diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java
index f87ef77718..87e40aa100 100644
--- a/runescape-client/src/main/java/AbstractByteArrayCopier.java
+++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java
@@ -13,11 +13,7 @@ public abstract class AbstractByteArrayCopier {
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   static IndexCache __gu_et;
-
-   static {
-      directBufferUnavailable = false;
-   }
+   static IndexCache field0;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -43,13 +39,13 @@ public abstract class AbstractByteArrayCopier {
    @Export("getVarcInt")
    public static VarcInt getVarcInt(int var0) {
       VarcInt var1 = (VarcInt)VarcInt.cachedVarcInts.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = VarcInt.__iw_m.takeRecord(19, var0);
+         byte[] var2 = VarcInt.field942.takeRecord(19, var0);
          var1 = new VarcInt();
-         if(var2 != null) {
-            var1.__q_411(new Buffer(var2));
+         if (var2 != null) {
+            var1.method354(new Buffer(var2));
          }
 
          VarcInt.cachedVarcInts.put(var1, (long)var0);
@@ -64,30 +60,29 @@ public abstract class AbstractByteArrayCopier {
    )
    @Export("unloadWidgetGroup")
    public static void unloadWidgetGroup(int var0) {
-      if(var0 != -1) {
-         if(Widget.loadedWidgetGroups[var0]) {
-            Widget.Widget_indexCache.__h_399(var0);
-            if(Widget.widgets[var0] != null) {
-               boolean var1 = true;
+      if (var0 != -1 && Widget.loadedWidgetGroups[var0]) {
+         Widget.Widget_indexCache.method7(var0);
+         if (Widget.widgets[var0] != null) {
+            boolean var1 = true;
 
-               for(int var2 = 0; var2 < Widget.widgets[var0].length; ++var2) {
-                  if(Widget.widgets[var0][var2] != null) {
-                     if(Widget.widgets[var0][var2].type != 2) {
-                        Widget.widgets[var0][var2] = null;
-                     } else {
-                        var1 = false;
-                     }
+            for (int var2 = 0; var2 < Widget.widgets[var0].length; ++var2) {
+               if (Widget.widgets[var0][var2] != null) {
+                  if (Widget.widgets[var0][var2].type != 2) {
+                     Widget.widgets[var0][var2] = null;
+                  } else {
+                     var1 = false;
                   }
                }
-
-               if(var1) {
-                  Widget.widgets[var0] = null;
-               }
-
-               Widget.loadedWidgetGroups[var0] = false;
             }
+
+            if (var1) {
+               Widget.widgets[var0] = null;
+            }
+
+            Widget.loadedWidgetGroups[var0] = false;
          }
       }
+
    }
 
    @ObfuscatedName("gb")
@@ -96,10 +91,14 @@ public abstract class AbstractByteArrayCopier {
       garbageValue = "-1256278627"
    )
    static void method4024() {
-      PacketBufferNode var0 = Interpreter.method1915(ClientPacket.__gs_aw, Client.packetWriter.isaacCipher);
+      PacketBufferNode var0 = Interpreter.method1915(ClientPacket.field257, Client.packetWriter.isaacCipher);
       var0.packetBuffer.writeByte(SpotAnimationDefinition.method4822());
       var0.packetBuffer.writeShort(SoundCache.canvasWidth);
       var0.packetBuffer.writeShort(Huffman.canvasHeight);
-      Client.packetWriter.__q_167(var0);
+      Client.packetWriter.method241(var0);
+   }
+
+   static {
+      directBufferUnavailable = false;
    }
 }
diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java
index 967f2b291c..a387cfe60f 100644
--- a/runescape-client/src/main/java/AbstractFont.java
+++ b/runescape-client/src/main/java/AbstractFont.java
@@ -77,20 +77,6 @@ public abstract class AbstractFont extends Rasterizer2D {
    @Export("kerning")
    byte[] kerning;
 
-   static {
-      AbstractFont_strike = -1;
-      AbstractFont_underline = -1;
-      AbstractFont_previousShadow = -1;
-      AbstractFont_shadow = -1;
-      AbstractFont_previousColor = 0;
-      AbstractFont_color = 0;
-      AbstractFont_alpha = 256;
-      AbstractFont_justificationTotal = 0;
-      AbstractFont_justificationCurrent = 0;
-      AbstractFont_random = new Random();
-      AbstractFont_lines = new String[100];
-   }
-
    AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
       this.pixels = new byte[256][];
       this.ascent = 0;
@@ -103,12 +89,12 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var8 = Integer.MAX_VALUE;
       int var9 = Integer.MIN_VALUE;
 
-      for(int var10 = 0; var10 < 256; ++var10) {
-         if(this.topBearings[var10] < var8 && this.heights[var10] != 0) {
+      for (int var10 = 0; var10 < 256; ++var10) {
+         if (this.topBearings[var10] < var8 && this.heights[var10] != 0) {
             var8 = this.topBearings[var10];
          }
 
-         if(this.topBearings[var10] + this.heights[var10] > var9) {
+         if (this.topBearings[var10] + this.heights[var10] > var9) {
             var9 = this.topBearings[var10] + this.heights[var10];
          }
       }
@@ -136,8 +122,8 @@ public abstract class AbstractFont extends Rasterizer2D {
    void readMetrics(byte[] var1) {
       this.advances = new int[256];
       int var2;
-      if(var1.length == 257) {
-         for(var2 = 0; var2 < this.advances.length; ++var2) {
+      if (var1.length == 257) {
+         for (var2 = 0; var2 < this.advances.length; ++var2) {
             this.advances[var2] = var1[var2] & 255;
          }
 
@@ -145,61 +131,61 @@ public abstract class AbstractFont extends Rasterizer2D {
       } else {
          var2 = 0;
 
-         for(int var3 = 0; var3 < 256; ++var3) {
+         for (int var3 = 0; var3 < 256; ++var3) {
             this.advances[var3] = var1[var2++] & 255;
          }
 
-         int[] var10 = new int[256];
+         int[] var12 = new int[256];
          int[] var4 = new int[256];
 
          int var5;
-         for(var5 = 0; var5 < 256; ++var5) {
-            var10[var5] = var1[var2++] & 255;
+         for (var5 = 0; var5 < 256; ++var5) {
+            var12[var5] = var1[var2++] & 255;
          }
 
-         for(var5 = 0; var5 < 256; ++var5) {
+         for (var5 = 0; var5 < 256; ++var5) {
             var4[var5] = var1[var2++] & 255;
          }
 
-         byte[][] var11 = new byte[256][];
+         byte[][] var6 = new byte[256][];
 
-         int var8;
-         for(int var6 = 0; var6 < 256; ++var6) {
-            var11[var6] = new byte[var10[var6]];
-            byte var7 = 0;
+         int var7;
+         for (int var8 = 0; var8 < 256; ++var8) {
+            var6[var8] = new byte[var12[var8]];
+            byte var9 = 0;
 
-            for(var8 = 0; var8 < var11[var6].length; ++var8) {
-               var7 += var1[var2++];
-               var11[var6][var8] = var7;
+            for (var7 = 0; var7 < var6[var8].length; ++var7) {
+               var9 += var1[var2++];
+               var6[var8][var7] = var9;
             }
          }
 
-         byte[][] var12 = new byte[256][];
+         byte[][] var13 = new byte[256][];
 
-         int var13;
-         for(var13 = 0; var13 < 256; ++var13) {
-            var12[var13] = new byte[var10[var13]];
-            byte var14 = 0;
+         int var14;
+         for (var14 = 0; var14 < 256; ++var14) {
+            var13[var14] = new byte[var12[var14]];
+            byte var10 = 0;
 
-            for(int var9 = 0; var9 < var12[var13].length; ++var9) {
-               var14 += var1[var2++];
-               var12[var13][var9] = var14;
+            for (int var11 = 0; var11 < var13[var14].length; ++var11) {
+               var10 += var1[var2++];
+               var13[var14][var11] = var10;
             }
          }
 
          this.kerning = new byte[65536];
 
-         for(var13 = 0; var13 < 256; ++var13) {
-            if(var13 != 32 && var13 != 160) {
-               for(var8 = 0; var8 < 256; ++var8) {
-                  if(var8 != 32 && var8 != 160) {
-                     this.kerning[var8 + (var13 << 8)] = (byte)method5658(var11, var12, var4, this.advances, var10, var13, var8);
+         for (var14 = 0; var14 < 256; ++var14) {
+            if (var14 != 32 && var14 != 160) {
+               for (var7 = 0; var7 < 256; ++var7) {
+                  if (var7 != 32 && var7 != 160) {
+                     this.kerning[var7 + (var14 << 8)] = (byte)method5658(var6, var13, var4, this.advances, var12, var14, var7);
                   }
                }
             }
          }
 
-         this.ascent = var4[32] + var10[32];
+         this.ascent = var4[32] + var12[32];
       }
 
    }
@@ -207,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D {
    @ObfuscatedName("x")
    @Export("charWidth")
    int charWidth(char var1) {
-      if(var1 == 160) {
+      if (var1 == 160) {
          var1 = ' ';
       }
 
@@ -217,32 +203,31 @@ public abstract class AbstractFont extends Rasterizer2D {
    @ObfuscatedName("d")
    @Export("stringWidth")
    public int stringWidth(String var1) {
-      if(var1 == null) {
+      if (var1 == null) {
          return 0;
       } else {
          int var2 = -1;
          int var3 = -1;
          int var4 = 0;
 
-         for(int var5 = 0; var5 < var1.length(); ++var5) {
+         for (int var5 = 0; var5 < var1.length(); ++var5) {
             char var6 = var1.charAt(var5);
-            if(var6 == '<') {
+            if (var6 == '<') {
                var2 = var5;
             } else {
-               if(var6 == '>' && var2 != -1) {
+               if (var6 == '>' && var2 != -1) {
                   String var7 = var1.substring(var2 + 1, var5);
                   var2 = -1;
-                  if(var7.equals("lt")) {
+                  if (var7.equals("lt")) {
                      var6 = '<';
                   } else {
-                     if(!var7.equals("gt")) {
-                        if(var7.startsWith("img=")) {
+                     if (!var7.equals("gt")) {
+                        if (var7.startsWith("img=")) {
                            try {
                               int var8 = MouseHandler.method1085(var7.substring(4));
                               var4 += AbstractFont_modIconSprites[var8].width;
                               var3 = -1;
-                           } catch (Exception var10) {
-                              ;
+                           } catch (Exception var9) {
                            }
                         }
                         continue;
@@ -252,13 +237,13 @@ public abstract class AbstractFont extends Rasterizer2D {
                   }
                }
 
-               if(var6 == 160) {
+               if (var6 == 160) {
                   var6 = ' ';
                }
 
-               if(var2 == -1) {
+               if (var2 == -1) {
                   var4 += this.advances[(char)(HealthBar.charToByteCp1252(var6) & 255)];
-                  if(this.kerning != null && var3 != -1) {
+                  if (this.kerning != null && var3 != -1) {
                      var4 += this.kerning[var6 + (var3 << 8)];
                   }
 
@@ -274,7 +259,7 @@ public abstract class AbstractFont extends Rasterizer2D {
    @ObfuscatedName("a")
    @Export("breakLines")
    public int breakLines(String var1, int[] var2, String[] var3) {
-      if(var1 == null) {
+      if (var1 == null) {
          return 0;
       } else {
          int var4 = 0;
@@ -288,69 +273,68 @@ public abstract class AbstractFont extends Rasterizer2D {
          int var12 = 0;
          int var13 = var1.length();
 
-         for(int var14 = 0; var14 < var13; ++var14) {
+         for (int var14 = 0; var14 < var13; ++var14) {
             char var15 = var1.charAt(var14);
-            if(var15 == '<') {
+            if (var15 == '<') {
                var10 = var14;
             } else {
-               if(var15 == '>' && var10 != -1) {
+               if (var15 == '>' && var10 != -1) {
                   String var16 = var1.substring(var10 + 1, var14);
                   var10 = -1;
                   var6.append('<');
                   var6.append(var16);
                   var6.append('>');
-                  if(var16.equals("br")) {
+                  if (var16.equals("br")) {
                      var3[var12] = var6.toString().substring(var5, var6.length());
                      ++var12;
                      var5 = var6.length();
                      var4 = 0;
                      var7 = -1;
                      var11 = 0;
-                  } else if(var16.equals("lt")) {
+                  } else if (var16.equals("lt")) {
                      var4 += this.charWidth('<');
-                     if(this.kerning != null && var11 != -1) {
+                     if (this.kerning != null && var11 != -1) {
                         var4 += this.kerning[(var11 << '\b') + 60];
                      }
 
                      var11 = '<';
-                  } else if(var16.equals("gt")) {
+                  } else if (var16.equals("gt")) {
                      var4 += this.charWidth('>');
-                     if(this.kerning != null && var11 != -1) {
+                     if (this.kerning != null && var11 != -1) {
                         var4 += this.kerning[(var11 << '\b') + 62];
                      }
 
                      var11 = '>';
-                  } else if(var16.startsWith("img=")) {
+                  } else if (var16.startsWith("img=")) {
                      try {
                         int var17 = MouseHandler.method1085(var16.substring(4));
                         var4 += AbstractFont_modIconSprites[var17].width;
                         var11 = 0;
-                     } catch (Exception var20) {
-                        ;
+                     } catch (Exception var18) {
                      }
                   }
 
                   var15 = 0;
                }
 
-               if(var10 == -1) {
-                  if(var15 != 0) {
+               if (var10 == -1) {
+                  if (var15 != 0) {
                      var6.append(var15);
                      var4 += this.charWidth(var15);
-                     if(this.kerning != null && var11 != -1) {
+                     if (this.kerning != null && var11 != -1) {
                         var4 += this.kerning[var15 + (var11 << '\b')];
                      }
 
                      var11 = var15;
                   }
 
-                  if(var15 == ' ') {
+                  if (var15 == ' ') {
                      var7 = var6.length();
                      var8 = var4;
                      var9 = 1;
                   }
 
-                  if(var2 != null && var4 > var2[var12 < var2.length?var12:var2.length - 1] && var7 >= 0) {
+                  if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) {
                      var3[var12] = var6.toString().substring(var5, var7 - var9);
                      ++var12;
                      var5 = var7;
@@ -359,7 +343,7 @@ public abstract class AbstractFont extends Rasterizer2D {
                      var11 = 0;
                   }
 
-                  if(var15 == '-') {
+                  if (var15 == '-') {
                      var7 = var6.length();
                      var8 = var4;
                      var9 = 0;
@@ -369,7 +353,7 @@ public abstract class AbstractFont extends Rasterizer2D {
          }
 
          String var19 = var6.toString();
-         if(var19.length() > var5) {
+         if (var19.length() > var5) {
             var3[var12++] = var19.substring(var5, var19.length());
          }
 
@@ -383,9 +367,9 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
       int var4 = 0;
 
-      for(int var5 = 0; var5 < var3; ++var5) {
+      for (int var5 = 0; var5 < var3; ++var5) {
          int var6 = this.stringWidth(AbstractFont_lines[var5]);
-         if(var6 > var4) {
+         if (var6 > var4) {
             var4 = var6;
          }
       }
@@ -402,72 +386,76 @@ public abstract class AbstractFont extends Rasterizer2D {
    @ObfuscatedName("t")
    @Export("draw")
    public void draw(String var1, int var2, int var3, int var4, int var5) {
-      if(var1 != null) {
+      if (var1 != null) {
          this.reset(var4, var5);
          this.draw0(var1, var2, var3);
       }
+
    }
 
    @ObfuscatedName("y")
    @Export("drawAlpha")
    public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) {
-      if(var1 != null) {
+      if (var1 != null) {
          this.reset(var4, var5);
          AbstractFont_alpha = var6;
          this.draw0(var1, var2, var3);
       }
+
    }
 
    @ObfuscatedName("h")
    @Export("drawRightAligned")
    public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) {
-      if(var1 != null) {
+      if (var1 != null) {
          this.reset(var4, var5);
          this.draw0(var1, var2 - this.stringWidth(var1), var3);
       }
+
    }
 
    @ObfuscatedName("b")
    @Export("drawCentered")
    public void drawCentered(String var1, int var2, int var3, int var4, int var5) {
-      if(var1 != null) {
+      if (var1 != null) {
          this.reset(var4, var5);
          this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3);
       }
+
    }
 
    @ObfuscatedName("c")
    @Export("drawLines")
    public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
-      if(var1 == null) {
+      if (var1 == null) {
          return 0;
       } else {
          this.reset(var6, var7);
-         if(var10 == 0) {
+         if (var10 == 0) {
             var10 = this.ascent;
          }
 
          int[] var11 = new int[]{var4};
-         if(var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) {
+         if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) {
             var11 = null;
          }
 
          int var12 = this.breakLines(var1, var11, AbstractFont_lines);
-         if(var9 == 3 && var12 == 1) {
+         if (var9 == 3 && var12 == 1) {
             var9 = 1;
          }
 
          int var13;
          int var14;
-         if(var9 == 0) {
+         if (var9 == 0) {
             var13 = var3 + this.maxAscent;
-         } else if(var9 == 1) {
+         } else if (var9 == 1) {
             var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent;
-         } else if(var9 == 2) {
+         } else if (var9 == 2) {
             var13 = var3 + var5 - this.maxDescent - var10 * (var12 - 1);
          } else {
             var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1);
-            if(var14 < 0) {
+            if (var14 < 0) {
                var14 = 0;
             }
 
@@ -475,14 +463,14 @@ public abstract class AbstractFont extends Rasterizer2D {
             var10 += var14;
          }
 
-         for(var14 = 0; var14 < var12; ++var14) {
-            if(var8 == 0) {
+         for (var14 = 0; var14 < var12; ++var14) {
+            if (var8 == 0) {
                this.draw0(AbstractFont_lines[var14], var2, var13);
-            } else if(var8 == 1) {
+            } else if (var8 == 1) {
                this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13);
-            } else if(var8 == 2) {
+            } else if (var8 == 2) {
                this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13);
-            } else if(var14 == var12 - 1) {
+            } else if (var14 == var12 - 1) {
                this.draw0(AbstractFont_lines[var14], var2, var13);
             } else {
                this.calculateLineJustification(AbstractFont_lines[var14], var4);
@@ -500,74 +488,78 @@ public abstract class AbstractFont extends Rasterizer2D {
    @ObfuscatedName("p")
    @Export("drawCenteredWave")
    public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) {
-      if(var1 != null) {
+      if (var1 != null) {
          this.reset(var4, var5);
          int[] var7 = new int[var1.length()];
 
-         for(int var8 = 0; var8 < var1.length(); ++var8) {
+         for (int var8 = 0; var8 < var1.length(); ++var8) {
             var7[var8] = (int)(Math.sin((double)var8 / 2.0D + (double)var6 / 5.0D) * 5.0D);
          }
 
          this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var7);
       }
+
    }
 
    @ObfuscatedName("v")
    @Export("drawCenteredWave2")
    public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) {
-      if(var1 != null) {
+      if (var1 != null) {
          this.reset(var4, var5);
          int[] var7 = new int[var1.length()];
          int[] var8 = new int[var1.length()];
 
-         for(int var9 = 0; var9 < var1.length(); ++var9) {
+         for (int var9 = 0; var9 < var1.length(); ++var9) {
             var7[var9] = (int)(Math.sin((double)var9 / 5.0D + (double)var6 / 5.0D) * 5.0D);
             var8[var9] = (int)(Math.sin((double)var9 / 3.0D + (double)var6 / 5.0D) * 5.0D);
          }
 
          this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8);
       }
+
    }
 
    @ObfuscatedName("ag")
    @Export("drawCenteredShake")
    public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-      if(var1 != null) {
+      if (var1 != null) {
          this.reset(var4, var5);
          double var8 = 7.0D - (double)var7 / 8.0D;
-         if(var8 < 0.0D) {
+         if (var8 < 0.0D) {
             var8 = 0.0D;
          }
 
          int[] var10 = new int[var1.length()];
 
-         for(int var11 = 0; var11 < var1.length(); ++var11) {
+         for (int var11 = 0; var11 < var1.length(); ++var11) {
             var10[var11] = (int)(Math.sin((double)var11 / 1.5D + (double)var6 / 1.0D) * var8);
          }
 
          this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var10);
       }
+
    }
 
    @ObfuscatedName("aq")
    @Export("drawRandomAlphaAndSpacing")
    public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) {
-      if(var1 != null) {
+      if (var1 != null) {
          this.reset(var4, var5);
          AbstractFont_random.setSeed((long)var6);
          AbstractFont_alpha = 192 + (AbstractFont_random.nextInt() & 31);
          int[] var7 = new int[var1.length()];
          int var8 = 0;
 
-         for(int var9 = 0; var9 < var1.length(); ++var9) {
+         for (int var9 = 0; var9 < var1.length(); ++var9) {
             var7[var9] = var8;
-            if((AbstractFont_random.nextInt() & 3) == 0) {
+            if ((AbstractFont_random.nextInt() & 3) == 0) {
                ++var8;
             }
          }
 
          this.drawWithOffsets0(var1, var2, var3, var7, (int[])null);
       }
+
    }
 
    @ObfuscatedName("aj")
@@ -588,33 +580,32 @@ public abstract class AbstractFont extends Rasterizer2D {
    @Export("decodeTag")
    void decodeTag(String var1) {
       try {
-         if(var1.startsWith("col=")) {
+         if (var1.startsWith("col=")) {
             AbstractFont_color = class214.method4157(var1.substring(4), 16);
-         } else if(var1.equals("/col")) {
+         } else if (var1.equals("/col")) {
             AbstractFont_color = AbstractFont_previousColor;
-         } else if(var1.startsWith("str=")) {
+         } else if (var1.startsWith("str=")) {
             AbstractFont_strike = class214.method4157(var1.substring(4), 16);
-         } else if(var1.equals("str")) {
+         } else if (var1.equals("str")) {
             AbstractFont_strike = 8388608;
-         } else if(var1.equals("/str")) {
+         } else if (var1.equals("/str")) {
             AbstractFont_strike = -1;
-         } else if(var1.startsWith("u=")) {
+         } else if (var1.startsWith("u=")) {
             AbstractFont_underline = class214.method4157(var1.substring(2), 16);
-         } else if(var1.equals("u")) {
+         } else if (var1.equals("u")) {
             AbstractFont_underline = 0;
-         } else if(var1.equals("/u")) {
+         } else if (var1.equals("/u")) {
             AbstractFont_underline = -1;
-         } else if(var1.startsWith("shad=")) {
+         } else if (var1.startsWith("shad=")) {
             AbstractFont_shadow = class214.method4157(var1.substring(5), 16);
-         } else if(var1.equals("shad")) {
+         } else if (var1.equals("shad")) {
             AbstractFont_shadow = 0;
-         } else if(var1.equals("/shad")) {
+         } else if (var1.equals("/shad")) {
             AbstractFont_shadow = AbstractFont_previousShadow;
-         } else if(var1.equals("br")) {
+         } else if (var1.equals("br")) {
             this.reset(AbstractFont_previousColor, AbstractFont_previousShadow);
          }
       } catch (Exception var3) {
-         ;
       }
 
    }
@@ -625,18 +616,18 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var3 = 0;
       boolean var4 = false;
 
-      for(int var5 = 0; var5 < var1.length(); ++var5) {
+      for (int var5 = 0; var5 < var1.length(); ++var5) {
          char var6 = var1.charAt(var5);
-         if(var6 == '<') {
+         if (var6 == '<') {
             var4 = true;
-         } else if(var6 == '>') {
+         } else if (var6 == '>') {
             var4 = false;
-         } else if(!var4 && var6 == ' ') {
+         } else if (!var4 && var6 == ' ') {
             ++var3;
          }
       }
 
-      if(var3 > 0) {
+      if (var3 > 0) {
          AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3;
       }
 
@@ -649,32 +640,31 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var4 = -1;
       int var5 = -1;
 
-      for(int var6 = 0; var6 < var1.length(); ++var6) {
-         if(var1.charAt(var6) != 0) {
+      for (int var6 = 0; var6 < var1.length(); ++var6) {
+         if (var1.charAt(var6) != 0) {
             char var7 = (char)(HealthBar.charToByteCp1252(var1.charAt(var6)) & 255);
-            if(var7 == '<') {
+            if (var7 == '<') {
                var4 = var6;
             } else {
-               int var9;
-               if(var7 == '>' && var4 != -1) {
-                  String var8 = var1.substring(var4 + 1, var6);
+               int var8;
+               if (var7 == '>' && var4 != -1) {
+                  String var9 = var1.substring(var4 + 1, var6);
                   var4 = -1;
-                  if(var8.equals("lt")) {
+                  if (var9.equals("lt")) {
                      var7 = '<';
                   } else {
-                     if(!var8.equals("gt")) {
-                        if(var8.startsWith("img=")) {
+                     if (!var9.equals("gt")) {
+                        if (var9.startsWith("img=")) {
                            try {
-                              var9 = MouseHandler.method1085(var8.substring(4));
-                              IndexedSprite var10 = AbstractFont_modIconSprites[var9];
-                              var10.drawAt(var2, var3 + this.ascent - var10.height);
-                              var2 += var10.width;
+                              var8 = MouseHandler.method1085(var9.substring(4));
+                              IndexedSprite var13 = AbstractFont_modIconSprites[var8];
+                              var13.drawAt(var2, var3 + this.ascent - var13.height);
+                              var2 += var13.width;
                               var5 = -1;
-                           } catch (Exception var14) {
-                              ;
+                           } catch (Exception var11) {
                            }
                         } else {
-                           this.decodeTag(var8);
+                           this.decodeTag(var9);
                         }
                         continue;
                      }
@@ -683,47 +673,47 @@ public abstract class AbstractFont extends Rasterizer2D {
                   }
                }
 
-               if(var7 == 160) {
+               if (var7 == 160) {
                   var7 = ' ';
                }
 
-               if(var4 == -1) {
-                  if(this.kerning != null && var5 != -1) {
+               if (var4 == -1) {
+                  if (this.kerning != null && var5 != -1) {
                      var2 += this.kerning[var7 + (var5 << 8)];
                   }
 
                   int var12 = this.widths[var7];
-                  var9 = this.heights[var7];
-                  if(var7 != ' ') {
-                     if(AbstractFont_alpha == 256) {
-                        if(AbstractFont_shadow != -1) {
-                           AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow);
+                  var8 = this.heights[var7];
+                  if (var7 != ' ') {
+                     if (AbstractFont_alpha == 256) {
+                        if (AbstractFont_shadow != -1) {
+                           AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow);
                         }
 
-                        this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color);
+                        this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var8, AbstractFont_color);
                      } else {
-                        if(AbstractFont_shadow != -1) {
-                           AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha);
+                        if (AbstractFont_shadow != -1) {
+                           AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow, AbstractFont_alpha);
                         }
 
-                        this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha);
+                        this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var8, AbstractFont_color, AbstractFont_alpha);
                      }
-                  } else if(AbstractFont_justificationTotal > 0) {
+                  } else if (AbstractFont_justificationTotal > 0) {
                      AbstractFont_justificationCurrent += AbstractFont_justificationTotal;
                      var2 += AbstractFont_justificationCurrent >> 8;
                      AbstractFont_justificationCurrent &= 255;
                   }
 
-                  int var13 = this.advances[var7];
-                  if(AbstractFont_strike != -1) {
-                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike);
+                  int var10 = this.advances[var7];
+                  if (AbstractFont_strike != -1) {
+                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var10, AbstractFont_strike);
                   }
 
-                  if(AbstractFont_underline != -1) {
-                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline);
+                  if (AbstractFont_underline != -1) {
+                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var10, AbstractFont_underline);
                   }
 
-                  var2 += var13;
+                  var2 += var10;
                   var5 = var7;
                }
             }
@@ -740,47 +730,46 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var7 = -1;
       int var8 = 0;
 
-      for(int var9 = 0; var9 < var1.length(); ++var9) {
-         if(var1.charAt(var9) != 0) {
+      for (int var9 = 0; var9 < var1.length(); ++var9) {
+         if (var1.charAt(var9) != 0) {
             char var10 = (char)(HealthBar.charToByteCp1252(var1.charAt(var9)) & 255);
-            if(var10 == '<') {
+            if (var10 == '<') {
                var6 = var9;
             } else {
+               int var11;
                int var12;
                int var13;
-               int var14;
-               if(var10 == '>' && var6 != -1) {
-                  String var11 = var1.substring(var6 + 1, var9);
+               if (var10 == '>' && var6 != -1) {
+                  String var14 = var1.substring(var6 + 1, var9);
                   var6 = -1;
-                  if(var11.equals("lt")) {
+                  if (var14.equals("lt")) {
                      var10 = '<';
                   } else {
-                     if(!var11.equals("gt")) {
-                        if(var11.startsWith("img=")) {
+                     if (!var14.equals("gt")) {
+                        if (var14.startsWith("img=")) {
                            try {
-                              if(var4 != null) {
-                                 var12 = var4[var8];
+                              if (var4 != null) {
+                                 var11 = var4[var8];
+                              } else {
+                                 var11 = 0;
+                              }
+
+                              if (var5 != null) {
+                                 var12 = var5[var8];
                               } else {
                                  var12 = 0;
                               }
 
-                              if(var5 != null) {
-                                 var13 = var5[var8];
-                              } else {
-                                 var13 = 0;
-                              }
-
                               ++var8;
-                              var14 = MouseHandler.method1085(var11.substring(4));
-                              IndexedSprite var15 = AbstractFont_modIconSprites[var14];
-                              var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height));
-                              var2 += var15.width;
+                              var13 = MouseHandler.method1085(var14.substring(4));
+                              IndexedSprite var18 = AbstractFont_modIconSprites[var13];
+                              var18.drawAt(var11 + var2, var12 + (var3 + this.ascent - var18.height));
+                              var2 += var18.width;
                               var7 = -1;
-                           } catch (Exception var19) {
-                              ;
+                           } catch (Exception var16) {
                            }
                         } else {
-                           this.decodeTag(var11);
+                           this.decodeTag(var14);
                         }
                         continue;
                      }
@@ -789,60 +778,60 @@ public abstract class AbstractFont extends Rasterizer2D {
                   }
                }
 
-               if(var10 == 160) {
+               if (var10 == 160) {
                   var10 = ' ';
                }
 
-               if(var6 == -1) {
-                  if(this.kerning != null && var7 != -1) {
+               if (var6 == -1) {
+                  if (this.kerning != null && var7 != -1) {
                      var2 += this.kerning[var10 + (var7 << 8)];
                   }
 
                   int var17 = this.widths[var10];
-                  var12 = this.heights[var10];
-                  if(var4 != null) {
-                     var13 = var4[var8];
+                  var11 = this.heights[var10];
+                  if (var4 != null) {
+                     var12 = var4[var8];
+                  } else {
+                     var12 = 0;
+                  }
+
+                  if (var5 != null) {
+                     var13 = var5[var8];
                   } else {
                      var13 = 0;
                   }
 
-                  if(var5 != null) {
-                     var14 = var5[var8];
-                  } else {
-                     var14 = 0;
-                  }
-
                   ++var8;
-                  if(var10 != ' ') {
-                     if(AbstractFont_alpha == 256) {
-                        if(AbstractFont_shadow != -1) {
-                           AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow);
+                  if (var10 != ' ') {
+                     if (AbstractFont_alpha == 256) {
+                        if (AbstractFont_shadow != -1) {
+                           AbstractFont_drawGlyph(this.pixels[var10], var12 + var2 + this.leftBearings[var10] + 1, var3 + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow);
                         }
 
-                        this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color);
+                        this.drawGlyph(this.pixels[var10], var12 + var2 + this.leftBearings[var10], var3 + var13 + this.topBearings[var10], var17, var11, AbstractFont_color);
                      } else {
-                        if(AbstractFont_shadow != -1) {
-                           AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha);
+                        if (AbstractFont_shadow != -1) {
+                           AbstractFont_drawGlyphAlpha(this.pixels[var10], var12 + var2 + this.leftBearings[var10] + 1, var3 + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow, AbstractFont_alpha);
                         }
 
-                        this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha);
+                        this.drawGlyphAlpha(this.pixels[var10], var12 + var2 + this.leftBearings[var10], var3 + var13 + this.topBearings[var10], var17, var11, AbstractFont_color, AbstractFont_alpha);
                      }
-                  } else if(AbstractFont_justificationTotal > 0) {
+                  } else if (AbstractFont_justificationTotal > 0) {
                      AbstractFont_justificationCurrent += AbstractFont_justificationTotal;
                      var2 += AbstractFont_justificationCurrent >> 8;
                      AbstractFont_justificationCurrent &= 255;
                   }
 
-                  int var18 = this.advances[var10];
-                  if(AbstractFont_strike != -1) {
-                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike);
+                  int var15 = this.advances[var10];
+                  if (AbstractFont_strike != -1) {
+                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var15, AbstractFont_strike);
                   }
 
-                  if(AbstractFont_underline != -1) {
-                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline);
+                  if (AbstractFont_underline != -1) {
+                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var15, AbstractFont_underline);
                   }
 
-                  var2 += var18;
+                  var2 += var15;
                   var7 = var10;
                }
             }
@@ -858,17 +847,17 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var9 = var2[var6];
       int var10 = var9 + var4[var6];
       int var11 = var7;
-      if(var9 > var7) {
+      if (var9 > var7) {
          var11 = var9;
       }
 
       int var12 = var8;
-      if(var10 < var8) {
+      if (var10 < var8) {
          var12 = var10;
       }
 
       int var13 = var3[var5];
-      if(var3[var6] < var13) {
+      if (var3[var6] < var13) {
          var13 = var3[var6];
       }
 
@@ -877,9 +866,9 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var16 = var11 - var7;
       int var17 = var11 - var9;
 
-      for(int var18 = var11; var18 < var12; ++var18) {
+      for (int var18 = var11; var18 < var12; ++var18) {
          int var19 = var14[var16++] + var15[var17++];
-         if(var19 < var13) {
+         if (var19 < var13) {
             var13 = var19;
          }
       }
@@ -893,20 +882,20 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var1 = var0.length();
       int var2 = 0;
 
-      for(int var3 = 0; var3 < var1; ++var3) {
+      for (int var3 = 0; var3 < var1; ++var3) {
          char var4 = var0.charAt(var3);
-         if(var4 == '<' || var4 == '>') {
+         if (var4 == '<' || var4 == '>') {
             var2 += 3;
          }
       }
 
       StringBuilder var6 = new StringBuilder(var1 + var2);
 
-      for(int var7 = 0; var7 < var1; ++var7) {
+      for (int var7 = 0; var7 < var1; ++var7) {
          char var5 = var0.charAt(var7);
-         if(var5 == '<') {
+         if (var5 == '<') {
             var6.append("<lt>");
-         } else if(var5 == '>') {
+         } else if (var5 == '>') {
             var6.append("<gt>");
          } else {
             var6.append(var5);
@@ -924,7 +913,7 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var8 = 0;
       int var9 = 0;
       int var10;
-      if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
          var4 -= var10;
          var2 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -932,11 +921,11 @@ public abstract class AbstractFont extends Rasterizer2D {
          var6 += var10 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
          var3 -= var10;
          var1 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -946,16 +935,17 @@ public abstract class AbstractFont extends Rasterizer2D {
          var7 += var10;
       }
 
-      if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var3 -= var10;
          var8 += var10;
          var7 += var10;
       }
 
-      if(var3 > 0 && var4 > 0) {
+      if (var3 > 0 && var4 > 0) {
          AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8);
       }
+
    }
 
    @ObfuscatedName("ak")
@@ -964,36 +954,36 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var9 = -(var5 >> 2);
       var5 = -(var5 & 3);
 
-      for(int var10 = -var6; var10 < 0; ++var10) {
+      for (int var10 = -var6; var10 < 0; ++var10) {
          int var11;
-         for(var11 = var9; var11 < 0; ++var11) {
-            if(var1[var3++] != 0) {
+         for (var11 = var9; var11 < 0; ++var11) {
+            if (var1[var3++] != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
 
-            if(var1[var3++] != 0) {
+            if (var1[var3++] != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
 
-            if(var1[var3++] != 0) {
+            if (var1[var3++] != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
 
-            if(var1[var3++] != 0) {
+            if (var1[var3++] != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
          }
 
-         for(var11 = var5; var11 < 0; ++var11) {
-            if(var1[var3++] != 0) {
+         for (var11 = var5; var11 < 0; ++var11) {
+            if (var1[var3++] != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
@@ -1014,7 +1004,7 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var9 = 0;
       int var10 = 0;
       int var11;
-      if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
          var4 -= var11;
          var2 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -1022,11 +1012,11 @@ public abstract class AbstractFont extends Rasterizer2D {
          var7 += var11 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
          var3 -= var11;
          var1 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -1036,16 +1026,17 @@ public abstract class AbstractFont extends Rasterizer2D {
          var8 += var11;
       }
 
-      if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var3 -= var11;
          var9 += var11;
          var8 += var11;
       }
 
-      if(var3 > 0 && var4 > 0) {
+      if (var3 > 0 && var4 > 0) {
          AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6);
       }
+
    }
 
    @ObfuscatedName("al")
@@ -1054,9 +1045,9 @@ public abstract class AbstractFont extends Rasterizer2D {
       var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8;
       var9 = 256 - var9;
 
-      for(int var10 = -var6; var10 < 0; ++var10) {
-         for(int var11 = -var5; var11 < 0; ++var11) {
-            if(var1[var3++] != 0) {
+      for (int var10 = -var6; var10 < 0; ++var10) {
+         for (int var11 = -var5; var11 < 0; ++var11) {
+            if (var1[var3++] != 0) {
                int var12 = var0[var4];
                var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2;
             } else {
@@ -1069,4 +1060,18 @@ public abstract class AbstractFont extends Rasterizer2D {
       }
 
    }
+
+   static {
+      AbstractFont_strike = -1;
+      AbstractFont_underline = -1;
+      AbstractFont_previousShadow = -1;
+      AbstractFont_shadow = -1;
+      AbstractFont_previousColor = 0;
+      AbstractFont_color = 0;
+      AbstractFont_alpha = 256;
+      AbstractFont_justificationTotal = 0;
+      AbstractFont_justificationCurrent = 0;
+      AbstractFont_random = new Random();
+      AbstractFont_lines = new String[100];
+   }
 }
diff --git a/runescape-client/src/main/java/AbstractIndexCache.java b/runescape-client/src/main/java/AbstractIndexCache.java
index 22249e8e50..c6c7ff1a91 100644
--- a/runescape-client/src/main/java/AbstractIndexCache.java
+++ b/runescape-client/src/main/java/AbstractIndexCache.java
@@ -24,7 +24,7 @@ public abstract class AbstractIndexCache {
    @ObfuscatedGetter(
       intValue = -244224193
    )
-   static int __ir_s;
+   static int field1;
    @ObfuscatedName("au")
    @Export("garbageCollector")
    static GarbageCollectorMXBean garbageCollector;
@@ -32,7 +32,7 @@ public abstract class AbstractIndexCache {
    @ObfuscatedGetter(
       intValue = 334735939
    )
-   static int __ir_bu;
+   static int field2;
    @ObfuscatedName("di")
    @ObfuscatedSignature(
       signature = "Lit;"
@@ -97,11 +97,6 @@ public abstract class AbstractIndexCache {
    @Export("shallowRecords")
    boolean shallowRecords;
 
-   static {
-      gzipDecompressor = new GzipDecompressor();
-      __ir_s = 0;
-   }
-
    AbstractIndexCache(boolean var1, boolean var2) {
       this.releaseArchives = var1;
       this.shallowRecords = var2;
@@ -117,33 +112,33 @@ public abstract class AbstractIndexCache {
       this.hash = WallDecoration.method3257(var1, var1.length);
       Buffer var2 = new Buffer(Strings.decompressBytes(var1));
       int var3 = var2.readUnsignedByte();
-      if(var3 >= 5 && var3 <= 7) {
-         if(var3 >= 6) {
+      if (var3 >= 5 && var3 <= 7) {
+         if (var3 >= 6) {
             var2.readInt();
          }
 
          int var4 = var2.readUnsignedByte();
-         if(var3 >= 7) {
-            this.archiveCount = var2.__ad_309();
+         if (var3 >= 7) {
+            this.archiveCount = var2.method50();
          } else {
-            this.archiveCount = var2.__ag_302();
+            this.archiveCount = var2.method43();
          }
 
          int var5 = 0;
          int var6 = -1;
          this.archiveIds = new int[this.archiveCount];
          int var7;
-         if(var3 >= 7) {
-            for(var7 = 0; var7 < this.archiveCount; ++var7) {
-               this.archiveIds[var7] = var5 += var2.__ad_309();
-               if(this.archiveIds[var7] > var6) {
+         if (var3 >= 7) {
+            for (var7 = 0; var7 < this.archiveCount; ++var7) {
+               this.archiveIds[var7] = var5 += var2.method50();
+               if (this.archiveIds[var7] > var6) {
                   var6 = this.archiveIds[var7];
                }
             }
          } else {
-            for(var7 = 0; var7 < this.archiveCount; ++var7) {
-               this.archiveIds[var7] = var5 += var2.__ag_302();
-               if(this.archiveIds[var7] > var6) {
+            for (var7 = 0; var7 < this.archiveCount; ++var7) {
+               this.archiveIds[var7] = var5 += var2.method43();
+               if (this.archiveIds[var7] > var6) {
                   var6 = this.archiveIds[var7];
                }
             }
@@ -155,26 +150,26 @@ public abstract class AbstractIndexCache {
          this.recordIds = new int[var6 + 1][];
          this.archives = new Object[var6 + 1];
          this.records = new Object[var6 + 1][];
-         if(var4 != 0) {
+         if (var4 != 0) {
             this.archiveNameHashes = new int[var6 + 1];
 
-            for(var7 = 0; var7 < this.archiveCount; ++var7) {
+            for (var7 = 0; var7 < this.archiveCount; ++var7) {
                this.archiveNameHashes[this.archiveIds[var7]] = var2.readInt();
             }
 
             this.archiveNameHashTable = new IntHashTable(this.archiveNameHashes);
          }
 
-         for(var7 = 0; var7 < this.archiveCount; ++var7) {
+         for (var7 = 0; var7 < this.archiveCount; ++var7) {
             this.archiveCrcs[this.archiveIds[var7]] = var2.readInt();
          }
 
-         for(var7 = 0; var7 < this.archiveCount; ++var7) {
+         for (var7 = 0; var7 < this.archiveCount; ++var7) {
             this.archiveVersions[this.archiveIds[var7]] = var2.readInt();
          }
 
-         for(var7 = 0; var7 < this.archiveCount; ++var7) {
-            this.recordCounts[this.archiveIds[var7]] = var2.__ag_302();
+         for (var7 = 0; var7 < this.archiveCount; ++var7) {
+            this.recordCounts[this.archiveIds[var7]] = var2.method43();
          }
 
          int var8;
@@ -182,17 +177,17 @@ public abstract class AbstractIndexCache {
          int var10;
          int var11;
          int var12;
-         if(var3 >= 7) {
-            for(var7 = 0; var7 < this.archiveCount; ++var7) {
+         if (var3 >= 7) {
+            for (var7 = 0; var7 < this.archiveCount; ++var7) {
                var8 = this.archiveIds[var7];
                var9 = this.recordCounts[var8];
                var5 = 0;
                var10 = -1;
                this.recordIds[var8] = new int[var9];
 
-               for(var11 = 0; var11 < var9; ++var11) {
-                  var12 = this.recordIds[var8][var11] = var5 += var2.__ad_309();
-                  if(var12 > var10) {
+               for (var11 = 0; var11 < var9; ++var11) {
+                  var12 = this.recordIds[var8][var11] = var5 += var2.method50();
+                  if (var12 > var10) {
                      var10 = var12;
                   }
                }
@@ -200,16 +195,16 @@ public abstract class AbstractIndexCache {
                this.records[var8] = new Object[var10 + 1];
             }
          } else {
-            for(var7 = 0; var7 < this.archiveCount; ++var7) {
+            for (var7 = 0; var7 < this.archiveCount; ++var7) {
                var8 = this.archiveIds[var7];
                var9 = this.recordCounts[var8];
                var5 = 0;
                var10 = -1;
                this.recordIds[var8] = new int[var9];
 
-               for(var11 = 0; var11 < var9; ++var11) {
-                  var12 = this.recordIds[var8][var11] = var5 += var2.__ag_302();
-                  if(var12 > var10) {
+               for (var11 = 0; var11 < var9; ++var11) {
+                  var12 = this.recordIds[var8][var11] = var5 += var2.method43();
+                  if (var12 > var10) {
                      var10 = var12;
                   }
                }
@@ -218,16 +213,16 @@ public abstract class AbstractIndexCache {
             }
          }
 
-         if(var4 != 0) {
+         if (var4 != 0) {
             this.recordNameHashes = new int[var6 + 1][];
             this.recordNameHashTables = new IntHashTable[var6 + 1];
 
-            for(var7 = 0; var7 < this.archiveCount; ++var7) {
+            for (var7 = 0; var7 < this.archiveCount; ++var7) {
                var8 = this.archiveIds[var7];
                var9 = this.recordCounts[var8];
                this.recordNameHashes[var8] = new int[this.records[var8].length];
 
-               for(var10 = 0; var10 < var9; ++var10) {
+               for (var10 = 0; var10 < var9; ++var10) {
                   this.recordNameHashes[var8][this.recordIds[var8][var10]] = var2.readInt();
                }
 
@@ -245,7 +240,7 @@ public abstract class AbstractIndexCache {
       signature = "(II)V",
       garbageValue = "2102142648"
    )
-   void __f_392(int var1) {
+   void vmethod129(int var1) {
    }
 
    @ObfuscatedName("q")
@@ -265,20 +260,20 @@ public abstract class AbstractIndexCache {
    )
    @Export("takeRecordEncrypted")
    public byte[] takeRecordEncrypted(int var1, int var2, int[] var3) {
-      if(var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) {
-         if(this.records[var1][var2] == null) {
+      if (var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) {
+         if (this.records[var1][var2] == null) {
             boolean var4 = this.buildRecords(var1, var3);
-            if(!var4) {
+            if (!var4) {
                this.loadArchive(var1);
                var4 = this.buildRecords(var1, var3);
-               if(!var4) {
+               if (!var4) {
                   return null;
                }
             }
          }
 
          byte[] var5 = TextureProvider.byteArrayFromObject(this.records[var1][var2], false);
-         if(this.shallowRecords) {
+         if (this.shallowRecords) {
             this.records[var1][var2] = null;
          }
 
@@ -295,10 +290,10 @@ public abstract class AbstractIndexCache {
    )
    @Export("tryLoadRecord")
    public boolean tryLoadRecord(int var1, int var2) {
-      if(var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) {
-         if(this.records[var1][var2] != null) {
+      if (var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) {
+         if (this.records[var1][var2] != null) {
             return true;
-         } else if(this.archives[var1] != null) {
+         } else if (this.archives[var1] != null) {
             return true;
          } else {
             this.loadArchive(var1);
@@ -314,10 +309,10 @@ public abstract class AbstractIndexCache {
       signature = "(II)Z",
       garbageValue = "-1923759754"
    )
-   public boolean __u_393(int var1) {
-      if(this.records.length == 1) {
+   public boolean method1(int var1) {
+      if (this.records.length == 1) {
          return this.tryLoadRecord(0, var1);
-      } else if(this.records[var1].length == 1) {
+      } else if (this.records[var1].length == 1) {
          return this.tryLoadRecord(var1, 0);
       } else {
          throw new RuntimeException();
@@ -331,7 +326,7 @@ public abstract class AbstractIndexCache {
    )
    @Export("tryLoadArchive")
    public boolean tryLoadArchive(int var1) {
-      if(this.archives[var1] != null) {
+      if (this.archives[var1] != null) {
          return true;
       } else {
          this.loadArchive(var1);
@@ -344,14 +339,14 @@ public abstract class AbstractIndexCache {
       signature = "(I)Z",
       garbageValue = "1694975256"
    )
-   public boolean __l_394() {
+   public boolean method2() {
       boolean var1 = true;
 
-      for(int var2 = 0; var2 < this.archiveIds.length; ++var2) {
+      for (int var2 = 0; var2 < this.archiveIds.length; ++var2) {
          int var3 = this.archiveIds[var2];
-         if(this.archives[var3] == null) {
+         if (this.archives[var3] == null) {
             this.loadArchive(var3);
-            if(this.archives[var3] == null) {
+            if (this.archives[var3] == null) {
                var1 = false;
             }
          }
@@ -367,7 +362,7 @@ public abstract class AbstractIndexCache {
    )
    @Export("archiveLoadPercent")
    int archiveLoadPercent(int var1) {
-      return this.archives[var1] != null?100:0;
+      return this.archives[var1] != null ? 100 : 0;
    }
 
    @ObfuscatedName("x")
@@ -377,9 +372,9 @@ public abstract class AbstractIndexCache {
    )
    @Export("takeRecordFlat")
    public byte[] takeRecordFlat(int var1) {
-      if(this.records.length == 1) {
+      if (this.records.length == 1) {
          return this.takeRecord(0, var1);
-      } else if(this.records[var1].length == 1) {
+      } else if (this.records[var1].length == 1) {
          return this.takeRecord(var1, 0);
       } else {
          throw new RuntimeException();
@@ -393,13 +388,13 @@ public abstract class AbstractIndexCache {
    )
    @Export("getRecord")
    public byte[] getRecord(int var1, int var2) {
-      if(var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) {
-         if(this.records[var1][var2] == null) {
+      if (var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) {
+         if (this.records[var1][var2] == null) {
             boolean var3 = this.buildRecords(var1, (int[])null);
-            if(!var3) {
+            if (!var3) {
                this.loadArchive(var1);
                var3 = this.buildRecords(var1, (int[])null);
-               if(!var3) {
+               if (!var3) {
                   return null;
                }
             }
@@ -419,9 +414,9 @@ public abstract class AbstractIndexCache {
    )
    @Export("getRecordFlat")
    public byte[] getRecordFlat(int var1) {
-      if(this.records.length == 1) {
+      if (this.records.length == 1) {
          return this.getRecord(0, var1);
-      } else if(this.records[var1].length == 1) {
+      } else if (this.records[var1].length == 1) {
          return this.getRecord(var1, 0);
       } else {
          throw new RuntimeException();
@@ -442,8 +437,8 @@ public abstract class AbstractIndexCache {
       signature = "(IB)[I",
       garbageValue = "28"
    )
-   public int[] __j_395(int var1) {
-      return var1 >= 0 && var1 < this.recordIds.length?this.recordIds[var1]:null;
+   public int[] method3(int var1) {
+      return var1 >= 0 && var1 < this.recordIds.length ? this.recordIds[var1] : null;
    }
 
    @ObfuscatedName("s")
@@ -451,7 +446,7 @@ public abstract class AbstractIndexCache {
       signature = "(II)I",
       garbageValue = "1178362496"
    )
-   public int __s_396(int var1) {
+   public int method4(int var1) {
       return this.records[var1].length;
    }
 
@@ -460,7 +455,7 @@ public abstract class AbstractIndexCache {
       signature = "(I)I",
       garbageValue = "1702434573"
    )
-   public int __t_397() {
+   public int method5() {
       return this.records.length;
    }
 
@@ -469,8 +464,8 @@ public abstract class AbstractIndexCache {
       signature = "(B)V",
       garbageValue = "38"
    )
-   public void __y_398() {
-      for(int var1 = 0; var1 < this.archives.length; ++var1) {
+   public void method6() {
+      for (int var1 = 0; var1 < this.archives.length; ++var1) {
          this.archives[var1] = null;
       }
 
@@ -481,8 +476,8 @@ public abstract class AbstractIndexCache {
       signature = "(II)V",
       garbageValue = "330258899"
    )
-   public void __h_399(int var1) {
-      for(int var2 = 0; var2 < this.records[var1].length; ++var2) {
+   public void method7(int var1) {
+      for (int var2 = 0; var2 < this.records[var1].length; ++var2) {
          this.records[var1][var2] = null;
       }
 
@@ -493,10 +488,10 @@ public abstract class AbstractIndexCache {
       signature = "(I)V",
       garbageValue = "-709581639"
    )
-   public void __b_400() {
-      for(int var1 = 0; var1 < this.records.length; ++var1) {
-         if(this.records[var1] != null) {
-            for(int var2 = 0; var2 < this.records[var1].length; ++var2) {
+   public void method8() {
+      for (int var1 = 0; var1 < this.records.length; ++var1) {
+         if (this.records[var1] != null) {
+            for (int var2 = 0; var2 < this.records[var1].length; ++var2) {
                this.records[var1][var2] = null;
             }
          }
@@ -511,7 +506,7 @@ public abstract class AbstractIndexCache {
    )
    @Export("buildRecords")
    boolean buildRecords(int var1, int[] var2) {
-      if(this.archives[var1] == null) {
+      if (this.archives[var1] == null) {
          return false;
       } else {
          int var3 = this.recordCounts[var1];
@@ -519,18 +514,18 @@ public abstract class AbstractIndexCache {
          Object[] var5 = this.records[var1];
          boolean var6 = true;
 
-         for(int var7 = 0; var7 < var3; ++var7) {
-            if(var5[var4[var7]] == null) {
+         for (int var7 = 0; var7 < var3; ++var7) {
+            if (var5[var4[var7]] == null) {
                var6 = false;
                break;
             }
          }
 
-         if(var6) {
+         if (var6) {
             return true;
          } else {
             byte[] var18;
-            if(var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) {
+            if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) {
                var18 = TextureProvider.byteArrayFromObject(this.archives[var1], false);
             } else {
                var18 = TextureProvider.byteArrayFromObject(this.archives[var1], true);
@@ -538,63 +533,63 @@ public abstract class AbstractIndexCache {
                var8.xteaDecrypt(var2, 5, var8.array.length);
             }
 
-            byte[] var20 = Strings.decompressBytes(var18);
-            if(this.releaseArchives) {
+            byte[] var19 = Strings.decompressBytes(var18);
+            if (this.releaseArchives) {
                this.archives[var1] = null;
             }
 
-            if(var3 > 1) {
-               int var9 = var20.length;
+            if (var3 > 1) {
+               int var9 = var19.length;
                --var9;
-               int var10 = var20[var9] & 255;
+               int var10 = var19[var9] & 255;
                var9 -= var10 * var3 * 4;
-               Buffer var11 = new Buffer(var20);
+               Buffer var11 = new Buffer(var19);
                int[] var12 = new int[var3];
                var11.index = var9;
 
+               int var13;
                int var14;
-               int var15;
-               for(int var13 = 0; var13 < var10; ++var13) {
-                  var14 = 0;
+               for (int var15 = 0; var15 < var10; ++var15) {
+                  var13 = 0;
 
-                  for(var15 = 0; var15 < var3; ++var15) {
-                     var14 += var11.readInt();
-                     var12[var15] += var14;
+                  for (var14 = 0; var14 < var3; ++var14) {
+                     var13 += var11.readInt();
+                     var12[var14] += var13;
                   }
                }
 
-               byte[][] var19 = new byte[var3][];
+               byte[][] var20 = new byte[var3][];
 
-               for(var14 = 0; var14 < var3; ++var14) {
-                  var19[var14] = new byte[var12[var14]];
-                  var12[var14] = 0;
+               for (var13 = 0; var13 < var3; ++var13) {
+                  var20[var13] = new byte[var12[var13]];
+                  var12[var13] = 0;
                }
 
                var11.index = var9;
-               var14 = 0;
+               var13 = 0;
 
-               for(var15 = 0; var15 < var10; ++var15) {
+               for (var14 = 0; var14 < var10; ++var14) {
                   int var16 = 0;
 
-                  for(int var17 = 0; var17 < var3; ++var17) {
+                  for (int var17 = 0; var17 < var3; ++var17) {
                      var16 += var11.readInt();
-                     System.arraycopy(var20, var14, var19[var17], var12[var17], var16);
+                     System.arraycopy(var19, var13, var20[var17], var12[var17], var16);
                      var12[var17] += var16;
-                     var14 += var16;
+                     var13 += var16;
                   }
                }
 
-               for(var15 = 0; var15 < var3; ++var15) {
-                  if(!this.shallowRecords) {
-                     var5[var4[var15]] = Projectile.byteArrayToObject(var19[var15], false);
+               for (var14 = 0; var14 < var3; ++var14) {
+                  if (!this.shallowRecords) {
+                     var5[var4[var14]] = Projectile.byteArrayToObject(var20[var14], false);
                   } else {
-                     var5[var4[var15]] = var19[var15];
+                     var5[var4[var14]] = var20[var14];
                   }
                }
-            } else if(!this.shallowRecords) {
-               var5[var4[0]] = Projectile.byteArrayToObject(var20, false);
+            } else if (!this.shallowRecords) {
+               var5[var4[0]] = Projectile.byteArrayToObject(var19, false);
             } else {
-               var5[var4[0]] = var20;
+               var5[var4[0]] = var19;
             }
 
             return true;
@@ -629,11 +624,11 @@ public abstract class AbstractIndexCache {
       signature = "(Ljava/lang/String;Ljava/lang/String;B)Z",
       garbageValue = "68"
    )
-   public boolean __ag_401(String var1, String var2) {
+   public boolean method9(String var1, String var2) {
       var1 = var1.toLowerCase();
       var2 = var2.toLowerCase();
       int var3 = this.archiveNameHashTable.get(Client.hashString(var1));
-      if(var3 < 0) {
+      if (var3 < 0) {
          return false;
       } else {
          int var4 = this.recordNameHashTables[var3].get(Client.hashString(var2));
@@ -686,12 +681,13 @@ public abstract class AbstractIndexCache {
       signature = "(Ljava/lang/String;B)V",
       garbageValue = "40"
    )
-   public void __ar_402(String var1) {
+   public void method10(String var1) {
       var1 = var1.toLowerCase();
       int var2 = this.archiveNameHashTable.get(Client.hashString(var1));
-      if(var2 >= 0) {
-         this.__f_392(var2);
+      if (var2 >= 0) {
+         this.vmethod129(var2);
       }
+
    }
 
    @ObfuscatedName("ac")
@@ -715,16 +711,16 @@ public abstract class AbstractIndexCache {
    static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) {
       int var2 = var0.readUnsignedByte();
       int var3;
-      if(var1 == null) {
+      if (var1 == null) {
          var3 = World.method1759(var2);
          var1 = new IterableNodeHashTable(var3);
       }
 
-      for(var3 = 0; var3 < var2; ++var3) {
+      for (var3 = 0; var3 < var2; ++var3) {
          boolean var4 = var0.readUnsignedByte() == 1;
          int var5 = var0.readMedium();
          Object var6;
-         if(var4) {
+         if (var4) {
             var6 = new ObjectNode(var0.readStringCp1252NullTerminated());
          } else {
             var6 = new IntegerNode(var0.readInt());
@@ -752,10 +748,10 @@ public abstract class AbstractIndexCache {
       garbageValue = "308670894"
    )
    static boolean method4585() {
-      if(Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) {
-         while(Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) {
+      if (Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) {
+         while (Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) {
             IndexCacheLoader var0 = (IndexCacheLoader)Client.indexCacheLoaders.get(Client.indexCacheLoaderIndex);
-            if(!var0.__m_122()) {
+            if (!var0.method134()) {
                return false;
             }
 
@@ -767,4 +763,9 @@ public abstract class AbstractIndexCache {
          return true;
       }
    }
+
+   static {
+      gzipDecompressor = new GzipDecompressor();
+      field1 = 0;
+   }
 }
diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java
index 9748d7bcfc..0c7a6326c8 100644
--- a/runescape-client/src/main/java/AbstractSocket.java
+++ b/runescape-client/src/main/java/AbstractSocket.java
@@ -61,12 +61,12 @@ public abstract class AbstractSocket {
       garbageValue = "-15"
    )
    public static void method3488(int var0) {
-      class214.__hf_o = 1;
-      class214.__hf_u = null;
+      class214.field1129 = 1;
+      class214.field1130 = null;
       class30.musicTrackArchiveId = -1;
       GrandExchangeOffer.musicTrackFileId = -1;
-      WorldMapLabel.__aj_e = 0;
+      WorldMapLabel.field1039 = 0;
       RectangleMode.musicTrackBoolean = false;
-      FaceNormal.__el_x = var0;
+      FaceNormal.field344 = var0;
    }
 }
diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java
index 2ce70ecb9b..0d2b77c0d2 100644
--- a/runescape-client/src/main/java/AbstractUserComparator.java
+++ b/runescape-client/src/main/java/AbstractUserComparator.java
@@ -1,5 +1,4 @@
 import java.util.Comparator;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
@@ -8,18 +7,18 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("AbstractUserComparator")
 public abstract class AbstractUserComparator implements Comparator {
    @ObfuscatedName("f")
-   Comparator __f;
+   Comparator field3;
 
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "(Ljava/util/Comparator;B)V",
       garbageValue = "-2"
    )
-   final void __e_460(Comparator var1) {
-      if(this.__f == null) {
-         this.__f = var1;
-      } else if(this.__f instanceof AbstractUserComparator) {
-         ((AbstractUserComparator)this.__f).__e_460(var1);
+   final void method11(Comparator var1) {
+      if (this.field3 == null) {
+         this.field3 = var1;
+      } else if (this.field3 instanceof AbstractUserComparator) {
+         ((AbstractUserComparator)this.field3).method11(var1);
       }
 
    }
@@ -29,12 +28,12 @@ public abstract class AbstractUserComparator implements Comparator {
       signature = "(Ljs;Ljs;I)I",
       garbageValue = "-962181316"
    )
-   protected final int __x_461(User var1, User var2) {
-      return this.__f == null?0:this.__f.compare(var1, var2);
+   protected final int method12(User var1, User var2) {
+      return this.field3 == null ? 0 : this.field3.compare(var1, var2);
    }
 
    @ObfuscatedName("equals")
-   public boolean __equals_462(Object var1) {
+   public boolean method13(Object var1) {
       return super.equals(var1);
    }
 
@@ -44,22 +43,22 @@ public abstract class AbstractUserComparator implements Comparator {
       garbageValue = "2048322935"
    )
    static void method5437(int var0) {
-      if(var0 == -1 && !Client.__client_qq) {
+      if (var0 == -1 && !Client.field107) {
          class214.midiPcmStream.clear();
-         class214.__hf_o = 1;
-         class214.__hf_u = null;
-      } else if(var0 != -1 && var0 != Client.__client_qy && Client.__client_qf != 0 && !Client.__client_qq) {
+         class214.field1129 = 1;
+         class214.field1130 = null;
+      } else if (var0 != -1 && var0 != Client.field112 && Client.field128 != 0 && !Client.field107) {
          IndexCache var1 = UserComparator3.indexCache6;
-         int var2 = Client.__client_qf;
-         class214.__hf_o = 1;
-         class214.__hf_u = var1;
+         int var2 = Client.field128;
+         class214.field1129 = 1;
+         class214.field1130 = var1;
          class30.musicTrackArchiveId = var0;
          GrandExchangeOffer.musicTrackFileId = 0;
-         WorldMapLabel.__aj_e = var2;
+         WorldMapLabel.field1039 = var2;
          RectangleMode.musicTrackBoolean = false;
-         FaceNormal.__el_x = 2;
+         FaceNormal.field344 = 2;
       }
 
-      Client.__client_qy = var0;
+      Client.field112 = var0;
    }
 }
diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java
index f98c6c3107..b6ed56b3b4 100644
--- a/runescape-client/src/main/java/AbstractWorldMapIcon.java
+++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java
@@ -11,7 +11,7 @@ public abstract class AbstractWorldMapIcon {
    @ObfuscatedGetter(
       intValue = -1942470229
    )
-   static int __ak_qj;
+   static int field4;
    @ObfuscatedName("ka")
    @ObfuscatedGetter(
       intValue = -1734004743
@@ -34,12 +34,12 @@ public abstract class AbstractWorldMapIcon {
    @ObfuscatedGetter(
       intValue = -521086143
    )
-   int __e;
+   int field5;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = -1065362217
    )
-   int __x;
+   int field6;
 
    @ObfuscatedSignature(
       signature = "(Lhu;Lhu;)V"
@@ -54,36 +54,36 @@ public abstract class AbstractWorldMapIcon {
       signature = "(I)I",
       garbageValue = "1990181988"
    )
-   public abstract int __m_15();
+   public abstract int vmethod395();
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "(I)Laj;",
       garbageValue = "1159446036"
    )
-   abstract WorldMapLabel __f_16();
+   abstract WorldMapLabel vmethod396();
 
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "(B)I",
       garbageValue = "75"
    )
-   abstract int __q_17();
+   abstract int vmethod397();
 
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "(I)I",
       garbageValue = "-1558233611"
    )
-   abstract int __w_18();
+   abstract int vmethod398();
 
    @ObfuscatedName("y")
    @ObfuscatedSignature(
       signature = "(IIB)Z",
       garbageValue = "-63"
    )
-   boolean __y_66(int var1, int var2) {
-      return this.__b_68(var1, var2)?true:this.__c_69(var1, var2);
+   boolean method18(int var1, int var2) {
+      return this.method20(var1, var2) ? true : this.method21(var1, var2);
    }
 
    @ObfuscatedName("h")
@@ -91,8 +91,8 @@ public abstract class AbstractWorldMapIcon {
       signature = "(I)Z",
       garbageValue = "1150380891"
    )
-   boolean __h_67() {
-      return this.__m_15() >= 0;
+   boolean method19() {
+      return this.vmethod395() >= 0;
    }
 
    @ObfuscatedName("b")
@@ -100,44 +100,45 @@ public abstract class AbstractWorldMapIcon {
       signature = "(III)Z",
       garbageValue = "484201257"
    )
-   boolean __b_68(int var1, int var2) {
-      if(!this.__h_67()) {
+   boolean method20(int var1, int var2) {
+      if (!this.method19()) {
          return false;
       } else {
-         WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.__m_15());
-         int var4 = this.__q_17();
-         int var5 = this.__w_18();
+         WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.vmethod395());
+         int var4 = this.vmethod397();
+         int var5 = this.vmethod398();
          switch(var3.field3287.field3528) {
          case 0:
-            if(var1 < this.__e - var4 / 2 || var1 > var4 / 2 + this.__e) {
-               return false;
+            if (var1 >= this.field5 - var4 / 2 && var1 <= var4 / 2 + this.field5) {
+               break;
             }
-            break;
+
+            return false;
          case 1:
-            if(var1 >= this.__e && var1 < var4 + this.__e) {
+            if (var1 >= this.field5 && var1 < var4 + this.field5) {
                break;
             }
 
             return false;
          case 2:
-            if(var1 <= this.__e - var4 || var1 > this.__e) {
+            if (var1 <= this.field5 - var4 || var1 > this.field5) {
                return false;
             }
          }
 
          switch(var3.field3301.field3275) {
          case 0:
-            if(var2 <= this.__x - var5 || var2 > this.__x) {
+            if (var2 <= this.field6 - var5 || var2 > this.field6) {
                return false;
             }
             break;
          case 1:
-            if(var2 < this.__x - var5 / 2 || var2 > var5 / 2 + this.__x) {
+            if (var2 < this.field6 - var5 / 2 || var2 > var5 / 2 + this.field6) {
                return false;
             }
             break;
          case 2:
-            if(var2 < this.__x || var2 >= var5 + this.__x) {
+            if (var2 < this.field6 || var2 >= var5 + this.field6) {
                return false;
             }
          }
@@ -151,9 +152,9 @@ public abstract class AbstractWorldMapIcon {
       signature = "(III)Z",
       garbageValue = "1201712205"
    )
-   boolean __c_69(int var1, int var2) {
-      WorldMapLabel var3 = this.__f_16();
-      return var3 == null?false:(var1 >= this.__e - var3.width / 2 && var1 <= var3.width / 2 + this.__e?var2 >= this.__x && var2 <= var3.height + this.__x:false);
+   boolean method21(int var1, int var2) {
+      WorldMapLabel var3 = this.vmethod396();
+      return var3 == null ? false : (var1 >= this.field5 - var3.width / 2 && var1 <= var3.width / 2 + this.field5 ? var2 >= this.field6 && var2 <= var3.height + this.field6 : false);
    }
 
    @ObfuscatedName("es")
@@ -164,6 +165,6 @@ public abstract class AbstractWorldMapIcon {
    static void method625(IndexCache var0, String var1) {
       IndexCacheLoader var2 = new IndexCacheLoader(var0, var1);
       Client.indexCacheLoaders.add(var2);
-      Client.__client_sx += var2.__q;
+      Client.field140 += var2.field408;
    }
 }
diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java
index cf25c7a265..2426fcb1e9 100644
--- a/runescape-client/src/main/java/AccessFile.java
+++ b/runescape-client/src/main/java/AccessFile.java
@@ -16,12 +16,12 @@ public final class AccessFile {
    @ObfuscatedGetter(
       intValue = -1762891465
    )
-   static int __dk_o;
+   static int field7;
    @ObfuscatedName("lm")
    @ObfuscatedSignature(
       signature = "Lho;"
    )
-   static Widget __dk_lm;
+   static Widget field8;
    @ObfuscatedName("m")
    @Export("file")
    RandomAccessFile file;
@@ -39,11 +39,11 @@ public final class AccessFile {
    long index;
 
    public AccessFile(File var1, String var2, long var3) throws IOException {
-      if(var3 == -1L) {
+      if (var3 == -1L) {
          var3 = Long.MAX_VALUE;
       }
 
-      if(var1.length() >= var3) {
+      if (var1.length() >= var3) {
          var1.delete();
       }
 
@@ -51,7 +51,7 @@ public final class AccessFile {
       this.capacity = var3;
       this.index = 0L;
       int var5 = this.file.read();
-      if(var5 != -1 && !var2.equals("r")) {
+      if (var5 != -1 && !var2.equals("r")) {
          this.file.seek(0L);
          this.file.write(var5);
       }
@@ -73,7 +73,7 @@ public final class AccessFile {
    )
    @Export("write")
    public final void write(byte[] var1, int var2, int var3) throws IOException {
-      if((long)var3 + this.index > this.capacity) {
+      if ((long)var3 + this.index > this.capacity) {
          this.file.seek(this.capacity + 1L);
          this.file.write(1);
          throw new EOFException();
@@ -100,12 +100,11 @@ public final class AccessFile {
    )
    @Export("closeSync")
    public final void closeSync(boolean var1) throws IOException {
-      if(this.file != null) {
-         if(var1) {
+      if (this.file != null) {
+         if (var1) {
             try {
                this.file.getFD().sync();
             } catch (SyncFailedException var3) {
-               ;
             }
          }
 
@@ -133,7 +132,7 @@ public final class AccessFile {
    @Export("read")
    public final int read(byte[] var1, int var2, int var3) throws IOException {
       int var4 = this.file.read(var1, var2, var3);
-      if(var4 > 0) {
+      if (var4 > 0) {
          this.index += (long)var4;
       }
 
@@ -141,8 +140,8 @@ public final class AccessFile {
    }
 
    @ObfuscatedName("finalize")
-   protected void __finalize_211() throws Throwable {
-      if(this.file != null) {
+   protected void method22() throws Throwable {
+      if (this.file != null) {
          System.out.println("");
          this.close();
       }
@@ -155,31 +154,31 @@ public final class AccessFile {
       garbageValue = "-728558316"
    )
    @Export("addWidgetItemMenuItem")
-   static final void addWidgetItemMenuItem(Widget widget, ItemDefinition definition, int var2, int actionIndex, boolean shiftClick) {
-      String[] var5 = definition.inventoryActions;
-      byte opcode = -1;
-      String action = null;
-      if(var5 != null && var5[actionIndex] != null) {
-         if(actionIndex == 0) {
-            opcode = 33;
-         } else if(actionIndex == 1) {
-            opcode = 34;
-         } else if(actionIndex == 2) {
-            opcode = 35;
-         } else if(actionIndex == 3) {
-            opcode = 36;
+   static final void addWidgetItemMenuItem(Widget var0, ItemDefinition var1, int var2, int var3, boolean var4) {
+      String[] var5 = var1.inventoryActions;
+      byte var6 = -1;
+      String var7 = null;
+      if (var5 != null && var5[var3] != null) {
+         if (var3 == 0) {
+            var6 = 33;
+         } else if (var3 == 1) {
+            var6 = 34;
+         } else if (var3 == 2) {
+            var6 = 35;
+         } else if (var3 == 3) {
+            var6 = 36;
          } else {
-            opcode = 37;
+            var6 = 37;
          }
 
-         action = var5[actionIndex];
-      } else if(actionIndex == 4) {
-         opcode = 37;
-         action = "Drop";
+         var7 = var5[var3];
+      } else if (var3 == 4) {
+         var6 = 37;
+         var7 = "Drop";
       }
 
-      if(opcode != -1 && action != null) {
-         class16.insertMenuItem(action, BufferedFile.colorStartTag(0xff9040) + definition.name, opcode, definition.id, var2, widget.id, shiftClick);
+      if (var6 != -1 && var7 != null) {
+         class16.insertMenuItem(var7, BufferedFile.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4);
       }
 
    }
diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java
index ecd96ba288..1f1be493c2 100644
--- a/runescape-client/src/main/java/Actor.java
+++ b/runescape-client/src/main/java/Actor.java
@@ -23,9 +23,9 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = 1439711403
    )
-   int __ac;
+   int field9;
    @ObfuscatedName("ay")
-   boolean __ay;
+   boolean field10;
    @ObfuscatedName("ah")
    @ObfuscatedGetter(
       intValue = -1357622739
@@ -93,7 +93,7 @@ public abstract class Actor extends Entity {
    @Export("isAutoChatting")
    boolean isAutoChatting;
    @ObfuscatedName("az")
-   boolean __az;
+   boolean field11;
    @ObfuscatedName("au")
    @ObfuscatedGetter(
       intValue = 137508815
@@ -149,7 +149,7 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = 139384875
    )
-   int __bc;
+   int field12;
    @ObfuscatedName("bo")
    @ObfuscatedGetter(
       intValue = 1614854211
@@ -196,7 +196,7 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = -1523249259
    )
-   int __bj;
+   int field13;
    @ObfuscatedName("bi")
    @ObfuscatedGetter(
       intValue = -220610999
@@ -219,7 +219,7 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = 886371765
    )
-   int __bt;
+   int field14;
    @ObfuscatedName("bp")
    @ObfuscatedGetter(
       intValue = -779457309
@@ -230,37 +230,37 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = 2121599561
    )
-   int __bf;
+   int field15;
    @ObfuscatedName("bh")
    @ObfuscatedGetter(
       intValue = 280591281
    )
-   int __bh;
+   int field16;
    @ObfuscatedName("be")
    @ObfuscatedGetter(
       intValue = 837989037
    )
-   int __be;
+   int field17;
    @ObfuscatedName("bv")
    @ObfuscatedGetter(
       intValue = -1857513783
    )
-   int __bv;
+   int field18;
    @ObfuscatedName("bw")
    @ObfuscatedGetter(
       intValue = -1630403001
    )
-   int __bw;
+   int field19;
    @ObfuscatedName("cr")
    @ObfuscatedGetter(
       intValue = 1367256299
    )
-   int __cr;
+   int field20;
    @ObfuscatedName("cv")
    @ObfuscatedGetter(
       intValue = -1723834619
    )
-   int __cv;
+   int field21;
    @ObfuscatedName("ce")
    @ObfuscatedGetter(
       intValue = 2051334073
@@ -283,12 +283,12 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = 1252341007
    )
-   int __cm;
+   int field22;
    @ObfuscatedName("cj")
    @ObfuscatedGetter(
       intValue = -336931157
    )
-   int __cj;
+   int field23;
    @ObfuscatedName("cu")
    @ObfuscatedGetter(
       intValue = -2033082375
@@ -308,15 +308,15 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = -1583514013
    )
-   int __cq;
+   int field24;
    @ObfuscatedName("ch")
    @ObfuscatedGetter(
       intValue = 1584102533
    )
-   int __ch;
+   int field25;
 
    Actor() {
-      this.__ay = false;
+      this.field10 = false;
       this.size = 1;
       this.idleSequence = -1;
       this.turnLeftSequence = -1;
@@ -327,7 +327,7 @@ public abstract class Actor extends Entity {
       this.walkTurnRightSequence = -1;
       this.runSequence = -1;
       this.overheadText = null;
-      this.__az = false;
+      this.field11 = false;
       this.overheadTextCyclesRemaining = 100;
       this.overheadTextColor = 0;
       this.overheadTextEffect = 0;
@@ -340,7 +340,7 @@ public abstract class Actor extends Entity {
       this.healthBars = new IterableNodeDeque();
       this.targetIndex = -1;
       this.false0 = false;
-      this.__bc = -1;
+      this.field12 = -1;
       this.movementSequence = -1;
       this.movementFrame = 0;
       this.movementFrameCycle = 0;
@@ -348,20 +348,20 @@ public abstract class Actor extends Entity {
       this.sequenceFrame = 0;
       this.sequenceFrameCycle = 0;
       this.sequenceDelay = 0;
-      this.__bj = 0;
+      this.field13 = 0;
       this.spotAnimation = -1;
       this.spotAnimationFrame = 0;
       this.spotAnimationFrameCycle = 0;
       this.npcCycle = 0;
       this.defaultHeight = 200;
-      this.__cm = 0;
-      this.__cj = 32;
+      this.field22 = 0;
+      this.field23 = 32;
       this.pathLength = 0;
       this.pathX = new int[10];
       this.pathY = new int[10];
       this.pathTraversed = new byte[10];
-      this.__cq = 0;
-      this.__ch = 0;
+      this.field24 = 0;
+      this.field25 = 0;
    }
 
    @ObfuscatedName("z")
@@ -379,9 +379,9 @@ public abstract class Actor extends Entity {
       signature = "(I)V",
       garbageValue = "1415393262"
    )
-   final void __bb_143() {
+   final void method23() {
       this.pathLength = 0;
-      this.__ch = 0;
+      this.field25 = 0;
    }
 
    @ObfuscatedName("bs")
@@ -395,8 +395,8 @@ public abstract class Actor extends Entity {
       boolean var8 = true;
 
       int var9;
-      for(var9 = 0; var9 < 4; ++var9) {
-         if(this.hitSplatCycles[var9] > var5) {
+      for (var9 = 0; var9 < 4; ++var9) {
+         if (this.hitSplatCycles[var9] > var5) {
             var7 = false;
          } else {
             var8 = false;
@@ -406,63 +406,64 @@ public abstract class Actor extends Entity {
       var9 = -1;
       int var10 = -1;
       int var11 = 0;
-      if(var1 >= 0) {
+      if (var1 >= 0) {
          HitSplatDefinition var12 = LoginScreenAnimation.getHitSplatDefinition(var1);
-         var10 = var12.__c;
-         var11 = var12.__i;
+         var10 = var12.field396;
+         var11 = var12.field387;
       }
 
       int var14;
-      if(var8) {
-         if(var10 == -1) {
+      if (var8) {
+         if (var10 == -1) {
             return;
          }
 
          var9 = 0;
          var14 = 0;
-         if(var10 == 0) {
+         if (var10 == 0) {
             var14 = this.hitSplatCycles[0];
-         } else if(var10 == 1) {
+         } else if (var10 == 1) {
             var14 = this.hitSplatValues[0];
          }
 
-         for(int var13 = 1; var13 < 4; ++var13) {
-            if(var10 == 0) {
-               if(this.hitSplatCycles[var13] < var14) {
+         for (int var13 = 1; var13 < 4; ++var13) {
+            if (var10 == 0) {
+               if (this.hitSplatCycles[var13] < var14) {
                   var9 = var13;
                   var14 = this.hitSplatCycles[var13];
                }
-            } else if(var10 == 1 && this.hitSplatValues[var13] < var14) {
+            } else if (var10 == 1 && this.hitSplatValues[var13] < var14) {
                var9 = var13;
                var14 = this.hitSplatValues[var13];
             }
          }
 
-         if(var10 == 1 && var14 >= var2) {
+         if (var10 == 1 && var14 >= var2) {
             return;
          }
       } else {
-         if(var7) {
+         if (var7) {
             this.hitSplatCount = 0;
          }
 
-         for(var14 = 0; var14 < 4; ++var14) {
+         for (var14 = 0; var14 < 4; ++var14) {
             byte var15 = this.hitSplatCount;
             this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4);
-            if(this.hitSplatCycles[var15] <= var5) {
+            if (this.hitSplatCycles[var15] <= var5) {
                var9 = var15;
                break;
             }
          }
       }
 
-      if(var9 >= 0) {
+      if (var9 >= 0) {
          this.hitSplatTypes[var9] = var1;
          this.hitSplatValues[var9] = var2;
          this.hitSplatTypes2[var9] = var3;
          this.hitSplatValues2[var9] = var4;
          this.hitSplatCycles[var9] = var5 + var11 + var6;
       }
+
    }
 
    @ObfuscatedName("bq")
@@ -472,59 +473,59 @@ public abstract class Actor extends Entity {
    )
    @Export("addHealthBar")
    final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) {
-      HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
-      HealthBarDefinition var7;
-      if(var8 != null) {
-         var7 = var8;
+      HealthBarDefinition var7 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
+      HealthBarDefinition var8;
+      if (var7 != null) {
+         var8 = var7;
       } else {
-         byte[] var9 = HealthBarDefinition.__ii_m.takeRecord(33, var1);
-         var8 = new HealthBarDefinition();
-         if(var9 != null) {
-            var8.read(new Buffer(var9));
+         byte[] var9 = HealthBarDefinition.field379.takeRecord(33, var1);
+         var7 = new HealthBarDefinition();
+         if (var9 != null) {
+            var7.read(new Buffer(var9));
          }
 
-         HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1);
-         var7 = var8;
+         HealthBarDefinition.HealthBarDefinition_cached.put(var7, (long)var1);
+         var8 = var7;
       }
 
-      var8 = var7;
+      var7 = var8;
       HealthBar var14 = null;
       HealthBar var10 = null;
-      int var11 = var7.int2;
+      int var11 = var8.int2;
       int var12 = 0;
 
       HealthBar var13;
-      for(var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) {
+      for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) {
          ++var12;
-         if(var13.definition.__o == var8.__o) {
+         if (var13.definition.field381 == var7.field381) {
             var13.put(var2 + var4, var5, var6, var3);
             return;
          }
 
-         if(var13.definition.int1 <= var8.int1) {
+         if (var13.definition.int1 <= var7.int1) {
             var14 = var13;
          }
 
-         if(var13.definition.int2 > var11) {
+         if (var13.definition.int2 > var11) {
             var10 = var13;
             var11 = var13.definition.int2;
          }
       }
 
-      if(var10 != null || var12 < 4) {
-         var13 = new HealthBar(var8);
-         if(var14 == null) {
+      if (var10 != null || var12 < 4) {
+         var13 = new HealthBar(var7);
+         if (var14 == null) {
             this.healthBars.addLast(var13);
          } else {
             IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14);
          }
 
          var13.put(var2 + var4, var5, var6, var3);
-         if(var12 >= 4) {
+         if (var12 >= 4) {
             var10.remove();
          }
-
       }
+
    }
 
    @ObfuscatedName("bn")
@@ -534,25 +535,25 @@ public abstract class Actor extends Entity {
    )
    @Export("removeHealthBar")
    final void removeHealthBar(int var1) {
-      HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
-      HealthBarDefinition var2;
-      if(var3 != null) {
-         var2 = var3;
+      HealthBarDefinition var2 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
+      HealthBarDefinition var3;
+      if (var2 != null) {
+         var3 = var2;
       } else {
-         byte[] var4 = HealthBarDefinition.__ii_m.takeRecord(33, var1);
-         var3 = new HealthBarDefinition();
-         if(var4 != null) {
-            var3.read(new Buffer(var4));
+         byte[] var4 = HealthBarDefinition.field379.takeRecord(33, var1);
+         var2 = new HealthBarDefinition();
+         if (var4 != null) {
+            var2.read(new Buffer(var4));
          }
 
-         HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1);
-         var2 = var3;
+         HealthBarDefinition.HealthBarDefinition_cached.put(var2, (long)var1);
+         var3 = var2;
       }
 
-      var3 = var2;
+      var2 = var3;
 
-      for(HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) {
-         if(var3 == var5.definition) {
+      for (HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) {
+         if (var2 == var5.definition) {
             var5.remove();
             return;
          }
@@ -566,754 +567,754 @@ public abstract class Actor extends Entity {
       garbageValue = "493234011"
    )
    @Export("menuAction")
-   static final void menuAction(int arg1, int arg2, int opcode, int arg0, String action, String target, int mouseX, int mouseY) {
-      if(opcode >= 2000) {
-         opcode -= 2000;
+   static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) {
+      if (var2 >= 2000) {
+         var2 -= 2000;
       }
 
       PacketBufferNode var8;
-      if(opcode == 1) {
-         Client.mouseCrossX = mouseX;
-         Client.mouseCrossY = mouseY;
+      if (var2 == 1) {
+         Client.mouseCrossX = var6;
+         Client.mouseCrossY = var7;
          Client.mouseCrossColor = 2;
          Client.mouseCrossState = 0;
-         Client.destinationX = arg1;
-         Client.destinationY = arg2;
-         var8 = Interpreter.method1915(ClientPacket.__gs_an, Client.packetWriter.isaacCipher);
-         var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2);
+         Client.destinationX = var0;
+         Client.destinationY = var1;
+         var8 = Interpreter.method1915(ClientPacket.field266, Client.packetWriter.isaacCipher);
+         var8.packetBuffer.method64(GraphicsObject.baseY + var1);
          var8.packetBuffer.writeShortLE(HealthBarDefinition.selectedItemSlot);
-         var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
+         var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
          var8.packetBuffer.writeIntLE(ServerPacket.selectedItemWidget);
-         var8.packetBuffer.__bx_323(arg1 + class50.baseX);
-         var8.packetBuffer.writeShort(arg0);
+         var8.packetBuffer.method64(var0 + class50.baseX);
+         var8.packetBuffer.writeShort(var3);
          var8.packetBuffer.writeShortLE(MenuAction.selectedItemId);
-         Client.packetWriter.__q_167(var8);
-      } else if(opcode == 2) {
-         Client.mouseCrossX = mouseX;
-         Client.mouseCrossY = mouseY;
+         Client.packetWriter.method241(var8);
+      } else if (var2 == 2) {
+         Client.mouseCrossX = var6;
+         Client.mouseCrossY = var7;
          Client.mouseCrossColor = 2;
          Client.mouseCrossState = 0;
-         Client.destinationX = arg1;
-         Client.destinationY = arg2;
-         var8 = Interpreter.method1915(ClientPacket.__gs_cg, Client.packetWriter.isaacCipher);
-         var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-         var8.packetBuffer.writeShort(arg1 + class50.baseX);
-         var8.packetBuffer.__bo_322(arg0);
-         var8.packetBuffer.writeIntLE16(ServerBuild.__iy_lo);
-         var8.packetBuffer.writeShort(Client.__client_lc);
-         var8.packetBuffer.writeShortLE(GraphicsObject.baseY + arg2);
-         Client.packetWriter.__q_167(var8);
-      } else if(opcode == 3) {
-         Client.mouseCrossX = mouseX;
-         Client.mouseCrossY = mouseY;
+         Client.destinationX = var0;
+         Client.destinationY = var1;
+         var8 = Interpreter.method1915(ClientPacket.field314, Client.packetWriter.isaacCipher);
+         var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+         var8.packetBuffer.writeShort(var0 + class50.baseX);
+         var8.packetBuffer.method63(var3);
+         var8.packetBuffer.writeIntLE16(ServerBuild.field788);
+         var8.packetBuffer.writeShort(Client.field220);
+         var8.packetBuffer.writeShortLE(GraphicsObject.baseY + var1);
+         Client.packetWriter.method241(var8);
+      } else if (var2 == 3) {
+         Client.mouseCrossX = var6;
+         Client.mouseCrossY = var7;
          Client.mouseCrossColor = 2;
          Client.mouseCrossState = 0;
-         Client.destinationX = arg1;
-         Client.destinationY = arg2;
-         var8 = Interpreter.method1915(ClientPacket.__gs_d, Client.packetWriter.isaacCipher);
-         var8.packetBuffer.writeShort(GraphicsObject.baseY + arg2);
-         var8.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-         var8.packetBuffer.__bo_322(arg0);
-         var8.packetBuffer.__bx_323(arg1 + class50.baseX);
-         Client.packetWriter.__q_167(var8);
-      } else if(opcode == 4) {
-         Client.mouseCrossX = mouseX;
-         Client.mouseCrossY = mouseY;
+         Client.destinationX = var0;
+         Client.destinationY = var1;
+         var8 = Interpreter.method1915(ClientPacket.field232, Client.packetWriter.isaacCipher);
+         var8.packetBuffer.writeShort(GraphicsObject.baseY + var1);
+         var8.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+         var8.packetBuffer.method63(var3);
+         var8.packetBuffer.method64(var0 + class50.baseX);
+         Client.packetWriter.method241(var8);
+      } else if (var2 == 4) {
+         Client.mouseCrossX = var6;
+         Client.mouseCrossY = var7;
          Client.mouseCrossColor = 2;
          Client.mouseCrossState = 0;
-         Client.destinationX = arg1;
-         Client.destinationY = arg2;
-         var8 = Interpreter.method1915(ClientPacket.__gs_cv, Client.packetWriter.isaacCipher);
-         var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-         var8.packetBuffer.writeShort(arg0);
-         var8.packetBuffer.writeShort(GraphicsObject.baseY + arg2);
-         var8.packetBuffer.writeShort(arg1 + class50.baseX);
-         Client.packetWriter.__q_167(var8);
-      } else if(opcode == 5) {
-         Client.mouseCrossX = mouseX;
-         Client.mouseCrossY = mouseY;
+         Client.destinationX = var0;
+         Client.destinationY = var1;
+         var8 = Interpreter.method1915(ClientPacket.field301, Client.packetWriter.isaacCipher);
+         var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+         var8.packetBuffer.writeShort(var3);
+         var8.packetBuffer.writeShort(GraphicsObject.baseY + var1);
+         var8.packetBuffer.writeShort(var0 + class50.baseX);
+         Client.packetWriter.method241(var8);
+      } else if (var2 == 5) {
+         Client.mouseCrossX = var6;
+         Client.mouseCrossY = var7;
          Client.mouseCrossColor = 2;
          Client.mouseCrossState = 0;
-         Client.destinationX = arg1;
-         Client.destinationY = arg2;
-         var8 = Interpreter.method1915(ClientPacket.__gs_cq, Client.packetWriter.isaacCipher);
-         var8.packetBuffer.__bx_323(arg1 + class50.baseX);
-         var8.packetBuffer.__bo_322(arg0);
-         var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2);
-         var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-         Client.packetWriter.__q_167(var8);
-      } else if(opcode == 6) {
-         Client.mouseCrossX = mouseX;
-         Client.mouseCrossY = mouseY;
+         Client.destinationX = var0;
+         Client.destinationY = var1;
+         var8 = Interpreter.method1915(ClientPacket.field311, Client.packetWriter.isaacCipher);
+         var8.packetBuffer.method64(var0 + class50.baseX);
+         var8.packetBuffer.method63(var3);
+         var8.packetBuffer.method64(GraphicsObject.baseY + var1);
+         var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+         Client.packetWriter.method241(var8);
+      } else if (var2 == 6) {
+         Client.mouseCrossX = var6;
+         Client.mouseCrossY = var7;
          Client.mouseCrossColor = 2;
          Client.mouseCrossState = 0;
-         Client.destinationX = arg1;
-         Client.destinationY = arg2;
-         var8 = Interpreter.method1915(ClientPacket.__gs_w, Client.packetWriter.isaacCipher);
-         var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-         var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2);
-         var8.packetBuffer.__bo_322(arg1 + class50.baseX);
-         var8.packetBuffer.writeShortLE(arg0);
-         Client.packetWriter.__q_167(var8);
+         Client.destinationX = var0;
+         Client.destinationY = var1;
+         var8 = Interpreter.method1915(ClientPacket.field225, Client.packetWriter.isaacCipher);
+         var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+         var8.packetBuffer.method63(GraphicsObject.baseY + var1);
+         var8.packetBuffer.method63(var0 + class50.baseX);
+         var8.packetBuffer.writeShortLE(var3);
+         Client.packetWriter.method241(var8);
       } else {
          PacketBufferNode var9;
-         Npc var13;
-         if(opcode == 7) {
-            var13 = Client.npcs[arg0];
-            if(var13 != null) {
-               Client.mouseCrossX = mouseX;
-               Client.mouseCrossY = mouseY;
+         NPC var10;
+         if (var2 == 7) {
+            var10 = Client.npcs[var3];
+            if (var10 != null) {
+               Client.mouseCrossX = var6;
+               Client.mouseCrossY = var7;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var9 = Interpreter.method1915(ClientPacket.__gs_r, Client.packetWriter.isaacCipher);
-               var9.packetBuffer.__bx_323(MenuAction.selectedItemId);
+               Client.destinationX = var0;
+               Client.destinationY = var1;
+               var9 = Interpreter.method1915(ClientPacket.field245, Client.packetWriter.isaacCipher);
+               var9.packetBuffer.method64(MenuAction.selectedItemId);
                var9.packetBuffer.writeShort(HealthBarDefinition.selectedItemSlot);
-               var9.packetBuffer.__bx_323(arg0);
-               var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
+               var9.packetBuffer.method64(var3);
+               var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
                var9.packetBuffer.writeInt(ServerPacket.selectedItemWidget);
-               Client.packetWriter.__q_167(var9);
+               Client.packetWriter.method241(var9);
             }
-         } else if(opcode == 8) {
-            var13 = Client.npcs[arg0];
-            if(var13 != null) {
-               Client.mouseCrossX = mouseX;
-               Client.mouseCrossY = mouseY;
+         } else if (var2 == 8) {
+            var10 = Client.npcs[var3];
+            if (var10 != null) {
+               Client.mouseCrossX = var6;
+               Client.mouseCrossY = var7;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var9 = Interpreter.method1915(ClientPacket.__gs_cb, Client.packetWriter.isaacCipher);
-               var9.packetBuffer.__bx_323(arg0);
-               var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               var9.packetBuffer.writeIntLE(ServerBuild.__iy_lo);
-               var9.packetBuffer.__bo_322(Client.__client_lc);
-               Client.packetWriter.__q_167(var9);
+               Client.destinationX = var0;
+               Client.destinationY = var1;
+               var9 = Interpreter.method1915(ClientPacket.field308, Client.packetWriter.isaacCipher);
+               var9.packetBuffer.method64(var3);
+               var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               var9.packetBuffer.writeIntLE(ServerBuild.field788);
+               var9.packetBuffer.method63(Client.field220);
+               Client.packetWriter.method241(var9);
             }
-         } else if(opcode == 9) {
-            var13 = Client.npcs[arg0];
-            if(var13 != null) {
-               Client.mouseCrossX = mouseX;
-               Client.mouseCrossY = mouseY;
+         } else if (var2 == 9) {
+            var10 = Client.npcs[var3];
+            if (var10 != null) {
+               Client.mouseCrossX = var6;
+               Client.mouseCrossY = var7;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var9 = Interpreter.method1915(ClientPacket.__gs_bt, Client.packetWriter.isaacCipher);
-               var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               var9.packetBuffer.writeShortLE(arg0);
-               Client.packetWriter.__q_167(var9);
+               Client.destinationX = var0;
+               Client.destinationY = var1;
+               var9 = Interpreter.method1915(ClientPacket.field293, Client.packetWriter.isaacCipher);
+               var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               var9.packetBuffer.writeShortLE(var3);
+               Client.packetWriter.method241(var9);
             }
-         } else if(opcode == 10) {
-            var13 = Client.npcs[arg0];
-            if(var13 != null) {
-               Client.mouseCrossX = mouseX;
-               Client.mouseCrossY = mouseY;
+         } else if (var2 == 10) {
+            var10 = Client.npcs[var3];
+            if (var10 != null) {
+               Client.mouseCrossX = var6;
+               Client.mouseCrossY = var7;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var9 = Interpreter.method1915(ClientPacket.__gs_f, Client.packetWriter.isaacCipher);
-               var9.packetBuffer.__bo_322(arg0);
-               var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               Client.packetWriter.__q_167(var9);
+               Client.destinationX = var0;
+               Client.destinationY = var1;
+               var9 = Interpreter.method1915(ClientPacket.field223, Client.packetWriter.isaacCipher);
+               var9.packetBuffer.method63(var3);
+               var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               Client.packetWriter.method241(var9);
             }
-         } else if(opcode == 11) {
-            var13 = Client.npcs[arg0];
-            if(var13 != null) {
-               Client.mouseCrossX = mouseX;
-               Client.mouseCrossY = mouseY;
+         } else if (var2 == 11) {
+            var10 = Client.npcs[var3];
+            if (var10 != null) {
+               Client.mouseCrossX = var6;
+               Client.mouseCrossY = var7;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var9 = Interpreter.method1915(ClientPacket.__gs_ah, Client.packetWriter.isaacCipher);
-               var9.packetBuffer.__bx_323(arg0);
-               var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               Client.packetWriter.__q_167(var9);
+               Client.destinationX = var0;
+               Client.destinationY = var1;
+               var9 = Interpreter.method1915(ClientPacket.field255, Client.packetWriter.isaacCipher);
+               var9.packetBuffer.method64(var3);
+               var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               Client.packetWriter.method241(var9);
             }
-         } else if(opcode == 12) {
-            var13 = Client.npcs[arg0];
-            if(var13 != null) {
-               Client.mouseCrossX = mouseX;
-               Client.mouseCrossY = mouseY;
+         } else if (var2 == 12) {
+            var10 = Client.npcs[var3];
+            if (var10 != null) {
+               Client.mouseCrossX = var6;
+               Client.mouseCrossY = var7;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var9 = Interpreter.method1915(ClientPacket.__gs_bc, Client.packetWriter.isaacCipher);
-               var9.packetBuffer.writeShort(arg0);
-               var9.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               Client.packetWriter.__q_167(var9);
+               Client.destinationX = var0;
+               Client.destinationY = var1;
+               var9 = Interpreter.method1915(ClientPacket.field281, Client.packetWriter.isaacCipher);
+               var9.packetBuffer.writeShort(var3);
+               var9.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               Client.packetWriter.method241(var9);
             }
-         } else if(opcode == 13) {
-            var13 = Client.npcs[arg0];
-            if(var13 != null) {
-               Client.mouseCrossX = mouseX;
-               Client.mouseCrossY = mouseY;
+         } else if (var2 == 13) {
+            var10 = Client.npcs[var3];
+            if (var10 != null) {
+               Client.mouseCrossX = var6;
+               Client.mouseCrossY = var7;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var9 = Interpreter.method1915(ClientPacket.__gs_ac, Client.packetWriter.isaacCipher);
-               var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               var9.packetBuffer.__bo_322(arg0);
-               Client.packetWriter.__q_167(var9);
+               Client.destinationX = var0;
+               Client.destinationY = var1;
+               var9 = Interpreter.method1915(ClientPacket.field253, Client.packetWriter.isaacCipher);
+               var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               var9.packetBuffer.method63(var3);
+               Client.packetWriter.method241(var9);
             }
          } else {
-            Player var15;
-            if(opcode == 14) {
-               var15 = Client.players[arg0];
-               if(var15 != null) {
-                  Client.mouseCrossX = mouseX;
-                  Client.mouseCrossY = mouseY;
+            Player var11;
+            if (var2 == 14) {
+               var11 = Client.players[var3];
+               if (var11 != null) {
+                  Client.mouseCrossX = var6;
+                  Client.mouseCrossY = var7;
                   Client.mouseCrossColor = 2;
                   Client.mouseCrossState = 0;
-                  Client.destinationX = arg1;
-                  Client.destinationY = arg2;
-                  var9 = Interpreter.method1915(ClientPacket.__gs_cy, Client.packetWriter.isaacCipher);
-                  var9.packetBuffer.__bx_323(HealthBarDefinition.selectedItemSlot);
-                  var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
+                  Client.destinationX = var0;
+                  Client.destinationY = var1;
+                  var9 = Interpreter.method1915(ClientPacket.field303, Client.packetWriter.isaacCipher);
+                  var9.packetBuffer.method64(HealthBarDefinition.selectedItemSlot);
+                  var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
                   var9.packetBuffer.writeIntME(ServerPacket.selectedItemWidget);
-                  var9.packetBuffer.writeShort(arg0);
+                  var9.packetBuffer.writeShort(var3);
                   var9.packetBuffer.writeShort(MenuAction.selectedItemId);
-                  Client.packetWriter.__q_167(var9);
+                  Client.packetWriter.method241(var9);
                }
-            } else if(opcode == 15) {
-               var15 = Client.players[arg0];
-               if(var15 != null) {
-                  Client.mouseCrossX = mouseX;
-                  Client.mouseCrossY = mouseY;
+            } else if (var2 == 15) {
+               var11 = Client.players[var3];
+               if (var11 != null) {
+                  Client.mouseCrossX = var6;
+                  Client.mouseCrossY = var7;
                   Client.mouseCrossColor = 2;
                   Client.mouseCrossState = 0;
-                  Client.destinationX = arg1;
-                  Client.destinationY = arg2;
-                  var9 = Interpreter.method1915(ClientPacket.__gs_bq, Client.packetWriter.isaacCipher);
-                  var9.packetBuffer.writeIntLE16(ServerBuild.__iy_lo);
-                  var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                  var9.packetBuffer.__bo_322(Client.__client_lc);
-                  var9.packetBuffer.writeShort(arg0);
-                  Client.packetWriter.__q_167(var9);
+                  Client.destinationX = var0;
+                  Client.destinationY = var1;
+                  var9 = Interpreter.method1915(ClientPacket.field277, Client.packetWriter.isaacCipher);
+                  var9.packetBuffer.writeIntLE16(ServerBuild.field788);
+                  var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                  var9.packetBuffer.method63(Client.field220);
+                  var9.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var9);
                }
-            } else if(opcode == 16) {
-               Client.mouseCrossX = mouseX;
-               Client.mouseCrossY = mouseY;
+            } else if (var2 == 16) {
+               Client.mouseCrossX = var6;
+               Client.mouseCrossY = var7;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var8 = Interpreter.method1915(ClientPacket.__gs_t, Client.packetWriter.isaacCipher);
+               Client.destinationX = var0;
+               Client.destinationY = var1;
+               var8 = Interpreter.method1915(ClientPacket.field240, Client.packetWriter.isaacCipher);
                var8.packetBuffer.writeIntME(ServerPacket.selectedItemWidget);
-               var8.packetBuffer.__bx_323(MenuAction.selectedItemId);
-               var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
+               var8.packetBuffer.method64(MenuAction.selectedItemId);
+               var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
                var8.packetBuffer.writeShortLE(HealthBarDefinition.selectedItemSlot);
-               var8.packetBuffer.__bx_323(arg0);
-               var8.packetBuffer.__bx_323(arg1 + class50.baseX);
-               var8.packetBuffer.writeShortLE(GraphicsObject.baseY + arg2);
-               Client.packetWriter.__q_167(var8);
-            } else if(opcode == 17) {
-               Client.mouseCrossX = mouseX;
-               Client.mouseCrossY = mouseY;
+               var8.packetBuffer.method64(var3);
+               var8.packetBuffer.method64(var0 + class50.baseX);
+               var8.packetBuffer.writeShortLE(GraphicsObject.baseY + var1);
+               Client.packetWriter.method241(var8);
+            } else if (var2 == 17) {
+               Client.mouseCrossX = var6;
+               Client.mouseCrossY = var7;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var8 = Interpreter.method1915(ClientPacket.__gs_bb, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.writeIntME(ServerBuild.__iy_lo);
-               var8.packetBuffer.writeShort(Client.__client_lc);
-               var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2);
-               var8.packetBuffer.__bo_322(arg1 + class50.baseX);
-               var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               var8.packetBuffer.writeShortLE(arg0);
-               Client.packetWriter.__q_167(var8);
-            } else if(opcode == 18) {
-               Client.mouseCrossX = mouseX;
-               Client.mouseCrossY = mouseY;
+               Client.destinationX = var0;
+               Client.destinationY = var1;
+               var8 = Interpreter.method1915(ClientPacket.field275, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.writeIntME(ServerBuild.field788);
+               var8.packetBuffer.writeShort(Client.field220);
+               var8.packetBuffer.method63(GraphicsObject.baseY + var1);
+               var8.packetBuffer.method63(var0 + class50.baseX);
+               var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               var8.packetBuffer.writeShortLE(var3);
+               Client.packetWriter.method241(var8);
+            } else if (var2 == 18) {
+               Client.mouseCrossX = var6;
+               Client.mouseCrossY = var7;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var8 = Interpreter.method1915(ClientPacket.__gs_u, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2);
-               var8.packetBuffer.writeShortLE(arg0);
-               var8.packetBuffer.writeShortLE(arg1 + class50.baseX);
-               var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               Client.packetWriter.__q_167(var8);
-            } else if(opcode == 19) {
-               Client.mouseCrossX = mouseX;
-               Client.mouseCrossY = mouseY;
+               Client.destinationX = var0;
+               Client.destinationY = var1;
+               var8 = Interpreter.method1915(ClientPacket.field227, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.method64(GraphicsObject.baseY + var1);
+               var8.packetBuffer.writeShortLE(var3);
+               var8.packetBuffer.writeShortLE(var0 + class50.baseX);
+               var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               Client.packetWriter.method241(var8);
+            } else if (var2 == 19) {
+               Client.mouseCrossX = var6;
+               Client.mouseCrossY = var7;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var8 = Interpreter.method1915(ClientPacket.__gs_bh, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.__bx_323(arg0);
-               var8.packetBuffer.__bo_322(arg1 + class50.baseX);
-               var8.packetBuffer.writeShort(GraphicsObject.baseY + arg2);
-               var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               Client.packetWriter.__q_167(var8);
-            } else if(opcode == 20) {
-               Client.mouseCrossX = mouseX;
-               Client.mouseCrossY = mouseY;
+               Client.destinationX = var0;
+               Client.destinationY = var1;
+               var8 = Interpreter.method1915(ClientPacket.field296, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.method64(var3);
+               var8.packetBuffer.method63(var0 + class50.baseX);
+               var8.packetBuffer.writeShort(GraphicsObject.baseY + var1);
+               var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               Client.packetWriter.method241(var8);
+            } else if (var2 == 20) {
+               Client.mouseCrossX = var6;
+               Client.mouseCrossY = var7;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var8 = Interpreter.method1915(ClientPacket.__gs_g, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.writeShortLE(GraphicsObject.baseY + arg2);
-               var8.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               var8.packetBuffer.writeShortLE(arg1 + class50.baseX);
-               var8.packetBuffer.writeShortLE(arg0);
-               Client.packetWriter.__q_167(var8);
-            } else if(opcode == 21) {
-               Client.mouseCrossX = mouseX;
-               Client.mouseCrossY = mouseY;
+               Client.destinationX = var0;
+               Client.destinationY = var1;
+               var8 = Interpreter.method1915(ClientPacket.field228, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.writeShortLE(GraphicsObject.baseY + var1);
+               var8.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               var8.packetBuffer.writeShortLE(var0 + class50.baseX);
+               var8.packetBuffer.writeShortLE(var3);
+               Client.packetWriter.method241(var8);
+            } else if (var2 == 21) {
+               Client.mouseCrossX = var6;
+               Client.mouseCrossY = var7;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var8 = Interpreter.method1915(ClientPacket.__gs_av, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2);
-               var8.packetBuffer.writeShortLE(arg0);
-               var8.packetBuffer.writeShort(arg1 + class50.baseX);
-               var8.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               Client.packetWriter.__q_167(var8);
-            } else if(opcode == 22) {
-               Client.mouseCrossX = mouseX;
-               Client.mouseCrossY = mouseY;
+               Client.destinationX = var0;
+               Client.destinationY = var1;
+               var8 = Interpreter.method1915(ClientPacket.field251, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.method63(GraphicsObject.baseY + var1);
+               var8.packetBuffer.writeShortLE(var3);
+               var8.packetBuffer.writeShort(var0 + class50.baseX);
+               var8.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               Client.packetWriter.method241(var8);
+            } else if (var2 == 22) {
+               Client.mouseCrossX = var6;
+               Client.mouseCrossY = var7;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var8 = Interpreter.method1915(ClientPacket.__gs_ai, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               var8.packetBuffer.__bx_323(arg0);
-               var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2);
-               var8.packetBuffer.writeShort(arg1 + class50.baseX);
-               Client.packetWriter.__q_167(var8);
-            } else if(opcode == 23) {
-               if(Client.isMenuOpen) {
-                  class65.scene.__as_250();
+               Client.destinationX = var0;
+               Client.destinationY = var1;
+               var8 = Interpreter.method1915(ClientPacket.field273, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               var8.packetBuffer.method64(var3);
+               var8.packetBuffer.method63(GraphicsObject.baseY + var1);
+               var8.packetBuffer.writeShort(var0 + class50.baseX);
+               Client.packetWriter.method241(var8);
+            } else if (var2 == 23) {
+               if (Client.isMenuOpen) {
+                  class65.scene.method296();
                } else {
-                  class65.scene.menuOpen(SoundSystem.plane, arg1, arg2, true);
+                  class65.scene.menuOpen(SoundSystem.plane, var0, var1, true);
                }
             } else {
-               PacketBufferNode var10;
-               Widget var16;
-               if(opcode == 24) {
-                  var16 = Huffman.getWidget(arg2);
-                  boolean var12 = true;
-                  if(var16.contentType > 0) {
-                     var12 = ViewportMouse.method2957(var16);
+               PacketBufferNode var12;
+               Widget var13;
+               if (var2 == 24) {
+                  var13 = Huffman.getWidget(var1);
+                  boolean var14 = true;
+                  if (var13.contentType > 0) {
+                     var14 = ViewportMouse.method2957(var13);
                   }
 
-                  if(var12) {
-                     var10 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher);
-                     var10.packetBuffer.writeInt(arg2);
-                     Client.packetWriter.__q_167(var10);
+                  if (var14) {
+                     var12 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher);
+                     var12.packetBuffer.writeInt(var1);
+                     Client.packetWriter.method241(var12);
                   }
                } else {
-                  if(opcode == 25) {
-                     var16 = class204.getWidgetChild(arg2, arg1);
-                     if(var16 != null) {
+                  if (var2 == 25) {
+                     var13 = class204.getWidgetChild(var1, var0);
+                     if (var13 != null) {
                         Player.method1281();
-                        class25.method350(arg2, arg1, class211.method4107(class1.getWidgetClickMask(var16)), var16.itemId);
+                        class25.method350(var1, var0, class211.method4107(class1.getWidgetClickMask(var13)), var13.itemId);
                         Client.isItemSelected = 0;
-                        Client.selectedSpellActionName = class198.method3745(var16);
-                        if(Client.selectedSpellActionName == null) {
+                        Client.selectedSpellActionName = class198.method3745(var13);
+                        if (Client.selectedSpellActionName == null) {
                            Client.selectedSpellActionName = "null";
                         }
 
-                        if(var16.isIf3) {
-                           Client.selectedSpellName = var16.dataText + BufferedFile.colorStartTag(16777215);
+                        if (var13.isIf3) {
+                           Client.selectedSpellName = var13.dataText + BufferedFile.colorStartTag(16777215);
                         } else {
-                           Client.selectedSpellName = BufferedFile.colorStartTag(65280) + var16.spellName + BufferedFile.colorStartTag(16777215);
+                           Client.selectedSpellName = BufferedFile.colorStartTag(65280) + var13.spellName + BufferedFile.colorStartTag(16777215);
                         }
                      }
 
                      return;
                   }
 
-                  if(opcode == 26) {
+                  if (var2 == 26) {
                      WorldMapLabelSize.method198();
                   } else {
-                     int var11;
-                     Widget var14;
-                     if(opcode == 28) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.writeInt(arg2);
-                        Client.packetWriter.__q_167(var8);
-                        var14 = Huffman.getWidget(arg2);
-                        if(var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) {
-                           var11 = var14.cs1Instructions[0][1];
-                           Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11];
-                           IndexCache.method4703(var11);
+                     Widget var15;
+                     int var17;
+                     if (var2 == 28) {
+                        var8 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.writeInt(var1);
+                        Client.packetWriter.method241(var8);
+                        var15 = Huffman.getWidget(var1);
+                        if (var15.cs1Instructions != null && var15.cs1Instructions[0][0] == 5) {
+                           var17 = var15.cs1Instructions[0][1];
+                           Varps.Varps_main[var17] = 1 - Varps.Varps_main[var17];
+                           IndexCache.method4703(var17);
                         }
-                     } else if(opcode == 29) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.writeInt(arg2);
-                        Client.packetWriter.__q_167(var8);
-                        var14 = Huffman.getWidget(arg2);
-                        if(var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) {
-                           var11 = var14.cs1Instructions[0][1];
-                           if(Varps.Varps_main[var11] != var14.cs1ComparisonValues[0]) {
-                              Varps.Varps_main[var11] = var14.cs1ComparisonValues[0];
-                              IndexCache.method4703(var11);
+                     } else if (var2 == 29) {
+                        var8 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.writeInt(var1);
+                        Client.packetWriter.method241(var8);
+                        var15 = Huffman.getWidget(var1);
+                        if (var15.cs1Instructions != null && var15.cs1Instructions[0][0] == 5) {
+                           var17 = var15.cs1Instructions[0][1];
+                           if (Varps.Varps_main[var17] != var15.cs1ComparisonValues[0]) {
+                              Varps.Varps_main[var17] = var15.cs1ComparisonValues[0];
+                              IndexCache.method4703(var17);
                            }
                         }
-                     } else if(opcode == 30) {
-                        if(Client.__client_mo == null) {
-                           TilePaint.method3060(arg2, arg1);
-                           Client.__client_mo = class204.getWidgetChild(arg2, arg1);
-                           class22.method295(Client.__client_mo);
+                     } else if (var2 == 30) {
+                        if (Client.field127 == null) {
+                           TilePaint.method3060(var1, var0);
+                           Client.field127 = class204.getWidgetChild(var1, var0);
+                           class22.method295(Client.field127);
                         }
-                     } else if(opcode == 31) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_bu, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.writeIntME(arg2);
+                     } else if (var2 == 31) {
+                        var8 = Interpreter.method1915(ClientPacket.field285, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.writeIntME(var1);
                         var8.packetBuffer.writeIntLE16(ServerPacket.selectedItemWidget);
-                        var8.packetBuffer.__bx_323(HealthBarDefinition.selectedItemSlot);
+                        var8.packetBuffer.method64(HealthBarDefinition.selectedItemSlot);
                         var8.packetBuffer.writeShortLE(MenuAction.selectedItemId);
-                        var8.packetBuffer.writeShortLE(arg1);
-                        var8.packetBuffer.__bx_323(arg0);
-                        Client.packetWriter.__q_167(var8);
-                        Client.__client_ju = 0;
-                        BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                        Client.__client_jz = arg1;
-                     } else if(opcode == 32) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_q, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.writeIntME(ServerBuild.__iy_lo);
-                        var8.packetBuffer.writeInt(arg2);
-                        var8.packetBuffer.writeShort(arg1);
-                        var8.packetBuffer.writeShortLE(arg0);
-                        var8.packetBuffer.writeShortLE(Client.__client_lc);
-                        Client.packetWriter.__q_167(var8);
-                        Client.__client_ju = 0;
-                        BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                        Client.__client_jz = arg1;
-                     } else if(opcode == 33) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_ck, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.writeShortLE(arg0);
-                        var8.packetBuffer.writeIntME(arg2);
-                        var8.packetBuffer.writeShort(arg1);
-                        Client.packetWriter.__q_167(var8);
-                        Client.__client_ju = 0;
-                        BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                        Client.__client_jz = arg1;
-                     } else if(opcode == 34) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_cc, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.__bo_322(arg0);
-                        var8.packetBuffer.writeIntLE16(arg2);
-                        var8.packetBuffer.__bx_323(arg1);
-                        Client.packetWriter.__q_167(var8);
-                        Client.__client_ju = 0;
-                        BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                        Client.__client_jz = arg1;
-                     } else if(opcode == 35) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_bp, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.writeIntLE(arg2);
-                        var8.packetBuffer.__bx_323(arg1);
-                        var8.packetBuffer.__bx_323(arg0);
-                        Client.packetWriter.__q_167(var8);
-                        Client.__client_ju = 0;
-                        BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                        Client.__client_jz = arg1;
-                     } else if(opcode == 36) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_l, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.__bx_323(arg0);
-                        var8.packetBuffer.writeInt(arg2);
-                        var8.packetBuffer.__bx_323(arg1);
-                        Client.packetWriter.__q_167(var8);
-                        Client.__client_ju = 0;
-                        BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                        Client.__client_jz = arg1;
-                     } else if(opcode == 37) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_bd, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.writeInt(arg2);
-                        var8.packetBuffer.writeShort(arg1);
-                        var8.packetBuffer.writeShort(arg0);
-                        Client.packetWriter.__q_167(var8);
-                        Client.__client_ju = 0;
-                        BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                        Client.__client_jz = arg1;
+                        var8.packetBuffer.writeShortLE(var0);
+                        var8.packetBuffer.method64(var3);
+                        Client.packetWriter.method241(var8);
+                        Client.field203 = 0;
+                        BoundaryObject.field40 = Huffman.getWidget(var1);
+                        Client.field204 = var0;
+                     } else if (var2 == 32) {
+                        var8 = Interpreter.method1915(ClientPacket.field224, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.writeIntME(ServerBuild.field788);
+                        var8.packetBuffer.writeInt(var1);
+                        var8.packetBuffer.writeShort(var0);
+                        var8.packetBuffer.writeShortLE(var3);
+                        var8.packetBuffer.writeShortLE(Client.field220);
+                        Client.packetWriter.method241(var8);
+                        Client.field203 = 0;
+                        BoundaryObject.field40 = Huffman.getWidget(var1);
+                        Client.field204 = var0;
+                     } else if (var2 == 33) {
+                        var8 = Interpreter.method1915(ClientPacket.field309, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.writeShortLE(var3);
+                        var8.packetBuffer.writeIntME(var1);
+                        var8.packetBuffer.writeShort(var0);
+                        Client.packetWriter.method241(var8);
+                        Client.field203 = 0;
+                        BoundaryObject.field40 = Huffman.getWidget(var1);
+                        Client.field204 = var0;
+                     } else if (var2 == 34) {
+                        var8 = Interpreter.method1915(ClientPacket.field320, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.method63(var3);
+                        var8.packetBuffer.writeIntLE16(var1);
+                        var8.packetBuffer.method64(var0);
+                        Client.packetWriter.method241(var8);
+                        Client.field203 = 0;
+                        BoundaryObject.field40 = Huffman.getWidget(var1);
+                        Client.field204 = var0;
+                     } else if (var2 == 35) {
+                        var8 = Interpreter.method1915(ClientPacket.field294, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.writeIntLE(var1);
+                        var8.packetBuffer.method64(var0);
+                        var8.packetBuffer.method64(var3);
+                        Client.packetWriter.method241(var8);
+                        Client.field203 = 0;
+                        BoundaryObject.field40 = Huffman.getWidget(var1);
+                        Client.field204 = var0;
+                     } else if (var2 == 36) {
+                        var8 = Interpreter.method1915(ClientPacket.field229, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.method64(var3);
+                        var8.packetBuffer.writeInt(var1);
+                        var8.packetBuffer.method64(var0);
+                        Client.packetWriter.method241(var8);
+                        Client.field203 = 0;
+                        BoundaryObject.field40 = Huffman.getWidget(var1);
+                        Client.field204 = var0;
+                     } else if (var2 == 37) {
+                        var8 = Interpreter.method1915(ClientPacket.field280, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.writeInt(var1);
+                        var8.packetBuffer.writeShort(var0);
+                        var8.packetBuffer.writeShort(var3);
+                        Client.packetWriter.method241(var8);
+                        Client.field203 = 0;
+                        BoundaryObject.field40 = Huffman.getWidget(var1);
+                        Client.field204 = var0;
                      } else {
-                        if(opcode == 38) {
+                        if (var2 == 38) {
                            Player.method1281();
-                           var16 = Huffman.getWidget(arg2);
+                           var13 = Huffman.getWidget(var1);
                            Client.isItemSelected = 1;
-                           HealthBarDefinition.selectedItemSlot = arg1;
-                           ServerPacket.selectedItemWidget = arg2;
-                           MenuAction.selectedItemId = arg0;
-                           class22.method295(var16);
-                           Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(arg0).name + BufferedFile.colorStartTag(16777215);
-                           if(Client.selectedItemName == null) {
+                           HealthBarDefinition.selectedItemSlot = var0;
+                           ServerPacket.selectedItemWidget = var1;
+                           MenuAction.selectedItemId = var3;
+                           class22.method295(var13);
+                           Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(var3).name + BufferedFile.colorStartTag(16777215);
+                           if (Client.selectedItemName == null) {
                               Client.selectedItemName = "null";
                            }
 
                            return;
                         }
 
-                        if(opcode == 39) {
-                           var8 = Interpreter.method1915(ClientPacket.__gs_au, Client.packetWriter.isaacCipher);
-                           var8.packetBuffer.__bx_323(arg0);
-                           var8.packetBuffer.writeIntLE16(arg2);
-                           var8.packetBuffer.writeShortLE(arg1);
-                           Client.packetWriter.__q_167(var8);
-                           Client.__client_ju = 0;
-                           BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                           Client.__client_jz = arg1;
-                        } else if(opcode == 40) {
-                           var8 = Interpreter.method1915(ClientPacket.__gs_ag, Client.packetWriter.isaacCipher);
-                           var8.packetBuffer.writeIntLE16(arg2);
-                           var8.packetBuffer.writeShortLE(arg1);
-                           var8.packetBuffer.__bo_322(arg0);
-                           Client.packetWriter.__q_167(var8);
-                           Client.__client_ju = 0;
-                           BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                           Client.__client_jz = arg1;
-                        } else if(opcode == 41) {
-                           var8 = Interpreter.method1915(ClientPacket.__gs_bl, Client.packetWriter.isaacCipher);
-                           var8.packetBuffer.writeIntLE(arg2);
-                           var8.packetBuffer.__bo_322(arg1);
-                           var8.packetBuffer.writeShort(arg0);
-                           Client.packetWriter.__q_167(var8);
-                           Client.__client_ju = 0;
-                           BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                           Client.__client_jz = arg1;
-                        } else if(opcode == 42) {
-                           var8 = Interpreter.method1915(ClientPacket.__gs_bm, Client.packetWriter.isaacCipher);
-                           var8.packetBuffer.writeInt(arg2);
-                           var8.packetBuffer.__bo_322(arg1);
-                           var8.packetBuffer.writeShort(arg0);
-                           Client.packetWriter.__q_167(var8);
-                           Client.__client_ju = 0;
-                           BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                           Client.__client_jz = arg1;
-                        } else if(opcode == 43) {
-                           var8 = Interpreter.method1915(ClientPacket.__gs_ay, Client.packetWriter.isaacCipher);
-                           var8.packetBuffer.writeShort(arg0);
-                           var8.packetBuffer.writeIntME(arg2);
-                           var8.packetBuffer.writeShort(arg1);
-                           Client.packetWriter.__q_167(var8);
-                           Client.__client_ju = 0;
-                           BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                           Client.__client_jz = arg1;
-                        } else if(opcode == 44) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
-                              Client.mouseCrossX = mouseX;
-                              Client.mouseCrossY = mouseY;
+                        if (var2 == 39) {
+                           var8 = Interpreter.method1915(ClientPacket.field268, Client.packetWriter.isaacCipher);
+                           var8.packetBuffer.method64(var3);
+                           var8.packetBuffer.writeIntLE16(var1);
+                           var8.packetBuffer.writeShortLE(var0);
+                           Client.packetWriter.method241(var8);
+                           Client.field203 = 0;
+                           BoundaryObject.field40 = Huffman.getWidget(var1);
+                           Client.field204 = var0;
+                        } else if (var2 == 40) {
+                           var8 = Interpreter.method1915(ClientPacket.field248, Client.packetWriter.isaacCipher);
+                           var8.packetBuffer.writeIntLE16(var1);
+                           var8.packetBuffer.writeShortLE(var0);
+                           var8.packetBuffer.method63(var3);
+                           Client.packetWriter.method241(var8);
+                           Client.field203 = 0;
+                           BoundaryObject.field40 = Huffman.getWidget(var1);
+                           Client.field204 = var0;
+                        } else if (var2 == 41) {
+                           var8 = Interpreter.method1915(ClientPacket.field287, Client.packetWriter.isaacCipher);
+                           var8.packetBuffer.writeIntLE(var1);
+                           var8.packetBuffer.method63(var0);
+                           var8.packetBuffer.writeShort(var3);
+                           Client.packetWriter.method241(var8);
+                           Client.field203 = 0;
+                           BoundaryObject.field40 = Huffman.getWidget(var1);
+                           Client.field204 = var0;
+                        } else if (var2 == 42) {
+                           var8 = Interpreter.method1915(ClientPacket.field286, Client.packetWriter.isaacCipher);
+                           var8.packetBuffer.writeInt(var1);
+                           var8.packetBuffer.method63(var0);
+                           var8.packetBuffer.writeShort(var3);
+                           Client.packetWriter.method241(var8);
+                           Client.field203 = 0;
+                           BoundaryObject.field40 = Huffman.getWidget(var1);
+                           Client.field204 = var0;
+                        } else if (var2 == 43) {
+                           var8 = Interpreter.method1915(ClientPacket.field254, Client.packetWriter.isaacCipher);
+                           var8.packetBuffer.writeShort(var3);
+                           var8.packetBuffer.writeIntME(var1);
+                           var8.packetBuffer.writeShort(var0);
+                           Client.packetWriter.method241(var8);
+                           Client.field203 = 0;
+                           BoundaryObject.field40 = Huffman.getWidget(var1);
+                           Client.field204 = var0;
+                        } else if (var2 == 44) {
+                           var11 = Client.players[var3];
+                           if (var11 != null) {
+                              Client.mouseCrossX = var6;
+                              Client.mouseCrossY = var7;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_ao, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.writeShort(arg0);
-                              var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = var0;
+                              Client.destinationY = var1;
+                              var9 = Interpreter.method1915(ClientPacket.field269, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.writeShort(var3);
+                              var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              Client.packetWriter.method241(var9);
                            }
-                        } else if(opcode == 45) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
-                              Client.mouseCrossX = mouseX;
-                              Client.mouseCrossY = mouseY;
+                        } else if (var2 == 45) {
+                           var11 = Client.players[var3];
+                           if (var11 != null) {
+                              Client.mouseCrossX = var6;
+                              Client.mouseCrossY = var7;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_bn, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              var9.packetBuffer.__bo_322(arg0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = var0;
+                              Client.destinationY = var1;
+                              var9 = Interpreter.method1915(ClientPacket.field278, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              var9.packetBuffer.method63(var3);
+                              Client.packetWriter.method241(var9);
                            }
-                        } else if(opcode == 46) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
-                              Client.mouseCrossX = mouseX;
-                              Client.mouseCrossY = mouseY;
+                        } else if (var2 == 46) {
+                           var11 = Client.players[var3];
+                           if (var11 != null) {
+                              Client.mouseCrossX = var6;
+                              Client.mouseCrossY = var7;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_by, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.__bo_322(arg0);
-                              var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = var0;
+                              Client.destinationY = var1;
+                              var9 = Interpreter.method1915(ClientPacket.field284, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.method63(var3);
+                              var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              Client.packetWriter.method241(var9);
                            }
-                        } else if(opcode == 47) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
-                              Client.mouseCrossX = mouseX;
-                              Client.mouseCrossY = mouseY;
+                        } else if (var2 == 47) {
+                           var11 = Client.players[var3];
+                           if (var11 != null) {
+                              Client.mouseCrossX = var6;
+                              Client.mouseCrossY = var7;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_aq, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.__bx_323(arg0);
-                              var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = var0;
+                              Client.destinationY = var1;
+                              var9 = Interpreter.method1915(ClientPacket.field249, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.method64(var3);
+                              var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              Client.packetWriter.method241(var9);
                            }
-                        } else if(opcode == 48) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
-                              Client.mouseCrossX = mouseX;
-                              Client.mouseCrossY = mouseY;
+                        } else if (var2 == 48) {
+                           var11 = Client.players[var3];
+                           if (var11 != null) {
+                              Client.mouseCrossX = var6;
+                              Client.mouseCrossY = var7;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_cm, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              var9.packetBuffer.__bo_322(arg0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = var0;
+                              Client.destinationY = var1;
+                              var9 = Interpreter.method1915(ClientPacket.field305, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              var9.packetBuffer.method63(var3);
+                              Client.packetWriter.method241(var9);
                            }
-                        } else if(opcode == 49) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
-                              Client.mouseCrossX = mouseX;
-                              Client.mouseCrossY = mouseY;
+                        } else if (var2 == 49) {
+                           var11 = Client.players[var3];
+                           if (var11 != null) {
+                              Client.mouseCrossX = var6;
+                              Client.mouseCrossY = var7;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_cf, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.__bo_322(arg0);
-                              var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = var0;
+                              Client.destinationY = var1;
+                              var9 = Interpreter.method1915(ClientPacket.field315, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.method63(var3);
+                              var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              Client.packetWriter.method241(var9);
                            }
-                        } else if(opcode == 50) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
-                              Client.mouseCrossX = mouseX;
-                              Client.mouseCrossY = mouseY;
+                        } else if (var2 == 50) {
+                           var11 = Client.players[var3];
+                           if (var11 != null) {
+                              Client.mouseCrossX = var6;
+                              Client.mouseCrossY = var7;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_be, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              var9.packetBuffer.writeShortLE(arg0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = var0;
+                              Client.destinationY = var1;
+                              var9 = Interpreter.method1915(ClientPacket.field297, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              var9.packetBuffer.writeShortLE(var3);
+                              Client.packetWriter.method241(var9);
                            }
-                        } else if(opcode == 51) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
-                              Client.mouseCrossX = mouseX;
-                              Client.mouseCrossY = mouseY;
+                        } else if (var2 == 51) {
+                           var11 = Client.players[var3];
+                           if (var11 != null) {
+                              Client.mouseCrossX = var6;
+                              Client.mouseCrossY = var7;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_af, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              var9.packetBuffer.__bx_323(arg0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = var0;
+                              Client.destinationY = var1;
+                              var9 = Interpreter.method1915(ClientPacket.field272, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              var9.packetBuffer.method64(var3);
+                              Client.packetWriter.method241(var9);
                            }
                         } else {
-                           label921: {
-                              if(opcode != 57) {
-                                 if(opcode == 58) {
-                                    var16 = class204.getWidgetChild(arg2, arg1);
-                                    if(var16 != null) {
-                                       var9 = Interpreter.method1915(ClientPacket.__gs_cs, Client.packetWriter.isaacCipher);
-                                       var9.packetBuffer.writeShortLE(Client.__client_lc);
-                                       var9.packetBuffer.writeIntLE16(arg2);
-                                       var9.packetBuffer.writeShortLE(Client.__client_mh);
-                                       var9.packetBuffer.__bx_323(arg1);
-                                       var9.packetBuffer.writeInt(ServerBuild.__iy_lo);
-                                       var9.packetBuffer.__bx_323(var16.itemId);
-                                       Client.packetWriter.__q_167(var9);
+                           label415: {
+                              if (var2 != 57) {
+                                 if (var2 == 58) {
+                                    var13 = class204.getWidgetChild(var1, var0);
+                                    if (var13 != null) {
+                                       var9 = Interpreter.method1915(ClientPacket.field304, Client.packetWriter.isaacCipher);
+                                       var9.packetBuffer.writeShortLE(Client.field220);
+                                       var9.packetBuffer.writeIntLE16(var1);
+                                       var9.packetBuffer.writeShortLE(Client.field157);
+                                       var9.packetBuffer.method64(var0);
+                                       var9.packetBuffer.writeInt(ServerBuild.field788);
+                                       var9.packetBuffer.method64(var13.itemId);
+                                       Client.packetWriter.method241(var9);
                                     }
-                                    break label921;
+                                    break label415;
                                  }
 
-                                 if(opcode == 1001) {
-                                    Client.mouseCrossX = mouseX;
-                                    Client.mouseCrossY = mouseY;
+                                 if (var2 == 1001) {
+                                    Client.mouseCrossX = var6;
+                                    Client.mouseCrossY = var7;
                                     Client.mouseCrossColor = 2;
                                     Client.mouseCrossState = 0;
-                                    Client.destinationX = arg1;
-                                    Client.destinationY = arg2;
-                                    var8 = Interpreter.method1915(ClientPacket.__gs_cp, Client.packetWriter.isaacCipher);
-                                    var8.packetBuffer.writeShort(arg0);
-                                    var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                                    var8.packetBuffer.__bo_322(arg1 + class50.baseX);
-                                    var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2);
-                                    Client.packetWriter.__q_167(var8);
-                                    break label921;
+                                    Client.destinationX = var0;
+                                    Client.destinationY = var1;
+                                    var8 = Interpreter.method1915(ClientPacket.field316, Client.packetWriter.isaacCipher);
+                                    var8.packetBuffer.writeShort(var3);
+                                    var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                                    var8.packetBuffer.method63(var0 + class50.baseX);
+                                    var8.packetBuffer.method64(GraphicsObject.baseY + var1);
+                                    Client.packetWriter.method241(var8);
+                                    break label415;
                                  }
 
-                                 if(opcode == 1002) {
-                                    Client.mouseCrossX = mouseX;
-                                    Client.mouseCrossY = mouseY;
+                                 if (var2 == 1002) {
+                                    Client.mouseCrossX = var6;
+                                    Client.mouseCrossY = var7;
                                     Client.mouseCrossColor = 2;
                                     Client.mouseCrossState = 0;
-                                    var8 = Interpreter.method1915(ClientPacket.__gs_al, Client.packetWriter.isaacCipher);
-                                    var8.packetBuffer.__bo_322(arg0);
-                                    Client.packetWriter.__q_167(var8);
-                                    break label921;
+                                    var8 = Interpreter.method1915(ClientPacket.field258, Client.packetWriter.isaacCipher);
+                                    var8.packetBuffer.method63(var3);
+                                    Client.packetWriter.method241(var8);
+                                    break label415;
                                  }
 
-                                 if(opcode == 1003) {
-                                    Client.mouseCrossX = mouseX;
-                                    Client.mouseCrossY = mouseY;
+                                 if (var2 == 1003) {
+                                    Client.mouseCrossX = var6;
+                                    Client.mouseCrossY = var7;
                                     Client.mouseCrossColor = 2;
                                     Client.mouseCrossState = 0;
-                                    var13 = Client.npcs[arg0];
-                                    if(var13 != null) {
-                                       NpcDefinition var17 = var13.definition;
-                                       if(var17.transforms != null) {
-                                          var17 = var17.transform();
+                                    var10 = Client.npcs[var3];
+                                    if (var10 != null) {
+                                       NPCDefinition var16 = var10.definition;
+                                       if (var16.transforms != null) {
+                                          var16 = var16.transform();
                                        }
 
-                                       if(var17 != null) {
-                                          var10 = Interpreter.method1915(ClientPacket.__gs_ar, Client.packetWriter.isaacCipher);
-                                          var10.packetBuffer.__bo_322(var17.id);
-                                          Client.packetWriter.__q_167(var10);
+                                       if (var16 != null) {
+                                          var12 = Interpreter.method1915(ClientPacket.field252, Client.packetWriter.isaacCipher);
+                                          var12.packetBuffer.method63(var16.id);
+                                          Client.packetWriter.method241(var12);
                                        }
                                     }
-                                    break label921;
+                                    break label415;
                                  }
 
-                                 if(opcode == 1004) {
-                                    Client.mouseCrossX = mouseX;
-                                    Client.mouseCrossY = mouseY;
+                                 if (var2 == 1004) {
+                                    Client.mouseCrossX = var6;
+                                    Client.mouseCrossY = var7;
                                     Client.mouseCrossColor = 2;
                                     Client.mouseCrossState = 0;
-                                    var8 = Interpreter.method1915(ClientPacket.__gs_p, Client.packetWriter.isaacCipher);
-                                    var8.packetBuffer.writeShortLE(arg0);
-                                    Client.packetWriter.__q_167(var8);
-                                    break label921;
+                                    var8 = Interpreter.method1915(ClientPacket.field246, Client.packetWriter.isaacCipher);
+                                    var8.packetBuffer.writeShortLE(var3);
+                                    Client.packetWriter.method241(var8);
+                                    break label415;
                                  }
 
-                                 if(opcode == 1005) {
-                                    var16 = Huffman.getWidget(arg2);
-                                    if(var16 != null && var16.itemQuantities[arg1] >= 100000) {
-                                       WorldMapIcon1.method219(27, "", var16.itemQuantities[arg1] + " x " + Skills.getItemDefinition(arg0).name);
+                                 if (var2 == 1005) {
+                                    var13 = Huffman.getWidget(var1);
+                                    if (var13 != null && var13.itemQuantities[var0] >= 100000) {
+                                       WorldMapIcon1.method219(27, "", var13.itemQuantities[var0] + " x " + Skills.getItemDefinition(var3).name);
                                     } else {
-                                       var9 = Interpreter.method1915(ClientPacket.__gs_p, Client.packetWriter.isaacCipher);
-                                       var9.packetBuffer.writeShortLE(arg0);
-                                       Client.packetWriter.__q_167(var9);
+                                       var9 = Interpreter.method1915(ClientPacket.field246, Client.packetWriter.isaacCipher);
+                                       var9.packetBuffer.writeShortLE(var3);
+                                       Client.packetWriter.method241(var9);
                                     }
 
-                                    Client.__client_ju = 0;
-                                    BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                                    Client.__client_jz = arg1;
-                                    break label921;
+                                    Client.field203 = 0;
+                                    BoundaryObject.field40 = Huffman.getWidget(var1);
+                                    Client.field204 = var0;
+                                    break label415;
                                  }
 
-                                 if(opcode != 1007) {
-                                    if(opcode == 1008 || opcode == 1011 || opcode == 1010 || opcode == 1009 || opcode == 1012) {
-                                       class60.worldMap0.menuAction(opcode, arg0, new TileLocation(arg1), new TileLocation(arg2));
+                                 if (var2 != 1007) {
+                                    if (var2 == 1008 || var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1012) {
+                                       class60.worldMap0.menuAction(var2, var3, new TileLocation(var0), new TileLocation(var1));
                                     }
-                                    break label921;
+                                    break label415;
                                  }
                               }
 
-                              var16 = class204.getWidgetChild(arg2, arg1);
-                              if(var16 != null) {
-                                 class171.method3494(arg0, arg2, arg1, var16.itemId, target);
+                              var13 = class204.getWidgetChild(var1, var0);
+                              if (var13 != null) {
+                                 class171.method3494(var3, var1, var0, var13.itemId, var5);
                               }
                            }
                         }
@@ -1324,17 +1325,17 @@ public abstract class Actor extends Entity {
          }
       }
 
-      if(Client.isItemSelected != 0) {
+      if (Client.isItemSelected != 0) {
          Client.isItemSelected = 0;
          class22.method295(Huffman.getWidget(ServerPacket.selectedItemWidget));
       }
 
-      if(Client.isSpellSelected) {
+      if (Client.isSpellSelected) {
          Player.method1281();
       }
 
-      if(BoundaryObject.__ej_jv != null && Client.__client_ju == 0) {
-         class22.method295(BoundaryObject.__ej_jv);
+      if (BoundaryObject.field40 != null && Client.field203 == 0) {
+         class22.method295(BoundaryObject.field40);
       }
 
    }
diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java
index 826dd5043d..da9442b259 100644
--- a/runescape-client/src/main/java/Animation.java
+++ b/runescape-client/src/main/java/Animation.java
@@ -7,13 +7,13 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Animation")
 public class Animation {
    @ObfuscatedName("m")
-   static int[] __dz_m;
+   static int[] field26;
    @ObfuscatedName("f")
-   static int[] __dz_f;
+   static int[] field27;
    @ObfuscatedName("q")
-   static int[] __dz_q;
+   static int[] field28;
    @ObfuscatedName("w")
-   static int[] __dz_w;
+   static int[] field29;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Lek;"
@@ -39,13 +39,6 @@ public class Animation {
    @Export("hasAlphaTransform")
    boolean hasAlphaTransform;
 
-   static {
-      __dz_m = new int[500];
-      __dz_f = new int[500];
-      __dz_q = new int[500];
-      __dz_w = new int[500];
-   }
-
    @ObfuscatedSignature(
       signature = "([BLek;)V"
    )
@@ -63,55 +56,55 @@ public class Animation {
       var4.index = var5 + var3.index;
 
       int var8;
-      for(var8 = 0; var8 < var5; ++var8) {
+      for (var8 = 0; var8 < var5; ++var8) {
          int var9 = var3.readUnsignedByte();
-         if(var9 > 0) {
-            if(this.skeleton.transformTypes[var8] != 0) {
-               for(int var10 = var8 - 1; var10 > var6; --var10) {
-                  if(this.skeleton.transformTypes[var10] == 0) {
-                     __dz_m[var7] = var10;
-                     __dz_f[var7] = 0;
-                     __dz_q[var7] = 0;
-                     __dz_w[var7] = 0;
+         if (var9 > 0) {
+            if (this.skeleton.transformTypes[var8] != 0) {
+               for (int var10 = var8 - 1; var10 > var6; --var10) {
+                  if (this.skeleton.transformTypes[var10] == 0) {
+                     field26[var7] = var10;
+                     field27[var7] = 0;
+                     field28[var7] = 0;
+                     field29[var7] = 0;
                      ++var7;
                      break;
                   }
                }
             }
 
-            __dz_m[var7] = var8;
+            field26[var7] = var8;
             short var11 = 0;
-            if(this.skeleton.transformTypes[var8] == 3) {
+            if (this.skeleton.transformTypes[var8] == 3) {
                var11 = 128;
             }
 
-            if((var9 & 1) != 0) {
-               __dz_f[var7] = var4.__ab_306();
+            if ((var9 & 1) != 0) {
+               field27[var7] = var4.method47();
             } else {
-               __dz_f[var7] = var11;
+               field27[var7] = var11;
             }
 
-            if((var9 & 2) != 0) {
-               __dz_q[var7] = var4.__ab_306();
+            if ((var9 & 2) != 0) {
+               field28[var7] = var4.method47();
             } else {
-               __dz_q[var7] = var11;
+               field28[var7] = var11;
             }
 
-            if((var9 & 4) != 0) {
-               __dz_w[var7] = var4.__ab_306();
+            if ((var9 & 4) != 0) {
+               field29[var7] = var4.method47();
             } else {
-               __dz_w[var7] = var11;
+               field29[var7] = var11;
             }
 
             var6 = var8;
             ++var7;
-            if(this.skeleton.transformTypes[var8] == 5) {
+            if (this.skeleton.transformTypes[var8] == 5) {
                this.hasAlphaTransform = true;
             }
          }
       }
 
-      if(var1.length != var4.index) {
+      if (var1.length != var4.index) {
          throw new RuntimeException();
       } else {
          this.transformCount = var7;
@@ -120,13 +113,20 @@ public class Animation {
          this.transformYs = new int[var7];
          this.transformZs = new int[var7];
 
-         for(var8 = 0; var8 < var7; ++var8) {
-            this.transformSkeletonLabels[var8] = __dz_m[var8];
-            this.transformXs[var8] = __dz_f[var8];
-            this.transformYs[var8] = __dz_q[var8];
-            this.transformZs[var8] = __dz_w[var8];
+         for (var8 = 0; var8 < var7; ++var8) {
+            this.transformSkeletonLabels[var8] = field26[var8];
+            this.transformXs[var8] = field27[var8];
+            this.transformYs[var8] = field28[var8];
+            this.transformZs[var8] = field29[var8];
          }
 
       }
    }
+
+   static {
+      field26 = new int[500];
+      field27 = new int[500];
+      field28 = new int[500];
+      field29 = new int[500];
+   }
 }
diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java
index 49787eda2c..2f393def77 100644
--- a/runescape-client/src/main/java/AttackOption.java
+++ b/runescape-client/src/main/java/AttackOption.java
@@ -33,10 +33,11 @@ public enum AttackOption implements Enumerated {
    )
    @Export("AttackOption_hidden")
    AttackOption_hidden(3);
+
    @ObfuscatedName("sp")
-   static short[] __cj_sp;
+   static short[] field30;
    @ObfuscatedName("ay")
-   static String __cj_ay;
+   static String field31;
    @ObfuscatedName("bo")
    @ObfuscatedSignature(
       signature = "[Llq;"
@@ -50,7 +51,7 @@ public enum AttackOption implements Enumerated {
    @Export("id")
    final int id;
 
-   AttackOption(int var3) {
+   private AttackOption(int var3) {
       this.id = var3;
    }
 
@@ -88,57 +89,57 @@ public enum AttackOption implements Enumerated {
       byte var7 = 0;
       byte var8 = 0;
 
-      while(var5 - var7 < var3 || var6 - var8 < var4) {
-         if(var5 - var7 >= var3) {
+      while (var5 - var7 < var3 || var6 - var8 < var4) {
+         if (var5 - var7 >= var3) {
             return -1;
          }
 
-         if(var6 - var8 >= var4) {
+         if (var6 - var8 >= var4) {
             return 1;
          }
 
          char var9;
-         if(var7 != 0) {
+         if (var7 != 0) {
             var9 = (char)var7;
-            boolean var14 = false;
+            boolean var10 = false;
          } else {
             var9 = var0.charAt(var5++);
          }
 
-         char var10;
-         if(var8 != 0) {
-            var10 = (char)var8;
-            boolean var15 = false;
+         char var14;
+         if (var8 != 0) {
+            var14 = (char)var8;
+            boolean var11 = false;
          } else {
-            var10 = var1.charAt(var6++);
+            var14 = var1.charAt(var6++);
          }
 
-         byte var11;
-         if(var9 == 198) {
-            var11 = 69;
-         } else if(var9 == 230) {
-            var11 = 101;
-         } else if(var9 == 223) {
-            var11 = 115;
-         } else if(var9 == 338) {
-            var11 = 69;
-         } else if(var9 == 339) {
-            var11 = 101;
+         byte var16;
+         if (var9 == 198) {
+            var16 = 69;
+         } else if (var9 == 230) {
+            var16 = 101;
+         } else if (var9 == 223) {
+            var16 = 115;
+         } else if (var9 == 338) {
+            var16 = 69;
+         } else if (var9 == 339) {
+            var16 = 101;
          } else {
-            var11 = 0;
+            var16 = 0;
          }
 
-         var7 = var11;
+         var7 = var16;
          byte var12;
-         if(var10 == 198) {
+         if (var14 == 198) {
             var12 = 69;
-         } else if(var10 == 230) {
+         } else if (var14 == 230) {
             var12 = 101;
-         } else if(var10 == 223) {
+         } else if (var14 == 223) {
             var12 = 115;
-         } else if(var10 == 338) {
+         } else if (var14 == 338) {
             var12 = 69;
-         } else if(var10 == 339) {
+         } else if (var14 == 339) {
             var12 = 101;
          } else {
             var12 = 0;
@@ -146,41 +147,41 @@ public enum AttackOption implements Enumerated {
 
          var8 = var12;
          var9 = class12.method155(var9, var2);
-         var10 = class12.method155(var10, var2);
-         if(var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) {
+         var14 = class12.method155(var14, var2);
+         if (var9 != var14 && Character.toUpperCase(var9) != Character.toUpperCase(var14)) {
             var9 = Character.toLowerCase(var9);
-            var10 = Character.toLowerCase(var10);
-            if(var10 != var9) {
-               return CollisionMap.method3631(var9, var2) - CollisionMap.method3631(var10, var2);
+            var14 = Character.toLowerCase(var14);
+            if (var14 != var9) {
+               return CollisionMap.method3631(var9, var2) - CollisionMap.method3631(var14, var2);
             }
          }
       }
 
-      int var16 = Math.min(var3, var4);
+      int var15 = Math.min(var3, var4);
 
       int var17;
-      char var20;
-      for(var17 = 0; var17 < var16; ++var17) {
-         char var18 = var0.charAt(var17);
-         var20 = var1.charAt(var17);
-         if(var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) {
+      char var18;
+      for (var17 = 0; var17 < var15; ++var17) {
+         char var19 = var0.charAt(var17);
+         var18 = var1.charAt(var17);
+         if (var18 != var19 && Character.toUpperCase(var19) != Character.toUpperCase(var18)) {
+            var19 = Character.toLowerCase(var19);
             var18 = Character.toLowerCase(var18);
-            var20 = Character.toLowerCase(var20);
-            if(var18 != var20) {
-               return CollisionMap.method3631(var18, var2) - CollisionMap.method3631(var20, var2);
+            if (var19 != var18) {
+               return CollisionMap.method3631(var19, var2) - CollisionMap.method3631(var18, var2);
             }
          }
       }
 
       var17 = var3 - var4;
-      if(var17 != 0) {
+      if (var17 != 0) {
          return var17;
       } else {
-         for(int var19 = 0; var19 < var16; ++var19) {
-            var20 = var0.charAt(var19);
-            char var13 = var1.charAt(var19);
-            if(var20 != var13) {
-               return CollisionMap.method3631(var20, var2) - CollisionMap.method3631(var13, var2);
+         for (int var20 = 0; var20 < var15; ++var20) {
+            var18 = var0.charAt(var20);
+            char var13 = var1.charAt(var20);
+            if (var18 != var13) {
+               return CollisionMap.method3631(var18, var2) - CollisionMap.method3631(var13, var2);
             }
          }
 
@@ -201,15 +202,14 @@ public enum AttackOption implements Enumerated {
          class168.randomDat.readFill(var0);
 
          int var1;
-         for(var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) {
-            ;
+         for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) {
          }
 
-         if(var1 >= 24) {
+         if (var1 >= 24) {
             throw new IOException();
          }
-      } catch (Exception var4) {
-         for(int var2 = 0; var2 < 24; ++var2) {
+      } catch (Exception var3) {
+         for (int var2 = 0; var2 < 24; ++var2) {
             var0[var2] = -1;
          }
       }
diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java
index 4c84f460d0..660e6931f5 100644
--- a/runescape-client/src/main/java/AudioFilter.java
+++ b/runescape-client/src/main/java/AudioFilter.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
@@ -7,92 +6,92 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("AudioFilter")
 public class AudioFilter {
    @ObfuscatedName("u")
-   static float[][] __di_u;
+   static float[][] field32;
    @ObfuscatedName("g")
-   static int[][] __di_g;
+   static int[][] field33;
    @ObfuscatedName("l")
-   static float __di_l;
+   static float field34;
    @ObfuscatedName("e")
-   static int __di_e;
+   static int field35;
    @ObfuscatedName("m")
-   int[] __m;
+   int[] field36;
    @ObfuscatedName("q")
-   int[][][] __q;
+   int[][][] field37;
    @ObfuscatedName("w")
-   int[][][] __w;
+   int[][][] field38;
    @ObfuscatedName("o")
-   int[] __o;
-
-   static {
-      __di_u = new float[2][8];
-      __di_g = new int[2][8];
-   }
+   int[] field39;
 
    AudioFilter() {
-      this.__m = new int[2];
-      this.__q = new int[2][2][4];
-      this.__w = new int[2][2][4];
-      this.__o = new int[2];
+      this.field36 = new int[2];
+      this.field37 = new int[2][2][4];
+      this.field38 = new int[2][2][4];
+      this.field39 = new int[2];
    }
 
    @ObfuscatedName("m")
-   float __m_205(int var1, int var2, float var3) {
-      float var4 = (float)this.__w[var1][0][var2] + var3 * (float)(this.__w[var1][1][var2] - this.__w[var1][0][var2]);
+   float method24(int var1, int var2, float var3) {
+      float var4 = (float)this.field38[var1][0][var2] + var3 * (float)(this.field38[var1][1][var2] - this.field38[var1][0][var2]);
       var4 *= 0.0015258789F;
       return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F));
    }
 
    @ObfuscatedName("q")
-   float __q_206(int var1, int var2, float var3) {
-      float var4 = (float)this.__q[var1][0][var2] + var3 * (float)(this.__q[var1][1][var2] - this.__q[var1][0][var2]);
+   float method25(int var1, int var2, float var3) {
+      float var4 = (float)this.field37[var1][0][var2] + var3 * (float)(this.field37[var1][1][var2] - this.field37[var1][0][var2]);
       var4 *= 1.2207031E-4F;
       return method2646(var4);
    }
 
    @ObfuscatedName("w")
-   int __w_207(int var1, float var2) {
+   int method26(int var1, float var2) {
       float var3;
-      if(var1 == 0) {
-         var3 = (float)this.__o[0] + (float)(this.__o[1] - this.__o[0]) * var2;
+      if (var1 == 0) {
+         var3 = (float)this.field39[0] + (float)(this.field39[1] - this.field39[0]) * var2;
          var3 *= 0.0030517578F;
-         __di_l = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
-         __di_e = (int)(__di_l * 65536.0F);
+         field34 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
+         field35 = (int)(field34 * 65536.0F);
       }
 
-      if(this.__m[var1] == 0) {
+      if (this.field36[var1] == 0) {
          return 0;
       } else {
-         var3 = this.__m_205(var1, 0, var2);
-         __di_u[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.__q_206(var1, 0, var2));
-         __di_u[var1][1] = var3 * var3;
+         var3 = this.method24(var1, 0, var2);
+         field32[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method25(var1, 0, var2));
+         field32[var1][1] = var3 * var3;
 
+         float[] var10000;
          int var4;
-         for(var4 = 1; var4 < this.__m[var1]; ++var4) {
-            var3 = this.__m_205(var1, var4, var2);
-            float var5 = -2.0F * var3 * (float)Math.cos((double)this.__q_206(var1, var4, var2));
+         for (var4 = 1; var4 < this.field36[var1]; ++var4) {
+            var3 = this.method24(var1, var4, var2);
+            float var5 = -2.0F * var3 * (float)Math.cos((double)this.method25(var1, var4, var2));
             float var6 = var3 * var3;
-            __di_u[var1][var4 * 2 + 1] = __di_u[var1][var4 * 2 - 1] * var6;
-            __di_u[var1][var4 * 2] = __di_u[var1][var4 * 2 - 1] * var5 + __di_u[var1][var4 * 2 - 2] * var6;
+            field32[var1][var4 * 2 + 1] = field32[var1][var4 * 2 - 1] * var6;
+            field32[var1][var4 * 2] = field32[var1][var4 * 2 - 1] * var5 + field32[var1][var4 * 2 - 2] * var6;
 
-            for(int var7 = var4 * 2 - 1; var7 >= 2; --var7) {
-               __di_u[var1][var7] += __di_u[var1][var7 - 1] * var5 + __di_u[var1][var7 - 2] * var6;
+            for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) {
+               var10000 = field32[var1];
+               var10000[var7] += field32[var1][var7 - 1] * var5 + field32[var1][var7 - 2] * var6;
             }
 
-            __di_u[var1][1] += __di_u[var1][0] * var5 + var6;
-            __di_u[var1][0] += var5;
+            var10000 = field32[var1];
+            var10000[1] += field32[var1][0] * var5 + var6;
+            var10000 = field32[var1];
+            var10000[0] += var5;
          }
 
-         if(var1 == 0) {
-            for(var4 = 0; var4 < this.__m[0] * 2; ++var4) {
-               __di_u[0][var4] *= __di_l;
+         if (var1 == 0) {
+            for (var4 = 0; var4 < this.field36[0] * 2; ++var4) {
+               var10000 = field32[0];
+               var10000[var4] *= field34;
             }
          }
 
-         for(var4 = 0; var4 < this.__m[var1] * 2; ++var4) {
-            __di_g[var1][var4] = (int)(__di_u[var1][var4] * 65536.0F);
+         for (var4 = 0; var4 < this.field36[var1] * 2; ++var4) {
+            field33[var1][var4] = (int)(field32[var1][var4] * 65536.0F);
          }
 
-         return this.__m[var1] * 2;
+         return this.field36[var1] * 2;
       }
    }
 
@@ -100,42 +99,42 @@ public class AudioFilter {
    @ObfuscatedSignature(
       signature = "(Lgr;Lde;)V"
    )
-   final void __o_208(Buffer var1, SoundEnvelope var2) {
+   final void method27(Buffer var1, SoundEnvelope var2) {
       int var3 = var1.readUnsignedByte();
-      this.__m[0] = var3 >> 4;
-      this.__m[1] = var3 & 15;
-      if(var3 != 0) {
-         this.__o[0] = var1.__ag_302();
-         this.__o[1] = var1.__ag_302();
+      this.field36[0] = var3 >> 4;
+      this.field36[1] = var3 & 15;
+      if (var3 != 0) {
+         this.field39[0] = var1.method43();
+         this.field39[1] = var1.method43();
          int var4 = var1.readUnsignedByte();
 
          int var5;
          int var6;
-         for(var5 = 0; var5 < 2; ++var5) {
-            for(var6 = 0; var6 < this.__m[var5]; ++var6) {
-               this.__q[var5][0][var6] = var1.__ag_302();
-               this.__w[var5][0][var6] = var1.__ag_302();
+         for (var5 = 0; var5 < 2; ++var5) {
+            for (var6 = 0; var6 < this.field36[var5]; ++var6) {
+               this.field37[var5][0][var6] = var1.method43();
+               this.field38[var5][0][var6] = var1.method43();
             }
          }
 
-         for(var5 = 0; var5 < 2; ++var5) {
-            for(var6 = 0; var6 < this.__m[var5]; ++var6) {
-               if((var4 & 1 << var5 * 4 << var6) != 0) {
-                  this.__q[var5][1][var6] = var1.__ag_302();
-                  this.__w[var5][1][var6] = var1.__ag_302();
+         for (var5 = 0; var5 < 2; ++var5) {
+            for (var6 = 0; var6 < this.field36[var5]; ++var6) {
+               if ((var4 & 1 << var5 * 4 << var6) != 0) {
+                  this.field37[var5][1][var6] = var1.method43();
+                  this.field38[var5][1][var6] = var1.method43();
                } else {
-                  this.__q[var5][1][var6] = this.__q[var5][0][var6];
-                  this.__w[var5][1][var6] = this.__w[var5][0][var6];
+                  this.field37[var5][1][var6] = this.field37[var5][0][var6];
+                  this.field38[var5][1][var6] = this.field38[var5][0][var6];
                }
             }
          }
 
-         if(var4 != 0 || this.__o[1] != this.__o[0]) {
+         if (var4 != 0 || this.field39[1] != this.field39[0]) {
             var2.decodeSegments(var1);
          }
       } else {
-         int[] var7 = this.__o;
-         this.__o[1] = 0;
+         int[] var7 = this.field39;
+         this.field39[1] = 0;
          var7[0] = 0;
       }
 
@@ -146,4 +145,9 @@ public class AudioFilter {
       float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0);
       return var1 * 3.1415927F / 11025.0F;
    }
+
+   static {
+      field32 = new float[2][8];
+      field33 = new int[2][8];
+   }
 }
diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java
index 8c65d3323a..f648c7a322 100644
--- a/runescape-client/src/main/java/BoundaryObject.java
+++ b/runescape-client/src/main/java/BoundaryObject.java
@@ -11,7 +11,7 @@ public final class BoundaryObject {
    @ObfuscatedSignature(
       signature = "Lho;"
    )
-   static Widget __ej_jv;
+   static Widget field40;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = -9307913
@@ -79,57 +79,57 @@ public final class BoundaryObject {
    )
    @Export("doCheat")
    static final void doCheat(String var0) {
-      if(var0.equalsIgnoreCase("toggleroof")) {
+      if (var0.equalsIgnoreCase("toggleroof")) {
          ReflectionCheck.clientPreferences.roofsHidden = !ReflectionCheck.clientPreferences.roofsHidden;
          WorldMapSection0.savePreferences();
-         if(ReflectionCheck.clientPreferences.roofsHidden) {
+         if (ReflectionCheck.clientPreferences.roofsHidden) {
             WorldMapIcon1.method219(99, "", "Roofs are now all hidden");
          } else {
             WorldMapIcon1.method219(99, "", "Roofs will only be removed selectively");
          }
       }
 
-      if(var0.equalsIgnoreCase("displayfps")) {
+      if (var0.equalsIgnoreCase("displayfps")) {
          Client.displayFps = !Client.displayFps;
       }
 
-      if(var0.equalsIgnoreCase("renderself")) {
+      if (var0.equalsIgnoreCase("renderself")) {
          Client.renderSelf = !Client.renderSelf;
       }
 
-      if(var0.equalsIgnoreCase("mouseovertext")) {
+      if (var0.equalsIgnoreCase("mouseovertext")) {
          Client.showMouseOverText = !Client.showMouseOverText;
       }
 
-      if(Client.rights >= 2) {
-         if(var0.equalsIgnoreCase("errortest")) {
+      if (Client.rights >= 2) {
+         if (var0.equalsIgnoreCase("errortest")) {
             throw new RuntimeException();
          }
 
-         if(var0.equalsIgnoreCase("showcoord")) {
+         if (var0.equalsIgnoreCase("showcoord")) {
             class60.worldMap0.showCoord = !class60.worldMap0.showCoord;
          }
 
-         if(var0.equalsIgnoreCase("fpson")) {
+         if (var0.equalsIgnoreCase("fpson")) {
             Client.displayFps = true;
          }
 
-         if(var0.equalsIgnoreCase("fpsoff")) {
+         if (var0.equalsIgnoreCase("fpsoff")) {
             Client.displayFps = false;
          }
 
-         if(var0.equalsIgnoreCase("gc")) {
+         if (var0.equalsIgnoreCase("gc")) {
             System.gc();
          }
 
-         if(var0.equalsIgnoreCase("clientdrop")) {
+         if (var0.equalsIgnoreCase("clientdrop")) {
             class48.method868();
          }
       }
 
-      PacketBufferNode var1 = Interpreter.method1915(ClientPacket.__gs_bo, Client.packetWriter.isaacCipher);
+      PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field282, Client.packetWriter.isaacCipher);
       var1.packetBuffer.writeByte(var0.length() + 1);
       var1.packetBuffer.writeStringCp1252NullTerminated(var0);
-      Client.packetWriter.__q_167(var1);
+      Client.packetWriter.method241(var1);
    }
 }
diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java
index 45b2743682..28eb923bce 100644
--- a/runescape-client/src/main/java/Bounds.java
+++ b/runescape-client/src/main/java/Bounds.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
@@ -11,26 +10,26 @@ public class Bounds {
    @ObfuscatedGetter(
       intValue = -2004088829
    )
-   public int __m;
+   public int field41;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = -1887298731
    )
-   public int __f;
+   public int field42;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 2001187823
    )
-   public int __q;
+   public int field43;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = 1377856837
    )
-   public int __w;
+   public int field44;
 
    public Bounds(int var1, int var2, int var3, int var4) {
-      this.__m_487(var1, var2);
-      this.__f_488(var3, var4);
+      this.method28(var1, var2);
+      this.method29(var3, var4);
    }
 
    public Bounds(int var1, int var2) {
@@ -42,9 +41,9 @@ public class Bounds {
       signature = "(IIB)V",
       garbageValue = "1"
    )
-   public void __m_487(int var1, int var2) {
-      this.__m = var1;
-      this.__f = var2;
+   public void method28(int var1, int var2) {
+      this.field41 = var1;
+      this.field42 = var2;
    }
 
    @ObfuscatedName("f")
@@ -52,9 +51,9 @@ public class Bounds {
       signature = "(III)V",
       garbageValue = "-11269827"
    )
-   public void __f_488(int var1, int var2) {
-      this.__q = var1;
-      this.__w = var2;
+   public void method29(int var1, int var2) {
+      this.field43 = var1;
+      this.field44 = var2;
    }
 
    @ObfuscatedName("q")
@@ -62,9 +61,9 @@ public class Bounds {
       signature = "(Lla;Lla;I)V",
       garbageValue = "-2123792170"
    )
-   public void __q_490(Bounds var1, Bounds var2) {
-      this.__w_491(var1, var2);
-      this.__o_492(var1, var2);
+   public void method30(Bounds var1, Bounds var2) {
+      this.method31(var1, var2);
+      this.method32(var1, var2);
    }
 
    @ObfuscatedName("w")
@@ -72,20 +71,20 @@ public class Bounds {
       signature = "(Lla;Lla;I)V",
       garbageValue = "314675149"
    )
-   void __w_491(Bounds var1, Bounds var2) {
-      var2.__m = this.__m;
-      var2.__q = this.__q;
-      if(this.__m < var1.__m) {
-         var2.__q -= var1.__m - this.__m;
-         var2.__m = var1.__m;
+   void method31(Bounds var1, Bounds var2) {
+      var2.field41 = this.field41;
+      var2.field43 = this.field43;
+      if (this.field41 < var1.field41) {
+         var2.field43 -= var1.field41 - this.field41;
+         var2.field41 = var1.field41;
       }
 
-      if(var2.__u_493() > var1.__u_493()) {
-         var2.__q -= var2.__u_493() - var1.__u_493();
+      if (var2.method33() > var1.method33()) {
+         var2.field43 -= var2.method33() - var1.method33();
       }
 
-      if(var2.__q < 0) {
-         var2.__q = 0;
+      if (var2.field43 < 0) {
+         var2.field43 = 0;
       }
 
    }
@@ -95,20 +94,20 @@ public class Bounds {
       signature = "(Lla;Lla;S)V",
       garbageValue = "128"
    )
-   void __o_492(Bounds var1, Bounds var2) {
-      var2.__f = this.__f;
-      var2.__w = this.__w;
-      if(this.__f < var1.__f) {
-         var2.__w -= var1.__f - this.__f;
-         var2.__f = var1.__f;
+   void method32(Bounds var1, Bounds var2) {
+      var2.field42 = this.field42;
+      var2.field44 = this.field44;
+      if (this.field42 < var1.field42) {
+         var2.field44 -= var1.field42 - this.field42;
+         var2.field42 = var1.field42;
       }
 
-      if(var2.__g_494() > var1.__g_494()) {
-         var2.__w -= var2.__g_494() - var1.__g_494();
+      if (var2.method34() > var1.method34()) {
+         var2.field44 -= var2.method34() - var1.method34();
       }
 
-      if(var2.__w < 0) {
-         var2.__w = 0;
+      if (var2.field44 < 0) {
+         var2.field44 = 0;
       }
 
    }
@@ -118,8 +117,8 @@ public class Bounds {
       signature = "(I)I",
       garbageValue = "-1842151293"
    )
-   int __u_493() {
-      return this.__m + this.__q;
+   int method33() {
+      return this.field41 + this.field43;
    }
 
    @ObfuscatedName("g")
@@ -127,12 +126,12 @@ public class Bounds {
       signature = "(B)I",
       garbageValue = "-22"
    )
-   int __g_494() {
-      return this.__f + this.__w;
+   int method34() {
+      return this.field42 + this.field44;
    }
 
    @ObfuscatedName("toString")
-   public String __toString_489() {
+   public String method35() {
       return null;
    }
 
@@ -146,11 +145,11 @@ public class Bounds {
       double[] var6 = new double[var5];
       int var7 = -var4;
 
-      for(int var8 = 0; var7 <= var4; ++var8) {
-         double var15 = ((double)var7 - var0) / var2;
-         double var13 = Math.exp(-var15 * var15 / 2.0D) / Math.sqrt(6.283185307179586D);
-         double var11 = var13 / var2;
-         var6[var8] = var11;
+      for (int var8 = 0; var7 <= var4; ++var8) {
+         double var9 = ((double)var7 - var0) / var2;
+         double var11 = Math.exp(-var9 * var9 / 2.0D) / Math.sqrt(6.283185307179586D);
+         double var13 = var11 / var2;
+         var6[var8] = var13;
          ++var7;
       }
 
diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java
index 42a54d7e6b..a676800453 100644
--- a/runescape-client/src/main/java/Buddy.java
+++ b/runescape-client/src/main/java/Buddy.java
@@ -71,22 +71,22 @@ public class Buddy extends User {
       int[] var0 = Players.Players_indices;
 
       int var1;
-      for(var1 = 0; var1 < Players.Players_count; ++var1) {
+      for (var1 = 0; var1 < Players.Players_count; ++var1) {
          Player var2 = Client.players[var0[var1]];
-         if(var2 != null && var2.overheadTextCyclesRemaining > 0) {
+         if (var2 != null && var2.overheadTextCyclesRemaining > 0) {
             --var2.overheadTextCyclesRemaining;
-            if(var2.overheadTextCyclesRemaining == 0) {
+            if (var2.overheadTextCyclesRemaining == 0) {
                var2.overheadText = null;
             }
          }
       }
 
-      for(var1 = 0; var1 < Client.npcCount; ++var1) {
+      for (var1 = 0; var1 < Client.npcCount; ++var1) {
          int var4 = Client.npcIndices[var1];
-         Npc var3 = Client.npcs[var4];
-         if(var3 != null && var3.overheadTextCyclesRemaining > 0) {
+         NPC var3 = Client.npcs[var4];
+         if (var3 != null && var3.overheadTextCyclesRemaining > 0) {
             --var3.overheadTextCyclesRemaining;
-            if(var3.overheadTextCyclesRemaining == 0) {
+            if (var3.overheadTextCyclesRemaining == 0) {
                var3.overheadText = null;
             }
          }
diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java
index c711dc32c1..0c263a1b47 100644
--- a/runescape-client/src/main/java/Buffer.java
+++ b/runescape-client/src/main/java/Buffer.java
@@ -9,9 +9,9 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Buffer")
 public class Buffer extends Node {
    @ObfuscatedName("q")
-   static int[] __gr_q;
+   static int[] field45;
    @ObfuscatedName("o")
-   static long[] __gr_o;
+   static long[] field46;
    @ObfuscatedName("m")
    @Export("array")
    public byte[] array;
@@ -22,42 +22,6 @@ public class Buffer extends Node {
    @Export("index")
    public int index;
 
-   static {
-      __gr_q = new int[256];
-
-      int var2;
-      for(int var1 = 0; var1 < 256; ++var1) {
-         int var0 = var1;
-
-         for(var2 = 0; var2 < 8; ++var2) {
-            if((var0 & 1) == 1) {
-               var0 = var0 >>> 1 ^ -306674912;
-            } else {
-               var0 >>>= 1;
-            }
-         }
-
-         __gr_q[var1] = var0;
-      }
-
-      __gr_o = new long[256];
-
-      for(var2 = 0; var2 < 256; ++var2) {
-         long var4 = (long)var2;
-
-         for(int var3 = 0; var3 < 8; ++var3) {
-            if((var4 & 1L) == 1L) {
-               var4 = var4 >>> 1 ^ -3932672073523589310L;
-            } else {
-               var4 >>>= 1;
-            }
-         }
-
-         __gr_o[var2] = var4;
-      }
-
-   }
-
    public Buffer(int var1) {
       this.array = Canvas.method862(var1);
       this.index = 0;
@@ -73,8 +37,8 @@ public class Buffer extends Node {
       signature = "(S)V",
       garbageValue = "13572"
    )
-   public void __f_295() {
-      if(this.array != null) {
+   public void method36() {
+      if (this.array != null) {
          VertexNormal.method2984(this.array);
       }
 
@@ -158,7 +122,7 @@ public class Buffer extends Node {
    )
    @Export("writeBoolean")
    public void writeBoolean(boolean var1) {
-      this.writeByte(var1?1:0);
+      this.writeByte(var1 ? 1 : 0);
    }
 
    @ObfuscatedName("d")
@@ -169,7 +133,7 @@ public class Buffer extends Node {
    @Export("writeStringCp1252NullTerminated")
    public void writeStringCp1252NullTerminated(String var1) {
       int var2 = var1.indexOf(0);
-      if(var2 >= 0) {
+      if (var2 >= 0) {
          throw new IllegalArgumentException("");
       } else {
          this.index += SoundCache.encodeStringCp1252(var1, 0, var1.length(), this.array, this.index);
@@ -185,7 +149,7 @@ public class Buffer extends Node {
    @Export("writeStringCp1252NullCircumfixed")
    public void writeStringCp1252NullCircumfixed(String var1) {
       int var2 = var1.indexOf(0);
-      if(var2 >= 0) {
+      if (var2 >= 0) {
          throw new IllegalArgumentException("");
       } else {
          this.array[++this.index - 1] = 0;
@@ -199,23 +163,23 @@ public class Buffer extends Node {
       signature = "(Ljava/lang/CharSequence;B)V",
       garbageValue = "58"
    )
-   public void __j_296(CharSequence var1) {
-      int var3 = var1.length();
-      int var4 = 0;
+   public void method37(CharSequence var1) {
+      int var2 = var1.length();
+      int var3 = 0;
 
-      for(int var5 = 0; var5 < var3; ++var5) {
-         char var6 = var1.charAt(var5);
-         if(var6 <= 127) {
-            ++var4;
-         } else if(var6 <= 2047) {
-            var4 += 2;
+      for (int var4 = 0; var4 < var2; ++var4) {
+         char var5 = var1.charAt(var4);
+         if (var5 <= 127) {
+            ++var3;
+         } else if (var5 <= 2047) {
+            var3 += 2;
          } else {
-            var4 += 3;
+            var3 += 3;
          }
       }
 
       this.array[++this.index - 1] = 0;
-      this.__c_301(var4);
+      this.method42(var3);
       this.index += class16.method190(this.array, this.index, var1);
    }
 
@@ -224,8 +188,8 @@ public class Buffer extends Node {
       signature = "([BIII)V",
       garbageValue = "-1915344405"
    )
-   public void __s_297(byte[] var1, int var2, int var3) {
-      for(int var4 = var2; var4 < var3 + var2; ++var4) {
+   public void method38(byte[] var1, int var2, int var3) {
+      for (int var4 = var2; var4 < var3 + var2; ++var4) {
          this.array[++this.index - 1] = var1[var4];
       }
 
@@ -236,7 +200,7 @@ public class Buffer extends Node {
       signature = "(II)V",
       garbageValue = "-225163682"
    )
-   public void __t_298(int var1) {
+   public void method39(int var1) {
       this.array[this.index - var1 - 4] = (byte)(var1 >> 24);
       this.array[this.index - var1 - 3] = (byte)(var1 >> 16);
       this.array[this.index - var1 - 2] = (byte)(var1 >> 8);
@@ -248,7 +212,7 @@ public class Buffer extends Node {
       signature = "(II)V",
       garbageValue = "-1298210761"
    )
-   public void __y_299(int var1) {
+   public void method40(int var1) {
       this.array[this.index - var1 - 2] = (byte)(var1 >> 8);
       this.array[this.index - var1 - 1] = (byte)var1;
    }
@@ -258,7 +222,7 @@ public class Buffer extends Node {
       signature = "(II)V",
       garbageValue = "-1839722163"
    )
-   public void __h_300(int var1) {
+   public void method41(int var1) {
       this.array[this.index - var1 - 1] = (byte)var1;
    }
 
@@ -269,13 +233,16 @@ public class Buffer extends Node {
    )
    @Export("writeSmartByteShort")
    public void writeSmartByteShort(int var1) {
-      if(var1 >= 0 && var1 < 128) {
+      if (var1 >= 0 && var1 < 128) {
          this.writeByte(var1);
-      } else if(var1 >= 0 && var1 < 32768) {
-         this.writeShort(var1 + 32768);
       } else {
-         throw new IllegalArgumentException();
+         if (var1 < 0 || var1 >= 32768) {
+            throw new IllegalArgumentException();
+         }
+
+         this.writeShort(var1 + 32768);
       }
+
    }
 
    @ObfuscatedName("c")
@@ -283,11 +250,11 @@ public class Buffer extends Node {
       signature = "(II)V",
       garbageValue = "820873705"
    )
-   public void __c_301(int var1) {
-      if((var1 & -128) != 0) {
-         if((var1 & -16384) != 0) {
-            if((var1 & -2097152) != 0) {
-               if((var1 & -268435456) != 0) {
+   public void method42(int var1) {
+      if ((var1 & -128) != 0) {
+         if ((var1 & -16384) != 0) {
+            if ((var1 & -2097152) != 0) {
+               if ((var1 & -268435456) != 0) {
                   this.writeByte(var1 >>> 28 | 128);
                }
 
@@ -328,7 +295,7 @@ public class Buffer extends Node {
       signature = "(B)I",
       garbageValue = "-86"
    )
-   public int __ag_302() {
+   public int method43() {
       this.index += 2;
       return (this.array[this.index - 1] & 255) + ((this.array[this.index - 2] & 255) << 8);
    }
@@ -338,10 +305,10 @@ public class Buffer extends Node {
       signature = "(B)I",
       garbageValue = "1"
    )
-   public int __aq_303() {
+   public int method44() {
       this.index += 2;
       int var1 = (this.array[this.index - 1] & 255) + ((this.array[this.index - 2] & 255) << 8);
-      if(var1 > 32767) {
+      if (var1 > 32767) {
          var1 -= 65536;
       }
 
@@ -399,7 +366,7 @@ public class Buffer extends Node {
    )
    @Export("readStringCp1252NullTerminatedOrNull")
    public String readStringCp1252NullTerminatedOrNull() {
-      if(this.array[this.index] == 0) {
+      if (this.array[this.index] == 0) {
          ++this.index;
          return null;
       } else {
@@ -416,12 +383,11 @@ public class Buffer extends Node {
    public String readStringCp1252NullTerminated() {
       int var1 = this.index;
 
-      while(this.array[++this.index - 1] != 0) {
-         ;
+      while (this.array[++this.index - 1] != 0) {
       }
 
       int var2 = this.index - var1 - 1;
-      return var2 == 0?"":WidgetGroupParent.decodeStringCp1252(this.array, var1, var2);
+      return var2 == 0 ? "" : WidgetGroupParent.decodeStringCp1252(this.array, var1, var2);
    }
 
    @ObfuscatedName("ak")
@@ -432,17 +398,16 @@ public class Buffer extends Node {
    @Export("readStringCp1252NullCircumfixed")
    public String readStringCp1252NullCircumfixed() {
       byte var1 = this.array[++this.index - 1];
-      if(var1 != 0) {
+      if (var1 != 0) {
          throw new IllegalStateException("");
       } else {
          int var2 = this.index;
 
-         while(this.array[++this.index - 1] != 0) {
-            ;
+         while (this.array[++this.index - 1] != 0) {
          }
 
          int var3 = this.index - var2 - 1;
-         return var3 == 0?"":WidgetGroupParent.decodeStringCp1252(this.array, var2, var3);
+         return var3 == 0 ? "" : WidgetGroupParent.decodeStringCp1252(this.array, var2, var3);
       }
    }
 
@@ -451,69 +416,69 @@ public class Buffer extends Node {
       signature = "(B)Ljava/lang/String;",
       garbageValue = "-14"
    )
-   public String __aw_304() {
+   public String method45() {
       byte var1 = this.array[++this.index - 1];
-      if(var1 != 0) {
+      if (var1 != 0) {
          throw new IllegalStateException("");
       } else {
-         int var2 = this.__as_311();
-         if(var2 + this.index > this.array.length) {
+         int var2 = this.method52();
+         if (var2 + this.index > this.array.length) {
             throw new IllegalStateException("");
          } else {
-            byte[] var4 = this.array;
-            int var5 = this.index;
-            char[] var6 = new char[var2];
-            int var7 = 0;
-            int var8 = var5;
+            byte[] var3 = this.array;
+            int var4 = this.index;
+            char[] var5 = new char[var2];
+            int var6 = 0;
+            int var7 = var4;
 
-            int var11;
-            for(int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) {
-               int var10 = var4[var8++] & 255;
-               if(var10 < 128) {
-                  if(var10 == 0) {
-                     var11 = 65533;
+            int var8;
+            for (int var9 = var4 + var2; var7 < var9; var5[var6++] = (char)var8) {
+               int var10 = var3[var7++] & 255;
+               if (var10 < 128) {
+                  if (var10 == 0) {
+                     var8 = 65533;
                   } else {
-                     var11 = var10;
+                     var8 = var10;
                   }
-               } else if(var10 < 192) {
-                  var11 = 65533;
-               } else if(var10 < 224) {
-                  if(var8 < var9 && (var4[var8] & 192) == 128) {
-                     var11 = (var10 & 31) << 6 | var4[var8++] & 63;
-                     if(var11 < 128) {
-                        var11 = 65533;
+               } else if (var10 < 192) {
+                  var8 = 65533;
+               } else if (var10 < 224) {
+                  if (var7 < var9 && (var3[var7] & 192) == 128) {
+                     var8 = (var10 & 31) << 6 | var3[var7++] & 63;
+                     if (var8 < 128) {
+                        var8 = 65533;
                      }
                   } else {
-                     var11 = 65533;
+                     var8 = 65533;
                   }
-               } else if(var10 < 240) {
-                  if(var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) {
-                     var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63;
-                     if(var11 < 2048) {
-                        var11 = 65533;
+               } else if (var10 < 240) {
+                  if (var7 + 1 < var9 && (var3[var7] & 192) == 128 && (var3[var7 + 1] & 192) == 128) {
+                     var8 = (var10 & 15) << 12 | (var3[var7++] & 63) << 6 | var3[var7++] & 63;
+                     if (var8 < 2048) {
+                        var8 = 65533;
                      }
                   } else {
-                     var11 = 65533;
+                     var8 = 65533;
                   }
-               } else if(var10 < 248) {
-                  if(var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) {
-                     var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63;
-                     if(var11 >= 65536 && var11 <= 1114111) {
-                        var11 = 65533;
+               } else if (var10 < 248) {
+                  if (var7 + 2 < var9 && (var3[var7] & 192) == 128 && (var3[var7 + 1] & 192) == 128 && (var3[var7 + 2] & 192) == 128) {
+                     var8 = (var10 & 7) << 18 | (var3[var7++] & 63) << 12 | (var3[var7++] & 63) << 6 | var3[var7++] & 63;
+                     if (var8 >= 65536 && var8 <= 1114111) {
+                        var8 = 65533;
                      } else {
-                        var11 = 65533;
+                        var8 = 65533;
                      }
                   } else {
-                     var11 = 65533;
+                     var8 = 65533;
                   }
                } else {
-                  var11 = 65533;
+                  var8 = 65533;
                }
             }
 
-            String var3 = new String(var6, 0, var7);
+            String var11 = new String(var5, 0, var6);
             this.index += var2;
-            return var3;
+            return var11;
          }
       }
    }
@@ -523,8 +488,8 @@ public class Buffer extends Node {
       signature = "([BIIB)V",
       garbageValue = "-122"
    )
-   public void __al_305(byte[] var1, int var2, int var3) {
-      for(int var4 = var2; var4 < var3 + var2; ++var4) {
+   public void method46(byte[] var1, int var2, int var3) {
+      for (int var4 = var2; var4 < var3 + var2; ++var4) {
          var1[var4] = this.array[++this.index - 1];
       }
 
@@ -535,9 +500,9 @@ public class Buffer extends Node {
       signature = "(B)I",
       garbageValue = "-24"
    )
-   public int __ab_306() {
+   public int method47() {
       int var1 = this.array[this.index] & 255;
-      return var1 < 128?this.readUnsignedByte() - 64:this.__ag_302() - 49152;
+      return var1 < 128 ? this.readUnsignedByte() - 64 : this.method43() - 49152;
    }
 
    @ObfuscatedName("ae")
@@ -545,9 +510,9 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "1370512869"
    )
-   public int __ae_307() {
+   public int method48() {
       int var1 = this.array[this.index] & 255;
-      return var1 < 128?this.readUnsignedByte():this.__ag_302() - 32768;
+      return var1 < 128 ? this.readUnsignedByte() : this.method43() - 32768;
    }
 
    @ObfuscatedName("at")
@@ -555,11 +520,11 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "1177684230"
    )
-   public int __at_308() {
+   public int method49() {
       int var1 = 0;
 
       int var2;
-      for(var2 = this.__ae_307(); var2 == 32767; var2 = this.__ae_307()) {
+      for (var2 = this.method48(); var2 == 32767; var2 = this.method48()) {
          var1 += 32767;
       }
 
@@ -572,8 +537,8 @@ public class Buffer extends Node {
       signature = "(B)I",
       garbageValue = "103"
    )
-   public int __ad_309() {
-      return this.array[this.index] < 0?this.readInt() & Integer.MAX_VALUE:this.__ag_302();
+   public int method50() {
+      return this.array[this.index] < 0 ? this.readInt() & Integer.MAX_VALUE : this.method43();
    }
 
    @ObfuscatedName("ap")
@@ -581,12 +546,12 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "-1151173205"
    )
-   public int __ap_310() {
-      if(this.array[this.index] < 0) {
+   public int method51() {
+      if (this.array[this.index] < 0) {
          return this.readInt() & Integer.MAX_VALUE;
       } else {
-         int var1 = this.__ag_302();
-         return var1 == 32767?-1:var1;
+         int var1 = this.method43();
+         return var1 == 32767 ? -1 : var1;
       }
    }
 
@@ -595,11 +560,11 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "984135559"
    )
-   public int __as_311() {
+   public int method52() {
       byte var1 = this.array[++this.index - 1];
 
       int var2;
-      for(var2 = 0; var1 < 0; var1 = this.array[++this.index - 1]) {
+      for (var2 = 0; var1 < 0; var1 = this.array[++this.index - 1]) {
          var2 = (var2 | var1 & 127) << 7;
       }
 
@@ -616,13 +581,13 @@ public class Buffer extends Node {
       int var2 = this.index / 8;
       this.index = 0;
 
-      for(int var3 = 0; var3 < var2; ++var3) {
+      for (int var3 = 0; var3 < var2; ++var3) {
          int var4 = this.readInt();
          int var5 = this.readInt();
          int var6 = 0;
          int var7 = -1640531527;
 
-         for(int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) {
+         for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) {
             var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3];
             var6 += var7;
          }
@@ -644,13 +609,13 @@ public class Buffer extends Node {
       int var2 = this.index / 8;
       this.index = 0;
 
-      for(int var3 = 0; var3 < var2; ++var3) {
+      for (int var3 = 0; var3 < var2; ++var3) {
          int var4 = this.readInt();
          int var5 = this.readInt();
          int var6 = -957401312;
          int var7 = -1640531527;
 
-         for(int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) {
+         for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) {
             var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6;
             var6 -= var7;
          }
@@ -673,13 +638,13 @@ public class Buffer extends Node {
       this.index = var2;
       int var5 = (var3 - var2) / 8;
 
-      for(int var6 = 0; var6 < var5; ++var6) {
+      for (int var6 = 0; var6 < var5; ++var6) {
          int var7 = this.readInt();
          int var8 = this.readInt();
          int var9 = 0;
          int var10 = -1640531527;
 
-         for(int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) {
+         for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) {
             var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3];
             var9 += var10;
          }
@@ -703,13 +668,13 @@ public class Buffer extends Node {
       this.index = var2;
       int var5 = (var3 - var2) / 8;
 
-      for(int var6 = 0; var6 < var5; ++var6) {
+      for (int var6 = 0; var6 < var5; ++var6) {
          int var7 = this.readInt();
          int var8 = this.readInt();
          int var9 = -957401312;
          int var10 = -1640531527;
 
-         for(int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) {
+         for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) {
             var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9;
             var9 -= var10;
          }
@@ -732,13 +697,13 @@ public class Buffer extends Node {
       int var3 = this.index;
       this.index = 0;
       byte[] var4 = new byte[var3];
-      this.__al_305(var4, 0, var3);
+      this.method46(var4, 0, var3);
       BigInteger var5 = new BigInteger(var4);
       BigInteger var6 = var5.modPow(var1, var2);
       byte[] var7 = var6.toByteArray();
       this.index = 0;
       this.writeShort(var7.length);
-      this.__s_297(var7, 0, var7.length);
+      this.method38(var7, 0, var7.length);
    }
 
    @ObfuscatedName("aa")
@@ -746,18 +711,18 @@ public class Buffer extends Node {
       signature = "(II)I",
       garbageValue = "-484928770"
    )
-   public int __aa_312(int var1) {
-      byte[] var3 = this.array;
-      int var4 = this.index;
-      int var5 = -1;
+   public int method53(int var1) {
+      byte[] var2 = this.array;
+      int var3 = this.index;
+      int var4 = -1;
 
-      for(int var6 = var1; var6 < var4; ++var6) {
-         var5 = var5 >>> 8 ^ __gr_q[(var5 ^ var3[var6]) & 255];
+      for (int var5 = var1; var5 < var3; ++var5) {
+         var4 = var4 >>> 8 ^ field45[(var4 ^ var2[var5]) & 255];
       }
 
-      var5 = ~var5;
-      this.writeInt(var5);
-      return var5;
+      var4 = ~var4;
+      this.writeInt(var4);
+      return var4;
    }
 
    @ObfuscatedName("ax")
@@ -765,20 +730,20 @@ public class Buffer extends Node {
       signature = "(B)Z",
       garbageValue = "-11"
    )
-   public boolean __ax_313() {
+   public boolean method54() {
       this.index -= 4;
-      byte[] var2 = this.array;
-      int var3 = this.index;
-      int var4 = -1;
+      byte[] var1 = this.array;
+      int var2 = this.index;
+      int var3 = -1;
 
-      int var5;
-      for(var5 = 0; var5 < var3; ++var5) {
-         var4 = var4 >>> 8 ^ __gr_q[(var4 ^ var2[var5]) & 255];
+      int var4;
+      for (var4 = 0; var4 < var2; ++var4) {
+         var3 = var3 >>> 8 ^ field45[(var3 ^ var1[var4]) & 255];
       }
 
-      var4 = ~var4;
-      var5 = this.readInt();
-      return var5 == var4;
+      var3 = ~var3;
+      var4 = this.readInt();
+      return var4 == var3;
    }
 
    @ObfuscatedName("af")
@@ -786,7 +751,7 @@ public class Buffer extends Node {
       signature = "(IB)V",
       garbageValue = "-47"
    )
-   public void __af_314(int var1) {
+   public void method55(int var1) {
       this.array[++this.index - 1] = (byte)(var1 + 128);
    }
 
@@ -795,7 +760,7 @@ public class Buffer extends Node {
       signature = "(II)V",
       garbageValue = "-1336494664"
    )
-   public void __ai_315(int var1) {
+   public void method56(int var1) {
       this.array[++this.index - 1] = (byte)(0 - var1);
    }
 
@@ -804,7 +769,7 @@ public class Buffer extends Node {
       signature = "(IB)V",
       garbageValue = "21"
    )
-   public void __ba_316(int var1) {
+   public void method57(int var1) {
       this.array[++this.index - 1] = (byte)(128 - var1);
    }
 
@@ -813,7 +778,7 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "-86972759"
    )
-   public int __bb_317() {
+   public int method58() {
       return this.array[++this.index - 1] - 128 & 255;
    }
 
@@ -832,7 +797,7 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "359814653"
    )
-   public int __bq_318() {
+   public int method59() {
       return 128 - this.array[++this.index - 1] & 255;
    }
 
@@ -841,7 +806,7 @@ public class Buffer extends Node {
       signature = "(I)B",
       garbageValue = "2130167320"
    )
-   public byte __bn_319() {
+   public byte method60() {
       return (byte)(this.array[++this.index - 1] - 128);
    }
 
@@ -850,7 +815,7 @@ public class Buffer extends Node {
       signature = "(I)B",
       garbageValue = "1415936818"
    )
-   public byte __bk_320() {
+   public byte method61() {
       return (byte)(0 - this.array[++this.index - 1]);
    }
 
@@ -859,7 +824,7 @@ public class Buffer extends Node {
       signature = "(I)B",
       garbageValue = "1496705333"
    )
-   public byte __bd_321() {
+   public byte method62() {
       return (byte)(128 - this.array[++this.index - 1]);
    }
 
@@ -879,7 +844,7 @@ public class Buffer extends Node {
       signature = "(II)V",
       garbageValue = "189694315"
    )
-   public void __bo_322(int var1) {
+   public void method63(int var1) {
       this.array[++this.index - 1] = (byte)(var1 >> 8);
       this.array[++this.index - 1] = (byte)(var1 + 128);
    }
@@ -889,7 +854,7 @@ public class Buffer extends Node {
       signature = "(IB)V",
       garbageValue = "-7"
    )
-   public void __bx_323(int var1) {
+   public void method64(int var1) {
       this.array[++this.index - 1] = (byte)(var1 + 128);
       this.array[++this.index - 1] = (byte)(var1 >> 8);
    }
@@ -899,7 +864,7 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "2147134369"
    )
-   public int __by_324() {
+   public int method65() {
       this.index += 2;
       return ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] & 255);
    }
@@ -909,7 +874,7 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "-1489217204"
    )
-   public int __bu_325() {
+   public int method66() {
       this.index += 2;
       return (this.array[this.index - 1] - 128 & 255) + ((this.array[this.index - 2] & 255) << 8);
    }
@@ -919,7 +884,7 @@ public class Buffer extends Node {
       signature = "(B)I",
       garbageValue = "-86"
    )
-   public int __bm_326() {
+   public int method67() {
       this.index += 2;
       return ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] - 128 & 255);
    }
@@ -929,10 +894,10 @@ public class Buffer extends Node {
       signature = "(B)I",
       garbageValue = "54"
    )
-   public int __bl_327() {
+   public int method68() {
       this.index += 2;
       int var1 = ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] & 255);
-      if(var1 > 32767) {
+      if (var1 > 32767) {
          var1 -= 65536;
       }
 
@@ -944,10 +909,10 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "388487388"
    )
-   public int __br_328() {
+   public int method69() {
       this.index += 2;
       int var1 = ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] - 128 & 255);
-      if(var1 > 32767) {
+      if (var1 > 32767) {
          var1 -= 65536;
       }
 
@@ -959,7 +924,7 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "-88751042"
    )
-   public int __bj_329() {
+   public int method70() {
       this.index += 3;
       return (this.array[this.index - 3] & 255) + ((this.array[this.index - 2] & 255) << 8) + ((this.array[this.index - 1] & 255) << 16);
    }
@@ -1008,7 +973,7 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "-1322860835"
    )
-   public int __bt_330() {
+   public int method71() {
       this.index += 4;
       return (this.array[this.index - 4] & 255) + ((this.array[this.index - 3] & 255) << 8) + ((this.array[this.index - 2] & 255) << 16) + ((this.array[this.index - 1] & 255) << 24);
    }
@@ -1018,7 +983,7 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "-1731171028"
    )
-   public int __bp_331() {
+   public int method72() {
       this.index += 4;
       return ((this.array[this.index - 2] & 255) << 24) + ((this.array[this.index - 4] & 255) << 8) + (this.array[this.index - 3] & 255) + ((this.array[this.index - 1] & 255) << 16);
    }
@@ -1028,7 +993,7 @@ public class Buffer extends Node {
       signature = "(B)I",
       garbageValue = "-126"
    )
-   public int __bf_332() {
+   public int method73() {
       this.index += 4;
       return ((this.array[this.index - 1] & 255) << 8) + ((this.array[this.index - 4] & 255) << 16) + (this.array[this.index - 2] & 255) + ((this.array[this.index - 3] & 255) << 24);
    }
@@ -1038,8 +1003,8 @@ public class Buffer extends Node {
       signature = "([BIII)V",
       garbageValue = "1303287859"
    )
-   public void __bh_333(byte[] var1, int var2, int var3) {
-      for(int var4 = var2; var4 < var3 + var2; ++var4) {
+   public void method74(byte[] var1, int var2, int var3) {
+      for (int var4 = var2; var4 < var3 + var2; ++var4) {
          var1[var4] = (byte)(this.array[++this.index - 1] - 128);
       }
 
@@ -1055,4 +1020,40 @@ public class Buffer extends Node {
       HealthBarDefinition.HealthBarDefinition_cached.clear();
       HealthBarDefinition.HealthBarDefinition_cachedSprites.clear();
    }
+
+   static {
+      field45 = new int[256];
+
+      int var0;
+      for (int var1 = 0; var1 < 256; ++var1) {
+         int var2 = var1;
+
+         for (var0 = 0; var0 < 8; ++var0) {
+            if ((var2 & 1) == 1) {
+               var2 = var2 >>> 1 ^ -306674912;
+            } else {
+               var2 >>>= 1;
+            }
+         }
+
+         field45[var1] = var2;
+      }
+
+      field46 = new long[256];
+
+      for (var0 = 0; var0 < 256; ++var0) {
+         long var4 = (long)var0;
+
+         for (int var3 = 0; var3 < 8; ++var3) {
+            if ((var4 & 1L) == 1L) {
+               var4 = var4 >>> 1 ^ -3932672073523589310L;
+            } else {
+               var4 >>>= 1;
+            }
+         }
+
+         field46[var0] = var4;
+      }
+
+   }
 }
diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java
index 5b4292d34b..e7385c68e3 100644
--- a/runescape-client/src/main/java/BufferedFile.java
+++ b/runescape-client/src/main/java/BufferedFile.java
@@ -23,12 +23,12 @@ public class BufferedFile {
    @ObfuscatedGetter(
       longValue = -7773729680030815835L
    )
-   long __q;
+   long field47;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = -846810907
    )
-   int __w;
+   int field48;
    @ObfuscatedName("o")
    @Export("writeBuffer")
    byte[] writeBuffer;
@@ -36,22 +36,22 @@ public class BufferedFile {
    @ObfuscatedGetter(
       longValue = 5249231081498323007L
    )
-   long __u;
+   long field49;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = -1558233611
    )
-   int __g;
+   int field50;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       longValue = -6819476051574242871L
    )
-   long __l;
+   long field51;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       longValue = -3728247331531750871L
    )
-   long __e;
+   long field52;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       longValue = 2663146692618913943L
@@ -62,20 +62,20 @@ public class BufferedFile {
    @ObfuscatedGetter(
       longValue = 5720856138805191881L
    )
-   long __d;
+   long field53;
 
    @ObfuscatedSignature(
       signature = "(Ldk;II)V"
    )
    public BufferedFile(AccessFile var1, int var2, int var3) throws IOException {
-      this.__q = -1L;
-      this.__u = -1L;
-      this.__g = 0;
+      this.field47 = -1L;
+      this.field49 = -1L;
+      this.field50 = 0;
       this.accessFile = var1;
-      this.capacity = this.__e = var1.length();
+      this.capacity = this.field52 = var1.length();
       this.readBuffer = new byte[var2];
       this.writeBuffer = new byte[var3];
-      this.__l = 0L;
+      this.field51 = 0L;
    }
 
    @ObfuscatedName("m")
@@ -92,10 +92,10 @@ public class BufferedFile {
    @ObfuscatedName("f")
    @Export("seek")
    public void seek(long var1) throws IOException {
-      if(var1 < 0L) {
+      if (var1 < 0L) {
          throw new IOException("");
       } else {
-         this.__l = var1;
+         this.field51 = var1;
       }
    }
 
@@ -127,100 +127,100 @@ public class BufferedFile {
    @Export("read")
    public void read(byte[] var1, int var2, int var3) throws IOException {
       try {
-         if(var3 + var2 > var1.length) {
+         if (var3 + var2 > var1.length) {
             throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length);
          }
 
-         if(-1L != this.__u && this.__l >= this.__u && this.__l + (long)var3 <= this.__u + (long)this.__g) {
-            System.arraycopy(this.writeBuffer, (int)(this.__l - this.__u), var1, var2, var3);
-            this.__l += (long)var3;
+         if (-1L != this.field49 && this.field51 >= this.field49 && this.field51 + (long)var3 <= this.field49 + (long)this.field50) {
+            System.arraycopy(this.writeBuffer, (int)(this.field51 - this.field49), var1, var2, var3);
+            this.field51 += (long)var3;
             return;
          }
 
-         long var4 = this.__l;
-         int var7 = var3;
-         int var8;
-         if(this.__l >= this.__q && this.__l < this.__q + (long)this.__w) {
-            var8 = (int)((long)this.__w - (this.__l - this.__q));
-            if(var8 > var3) {
-               var8 = var3;
+         long var4 = this.field51;
+         int var6 = var3;
+         int var7;
+         if (this.field51 >= this.field47 && this.field51 < this.field47 + (long)this.field48) {
+            var7 = (int)((long)this.field48 - (this.field51 - this.field47));
+            if (var7 > var3) {
+               var7 = var3;
             }
 
-            System.arraycopy(this.readBuffer, (int)(this.__l - this.__q), var1, var2, var8);
-            this.__l += (long)var8;
-            var2 += var8;
-            var3 -= var8;
+            System.arraycopy(this.readBuffer, (int)(this.field51 - this.field47), var1, var2, var7);
+            this.field51 += (long)var7;
+            var2 += var7;
+            var3 -= var7;
          }
 
-         if(var3 > this.readBuffer.length) {
-            this.accessFile.seek(this.__l);
+         if (var3 > this.readBuffer.length) {
+            this.accessFile.seek(this.field51);
 
-            for(this.__d = this.__l; var3 > 0; var3 -= var8) {
-               var8 = this.accessFile.read(var1, var2, var3);
-               if(var8 == -1) {
+            for (this.field53 = this.field51; var3 > 0; var3 -= var7) {
+               var7 = this.accessFile.read(var1, var2, var3);
+               if (var7 == -1) {
                   break;
                }
 
-               this.__d += (long)var8;
-               this.__l += (long)var8;
-               var2 += var8;
+               this.field53 += (long)var7;
+               this.field51 += (long)var7;
+               var2 += var7;
             }
-         } else if(var3 > 0) {
+         } else if (var3 > 0) {
             this.load();
-            var8 = var3;
-            if(var3 > this.__w) {
-               var8 = this.__w;
+            var7 = var3;
+            if (var3 > this.field48) {
+               var7 = this.field48;
             }
 
-            System.arraycopy(this.readBuffer, 0, var1, var2, var8);
-            var2 += var8;
-            var3 -= var8;
-            this.__l += (long)var8;
+            System.arraycopy(this.readBuffer, 0, var1, var2, var7);
+            var2 += var7;
+            var3 -= var7;
+            this.field51 += (long)var7;
          }
 
-         if(-1L != this.__u) {
-            if(this.__u > this.__l && var3 > 0) {
-               var8 = var2 + (int)(this.__u - this.__l);
-               if(var8 > var3 + var2) {
-                  var8 = var3 + var2;
+         if (-1L != this.field49) {
+            if (this.field49 > this.field51 && var3 > 0) {
+               var7 = var2 + (int)(this.field49 - this.field51);
+               if (var7 > var3 + var2) {
+                  var7 = var3 + var2;
                }
 
-               while(var2 < var8) {
+               while (var2 < var7) {
                   var1[var2++] = 0;
                   --var3;
-                  ++this.__l;
+                  ++this.field51;
                }
             }
 
-            long var13 = -1L;
+            long var8 = -1L;
             long var10 = -1L;
-            if(this.__u >= var4 && this.__u < var4 + (long)var7) {
-               var13 = this.__u;
-            } else if(var4 >= this.__u && var4 < this.__u + (long)this.__g) {
-               var13 = var4;
+            if (this.field49 >= var4 && this.field49 < var4 + (long)var6) {
+               var8 = this.field49;
+            } else if (var4 >= this.field49 && var4 < this.field49 + (long)this.field50) {
+               var8 = var4;
             }
 
-            if((long)this.__g + this.__u > var4 && this.__u + (long)this.__g <= var4 + (long)var7) {
-               var10 = (long)this.__g + this.__u;
-            } else if((long)var7 + var4 > this.__u && (long)var7 + var4 <= this.__u + (long)this.__g) {
-               var10 = (long)var7 + var4;
+            if ((long)this.field50 + this.field49 > var4 && this.field49 + (long)this.field50 <= var4 + (long)var6) {
+               var10 = (long)this.field50 + this.field49;
+            } else if ((long)var6 + var4 > this.field49 && (long)var6 + var4 <= this.field49 + (long)this.field50) {
+               var10 = (long)var6 + var4;
             }
 
-            if(var13 > -1L && var10 > var13) {
-               int var12 = (int)(var10 - var13);
-               System.arraycopy(this.writeBuffer, (int)(var13 - this.__u), var1, (int)(var13 - var4) + var2, var12);
-               if(var10 > this.__l) {
-                  var3 = (int)((long)var3 - (var10 - this.__l));
-                  this.__l = var10;
+            if (var8 > -1L && var10 > var8) {
+               int var12 = (int)(var10 - var8);
+               System.arraycopy(this.writeBuffer, (int)(var8 - this.field49), var1, (int)(var8 - var4) + var2, var12);
+               if (var10 > this.field51) {
+                  var3 = (int)((long)var3 - (var10 - this.field51));
+                  this.field51 = var10;
                }
             }
          }
-      } catch (IOException var16) {
-         this.__d = -1L;
-         throw var16;
+      } catch (IOException var13) {
+         this.field53 = -1L;
+         throw var13;
       }
 
-      if(var3 > 0) {
+      if (var3 > 0) {
          throw new EOFException();
       }
    }
@@ -232,20 +232,20 @@ public class BufferedFile {
    )
    @Export("load")
    void load() throws IOException {
-      this.__w = 0;
-      if(this.__d != this.__l) {
-         this.accessFile.seek(this.__l);
-         this.__d = this.__l;
+      this.field48 = 0;
+      if (this.field53 != this.field51) {
+         this.accessFile.seek(this.field51);
+         this.field53 = this.field51;
       }
 
       int var1;
-      for(this.__q = this.__l; this.__w < this.readBuffer.length; this.__w += var1) {
-         var1 = this.accessFile.read(this.readBuffer, this.__w, this.readBuffer.length - this.__w);
-         if(var1 == -1) {
+      for (this.field47 = this.field51; this.field48 < this.readBuffer.length; this.field48 += var1) {
+         var1 = this.accessFile.read(this.readBuffer, this.field48, this.readBuffer.length - this.field48);
+         if (var1 == -1) {
             break;
          }
 
-         this.__d += (long)var1;
+         this.field53 += (long)var1;
       }
 
    }
@@ -258,73 +258,73 @@ public class BufferedFile {
    @Export("write")
    public void write(byte[] var1, int var2, int var3) throws IOException {
       try {
-         if(this.__l + (long)var3 > this.capacity) {
-            this.capacity = this.__l + (long)var3;
+         if (this.field51 + (long)var3 > this.capacity) {
+            this.capacity = this.field51 + (long)var3;
          }
 
-         if(-1L != this.__u && (this.__l < this.__u || this.__l > this.__u + (long)this.__g)) {
+         if (-1L != this.field49 && (this.field51 < this.field49 || this.field51 > this.field49 + (long)this.field50)) {
             this.flush();
          }
 
-         if(this.__u != -1L && (long)var3 + this.__l > this.__u + (long)this.writeBuffer.length) {
-            int var4 = (int)((long)this.writeBuffer.length - (this.__l - this.__u));
-            System.arraycopy(var1, var2, this.writeBuffer, (int)(this.__l - this.__u), var4);
-            this.__l += (long)var4;
+         if (this.field49 != -1L && (long)var3 + this.field51 > this.field49 + (long)this.writeBuffer.length) {
+            int var4 = (int)((long)this.writeBuffer.length - (this.field51 - this.field49));
+            System.arraycopy(var1, var2, this.writeBuffer, (int)(this.field51 - this.field49), var4);
+            this.field51 += (long)var4;
             var2 += var4;
             var3 -= var4;
-            this.__g = this.writeBuffer.length;
+            this.field50 = this.writeBuffer.length;
             this.flush();
          }
 
-         if(var3 <= this.writeBuffer.length) {
-            if(var3 > 0) {
-               if(this.__u == -1L) {
-                  this.__u = this.__l;
+         if (var3 <= this.writeBuffer.length) {
+            if (var3 > 0) {
+               if (this.field49 == -1L) {
+                  this.field49 = this.field51;
                }
 
-               System.arraycopy(var1, var2, this.writeBuffer, (int)(this.__l - this.__u), var3);
-               this.__l += (long)var3;
-               if(this.__l - this.__u > (long)this.__g) {
-                  this.__g = (int)(this.__l - this.__u);
+               System.arraycopy(var1, var2, this.writeBuffer, (int)(this.field51 - this.field49), var3);
+               this.field51 += (long)var3;
+               if (this.field51 - this.field49 > (long)this.field50) {
+                  this.field50 = (int)(this.field51 - this.field49);
                }
-
             }
          } else {
-            if(this.__d != this.__l) {
-               this.accessFile.seek(this.__l);
-               this.__d = this.__l;
+            if (this.field53 != this.field51) {
+               this.accessFile.seek(this.field51);
+               this.field53 = this.field51;
             }
 
             this.accessFile.write(var1, var2, var3);
-            this.__d += (long)var3;
-            if(this.__d > this.__e) {
-               this.__e = this.__d;
+            this.field53 += (long)var3;
+            if (this.field53 > this.field52) {
+               this.field52 = this.field53;
             }
 
-            long var9 = -1L;
+            long var10 = -1L;
             long var6 = -1L;
-            if(this.__l >= this.__q && this.__l < (long)this.__w + this.__q) {
-               var9 = this.__l;
-            } else if(this.__q >= this.__l && this.__q < (long)var3 + this.__l) {
-               var9 = this.__q;
+            if (this.field51 >= this.field47 && this.field51 < (long)this.field48 + this.field47) {
+               var10 = this.field51;
+            } else if (this.field47 >= this.field51 && this.field47 < (long)var3 + this.field51) {
+               var10 = this.field47;
             }
 
-            if(this.__l + (long)var3 > this.__q && (long)var3 + this.__l <= (long)this.__w + this.__q) {
-               var6 = this.__l + (long)var3;
-            } else if((long)this.__w + this.__q > this.__l && this.__q + (long)this.__w <= (long)var3 + this.__l) {
-               var6 = (long)this.__w + this.__q;
+            if (this.field51 + (long)var3 > this.field47 && (long)var3 + this.field51 <= (long)this.field48 + this.field47) {
+               var6 = this.field51 + (long)var3;
+            } else if ((long)this.field48 + this.field47 > this.field51 && this.field47 + (long)this.field48 <= (long)var3 + this.field51) {
+               var6 = (long)this.field48 + this.field47;
             }
 
-            if(var9 > -1L && var6 > var9) {
-               int var8 = (int)(var6 - var9);
-               System.arraycopy(var1, (int)(var9 + (long)var2 - this.__l), this.readBuffer, (int)(var9 - this.__q), var8);
+            if (var10 > -1L && var6 > var10) {
+               int var8 = (int)(var6 - var10);
+               System.arraycopy(var1, (int)(var10 + (long)var2 - this.field51), this.readBuffer, (int)(var10 - this.field47), var8);
             }
 
-            this.__l += (long)var3;
+            this.field51 += (long)var3;
          }
-      } catch (IOException var12) {
-         this.__d = -1L;
-         throw var12;
+
+      } catch (IOException var9) {
+         this.field53 = -1L;
+         throw var9;
       }
    }
 
@@ -335,39 +335,39 @@ public class BufferedFile {
    )
    @Export("flush")
    void flush() throws IOException {
-      if(this.__u != -1L) {
-         if(this.__u != this.__d) {
-            this.accessFile.seek(this.__u);
-            this.__d = this.__u;
+      if (this.field49 != -1L) {
+         if (this.field49 != this.field53) {
+            this.accessFile.seek(this.field49);
+            this.field53 = this.field49;
          }
 
-         this.accessFile.write(this.writeBuffer, 0, this.__g);
-         this.__d += (long)(this.__g * 1290782301) * -1558233611L;
-         if(this.__d > this.__e) {
-            this.__e = this.__d;
+         this.accessFile.write(this.writeBuffer, 0, this.field50);
+         this.field53 += (long)(this.field50 * 1290782301) * -1558233611L;
+         if (this.field53 > this.field52) {
+            this.field52 = this.field53;
          }
 
          long var1 = -1L;
          long var3 = -1L;
-         if(this.__u >= this.__q && this.__u < (long)this.__w + this.__q) {
-            var1 = this.__u;
-         } else if(this.__q >= this.__u && this.__q < this.__u + (long)this.__g) {
-            var1 = this.__q;
+         if (this.field49 >= this.field47 && this.field49 < (long)this.field48 + this.field47) {
+            var1 = this.field49;
+         } else if (this.field47 >= this.field49 && this.field47 < this.field49 + (long)this.field50) {
+            var1 = this.field47;
          }
 
-         if(this.__u + (long)this.__g > this.__q && this.__u + (long)this.__g <= this.__q + (long)this.__w) {
-            var3 = this.__u + (long)this.__g;
-         } else if((long)this.__w + this.__q > this.__u && (long)this.__w + this.__q <= (long)this.__g + this.__u) {
-            var3 = this.__q + (long)this.__w;
+         if (this.field49 + (long)this.field50 > this.field47 && this.field49 + (long)this.field50 <= this.field47 + (long)this.field48) {
+            var3 = this.field49 + (long)this.field50;
+         } else if ((long)this.field48 + this.field47 > this.field49 && (long)this.field48 + this.field47 <= (long)this.field50 + this.field49) {
+            var3 = this.field47 + (long)this.field48;
          }
 
-         if(var1 > -1L && var3 > var1) {
+         if (var1 > -1L && var3 > var1) {
             int var5 = (int)(var3 - var1);
-            System.arraycopy(this.writeBuffer, (int)(var1 - this.__u), this.readBuffer, (int)(var1 - this.__q), var5);
+            System.arraycopy(this.writeBuffer, (int)(var1 - this.field49), this.readBuffer, (int)(var1 - this.field47), var5);
          }
 
-         this.__u = -1L;
-         this.__g = 0;
+         this.field49 = -1L;
+         this.field50 = 0;
       }
 
    }
diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java
index 1b5b13c43e..16f77583d9 100644
--- a/runescape-client/src/main/java/BufferedNetSocket.java
+++ b/runescape-client/src/main/java/BufferedNetSocket.java
@@ -96,14 +96,13 @@ public class BufferedNetSocket extends AbstractSocket {
       try {
          this.socket.close();
       } catch (IOException var2) {
-         ;
       }
 
       this.source.close();
    }
 
    @ObfuscatedName("finalize")
-   protected void __finalize_280() {
+   protected void method75() {
       this.close();
    }
 
diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java
index 3bca5ee7dd..f4d5e0a768 100644
--- a/runescape-client/src/main/java/BufferedSink.java
+++ b/runescape-client/src/main/java/BufferedSink.java
@@ -61,14 +61,14 @@ public class BufferedSink implements Runnable {
    )
    @Export("isClosed")
    boolean isClosed() {
-      if(this.isClosed0) {
+      if (this.isClosed0) {
          try {
             this.outputStream.close();
-            if(this.exception == null) {
+            if (this.exception == null) {
                this.exception = new IOException("");
             }
          } catch (IOException var2) {
-            if(this.exception == null) {
+            if (this.exception == null) {
                this.exception = new IOException(var2);
             }
          }
@@ -86,22 +86,22 @@ public class BufferedSink implements Runnable {
    )
    @Export("write")
    void write(byte[] var1, int var2, int var3) throws IOException {
-      if(var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) {
+      if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) {
          synchronized(this) {
-            if(this.exception != null) {
+            if (this.exception != null) {
                throw new IOException(this.exception.toString());
             } else {
                int var5;
-               if(this.position <= this.limit) {
+               if (this.position <= this.limit) {
                   var5 = this.capacity - this.limit + this.position - 1;
                } else {
                   var5 = this.position - this.limit - 1;
                }
 
-               if(var5 < var3) {
+               if (var5 < var3) {
                   throw new IOException("");
                } else {
-                  if(var3 + this.limit <= this.capacity) {
+                  if (var3 + this.limit <= this.capacity) {
                      System.arraycopy(var1, var2, this.buffer, this.limit, var3);
                   } else {
                      int var6 = this.capacity - this.limit;
@@ -134,7 +134,6 @@ public class BufferedSink implements Runnable {
       try {
          this.thread.join();
       } catch (InterruptedException var3) {
-         ;
       }
 
    }
@@ -142,64 +141,78 @@ public class BufferedSink implements Runnable {
    @Export("run")
    @ObfuscatedName("run")
    public void run() {
-      do {
-         int var1;
-         synchronized(this) {
-            while(true) {
-               if(this.exception != null) {
+      while (true) {
+         synchronized(this){}
+
+         while (true) {
+            boolean var13 = false;
+
+            int var1;
+            try {
+               var13 = true;
+               if (this.exception != null) {
                   return;
                }
 
-               if(this.position <= this.limit) {
+               if (this.position <= this.limit) {
                   var1 = this.limit - this.position;
                } else {
                   var1 = this.capacity - this.position + this.limit;
                }
 
-               if(var1 > 0) {
-                  break;
+               if (var1 <= 0) {
+                  try {
+                     this.outputStream.flush();
+                  } catch (IOException var17) {
+                     this.exception = var17;
+                     return;
+                  }
+
+                  if (this.isClosed()) {
+                     return;
+                  }
+
+                  try {
+                     this.wait();
+                  } catch (InterruptedException var18) {
+                  }
+                  continue;
                }
 
-               try {
-                  this.outputStream.flush();
-               } catch (IOException var11) {
-                  this.exception = var11;
-                  return;
-               }
-
-               if(this.isClosed()) {
-                  return;
-               }
-
-               try {
-                  this.wait();
-               } catch (InterruptedException var12) {
+               var13 = false;
+            } finally {
+               if (var13) {
                   ;
                }
             }
-         }
 
-         try {
-            if(var1 + this.position <= this.capacity) {
-               this.outputStream.write(this.buffer, this.position, var1);
-            } else {
-               int var7 = this.capacity - this.position;
-               this.outputStream.write(this.buffer, this.position, var7);
-               this.outputStream.write(this.buffer, 0, var1 - var7);
+            try {
+               if (var1 + this.position <= this.capacity) {
+                  this.outputStream.write(this.buffer, this.position, var1);
+               } else {
+                  int var2 = this.capacity - this.position;
+                  this.outputStream.write(this.buffer, this.position, var2);
+                  this.outputStream.write(this.buffer, 0, var1 - var2);
+               }
+            } catch (IOException var16) {
+               IOException var3 = var16;
+               synchronized(this) {
+                  this.exception = var3;
+                  return;
+               }
             }
-         } catch (IOException var10) {
-            IOException var2 = var10;
+
             synchronized(this) {
-               this.exception = var2;
-               return;
+               this.position = (var1 + this.position) % this.capacity;
             }
-         }
 
-         synchronized(this) {
-            this.position = (var1 + this.position) % this.capacity;
-         }
-      } while(!this.isClosed());
+            if (!this.isClosed()) {
+               break;
+            }
 
+            return;
+         }
+      }
    }
 
    @ObfuscatedName("m")
@@ -208,18 +221,18 @@ public class BufferedSink implements Runnable {
       garbageValue = "449588720"
    )
    static void method3603() {
-      Tiles.__bq_w = null;
-      Fonts.__kz_o = null;
-      class32.__ay_u = null;
-      class307.__kc_g = null;
-      Tiles.__bq_a = null;
-      Tiles.__bq_l = null;
-      Huffman.__gd_e = null;
-      class13.__i_x = null;
-      Formatting.__cy_d = null;
-      class214.__hf_k = null;
-      WorldMapSectionType.__h_n = null;
-      Message.__bm_i = null;
+      Tiles.field908 = (byte[][][])null;
+      Fonts.field350 = (byte[][][])null;
+      class32.field1157 = (byte[][][])null;
+      class307.field1155 = (byte[][][])null;
+      Tiles.field910 = (int[][][])null;
+      Tiles.field909 = (byte[][][])null;
+      Huffman.field398 = (int[][])null;
+      class13.field1112 = null;
+      Formatting.field353 = null;
+      class214.field1131 = null;
+      WorldMapSectionType.field1104 = null;
+      Message.field490 = null;
    }
 
    @ObfuscatedName("e")
@@ -228,31 +241,31 @@ public class BufferedSink implements Runnable {
       garbageValue = "-1337774818"
    )
    static final void method3595(Widget var0, int var1, byte[] var2, byte[] var3) {
-      if(var0.__cf == null) {
-         if(var2 == null) {
+      if (var0.field966 == null) {
+         if (var2 == null) {
             return;
          }
 
-         var0.__cf = new byte[11][];
-         var0.__cp = new byte[11][];
-         var0.__cc = new int[11];
-         var0.__ci = new int[11];
+         var0.field966 = new byte[11][];
+         var0.field967 = new byte[11][];
+         var0.field968 = new int[11];
+         var0.field969 = new int[11];
       }
 
-      var0.__cf[var1] = var2;
-      if(var2 != null) {
-         var0.__cg = true;
+      var0.field966[var1] = var2;
+      if (var2 != null) {
+         var0.field965 = true;
       } else {
-         var0.__cg = false;
+         var0.field965 = false;
 
-         for(int var4 = 0; var4 < var0.__cf.length; ++var4) {
-            if(var0.__cf[var4] != null) {
-               var0.__cg = true;
+         for (int var4 = 0; var4 < var0.field966.length; ++var4) {
+            if (var0.field966[var4] != null) {
+               var0.field965 = true;
                break;
             }
          }
       }
 
-      var0.__cp[var1] = var3;
+      var0.field967[var1] = var3;
    }
 }
diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java
index 5069205f88..2f5483c779 100644
--- a/runescape-client/src/main/java/BufferedSource.java
+++ b/runescape-client/src/main/java/BufferedSource.java
@@ -14,7 +14,7 @@ public class BufferedSource implements Runnable {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __fh_x;
+   public static AbstractIndexCache field54;
    @ObfuscatedName("m")
    @Export("thread")
    Thread thread;
@@ -64,19 +64,19 @@ public class BufferedSource implements Runnable {
    )
    @Export("isAvailable")
    boolean isAvailable(int var1) throws IOException {
-      if(var1 == 0) {
+      if (var1 == 0) {
          return true;
-      } else if(var1 > 0 && var1 < this.capacity) {
+      } else if (var1 > 0 && var1 < this.capacity) {
          synchronized(this) {
             int var3;
-            if(this.position <= this.limit) {
+            if (this.position <= this.limit) {
                var3 = this.limit - this.position;
             } else {
                var3 = this.capacity - this.position + this.limit;
             }
 
-            if(var3 < var1) {
-               if(this.exception != null) {
+            if (var3 < var1) {
+               if (this.exception != null) {
                   throw new IOException(this.exception.toString());
                } else {
                   this.notifyAll();
@@ -100,13 +100,13 @@ public class BufferedSource implements Runnable {
    int available() throws IOException {
       synchronized(this) {
          int var2;
-         if(this.position <= this.limit) {
+         if (this.position <= this.limit) {
             var2 = this.limit - this.position;
          } else {
             var2 = this.capacity - this.position + this.limit;
          }
 
-         if(var2 <= 0 && this.exception != null) {
+         if (var2 <= 0 && this.exception != null) {
             throw new IOException(this.exception.toString());
          } else {
             this.notifyAll();
@@ -123,8 +123,8 @@ public class BufferedSource implements Runnable {
    @Export("readUnsignedByte")
    int readUnsignedByte() throws IOException {
       synchronized(this) {
-         if(this.position == this.limit) {
-            if(this.exception != null) {
+         if (this.position == this.limit) {
+            if (this.exception != null) {
                throw new IOException(this.exception.toString());
             } else {
                return -1;
@@ -145,23 +145,23 @@ public class BufferedSource implements Runnable {
    )
    @Export("read")
    int read(byte[] var1, int var2, int var3) throws IOException {
-      if(var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) {
+      if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) {
          synchronized(this) {
             int var5;
-            if(this.position <= this.limit) {
+            if (this.position <= this.limit) {
                var5 = this.limit - this.position;
             } else {
                var5 = this.capacity - this.position + this.limit;
             }
 
-            if(var3 > var5) {
+            if (var3 > var5) {
                var3 = var5;
             }
 
-            if(var3 == 0 && this.exception != null) {
+            if (var3 == 0 && this.exception != null) {
                throw new IOException(this.exception.toString());
             } else {
-               if(var3 + this.position <= this.capacity) {
+               if (var3 + this.position <= this.capacity) {
                   System.arraycopy(this.buffer, this.position, var1, var2, var3);
                } else {
                   int var6 = this.capacity - this.position;
@@ -187,7 +187,7 @@ public class BufferedSource implements Runnable {
    @Export("close")
    void close() {
       synchronized(this) {
-         if(this.exception == null) {
+         if (this.exception == null) {
             this.exception = new IOException("");
          }
 
@@ -197,7 +197,6 @@ public class BufferedSource implements Runnable {
       try {
          this.thread.join();
       } catch (InterruptedException var3) {
-         ;
       }
 
    }
@@ -205,50 +204,49 @@ public class BufferedSource implements Runnable {
    @Export("run")
    @ObfuscatedName("run")
    public void run() {
-      while(true) {
+      while (true) {
          int var1;
          synchronized(this) {
-            while(true) {
-               if(this.exception != null) {
+            while (true) {
+               if (this.exception != null) {
                   return;
                }
 
-               if(this.position == 0) {
+               if (this.position == 0) {
                   var1 = this.capacity - this.limit - 1;
-               } else if(this.position <= this.limit) {
+               } else if (this.position <= this.limit) {
                   var1 = this.capacity - this.limit;
                } else {
                   var1 = this.position - this.limit - 1;
                }
 
-               if(var1 > 0) {
+               if (var1 > 0) {
                   break;
                }
 
                try {
                   this.wait();
                } catch (InterruptedException var10) {
-                  ;
                }
             }
          }
 
-         int var7;
+         int var2;
          try {
-            var7 = this.inputStream.read(this.buffer, this.limit, var1);
-            if(var7 == -1) {
+            var2 = this.inputStream.read(this.buffer, this.limit, var1);
+            if (var2 == -1) {
                throw new EOFException();
             }
          } catch (IOException var11) {
-            IOException var3 = var11;
+            IOException var4 = var11;
             synchronized(this) {
-               this.exception = var3;
+               this.exception = var4;
                return;
             }
          }
 
          synchronized(this) {
-            this.limit = (var7 + this.limit) % this.capacity;
+            this.limit = (var2 + this.limit) % this.capacity;
          }
       }
    }
@@ -259,14 +257,14 @@ public class BufferedSource implements Runnable {
       garbageValue = "6"
    )
    static final void method3423(boolean var0) {
-      for(int var1 = 0; var1 < Client.npcCount; ++var1) {
-         Npc var2 = Client.npcs[Client.npcIndices[var1]];
-         if(var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.__e_435()) {
+      for (int var1 = 0; var1 < Client.npcCount; ++var1) {
+         NPC var2 = Client.npcs[Client.npcIndices[var1]];
+         if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.method229()) {
             int var3 = var2.x >> 7;
             int var4 = var2.y >> 7;
-            if(var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) {
-               if(var2.size == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) {
-                  if(Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) {
+            if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) {
+               if (var2.size == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) {
+                  if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) {
                      continue;
                   }
 
@@ -275,7 +273,7 @@ public class BufferedSource implements Runnable {
 
                long var5 = FontName.method5637(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]);
                var2.playerCycle = Client.cycle;
-               class65.scene.__a_239(SoundSystem.plane, var2.x, var2.y, class32.getTileHeight(var2.size * 64 - 64 + var2.x, var2.size * 64 - 64 + var2.y, SoundSystem.plane), var2.size * 64 - 64 + 60, var2, var2.__ac, var5, var2.__ay);
+               class65.scene.method285(SoundSystem.plane, var2.x, var2.y, class32.getTileHeight(var2.size * 64 - 64 + var2.x, var2.size * 64 - 64 + var2.y, SoundSystem.plane), var2.size * 64 - 64 + 60, var2, var2.field9, var5, var2.field10);
             }
          }
       }
diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java
index 8ac8278150..ca26e844a9 100644
--- a/runescape-client/src/main/java/ByteArrayPool.java
+++ b/runescape-client/src/main/java/ByteArrayPool.java
@@ -35,7 +35,7 @@ public class ByteArrayPool {
    @Export("ByteArrayPool_large")
    static byte[][] ByteArrayPool_large;
    @ObfuscatedName("g")
-   static int[] __gi_g;
+   static int[] field55;
    @ObfuscatedName("dz")
    @ObfuscatedSignature(
       signature = "Lit;"
@@ -43,15 +43,6 @@ public class ByteArrayPool {
    @Export("indexCache13")
    static IndexCache indexCache13;
 
-   static {
-      ByteArrayPool_smallCount = 0;
-      ByteArrayPool_mediumCount = 0;
-      ByteArrayPool_largeCount = 0;
-      ByteArrayPool_small = new byte[1000][];
-      ByteArrayPool_medium = new byte[250][];
-      ByteArrayPool_large = new byte[50][];
-   }
-
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "(IZI)[B",
@@ -60,46 +51,42 @@ public class ByteArrayPool {
    @Export("ByteArrayPool_get")
    static synchronized byte[] ByteArrayPool_get(int var0, boolean var1) {
       byte[] var2;
-      if(var0 != 100) {
-         if(var0 < 100) {
-            ;
+      if (var0 != 100) {
+         if (var0 < 100) {
          }
-      } else if(ByteArrayPool_smallCount > 0) {
+      } else if (ByteArrayPool_smallCount > 0) {
          var2 = ByteArrayPool_small[--ByteArrayPool_smallCount];
          ByteArrayPool_small[ByteArrayPool_smallCount] = null;
          return var2;
       }
 
-      if(var0 != 5000) {
-         if(var0 < 5000) {
-            ;
+      if (var0 != 5000) {
+         if (var0 < 5000) {
          }
-      } else if(ByteArrayPool_mediumCount > 0) {
+      } else if (ByteArrayPool_mediumCount > 0) {
          var2 = ByteArrayPool_medium[--ByteArrayPool_mediumCount];
          ByteArrayPool_medium[ByteArrayPool_mediumCount] = null;
          return var2;
       }
 
-      if(var0 != 30000) {
-         if(var0 < 30000) {
-            ;
+      if (var0 != 30000) {
+         if (var0 < 30000) {
          }
-      } else if(ByteArrayPool_largeCount > 0) {
+      } else if (ByteArrayPool_largeCount > 0) {
          var2 = ByteArrayPool_large[--ByteArrayPool_largeCount];
          ByteArrayPool_large[ByteArrayPool_largeCount] = null;
          return var2;
       }
 
-      if(RouteStrategy.__fe_e != null) {
-         for(int var4 = 0; var4 < __gi_g.length; ++var4) {
-            if(__gi_g[var4] != var0) {
-               if(var0 < __gi_g[var4]) {
-                  ;
+      if (RouteStrategy.field760 != null) {
+         for (int var3 = 0; var3 < field55.length; ++var3) {
+            if (field55[var3] != var0) {
+               if (var0 < field55[var3]) {
                }
-            } else if(WorldMapSection2.__ah_l[var4] > 0) {
-               byte[] var3 = RouteStrategy.__fe_e[var4][--WorldMapSection2.__ah_l[var4]];
-               RouteStrategy.__fe_e[var4][WorldMapSection2.__ah_l[var4]] = null;
-               return var3;
+            } else if (WorldMapSection2.field1082[var3] > 0) {
+               byte[] var4 = RouteStrategy.field760[var3][--WorldMapSection2.field1082[var3]];
+               RouteStrategy.field760[var3][WorldMapSection2.field1082[var3]] = null;
+               return var4;
             }
          }
       }
@@ -113,38 +100,47 @@ public class ByteArrayPool {
       garbageValue = "-399583759"
    )
    public static String method4001(int var0, boolean var1) {
-      if(var1 && var0 >= 0) {
-         int var3 = var0;
-         String var2;
-         if(var1 && var0 >= 0) {
+      if (var1 && var0 >= 0) {
+         int var2 = var0;
+         String var3;
+         if (var1 && var0 >= 0) {
             int var4 = 2;
 
-            for(int var5 = var0 / 10; var5 != 0; ++var4) {
+            for (int var5 = var0 / 10; var5 != 0; ++var4) {
                var5 /= 10;
             }
 
-            char[] var6 = new char[var4];
-            var6[0] = '+';
+            char[] var9 = new char[var4];
+            var9[0] = '+';
 
-            for(int var7 = var4 - 1; var7 > 0; --var7) {
-               int var8 = var3;
-               var3 /= 10;
-               int var9 = var8 - var3 * 10;
-               if(var9 >= 10) {
-                  var6[var7] = (char)(var9 + 87);
+            for (int var6 = var4 - 1; var6 > 0; --var6) {
+               int var7 = var2;
+               var2 /= 10;
+               int var8 = var7 - var2 * 10;
+               if (var8 >= 10) {
+                  var9[var6] = (char)(var8 + 87);
                } else {
-                  var6[var7] = (char)(var9 + 48);
+                  var9[var6] = (char)(var8 + 48);
                }
             }
 
-            var2 = new String(var6);
+            var3 = new String(var9);
          } else {
-            var2 = Integer.toString(var0, 10);
+            var3 = Integer.toString(var0, 10);
          }
 
-         return var2;
+         return var3;
       } else {
          return Integer.toString(var0);
       }
    }
+
+   static {
+      ByteArrayPool_smallCount = 0;
+      ByteArrayPool_mediumCount = 0;
+      ByteArrayPool_largeCount = 0;
+      ByteArrayPool_small = new byte[1000][];
+      ByteArrayPool_medium = new byte[250][];
+      ByteArrayPool_large = new byte[50][];
+   }
 }
diff --git a/runescape-client/src/main/java/Bzip2Decompressor.java b/runescape-client/src/main/java/Bzip2Decompressor.java
index b5cee0b5ba..70b8bdb0f8 100644
--- a/runescape-client/src/main/java/Bzip2Decompressor.java
+++ b/runescape-client/src/main/java/Bzip2Decompressor.java
@@ -13,28 +13,24 @@ public final class Bzip2Decompressor {
    @Export("Bzip2Decompressor_state")
    static Bzip2State Bzip2Decompressor_state;
 
-   static {
-      Bzip2Decompressor_state = new Bzip2State();
-   }
-
    @ObfuscatedName("m")
    @Export("Bzip2Decompressor_decompress")
    public static int Bzip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) {
       Bzip2State var5 = Bzip2Decompressor_state;
       synchronized(Bzip2Decompressor_state) {
-         Bzip2Decompressor_state.__g = var2;
-         Bzip2Decompressor_state.__l = var4;
-         Bzip2Decompressor_state.__x = var0;
-         Bzip2Decompressor_state.__d = 0;
-         Bzip2Decompressor_state.__k = var1;
-         Bzip2Decompressor_state.__j = 0;
-         Bzip2Decompressor_state.__z = 0;
-         Bzip2Decompressor_state.__e = 0;
-         Bzip2Decompressor_state.__n = 0;
+         Bzip2Decompressor_state.field62 = var2;
+         Bzip2Decompressor_state.field63 = var4;
+         Bzip2Decompressor_state.field65 = var0;
+         Bzip2Decompressor_state.field66 = 0;
+         Bzip2Decompressor_state.field67 = var1;
+         Bzip2Decompressor_state.field72 = 0;
+         Bzip2Decompressor_state.field71 = 0;
+         Bzip2Decompressor_state.field64 = 0;
+         Bzip2Decompressor_state.field68 = 0;
          method3725(Bzip2Decompressor_state);
-         var1 -= Bzip2Decompressor_state.__k;
-         Bzip2Decompressor_state.__g = null;
-         Bzip2Decompressor_state.__x = null;
+         var1 -= Bzip2Decompressor_state.field67;
+         Bzip2Decompressor_state.field62 = null;
+         Bzip2Decompressor_state.field65 = null;
          return var1;
       }
    }
@@ -44,131 +40,130 @@ public final class Bzip2Decompressor {
       signature = "(Lgt;)V"
    )
    static void method3705(Bzip2State var0) {
-      byte var2 = var0.__i;
-      int var3 = var0.__a;
-      int var4 = var0.__c;
-      int var5 = var0.__h;
-      int[] var6 = WorldMapSection0.__y_p;
-      int var7 = var0.__y;
-      byte[] var8 = var0.__x;
-      int var9 = var0.__d;
-      int var10 = var0.__k;
-      int var12 = var0.__ae + 1;
+      byte var1 = var0.field69;
+      int var2 = var0.field70;
+      int var3 = var0.field78;
+      int var4 = var0.field76;
+      int[] var5 = WorldMapSection0.field1056;
+      int var6 = var0.field75;
+      byte[] var7 = var0.field65;
+      int var8 = var0.field66;
+      int var9 = var0.field67;
+      int var10 = var0.field93 + 1;
 
       label65:
-      while(true) {
-         if(var3 > 0) {
-            while(true) {
-               if(var10 == 0) {
+      while (true) {
+         if (var2 > 0) {
+            while (true) {
+               if (var9 == 0) {
                   break label65;
                }
 
-               if(var3 == 1) {
-                  if(var10 == 0) {
-                     var3 = 1;
+               if (var2 == 1) {
+                  if (var9 == 0) {
+                     var2 = 1;
                      break label65;
                   }
 
-                  var8[var9] = var2;
-                  ++var9;
-                  --var10;
+                  var7[var8] = var1;
+                  ++var8;
+                  --var9;
                   break;
                }
 
-               var8[var9] = var2;
-               --var3;
-               ++var9;
-               --var10;
+               var7[var8] = var1;
+               --var2;
+               ++var8;
+               --var9;
             }
          }
 
-         boolean var14 = true;
+         boolean var11 = true;
 
-         byte var1;
-         while(var14) {
-            var14 = false;
-            if(var4 == var12) {
-               var3 = 0;
+         byte var12;
+         while (var11) {
+            var11 = false;
+            if (var3 == var10) {
+               var2 = 0;
                break label65;
             }
 
-            var2 = (byte)var5;
-            var7 = var6[var7];
-            var1 = (byte)(var7 & 255);
-            var7 >>= 8;
-            ++var4;
-            if(var1 != var5) {
-               var5 = var1;
-               if(var10 == 0) {
-                  var3 = 1;
+            var1 = (byte)var4;
+            var6 = var5[var6];
+            var12 = (byte)(var6 & 255);
+            var6 >>= 8;
+            ++var3;
+            if (var12 != var4) {
+               var4 = var12;
+               if (var9 == 0) {
+                  var2 = 1;
                   break label65;
                }
 
-               var8[var9] = var2;
-               ++var9;
-               --var10;
-               var14 = true;
-            } else if(var4 == var12) {
-               if(var10 == 0) {
-                  var3 = 1;
+               var7[var8] = var1;
+               ++var8;
+               --var9;
+               var11 = true;
+            } else if (var3 == var10) {
+               if (var9 == 0) {
+                  var2 = 1;
                   break label65;
                }
 
-               var8[var9] = var2;
-               ++var9;
-               --var10;
-               var14 = true;
+               var7[var8] = var1;
+               ++var8;
+               --var9;
+               var11 = true;
             }
          }
 
-         var3 = 2;
-         var7 = var6[var7];
-         var1 = (byte)(var7 & 255);
-         var7 >>= 8;
-         ++var4;
-         if(var4 != var12) {
-            if(var1 != var5) {
-               var5 = var1;
+         var2 = 2;
+         var6 = var5[var6];
+         var12 = (byte)(var6 & 255);
+         var6 >>= 8;
+         ++var3;
+         if (var3 != var10) {
+            if (var12 != var4) {
+               var4 = var12;
             } else {
-               var3 = 3;
-               var7 = var6[var7];
-               var1 = (byte)(var7 & 255);
-               var7 >>= 8;
-               ++var4;
-               if(var4 != var12) {
-                  if(var1 != var5) {
-                     var5 = var1;
+               var2 = 3;
+               var6 = var5[var6];
+               var12 = (byte)(var6 & 255);
+               var6 >>= 8;
+               ++var3;
+               if (var3 != var10) {
+                  if (var12 != var4) {
+                     var4 = var12;
                   } else {
-                     var7 = var6[var7];
-                     var1 = (byte)(var7 & 255);
-                     var7 >>= 8;
-                     ++var4;
-                     var3 = (var1 & 255) + 4;
-                     var7 = var6[var7];
-                     var5 = (byte)(var7 & 255);
-                     var7 >>= 8;
-                     ++var4;
+                     var6 = var5[var6];
+                     var12 = (byte)(var6 & 255);
+                     var6 >>= 8;
+                     ++var3;
+                     var2 = (var12 & 255) + 4;
+                     var6 = var5[var6];
+                     var4 = (byte)(var6 & 255);
+                     var6 >>= 8;
+                     ++var3;
                   }
                }
             }
          }
       }
 
-      int var13 = var0.__n;
-      var0.__n += var10 - var10;
-      if(var0.__n < var13) {
-         ;
+      int var13 = var0.field68;
+      var0.field68 += var9 - var9;
+      if (var0.field68 < var13) {
       }
 
-      var0.__i = var2;
-      var0.__a = var3;
-      var0.__c = var4;
-      var0.__h = var5;
-      WorldMapSection0.__y_p = var6;
-      var0.__y = var7;
-      var0.__x = var8;
-      var0.__d = var9;
-      var0.__k = var10;
+      var0.field69 = var1;
+      var0.field70 = var2;
+      var0.field78 = var3;
+      var0.field76 = var4;
+      WorldMapSection0.field1056 = var5;
+      var0.field75 = var6;
+      var0.field65 = var7;
+      var0.field66 = var8;
+      var0.field67 = var9;
    }
 
    @ObfuscatedName("q")
@@ -176,6 +171,9 @@ public final class Bzip2Decompressor {
       signature = "(Lgt;)V"
    )
    static void method3725(Bzip2State var0) {
+      boolean var1 = false;
+      boolean var2 = false;
+      boolean var3 = false;
       boolean var4 = false;
       boolean var5 = false;
       boolean var6 = false;
@@ -191,350 +189,351 @@ public final class Bzip2Decompressor {
       boolean var16 = false;
       boolean var17 = false;
       boolean var18 = false;
-      boolean var19 = false;
-      boolean var20 = false;
-      boolean var21 = false;
-      int var22 = 0;
-      int[] var23 = null;
-      int[] var24 = null;
-      int[] var25 = null;
-      var0.__s = 1;
-      if(WorldMapSection0.__y_p == null) {
-         WorldMapSection0.__y_p = new int[var0.__s * 100000];
+      int var19 = 0;
+      int[] var20 = null;
+      int[] var21 = null;
+      int[] var22 = null;
+      var0.field73 = 1;
+      if (WorldMapSection0.field1056 == null) {
+         WorldMapSection0.field1056 = new int[var0.field73 * 100000];
       }
 
-      boolean var26 = true;
+      boolean var23 = true;
 
-      while(true) {
-         while(var26) {
-            byte var1 = method3707(var0);
-            if(var1 == 23) {
+      while (true) {
+         while (var23) {
+            byte var24 = method3707(var0);
+            if (var24 == 23) {
                return;
             }
 
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3711(var0);
-            if(var1 != 0) {
-               ;
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3711(var0);
+            if (var24 != 0) {
             }
 
-            var0.__t = 0;
-            var1 = method3707(var0);
-            var0.__t = var0.__t << 8 | var1 & 255;
-            var1 = method3707(var0);
-            var0.__t = var0.__t << 8 | var1 & 255;
-            var1 = method3707(var0);
-            var0.__t = var0.__t << 8 | var1 & 255;
+            var0.field74 = 0;
+            var24 = method3707(var0);
+            var0.field74 = var0.field74 << 8 | var24 & 255;
+            var24 = method3707(var0);
+            var0.field74 = var0.field74 << 8 | var24 & 255;
+            var24 = method3707(var0);
+            var0.field74 = var0.field74 << 8 | var24 & 255;
 
-            int var36;
-            for(var36 = 0; var36 < 16; ++var36) {
-               var1 = method3711(var0);
-               if(var1 == 1) {
-                  var0.__aq[var36] = true;
+            int var25;
+            for (var25 = 0; var25 < 16; ++var25) {
+               var24 = method3711(var0);
+               if (var24 == 1) {
+                  var0.field82[var25] = true;
                } else {
-                  var0.__aq[var36] = false;
+                  var0.field82[var25] = false;
                }
             }
 
-            for(var36 = 0; var36 < 256; ++var36) {
-               var0.__ag[var36] = false;
+            for (var25 = 0; var25 < 256; ++var25) {
+               var0.field81[var25] = false;
             }
 
-            int var37;
-            for(var36 = 0; var36 < 16; ++var36) {
-               if(var0.__aq[var36]) {
-                  for(var37 = 0; var37 < 16; ++var37) {
-                     var1 = method3711(var0);
-                     if(var1 == 1) {
-                        var0.__ag[var37 + var36 * 16] = true;
+            int var26;
+            for (var25 = 0; var25 < 16; ++var25) {
+               if (var0.field82[var25]) {
+                  for (var26 = 0; var26 < 16; ++var26) {
+                     var24 = method3711(var0);
+                     if (var24 == 1) {
+                        var0.field81[var26 + var25 * 16] = true;
                      }
                   }
                }
             }
 
             method3710(var0);
-            int var39 = var0.__v + 2;
-            int var40 = method3708(3, var0);
-            int var41 = method3708(15, var0);
+            int var27 = var0.field80 + 2;
+            int var28 = method3708(3, var0);
+            int var29 = method3708(15, var0);
 
-            for(var36 = 0; var36 < var41; ++var36) {
-               var37 = 0;
+            for (var25 = 0; var25 < var29; ++var25) {
+               var26 = 0;
 
-               while(true) {
-                  var1 = method3711(var0);
-                  if(var1 == 0) {
-                     var0.__ay[var36] = (byte)var37;
+               while (true) {
+                  var24 = method3711(var0);
+                  if (var24 == 0) {
+                     var0.field87[var25] = (byte)var26;
                      break;
                   }
 
-                  ++var37;
+                  ++var26;
                }
             }
 
-            byte[] var27 = new byte[6];
+            byte[] var30 = new byte[6];
 
-            byte var29;
-            for(var29 = 0; var29 < var40; var27[var29] = var29++) {
-               ;
+            byte var31;
+            for (var31 = 0; var31 < var28; var30[var31] = var31++) {
             }
 
-            for(var36 = 0; var36 < var41; ++var36) {
-               var29 = var0.__ay[var36];
+            for (var25 = 0; var25 < var29; ++var25) {
+               var31 = var0.field87[var25];
 
-               byte var28;
-               for(var28 = var27[var29]; var29 > 0; --var29) {
-                  var27[var29] = var27[var29 - 1];
+               byte var32;
+               for (var32 = var30[var31]; var31 > 0; --var31) {
+                  var30[var31] = var30[var31 - 1];
                }
 
-               var27[0] = var28;
-               var0.__ac[var36] = var28;
+               var30[0] = var32;
+               var0.field86[var25] = var32;
             }
 
-            int var38;
-            for(var38 = 0; var38 < var40; ++var38) {
-               int var50 = method3708(5, var0);
+            int var33;
+            int var50;
+            for (var50 = 0; var50 < var28; ++var50) {
+               var33 = method3708(5, var0);
 
-               for(var36 = 0; var36 < var39; ++var36) {
-                  while(true) {
-                     var1 = method3711(var0);
-                     if(var1 == 0) {
-                        var0.__ah[var38][var36] = (byte)var50;
+               for (var25 = 0; var25 < var27; ++var25) {
+                  while (true) {
+                     var24 = method3711(var0);
+                     if (var24 == 0) {
+                        var0.field88[var50][var25] = (byte)var33;
                         break;
                      }
 
-                     var1 = method3711(var0);
-                     if(var1 == 0) {
-                        ++var50;
+                     var24 = method3711(var0);
+                     if (var24 == 0) {
+                        ++var33;
                      } else {
-                        --var50;
+                        --var33;
                      }
                   }
                }
             }
 
-            for(var38 = 0; var38 < var40; ++var38) {
-               byte var2 = 32;
-               byte var3 = 0;
+            for (var50 = 0; var50 < var28; ++var50) {
+               byte var51 = 32;
+               byte var34 = 0;
 
-               for(var36 = 0; var36 < var39; ++var36) {
-                  if(var0.__ah[var38][var36] > var3) {
-                     var3 = var0.__ah[var38][var36];
+               for (var25 = 0; var25 < var27; ++var25) {
+                  if (var0.field88[var50][var25] > var34) {
+                     var34 = var0.field88[var50][var25];
                   }
 
-                  if(var0.__ah[var38][var36] < var2) {
-                     var2 = var0.__ah[var38][var36];
+                  if (var0.field88[var50][var25] < var51) {
+                     var51 = var0.field88[var50][var25];
                   }
                }
 
-               method3706(var0.__ak[var38], var0.__aw[var38], var0.__al[var38], var0.__ah[var38], var2, var3, var39);
-               var0.__ab[var38] = var2;
+               method3706(var0.field89[var50], var0.field90[var50], var0.field91[var50], var0.field88[var50], var51, var34, var27);
+               var0.field92[var50] = var51;
             }
 
-            int var42 = var0.__v + 1;
-            int var43 = -1;
-            byte var44 = 0;
+            var33 = var0.field80 + 1;
+            int var52 = -1;
+            byte var35 = 0;
 
-            for(var36 = 0; var36 <= 255; ++var36) {
-               var0.__b[var36] = 0;
+            for (var25 = 0; var25 <= 255; ++var25) {
+               var0.field77[var25] = 0;
             }
 
-            int var56 = 4095;
+            int var36 = 4095;
 
-            int var35;
-            int var55;
-            for(var35 = 15; var35 >= 0; --var35) {
-               for(var55 = 15; var55 >= 0; --var55) {
-                  var0.__av[var56] = (byte)(var55 + var35 * 16);
-                  --var56;
+            int var37;
+            int var38;
+            for (var37 = 15; var37 >= 0; --var37) {
+               for (var38 = 15; var38 >= 0; --var38) {
+                  var0.field84[var36] = (byte)(var38 + var37 * 16);
+                  --var36;
                }
 
-               var0.__ar[var35] = var56 + 1;
+               var0.field85[var37] = var36 + 1;
             }
 
-            int var47 = 0;
-            byte var54;
-            if(var44 == 0) {
-               ++var43;
-               var44 = 50;
-               var54 = var0.__ac[var43];
-               var22 = var0.__ab[var54];
-               var23 = var0.__ak[var54];
-               var25 = var0.__al[var54];
-               var24 = var0.__aw[var54];
+            int var39 = 0;
+            byte var40;
+            if (var35 == 0) {
+               ++var52;
+               var35 = 50;
+               var40 = var0.field86[var52];
+               var19 = var0.field92[var40];
+               var20 = var0.field89[var40];
+               var22 = var0.field91[var40];
+               var21 = var0.field90[var40];
             }
 
-            int var45 = var44 - 1;
-            int var51 = var22;
+            int var41 = var35 - 1;
+            int var42 = var19;
 
-            int var52;
-            byte var53;
-            for(var52 = method3708(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) {
-               ++var51;
-               var53 = method3711(var0);
+            int var43;
+            byte var44;
+            for (var43 = method3708(var19, var0); var43 > var20[var42]; var43 = var43 << 1 | var44) {
+               ++var42;
+               var44 = method3711(var0);
             }
 
-            int var46 = var25[var52 - var24[var51]];
+            int var45 = var22[var43 - var21[var42]];
 
-            while(true) {
-               while(var46 != var42) {
-                  if(var46 != 0 && var46 != 1) {
-                     int var33 = var46 - 1;
-                     int var30;
-                     if(var33 < 16) {
-                        var30 = var0.__ar[0];
+            while (true) {
+               int[] var10000;
+               int var54;
+               while (var45 != var33) {
+                  int var46;
+                  int var47;
+                  if (var45 != 0 && var45 != 1) {
+                     var46 = var45 - 1;
+                     int var48;
+                     if (var46 < 16) {
+                        var47 = var0.field85[0];
 
-                        for(var1 = var0.__av[var30 + var33]; var33 > 3; var33 -= 4) {
-                           int var34 = var30 + var33;
-                           var0.__av[var34] = var0.__av[var34 - 1];
-                           var0.__av[var34 - 1] = var0.__av[var34 - 2];
-                           var0.__av[var34 - 2] = var0.__av[var34 - 3];
-                           var0.__av[var34 - 3] = var0.__av[var34 - 4];
+                        for (var24 = var0.field84[var47 + var46]; var46 > 3; var46 -= 4) {
+                           var48 = var47 + var46;
+                           var0.field84[var48] = var0.field84[var48 - 1];
+                           var0.field84[var48 - 1] = var0.field84[var48 - 2];
+                           var0.field84[var48 - 2] = var0.field84[var48 - 3];
+                           var0.field84[var48 - 3] = var0.field84[var48 - 4];
                         }
 
-                        while(var33 > 0) {
-                           var0.__av[var30 + var33] = var0.__av[var30 + var33 - 1];
-                           --var33;
+                        while (var46 > 0) {
+                           var0.field84[var47 + var46] = var0.field84[var47 + var46 - 1];
+                           --var46;
                         }
 
-                        var0.__av[var30] = var1;
+                        var0.field84[var47] = var24;
                      } else {
-                        int var31 = var33 / 16;
-                        int var32 = var33 % 16;
-                        var30 = var0.__ar[var31] + var32;
+                        var48 = var46 / 16;
+                        int var49 = var46 % 16;
+                        var47 = var0.field85[var48] + var49;
 
-                        for(var1 = var0.__av[var30]; var30 > var0.__ar[var31]; --var30) {
-                           var0.__av[var30] = var0.__av[var30 - 1];
+                        for (var24 = var0.field84[var47]; var47 > var0.field85[var48]; --var47) {
+                           var0.field84[var47] = var0.field84[var47 - 1];
                         }
 
-                        ++var0.__ar[var31];
-
-                        while(var31 > 0) {
-                           --var0.__ar[var31];
-                           var0.__av[var0.__ar[var31]] = var0.__av[var0.__ar[var31 - 1] + 16 - 1];
-                           --var31;
+                        for (var54 = var0.field85[var48]++; var48 > 0; --var48) {
+                           var54 = var0.field85[var48]--;
+                           var0.field84[var0.field85[var48]] = var0.field84[var0.field85[var48 - 1] + 16 - 1];
                         }
 
-                        --var0.__ar[0];
-                        var0.__av[var0.__ar[0]] = var1;
-                        if(var0.__ar[0] == 0) {
-                           var56 = 4095;
+                        var54 = var0.field85[0]--;
+                        var0.field84[var0.field85[0]] = var24;
+                        if (var0.field85[0] == 0) {
+                           var36 = 4095;
 
-                           for(var35 = 15; var35 >= 0; --var35) {
-                              for(var55 = 15; var55 >= 0; --var55) {
-                                 var0.__av[var56] = var0.__av[var0.__ar[var35] + var55];
-                                 --var56;
+                           for (var37 = 15; var37 >= 0; --var37) {
+                              for (var38 = 15; var38 >= 0; --var38) {
+                                 var0.field84[var36] = var0.field84[var0.field85[var37] + var38];
+                                 --var36;
                               }
 
-                              var0.__ar[var35] = var56 + 1;
+                              var0.field85[var37] = var36 + 1;
                            }
                         }
                      }
 
-                     ++var0.__b[var0.__aj[var1 & 255] & 255];
-                     WorldMapSection0.__y_p[var47] = var0.__aj[var1 & 255] & 255;
-                     ++var47;
-                     if(var45 == 0) {
-                        ++var43;
-                        var45 = 50;
-                        var54 = var0.__ac[var43];
-                        var22 = var0.__ab[var54];
-                        var23 = var0.__ak[var54];
-                        var25 = var0.__al[var54];
-                        var24 = var0.__aw[var54];
+                     var54 = var0.field77[var0.field83[var24 & 255] & 255]++;
+                     WorldMapSection0.field1056[var39] = var0.field83[var24 & 255] & 255;
+                     ++var39;
+                     if (var41 == 0) {
+                        ++var52;
+                        var41 = 50;
+                        var40 = var0.field86[var52];
+                        var19 = var0.field92[var40];
+                        var20 = var0.field89[var40];
+                        var22 = var0.field91[var40];
+                        var21 = var0.field90[var40];
                      }
 
-                     --var45;
-                     var51 = var22;
+                     --var41;
+                     var42 = var19;
 
-                     for(var52 = method3708(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) {
-                        ++var51;
-                        var53 = method3711(var0);
+                     for (var43 = method3708(var19, var0); var43 > var20[var42]; var43 = var43 << 1 | var44) {
+                        ++var42;
+                        var44 = method3711(var0);
                      }
 
-                     var46 = var25[var52 - var24[var51]];
+                     var45 = var22[var43 - var21[var42]];
                   } else {
-                     int var48 = -1;
-                     int var49 = 1;
+                     var46 = -1;
+                     var47 = 1;
 
                      do {
-                        if(var46 == 0) {
-                           var48 += var49;
-                        } else if(var46 == 1) {
-                           var48 += var49 * 2;
+                        if (var45 == 0) {
+                           var46 += var47;
+                        } else if (var45 == 1) {
+                           var46 += var47 * 2;
                         }
 
-                        var49 *= 2;
-                        if(var45 == 0) {
-                           ++var43;
-                           var45 = 50;
-                           var54 = var0.__ac[var43];
-                           var22 = var0.__ab[var54];
-                           var23 = var0.__ak[var54];
-                           var25 = var0.__al[var54];
-                           var24 = var0.__aw[var54];
+                        var47 *= 2;
+                        if (var41 == 0) {
+                           ++var52;
+                           var41 = 50;
+                           var40 = var0.field86[var52];
+                           var19 = var0.field92[var40];
+                           var20 = var0.field89[var40];
+                           var22 = var0.field91[var40];
+                           var21 = var0.field90[var40];
                         }
 
-                        --var45;
-                        var51 = var22;
+                        --var41;
+                        var42 = var19;
 
-                        for(var52 = method3708(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) {
-                           ++var51;
-                           var53 = method3711(var0);
+                        for (var43 = method3708(var19, var0); var43 > var20[var42]; var43 = var43 << 1 | var44) {
+                           ++var42;
+                           var44 = method3711(var0);
                         }
 
-                        var46 = var25[var52 - var24[var51]];
-                     } while(var46 == 0 || var46 == 1);
+                        var45 = var22[var43 - var21[var42]];
+                     } while(var45 == 0 || var45 == 1);
 
-                     ++var48;
-                     var1 = var0.__aj[var0.__av[var0.__ar[0]] & 255];
+                     ++var46;
+                     var24 = var0.field83[var0.field84[var0.field85[0]] & 255];
+                     var10000 = var0.field77;
 
-                     for(var0.__b[var1 & 255] += var48; var48 > 0; --var48) {
-                        WorldMapSection0.__y_p[var47] = var1 & 255;
-                        ++var47;
+                     for (var10000[var24 & 255] += var46; var46 > 0; --var46) {
+                        WorldMapSection0.field1056[var39] = var24 & 255;
+                        ++var39;
                      }
                   }
                }
 
-               var0.__a = 0;
-               var0.__i = 0;
-               var0.__r[0] = 0;
+               var0.field70 = 0;
+               var0.field69 = 0;
+               var0.field79[0] = 0;
 
-               for(var36 = 1; var36 <= 256; ++var36) {
-                  var0.__r[var36] = var0.__b[var36 - 1];
+               for (var25 = 1; var25 <= 256; ++var25) {
+                  var0.field79[var25] = var0.field77[var25 - 1];
                }
 
-               for(var36 = 1; var36 <= 256; ++var36) {
-                  var0.__r[var36] += var0.__r[var36 - 1];
+               for (var25 = 1; var25 <= 256; ++var25) {
+                  var10000 = var0.field79;
+                  var10000[var25] += var0.field79[var25 - 1];
                }
 
-               for(var36 = 0; var36 < var47; ++var36) {
-                  var1 = (byte)(WorldMapSection0.__y_p[var36] & 255);
-                  WorldMapSection0.__y_p[var0.__r[var1 & 255]] |= var36 << 8;
-                  ++var0.__r[var1 & 255];
+               for (var25 = 0; var25 < var39; ++var25) {
+                  var24 = (byte)(WorldMapSection0.field1056[var25] & 255);
+                  var10000 = WorldMapSection0.field1056;
+                  int var53 = var0.field79[var24 & 255];
+                  var10000[var53] |= var25 << 8;
+                  var54 = var0.field79[var24 & 255]++;
                }
 
-               var0.__y = WorldMapSection0.__y_p[var0.__t] >> 8;
-               var0.__c = 0;
-               var0.__y = WorldMapSection0.__y_p[var0.__y];
-               var0.__h = (byte)(var0.__y & 255);
-               var0.__y >>= 8;
-               ++var0.__c;
-               var0.__ae = var47;
+               var0.field75 = WorldMapSection0.field1056[var0.field74] >> 8;
+               var0.field78 = 0;
+               var0.field75 = WorldMapSection0.field1056[var0.field75];
+               var0.field76 = (byte)(var0.field75 & 255);
+               var0.field75 >>= 8;
+               ++var0.field78;
+               var0.field93 = var39;
                method3705(var0);
-               if(var0.__ae + 1 == var0.__c && var0.__a == 0) {
-                  var26 = true;
+               if (var0.field93 + 1 == var0.field78 && var0.field70 == 0) {
+                  var23 = true;
                   break;
                }
 
-               var26 = false;
+               var23 = false;
                break;
             }
          }
@@ -564,19 +563,18 @@ public final class Bzip2Decompressor {
       signature = "(ILgt;)I"
    )
    static int method3708(int var0, Bzip2State var1) {
-      while(var1.__j < var0) {
-         var1.__z = var1.__z << 8 | var1.__g[var1.__l] & 255;
-         var1.__j += 8;
-         ++var1.__l;
-         ++var1.__e;
-         if(var1.__e == 0) {
-            ;
+      while (var1.field72 < var0) {
+         var1.field71 = var1.field71 << 8 | var1.field62[var1.field63] & 255;
+         var1.field72 += 8;
+         ++var1.field63;
+         ++var1.field64;
+         if (var1.field64 == 0) {
          }
       }
 
-      int var3 = var1.__z >> var1.__j - var0 & (1 << var0) - 1;
-      var1.__j -= var0;
-      return var3;
+      int var2 = var1.field71 >> var1.field72 - var0 & (1 << var0) - 1;
+      var1.field72 -= var0;
+      return var2;
    }
 
    @ObfuscatedName("g")
@@ -584,12 +582,12 @@ public final class Bzip2Decompressor {
       signature = "(Lgt;)V"
    )
    static void method3710(Bzip2State var0) {
-      var0.__v = 0;
+      var0.field80 = 0;
 
-      for(int var1 = 0; var1 < 256; ++var1) {
-         if(var0.__ag[var1]) {
-            var0.__aj[var0.__v] = (byte)var1;
-            ++var0.__v;
+      for (int var1 = 0; var1 < 256; ++var1) {
+         if (var0.field81[var1]) {
+            var0.field83[var0.field80] = (byte)var1;
+            ++var0.field80;
          }
       }
 
@@ -600,42 +598,47 @@ public final class Bzip2Decompressor {
       int var7 = 0;
 
       int var8;
-      for(var8 = var4; var8 <= var5; ++var8) {
-         for(int var9 = 0; var9 < var6; ++var9) {
-            if(var8 == var3[var9]) {
+      int var9;
+      for (var8 = var4; var8 <= var5; ++var8) {
+         for (var9 = 0; var9 < var6; ++var9) {
+            if (var8 == var3[var9]) {
                var2[var7] = var9;
                ++var7;
             }
          }
       }
 
-      for(var8 = 0; var8 < 23; ++var8) {
+      for (var8 = 0; var8 < 23; ++var8) {
          var1[var8] = 0;
       }
 
-      for(var8 = 0; var8 < var6; ++var8) {
+      for (var8 = 0; var8 < var6; ++var8) {
          ++var1[var3[var8] + 1];
       }
 
-      for(var8 = 1; var8 < 23; ++var8) {
+      for (var8 = 1; var8 < 23; ++var8) {
          var1[var8] += var1[var8 - 1];
       }
 
-      for(var8 = 0; var8 < 23; ++var8) {
+      for (var8 = 0; var8 < 23; ++var8) {
          var0[var8] = 0;
       }
 
-      int var10 = 0;
+      var9 = 0;
 
-      for(var8 = var4; var8 <= var5; ++var8) {
-         var10 += var1[var8 + 1] - var1[var8];
-         var0[var8] = var10 - 1;
-         var10 <<= 1;
+      for (var8 = var4; var8 <= var5; ++var8) {
+         var9 += var1[var8 + 1] - var1[var8];
+         var0[var8] = var9 - 1;
+         var9 <<= 1;
       }
 
-      for(var8 = var4 + 1; var8 <= var5; ++var8) {
+      for (var8 = var4 + 1; var8 <= var5; ++var8) {
          var1[var8] = (var0[var8 - 1] + 1 << 1) - var1[var8];
       }
 
    }
+
+   static {
+      Bzip2Decompressor_state = new Bzip2State();
+   }
 }
diff --git a/runescape-client/src/main/java/Bzip2State.java b/runescape-client/src/main/java/Bzip2State.java
index 41c6b17ddc..8bc2fb66a7 100644
--- a/runescape-client/src/main/java/Bzip2State.java
+++ b/runescape-client/src/main/java/Bzip2State.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
@@ -7,149 +6,149 @@ import net.runelite.mapping.ObfuscatedName;
 @Implements("Bzip2State")
 public final class Bzip2State {
    @ObfuscatedName("m")
-   final int __m;
+   final int field56;
    @ObfuscatedName("f")
-   final int __f;
+   final int field57;
    @ObfuscatedName("q")
-   final int __q;
+   final int field58;
    @ObfuscatedName("w")
-   final int __w;
+   final int field59;
    @ObfuscatedName("o")
-   final int __o;
+   final int field60;
    @ObfuscatedName("u")
-   final int __u;
+   final int field61;
    @ObfuscatedName("g")
-   byte[] __g;
+   byte[] field62;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -1510817847
    )
-   int __l;
+   int field63;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -473971741
    )
-   int __e;
+   int field64;
    @ObfuscatedName("x")
-   byte[] __x;
+   byte[] field65;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = -861462251
    )
-   int __d;
+   int field66;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = 594179173
    )
-   int __k;
+   int field67;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
       intValue = 1860254567
    )
-   int __n;
+   int field68;
    @ObfuscatedName("i")
-   byte __i;
+   byte field69;
    @ObfuscatedName("a")
    @ObfuscatedGetter(
       intValue = -1994129645
    )
-   int __a;
+   int field70;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = -1793367959
    )
-   int __z;
+   int field71;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = -1987934943
    )
-   int __j;
+   int field72;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = 1172102327
    )
-   int __s;
+   int field73;
    @ObfuscatedName("t")
    @ObfuscatedGetter(
       intValue = 1502359789
    )
-   int __t;
+   int field74;
    @ObfuscatedName("y")
    @ObfuscatedGetter(
       intValue = -953353963
    )
-   int __y;
+   int field75;
    @ObfuscatedName("h")
    @ObfuscatedGetter(
       intValue = -1981923611
    )
-   int __h;
+   int field76;
    @ObfuscatedName("b")
-   int[] __b;
+   int[] field77;
    @ObfuscatedName("c")
    @ObfuscatedGetter(
       intValue = -557334365
    )
-   int __c;
+   int field78;
    @ObfuscatedName("r")
-   int[] __r;
+   int[] field79;
    @ObfuscatedName("v")
    @ObfuscatedGetter(
       intValue = -886333045
    )
-   int __v;
+   int field80;
    @ObfuscatedName("ag")
-   boolean[] __ag;
+   boolean[] field81;
    @ObfuscatedName("aq")
-   boolean[] __aq;
+   boolean[] field82;
    @ObfuscatedName("aj")
-   byte[] __aj;
+   byte[] field83;
    @ObfuscatedName("av")
-   byte[] __av;
+   byte[] field84;
    @ObfuscatedName("ar")
-   int[] __ar;
+   int[] field85;
    @ObfuscatedName("ac")
-   byte[] __ac;
+   byte[] field86;
    @ObfuscatedName("ay")
-   byte[] __ay;
+   byte[] field87;
    @ObfuscatedName("ah")
-   byte[][] __ah;
+   byte[][] field88;
    @ObfuscatedName("ak")
-   int[][] __ak;
+   int[][] field89;
    @ObfuscatedName("aw")
-   int[][] __aw;
+   int[][] field90;
    @ObfuscatedName("al")
-   int[][] __al;
+   int[][] field91;
    @ObfuscatedName("ab")
-   int[] __ab;
+   int[] field92;
    @ObfuscatedName("ae")
    @ObfuscatedGetter(
       intValue = 444639767
    )
-   int __ae;
+   int field93;
 
    Bzip2State() {
-      this.__m = 4096;
-      this.__f = 16;
-      this.__q = 258;
-      this.__w = 6;
-      this.__o = 50;
-      this.__u = 18002;
-      this.__l = 0;
-      this.__d = 0;
-      this.__b = new int[256];
-      this.__r = new int[257];
-      this.__ag = new boolean[256];
-      this.__aq = new boolean[16];
-      this.__aj = new byte[256];
-      this.__av = new byte[4096];
-      this.__ar = new int[16];
-      this.__ac = new byte[18002];
-      this.__ay = new byte[18002];
-      this.__ah = new byte[6][258];
-      this.__ak = new int[6][258];
-      this.__aw = new int[6][258];
-      this.__al = new int[6][258];
-      this.__ab = new int[6];
+      this.field56 = 4096;
+      this.field57 = 16;
+      this.field58 = 258;
+      this.field59 = 6;
+      this.field60 = 50;
+      this.field61 = 18002;
+      this.field63 = 0;
+      this.field66 = 0;
+      this.field77 = new int[256];
+      this.field79 = new int[257];
+      this.field81 = new boolean[256];
+      this.field82 = new boolean[16];
+      this.field83 = new byte[256];
+      this.field84 = new byte[4096];
+      this.field85 = new int[16];
+      this.field86 = new byte[18002];
+      this.field87 = new byte[18002];
+      this.field88 = new byte[6][258];
+      this.field89 = new int[6][258];
+      this.field90 = new int[6][258];
+      this.field91 = new int[6][258];
+      this.field92 = new int[6];
    }
 }
diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java
index ccea55acb9..6b70aefc8e 100644
--- a/runescape-client/src/main/java/Canvas.java
+++ b/runescape-client/src/main/java/Canvas.java
@@ -15,12 +15,12 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Canvas")
 public final class Canvas extends java.awt.Canvas {
    @ObfuscatedName("s")
-   public static String[] __ao_s;
+   public static String[] field94;
    @ObfuscatedName("gk")
    @ObfuscatedGetter(
       intValue = -1131782991
    )
-   static int __ao_gk;
+   static int field95;
    @ObfuscatedName("jk")
    @ObfuscatedSignature(
       signature = "Lbr;"
@@ -54,7 +54,7 @@ public final class Canvas extends java.awt.Canvas {
    )
    static String method860(Throwable var0) throws IOException {
       String var1;
-      if(var0 instanceof RunException) {
+      if (var0 instanceof RunException) {
          RunException var2 = (RunException)var0;
          var1 = var2.string + " | ";
          var0 = var2.throwable;
@@ -70,20 +70,20 @@ public final class Canvas extends java.awt.Canvas {
       BufferedReader var5 = new BufferedReader(new StringReader(var4));
       String var6 = var5.readLine();
 
-      while(true) {
-         while(true) {
+      while (true) {
+         while (true) {
             String var7 = var5.readLine();
-            if(var7 == null) {
+            if (var7 == null) {
                var1 = var1 + "| " + var6;
                return var1;
             }
 
             int var8 = var7.indexOf(40);
             int var9 = var7.indexOf(41, var8 + 1);
-            if(var8 >= 0 && var9 >= 0) {
+            if (var8 >= 0 && var9 >= 0) {
                String var10 = var7.substring(var8 + 1, var9);
                int var11 = var10.indexOf(".java:");
-               if(var11 >= 0) {
+               if (var11 >= 0) {
                   var10 = var10.substring(0, var11) + var10.substring(var11 + 5);
                   var1 = var1 + var10 + ' ';
                   continue;
@@ -117,42 +117,43 @@ public final class Canvas extends java.awt.Canvas {
    static int method861(int var0, Script var1, boolean var2) {
       int var3;
       int var4;
-      if(var0 == 100) {
+      Widget var6;
+      if (var0 == 100) {
          RouteStrategy.Interpreter_intStackSize -= 3;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         int var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-         if(var4 == 0) {
+         int var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+         if (var4 == 0) {
             throw new RuntimeException();
          } else {
-            Widget var6 = Huffman.getWidget(var3);
-            if(var6.children == null) {
-               var6.children = new Widget[var5 + 1];
+            var6 = Huffman.getWidget(var3);
+            if (var6.children == null) {
+               var6.children = new Widget[var9 + 1];
             }
 
-            if(var6.children.length <= var5) {
-               Widget[] var7 = new Widget[var5 + 1];
+            if (var6.children.length <= var9) {
+               Widget[] var7 = new Widget[var9 + 1];
 
-               for(int var8 = 0; var8 < var6.children.length; ++var8) {
+               for (int var8 = 0; var8 < var6.children.length; ++var8) {
                   var7[var8] = var6.children[var8];
                }
 
                var6.children = var7;
             }
 
-            if(var5 > 0 && var6.children[var5 - 1] == null) {
-               throw new RuntimeException("" + (var5 - 1));
+            if (var9 > 0 && var6.children[var9 - 1] == null) {
+               throw new RuntimeException("" + (var9 - 1));
             } else {
-               Widget var12 = new Widget();
-               var12.type = var4;
-               var12.parentId = var12.id = var6.id;
-               var12.childIndex = var5;
-               var12.isIf3 = true;
-               var6.children[var5] = var12;
-               if(var2) {
-                  WorldMapIcon1.__t_i = var12;
+               Widget var10 = new Widget();
+               var10.type = var4;
+               var10.parentId = var10.id = var6.id;
+               var10.childIndex = var9;
+               var10.isIf3 = true;
+               var6.children[var9] = var10;
+               if (var2) {
+                  WorldMapIcon1.field1030 = var10;
                } else {
-                  class12.__n_n = var12;
+                  class12.field1111 = var10;
                }
 
                class22.method295(var6);
@@ -160,27 +161,27 @@ public final class Canvas extends java.awt.Canvas {
             }
          }
       } else {
-         Widget var9;
-         if(var0 == 101) {
-            var9 = var2?WorldMapIcon1.__t_i:class12.__n_n;
-            Widget var10 = Huffman.getWidget(var9.id);
-            var10.children[var9.childIndex] = null;
-            class22.method295(var10);
+         Widget var5;
+         if (var0 == 101) {
+            var5 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+            var6 = Huffman.getWidget(var5.id);
+            var6.children[var5.childIndex] = null;
+            class22.method295(var6);
             return 1;
-         } else if(var0 == 102) {
-            var9 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-            var9.children = null;
-            class22.method295(var9);
+         } else if (var0 == 102) {
+            var5 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+            var5.children = null;
+            class22.method295(var5);
             return 1;
-         } else if(var0 != 200) {
-            if(var0 == 201) {
-               var9 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-               if(var9 != null) {
+         } else if (var0 != 200) {
+            if (var0 == 201) {
+               var5 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+               if (var5 != null) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
-                  if(var2) {
-                     WorldMapIcon1.__t_i = var9;
+                  if (var2) {
+                     WorldMapIcon1.field1030 = var5;
                   } else {
-                     class12.__n_n = var9;
+                     class12.field1111 = var5;
                   }
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -194,13 +195,13 @@ public final class Canvas extends java.awt.Canvas {
             RouteStrategy.Interpreter_intStackSize -= 2;
             var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
             var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-            Widget var11 = class204.getWidgetChild(var3, var4);
-            if(var11 != null && var4 != -1) {
+            var6 = class204.getWidgetChild(var3, var4);
+            if (var6 != null && var4 != -1) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
-               if(var2) {
-                  WorldMapIcon1.__t_i = var11;
+               if (var2) {
+                  WorldMapIcon1.field1030 = var6;
                } else {
-                  class12.__n_n = var11;
+                  class12.field1111 = var6;
                }
             } else {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -219,13 +220,13 @@ public final class Canvas extends java.awt.Canvas {
    public static void method858(int var0, AbstractIndexCache var1, String var2, String var3, int var4, boolean var5) {
       int var6 = var1.getArchiveId(var2);
       int var7 = var1.getRecordId(var6, var3);
-      class214.__hf_o = 1;
-      class214.__hf_u = var1;
+      class214.field1129 = 1;
+      class214.field1130 = var1;
       class30.musicTrackArchiveId = var6;
       GrandExchangeOffer.musicTrackFileId = var7;
-      WorldMapLabel.__aj_e = var4;
+      WorldMapLabel.field1039 = var4;
       RectangleMode.musicTrackBoolean = var5;
-      FaceNormal.__el_x = var0;
+      FaceNormal.field344 = var0;
    }
 
    @ObfuscatedName("ha")
@@ -234,27 +235,27 @@ public final class Canvas extends java.awt.Canvas {
       garbageValue = "-1032035944"
    )
    static final void method855() {
-      for(class68 var0 = (class68)Client.__client_kh.last(); var0 != null; var0 = (class68)Client.__client_kh.previous()) {
-         if(var0.field910 > 0) {
+      for (class68 var0 = (class68)Client.field214.last(); var0 != null; var0 = (class68)Client.field214.previous()) {
+         if (var0.field910 > 0) {
             --var0.field910;
          }
 
-         if(var0.field910 == 0) {
-            if(var0.field903 < 0 || VarbitDefinition.method4910(var0.field903, var0.field905)) {
+         if (var0.field910 == 0) {
+            if (var0.field903 < 0 || VarbitDefinition.method4910(var0.field903, var0.field905)) {
                ParamKeyDefinition.method4933(var0.field911, var0.field906, var0.field913, var0.field901, var0.field903, var0.field904, var0.field905);
                var0.remove();
             }
          } else {
-            if(var0.field909 > 0) {
+            if (var0.field909 > 0) {
                --var0.field909;
             }
 
-            if(var0.field909 == 0 && var0.field913 >= 1 && var0.field901 >= 1 && var0.field913 <= 102 && var0.field901 <= 102 && (var0.field899 < 0 || VarbitDefinition.method4910(var0.field899, var0.field908))) {
+            if (var0.field909 == 0 && var0.field913 >= 1 && var0.field901 >= 1 && var0.field913 <= 102 && var0.field901 <= 102 && (var0.field899 < 0 || VarbitDefinition.method4910(var0.field899, var0.field908))) {
                ParamKeyDefinition.method4933(var0.field911, var0.field906, var0.field913, var0.field901, var0.field899, var0.field907, var0.field908);
                var0.field909 = -1;
-               if(var0.field903 == var0.field899 && var0.field903 == -1) {
+               if (var0.field903 == var0.field899 && var0.field903 == -1) {
                   var0.remove();
-               } else if(var0.field899 == var0.field903 && var0.field904 == var0.field907 && var0.field908 == var0.field905) {
+               } else if (var0.field899 == var0.field903 && var0.field904 == var0.field907 && var0.field908 == var0.field905) {
                   var0.remove();
                }
             }
diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java
index 66e6aaea2f..1e5967e1e3 100644
--- a/runescape-client/src/main/java/ChatChannel.java
+++ b/runescape-client/src/main/java/ChatChannel.java
@@ -33,13 +33,13 @@ public class ChatChannel {
    Message addMessage(int var1, String var2, String var3, String var4) {
       Message var5 = this.messages[99];
 
-      for(int var6 = this.count; var6 > 0; --var6) {
-         if(var6 != 100) {
+      for (int var6 = this.count; var6 > 0; --var6) {
+         if (var6 != 100) {
             this.messages[var6] = this.messages[var6 - 1];
          }
       }
 
-      if(var5 == null) {
+      if (var5 == null) {
          var5 = new Message(var1, var2, var4, var3);
       } else {
          var5.remove();
@@ -48,7 +48,7 @@ public class ChatChannel {
       }
 
       this.messages[0] = var5;
-      if(this.count < 100) {
+      if (this.count < 100) {
          ++this.count;
       }
 
@@ -62,7 +62,7 @@ public class ChatChannel {
    )
    @Export("getMessage")
    Message getMessage(int var1) {
-      return var1 >= 0 && var1 < this.count?this.messages[var1]:null;
+      return var1 >= 0 && var1 < this.count ? this.messages[var1] : null;
    }
 
    @ObfuscatedName("q")
@@ -81,7 +81,7 @@ public class ChatChannel {
       garbageValue = "-1857344803"
    )
    public static boolean method2238(char var0) {
-      return var0 >= ' ' && var0 <= '~'?true:(var0 >= 160 && var0 <= 255?true:var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376);
+      return var0 >= ' ' && var0 <= '~' ? true : (var0 >= 160 && var0 <= 255 ? true : var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376);
    }
 
    @ObfuscatedName("fk")
@@ -90,19 +90,19 @@ public class ChatChannel {
       garbageValue = "911583338"
    )
    static final void method2225(Actor var0) {
-      var0.__ay = false;
+      var0.field10 = false;
       SequenceDefinition var1;
-      if(var0.movementSequence != -1) {
+      if (var0.movementSequence != -1) {
          var1 = WorldMapAreaData.getSequenceDefinition(var0.movementSequence);
-         if(var1 != null && var1.frameIds != null) {
+         if (var1 != null && var1.frameIds != null) {
             ++var0.movementFrameCycle;
-            if(var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) {
+            if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) {
                var0.movementFrameCycle = 1;
                ++var0.movementFrame;
                Script.method2201(var1, var0.movementFrame, var0.x, var0.y);
             }
 
-            if(var0.movementFrame >= var1.frameIds.length) {
+            if (var0.movementFrame >= var1.frameIds.length) {
                var0.movementFrameCycle = 0;
                var0.movementFrame = 0;
                Script.method2201(var1, var0.movementFrame, var0.x, var0.y);
@@ -112,23 +112,23 @@ public class ChatChannel {
          }
       }
 
-      if(var0.spotAnimation != -1 && Client.cycle >= var0.__bt) {
-         if(var0.spotAnimationFrame < 0) {
+      if (var0.spotAnimation != -1 && Client.cycle >= var0.field14) {
+         if (var0.spotAnimationFrame < 0) {
             var0.spotAnimationFrame = 0;
          }
 
-         int var3 = class50.getSpotAnimationDefinition(var0.spotAnimation).sequence;
-         if(var3 != -1) {
-            SequenceDefinition var2 = WorldMapAreaData.getSequenceDefinition(var3);
-            if(var2 != null && var2.frameIds != null) {
+         int var2 = class50.getSpotAnimationDefinition(var0.spotAnimation).sequence;
+         if (var2 != -1) {
+            SequenceDefinition var3 = WorldMapAreaData.getSequenceDefinition(var2);
+            if (var3 != null && var3.frameIds != null) {
                ++var0.spotAnimationFrameCycle;
-               if(var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) {
+               if (var0.spotAnimationFrame < var3.frameIds.length && var0.spotAnimationFrameCycle > var3.frameLengths[var0.spotAnimationFrame]) {
                   var0.spotAnimationFrameCycle = 1;
                   ++var0.spotAnimationFrame;
-                  Script.method2201(var2, var0.spotAnimationFrame, var0.x, var0.y);
+                  Script.method2201(var3, var0.spotAnimationFrame, var0.x, var0.y);
                }
 
-               if(var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) {
+               if (var0.spotAnimationFrame >= var3.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3.frameIds.length)) {
                   var0.spotAnimation = -1;
                }
             } else {
@@ -139,43 +139,43 @@ public class ChatChannel {
          }
       }
 
-      if(var0.sequence != -1 && var0.sequenceDelay <= 1) {
+      if (var0.sequence != -1 && var0.sequenceDelay <= 1) {
          var1 = WorldMapAreaData.getSequenceDefinition(var0.sequence);
-         if(var1.__j == 1 && var0.__ch > 0 && var0.__bw <= Client.cycle && var0.__cr < Client.cycle) {
+         if (var1.field781 == 1 && var0.field25 > 0 && var0.field19 <= Client.cycle && var0.field20 < Client.cycle) {
             var0.sequenceDelay = 1;
             return;
          }
       }
 
-      if(var0.sequence != -1 && var0.sequenceDelay == 0) {
+      if (var0.sequence != -1 && var0.sequenceDelay == 0) {
          var1 = WorldMapAreaData.getSequenceDefinition(var0.sequence);
-         if(var1 != null && var1.frameIds != null) {
+         if (var1 != null && var1.frameIds != null) {
             ++var0.sequenceFrameCycle;
-            if(var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) {
+            if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) {
                var0.sequenceFrameCycle = 1;
                ++var0.sequenceFrame;
                Script.method2201(var1, var0.sequenceFrame, var0.x, var0.y);
             }
 
-            if(var0.sequenceFrame >= var1.frameIds.length) {
+            if (var0.sequenceFrame >= var1.frameIds.length) {
                var0.sequenceFrame -= var1.frameCount;
-               ++var0.__bj;
-               if(var0.__bj >= var1.__z) {
+               ++var0.field13;
+               if (var0.field13 >= var1.field780) {
                   var0.sequence = -1;
-               } else if(var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) {
+               } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) {
                   Script.method2201(var1, var0.sequenceFrame, var0.x, var0.y);
                } else {
                   var0.sequence = -1;
                }
             }
 
-            var0.__ay = var1.__k;
+            var0.field10 = var1.field778;
          } else {
             var0.sequence = -1;
          }
       }
 
-      if(var0.sequenceDelay > 0) {
+      if (var0.sequenceDelay > 0) {
          --var0.sequenceDelay;
       }
 
@@ -187,162 +187,163 @@ public class ChatChannel {
       garbageValue = "94"
    )
    static final void method2237(Widget var0, int var1, int var2) {
-      if(var0.buttonType == 1) {
+      if (var0.buttonType == 1) {
          Tiles.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id);
       }
 
       String var3;
-      if(var0.buttonType == 2 && !Client.isSpellSelected) {
+      if (var0.buttonType == 2 && !Client.isSpellSelected) {
          var3 = class198.method3745(var0);
-         if(var3 != null) {
+         if (var3 != null) {
             Tiles.insertMenuItemNoShift(var3, BufferedFile.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id);
          }
       }
 
-      if(var0.buttonType == 3) {
+      if (var0.buttonType == 3) {
          Tiles.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id);
       }
 
-      if(var0.buttonType == 4) {
+      if (var0.buttonType == 4) {
          Tiles.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id);
       }
 
-      if(var0.buttonType == 5) {
+      if (var0.buttonType == 5) {
          Tiles.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id);
       }
 
-      if(var0.buttonType == 6 && Client.__client_mo == null) {
+      if (var0.buttonType == 6 && Client.field127 == null) {
          Tiles.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id);
       }
 
       int var4;
       int var5;
-      int var13;
-      if(var0.type == 2) {
-         var13 = 0;
+      int var6;
+      if (var0.type == 2) {
+         var6 = 0;
 
-         for(var4 = 0; var4 < var0.height; ++var4) {
-            for(var5 = 0; var5 < var0.width; ++var5) {
-               int var6 = (var0.paddingX + 32) * var5;
-               int var7 = (var0.paddingY + 32) * var4;
-               if(var13 < 20) {
-                  var6 += var0.inventoryXOffsets[var13];
-                  var7 += var0.inventoryYOffsets[var13];
+         for (var4 = 0; var4 < var0.height; ++var4) {
+            for (var5 = 0; var5 < var0.width; ++var5) {
+               int var7 = (var0.paddingX + 32) * var5;
+               int var8 = (var0.paddingY + 32) * var4;
+               if (var6 < 20) {
+                  var7 += var0.inventoryXOffsets[var6];
+                  var8 += var0.inventoryYOffsets[var6];
                }
 
-               if(var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) {
-                  Client.dragItemSlotDestination = var13;
-                  UserComparator6.__fg_jh = var0;
-                  if(var0.itemIds[var13] > 0) {
-                     ItemDefinition var8 = Skills.getItemDefinition(var0.itemIds[var13] - 1);
-                     if(Client.isItemSelected == 1 && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
-                        if(var0.id != ServerPacket.selectedItemWidget || var13 != HealthBarDefinition.selectedItemSlot) {
-                           Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id);
+               if (var1 >= var7 && var2 >= var8 && var1 < var7 + 32 && var2 < var8 + 32) {
+                  Client.dragItemSlotDestination = var6;
+                  UserComparator6.field937 = var0;
+                  if (var0.itemIds[var6] > 0) {
+                     ItemDefinition var9 = Skills.getItemDefinition(var0.itemIds[var6] - 1);
+                     if (Client.isItemSelected == 1 && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
+                        if (var0.id != ServerPacket.selectedItemWidget || var6 != HealthBarDefinition.selectedItemSlot) {
+                           Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16748608) + var9.name, 31, var9.id, var6, var0.id);
                         }
-                     } else if(Client.isSpellSelected && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
-                        if((FloorDecoration.selectedSpellFlags & 16) == 16) {
-                           Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id);
+                     } else if (Client.isSpellSelected && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
+                        if ((FloorDecoration.selectedSpellFlags & 16) == 16) {
+                           Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16748608) + var9.name, 32, var9.id, var6, var0.id);
                         }
                      } else {
-                        String[] var9 = var8.inventoryActions;
-                        int var10 = -1;
-                        if(Client.shiftClickDrop && WorldMapEvent.method779()) {
-                           var10 = var8.getShiftClickIndex();
+                        String[] var10 = var9.inventoryActions;
+                        int var11 = -1;
+                        if (Client.shiftClickDrop && WorldMapEvent.isShiftPressed()) {
+                           var11 = var9.getShiftClickIndex();
                         }
 
-                        int var11;
-                        if(WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
-                           for(var11 = 4; var11 >= 3; --var11) {
-                              if(var10 != var11) {
-                                 AccessFile.addWidgetItemMenuItem(var0, var8, var13, var11, false);
+                        int var12;
+                        if (WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
+                           for (var12 = 4; var12 >= 3; --var12) {
+                              if (var11 != var12) {
+                                 AccessFile.addWidgetItemMenuItem(var0, var9, var6, var12, false);
                               }
                            }
                         }
 
-                        if(SecureRandomFuture.method2101(class1.getWidgetClickMask(var0))) {
-                           Tiles.insertMenuItemNoShift("Use", BufferedFile.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id);
+                        if (SecureRandomFuture.method2101(class1.getWidgetClickMask(var0))) {
+                           Tiles.insertMenuItemNoShift("Use", BufferedFile.colorStartTag(16748608) + var9.name, 38, var9.id, var6, var0.id);
                         }
 
-                        if(WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
-                           for(var11 = 2; var11 >= 0; --var11) {
-                              if(var11 != var10) {
-                                 AccessFile.addWidgetItemMenuItem(var0, var8, var13, var11, false);
+                        if (WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
+                           for (var12 = 2; var12 >= 0; --var12) {
+                              if (var12 != var11) {
+                                 AccessFile.addWidgetItemMenuItem(var0, var9, var6, var12, false);
                               }
                            }
 
-                           if(var10 >= 0) {
-                              AccessFile.addWidgetItemMenuItem(var0, var8, var13, var10, true);
+                           if (var11 >= 0) {
+                              AccessFile.addWidgetItemMenuItem(var0, var9, var6, var11, true);
                            }
                         }
 
-                        var9 = var0.itemActions;
-                        if(var9 != null) {
-                           for(var11 = 4; var11 >= 0; --var11) {
-                              if(var9[var11] != null) {
-                                 byte var12 = 0;
-                                 if(var11 == 0) {
-                                    var12 = 39;
+                        var10 = var0.itemActions;
+                        if (var10 != null) {
+                           for (var12 = 4; var12 >= 0; --var12) {
+                              if (var10[var12] != null) {
+                                 byte var13 = 0;
+                                 if (var12 == 0) {
+                                    var13 = 39;
                                  }
 
-                                 if(var11 == 1) {
-                                    var12 = 40;
+                                 if (var12 == 1) {
+                                    var13 = 40;
                                  }
 
-                                 if(var11 == 2) {
-                                    var12 = 41;
+                                 if (var12 == 2) {
+                                    var13 = 41;
                                  }
 
-                                 if(var11 == 3) {
-                                    var12 = 42;
+                                 if (var12 == 3) {
+                                    var13 = 42;
                                  }
 
-                                 if(var11 == 4) {
-                                    var12 = 43;
+                                 if (var12 == 4) {
+                                    var13 = 43;
                                  }
 
-                                 Tiles.insertMenuItemNoShift(var9[var11], BufferedFile.colorStartTag(0xff9040) + var8.name, var12, var8.id, var13, var0.id);
+                                 Tiles.insertMenuItemNoShift(var10[var12], BufferedFile.colorStartTag(16748608) + var9.name, var13, var9.id, var6, var0.id);
                               }
                            }
                         }
 
-                        Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(0xff9040) + var8.name, 1005, var8.id, var13, var0.id);
+                        Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var9.name, 1005, var9.id, var6, var0.id);
                      }
                   }
                }
 
-               ++var13;
+               ++var6;
             }
          }
       }
 
-      if(var0.isIf3) {
-         if(Client.isSpellSelected) {
-            if(WorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) {
-               Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id);
+      if (var0.isIf3) {
+         if (Client.isSpellSelected) {
+            if (WorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) {
+               Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + var0.dataText, 58, 0, var0.childIndex, var0.id);
             }
          } else {
-            for(var13 = 9; var13 >= 5; --var13) {
-               String var14 = GameShell.method1060(var0, var13);
-               if(var14 != null) {
-                  Tiles.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id);
+            String var14;
+            for (var6 = 9; var6 >= 5; --var6) {
+               var14 = GameShell.method1060(var0, var6);
+               if (var14 != null) {
+                  Tiles.insertMenuItemNoShift(var14, var0.dataText, 1007, var6 + 1, var0.childIndex, var0.id);
                }
             }
 
             var3 = class198.method3745(var0);
-            if(var3 != null) {
+            if (var3 != null) {
                Tiles.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id);
             }
 
-            for(var4 = 4; var4 >= 0; --var4) {
-               String var15 = GameShell.method1060(var0, var4);
-               if(var15 != null) {
-                  class16.insertMenuItem(var15, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.__fz);
+            for (var4 = 4; var4 >= 0; --var4) {
+               var14 = GameShell.method1060(var0, var4);
+               if (var14 != null) {
+                  class16.insertMenuItem(var14, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field985);
                }
             }
 
             var5 = class1.getWidgetClickMask(var0);
-            boolean var16 = (var5 & 1) != 0;
-            if(var16) {
+            boolean var15 = (var5 & 1) != 0;
+            if (var15) {
                Tiles.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id);
             }
          }
diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java
index 608c06c72c..68f78b31e8 100644
--- a/runescape-client/src/main/java/ClanChat.java
+++ b/runescape-client/src/main/java/ClanChat.java
@@ -26,7 +26,7 @@ public class ClanChat extends UserList {
    @Export("owner")
    public String owner;
    @ObfuscatedName("k")
-   public byte __k;
+   public byte field96;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
       intValue = -1534670751
@@ -37,7 +37,7 @@ public class ClanChat extends UserList {
    @ObfuscatedGetter(
       intValue = 386706253
    )
-   int __i;
+   int field97;
 
    @ObfuscatedSignature(
       signature = "(Llx;Lky;)V"
@@ -46,7 +46,7 @@ public class ClanChat extends UserList {
       super(100);
       this.name = null;
       this.owner = null;
-      this.__i = 1;
+      this.field97 = 1;
       this.loginType = var1;
       this.localUser = var2;
    }
@@ -76,7 +76,7 @@ public class ClanChat extends UserList {
       signature = "(Ljava/lang/String;I)V",
       garbageValue = "242122326"
    )
-   final void __q_472(String var1) {
+   final void method76(String var1) {
       this.name = HealthBarUpdate.method1722(var1);
    }
 
@@ -85,7 +85,7 @@ public class ClanChat extends UserList {
       signature = "(Ljava/lang/String;B)V",
       garbageValue = "103"
    )
-   final void __x_473(String var1) {
+   final void method77(String var1) {
       this.owner = HealthBarUpdate.method1722(var1);
    }
 
@@ -96,51 +96,51 @@ public class ClanChat extends UserList {
    )
    @Export("readUpdate")
    public final void readUpdate(Buffer var1) {
-      this.__x_473(var1.readStringCp1252NullTerminated());
+      this.method77(var1.readStringCp1252NullTerminated());
       long var2 = var1.readLong();
-      long var5 = var2;
-      String var4;
+      long var4 = var2;
+      String var6;
       int var7;
-      if(var2 > 0L && var2 < 6582952005840035281L) {
-         if(var2 % 37L == 0L) {
-            var4 = null;
+      if (var2 > 0L && var2 < 6582952005840035281L) {
+         if (var2 % 37L == 0L) {
+            var6 = null;
          } else {
             var7 = 0;
 
-            for(long var13 = var2; var13 != 0L; var13 /= 37L) {
+            for (long var8 = var2; var8 != 0L; var8 /= 37L) {
                ++var7;
             }
 
-            StringBuilder var15 = new StringBuilder(var7);
+            StringBuilder var11 = new StringBuilder(var7);
 
-            while(var5 != 0L) {
-               long var11 = var5;
-               var5 /= 37L;
-               var15.append(class306.base37Table[(int)(var11 - 37L * var5)]);
+            while (var4 != 0L) {
+               long var9 = var4;
+               var4 /= 37L;
+               var11.append(class306.base37Table[(int)(var9 - 37L * var4)]);
             }
 
-            var4 = var15.reverse().toString();
+            var6 = var11.reverse().toString();
          }
       } else {
-         var4 = null;
+         var6 = null;
       }
 
-      this.__q_472(var4);
-      this.__k = var1.readByte();
+      this.method76(var6);
+      this.field96 = var1.readByte();
       var7 = var1.readUnsignedByte();
-      if(var7 != 255) {
+      if (var7 != 255) {
          this.clear();
 
-         for(int var8 = 0; var8 < var7; ++var8) {
-            ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType));
-            int var10 = var1.__ag_302();
-            var9.set(var10, ++this.__i - 1);
-            var9.rank = var1.readByte();
+         for (int var12 = 0; var12 < var7; ++var12) {
+            ClanMate var13 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType));
+            int var10 = var1.method43();
+            var13.set(var10, ++this.field97 - 1);
+            var13.rank = var1.readByte();
             var1.readStringCp1252NullTerminated();
-            this.__cp_475(var9);
+            this.method79(var13);
          }
-
       }
+
    }
 
    @ObfuscatedName("a")
@@ -148,39 +148,39 @@ public class ClanChat extends UserList {
       signature = "(Lgr;B)V",
       garbageValue = "24"
    )
-   public final void __a_474(Buffer var1) {
+   public final void method78(Buffer var1) {
       Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
-      int var3 = var1.__ag_302();
+      int var3 = var1.method43();
       byte var4 = var1.readByte();
       boolean var5 = false;
-      if(var4 == -128) {
+      if (var4 == -128) {
          var5 = true;
       }
 
       ClanMate var6;
-      if(var5) {
-         if(this.size() == 0) {
+      if (var5) {
+         if (this.size() == 0) {
             return;
          }
 
          var6 = (ClanMate)this.getByCurrentUsername(var2);
-         if(var6 != null && var6.world() == var3) {
+         if (var6 != null && var6.world() == var3) {
             this.remove(var6);
          }
       } else {
          var1.readStringCp1252NullTerminated();
          var6 = (ClanMate)this.getByCurrentUsername(var2);
-         if(var6 == null) {
-            if(this.size() > super.capacity) {
+         if (var6 == null) {
+            if (this.size() > super.capacity) {
                return;
             }
 
             var6 = (ClanMate)this.addLastNoPreviousUsername(var2);
          }
 
-         var6.set(var3, ++this.__i - 1);
+         var6.set(var3, ++this.field97 - 1);
          var6.rank = var4;
-         this.__cp_475(var6);
+         this.method79(var6);
       }
 
    }
@@ -192,7 +192,7 @@ public class ClanChat extends UserList {
    )
    @Export("clearFriends")
    public final void clearFriends() {
-      for(int var1 = 0; var1 < this.size(); ++var1) {
+      for (int var1 = 0; var1 < this.size(); ++var1) {
          ((ClanMate)this.get(var1)).clearIsFriend();
       }
 
@@ -205,7 +205,7 @@ public class ClanChat extends UserList {
    )
    @Export("clearIgnoreds")
    public final void clearIgnoreds() {
-      for(int var1 = 0; var1 < this.size(); ++var1) {
+      for (int var1 = 0; var1 < this.size(); ++var1) {
          ((ClanMate)this.get(var1)).clearIsIgnored();
       }
 
@@ -216,8 +216,8 @@ public class ClanChat extends UserList {
       signature = "(Ljk;I)V",
       garbageValue = "-128608554"
    )
-   final void __cp_475(ClanMate var1) {
-      if(var1.username().equals(this.localUser.username())) {
+   final void method79(ClanMate var1) {
+      if (var1.username().equals(this.localUser.username())) {
          this.rank = var1.rank;
       }
 
diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java
index 1939253721..baf085d3fa 100644
--- a/runescape-client/src/main/java/ClanMate.java
+++ b/runescape-client/src/main/java/ClanMate.java
@@ -41,7 +41,7 @@ public class ClanMate extends Buddy {
    )
    @Export("isFriend")
    public final boolean isFriend() {
-      if(this.isFriend0 == TriBool.TriBool_unknown) {
+      if (this.isFriend0 == TriBool.TriBool_unknown) {
          this.fillIsFriend();
       }
 
@@ -55,7 +55,7 @@ public class ClanMate extends Buddy {
    )
    @Export("fillIsFriend")
    void fillIsFriend() {
-      this.isFriend0 = WorldMapArea.friendSystem.friendsList.contains(super.username0)?TriBool.TriBool_true:TriBool.TriBool_false;
+      this.isFriend0 = WorldMapArea.friendSystem.friendsList.contains(super.username0) ? TriBool.TriBool_true : TriBool.TriBool_false;
    }
 
    @ObfuscatedName("w")
@@ -75,7 +75,7 @@ public class ClanMate extends Buddy {
    )
    @Export("isIgnored")
    public final boolean isIgnored() {
-      if(this.isIgnored0 == TriBool.TriBool_unknown) {
+      if (this.isIgnored0 == TriBool.TriBool_unknown) {
          this.fillIsIgnored();
       }
 
@@ -89,6 +89,6 @@ public class ClanMate extends Buddy {
    )
    @Export("fillIsIgnored")
    void fillIsIgnored() {
-      this.isIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(super.username0)?TriBool.TriBool_true:TriBool.TriBool_false;
+      this.isIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(super.username0) ? TriBool.TriBool_true : TriBool.TriBool_false;
    }
 }
diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java
index 413e46bf08..10787ccfb1 100644
--- a/runescape-client/src/main/java/Client.java
+++ b/runescape-client/src/main/java/Client.java
@@ -30,7 +30,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 1348053843
    )
-   static int __client_oo;
+   static int field98;
    @ObfuscatedName("os")
    @ObfuscatedGetter(
       intValue = -546798303
@@ -41,15 +41,15 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       longValue = 8818983958751331899L
    )
-   static long __client_oa;
+   static long field99;
    @ObfuscatedName("od")
-   static boolean[] __client_od;
+   static boolean[] field100;
    @ObfuscatedName("oq")
-   static boolean[] __client_oq;
+   static boolean[] field101;
    @ObfuscatedName("ot")
-   static boolean[] __client_ot;
+   static boolean[] field102;
    @ObfuscatedName("nt")
-   static boolean __client_nt;
+   static boolean field103;
    @ObfuscatedName("ng")
    @ObfuscatedGetter(
       intValue = -1379876433
@@ -63,16 +63,16 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -451622431
    )
-   public static int __client_ss;
+   public static int field104;
    @ObfuscatedName("na")
    @ObfuscatedGetter(
       intValue = -934082817
    )
-   static int __client_na;
+   static int field105;
    @ObfuscatedName("nn")
-   static boolean __client_nn;
+   static boolean field106;
    @ObfuscatedName("qq")
-   static boolean __client_qq;
+   static boolean field107;
    @ObfuscatedName("mt")
    @ObfuscatedGetter(
       intValue = -1972775883
@@ -89,7 +89,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -843739713
    )
-   static int __client_nw;
+   static int field108;
    @ObfuscatedName("mr")
    @ObfuscatedSignature(
       signature = "Lho;"
@@ -112,7 +112,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 1939745821
    )
-   static int __client_nl;
+   static int field109;
    @ObfuscatedName("mx")
    @ObfuscatedSignature(
       signature = "Lho;"
@@ -161,12 +161,12 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 1019025247
    )
-   static int __client_nk;
+   static int field110;
    @ObfuscatedName("np")
    @ObfuscatedGetter(
       intValue = 1881890525
    )
-   static int __client_np;
+   static int field111;
    @ObfuscatedName("pd")
    @ObfuscatedGetter(
       intValue = -362336323
@@ -183,11 +183,11 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -34294211
    )
-   static int __client_qy;
+   static int field112;
    @ObfuscatedName("tp")
-   static int[] __client_tp;
+   static int[] field113;
    @ObfuscatedName("th")
-   static int[] __client_th;
+   static int[] field114;
    @ObfuscatedName("ny")
    @Export("isDraggingWidget")
    static boolean isDraggingWidget;
@@ -219,24 +219,24 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -818676431
    )
-   static int __client_qc;
+   static int field115;
    @ObfuscatedName("nz")
-   static int[] __client_nz;
+   static int[] field116;
    @ObfuscatedName("ns")
    @ObfuscatedGetter(
       intValue = 743073293
    )
-   static int __client_ns;
+   static int field117;
    @ObfuscatedName("sd")
    @ObfuscatedGetter(
       intValue = 944933439
    )
-   static int __client_sd;
+   static int field118;
    @ObfuscatedName("ru")
    @ObfuscatedSignature(
       signature = "Lhi;"
    )
-   static PlayerAppearance __client_ru;
+   static PlayerAppearance field119;
    @ObfuscatedName("qa")
    @ObfuscatedGetter(
       intValue = -1481002083
@@ -259,7 +259,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -1605855913
    )
-   static int __client_sl;
+   static int field120;
    @ObfuscatedName("md")
    @ObfuscatedSignature(
       signature = "Lho;"
@@ -279,22 +279,22 @@ public final class Client extends GameShell implements Usernamed {
    @Export("queuedSoundEffectDelays")
    static int[] queuedSoundEffectDelays;
    @ObfuscatedName("nr")
-   static int[] __client_nr;
+   static int[] field121;
    @ObfuscatedName("nv")
    @ObfuscatedGetter(
       intValue = -758575207
    )
-   static int __client_nv;
+   static int field122;
    @ObfuscatedName("nd")
    @ObfuscatedGetter(
       intValue = 760022015
    )
-   static int __client_nd;
+   static int field123;
    @ObfuscatedName("ni")
    @ObfuscatedGetter(
       intValue = 1990512261
    )
-   static int __client_ni;
+   static int field124;
    @ObfuscatedName("qe")
    @ObfuscatedSignature(
       signature = "[Lci;"
@@ -314,12 +314,12 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 587773171
    )
-   static int __client_ph;
+   static int field125;
    @ObfuscatedName("pp")
    @ObfuscatedGetter(
       longValue = -1704358328771670975L
    )
-   static long __client_pp;
+   static long field126;
    @ObfuscatedName("sk")
    @ObfuscatedSignature(
       signature = "Llm;"
@@ -330,19 +330,19 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedSignature(
       signature = "Lho;"
    )
-   static Widget __client_mo;
+   static Widget field127;
    @ObfuscatedName("qf")
    @ObfuscatedGetter(
       intValue = 1365951359
    )
-   static int __client_qf;
+   static int field128;
    @ObfuscatedName("nh")
    @ObfuscatedGetter(
       intValue = -278874973
    )
-   static int __client_nh;
+   static int field129;
    @ObfuscatedName("rw")
-   static short __client_rw;
+   static short field130;
    @ObfuscatedName("qp")
    @ObfuscatedGetter(
       intValue = -1352723865
@@ -350,13 +350,13 @@ public final class Client extends GameShell implements Usernamed {
    @Export("soundEffectVolume")
    static int soundEffectVolume;
    @ObfuscatedName("rm")
-   static short __client_rm;
+   static short field131;
    @ObfuscatedName("rs")
-   static short __client_rs;
+   static short field132;
    @ObfuscatedName("rp")
-   static short __client_rp;
+   static short field133;
    @ObfuscatedName("ri")
-   static short __client_ri;
+   static short field134;
    @ObfuscatedName("pi")
    @ObfuscatedGetter(
       intValue = 864673321
@@ -370,7 +370,7 @@ public final class Client extends GameShell implements Usernamed {
    @Export("viewportZoom")
    static int viewportZoom;
    @ObfuscatedName("rv")
-   static short __client_rv;
+   static short field135;
    @ObfuscatedName("ry")
    @ObfuscatedGetter(
       intValue = 2035623995
@@ -405,7 +405,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 1694810089
    )
-   static int __client_mb;
+   static int field136;
    @ObfuscatedName("rr")
    @ObfuscatedGetter(
       intValue = 386331251
@@ -422,14 +422,14 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -460406997
    )
-   static int __client_pm;
+   static int field137;
    @ObfuscatedName("pl")
    @ObfuscatedGetter(
       intValue = -1362734353
    )
-   static int __client_pl;
+   static int field138;
    @ObfuscatedName("rh")
-   static boolean[] __client_rh;
+   static boolean[] field139;
    @ObfuscatedName("ml")
    @ObfuscatedGetter(
       intValue = 1602665191
@@ -446,50 +446,50 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 206275573
    )
-   static int __client_sx;
+   static int field140;
    @ObfuscatedName("rd")
-   static int[] __client_rd;
+   static int[] field141;
    @ObfuscatedName("rl")
-   static int[] __client_rl;
+   static int[] field142;
    @ObfuscatedName("rj")
-   static int[] __client_rj;
+   static int[] field143;
    @ObfuscatedName("rk")
-   static int[] __client_rk;
+   static int[] field144;
    @ObfuscatedName("pn")
-   static int[] __client_pn;
+   static int[] field145;
    @ObfuscatedName("pq")
-   static int[] __client_pq;
+   static int[] field146;
    @ObfuscatedName("oh")
    @ObfuscatedSignature(
       signature = "Lje;"
    )
-   static NodeDeque __client_oh;
+   static NodeDeque field147;
    @ObfuscatedName("oc")
    @ObfuscatedSignature(
       signature = "Lje;"
    )
-   static NodeDeque __client_oc;
+   static NodeDeque field148;
    @ObfuscatedName("rb")
-   static short __client_rb;
+   static short field149;
    @ObfuscatedName("re")
-   static short __client_re;
+   static short field150;
    @ObfuscatedName("mf")
    @ObfuscatedGetter(
       intValue = -1715020411
    )
-   static int __client_mf;
+   static int field151;
    @ObfuscatedName("pu")
-   static long[] __client_pu;
+   static long[] field152;
    @ObfuscatedName("ms")
    @ObfuscatedGetter(
       intValue = 2128395635
    )
-   static int __client_ms;
+   static int field153;
    @ObfuscatedName("nc")
    @ObfuscatedGetter(
       intValue = 344308849
    )
-   static int __client_nc;
+   static int field154;
    @ObfuscatedName("nf")
    @Export("changedSkills")
    static int[] changedSkills;
@@ -500,12 +500,12 @@ public final class Client extends GameShell implements Usernamed {
    @Export("changedSkillsCount")
    static int changedSkillsCount;
    @ObfuscatedName("mn")
-   static boolean __client_mn;
+   static boolean field155;
    @ObfuscatedName("pb")
    @ObfuscatedGetter(
       intValue = 1230692157
    )
-   static int __client_pb;
+   static int field156;
    @ObfuscatedName("nq")
    @ObfuscatedGetter(
       intValue = 1467519791
@@ -516,16 +516,16 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 535219347
    )
-   static int __client_mh;
+   static int field157;
    @ObfuscatedName("pz")
-   static String __client_pz;
+   static String field158;
    @ObfuscatedName("sj")
    @ObfuscatedSignature(
       signature = "Lbj;"
    )
-   static OwnWorldComparator __client_sj;
+   static OwnWorldComparator field159;
    @ObfuscatedName("pv")
-   static int[] __client_pv;
+   static int[] field160;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "[Lfy;"
@@ -533,7 +533,7 @@ public final class Client extends GameShell implements Usernamed {
    @Export("collisionMaps")
    static CollisionMap[] collisionMaps;
    @ObfuscatedName("ai")
-   static boolean __client_ai;
+   static boolean field161;
    @ObfuscatedName("ba")
    @ObfuscatedGetter(
       intValue = 1412639841
@@ -571,7 +571,7 @@ public final class Client extends GameShell implements Usernamed {
    @Export("clientType")
    static int clientType;
    @ObfuscatedName("bl")
-   static boolean __client_bl;
+   static boolean field162;
    @ObfuscatedName("br")
    @ObfuscatedGetter(
       intValue = 244995961
@@ -597,19 +597,19 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -1731573291
    )
-   static int __client_cn;
+   static int field163;
    @ObfuscatedName("cq")
    @ObfuscatedGetter(
       intValue = -1313705721
    )
-   static int __client_cq;
+   static int field164;
    @ObfuscatedName("ch")
    @ObfuscatedGetter(
       longValue = -6574384275386813769L
    )
-   static long __client_ch;
+   static long field165;
    @ObfuscatedName("cw")
-   static boolean __client_cw;
+   static boolean field166;
    @ObfuscatedName("cg")
    @Export("displayFps")
    static boolean displayFps;
@@ -695,7 +695,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 1154760205
    )
-   static int __client_dp;
+   static int field167;
    @ObfuscatedName("ek")
    @ObfuscatedGetter(
       intValue = 1791955261
@@ -712,17 +712,17 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 755300107
    )
-   static int __client_ex;
+   static int field168;
    @ObfuscatedName("ej")
    @ObfuscatedGetter(
       intValue = -964416527
    )
-   static int __client_ej;
+   static int field169;
    @ObfuscatedName("el")
    @ObfuscatedGetter(
       intValue = 689094231
    )
-   static int __client_el;
+   static int field170;
    @ObfuscatedName("en")
    @ObfuscatedSignature(
       signature = "Lfc;"
@@ -732,7 +732,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -447055355
    )
-   static int __client_eo;
+   static int field171;
    @ObfuscatedName("ew")
    @Export("Login_isUsernameRemembered")
    static boolean Login_isUsernameRemembered;
@@ -743,13 +743,13 @@ public final class Client extends GameShell implements Usernamed {
    @Export("secureRandomFuture")
    static SecureRandomFuture secureRandomFuture;
    @ObfuscatedName("ev")
-   static byte[] __client_ev;
+   static byte[] field172;
    @ObfuscatedName("ez")
    @ObfuscatedSignature(
       signature = "[Lcv;"
    )
    @Export("npcs")
-   static Npc[] npcs;
+   static NPC[] npcs;
    @ObfuscatedName("ep")
    @ObfuscatedGetter(
       intValue = -1569269731
@@ -763,9 +763,9 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 516059665
    )
-   static int __client_fw;
+   static int field173;
    @ObfuscatedName("fg")
-   static int[] __client_fg;
+   static int[] field174;
    @ObfuscatedName("fj")
    @ObfuscatedSignature(
       signature = "Lcl;"
@@ -776,9 +776,9 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -1050480853
    )
-   static int __client_fd;
+   static int field175;
    @ObfuscatedName("fh")
-   static boolean __client_fh;
+   static boolean field176;
    @ObfuscatedName("fx")
    @Export("useBufferedSocket")
    static boolean useBufferedSocket;
@@ -795,27 +795,27 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 829228151
    )
-   static int __client_fe;
+   static int field177;
    @ObfuscatedName("fn")
    @ObfuscatedGetter(
       intValue = -597100741
    )
-   static int __client_fn;
+   static int field178;
    @ObfuscatedName("fk")
    @ObfuscatedGetter(
       intValue = 8470625
    )
-   static int __client_fk;
+   static int field179;
    @ObfuscatedName("gp")
    @ObfuscatedGetter(
       intValue = 685418907
    )
-   static int __client_gp;
+   static int field180;
    @ObfuscatedName("gh")
    @ObfuscatedGetter(
       intValue = -1456975367
    )
-   static int __client_gh;
+   static int field181;
    @ObfuscatedName("gg")
    @Export("isInInstance")
    static boolean isInInstance;
@@ -823,39 +823,39 @@ public final class Client extends GameShell implements Usernamed {
    @Export("instanceChunkTemplates")
    static int[][][] instanceChunkTemplates;
    @ObfuscatedName("gd")
-   static final int[] __client_gd;
+   static final int[] field182;
    @ObfuscatedName("gy")
    @ObfuscatedGetter(
       intValue = -134014371
    )
-   static int __client_gy;
+   static int field183;
    @ObfuscatedName("hx")
    @ObfuscatedGetter(
       intValue = -1406125895
    )
-   static int __client_hx;
+   static int field184;
    @ObfuscatedName("hn")
    @ObfuscatedGetter(
       intValue = -516933613
    )
-   static int __client_hn;
+   static int field185;
    @ObfuscatedName("hr")
    @ObfuscatedGetter(
       intValue = 1664350313
    )
-   static int __client_hr;
+   static int field186;
    @ObfuscatedName("hg")
    @ObfuscatedGetter(
       intValue = 1658018867
    )
-   static int __client_hg;
+   static int field187;
    @ObfuscatedName("hh")
-   static boolean __client_hh;
+   static boolean field188;
    @ObfuscatedName("hd")
    @ObfuscatedGetter(
       intValue = 438998245
    )
-   static int __client_hd;
+   static int field189;
    @ObfuscatedName("hw")
    @ObfuscatedGetter(
       intValue = 410614005
@@ -872,22 +872,22 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 218086227
    )
-   static int __client_hv;
+   static int field190;
    @ObfuscatedName("hu")
    @ObfuscatedGetter(
       intValue = -480633777
    )
-   static int __client_hu;
+   static int field191;
    @ObfuscatedName("hi")
    @ObfuscatedGetter(
       intValue = 402871301
    )
-   static int __client_hi;
+   static int field192;
    @ObfuscatedName("ht")
    @ObfuscatedGetter(
       intValue = 1502058429
    )
-   static int __client_ht;
+   static int field193;
    @ObfuscatedName("hj")
    @ObfuscatedGetter(
       intValue = -1420078475
@@ -904,17 +904,17 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -441913785
    )
-   static int __client_hc;
+   static int field194;
    @ObfuscatedName("hk")
    @ObfuscatedGetter(
       intValue = -1149138989
    )
-   static int __client_hk;
+   static int field195;
    @ObfuscatedName("if")
    @ObfuscatedGetter(
       intValue = -952172003
    )
-   static int __client_if;
+   static int field196;
    @ObfuscatedName("ie")
    @ObfuscatedGetter(
       intValue = 236939601
@@ -925,26 +925,26 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 351193663
    )
-   static int __client_in;
+   static int field197;
    @ObfuscatedName("il")
    @ObfuscatedGetter(
       intValue = -1063713523
    )
-   public static int __client_il;
+   public static int field198;
    @ObfuscatedName("ij")
-   static boolean __client_ij;
+   static boolean field199;
    @ObfuscatedName("iy")
    @ObfuscatedGetter(
       intValue = -1213062413
    )
-   static int __client_iy;
+   static int field200;
    @ObfuscatedName("is")
-   static boolean __client_is;
+   static boolean field201;
    @ObfuscatedName("ik")
    @ObfuscatedGetter(
       intValue = 910983131
    )
-   static int __client_ik;
+   static int field202;
    @ObfuscatedName("ir")
    @ObfuscatedGetter(
       intValue = 616180377
@@ -1036,12 +1036,12 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 1691923909
    )
-   static int __client_ju;
+   static int field203;
    @ObfuscatedName("jz")
    @ObfuscatedGetter(
       intValue = -1267243587
    )
-   static int __client_jz;
+   static int field204;
    @ObfuscatedName("jp")
    @ObfuscatedGetter(
       intValue = 485534011
@@ -1052,12 +1052,12 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 813973829
    )
-   static int __client_ja;
+   static int field205;
    @ObfuscatedName("je")
    @ObfuscatedGetter(
       intValue = 1959822241
    )
-   static int __client_je;
+   static int field206;
    @ObfuscatedName("jy")
    @ObfuscatedGetter(
       intValue = -836653679
@@ -1065,7 +1065,7 @@ public final class Client extends GameShell implements Usernamed {
    @Export("dragItemSlotDestination")
    static int dragItemSlotDestination;
    @ObfuscatedName("jl")
-   static boolean __client_jl;
+   static boolean field207;
    @ObfuscatedName("jt")
    @ObfuscatedGetter(
       intValue = 1486366835
@@ -1076,7 +1076,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 1084498299
    )
-   static int __client_jc;
+   static int field208;
    @ObfuscatedName("jj")
    @Export("showLoadingMessages")
    static boolean showLoadingMessages;
@@ -1096,7 +1096,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -836962805
    )
-   static int __client_jo;
+   static int field209;
    @ObfuscatedName("js")
    @Export("renderSelf")
    static boolean renderSelf;
@@ -1104,14 +1104,14 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -1208823721
    )
-   static int __client_ke;
+   static int field210;
    @ObfuscatedName("ky")
    @ObfuscatedGetter(
       intValue = -64320473
    )
-   static int __client_ky;
+   static int field211;
    @ObfuscatedName("kd")
-   static int[] __client_kd;
+   static int[] field212;
    @ObfuscatedName("kp")
    @Export("playerMenuOpcodes")
    static final int[] playerMenuOpcodes;
@@ -1122,7 +1122,7 @@ public final class Client extends GameShell implements Usernamed {
    @Export("playerOptionsPriorities")
    static boolean[] playerOptionsPriorities;
    @ObfuscatedName("kn")
-   static int[] __client_kn;
+   static int[] field213;
    @ObfuscatedName("kx")
    @ObfuscatedGetter(
       intValue = -1309758309
@@ -1139,7 +1139,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedSignature(
       signature = "Lje;"
    )
-   static NodeDeque __client_kh;
+   static NodeDeque field214;
    @ObfuscatedName("kk")
    @ObfuscatedSignature(
       signature = "Lje;"
@@ -1165,7 +1165,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -898263359
    )
-   static int __client_ku;
+   static int field215;
    @ObfuscatedName("kc")
    @Export("isMenuOpen")
    static boolean isMenuOpen;
@@ -1212,22 +1212,22 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 26099827
    )
-   static int __client_lq;
+   static int field216;
    @ObfuscatedName("ln")
    @ObfuscatedGetter(
       intValue = 885052255
    )
-   static int __client_ln;
+   static int field217;
    @ObfuscatedName("lb")
    @ObfuscatedGetter(
       intValue = 699084605
    )
-   static int __client_lb;
+   static int field218;
    @ObfuscatedName("ls")
    @ObfuscatedGetter(
       intValue = -274968037
    )
-   static int __client_ls;
+   static int field219;
    @ObfuscatedName("lz")
    @ObfuscatedGetter(
       intValue = 1630772923
@@ -1241,296 +1241,18 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 196309625
    )
-   static int __client_lc;
-
-   static {
-      __client_ai = true;
-      worldId = 1;
-      worldProperties = 0;
-      gameBuild = 0;
-      isMembersWorld = false;
-      isLowDetail = false;
-      language = 0;
-      clientType = -1;
-      __client_bl = false;
-      gameState = 0;
-      isLoading = true;
-      cycle = 0;
-      mouseLastLastPressedTimeMillis = 1L;
-      __client_cn = -1;
-      __client_cq = -1;
-      __client_ch = -1L;
-      __client_cw = true;
-      displayFps = false;
-      rebootTimer = 0;
-      hintArrowType = 0;
-      hintArrowNpcIndex = 0;
-      hintArrowPlayerIndex = 0;
-      hintArrowX = 0;
-      hintArrowY = 0;
-      hintArrowHeight = 0;
-      hintArrowSubX = 0;
-      hintArrowSubY = 0;
-      playerAttackOption = AttackOption.AttackOption_hidden;
-      npcAttackOption = AttackOption.AttackOption_hidden;
-      titleLoadingStage = 0;
-      js5ConnectState = 0;
-      __client_dp = 0;
-      js5Errors = 0;
-      loginState = 0;
-      __client_ex = 0;
-      __client_ej = 0;
-      __client_el = 0;
-      field658 = class159.field1985;
-      Login_isUsernameRemembered = false;
-      secureRandomFuture = new SecureRandomFuture();
-      __client_ev = null;
-      npcs = new Npc['耀'];
-      npcCount = 0;
-      npcIndices = new int['耀'];
-      __client_fw = 0;
-      __client_fg = new int[250];
-      packetWriter = new PacketWriter();
-      __client_fd = 0;
-      __client_fh = false;
-      useBufferedSocket = true;
-      timer = new Timer();
-      fontsMap = new HashMap();
-      __client_fe = 0;
-      __client_fn = 1;
-      __client_fk = 0;
-      __client_gp = 1;
-      __client_gh = 0;
-      collisionMaps = new CollisionMap[4];
-      isInInstance = false;
-      instanceChunkTemplates = new int[4][13][13];
-      __client_gd = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3};
-      __client_gy = 0;
-      __client_hx = 2301979;
-      __client_hn = 5063219;
-      __client_hr = 3353893;
-      __client_hg = 7759444;
-      __client_hh = false;
-      __client_hd = 0;
-      cameraPitchTarget = 128;
-      minimapOrientation = 0;
-      __client_hv = 0;
-      __client_hu = 0;
-      __client_hi = 0;
-      __client_ht = 0;
-      oculusOrbState = 0;
-      cameraFollowHeight = 50;
-      __client_hc = 0;
-      __client_hk = 0;
-      __client_if = 0;
-      oculusOrbNormalSpeed = 12;
-      __client_in = 6;
-      __client_il = 0;
-      __client_ij = false;
-      __client_iy = 0;
-      __client_is = false;
-      __client_ik = 0;
-      overheadTextCount = 0;
-      overheadTextLimit = 50;
-      overheadTextXs = new int[overheadTextLimit];
-      overheadTextYs = new int[overheadTextLimit];
-      overheadTextAscents = new int[overheadTextLimit];
-      overheadTextXOffsets = new int[overheadTextLimit];
-      overheadTextColors = new int[overheadTextLimit];
-      overheadTextEffects = new int[overheadTextLimit];
-      overheadTextCyclesRemaining = new int[overheadTextLimit];
-      overheadText = new String[overheadTextLimit];
-      tileLastDrawnActor = new int[104][104];
-      viewportDrawCount = 0;
-      viewportTempX = -1;
-      viewportTempY = -1;
-      mouseCrossX = 0;
-      mouseCrossY = 0;
-      mouseCrossState = 0;
-      mouseCrossColor = 0;
-      showMouseCross = true;
-      __client_ju = 0;
-      __client_jz = 0;
-      dragItemSlotSource = 0;
-      __client_ja = 0;
-      __client_je = 0;
-      dragItemSlotDestination = 0;
-      __client_jl = false;
-      itemDragDuration = 0;
-      __client_jc = 0;
-      showLoadingMessages = true;
-      players = new Player[2048];
-      localPlayerIndex = -1;
-      __client_jo = 0;
-      renderSelf = true;
-      __client_ke = 0;
-      __client_ky = 0;
-      __client_kd = new int[1000];
-      playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51};
-      playerMenuActions = new String[8];
-      playerOptionsPriorities = new boolean[8];
-      __client_kn = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792};
-      combatTargetPlayerIndex = -1;
-      groundItems = new NodeDeque[4][104][104];
-      __client_kh = new NodeDeque();
-      projectiles = new NodeDeque();
-      graphicsObjects = new NodeDeque();
-      currentLevels = new int[25];
-      levels = new int[25];
-      experience = new int[25];
-      __client_ku = 0;
-      isMenuOpen = false;
-      menuOptionsCount = 0;
-      menuArguments1 = new int[500];
-      menuArguments2 = new int[500];
-      menuOpcodes = new int[500];
-      menuArguments0 = new int[500];
-      menuActions = new String[500];
-      menuTargetNames = new String[500];
-      menuShiftClick = new boolean[500];
-      followerOpsLowPriority = false;
-      shiftClickDrop = false;
-      tapToDrop = false;
-      showMouseOverText = true;
-      __client_lq = -1;
-      __client_ln = -1;
-      __client_lb = 0;
-      __client_ls = 50;
-      isItemSelected = 0;
-      selectedItemName = null;
-      isSpellSelected = false;
-      __client_lc = -1;
-      __client_mh = -1;
-      selectedSpellActionName = null;
-      selectedSpellName = null;
-      rootWidgetGroup = -1;
-      widgetGroupParents = new NodeHashTable(8);
-      __client_mf = 0;
-      __client_ms = -1;
-      chatEffects = 0;
-      __client_mb = 0;
-      __client_mo = null;
-      runEnergy = 0;
-      weight = 0;
-      rights = 0;
-      followerIndex = -1;
-      __client_mn = false;
-      viewportWidget = null;
-      clickedWidget = null;
-      clickedWidgetParent = null;
-      widgetClickX = 0;
-      widgetClickY = 0;
-      draggedOnWidget = null;
-      __client_nn = false;
-      __client_nw = -1;
-      __client_nl = -1;
-      __client_nt = false;
-      __client_nk = -1;
-      __client_np = -1;
-      isDraggingWidget = false;
-      cycleCntr = 1;
-      __client_nr = new int[32];
-      __client_nd = 0;
-      __client_nz = new int[32];
-      __client_ns = 0;
-      changedSkills = new int[32];
-      changedSkillsCount = 0;
-      chatCycle = 0;
-      __client_na = 0;
-      __client_nh = 0;
-      __client_nv = 0;
-      __client_nc = 0;
-      __client_ni = 0;
-      mouseWheelRotation = 0;
-      scriptEvents = new NodeDeque();
-      __client_oh = new NodeDeque();
-      __client_oc = new NodeDeque();
-      widgetClickMasks = new NodeHashTable(512);
-      rootWidgetCount = 0;
-      __client_oo = -2;
-      __client_od = new boolean[100];
-      __client_ot = new boolean[100];
-      __client_oq = new boolean[100];
-      rootWidgetXs = new int[100];
-      rootWidgetYs = new int[100];
-      rootWidgetWidths = new int[100];
-      rootWidgetHeights = new int[100];
-      gameDrawingMode = 0;
-      __client_oa = 0L;
-      isResizable = true;
-      __client_pv = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215};
-      publicChatMode = 0;
-      __client_pl = 0;
-      __client_pz = "";
-      __client_pu = new long[100];
-      __client_pb = 0;
-      __client_pm = 0;
-      __client_pq = new int[128];
-      __client_pn = new int[128];
-      __client_pp = -1L;
-      __client_ph = -1;
-      mapIconCount = 0;
-      mapIconXs = new int[1000];
-      mapIconYs = new int[1000];
-      mapIcons = new Sprite[1000];
-      destinationX = 0;
-      destinationY = 0;
-      minimapState = 0;
-      __client_qf = 255;
-      __client_qy = -1;
-      __client_qq = false;
-      soundEffectVolume = 127;
-      __client_qc = 127;
-      soundEffectCount = 0;
-      soundEffectIds = new int[50];
-      queuedSoundEffectLoops = new int[50];
-	  queuedSoundEffectDelays = new int[50];
-      soundLocations = new int[50];
-      soundEffects = new SoundEffect[50];
-      isCameraLocked = false;
-      __client_rh = new boolean[5];
-      __client_rd = new int[5];
-      __client_rl = new int[5];
-      __client_rj = new int[5];
-      __client_rk = new int[5];
-      __client_rw = 256;
-      __client_rm = 205;
-      __client_re = 256;
-      __client_rb = 320;
-      __client_rv = 1;
-      __client_ri = 32767;
-      __client_rs = 1;
-      __client_rp = 32767;
-      viewportOffsetX = 0;
-      viewportOffsetY = 0;
-      viewportWidth = 0;
-      viewportHeight = 0;
-      viewportZoom = 0;
-      __client_ru = new PlayerAppearance();
-      __client_sd = -1;
-      __client_sl = -1;
-      platformInfoProvider = new DesktopPlatformInfoProvider();
-      grandExchangeOffers = new GrandExchangeOffer[8];
-      __client_sj = new OwnWorldComparator();
-      __client_ss = -1;
-      indexCacheLoaders = new ArrayList(10);
-      indexCacheLoaderIndex = 0;
-      __client_sx = 0;
-      field895 = new class65();
-      __client_tp = new int[50];
-      __client_th = new int[50];
-   }
+   static int field220;
 
    @ObfuscatedName("j")
    @ObfuscatedSignature(
       signature = "(I)V",
       garbageValue = "-1773624745"
    )
-   protected final void __j_113() {
-      __client_oa = class203.currentTimeMs() + 500L;
-      this.__ge_137();
-      if(rootWidgetGroup != -1) {
-         this.__iu_141(true);
+   protected final void vmethod107() {
+      field99 = class203.currentTimeMs() + 500L;
+      this.method84();
+      if (rootWidgetGroup != -1) {
+         this.method87(true);
       }
 
    }
@@ -1543,13 +1265,13 @@ public final class Client extends GameShell implements Usernamed {
    @Export("setUp")
    protected final void setUp() {
       WorldMapCacheName.method633(new int[]{20, 260, 10000}, new int[]{1000, 100, 500});
-      class2.port1 = gameBuild == 0?43594:worldId + 40000;
-      WorldMapArea.port2 = gameBuild == 0?443:worldId + 50000;
+      class2.port1 = gameBuild == 0 ? 43594 : worldId + 40000;
+      WorldMapArea.port2 = gameBuild == 0 ? 443 : worldId + 50000;
       class203.port3 = class2.port1;
-      PlayerAppearance.__hi_g = class226.__ht_m;
-      class229.__hz_l = class226.__ht_f;
-      class227.__hj_e = class226.__ht_q;
-      IndexCacheLoader.__bd_x = class226.__ht_w;
+      PlayerAppearance.field726 = class226.field1132;
+      class229.field1137 = class226.field1133;
+      class227.field1136 = class226.field1134;
+      IndexCacheLoader.field406 = class226.field1135;
       TriBool.urlRequester = new UrlRequester();
       this.setUpKeyboard();
       this.setUpMouse();
@@ -1557,13 +1279,13 @@ public final class Client extends GameShell implements Usernamed {
       Fonts.indexStore255 = new IndexStore(255, class168.dat2File, class168.idx255File, 500000);
       ReflectionCheck.clientPreferences = class306.method5780();
       this.setUpClipboard();
-      String var2 = Ignored.__ks_at;
-      class50.__af_m = this;
-      if(var2 != null) {
-         class50.__af_f = var2;
+      String var1 = Ignored.field402;
+      class50.field1159 = this;
+      if (var1 != null) {
+         class50.field1160 = var1;
       }
 
-      if(gameBuild != 0) {
+      if (gameBuild != 0) {
          displayFps = true;
       }
 
@@ -1576,47 +1298,47 @@ public final class Client extends GameShell implements Usernamed {
       signature = "(I)V",
       garbageValue = "1445885427"
    )
-   protected final void __al_111() {
+   protected final void vmethod112() {
       ++cycle;
       this.doCycleJs5();
       class3.method41();
 
       int var1;
       try {
-         if(class214.__hf_o == 1) {
-            var1 = class214.midiPcmStream.__f_341();
-            if(var1 > 0 && class214.midiPcmStream.isReady()) {
-               var1 -= FaceNormal.__el_x;
-               if(var1 < 0) {
+         if (class214.field1129 == 1) {
+            var1 = class214.midiPcmStream.method170();
+            if (var1 > 0 && class214.midiPcmStream.isReady()) {
+               var1 -= FaceNormal.field344;
+               if (var1 < 0) {
                   var1 = 0;
                }
 
-               class214.midiPcmStream.__m_340(var1);
+               class214.midiPcmStream.method169(var1);
             } else {
                class214.midiPcmStream.clear();
                class214.midiPcmStream.removeAll();
-               if(class214.__hf_u != null) {
-                  class214.__hf_o = 2;
+               if (class214.field1130 != null) {
+                  class214.field1129 = 2;
                } else {
-                  class214.__hf_o = 0;
+                  class214.field1129 = 0;
                }
 
                class13.musicTrack = null;
                class307.soundCache = null;
             }
          }
-      } catch (Exception var63) {
-         var63.printStackTrace();
+      } catch (Exception var54) {
+         var54.printStackTrace();
          class214.midiPcmStream.clear();
-         class214.__hf_o = 0;
+         class214.field1129 = 0;
          class13.musicTrack = null;
          class307.soundCache = null;
-         class214.__hf_u = null;
+         class214.field1130 = null;
       }
 
       class13.playPcmPlayers();
       class171.method3498();
-      MouseHandler var47 = MouseHandler.MouseHandler_instance;
+      MouseHandler var2 = MouseHandler.MouseHandler_instance;
       synchronized(MouseHandler.MouseHandler_instance) {
          MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButton0;
          MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_x0;
@@ -1629,108 +1351,110 @@ public final class Client extends GameShell implements Usernamed {
          MouseHandler.MouseHandler_lastButton0 = 0;
       }
 
-      if(class16.mouseWheel != null) {
+      if (class16.mouseWheel != null) {
          var1 = class16.mouseWheel.useRotation();
          mouseWheelRotation = var1;
       }
 
-      if(gameState == 0) {
+      if (gameState == 0) {
          class171.method3497();
          class11.method145();
-      } else if(gameState == 5) {
+      } else if (gameState == 5) {
          class54.method1092(this);
          class171.method3497();
          class11.method145();
-      } else if(gameState != 10 && gameState != 11) {
-         if(gameState == 20) {
+      } else if (gameState != 10 && gameState != 11) {
+         if (gameState == 20) {
             class54.method1092(this);
             this.doCycleLoggedOut();
-         } else if(gameState == 25) {
+         } else if (gameState == 25) {
             UserComparator10.method3352(false);
-            __client_fe = 0;
-            boolean var64 = true;
+            field177 = 0;
+            boolean var3 = true;
 
-            int var48;
-            for(var48 = 0; var48 < class40.regionLandArchives.length; ++var48) {
-               if(IndexCacheLoader.regionMapArchiveIds[var48] != -1 && class40.regionLandArchives[var48] == null) {
-                  class40.regionLandArchives[var48] = SecureRandomFuture.indexCache5.takeRecord(IndexCacheLoader.regionMapArchiveIds[var48], 0);
-                  if(class40.regionLandArchives[var48] == null) {
-                     var64 = false;
-                     ++__client_fe;
+            int var4;
+            for (var4 = 0; var4 < class40.regionLandArchives.length; ++var4) {
+               if (IndexCacheLoader.regionMapArchiveIds[var4] != -1 && class40.regionLandArchives[var4] == null) {
+                  class40.regionLandArchives[var4] = SecureRandomFuture.indexCache5.takeRecord(IndexCacheLoader.regionMapArchiveIds[var4], 0);
+                  if (class40.regionLandArchives[var4] == null) {
+                     var3 = false;
+                     ++field177;
                   }
                }
 
-               if(MouseHandler.regionLandArchiveIds[var48] != -1 && HealthBarUpdate.regionMapArchives[var48] == null) {
-                  HealthBarUpdate.regionMapArchives[var48] = SecureRandomFuture.indexCache5.takeRecordEncrypted(MouseHandler.regionLandArchiveIds[var48], 0, class190.xteaKeys[var48]);
-                  if(HealthBarUpdate.regionMapArchives[var48] == null) {
-                     var64 = false;
-                     ++__client_fe;
+               if (MouseHandler.regionLandArchiveIds[var4] != -1 && HealthBarUpdate.regionMapArchives[var4] == null) {
+                  HealthBarUpdate.regionMapArchives[var4] = SecureRandomFuture.indexCache5.takeRecordEncrypted(MouseHandler.regionLandArchiveIds[var4], 0, class190.xteaKeys[var4]);
+                  if (HealthBarUpdate.regionMapArchives[var4] == null) {
+                     var3 = false;
+                     ++field177;
                   }
                }
             }
 
-            if(!var64) {
-               __client_gh = 1;
+            if (!var3) {
+               field181 = 1;
             } else {
-               __client_fk = 0;
-               var64 = true;
+               field179 = 0;
+               var3 = true;
 
-               int var4;
                int var5;
-               for(var48 = 0; var48 < class40.regionLandArchives.length; ++var48) {
-                  byte[] var3 = HealthBarUpdate.regionMapArchives[var48];
-                  if(var3 != null) {
-                     var4 = (class308.regions[var48] >> 8) * 64 - class50.baseX;
-                     var5 = (class308.regions[var48] & 255) * 64 - GraphicsObject.baseY;
-                     if(isInInstance) {
-                        var4 = 10;
+               int var6;
+               for (var4 = 0; var4 < class40.regionLandArchives.length; ++var4) {
+                  byte[] var7 = HealthBarUpdate.regionMapArchives[var4];
+                  if (var7 != null) {
+                     var5 = (class308.regions[var4] >> 8) * 64 - class50.baseX;
+                     var6 = (class308.regions[var4] & 255) * 64 - GraphicsObject.baseY;
+                     if (isInInstance) {
                         var5 = 10;
+                        var6 = 10;
                      }
 
-                     var64 &= TextureProvider.method2774(var3, var4, var5);
+                     var3 &= TextureProvider.method2774(var7, var5, var6);
                   }
                }
 
-               if(!var64) {
-                  __client_gh = 2;
+               if (!var3) {
+                  field181 = 2;
                } else {
-                  if(__client_gh != 0) {
-                     class68.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + 100 + "%" + ")", true);
+                  if (field181 != 0) {
+                     class68.drawLoadingMessage("Loading - please wait.<br> (100%)", true);
                   }
 
                   class13.playPcmPlayers();
                   class65.scene.clear();
 
-                  for(var48 = 0; var48 < 4; ++var48) {
-                     collisionMaps[var48].clear();
+                  for (var4 = 0; var4 < 4; ++var4) {
+                     collisionMaps[var4].clear();
                   }
 
-                  int var49;
-                  for(var48 = 0; var48 < 4; ++var48) {
-                     for(var49 = 0; var49 < 104; ++var49) {
-                        for(var4 = 0; var4 < 104; ++var4) {
-                           Tiles.Tiles_renderFlags[var48][var49][var4] = 0;
+                  int var55;
+                  for (var4 = 0; var4 < 4; ++var4) {
+                     for (var55 = 0; var55 < 104; ++var55) {
+                        for (var5 = 0; var5 < 104; ++var5) {
+                           Tiles.Tiles_renderFlags[var4][var55][var5] = 0;
                         }
                      }
                   }
 
                   class13.playPcmPlayers();
                   Tiles.Tiles_minPlane = 99;
-                  Tiles.__bq_w = new byte[4][104][104];
-                  Fonts.__kz_o = new byte[4][104][104];
-                  class32.__ay_u = new byte[4][104][104];
-                  class307.__kc_g = new byte[4][104][104];
-                  Tiles.__bq_a = new int[4][105][105];
-                  Tiles.__bq_l = new byte[4][105][105];
-                  Huffman.__gd_e = new int[105][105];
-                  class13.__i_x = new int[104];
-                  Formatting.__cy_d = new int[104];
-                  class214.__hf_k = new int[104];
-                  WorldMapSectionType.__h_n = new int[104];
-                  Message.__bm_i = new int[104];
-                  var48 = class40.regionLandArchives.length;
+                  Tiles.field908 = new byte[4][104][104];
+                  Fonts.field350 = new byte[4][104][104];
+                  class32.field1157 = new byte[4][104][104];
+                  class307.field1155 = new byte[4][104][104];
+                  Tiles.field910 = new int[4][105][105];
+                  Tiles.field909 = new byte[4][105][105];
+                  Huffman.field398 = new int[105][105];
+                  class13.field1112 = new int[104];
+                  Formatting.field353 = new int[104];
+                  class214.field1131 = new int[104];
+                  WorldMapSectionType.field1104 = new int[104];
+                  Message.field490 = new int[104];
+                  var4 = class40.regionLandArchives.length;
                   SpriteMask.method4390();
                   UserComparator10.method3352(true);
+                  int var8;
+                  int var9;
                   int var10;
                   int var11;
                   int var12;
@@ -1743,79 +1467,77 @@ public final class Client extends GameShell implements Usernamed {
                   int var19;
                   int var20;
                   int var21;
-                  int var22;
-                  int var51;
-                  if(!isInInstance) {
-                     byte[] var6;
-                     for(var49 = 0; var49 < var48; ++var49) {
-                        var4 = (class308.regions[var49] >> 8) * 64 - class50.baseX;
-                        var5 = (class308.regions[var49] & 255) * 64 - GraphicsObject.baseY;
-                        var6 = class40.regionLandArchives[var49];
-                        if(var6 != null) {
+                  if (!isInInstance) {
+                     byte[] var22;
+                     for (var55 = 0; var55 < var4; ++var55) {
+                        var5 = (class308.regions[var55] >> 8) * 64 - class50.baseX;
+                        var6 = (class308.regions[var55] & 255) * 64 - GraphicsObject.baseY;
+                        var22 = class40.regionLandArchives[var55];
+                        if (var22 != null) {
                            class13.playPcmPlayers();
-                           Varcs.method2166(var6, var4, var5, GameObject.__eh_fy * 8 - 48, WorldMapLabelSize.__s_fi * 8 - 48, collisionMaps);
+                           Varcs.method2166(var22, var5, var6, GameObject.field359 * 8 - 48, WorldMapLabelSize.field1041 * 8 - 48, collisionMaps);
                         }
                      }
 
-                     for(var49 = 0; var49 < var48; ++var49) {
-                        var4 = (class308.regions[var49] >> 8) * 64 - class50.baseX;
-                        var5 = (class308.regions[var49] & 255) * 64 - GraphicsObject.baseY;
-                        var6 = class40.regionLandArchives[var49];
-                        if(var6 == null && WorldMapLabelSize.__s_fi < 800) {
+                     for (var55 = 0; var55 < var4; ++var55) {
+                        var5 = (class308.regions[var55] >> 8) * 64 - class50.baseX;
+                        var6 = (class308.regions[var55] & 255) * 64 - GraphicsObject.baseY;
+                        var22 = class40.regionLandArchives[var55];
+                        if (var22 == null && WorldMapLabelSize.field1041 < 800) {
                            class13.playPcmPlayers();
-                           UserComparator6.method3390(var4, var5, 64, 64);
+                           UserComparator6.method3390(var5, var6, 64, 64);
                         }
                      }
 
                      UserComparator10.method3352(true);
 
-                     for(var49 = 0; var49 < var48; ++var49) {
-                        byte[] var50 = HealthBarUpdate.regionMapArchives[var49];
-                        if(var50 != null) {
-                           var5 = (class308.regions[var49] >> 8) * 64 - class50.baseX;
-                           var51 = (class308.regions[var49] & 255) * 64 - GraphicsObject.baseY;
+                     for (var55 = 0; var55 < var4; ++var55) {
+                        byte[] var23 = HealthBarUpdate.regionMapArchives[var55];
+                        if (var23 != null) {
+                           var6 = (class308.regions[var55] >> 8) * 64 - class50.baseX;
+                           var21 = (class308.regions[var55] & 255) * 64 - GraphicsObject.baseY;
                            class13.playPcmPlayers();
-                           Scene var7 = class65.scene;
-                           CollisionMap[] var8 = collisionMaps;
-                           Buffer var9 = new Buffer(var50);
-                           var10 = -1;
+                           Scene var24 = class65.scene;
+                           CollisionMap[] var25 = collisionMaps;
+                           Buffer var26 = new Buffer(var23);
+                           var8 = -1;
 
-                           while(true) {
-                              var11 = var9.__at_308();
-                              if(var11 == 0) {
+                           while (true) {
+                              var9 = var26.method49();
+                              if (var9 == 0) {
                                  break;
                               }
 
-                              var10 += var11;
-                              var12 = 0;
+                              var8 += var9;
+                              var10 = 0;
 
-                              while(true) {
-                                 var13 = var9.__ae_307();
-                                 if(var13 == 0) {
+                              while (true) {
+                                 var11 = var26.method48();
+                                 if (var11 == 0) {
                                     break;
                                  }
 
-                                 var12 += var13 - 1;
-                                 var14 = var12 & 63;
-                                 var15 = var12 >> 6 & 63;
-                                 var16 = var12 >> 12;
-                                 var17 = var9.readUnsignedByte();
-                                 var18 = var17 >> 2;
-                                 var19 = var17 & 3;
-                                 var20 = var5 + var15;
-                                 var21 = var14 + var51;
-                                 if(var20 > 0 && var21 > 0 && var20 < 103 && var21 < 103) {
-                                    var22 = var16;
-                                    if((Tiles.Tiles_renderFlags[1][var20][var21] & 2) == 2) {
-                                       var22 = var16 - 1;
+                                 var10 += var11 - 1;
+                                 var12 = var10 & 63;
+                                 var13 = var10 >> 6 & 63;
+                                 var14 = var10 >> 12;
+                                 var15 = var26.readUnsignedByte();
+                                 var16 = var15 >> 2;
+                                 var17 = var15 & 3;
+                                 var18 = var6 + var13;
+                                 var19 = var12 + var21;
+                                 if (var18 > 0 && var19 > 0 && var18 < 103 && var19 < 103) {
+                                    var20 = var14;
+                                    if ((Tiles.Tiles_renderFlags[1][var18][var19] & 2) == 2) {
+                                       var20 = var14 - 1;
                                     }
 
-                                    CollisionMap var23 = null;
-                                    if(var22 >= 0) {
-                                       var23 = var8[var22];
+                                    CollisionMap var27 = null;
+                                    if (var20 >= 0) {
+                                       var27 = var25[var20];
                                     }
 
-                                    class227.method4446(var16, var20, var21, var10, var19, var18, var7, var23);
+                                    class227.method4446(var14, var18, var19, var8, var17, var16, var24, var27);
                                  }
                               }
                            }
@@ -1823,47 +1545,47 @@ public final class Client extends GameShell implements Usernamed {
                      }
                   }
 
-                  int var52;
-                  int var53;
-                  int var54;
-                  if(isInInstance) {
-                     var49 = 0;
+                  int var56;
+                  int var57;
+                  int var58;
+                  if (isInInstance) {
+                     var55 = 0;
 
-                     label1186:
-                     while(true) {
-                        if(var49 >= 4) {
-                           for(var49 = 0; var49 < 13; ++var49) {
-                              for(var4 = 0; var4 < 13; ++var4) {
-                                 var5 = instanceChunkTemplates[0][var49][var4];
-                                 if(var5 == -1) {
-                                    UserComparator6.method3390(var49 * 8, var4 * 8, 8, 8);
+                     label998:
+                     while (true) {
+                        if (var55 >= 4) {
+                           for (var55 = 0; var55 < 13; ++var55) {
+                              for (var5 = 0; var5 < 13; ++var5) {
+                                 var6 = instanceChunkTemplates[0][var55][var5];
+                                 if (var6 == -1) {
+                                    UserComparator6.method3390(var55 * 8, var5 * 8, 8, 8);
                                  }
                               }
                            }
 
                            UserComparator10.method3352(true);
-                           var49 = 0;
+                           var55 = 0;
 
-                           while(true) {
-                              if(var49 >= 4) {
-                                 break label1186;
+                           while (true) {
+                              if (var55 >= 4) {
+                                 break label998;
                               }
 
                               class13.playPcmPlayers();
 
-                              for(var4 = 0; var4 < 13; ++var4) {
-                                 for(var5 = 0; var5 < 13; ++var5) {
-                                    var51 = instanceChunkTemplates[var49][var4][var5];
-                                    if(var51 != -1) {
-                                       var52 = var51 >> 24 & 3;
-                                       var53 = var51 >> 1 & 3;
-                                       var54 = var51 >> 14 & 1023;
-                                       var10 = var51 >> 3 & 2047;
-                                       var11 = (var54 / 8 << 8) + var10 / 8;
+                              for (var5 = 0; var5 < 13; ++var5) {
+                                 for (var6 = 0; var6 < 13; ++var6) {
+                                    var21 = instanceChunkTemplates[var55][var5][var6];
+                                    if (var21 != -1) {
+                                       var56 = var21 >> 24 & 3;
+                                       var57 = var21 >> 1 & 3;
+                                       var58 = var21 >> 14 & 1023;
+                                       var8 = var21 >> 3 & 2047;
+                                       var9 = (var58 / 8 << 8) + var8 / 8;
 
-                                       for(var12 = 0; var12 < class308.regions.length; ++var12) {
-                                          if(class308.regions[var12] == var11 && HealthBarUpdate.regionMapArchives[var12] != null) {
-                                             ServerPacket.method3662(HealthBarUpdate.regionMapArchives[var12], var49, var4 * 8, var5 * 8, var52, (var54 & 7) * 8, (var10 & 7) * 8, var53, class65.scene, collisionMaps);
+                                       for (var10 = 0; var10 < class308.regions.length; ++var10) {
+                                          if (class308.regions[var10] == var9 && HealthBarUpdate.regionMapArchives[var10] != null) {
+                                             ServerPacket.method3662(HealthBarUpdate.regionMapArchives[var10], var55, var5 * 8, var6 * 8, var56, (var58 & 7) * 8, (var8 & 7) * 8, var57, class65.scene, collisionMaps);
                                              break;
                                           }
                                        }
@@ -1871,335 +1593,347 @@ public final class Client extends GameShell implements Usernamed {
                                  }
                               }
 
-                              ++var49;
+                              ++var55;
                            }
                         }
 
                         class13.playPcmPlayers();
 
-                        for(var4 = 0; var4 < 13; ++var4) {
-                           for(var5 = 0; var5 < 13; ++var5) {
-                              boolean var72 = false;
-                              var52 = instanceChunkTemplates[var49][var4][var5];
-                              if(var52 != -1) {
-                                 var53 = var52 >> 24 & 3;
-                                 var54 = var52 >> 1 & 3;
-                                 var10 = var52 >> 14 & 1023;
-                                 var11 = var52 >> 3 & 2047;
-                                 var12 = (var10 / 8 << 8) + var11 / 8;
+                        for (var5 = 0; var5 < 13; ++var5) {
+                           for (var6 = 0; var6 < 13; ++var6) {
+                              boolean var59 = false;
+                              var56 = instanceChunkTemplates[var55][var5][var6];
+                              if (var56 != -1) {
+                                 var57 = var56 >> 24 & 3;
+                                 var58 = var56 >> 1 & 3;
+                                 var8 = var56 >> 14 & 1023;
+                                 var9 = var56 >> 3 & 2047;
+                                 var10 = (var8 / 8 << 8) + var9 / 8;
 
-                                 for(var13 = 0; var13 < class308.regions.length; ++var13) {
-                                    if(class308.regions[var13] == var12 && class40.regionLandArchives[var13] != null) {
-                                       class204.method4013(class40.regionLandArchives[var13], var49, var4 * 8, var5 * 8, var53, (var10 & 7) * 8, (var11 & 7) * 8, var54, collisionMaps);
-                                       var72 = true;
+                                 for (var11 = 0; var11 < class308.regions.length; ++var11) {
+                                    if (class308.regions[var11] == var10 && class40.regionLandArchives[var11] != null) {
+                                       class204.method4013(class40.regionLandArchives[var11], var55, var5 * 8, var6 * 8, var57, (var8 & 7) * 8, (var9 & 7) * 8, var58, collisionMaps);
+                                       var59 = true;
                                        break;
                                     }
                                  }
                               }
 
-                              if(!var72) {
-                                 var53 = var49;
-                                 var54 = var4 * 8;
-                                 var10 = var5 * 8;
+                              if (!var59) {
+                                 var57 = var55;
+                                 var58 = var5 * 8;
+                                 var8 = var6 * 8;
 
-                                 for(var11 = 0; var11 < 8; ++var11) {
-                                    for(var12 = 0; var12 < 8; ++var12) {
-                                       Tiles.Tiles_heights[var53][var11 + var54][var12 + var10] = 0;
+                                 for (var9 = 0; var9 < 8; ++var9) {
+                                    for (var10 = 0; var10 < 8; ++var10) {
+                                       Tiles.Tiles_heights[var57][var9 + var58][var10 + var8] = 0;
                                     }
                                  }
 
-                                 if(var54 > 0) {
-                                    for(var11 = 1; var11 < 8; ++var11) {
-                                       Tiles.Tiles_heights[var53][var54][var10 + var11] = Tiles.Tiles_heights[var53][var54 - 1][var10 + var11];
+                                 if (var58 > 0) {
+                                    for (var9 = 1; var9 < 8; ++var9) {
+                                       Tiles.Tiles_heights[var57][var58][var8 + var9] = Tiles.Tiles_heights[var57][var58 - 1][var8 + var9];
                                     }
                                  }
 
-                                 if(var10 > 0) {
-                                    for(var11 = 1; var11 < 8; ++var11) {
-                                       Tiles.Tiles_heights[var53][var54 + var11][var10] = Tiles.Tiles_heights[var53][var54 + var11][var10 - 1];
+                                 if (var8 > 0) {
+                                    for (var9 = 1; var9 < 8; ++var9) {
+                                       Tiles.Tiles_heights[var57][var58 + var9][var8] = Tiles.Tiles_heights[var57][var58 + var9][var8 - 1];
                                     }
                                  }
 
-                                 if(var54 > 0 && Tiles.Tiles_heights[var53][var54 - 1][var10] != 0) {
-                                    Tiles.Tiles_heights[var53][var54][var10] = Tiles.Tiles_heights[var53][var54 - 1][var10];
-                                 } else if(var10 > 0 && Tiles.Tiles_heights[var53][var54][var10 - 1] != 0) {
-                                    Tiles.Tiles_heights[var53][var54][var10] = Tiles.Tiles_heights[var53][var54][var10 - 1];
-                                 } else if(var54 > 0 && var10 > 0 && Tiles.Tiles_heights[var53][var54 - 1][var10 - 1] != 0) {
-                                    Tiles.Tiles_heights[var53][var54][var10] = Tiles.Tiles_heights[var53][var54 - 1][var10 - 1];
+                                 if (var58 > 0 && Tiles.Tiles_heights[var57][var58 - 1][var8] != 0) {
+                                    Tiles.Tiles_heights[var57][var58][var8] = Tiles.Tiles_heights[var57][var58 - 1][var8];
+                                 } else if (var8 > 0 && Tiles.Tiles_heights[var57][var58][var8 - 1] != 0) {
+                                    Tiles.Tiles_heights[var57][var58][var8] = Tiles.Tiles_heights[var57][var58][var8 - 1];
+                                 } else if (var58 > 0 && var8 > 0 && Tiles.Tiles_heights[var57][var58 - 1][var8 - 1] != 0) {
+                                    Tiles.Tiles_heights[var57][var58][var8] = Tiles.Tiles_heights[var57][var58 - 1][var8 - 1];
                                  }
                               }
                            }
                         }
 
-                        ++var49;
+                        ++var55;
                      }
                   }
 
                   UserComparator10.method3352(true);
                   class13.playPcmPlayers();
-                  Scene var65 = class65.scene;
-                  CollisionMap[] var71 = collisionMaps;
+                  Scene var60 = class65.scene;
+                  CollisionMap[] var61 = collisionMaps;
 
-                  for(var5 = 0; var5 < 4; ++var5) {
-                     for(var51 = 0; var51 < 104; ++var51) {
-                        for(var52 = 0; var52 < 104; ++var52) {
-                           if((Tiles.Tiles_renderFlags[var5][var51][var52] & 1) == 1) {
-                              var53 = var5;
-                              if((Tiles.Tiles_renderFlags[1][var51][var52] & 2) == 2) {
-                                 var53 = var5 - 1;
+                  for (var6 = 0; var6 < 4; ++var6) {
+                     for (var21 = 0; var21 < 104; ++var21) {
+                        for (var56 = 0; var56 < 104; ++var56) {
+                           if ((Tiles.Tiles_renderFlags[var6][var21][var56] & 1) == 1) {
+                              var57 = var6;
+                              if ((Tiles.Tiles_renderFlags[1][var21][var56] & 2) == 2) {
+                                 var57 = var6 - 1;
                               }
 
-                              if(var53 >= 0) {
-                                 var71[var53].__w_285(var51, var52);
+                              if (var57 >= 0) {
+                                 var61[var57].method92(var21, var56);
                               }
                            }
                         }
                      }
                   }
 
-                  Tiles.__bq_p += (int)(Math.random() * 5.0D) - 2;
-                  if(Tiles.__bq_p < -8) {
-                     Tiles.__bq_p = -8;
+                  Tiles.field917 += (int)(Math.random() * 5.0D) - 2;
+                  if (Tiles.field917 < -8) {
+                     Tiles.field917 = -8;
                   }
 
-                  if(Tiles.__bq_p > 8) {
-                     Tiles.__bq_p = 8;
+                  if (Tiles.field917 > 8) {
+                     Tiles.field917 = 8;
                   }
 
-                  Tiles.__bq_v += (int)(Math.random() * 5.0D) - 2;
-                  if(Tiles.__bq_v < -16) {
-                     Tiles.__bq_v = -16;
+                  Tiles.field918 += (int)(Math.random() * 5.0D) - 2;
+                  if (Tiles.field918 < -16) {
+                     Tiles.field918 = -16;
                   }
 
-                  if(Tiles.__bq_v > 16) {
-                     Tiles.__bq_v = 16;
+                  if (Tiles.field918 > 16) {
+                     Tiles.field918 = 16;
                   }
 
-                  for(var5 = 0; var5 < 4; ++var5) {
-                     byte[][] var66 = Tiles.__bq_l[var5];
-                     var12 = (int)Math.sqrt(5100.0D);
-                     var13 = var12 * 768 >> 8;
+                  int[] var10000;
+                  for (var6 = 0; var6 < 4; ++var6) {
+                     byte[][] var62 = Tiles.field909[var6];
+                     var10 = (int)Math.sqrt(5100.0D);
+                     var11 = var10 * 768 >> 8;
 
-                     int var55;
-                     for(var14 = 1; var14 < 103; ++var14) {
-                        for(var15 = 1; var15 < 103; ++var15) {
-                           var16 = Tiles.Tiles_heights[var5][var15 + 1][var14] - Tiles.Tiles_heights[var5][var15 - 1][var14];
-                           var17 = Tiles.Tiles_heights[var5][var15][var14 + 1] - Tiles.Tiles_heights[var5][var15][var14 - 1];
-                           var18 = (int)Math.sqrt((double)(var17 * var17 + var16 * var16 + 65536));
-                           var19 = (var16 << 8) / var18;
-                           var20 = 65536 / var18;
-                           var21 = (var17 << 8) / var18;
-                           var22 = (var21 * -50 + var19 * -50 + var20 * -10) / var13 + 96;
-                           var55 = (var66[var15 - 1][var14] >> 2) + (var66[var15][var14 - 1] >> 2) + (var66[var15 + 1][var14] >> 3) + (var66[var15][var14 + 1] >> 3) + (var66[var15][var14] >> 1);
-                           Huffman.__gd_e[var15][var14] = var22 - var55;
+                     int var28;
+                     for (var12 = 1; var12 < 103; ++var12) {
+                        for (var13 = 1; var13 < 103; ++var13) {
+                           var14 = Tiles.Tiles_heights[var6][var13 + 1][var12] - Tiles.Tiles_heights[var6][var13 - 1][var12];
+                           var15 = Tiles.Tiles_heights[var6][var13][var12 + 1] - Tiles.Tiles_heights[var6][var13][var12 - 1];
+                           var16 = (int)Math.sqrt((double)(var15 * var15 + var14 * var14 + 65536));
+                           var17 = (var14 << 8) / var16;
+                           var18 = 65536 / var16;
+                           var19 = (var15 << 8) / var16;
+                           var20 = (var19 * -50 + var17 * -50 + var18 * -10) / var11 + 96;
+                           var28 = (var62[var13 - 1][var12] >> 2) + (var62[var13][var12 - 1] >> 2) + (var62[var13 + 1][var12] >> 3) + (var62[var13][var12 + 1] >> 3) + (var62[var13][var12] >> 1);
+                           Huffman.field398[var13][var12] = var20 - var28;
                         }
                      }
 
-                     for(var14 = 0; var14 < 104; ++var14) {
-                        class13.__i_x[var14] = 0;
-                        Formatting.__cy_d[var14] = 0;
-                        class214.__hf_k[var14] = 0;
-                        WorldMapSectionType.__h_n[var14] = 0;
-                        Message.__bm_i[var14] = 0;
+                     for (var12 = 0; var12 < 104; ++var12) {
+                        class13.field1112[var12] = 0;
+                        Formatting.field353[var12] = 0;
+                        class214.field1131[var12] = 0;
+                        WorldMapSectionType.field1104[var12] = 0;
+                        Message.field490[var12] = 0;
                      }
 
-                     for(var14 = -5; var14 < 109; ++var14) {
-                        for(var15 = 0; var15 < 104; ++var15) {
-                           var16 = var14 + 5;
-                           if(var16 >= 0 && var16 < 104) {
-                              var17 = Tiles.__bq_w[var5][var16][var15] & 255;
-                              if(var17 > 0) {
-                                 UnderlayDefinition var56 = StudioGame.method4550(var17 - 1);
-                                 class13.__i_x[var15] += var56.hue;
-                                 Formatting.__cy_d[var15] += var56.saturation;
-                                 class214.__hf_k[var15] += var56.lightness;
-                                 WorldMapSectionType.__h_n[var15] += var56.hueMultiplier;
-                                 ++Message.__bm_i[var15];
+                     for (var12 = -5; var12 < 109; ++var12) {
+                        for (var13 = 0; var13 < 104; ++var13) {
+                           var14 = var12 + 5;
+                           int var10002;
+                           UnderlayDefinition var29;
+                           if (var14 >= 0 && var14 < 104) {
+                              var15 = Tiles.field908[var6][var14][var13] & 255;
+                              if (var15 > 0) {
+                                 var29 = StudioGame.method4550(var15 - 1);
+                                 var10000 = class13.field1112;
+                                 var10000[var13] += var29.hue;
+                                 var10000 = Formatting.field353;
+                                 var10000[var13] += var29.saturation;
+                                 var10000 = class214.field1131;
+                                 var10000[var13] += var29.lightness;
+                                 var10000 = WorldMapSectionType.field1104;
+                                 var10000[var13] += var29.hueMultiplier;
+                                 var10002 = Message.field490[var13]++;
                               }
                            }
 
-                           var17 = var14 - 5;
-                           if(var17 >= 0 && var17 < 104) {
-                              var18 = Tiles.__bq_w[var5][var17][var15] & 255;
-                              if(var18 > 0) {
-                                 UnderlayDefinition var57 = StudioGame.method4550(var18 - 1);
-                                 class13.__i_x[var15] -= var57.hue;
-                                 Formatting.__cy_d[var15] -= var57.saturation;
-                                 class214.__hf_k[var15] -= var57.lightness;
-                                 WorldMapSectionType.__h_n[var15] -= var57.hueMultiplier;
-                                 --Message.__bm_i[var15];
+                           var15 = var12 - 5;
+                           if (var15 >= 0 && var15 < 104) {
+                              var16 = Tiles.field908[var6][var15][var13] & 255;
+                              if (var16 > 0) {
+                                 var29 = StudioGame.method4550(var16 - 1);
+                                 var10000 = class13.field1112;
+                                 var10000[var13] -= var29.hue;
+                                 var10000 = Formatting.field353;
+                                 var10000[var13] -= var29.saturation;
+                                 var10000 = class214.field1131;
+                                 var10000[var13] -= var29.lightness;
+                                 var10000 = WorldMapSectionType.field1104;
+                                 var10000[var13] -= var29.hueMultiplier;
+                                 var10002 = Message.field490[var13]--;
                               }
                            }
                         }
 
-                        if(var14 >= 1 && var14 < 103) {
+                        if (var12 >= 1 && var12 < 103) {
+                           var13 = 0;
+                           var14 = 0;
                            var15 = 0;
                            var16 = 0;
                            var17 = 0;
-                           var18 = 0;
-                           var19 = 0;
 
-                           for(var20 = -5; var20 < 109; ++var20) {
-                              var21 = var20 + 5;
-                              if(var21 >= 0 && var21 < 104) {
-                                 var15 += class13.__i_x[var21];
-                                 var16 += Formatting.__cy_d[var21];
-                                 var17 += class214.__hf_k[var21];
-                                 var18 += WorldMapSectionType.__h_n[var21];
-                                 var19 += Message.__bm_i[var21];
+                           for (var18 = -5; var18 < 109; ++var18) {
+                              var19 = var18 + 5;
+                              if (var19 >= 0 && var19 < 104) {
+                                 var13 += class13.field1112[var19];
+                                 var14 += Formatting.field353[var19];
+                                 var15 += class214.field1131[var19];
+                                 var16 += WorldMapSectionType.field1104[var19];
+                                 var17 += Message.field490[var19];
                               }
 
-                              var22 = var20 - 5;
-                              if(var22 >= 0 && var22 < 104) {
-                                 var15 -= class13.__i_x[var22];
-                                 var16 -= Formatting.__cy_d[var22];
-                                 var17 -= class214.__hf_k[var22];
-                                 var18 -= WorldMapSectionType.__h_n[var22];
-                                 var19 -= Message.__bm_i[var22];
+                              var20 = var18 - 5;
+                              if (var20 >= 0 && var20 < 104) {
+                                 var13 -= class13.field1112[var20];
+                                 var14 -= Formatting.field353[var20];
+                                 var15 -= class214.field1131[var20];
+                                 var16 -= WorldMapSectionType.field1104[var20];
+                                 var17 -= Message.field490[var20];
                               }
 
-                              if(var20 >= 1 && var20 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var20] & 2) != 0 || (Tiles.Tiles_renderFlags[var5][var14][var20] & 16) == 0)) {
-                                 if(var5 < Tiles.Tiles_minPlane) {
-                                    Tiles.Tiles_minPlane = var5;
+                              if (var18 >= 1 && var18 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var12][var18] & 2) != 0 || (Tiles.Tiles_renderFlags[var6][var12][var18] & 16) == 0)) {
+                                 if (var6 < Tiles.Tiles_minPlane) {
+                                    Tiles.Tiles_minPlane = var6;
                                  }
 
-                                 var55 = Tiles.__bq_w[var5][var14][var20] & 255;
-                                 int var24 = Fonts.__kz_o[var5][var14][var20] & 255;
-                                 if(var55 > 0 || var24 > 0) {
-                                    int var25 = Tiles.Tiles_heights[var5][var14][var20];
-                                    int var26 = Tiles.Tiles_heights[var5][var14 + 1][var20];
-                                    int var27 = Tiles.Tiles_heights[var5][var14 + 1][var20 + 1];
-                                    int var28 = Tiles.Tiles_heights[var5][var14][var20 + 1];
-                                    int var29 = Huffman.__gd_e[var14][var20];
-                                    int var30 = Huffman.__gd_e[var14 + 1][var20];
-                                    int var31 = Huffman.__gd_e[var14 + 1][var20 + 1];
-                                    int var32 = Huffman.__gd_e[var14][var20 + 1];
-                                    int var33 = -1;
-                                    int var34 = -1;
-                                    int var35;
-                                    int var36;
-                                    int var37;
-                                    if(var55 > 0) {
-                                       var35 = var15 * 256 / var18;
-                                       var36 = var16 / var19;
-                                       var37 = var17 / var19;
-                                       var33 = WorldMapAreaData.method712(var35, var36, var37);
-                                       var35 = var35 + Tiles.__bq_p & 255;
-                                       var37 += Tiles.__bq_v;
-                                       if(var37 < 0) {
-                                          var37 = 0;
-                                       } else if(var37 > 255) {
-                                          var37 = 255;
+                                 var28 = Tiles.field908[var6][var12][var18] & 255;
+                                 int var65 = Fonts.field350[var6][var12][var18] & 255;
+                                 if (var28 > 0 || var65 > 0) {
+                                    int var30 = Tiles.Tiles_heights[var6][var12][var18];
+                                    int var31 = Tiles.Tiles_heights[var6][var12 + 1][var18];
+                                    int var32 = Tiles.Tiles_heights[var6][var12 + 1][var18 + 1];
+                                    int var33 = Tiles.Tiles_heights[var6][var12][var18 + 1];
+                                    int var34 = Huffman.field398[var12][var18];
+                                    int var35 = Huffman.field398[var12 + 1][var18];
+                                    int var36 = Huffman.field398[var12 + 1][var18 + 1];
+                                    int var37 = Huffman.field398[var12][var18 + 1];
+                                    int var38 = -1;
+                                    int var39 = -1;
+                                    int var40;
+                                    int var41;
+                                    int var42;
+                                    if (var28 > 0) {
+                                       var40 = var13 * 256 / var16;
+                                       var41 = var14 / var17;
+                                       var42 = var15 / var17;
+                                       var38 = WorldMapAreaData.method712(var40, var41, var42);
+                                       var40 = var40 + Tiles.field917 & 255;
+                                       var42 += Tiles.field918;
+                                       if (var42 < 0) {
+                                          var42 = 0;
+                                       } else if (var42 > 255) {
+                                          var42 = 255;
                                        }
 
-                                       var34 = WorldMapAreaData.method712(var35, var36, var37);
+                                       var39 = WorldMapAreaData.method712(var40, var41, var42);
                                     }
 
-                                    OverlayDefinition var38;
-                                    if(var5 > 0) {
-                                       boolean var69 = true;
-                                       if(var55 == 0 && class32.__ay_u[var5][var14][var20] != 0) {
-                                          var69 = false;
+                                    OverlayDefinition var43;
+                                    if (var6 > 0) {
+                                       boolean var44 = true;
+                                       if (var28 == 0 && class32.field1157[var6][var12][var18] != 0) {
+                                          var44 = false;
                                        }
 
-                                       if(var24 > 0) {
-                                          var37 = var24 - 1;
-                                          var38 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var37);
-                                          OverlayDefinition var58;
-                                          if(var38 != null) {
-                                             var58 = var38;
+                                       if (var65 > 0) {
+                                          var42 = var65 - 1;
+                                          var43 = (OverlayDefinition)OverlayDefinition.field664.get((long)var42);
+                                          OverlayDefinition var45;
+                                          if (var43 != null) {
+                                             var45 = var43;
                                           } else {
-                                             byte[] var39 = OverlayDefinition.__jf_m.takeRecord(4, var37);
-                                             var38 = new OverlayDefinition();
-                                             if(var39 != null) {
-                                                var38.read(new Buffer(var39), var37);
+                                             byte[] var46 = OverlayDefinition.field663.takeRecord(4, var42);
+                                             var43 = new OverlayDefinition();
+                                             if (var46 != null) {
+                                                var43.read(new Buffer(var46), var42);
                                              }
 
-                                             var38.init();
-                                             OverlayDefinition.__jf_f.put(var38, (long)var37);
-                                             var58 = var38;
+                                             var43.init();
+                                             OverlayDefinition.field664.put(var43, (long)var42);
+                                             var45 = var43;
                                           }
 
-                                          if(!var58.__o) {
-                                             var69 = false;
+                                          if (!var45.field665) {
+                                             var44 = false;
                                           }
                                        }
 
-                                       if(var69 && var25 == var26 && var25 == var27 && var28 == var25) {
-                                          Tiles.__bq_a[var5][var14][var20] |= 2340;
+                                       if (var44 && var30 == var31 && var30 == var32 && var33 == var30) {
+                                          var10000 = Tiles.field910[var6][var12];
+                                          var10000[var18] |= 2340;
                                        }
                                     }
 
-                                    var35 = 0;
-                                    if(var34 != -1) {
-                                       var35 = Rasterizer3D.Rasterizer3D_colorPalette[class15.method183(var34, 96)];
+                                    var40 = 0;
+                                    if (var39 != -1) {
+                                       var40 = Rasterizer3D.Rasterizer3D_colorPalette[class15.method183(var39, 96)];
                                     }
 
-                                    if(var24 == 0) {
-                                       var65.addTile(var5, var14, var20, 0, 0, -1, var25, var26, var27, var28, class15.method183(var33, var29), class15.method183(var33, var30), class15.method183(var33, var31), class15.method183(var33, var32), 0, 0, 0, 0, var35, 0);
+                                    if (var65 == 0) {
+                                       var60.addTile(var6, var12, var18, 0, 0, -1, var30, var31, var32, var33, class15.method183(var38, var34), class15.method183(var38, var35), class15.method183(var38, var36), class15.method183(var38, var37), 0, 0, 0, 0, var40, 0);
                                     } else {
-                                       var36 = class32.__ay_u[var5][var14][var20] + 1;
-                                       byte var70 = class307.__kc_g[var5][var14][var20];
-                                       int var59 = var24 - 1;
-                                       OverlayDefinition var40 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var59);
-                                       if(var40 != null) {
-                                          var38 = var40;
+                                       var41 = class32.field1157[var6][var12][var18] + 1;
+                                       byte var66 = class307.field1155[var6][var12][var18];
+                                       int var67 = var65 - 1;
+                                       OverlayDefinition var68 = (OverlayDefinition)OverlayDefinition.field664.get((long)var67);
+                                       if (var68 != null) {
+                                          var43 = var68;
                                        } else {
-                                          byte[] var41 = OverlayDefinition.__jf_m.takeRecord(4, var59);
-                                          var40 = new OverlayDefinition();
-                                          if(var41 != null) {
-                                             var40.read(new Buffer(var41), var59);
+                                          byte[] var47 = OverlayDefinition.field663.takeRecord(4, var67);
+                                          var68 = new OverlayDefinition();
+                                          if (var47 != null) {
+                                             var68.read(new Buffer(var47), var67);
                                           }
 
-                                          var40.init();
-                                          OverlayDefinition.__jf_f.put(var40, (long)var59);
-                                          var38 = var40;
+                                          var68.init();
+                                          OverlayDefinition.field664.put(var68, (long)var67);
+                                          var43 = var68;
                                        }
 
-                                       int var60 = var38.texture;
-                                       int var42;
-                                       int var43;
-                                       int var44;
-                                       int var45;
-                                       if(var60 >= 0) {
-                                          var43 = Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var60);
-                                          var42 = -1;
-                                       } else if(var38.rgb == 16711935) {
-                                          var42 = -2;
-                                          var60 = -1;
-                                          var43 = -2;
+                                       int var69 = var43.texture;
+                                       int var48;
+                                       int var49;
+                                       int var50;
+                                       int var51;
+                                       if (var69 >= 0) {
+                                          var49 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var69);
+                                          var48 = -1;
+                                       } else if (var43.rgb == 16711935) {
+                                          var48 = -2;
+                                          var69 = -1;
+                                          var49 = -2;
                                        } else {
-                                          var42 = WorldMapAreaData.method712(var38.hue, var38.saturation, var38.lightness);
-                                          var44 = var38.hue + Tiles.__bq_p & 255;
-                                          var45 = var38.lightness + Tiles.__bq_v;
-                                          if(var45 < 0) {
-                                             var45 = 0;
-                                          } else if(var45 > 255) {
-                                             var45 = 255;
+                                          var48 = WorldMapAreaData.method712(var43.hue, var43.saturation, var43.lightness);
+                                          var50 = var43.hue + Tiles.field917 & 255;
+                                          var51 = var43.lightness + Tiles.field918;
+                                          if (var51 < 0) {
+                                             var51 = 0;
+                                          } else if (var51 > 255) {
+                                             var51 = 255;
                                           }
 
-                                          var43 = WorldMapAreaData.method712(var44, var38.saturation, var45);
+                                          var49 = WorldMapAreaData.method712(var50, var43.saturation, var51);
                                        }
 
-                                       var44 = 0;
-                                       if(var43 != -2) {
-                                          var44 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var43, 96)];
+                                       var50 = 0;
+                                       if (var49 != -2) {
+                                          var50 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var49, 96)];
                                        }
 
-                                       if(var38.rgb2 != -1) {
-                                          var45 = var38.hue2 + Tiles.__bq_p & 255;
-                                          int var46 = var38.lightness2 + Tiles.__bq_v;
-                                          if(var46 < 0) {
-                                             var46 = 0;
-                                          } else if(var46 > 255) {
-                                             var46 = 255;
+                                       if (var43.rgb2 != -1) {
+                                          var51 = var43.hue2 + Tiles.field917 & 255;
+                                          int var52 = var43.lightness2 + Tiles.field918;
+                                          if (var52 < 0) {
+                                             var52 = 0;
+                                          } else if (var52 > 255) {
+                                             var52 = 255;
                                           }
 
-                                          var43 = WorldMapAreaData.method712(var45, var38.saturation2, var46);
-                                          var44 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var43, 96)];
+                                          var49 = WorldMapAreaData.method712(var51, var43.saturation2, var52);
+                                          var50 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var49, 96)];
                                        }
 
-                                       var65.addTile(var5, var14, var20, var36, var70, var60, var25, var26, var27, var28, class15.method183(var33, var29), class15.method183(var33, var30), class15.method183(var33, var31), class15.method183(var33, var32), class25.method348(var42, var29), class25.method348(var42, var30), class25.method348(var42, var31), class25.method348(var42, var32), var35, var44);
+                                       var60.addTile(var6, var12, var18, var41, var66, var69, var30, var31, var32, var33, class15.method183(var38, var34), class15.method183(var38, var35), class15.method183(var38, var36), class15.method183(var38, var37), class25.method348(var48, var34), class25.method348(var48, var35), class25.method348(var48, var36), class25.method348(var48, var37), var40, var50);
                                     }
                                  }
                               }
@@ -2207,194 +1941,194 @@ public final class Client extends GameShell implements Usernamed {
                         }
                      }
 
-                     for(var14 = 1; var14 < 103; ++var14) {
-                        for(var15 = 1; var15 < 103; ++var15) {
-                           if((Tiles.Tiles_renderFlags[var5][var15][var14] & 8) != 0) {
-                              var20 = 0;
-                           } else if(var5 > 0 && (Tiles.Tiles_renderFlags[1][var15][var14] & 2) != 0) {
-                              var20 = var5 - 1;
+                     for (var12 = 1; var12 < 103; ++var12) {
+                        for (var13 = 1; var13 < 103; ++var13) {
+                           if ((Tiles.Tiles_renderFlags[var6][var13][var12] & 8) != 0) {
+                              var18 = 0;
+                           } else if (var6 > 0 && (Tiles.Tiles_renderFlags[1][var13][var12] & 2) != 0) {
+                              var18 = var6 - 1;
                            } else {
-                              var20 = var5;
+                              var18 = var6;
                            }
 
-                           var65.setTileMinPlane(var5, var15, var14, var20);
+                           var60.setTileMinPlane(var6, var13, var12, var18);
                         }
                      }
 
-                     Tiles.__bq_w[var5] = null;
-                     Fonts.__kz_o[var5] = null;
-                     class32.__ay_u[var5] = null;
-                     class307.__kc_g[var5] = null;
-                     Tiles.__bq_l[var5] = null;
+                     Tiles.field908[var6] = (byte[][])null;
+                     Fonts.field350[var6] = (byte[][])null;
+                     class32.field1157[var6] = (byte[][])null;
+                     class307.field1155[var6] = (byte[][])null;
+                     Tiles.field909[var6] = (byte[][])null;
                   }
 
-                  var65.__aw_247(-50, -10, -50);
+                  var60.method293(-50, -10, -50);
 
-                  for(var5 = 0; var5 < 104; ++var5) {
-                     for(var51 = 0; var51 < 104; ++var51) {
-                        if((Tiles.Tiles_renderFlags[1][var5][var51] & 2) == 2) {
-                           var65.setLinkBelow(var5, var51);
+                  for (var6 = 0; var6 < 104; ++var6) {
+                     for (var21 = 0; var21 < 104; ++var21) {
+                        if ((Tiles.Tiles_renderFlags[1][var6][var21] & 2) == 2) {
+                           var60.setLinkBelow(var6, var21);
                         }
                      }
                   }
 
-                  var5 = 1;
-                  var51 = 2;
-                  var52 = 4;
+                  var6 = 1;
+                  var21 = 2;
+                  var56 = 4;
 
-                  for(var53 = 0; var53 < 4; ++var53) {
-                     if(var53 > 0) {
-                        var5 <<= 3;
-                        var51 <<= 3;
-                        var52 <<= 3;
+                  for (var57 = 0; var57 < 4; ++var57) {
+                     if (var57 > 0) {
+                        var6 <<= 3;
+                        var21 <<= 3;
+                        var56 <<= 3;
                      }
 
-                     for(var54 = 0; var54 <= var53; ++var54) {
-                        for(var10 = 0; var10 <= 104; ++var10) {
-                           for(var11 = 0; var11 <= 104; ++var11) {
-                              short var68;
-                              if((Tiles.__bq_a[var54][var11][var10] & var5) != 0) {
-                                 var12 = var10;
-                                 var13 = var10;
-                                 var14 = var54;
+                     for (var58 = 0; var58 <= var57; ++var58) {
+                        for (var8 = 0; var8 <= 104; ++var8) {
+                           for (var9 = 0; var9 <= 104; ++var9) {
+                              short var63;
+                              if ((Tiles.field910[var58][var9][var8] & var6) != 0) {
+                                 var10 = var8;
+                                 var11 = var8;
+                                 var12 = var58;
 
-                                 for(var15 = var54; var12 > 0 && (Tiles.__bq_a[var54][var11][var12 - 1] & var5) != 0; --var12) {
-                                    ;
+                                 for (var13 = var58; var10 > 0 && (Tiles.field910[var58][var9][var10 - 1] & var6) != 0; --var10) {
                                  }
 
-                                 while(var13 < 104 && (Tiles.__bq_a[var54][var11][var13 + 1] & var5) != 0) {
-                                    ++var13;
+                                 while (var11 < 104 && (Tiles.field910[var58][var9][var11 + 1] & var6) != 0) {
+                                    ++var11;
                                  }
 
-                                 label837:
-                                 while(var14 > 0) {
-                                    for(var16 = var12; var16 <= var13; ++var16) {
-                                       if((Tiles.__bq_a[var14 - 1][var11][var16] & var5) == 0) {
-                                          break label837;
-                                       }
-                                    }
-
-                                    --var14;
-                                 }
-
-                                 label826:
-                                 while(var15 < var53) {
-                                    for(var16 = var12; var16 <= var13; ++var16) {
-                                       if((Tiles.__bq_a[var15 + 1][var11][var16] & var5) == 0) {
-                                          break label826;
-                                       }
-                                    }
-
-                                    ++var15;
-                                 }
-
-                                 var16 = (var13 - var12 + 1) * (var15 + 1 - var14);
-                                 if(var16 >= 8) {
-                                    var68 = 240;
-                                    var18 = Tiles.Tiles_heights[var15][var11][var12] - var68;
-                                    var19 = Tiles.Tiles_heights[var14][var11][var12];
-                                    Scene.Scene_addOccluder(var53, 1, var11 * 128, var11 * 128, var12 * 128, var13 * 128 + 128, var18, var19);
-
-                                    for(var20 = var14; var20 <= var15; ++var20) {
-                                       for(var21 = var12; var21 <= var13; ++var21) {
-                                          Tiles.__bq_a[var20][var11][var21] &= ~var5;
-                                       }
-                                    }
-                                 }
-                              }
-
-                              if((Tiles.__bq_a[var54][var11][var10] & var51) != 0) {
-                                 var12 = var11;
-                                 var13 = var11;
-                                 var14 = var54;
-
-                                 for(var15 = var54; var12 > 0 && (Tiles.__bq_a[var54][var12 - 1][var10] & var51) != 0; --var12) {
-                                    ;
-                                 }
-
-                                 while(var13 < 104 && (Tiles.__bq_a[var54][var13 + 1][var10] & var51) != 0) {
-                                    ++var13;
-                                 }
-
-                                 label890:
-                                 while(var14 > 0) {
-                                    for(var16 = var12; var16 <= var13; ++var16) {
-                                       if((Tiles.__bq_a[var14 - 1][var16][var10] & var51) == 0) {
-                                          break label890;
-                                       }
-                                    }
-
-                                    --var14;
-                                 }
-
-                                 label879:
-                                 while(var15 < var53) {
-                                    for(var16 = var12; var16 <= var13; ++var16) {
-                                       if((Tiles.__bq_a[var15 + 1][var16][var10] & var51) == 0) {
-                                          break label879;
-                                       }
-                                    }
-
-                                    ++var15;
-                                 }
-
-                                 var16 = (var13 - var12 + 1) * (var15 + 1 - var14);
-                                 if(var16 >= 8) {
-                                    var68 = 240;
-                                    var18 = Tiles.Tiles_heights[var15][var12][var10] - var68;
-                                    var19 = Tiles.Tiles_heights[var14][var12][var10];
-                                    Scene.Scene_addOccluder(var53, 2, var12 * 128, var13 * 128 + 128, var10 * 128, var10 * 128, var18, var19);
-
-                                    for(var20 = var14; var20 <= var15; ++var20) {
-                                       for(var21 = var12; var21 <= var13; ++var21) {
-                                          Tiles.__bq_a[var20][var21][var10] &= ~var51;
-                                       }
-                                    }
-                                 }
-                              }
-
-                              if((Tiles.__bq_a[var54][var11][var10] & var52) != 0) {
-                                 var12 = var11;
-                                 var13 = var11;
-                                 var14 = var10;
-
-                                 for(var15 = var10; var14 > 0 && (Tiles.__bq_a[var54][var11][var14 - 1] & var52) != 0; --var14) {
-                                    ;
-                                 }
-
-                                 while(var15 < 104 && (Tiles.__bq_a[var54][var11][var15 + 1] & var52) != 0) {
-                                    ++var15;
-                                 }
-
-                                 label943:
-                                 while(var12 > 0) {
-                                    for(var16 = var14; var16 <= var15; ++var16) {
-                                       if((Tiles.__bq_a[var54][var12 - 1][var16] & var52) == 0) {
-                                          break label943;
+                                 label649:
+                                 while (var12 > 0) {
+                                    for (var14 = var10; var14 <= var11; ++var14) {
+                                       if ((Tiles.field910[var12 - 1][var9][var14] & var6) == 0) {
+                                          break label649;
                                        }
                                     }
 
                                     --var12;
                                  }
 
-                                 label932:
-                                 while(var13 < 104) {
-                                    for(var16 = var14; var16 <= var15; ++var16) {
-                                       if((Tiles.__bq_a[var54][var13 + 1][var16] & var52) == 0) {
-                                          break label932;
+                                 label638:
+                                 while (var13 < var57) {
+                                    for (var14 = var10; var14 <= var11; ++var14) {
+                                       if ((Tiles.field910[var13 + 1][var9][var14] & var6) == 0) {
+                                          break label638;
                                        }
                                     }
 
                                     ++var13;
                                  }
 
-                                 if((var15 - var14 + 1) * (var13 - var12 + 1) >= 4) {
-                                    var16 = Tiles.Tiles_heights[var54][var12][var14];
-                                    Scene.Scene_addOccluder(var53, 4, var12 * 128, var13 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16);
+                                 var14 = (var11 - var10 + 1) * (var13 + 1 - var12);
+                                 if (var14 >= 8) {
+                                    var63 = 240;
+                                    var16 = Tiles.Tiles_heights[var13][var9][var10] - var63;
+                                    var17 = Tiles.Tiles_heights[var12][var9][var10];
+                                    Scene.Scene_addOccluder(var57, 1, var9 * 128, var9 * 128, var10 * 128, var11 * 128 + 128, var16, var17);
 
-                                    for(var17 = var12; var17 <= var13; ++var17) {
-                                       for(var18 = var14; var18 <= var15; ++var18) {
-                                          Tiles.__bq_a[var54][var17][var18] &= ~var52;
+                                    for (var18 = var12; var18 <= var13; ++var18) {
+                                       for (var19 = var10; var19 <= var11; ++var19) {
+                                          var10000 = Tiles.field910[var18][var9];
+                                          var10000[var19] &= ~var6;
+                                       }
+                                    }
+                                 }
+                              }
+
+                              if ((Tiles.field910[var58][var9][var8] & var21) != 0) {
+                                 var10 = var9;
+                                 var11 = var9;
+                                 var12 = var58;
+
+                                 for (var13 = var58; var10 > 0 && (Tiles.field910[var58][var10 - 1][var8] & var21) != 0; --var10) {
+                                 }
+
+                                 while (var11 < 104 && (Tiles.field910[var58][var11 + 1][var8] & var21) != 0) {
+                                    ++var11;
+                                 }
+
+                                 label702:
+                                 while (var12 > 0) {
+                                    for (var14 = var10; var14 <= var11; ++var14) {
+                                       if ((Tiles.field910[var12 - 1][var14][var8] & var21) == 0) {
+                                          break label702;
+                                       }
+                                    }
+
+                                    --var12;
+                                 }
+
+                                 label691:
+                                 while (var13 < var57) {
+                                    for (var14 = var10; var14 <= var11; ++var14) {
+                                       if ((Tiles.field910[var13 + 1][var14][var8] & var21) == 0) {
+                                          break label691;
+                                       }
+                                    }
+
+                                    ++var13;
+                                 }
+
+                                 var14 = (var11 - var10 + 1) * (var13 + 1 - var12);
+                                 if (var14 >= 8) {
+                                    var63 = 240;
+                                    var16 = Tiles.Tiles_heights[var13][var10][var8] - var63;
+                                    var17 = Tiles.Tiles_heights[var12][var10][var8];
+                                    Scene.Scene_addOccluder(var57, 2, var10 * 128, var11 * 128 + 128, var8 * 128, var8 * 128, var16, var17);
+
+                                    for (var18 = var12; var18 <= var13; ++var18) {
+                                       for (var19 = var10; var19 <= var11; ++var19) {
+                                          var10000 = Tiles.field910[var18][var19];
+                                          var10000[var8] &= ~var21;
+                                       }
+                                    }
+                                 }
+                              }
+
+                              if ((Tiles.field910[var58][var9][var8] & var56) != 0) {
+                                 var10 = var9;
+                                 var11 = var9;
+                                 var12 = var8;
+
+                                 for (var13 = var8; var12 > 0 && (Tiles.field910[var58][var9][var12 - 1] & var56) != 0; --var12) {
+                                 }
+
+                                 while (var13 < 104 && (Tiles.field910[var58][var9][var13 + 1] & var56) != 0) {
+                                    ++var13;
+                                 }
+
+                                 label755:
+                                 while (var10 > 0) {
+                                    for (var14 = var12; var14 <= var13; ++var14) {
+                                       if ((Tiles.field910[var58][var10 - 1][var14] & var56) == 0) {
+                                          break label755;
+                                       }
+                                    }
+
+                                    --var10;
+                                 }
+
+                                 label744:
+                                 while (var11 < 104) {
+                                    for (var14 = var12; var14 <= var13; ++var14) {
+                                       if ((Tiles.field910[var58][var11 + 1][var14] & var56) == 0) {
+                                          break label744;
+                                       }
+                                    }
+
+                                    ++var11;
+                                 }
+
+                                 if ((var13 - var12 + 1) * (var11 - var10 + 1) >= 4) {
+                                    var14 = Tiles.Tiles_heights[var58][var10][var12];
+                                    Scene.Scene_addOccluder(var57, 4, var10 * 128, var11 * 128 + 128, var12 * 128, var13 * 128 + 128, var14, var14);
+
+                                    for (var15 = var10; var15 <= var11; ++var15) {
+                                       for (var16 = var12; var16 <= var13; ++var16) {
+                                          var10000 = Tiles.field910[var58][var15];
+                                          var10000[var16] &= ~var56;
                                        }
                                     }
                                  }
@@ -2405,48 +2139,48 @@ public final class Client extends GameShell implements Usernamed {
                   }
 
                   UserComparator10.method3352(true);
-                  var5 = Tiles.Tiles_minPlane;
-                  if(var5 > SoundSystem.plane) {
-                     var5 = SoundSystem.plane;
+                  var6 = Tiles.Tiles_minPlane;
+                  if (var6 > SoundSystem.plane) {
+                     var6 = SoundSystem.plane;
                   }
 
-                  if(var5 < SoundSystem.plane - 1) {
-                     var5 = SoundSystem.plane - 1;
+                  if (var6 < SoundSystem.plane - 1) {
+                     var6 = SoundSystem.plane - 1;
                   }
 
-                  if(isLowDetail) {
+                  if (isLowDetail) {
                      class65.scene.init(Tiles.Tiles_minPlane);
                   } else {
                      class65.scene.init(0);
                   }
 
-                  for(var51 = 0; var51 < 104; ++var51) {
-                     for(var52 = 0; var52 < 104; ++var52) {
-                        TilePaint.method3061(var51, var52);
+                  for (var21 = 0; var21 < 104; ++var21) {
+                     for (var56 = 0; var56 < 104; ++var56) {
+                        TilePaint.method3061(var21, var56);
                      }
                   }
 
                   class13.playPcmPlayers();
                   ScriptEvent.method1179();
-                  ObjectDefinition.__jr_o.clear();
-                  PacketBufferNode var67;
-                  if(TextureProvider.client.hasFrame()) {
-                     var67 = Interpreter.method1915(ClientPacket.__gs_x, packetWriter.isaacCipher);
-                     var67.packetBuffer.writeInt(1057001181);
-                     packetWriter.__q_167(var67);
+                  ObjectDefinition.field641.clear();
+                  PacketBufferNode var64;
+                  if (TextureProvider.client.hasFrame()) {
+                     var64 = Interpreter.method1915(ClientPacket.field231, packetWriter.isaacCipher);
+                     var64.packetBuffer.writeInt(1057001181);
+                     packetWriter.method241(var64);
                   }
 
-                  if(!isInInstance) {
-                     var51 = (GameObject.__eh_fy - 6) / 8;
-                     var52 = (GameObject.__eh_fy + 6) / 8;
-                     var53 = (WorldMapLabelSize.__s_fi - 6) / 8;
-                     var54 = (WorldMapLabelSize.__s_fi + 6) / 8;
+                  if (!isInInstance) {
+                     var21 = (GameObject.field359 - 6) / 8;
+                     var56 = (GameObject.field359 + 6) / 8;
+                     var57 = (WorldMapLabelSize.field1041 - 6) / 8;
+                     var58 = (WorldMapLabelSize.field1041 + 6) / 8;
 
-                     for(var10 = var51 - 1; var10 <= var52 + 1; ++var10) {
-                        for(var11 = var53 - 1; var11 <= var54 + 1; ++var11) {
-                           if(var10 < var51 || var10 > var52 || var11 < var53 || var11 > var54) {
-                              SecureRandomFuture.indexCache5.__ar_402("m" + var10 + "_" + var11);
-                              SecureRandomFuture.indexCache5.__ar_402("l" + var10 + "_" + var11);
+                     for (var8 = var21 - 1; var8 <= var56 + 1; ++var8) {
+                        for (var9 = var57 - 1; var9 <= var58 + 1; ++var9) {
+                           if (var8 < var21 || var8 > var56 || var9 < var57 || var9 > var58) {
+                              SecureRandomFuture.indexCache5.method10("m" + var8 + "_" + var9);
+                              SecureRandomFuture.indexCache5.method10("l" + var8 + "_" + var9);
                            }
                         }
                      }
@@ -2455,8 +2189,8 @@ public final class Client extends GameShell implements Usernamed {
                   GameShell.updateGameState(30);
                   class13.playPcmPlayers();
                   BufferedSink.method3603();
-                  var67 = Interpreter.method1915(ClientPacket.__gs_bv, packetWriter.isaacCipher);
-                  packetWriter.__q_167(var67);
+                  var64 = Interpreter.method1915(ClientPacket.field298, packetWriter.isaacCipher);
+                  packetWriter.method241(var64);
                   class11.method145();
                }
             }
@@ -2465,9 +2199,9 @@ public final class Client extends GameShell implements Usernamed {
          class54.method1092(this);
       }
 
-      if(gameState == 30) {
+      if (gameState == 30) {
          this.doCycleLoggedIn();
-      } else if(gameState == 40 || gameState == 45) {
+      } else if (gameState == 40 || gameState == 45) {
          this.doCycleLoggedOut();
       }
 
@@ -2481,108 +2215,108 @@ public final class Client extends GameShell implements Usernamed {
    @Export("methodDraw")
    protected final void methodDraw(boolean var1) {
       boolean var2;
-      label166: {
+      label139: {
          try {
-            if(class214.__hf_o == 2) {
-               if(class13.musicTrack == null) {
-                  class13.musicTrack = MusicTrack.readTrack(class214.__hf_u, class30.musicTrackArchiveId, GrandExchangeOffer.musicTrackFileId);
-                  if(class13.musicTrack == null) {
+            if (class214.field1129 == 2) {
+               if (class13.musicTrack == null) {
+                  class13.musicTrack = MusicTrack.readTrack(class214.field1130, class30.musicTrackArchiveId, GrandExchangeOffer.musicTrackFileId);
+                  if (class13.musicTrack == null) {
                      var2 = false;
-                     break label166;
+                     break label139;
                   }
                }
 
-               if(class307.soundCache == null) {
-                  class307.soundCache = new SoundCache(class214.__hf_q, class214.__hf_f);
+               if (class307.soundCache == null) {
+                  class307.soundCache = new SoundCache(class214.field1128, class214.field1127);
                }
 
-               if(class214.midiPcmStream.loadMusicTrack(class13.musicTrack, class1.__f_m, class307.soundCache, 22050)) {
+               if (class214.midiPcmStream.loadMusicTrack(class13.musicTrack, class1.field1105, class307.soundCache, 22050)) {
                   class214.midiPcmStream.clearAll();
-                  class214.midiPcmStream.__m_340(WorldMapLabel.__aj_e);
+                  class214.midiPcmStream.method169(WorldMapLabel.field1039);
                   class214.midiPcmStream.setMusicTrack(class13.musicTrack, RectangleMode.musicTrackBoolean);
-                  class214.__hf_o = 0;
+                  class214.field1129 = 0;
                   class13.musicTrack = null;
                   class307.soundCache = null;
-                  class214.__hf_u = null;
+                  class214.field1130 = null;
                   var2 = true;
-                  break label166;
+                  break label139;
                }
             }
-         } catch (Exception var6) {
-            var6.printStackTrace();
+         } catch (Exception var4) {
+            var4.printStackTrace();
             class214.midiPcmStream.clear();
-            class214.__hf_o = 0;
+            class214.field1129 = 0;
             class13.musicTrack = null;
             class307.soundCache = null;
-            class214.__hf_u = null;
+            class214.field1130 = null;
          }
 
          var2 = false;
       }
 
-      if(var2 && __client_qq && WorldMapCacheName.pcmPlayer0 != null) {
+      if (var2 && field107 && WorldMapCacheName.pcmPlayer0 != null) {
          WorldMapCacheName.pcmPlayer0.tryDiscard();
       }
 
-      if((gameState == 10 || gameState == 20 || gameState == 30) && __client_oa != 0L && class203.currentTimeMs() > __client_oa) {
+      if ((gameState == 10 || gameState == 20 || gameState == 30) && field99 != 0L && class203.currentTimeMs() > field99) {
          GroundItem.method2095(SpotAnimationDefinition.method4822());
       }
 
-      int var4;
-      if(var1) {
-         for(var4 = 0; var4 < 100; ++var4) {
-            __client_od[var4] = true;
+      int var3;
+      if (var1) {
+         for (var3 = 0; var3 < 100; ++var3) {
+            field100[var3] = true;
          }
       }
 
-      if(gameState == 0) {
+      if (gameState == 0) {
          this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1);
-      } else if(gameState == 5) {
+      } else if (gameState == 5) {
          IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
-      } else if(gameState != 10 && gameState != 11) {
-         if(gameState == 20) {
+      } else if (gameState != 10 && gameState != 11) {
+         if (gameState == 20) {
             IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
-         } else if(gameState == 25) {
-            if(__client_gh == 1) {
-               if(__client_fe > __client_fn) {
-                  __client_fn = __client_fe;
+         } else if (gameState == 25) {
+            if (field181 == 1) {
+               if (field177 > field178) {
+                  field178 = field177;
                }
 
-               var4 = (__client_fn * 50 - __client_fe * 50) / __client_fn;
-               class68.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + var4 + "%" + ")", false);
-            } else if(__client_gh == 2) {
-               if(__client_fk > __client_gp) {
-                  __client_gp = __client_fk;
+               var3 = (field178 * 50 - field177 * 50) / field178;
+               class68.drawLoadingMessage("Loading - please wait.<br> (" + var3 + "%)", false);
+            } else if (field181 == 2) {
+               if (field179 > field180) {
+                  field180 = field179;
                }
 
-               var4 = (__client_gp * 50 - __client_fk * 50) / __client_gp + 50;
-               class68.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + var4 + "%" + ")", false);
+               var3 = (field180 * 50 - field179 * 50) / field180 + 50;
+               class68.drawLoadingMessage("Loading - please wait.<br> (" + var3 + "%)", false);
             } else {
                class68.drawLoadingMessage("Loading - please wait.", false);
             }
-         } else if(gameState == 30) {
+         } else if (gameState == 30) {
             this.drawLoggedIn();
-         } else if(gameState == 40) {
-            class68.drawLoadingMessage("Connection lost" + "<br>" + "Please wait - attempting to reestablish", false);
-         } else if(gameState == 45) {
+         } else if (gameState == 40) {
+            class68.drawLoadingMessage("Connection lost<br>Please wait - attempting to reestablish", false);
+         } else if (gameState == 45) {
             class68.drawLoadingMessage("Please wait...", false);
          }
       } else {
          IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
       }
 
-      if(gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) {
-         for(var4 = 0; var4 < rootWidgetCount; ++var4) {
-            if(__client_ot[var4]) {
-               class197.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]);
-               __client_ot[var4] = false;
+      if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) {
+         for (var3 = 0; var3 < rootWidgetCount; ++var3) {
+            if (field102[var3]) {
+               class197.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]);
+               field102[var3] = false;
             }
          }
-      } else if(gameState > 0) {
+      } else if (gameState > 0) {
          class197.rasterProvider.drawFull(0, 0);
 
-         for(var4 = 0; var4 < rootWidgetCount; ++var4) {
-            __client_ot[var4] = false;
+         for (var3 = 0; var3 < rootWidgetCount; ++var3) {
+            field102[var3] = false;
          }
       }
 
@@ -2595,24 +2329,24 @@ public final class Client extends GameShell implements Usernamed {
    )
    @Export("kill0")
    protected final void kill0() {
-      if(class196.varcs.hasUnwrittenChanges()) {
+      if (class196.varcs.hasUnwrittenChanges()) {
          class196.varcs.write();
       }
 
-      if(Projectile.mouseRecorder != null) {
+      if (Projectile.mouseRecorder != null) {
          Projectile.mouseRecorder.isRunning = false;
       }
 
       Projectile.mouseRecorder = null;
       packetWriter.close();
-      if(KeyHandler.KeyHandler_instance != null) {
+      if (KeyHandler.KeyHandler_instance != null) {
          KeyHandler var1 = KeyHandler.KeyHandler_instance;
          synchronized(KeyHandler.KeyHandler_instance) {
             KeyHandler.KeyHandler_instance = null;
          }
       }
 
-      if(MouseHandler.MouseHandler_instance != null) {
+      if (MouseHandler.MouseHandler_instance != null) {
          MouseHandler var8 = MouseHandler.MouseHandler_instance;
          synchronized(MouseHandler.MouseHandler_instance) {
             MouseHandler.MouseHandler_instance = null;
@@ -2620,20 +2354,20 @@ public final class Client extends GameShell implements Usernamed {
       }
 
       class16.mouseWheel = null;
-      if(WorldMapCacheName.pcmPlayer0 != null) {
+      if (WorldMapCacheName.pcmPlayer0 != null) {
          WorldMapCacheName.pcmPlayer0.shutdown();
       }
 
-      if(AbstractIndexCache.pcmPlayer1 != null) {
+      if (AbstractIndexCache.pcmPlayer1 != null) {
          AbstractIndexCache.pcmPlayer1.shutdown();
       }
 
-      if(NetCache.NetCache_socket != null) {
+      if (NetCache.NetCache_socket != null) {
          NetCache.NetCache_socket.close();
       }
 
       RunException.method3431();
-      if(TriBool.urlRequester != null) {
+      if (TriBool.urlRequester != null) {
          TriBool.urlRequester.close();
          TriBool.urlRequester = null;
       }
@@ -2641,14 +2375,13 @@ public final class Client extends GameShell implements Usernamed {
       try {
          class168.dat2File.close();
 
-         for(int var4 = 0; var4 < class168.idxCount; ++var4) {
-            IndexStoreAction.idxFiles[var4].close();
+         for (int var9 = 0; var9 < class168.idxCount; ++var9) {
+            IndexStoreAction.idxFiles[var9].close();
          }
 
          class168.idx255File.close();
          class168.randomDat.close();
       } catch (Exception var7) {
-         ;
       }
 
    }
@@ -2658,23 +2391,234 @@ public final class Client extends GameShell implements Usernamed {
       signature = "(I)V",
       garbageValue = "1860808291"
    )
-   protected final void __au_110() {
+   protected final void vmethod114() {
    }
 
    @ObfuscatedName("init")
-   public final void __init_109() {
+   public final void vmethod117() {
       try {
-         if(this.checkHost()) {
+         if (this.checkHost()) {
             ClientParameter[] var1 = class4.method47();
+            int var3 = 0;
 
-            int var9;
-            for(int var2 = 0; var2 < var1.length; ++var2) {
-               ClientParameter var3 = var1[var2];
-               String var4 = this.getParameter(var3.id);
-               if(var4 != null) {
-                  switch(Integer.parseInt(var3.id)) {
+            while (true) {
+               int var2;
+               if (var3 >= var1.length) {
+                  class237.method4539();
+                  class50.worldHost = this.getCodeBase().getHost();
+                  String var25 = class15.serverBuild.name;
+                  byte var26 = 0;
+
+                  try {
+                     class168.idxCount = 21;
+                     PacketBuffer.field667 = var26;
+
+                     try {
+                        class266.osName = System.getProperty("os.name");
+                     } catch (Exception var20) {
+                        class266.osName = "Unknown";
+                     }
+
+                     WorldMapSection3.osNameLowerCase = class266.osName.toLowerCase();
+
+                     try {
+                        WorldMapSection1.userHomeDirectory = System.getProperty("user.home");
+                        if (WorldMapSection1.userHomeDirectory != null) {
+                           WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/";
+                        }
+                     } catch (Exception var19) {
+                     }
+
+                     try {
+                        if (WorldMapSection3.osNameLowerCase.startsWith("win")) {
+                           if (WorldMapSection1.userHomeDirectory == null) {
+                              WorldMapSection1.userHomeDirectory = System.getenv("USERPROFILE");
+                           }
+                        } else if (WorldMapSection1.userHomeDirectory == null) {
+                           WorldMapSection1.userHomeDirectory = System.getenv("HOME");
+                        }
+
+                        if (WorldMapSection1.userHomeDirectory != null) {
+                           WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/";
+                        }
+                     } catch (Exception var18) {
+                     }
+
+                     if (WorldMapSection1.userHomeDirectory == null) {
+                        WorldMapSection1.userHomeDirectory = "~/";
+                     }
+
+                     WorldMapSection2.cacheDirectoryLocations = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", WorldMapSection1.userHomeDirectory, "/tmp/", ""};
+                     Canvas.field94 = new String[]{".jagex_cache_" + PacketBuffer.field667, ".file_store_" + PacketBuffer.field667};
+                     int var27 = 0;
+
+                     label262:
+                     while (var27 < 4) {
+                        String var28 = var27 == 0 ? "" : "" + var27;
+                        class337.clDat = new File(WorldMapSection1.userHomeDirectory, "jagex_cl_oldschool_" + var25 + var28 + ".dat");
+                        String var30 = null;
+                        String var31 = null;
+                        boolean var32 = false;
+                        int var14;
+                        File var33;
+                        if (class337.clDat.exists()) {
+                           try {
+                              AccessFile var11 = new AccessFile(class337.clDat, "rw", 10000L);
+
+                              int var12;
+                              Buffer var13;
+                              for (var13 = new Buffer((int)var11.length()); var13.index < var13.array.length; var13.index += var12) {
+                                 var12 = var11.read(var13.array, var13.index, var13.array.length - var13.index);
+                                 if (var12 == -1) {
+                                    throw new IOException();
+                                 }
+                              }
+
+                              var13.index = 0;
+                              var12 = var13.readUnsignedByte();
+                              if (var12 < 1 || var12 > 3) {
+                                 throw new IOException("" + var12);
+                              }
+
+                              var14 = 0;
+                              if (var12 > 1) {
+                                 var14 = var13.readUnsignedByte();
+                              }
+
+                              if (var12 <= 2) {
+                                 var30 = var13.readStringCp1252NullCircumfixed();
+                                 if (var14 == 1) {
+                                    var31 = var13.readStringCp1252NullCircumfixed();
+                                 }
+                              } else {
+                                 var30 = var13.method45();
+                                 if (var14 == 1) {
+                                    var31 = var13.method45();
+                                 }
+                              }
+
+                              var11.close();
+                           } catch (IOException var22) {
+                              var22.printStackTrace();
+                           }
+
+                           if (var30 != null) {
+                              var33 = new File(var30);
+                              if (!var33.exists()) {
+                                 var30 = null;
+                              }
+                           }
+
+                           if (var30 != null) {
+                              var33 = new File(var30, "test.dat");
+                              if (!DevicePcmPlayerProvider.method847(var33, true)) {
+                                 var30 = null;
+                              }
+                           }
+                        }
+
+                        if (var30 == null && var27 == 0) {
+                           label237:
+                           for (var2 = 0; var2 < Canvas.field94.length; ++var2) {
+                              for (int var34 = 0; var34 < WorldMapSection2.cacheDirectoryLocations.length; ++var34) {
+                                 File var37 = new File(WorldMapSection2.cacheDirectoryLocations[var34] + Canvas.field94[var2] + File.separatorChar + "oldschool" + File.separatorChar);
+                                 if (var37.exists() && DevicePcmPlayerProvider.method847(new File(var37, "test.dat"), true)) {
+                                    var30 = var37.toString();
+                                    var32 = true;
+                                    break label237;
+                                 }
+                              }
+                           }
+                        }
+
+                        if (var30 == null) {
+                           var30 = WorldMapSection1.userHomeDirectory + File.separatorChar + "jagexcache" + var28 + File.separatorChar + "oldschool" + File.separatorChar + var25 + File.separatorChar;
+                           var32 = true;
+                        }
+
+                        File var15;
+                        File var36;
+                        File[] var38;
+                        File[] var39;
+                        if (var31 != null) {
+                           var36 = new File(var31);
+                           var33 = new File(var30);
+
+                           try {
+                              var38 = var36.listFiles();
+                              var39 = var38;
+
+                              for (var14 = 0; var14 < var39.length; ++var14) {
+                                 var15 = var39[var14];
+                                 File var16 = new File(var33, var15.getName());
+                                 boolean var17 = var15.renameTo(var16);
+                                 if (!var17) {
+                                    throw new IOException();
+                                 }
+                              }
+                           } catch (Exception var21) {
+                              var21.printStackTrace();
+                           }
+
+                           var32 = true;
+                        }
+
+                        if (var32) {
+                           class14.method167(new File(var30), (File)null);
+                        }
+
+                        var36 = new File(var30);
+                        class168.field1115 = var36;
+                        if (!class168.field1115.exists()) {
+                           class168.field1115.mkdirs();
+                        }
+
+                        var38 = class168.field1115.listFiles();
+                        if (var38 != null) {
+                           var39 = var38;
+
+                           for (var14 = 0; var14 < var39.length; ++var14) {
+                              var15 = var39[var14];
+                              if (!DevicePcmPlayerProvider.method847(var15, false)) {
+                                 ++var27;
+                                 continue label262;
+                              }
+                           }
+                        }
+                        break;
+                     }
+
+                     File var29 = class168.field1115;
+                     class171.field1118 = var29;
+                     if (!class171.field1118.exists()) {
+                        throw new RuntimeException("");
+                     }
+
+                     class171.field1117 = true;
+                     Interpreter.method1976();
+                     class168.dat2File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0);
+                     class168.idx255File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx255"), "rw", 1048576L), 6000, 0);
+                     IndexStoreAction.idxFiles = new BufferedFile[class168.idxCount];
+
+                     for (int var35 = 0; var35 < class168.idxCount; ++var35) {
+                        IndexStoreAction.idxFiles[var35] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var35), "rw", 1048576L), 6000, 0);
+                     }
+                  } catch (Exception var23) {
+                     NPCDefinition.sendStackTrace((String)null, var23);
+                  }
+
+                  TextureProvider.client = this;
+                  RunException.field761 = clientType;
+                  this.startThread(765, 503, 180);
+                  break;
+               }
+
+               ClientParameter var4 = var1[var3];
+               String var5 = this.getParameter(var4.id);
+               if (var5 != null) {
+                  switch(Integer.parseInt(var4.id)) {
                   case 1:
-                     useBufferedSocket = Integer.parseInt(var4) != 0;
+                     useBufferedSocket = Integer.parseInt(var5) != 0;
                   case 2:
                   case 11:
                   case 13:
@@ -2682,284 +2626,82 @@ public final class Client extends GameShell implements Usernamed {
                   default:
                      break;
                   case 3:
-                     if(var4.equalsIgnoreCase("true")) {
+                     if (var5.equalsIgnoreCase("true")) {
                         isMembersWorld = true;
                      } else {
                         isMembersWorld = false;
                      }
                      break;
                   case 4:
-                     if(clientType == -1) {
-                        clientType = Integer.parseInt(var4);
+                     if (clientType == -1) {
+                        clientType = Integer.parseInt(var5);
                      }
                      break;
                   case 5:
-                     worldProperties = Integer.parseInt(var4);
+                     worldProperties = Integer.parseInt(var5);
                      break;
                   case 6:
-                     language = Integer.parseInt(var4);
+                     language = Integer.parseInt(var5);
                      break;
                   case 7:
-                     int var6 = Integer.parseInt(var4);
-                     ServerBuild[] var7 = new ServerBuild[]{ServerBuild.__iy_q, ServerBuild.__iy_w, ServerBuild.__iy_m, ServerBuild.__iy_f};
+                     int var6 = Integer.parseInt(var5);
+                     ServerBuild[] var7 = new ServerBuild[]{ServerBuild.field786, ServerBuild.field787, ServerBuild.field784, ServerBuild.field785};
                      ServerBuild[] var8 = var7;
-                     var9 = 0;
+                     var2 = 0;
 
-                     ServerBuild var5;
-                     while(true) {
-                        if(var9 >= var8.length) {
-                           var5 = null;
+                     ServerBuild var9;
+                     while (true) {
+                        if (var2 >= var8.length) {
+                           var9 = null;
                            break;
                         }
 
-                        ServerBuild var10 = var8[var9];
-                        if(var6 == var10.id) {
-                           var5 = var10;
+                        ServerBuild var10 = var8[var2];
+                        if (var6 == var10.id) {
+                           var9 = var10;
                            break;
                         }
 
-                        ++var9;
+                        ++var2;
                      }
 
-                     class15.serverBuild = var5;
+                     class15.serverBuild = var9;
                      break;
                   case 8:
-                     if(var4.equalsIgnoreCase("true")) {
-                        ;
+                     if (var5.equalsIgnoreCase("true")) {
                      }
                      break;
                   case 9:
-                     class21.__b_by = var4;
+                     class21.field1123 = var5;
                      break;
                   case 10:
-                     class22.studioGame = (StudioGame)ScriptFrame.findEnumerated(ClientPacket.method3664(), Integer.parseInt(var4));
-                     if(class22.studioGame == StudioGame.__is_u) {
-                        KeyHandler.loginType = LoginType.__lx_m;
+                     class22.studioGame = (StudioGame)ScriptFrame.findEnumerated(ClientPacket.method3664(), Integer.parseInt(var5));
+                     if (class22.studioGame == StudioGame.field892) {
+                        KeyHandler.loginType = LoginType.field479;
                      } else {
-                        KeyHandler.loginType = LoginType.__lx_e;
+                        KeyHandler.loginType = LoginType.field487;
                      }
                      break;
                   case 12:
-                     worldId = Integer.parseInt(var4);
+                     worldId = Integer.parseInt(var5);
                      break;
                   case 14:
-                     AbstractIndexCache.__ir_bu = Integer.parseInt(var4);
+                     AbstractIndexCache.field2 = Integer.parseInt(var5);
                      break;
                   case 15:
-                     gameBuild = Integer.parseInt(var4);
+                     gameBuild = Integer.parseInt(var5);
                      break;
                   case 17:
-                     ServerBuild.worldsUrl = var4;
+                     ServerBuild.worldsUrl = var5;
                   }
                }
+
+               ++var3;
             }
-
-            class237.method4539();
-            class50.worldHost = this.getCodeBase().getHost();
-            String var33 = class15.serverBuild.name;
-            byte var34 = 0;
-
-            try {
-               class168.idxCount = 21;
-               PacketBuffer.__hx_z = var34;
-
-               try {
-                  class266.osName = System.getProperty("os.name");
-               } catch (Exception var28) {
-                  class266.osName = "Unknown";
-               }
-
-               WorldMapSection3.osNameLowerCase = class266.osName.toLowerCase();
-
-               try {
-                  WorldMapSection1.userHomeDirectory = System.getProperty("user.home");
-                  if(WorldMapSection1.userHomeDirectory != null) {
-                     WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/";
-                  }
-               } catch (Exception var27) {
-                  ;
-               }
-
-               try {
-                  if(WorldMapSection3.osNameLowerCase.startsWith("win")) {
-                     if(WorldMapSection1.userHomeDirectory == null) {
-                        WorldMapSection1.userHomeDirectory = System.getenv("USERPROFILE");
-                     }
-                  } else if(WorldMapSection1.userHomeDirectory == null) {
-                     WorldMapSection1.userHomeDirectory = System.getenv("HOME");
-                  }
-
-                  if(WorldMapSection1.userHomeDirectory != null) {
-                     WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/";
-                  }
-               } catch (Exception var26) {
-                  ;
-               }
-
-               if(WorldMapSection1.userHomeDirectory == null) {
-                  WorldMapSection1.userHomeDirectory = "~/";
-               }
-
-               WorldMapSection2.cacheDirectoryLocations = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", WorldMapSection1.userHomeDirectory, "/tmp/", ""};
-               Canvas.__ao_s = new String[]{".jagex_cache_" + PacketBuffer.__hx_z, ".file_store_" + PacketBuffer.__hx_z};
-               int var17 = 0;
-
-               label259:
-               while(var17 < 4) {
-                  String var37 = var17 == 0?"":"" + var17;
-                  class337.clDat = new File(WorldMapSection1.userHomeDirectory, "jagex_cl_oldschool_" + var33 + var37 + ".dat");
-                  String var18 = null;
-                  String var39 = null;
-                  boolean var19 = false;
-                  File var42;
-                  if(class337.clDat.exists()) {
-                     try {
-                        AccessFile var20 = new AccessFile(class337.clDat, "rw", 10000L);
-
-                        int var11;
-                        Buffer var41;
-                        for(var41 = new Buffer((int)var20.length()); var41.index < var41.array.length; var41.index += var11) {
-                           var11 = var20.read(var41.array, var41.index, var41.array.length - var41.index);
-                           if(var11 == -1) {
-                              throw new IOException();
-                           }
-                        }
-
-                        var41.index = 0;
-                        var11 = var41.readUnsignedByte();
-                        if(var11 < 1 || var11 > 3) {
-                           throw new IOException("" + var11);
-                        }
-
-                        int var12 = 0;
-                        if(var11 > 1) {
-                           var12 = var41.readUnsignedByte();
-                        }
-
-                        if(var11 <= 2) {
-                           var18 = var41.readStringCp1252NullCircumfixed();
-                           if(var12 == 1) {
-                              var39 = var41.readStringCp1252NullCircumfixed();
-                           }
-                        } else {
-                           var18 = var41.__aw_304();
-                           if(var12 == 1) {
-                              var39 = var41.__aw_304();
-                           }
-                        }
-
-                        var20.close();
-                     } catch (IOException var30) {
-                        var30.printStackTrace();
-                     }
-
-                     if(var18 != null) {
-                        var42 = new File(var18);
-                        if(!var42.exists()) {
-                           var18 = null;
-                        }
-                     }
-
-                     if(var18 != null) {
-                        var42 = new File(var18, "test.dat");
-                        if(!DevicePcmPlayerProvider.method847(var42, true)) {
-                           var18 = null;
-                        }
-                     }
-                  }
-
-                  if(var18 == null && var17 == 0) {
-                     label234:
-                     for(var9 = 0; var9 < Canvas.__ao_s.length; ++var9) {
-                        for(int var21 = 0; var21 < WorldMapSection2.cacheDirectoryLocations.length; ++var21) {
-                           File var22 = new File(WorldMapSection2.cacheDirectoryLocations[var21] + Canvas.__ao_s[var9] + File.separatorChar + "oldschool" + File.separatorChar);
-                           if(var22.exists() && DevicePcmPlayerProvider.method847(new File(var22, "test.dat"), true)) {
-                              var18 = var22.toString();
-                              var19 = true;
-                              break label234;
-                           }
-                        }
-                     }
-                  }
-
-                  if(var18 == null) {
-                     var18 = WorldMapSection1.userHomeDirectory + File.separatorChar + "jagexcache" + var37 + File.separatorChar + "oldschool" + File.separatorChar + var33 + File.separatorChar;
-                     var19 = true;
-                  }
-
-                  if(var39 != null) {
-                     File var43 = new File(var39);
-                     var42 = new File(var18);
-
-                     try {
-                        File[] var44 = var43.listFiles();
-                        File[] var23 = var44;
-
-                        for(int var13 = 0; var13 < var23.length; ++var13) {
-                           File var14 = var23[var13];
-                           File var15 = new File(var42, var14.getName());
-                           boolean var16 = var14.renameTo(var15);
-                           if(!var16) {
-                              throw new IOException();
-                           }
-                        }
-                     } catch (Exception var29) {
-                        var29.printStackTrace();
-                     }
-
-                     var19 = true;
-                  }
-
-                  if(var19) {
-                     class14.method167(new File(var18), (File)null);
-                  }
-
-                  File var36 = new File(var18);
-                  class168.__fs_o = var36;
-                  if(!class168.__fs_o.exists()) {
-                     class168.__fs_o.mkdirs();
-                  }
-
-                  File[] var38 = class168.__fs_o.listFiles();
-                  if(var38 != null) {
-                     File[] var45 = var38;
-
-                     for(int var24 = 0; var24 < var45.length; ++var24) {
-                        File var40 = var45[var24];
-                        if(!DevicePcmPlayerProvider.method847(var40, false)) {
-                           ++var17;
-                           continue label259;
-                        }
-                     }
-                  }
-                  break;
-               }
-
-               File var35 = class168.__fs_o;
-               class171.__fo_f = var35;
-               if(!class171.__fo_f.exists()) {
-                  throw new RuntimeException("");
-               }
-
-               class171.__fo_m = true;
-               Interpreter.method1976();
-               class168.dat2File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0);
-               class168.idx255File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx255"), "rw", 1048576L), 6000, 0);
-               IndexStoreAction.idxFiles = new BufferedFile[class168.idxCount];
-
-               for(int var25 = 0; var25 < class168.idxCount; ++var25) {
-                  IndexStoreAction.idxFiles[var25] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var25), "rw", 1048576L), 6000, 0);
-               }
-            } catch (Exception var31) {
-               NpcDefinition.sendStackTrace((String)null, var31);
-            }
-
-            TextureProvider.client = this;
-            RunException.__fx_w = clientType;
-            this.startThread(765, 503, 180);
          }
-      } catch (RuntimeException var32) {
-         throw Players.method2120(var32, "client.init(" + ')');
+
+      } catch (RuntimeException var24) {
+         throw Players.method2120(var24, "client.init()");
       }
    }
 
@@ -2970,30 +2712,30 @@ public final class Client extends GameShell implements Usernamed {
    )
    @Export("doCycleJs5")
    void doCycleJs5() {
-      if(gameState != 1000) {
-         long var2 = class203.currentTimeMs();
-         int var4 = (int)(var2 - NetCache.__iq_q);
-         NetCache.__iq_q = var2;
-         if(var4 > 200) {
-            var4 = 200;
+      if (gameState != 1000) {
+         long var1 = class203.currentTimeMs();
+         int var3 = (int)(var1 - NetCache.field629);
+         NetCache.field629 = var1;
+         if (var3 > 200) {
+            var3 = 200;
          }
 
-         NetCache.__iq_f += var4;
-         boolean var1;
-         if(NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) {
-            var1 = true;
-         } else if(NetCache.NetCache_socket == null) {
-            var1 = false;
+         NetCache.field628 += var3;
+         boolean var4;
+         if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) {
+            var4 = true;
+         } else if (NetCache.NetCache_socket == null) {
+            var4 = false;
          } else {
             try {
-               label242: {
-                  if(NetCache.__iq_f > 30000) {
+               label205: {
+                  if (NetCache.field628 > 30000) {
                      throw new IOException();
                   }
 
                   NetFileRequest var5;
                   Buffer var6;
-                  while(NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) {
+                  while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) {
                      var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first();
                      var6 = new Buffer(4);
                      var6.writeByte(1);
@@ -3004,7 +2746,7 @@ public final class Client extends GameShell implements Usernamed {
                      ++NetCache.NetCache_pendingPriorityResponsesCount;
                   }
 
-                  while(NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) {
+                  while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) {
                      var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.last();
                      var6 = new Buffer(4);
                      var6.writeByte(0);
@@ -3016,175 +2758,182 @@ public final class Client extends GameShell implements Usernamed {
                      ++NetCache.NetCache_pendingResponsesCount;
                   }
 
-                  for(int var17 = 0; var17 < 100; ++var17) {
-                     int var18 = NetCache.NetCache_socket.available();
-                     if(var18 < 0) {
+                  for (int var7 = 0; var7 < 100; ++var7) {
+                     int var8 = NetCache.NetCache_socket.available();
+                     if (var8 < 0) {
                         throw new IOException();
                      }
 
-                     if(var18 == 0) {
+                     if (var8 == 0) {
                         break;
                      }
 
-                     NetCache.__iq_f = 0;
-                     byte var7 = 0;
-                     if(ModelData0.NetCache_currentResponse == null) {
-                        var7 = 8;
-                     } else if(NetCache.__iq_j == 0) {
-                        var7 = 1;
+                     NetCache.field628 = 0;
+                     byte var9 = 0;
+                     if (ModelData0.NetCache_currentResponse == null) {
+                        var9 = 8;
+                     } else if (NetCache.field630 == 0) {
+                        var9 = 1;
                      }
 
-                     int var8;
-                     int var9;
                      int var10;
+                     int var11;
                      int var12;
-                     if(var7 > 0) {
-                        var8 = var7 - NetCache.NetCache_responseHeaderBuffer.index;
-                        if(var8 > var18) {
-                           var8 = var18;
+                     int var13;
+                     byte[] var10000;
+                     int var10001;
+                     Buffer var24;
+                     if (var9 > 0) {
+                        var10 = var9 - NetCache.NetCache_responseHeaderBuffer.index;
+                        if (var10 > var8) {
+                           var10 = var8;
                         }
 
-                        NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.index, var8);
-                        if(NetCache.__iq_b != 0) {
-                           for(var9 = 0; var9 < var8; ++var9) {
-                              NetCache.NetCache_responseHeaderBuffer.array[NetCache.NetCache_responseHeaderBuffer.index + var9] ^= NetCache.__iq_b;
+                        NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.index, var10);
+                        if (NetCache.field631 != 0) {
+                           for (var11 = 0; var11 < var10; ++var11) {
+                              var10000 = NetCache.NetCache_responseHeaderBuffer.array;
+                              var10001 = NetCache.NetCache_responseHeaderBuffer.index + var11;
+                              var10000[var10001] ^= NetCache.field631;
                            }
                         }
 
-                        NetCache.NetCache_responseHeaderBuffer.index += var8;
-                        if(NetCache.NetCache_responseHeaderBuffer.index < var7) {
+                        var24 = NetCache.NetCache_responseHeaderBuffer;
+                        var24.index += var10;
+                        if (NetCache.NetCache_responseHeaderBuffer.index < var9) {
                            break;
                         }
 
-                        if(ModelData0.NetCache_currentResponse == null) {
+                        if (ModelData0.NetCache_currentResponse == null) {
                            NetCache.NetCache_responseHeaderBuffer.index = 0;
-                           var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte();
-                           var10 = NetCache.NetCache_responseHeaderBuffer.__ag_302();
-                           int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte();
-                           var12 = NetCache.NetCache_responseHeaderBuffer.readInt();
-                           long var13 = (long)(var10 + (var9 << 16));
-                           NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13);
-                           WorldComparator.__u_n = true;
-                           if(var15 == null) {
-                              var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13);
-                              WorldComparator.__u_n = false;
+                           var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte();
+                           var12 = NetCache.NetCache_responseHeaderBuffer.method43();
+                           int var14 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte();
+                           var13 = NetCache.NetCache_responseHeaderBuffer.readInt();
+                           long var15 = (long)(var12 + (var11 << 16));
+                           NetFileRequest var17 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var15);
+                           WorldComparator.field988 = true;
+                           if (var17 == null) {
+                              var17 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var15);
+                              WorldComparator.field988 = false;
                            }
 
-                           if(var15 == null) {
+                           if (var17 == null) {
                               throw new IOException();
                            }
 
-                           int var16 = var11 == 0?5:9;
-                           ModelData0.NetCache_currentResponse = var15;
-                           class22.NetCache_responseArchiveBuffer = new Buffer(var12 + var16 + ModelData0.NetCache_currentResponse.padding);
-                           class22.NetCache_responseArchiveBuffer.writeByte(var11);
-                           class22.NetCache_responseArchiveBuffer.writeInt(var12);
-                           NetCache.__iq_j = 8;
+                           int var18 = var14 == 0 ? 5 : 9;
+                           ModelData0.NetCache_currentResponse = var17;
+                           class22.NetCache_responseArchiveBuffer = new Buffer(var13 + var18 + ModelData0.NetCache_currentResponse.padding);
+                           class22.NetCache_responseArchiveBuffer.writeByte(var14);
+                           class22.NetCache_responseArchiveBuffer.writeInt(var13);
+                           NetCache.field630 = 8;
                            NetCache.NetCache_responseHeaderBuffer.index = 0;
-                        } else if(NetCache.__iq_j == 0) {
-                           if(NetCache.NetCache_responseHeaderBuffer.array[0] == -1) {
-                              NetCache.__iq_j = 1;
+                        } else if (NetCache.field630 == 0) {
+                           if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) {
+                              NetCache.field630 = 1;
                               NetCache.NetCache_responseHeaderBuffer.index = 0;
                            } else {
                               ModelData0.NetCache_currentResponse = null;
                            }
                         }
                      } else {
-                        var8 = class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding;
-                        var9 = 512 - NetCache.__iq_j;
-                        if(var9 > var8 - class22.NetCache_responseArchiveBuffer.index) {
-                           var9 = var8 - class22.NetCache_responseArchiveBuffer.index;
+                        var10 = class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding;
+                        var11 = 512 - NetCache.field630;
+                        if (var11 > var10 - class22.NetCache_responseArchiveBuffer.index) {
+                           var11 = var10 - class22.NetCache_responseArchiveBuffer.index;
                         }
 
-                        if(var9 > var18) {
-                           var9 = var18;
+                        if (var11 > var8) {
+                           var11 = var8;
                         }
 
-                        NetCache.NetCache_socket.read(class22.NetCache_responseArchiveBuffer.array, class22.NetCache_responseArchiveBuffer.index, var9);
-                        if(NetCache.__iq_b != 0) {
-                           for(var10 = 0; var10 < var9; ++var10) {
-                              class22.NetCache_responseArchiveBuffer.array[class22.NetCache_responseArchiveBuffer.index + var10] ^= NetCache.__iq_b;
+                        NetCache.NetCache_socket.read(class22.NetCache_responseArchiveBuffer.array, class22.NetCache_responseArchiveBuffer.index, var11);
+                        if (NetCache.field631 != 0) {
+                           for (var12 = 0; var12 < var11; ++var12) {
+                              var10000 = class22.NetCache_responseArchiveBuffer.array;
+                              var10001 = class22.NetCache_responseArchiveBuffer.index + var12;
+                              var10000[var10001] ^= NetCache.field631;
                            }
                         }
 
-                        class22.NetCache_responseArchiveBuffer.index += var9;
-                        NetCache.__iq_j += var9;
-                        if(var8 == class22.NetCache_responseArchiveBuffer.index) {
-                           if(16711935L == ModelData0.NetCache_currentResponse.key) {
+                        var24 = class22.NetCache_responseArchiveBuffer;
+                        var24.index += var11;
+                        NetCache.field630 += var11;
+                        if (var10 == class22.NetCache_responseArchiveBuffer.index) {
+                           if (16711935L == ModelData0.NetCache_currentResponse.key) {
                               Players.NetCache_reference = class22.NetCache_responseArchiveBuffer;
 
-                              for(var10 = 0; var10 < 256; ++var10) {
-                                 IndexCache var19 = NetCache.NetCache_indexCaches[var10];
-                                 if(var19 != null) {
-                                    Players.NetCache_reference.index = var10 * 8 + 5;
-                                    var12 = Players.NetCache_reference.readInt();
-                                    int var20 = Players.NetCache_reference.readInt();
-                                    var19.loadIndexReference(var12, var20);
+                              for (var12 = 0; var12 < 256; ++var12) {
+                                 IndexCache var22 = NetCache.NetCache_indexCaches[var12];
+                                 if (var22 != null) {
+                                    Players.NetCache_reference.index = var12 * 8 + 5;
+                                    var13 = Players.NetCache_reference.readInt();
+                                    int var23 = Players.NetCache_reference.readInt();
+                                    var22.loadIndexReference(var13, var23);
                                  }
                               }
                            } else {
                               NetCache.NetCache_crc.reset();
-                              NetCache.NetCache_crc.update(class22.NetCache_responseArchiveBuffer.array, 0, var8);
-                              var10 = (int)NetCache.NetCache_crc.getValue();
-                              if(var10 != ModelData0.NetCache_currentResponse.crc) {
+                              NetCache.NetCache_crc.update(class22.NetCache_responseArchiveBuffer.array, 0, var10);
+                              var12 = (int)NetCache.NetCache_crc.getValue();
+                              if (var12 != ModelData0.NetCache_currentResponse.crc) {
                                  try {
                                     NetCache.NetCache_socket.close();
-                                 } catch (Exception var23) {
-                                    ;
+                                 } catch (Exception var20) {
                                  }
 
                                  ++NetCache.NetCache_crcMismatches;
                                  NetCache.NetCache_socket = null;
-                                 NetCache.__iq_b = (byte)((int)(Math.random() * 255.0D + 1.0D));
-                                 var1 = false;
-                                 break label242;
+                                 NetCache.field631 = (byte)((int)(Math.random() * 255.0D + 1.0D));
+                                 var4 = false;
+                                 break label205;
                               }
 
                               NetCache.NetCache_crcMismatches = 0;
                               NetCache.NetCache_ioExceptions = 0;
-                              ModelData0.NetCache_currentResponse.indexCache.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), WorldComparator.__u_n);
+                              ModelData0.NetCache_currentResponse.indexCache.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), WorldComparator.field988);
                            }
 
                            ModelData0.NetCache_currentResponse.remove();
-                           if(WorldComparator.__u_n) {
+                           if (WorldComparator.field988) {
                               --NetCache.NetCache_pendingPriorityResponsesCount;
                            } else {
                               --NetCache.NetCache_pendingResponsesCount;
                            }
 
-                           NetCache.__iq_j = 0;
+                           NetCache.field630 = 0;
                            ModelData0.NetCache_currentResponse = null;
                            class22.NetCache_responseArchiveBuffer = null;
                         } else {
-                           if(NetCache.__iq_j != 512) {
+                           if (NetCache.field630 != 512) {
                               break;
                            }
 
-                           NetCache.__iq_j = 0;
+                           NetCache.field630 = 0;
                         }
                      }
                   }
 
-                  var1 = true;
+                  var4 = true;
                }
-            } catch (IOException var24) {
+            } catch (IOException var21) {
                try {
                   NetCache.NetCache_socket.close();
-               } catch (Exception var22) {
-                  ;
+               } catch (Exception var19) {
                }
 
                ++NetCache.NetCache_ioExceptions;
                NetCache.NetCache_socket = null;
-               var1 = false;
+               var4 = false;
             }
          }
 
-         if(!var1) {
+         if (!var4) {
             this.doCycleJs5Connect();
          }
-
       }
+
    }
 
    @ObfuscatedName("ev")
@@ -3194,41 +2943,41 @@ public final class Client extends GameShell implements Usernamed {
    )
    @Export("doCycleJs5Connect")
    void doCycleJs5Connect() {
-      if(NetCache.NetCache_crcMismatches >= 4) {
+      if (NetCache.NetCache_crcMismatches >= 4) {
          this.error("js5crc");
          gameState = 1000;
       } else {
-         if(NetCache.NetCache_ioExceptions >= 4) {
-            if(gameState <= 5) {
+         if (NetCache.NetCache_ioExceptions >= 4) {
+            if (gameState <= 5) {
                this.error("js5io");
                gameState = 1000;
                return;
             }
 
-            __client_dp = 3000;
+            field167 = 3000;
             NetCache.NetCache_ioExceptions = 3;
          }
 
-         if(--__client_dp + 1 <= 0) {
+         if (--field167 + 1 <= 0) {
             try {
-               if(js5ConnectState == 0) {
+               if (js5ConnectState == 0) {
                   class210.js5SocketTask = GameShell.taskHandler.newSocketTask(class50.worldHost, class203.port3);
                   ++js5ConnectState;
                }
 
-               if(js5ConnectState == 1) {
-                  if(class210.js5SocketTask.status == 2) {
+               if (js5ConnectState == 1) {
+                  if (class210.js5SocketTask.status == 2) {
                      this.js5Error(-1);
                      return;
                   }
 
-                  if(class210.js5SocketTask.status == 1) {
+                  if (class210.js5SocketTask.status == 1) {
                      ++js5ConnectState;
                   }
                }
 
-               if(js5ConnectState == 2) {
-                  if(useBufferedSocket) {
+               if (js5ConnectState == 2) {
+                  if (useBufferedSocket) {
                      DynamicObject.js5Socket = BufferedFile.method2719((Socket)class210.js5SocketTask.result, 40000, 5000);
                   } else {
                      DynamicObject.js5Socket = new NetSocket((Socket)class210.js5SocketTask.result, GameShell.taskHandler, 5000);
@@ -3242,59 +2991,57 @@ public final class Client extends GameShell implements Usernamed {
                   GameObject.js5StartTimeMs = class203.currentTimeMs();
                }
 
-               if(js5ConnectState == 3) {
-                  if(DynamicObject.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) {
-                     int var5 = DynamicObject.js5Socket.readUnsignedByte();
-                     if(var5 != 0) {
-                        this.js5Error(var5);
+               if (js5ConnectState == 3) {
+                  if (DynamicObject.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) {
+                     int var10 = DynamicObject.js5Socket.readUnsignedByte();
+                     if (var10 != 0) {
+                        this.js5Error(var10);
                         return;
                      }
 
                      ++js5ConnectState;
-                  } else if(class203.currentTimeMs() - GameObject.js5StartTimeMs > 30000L) {
+                  } else if (class203.currentTimeMs() - GameObject.js5StartTimeMs > 30000L) {
                      this.js5Error(-2);
                      return;
                   }
                }
 
-               if(js5ConnectState == 4) {
-                  AbstractSocket var10 = DynamicObject.js5Socket;
+               if (js5ConnectState == 4) {
+                  AbstractSocket var11 = DynamicObject.js5Socket;
                   boolean var2 = gameState > 20;
-                  if(NetCache.NetCache_socket != null) {
+                  if (NetCache.NetCache_socket != null) {
                      try {
                         NetCache.NetCache_socket.close();
                      } catch (Exception var8) {
-                        ;
                      }
 
                      NetCache.NetCache_socket = null;
                   }
 
-                  NetCache.NetCache_socket = var10;
+                  NetCache.NetCache_socket = var11;
                   UserComparator9.method3343(var2);
                   NetCache.NetCache_responseHeaderBuffer.index = 0;
                   ModelData0.NetCache_currentResponse = null;
                   class22.NetCache_responseArchiveBuffer = null;
-                  NetCache.__iq_j = 0;
+                  NetCache.field630 = 0;
 
-                  while(true) {
+                  while (true) {
                      NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first();
-                     if(var3 == null) {
-                        while(true) {
+                     if (var3 == null) {
+                        while (true) {
                            var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first();
-                           if(var3 == null) {
-                              if(NetCache.__iq_b != 0) {
+                           if (var3 == null) {
+                              if (NetCache.field631 != 0) {
                                  try {
-                                    Buffer var11 = new Buffer(4);
-                                    var11.writeByte(4);
-                                    var11.writeByte(NetCache.__iq_b);
-                                    var11.writeShort(0);
-                                    NetCache.NetCache_socket.write(var11.array, 0, 4);
+                                    Buffer var4 = new Buffer(4);
+                                    var4.writeByte(4);
+                                    var4.writeByte(NetCache.field631);
+                                    var4.writeShort(0);
+                                    NetCache.NetCache_socket.write(var4.array, 0, 4);
                                  } catch (IOException var7) {
                                     try {
                                        NetCache.NetCache_socket.close();
                                     } catch (Exception var6) {
-                                       ;
                                     }
 
                                     ++NetCache.NetCache_ioExceptions;
@@ -3302,8 +3049,8 @@ public final class Client extends GameShell implements Usernamed {
                                  }
                               }
 
-                              NetCache.__iq_f = 0;
-                              NetCache.__iq_q = class203.currentTimeMs();
+                              NetCache.field628 = 0;
+                              NetCache.field629 = class203.currentTimeMs();
                               class210.js5SocketTask = null;
                               DynamicObject.js5Socket = null;
                               js5ConnectState = 0;
@@ -3326,9 +3073,9 @@ public final class Client extends GameShell implements Usernamed {
             } catch (IOException var9) {
                this.js5Error(-3);
             }
-
          }
       }
+
    }
 
    @ObfuscatedName("ea")
@@ -3341,30 +3088,30 @@ public final class Client extends GameShell implements Usernamed {
       class210.js5SocketTask = null;
       DynamicObject.js5Socket = null;
       js5ConnectState = 0;
-      if(class2.port1 == class203.port3) {
+      if (class2.port1 == class203.port3) {
          class203.port3 = WorldMapArea.port2;
       } else {
          class203.port3 = class2.port1;
       }
 
       ++js5Errors;
-      if(js5Errors >= 2 && (var1 == 7 || var1 == 9)) {
-         if(gameState <= 5) {
-            this.error("js5connect_full");
+      if (js5Errors < 2 || var1 != 7 && var1 != 9) {
+         if (js5Errors >= 2 && var1 == 6) {
+            this.error("js5connect_outofdate");
             gameState = 1000;
-         } else {
-            __client_dp = 3000;
+         } else if (js5Errors >= 4) {
+            if (gameState <= 5) {
+               this.error("js5connect");
+               gameState = 1000;
+            } else {
+               field167 = 3000;
+            }
          }
-      } else if(js5Errors >= 2 && var1 == 6) {
-         this.error("js5connect_outofdate");
+      } else if (gameState <= 5) {
+         this.error("js5connect_full");
          gameState = 1000;
-      } else if(js5Errors >= 4) {
-         if(gameState <= 5) {
-            this.error("js5connect");
-            gameState = 1000;
-         } else {
-            __client_dp = 3000;
-         }
+      } else {
+         field167 = 3000;
       }
 
    }
@@ -3380,37 +3127,37 @@ public final class Client extends GameShell implements Usernamed {
       PacketBuffer var2 = packetWriter.packetBuffer;
 
       try {
-         if(loginState == 0) {
-            if(WorldMapIcon1.secureRandom == null && (secureRandomFuture.isDone() || __client_ex > 250)) {
+         if (loginState == 0) {
+            if (WorldMapIcon1.secureRandom == null && (secureRandomFuture.isDone() || field168 > 250)) {
                WorldMapIcon1.secureRandom = secureRandomFuture.get();
                secureRandomFuture.shutdown();
                secureRandomFuture = null;
             }
 
-            if(WorldMapIcon1.secureRandom != null) {
-               if(var1 != null) {
+            if (WorldMapIcon1.secureRandom != null) {
+               if (var1 != null) {
                   ((AbstractSocket)var1).close();
                   var1 = null;
                }
 
                UserComparator3.socketTask = null;
-               __client_fh = false;
-               __client_ex = 0;
+               field176 = false;
+               field168 = 0;
                loginState = 1;
             }
          }
 
-         if(loginState == 1) {
-            if(UserComparator3.socketTask == null) {
+         if (loginState == 1) {
+            if (UserComparator3.socketTask == null) {
                UserComparator3.socketTask = GameShell.taskHandler.newSocketTask(class50.worldHost, class203.port3);
             }
 
-            if(UserComparator3.socketTask.status == 2) {
+            if (UserComparator3.socketTask.status == 2) {
                throw new IOException();
             }
 
-            if(UserComparator3.socketTask.status == 1) {
-               if(useBufferedSocket) {
+            if (UserComparator3.socketTask.status == 1) {
+               if (useBufferedSocket) {
                   var1 = BufferedFile.method2719((Socket)UserComparator3.socketTask.result, 40000, 5000);
                } else {
                   var1 = new NetSocket((Socket)UserComparator3.socketTask.result, GameShell.taskHandler, 5000);
@@ -3422,53 +3169,53 @@ public final class Client extends GameShell implements Usernamed {
             }
          }
 
-         if(loginState == 2) {
-            packetWriter.__m_165();
-            PacketBufferNode var4;
-            if(PacketBufferNode.__gg_u == 0) {
-               var4 = new PacketBufferNode();
+         if (loginState == 2) {
+            packetWriter.method239();
+            PacketBufferNode var3;
+            if (PacketBufferNode.field668 == 0) {
+               var3 = new PacketBufferNode();
             } else {
-               var4 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.__gg_u];
+               var3 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.field668];
             }
 
-            var4.__m = null;
-            var4.__f = 0;
-            var4.packetBuffer = new PacketBuffer(5000);
-            var4.packetBuffer.writeByte(LoginPacket.__gl_m.id);
-            packetWriter.__q_167(var4);
-            packetWriter.__f_166();
+            var3.field669 = null;
+            var3.field670 = 0;
+            var3.packetBuffer = new PacketBuffer(5000);
+            var3.packetBuffer.writeByte(LoginPacket.field473.id);
+            packetWriter.method241(var3);
+            packetWriter.method240();
             var2.index = 0;
             loginState = 3;
          }
 
-         boolean var12;
-         int var13;
-         if(loginState == 3) {
-            if(WorldMapCacheName.pcmPlayer0 != null) {
-               WorldMapCacheName.pcmPlayer0.__ac_176();
+         int var4;
+         boolean var16;
+         if (loginState == 3) {
+            if (WorldMapCacheName.pcmPlayer0 != null) {
+               WorldMapCacheName.pcmPlayer0.method242();
             }
 
-            if(AbstractIndexCache.pcmPlayer1 != null) {
-               AbstractIndexCache.pcmPlayer1.__ac_176();
+            if (AbstractIndexCache.pcmPlayer1 != null) {
+               AbstractIndexCache.pcmPlayer1.method242();
             }
 
-            var12 = true;
-            if(useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) {
-               var12 = false;
+            var16 = true;
+            if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) {
+               var16 = false;
             }
 
-            if(var12) {
-               var13 = ((AbstractSocket)var1).readUnsignedByte();
-               if(WorldMapCacheName.pcmPlayer0 != null) {
-                  WorldMapCacheName.pcmPlayer0.__ac_176();
+            if (var16) {
+               var4 = ((AbstractSocket)var1).readUnsignedByte();
+               if (WorldMapCacheName.pcmPlayer0 != null) {
+                  WorldMapCacheName.pcmPlayer0.method242();
                }
 
-               if(AbstractIndexCache.pcmPlayer1 != null) {
-                  AbstractIndexCache.pcmPlayer1.__ac_176();
+               if (AbstractIndexCache.pcmPlayer1 != null) {
+                  AbstractIndexCache.pcmPlayer1.method242();
                }
 
-               if(var13 != 0) {
-                  IsaacCipher.method4093(var13);
+               if (var4 != 0) {
+                  IsaacCipher.method4093(var4);
                   return;
                }
 
@@ -3477,154 +3224,154 @@ public final class Client extends GameShell implements Usernamed {
             }
          }
 
-         int var25;
-         if(loginState == 4) {
-            if(var2.index < 8) {
-               var25 = ((AbstractSocket)var1).available();
-               if(var25 > 8 - var2.index) {
-                  var25 = 8 - var2.index;
+         int var5;
+         if (loginState == 4) {
+            if (var2.index < 8) {
+               var5 = ((AbstractSocket)var1).available();
+               if (var5 > 8 - var2.index) {
+                  var5 = 8 - var2.index;
                }
 
-               if(var25 > 0) {
-                  ((AbstractSocket)var1).read(var2.array, var2.index, var25);
-                  var2.index += var25;
+               if (var5 > 0) {
+                  ((AbstractSocket)var1).read(var2.array, var2.index, var5);
+                  var2.index += var5;
                }
             }
 
-            if(var2.index == 8) {
+            if (var2.index == 8) {
                var2.index = 0;
-               MusicPatchNode2.__hd_fc = var2.readLong();
+               MusicPatchNode2.field592 = var2.readLong();
                loginState = 5;
             }
          }
 
-         if(loginState == 5) {
+         if (loginState == 5) {
             packetWriter.packetBuffer.index = 0;
-            packetWriter.__m_165();
-            PacketBuffer var3 = new PacketBuffer(500);
-            int[] var20 = new int[]{WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt()};
-            var3.index = 0;
-            var3.writeByte(1);
-            var3.writeInt(var20[0]);
-            var3.writeInt(var20[1]);
-            var3.writeInt(var20[2]);
-            var3.writeInt(var20[3]);
-            var3.writeLong(MusicPatchNode2.__hd_fc);
-            if(gameState == 40) {
-               var3.writeInt(Skills.__hc_ef[0]);
-               var3.writeInt(Skills.__hc_ef[1]);
-               var3.writeInt(Skills.__hc_ef[2]);
-               var3.writeInt(Skills.__hc_ef[3]);
+            packetWriter.method239();
+            PacketBuffer var6 = new PacketBuffer(500);
+            int[] var7 = new int[]{WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt()};
+            var6.index = 0;
+            var6.writeByte(1);
+            var6.writeInt(var7[0]);
+            var6.writeInt(var7[1]);
+            var6.writeInt(var7[2]);
+            var6.writeInt(var7[3]);
+            var6.writeLong(MusicPatchNode2.field592);
+            if (gameState == 40) {
+               var6.writeInt(Skills.field875[0]);
+               var6.writeInt(Skills.field875[1]);
+               var6.writeInt(Skills.field875[2]);
+               var6.writeInt(Skills.field875[3]);
             } else {
-               var3.writeByte(field658.rsOrdinal());
+               var6.writeByte(field658.rsOrdinal());
                switch(field658.field1984) {
                case 0:
                case 3:
-                  var3.writeMedium(class13.otpInt);
-                  ++var3.index;
+                  var6.writeMedium(class13.otpInt);
+                  ++var6.index;
                   break;
                case 1:
-                  var3.index += 4;
+                  var6.index += 4;
                   break;
                case 2:
-                  var3.writeInt(((Integer)ReflectionCheck.clientPreferences.parameters.get(Integer.valueOf(class279.method5357(Login.Login_username)))).intValue());
+                  var6.writeInt((Integer)ReflectionCheck.clientPreferences.parameters.get(class279.method5357(Login.Login_username)));
                }
 
-               var3.writeByte(class313.field3834.rsOrdinal());
-               var3.writeStringCp1252NullTerminated(Login.Login_password);
+               var6.writeByte(class313.field3834.rsOrdinal());
+               var6.writeStringCp1252NullTerminated(Login.Login_password);
             }
 
-            var3.encryptRsa(class83.__cm_m, class83.__cm_f);
-            Skills.__hc_ef = var20;
-            PacketBufferNode var6;
-            if(PacketBufferNode.__gg_u == 0) {
-               var6 = new PacketBufferNode();
+            var6.encryptRsa(class83.field1165, class83.field1166);
+            Skills.field875 = var7;
+            PacketBufferNode var8;
+            if (PacketBufferNode.field668 == 0) {
+               var8 = new PacketBufferNode();
             } else {
-               var6 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.__gg_u];
+               var8 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.field668];
             }
 
-            var6.__m = null;
-            var6.__f = 0;
-            var6.packetBuffer = new PacketBuffer(5000);
-            var6.packetBuffer.index = 0;
-            if(gameState == 40) {
-               var6.packetBuffer.writeByte(LoginPacket.__gl_w.id);
+            var8.field669 = null;
+            var8.field670 = 0;
+            var8.packetBuffer = new PacketBuffer(5000);
+            var8.packetBuffer.index = 0;
+            if (gameState == 40) {
+               var8.packetBuffer.writeByte(LoginPacket.field476.id);
             } else {
-               var6.packetBuffer.writeByte(LoginPacket.__gl_q.id);
+               var8.packetBuffer.writeByte(LoginPacket.field475.id);
             }
 
-            var6.packetBuffer.writeShort(0);
-            int var14 = var6.packetBuffer.index;
-            var6.packetBuffer.writeInt(180);
-            var6.packetBuffer.writeInt(1);
-            var6.packetBuffer.writeByte(clientType);
-            var6.packetBuffer.__s_297(var3.array, 0, var3.index);
-            int var8 = var6.packetBuffer.index;
-            var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username);
-            var6.packetBuffer.writeByte((isResizable?1:0) << 1 | (isLowDetail?1:0));
-            var6.packetBuffer.writeShort(SoundCache.canvasWidth);
-            var6.packetBuffer.writeShort(Huffman.canvasHeight);
-            Varps.method4400(var6.packetBuffer);
-            var6.packetBuffer.writeStringCp1252NullTerminated(class21.__b_by);
-            var6.packetBuffer.writeInt(AbstractIndexCache.__ir_bu);
-            Buffer var9 = new Buffer(WorldMapLabelSize.platformInfo.size());
-            WorldMapLabelSize.platformInfo.write(var9);
-            var6.packetBuffer.__s_297(var9.array, 0, var9.array.length);
-            var6.packetBuffer.writeByte(clientType);
-            var6.packetBuffer.writeInt(0);
-            var6.packetBuffer.writeInt(AbstractIndexCache.indexCache0.hash);
-            var6.packetBuffer.writeInt(Skeleton.indexCache1.hash);
-            var6.packetBuffer.writeInt(ObjectSound.indexCache2.hash);
-            var6.packetBuffer.writeInt(WorldMapIcon1.indexCache3.hash);
-            var6.packetBuffer.writeInt(class25.indexCache4.hash);
-            var6.packetBuffer.writeInt(SecureRandomFuture.indexCache5.hash);
-            var6.packetBuffer.writeInt(UserComparator3.indexCache6.hash);
-            var6.packetBuffer.writeInt(class40.indexCache7.hash);
-            var6.packetBuffer.writeInt(WorldMapSection3.indexCache8.hash);
-            var6.packetBuffer.writeInt(class238.indexCache9.hash);
-            var6.packetBuffer.writeInt(class16.indexCache10.hash);
-            var6.packetBuffer.writeInt(Login.indexCache11.hash);
-            var6.packetBuffer.writeInt(Formatting.indexCache12.hash);
-            var6.packetBuffer.writeInt(ByteArrayPool.indexCache13.hash);
-            var6.packetBuffer.writeInt(class2.indexCache14.hash);
-            var6.packetBuffer.writeInt(WorldMapSection1.indexCache15.hash);
-            var6.packetBuffer.writeInt(0);
-            var6.packetBuffer.writeInt(class22.indexCache16.hash);
-            var6.packetBuffer.writeInt(WorldMapLabelSize.__s_dq.hash);
-            var6.packetBuffer.writeInt(ItemContainer.__bc_dm.hash);
-            var6.packetBuffer.writeInt(AbstractByteArrayCopier.__gu_et.hash);
-            var6.packetBuffer.xteaEncrypt(var20, var8, var6.packetBuffer.index);
-            var6.packetBuffer.__y_299(var6.packetBuffer.index - var14);
-            packetWriter.__q_167(var6);
-            packetWriter.__f_166();
-            packetWriter.isaacCipher = new IsaacCipher(var20);
-            int[] var10 = new int[4];
+            var8.packetBuffer.writeShort(0);
+            int var9 = var8.packetBuffer.index;
+            var8.packetBuffer.writeInt(180);
+            var8.packetBuffer.writeInt(1);
+            var8.packetBuffer.writeByte(clientType);
+            var8.packetBuffer.method38(var6.array, 0, var6.index);
+            int var10 = var8.packetBuffer.index;
+            var8.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username);
+            var8.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0));
+            var8.packetBuffer.writeShort(SoundCache.canvasWidth);
+            var8.packetBuffer.writeShort(Huffman.canvasHeight);
+            Varps.method4400(var8.packetBuffer);
+            var8.packetBuffer.writeStringCp1252NullTerminated(class21.field1123);
+            var8.packetBuffer.writeInt(AbstractIndexCache.field2);
+            Buffer var11 = new Buffer(WorldMapLabelSize.platformInfo.size());
+            WorldMapLabelSize.platformInfo.write(var11);
+            var8.packetBuffer.method38(var11.array, 0, var11.array.length);
+            var8.packetBuffer.writeByte(clientType);
+            var8.packetBuffer.writeInt(0);
+            var8.packetBuffer.writeInt(AbstractIndexCache.indexCache0.hash);
+            var8.packetBuffer.writeInt(Skeleton.indexCache1.hash);
+            var8.packetBuffer.writeInt(ObjectSound.indexCache2.hash);
+            var8.packetBuffer.writeInt(WorldMapIcon1.indexCache3.hash);
+            var8.packetBuffer.writeInt(class25.indexCache4.hash);
+            var8.packetBuffer.writeInt(SecureRandomFuture.indexCache5.hash);
+            var8.packetBuffer.writeInt(UserComparator3.indexCache6.hash);
+            var8.packetBuffer.writeInt(class40.indexCache7.hash);
+            var8.packetBuffer.writeInt(WorldMapSection3.indexCache8.hash);
+            var8.packetBuffer.writeInt(class238.indexCache9.hash);
+            var8.packetBuffer.writeInt(class16.indexCache10.hash);
+            var8.packetBuffer.writeInt(Login.indexCache11.hash);
+            var8.packetBuffer.writeInt(Formatting.indexCache12.hash);
+            var8.packetBuffer.writeInt(ByteArrayPool.indexCache13.hash);
+            var8.packetBuffer.writeInt(class2.indexCache14.hash);
+            var8.packetBuffer.writeInt(WorldMapSection1.indexCache15.hash);
+            var8.packetBuffer.writeInt(0);
+            var8.packetBuffer.writeInt(class22.indexCache16.hash);
+            var8.packetBuffer.writeInt(WorldMapLabelSize.field1040.hash);
+            var8.packetBuffer.writeInt(ItemContainer.field434.hash);
+            var8.packetBuffer.writeInt(AbstractByteArrayCopier.field0.hash);
+            var8.packetBuffer.xteaEncrypt(var7, var10, var8.packetBuffer.index);
+            var8.packetBuffer.method40(var8.packetBuffer.index - var9);
+            packetWriter.method241(var8);
+            packetWriter.method240();
+            packetWriter.isaacCipher = new IsaacCipher(var7);
+            int[] var12 = new int[4];
 
-            for(int var11 = 0; var11 < 4; ++var11) {
-               var10[var11] = var20[var11] + 50;
+            for (int var13 = 0; var13 < 4; ++var13) {
+               var12[var13] = var7[var13] + 50;
             }
 
-            var2.newIsaacCipher(var10);
+            var2.newIsaacCipher(var12);
             loginState = 6;
          }
 
-         if(loginState == 6 && ((AbstractSocket)var1).available() > 0) {
-            var25 = ((AbstractSocket)var1).readUnsignedByte();
-            if(var25 == 21 && gameState == 20) {
+         if (loginState == 6 && ((AbstractSocket)var1).available() > 0) {
+            var5 = ((AbstractSocket)var1).readUnsignedByte();
+            if (var5 == 21 && gameState == 20) {
                loginState = 9;
-            } else if(var25 == 2) {
+            } else if (var5 == 2) {
                loginState = 11;
-            } else if(var25 == 15 && gameState == 40) {
+            } else if (var5 == 15 && gameState == 40) {
                packetWriter.serverPacket0Length = -1;
                loginState = 16;
-            } else if(var25 == 64) {
+            } else if (var5 == 64) {
                loginState = 7;
-            } else if(var25 == 23 && __client_ej < 1) {
-               ++__client_ej;
+            } else if (var5 == 23 && field169 < 1) {
+               ++field169;
                loginState = 0;
             } else {
-               if(var25 != 29) {
-                  IsaacCipher.method4093(var25);
+               if (var5 != 29) {
+                  IsaacCipher.method4093(var5);
                   return;
                }
 
@@ -3632,56 +3379,55 @@ public final class Client extends GameShell implements Usernamed {
             }
          }
 
-         if(loginState == 7 && ((AbstractSocket)var1).available() > 0) {
-            WorldMapSection1.__as_ey = ((AbstractSocket)var1).readUnsignedByte();
+         if (loginState == 7 && ((AbstractSocket)var1).available() > 0) {
+            WorldMapSection1.field1071 = ((AbstractSocket)var1).readUnsignedByte();
             loginState = 8;
          }
 
-         if(loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection1.__as_ey) {
-            ((AbstractSocket)var1).read(var2.array, 0, WorldMapSection1.__as_ey);
+         if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection1.field1071) {
+            ((AbstractSocket)var1).read(var2.array, 0, WorldMapSection1.field1071);
             var2.index = 0;
             loginState = 6;
          }
 
-         if(loginState == 9 && ((AbstractSocket)var1).available() > 0) {
-            __client_el = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60;
+         if (loginState == 9 && ((AbstractSocket)var1).available() > 0) {
+            field170 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60;
             loginState = 10;
          }
 
-         if(loginState == 10) {
-            __client_ex = 0;
-            class54.method1089("You have only just left another world.", "Your profile will be transferred in:", __client_el / 60 + " seconds.");
-            if(--__client_el <= 0) {
+         if (loginState == 10) {
+            field168 = 0;
+            class54.method1089("You have only just left another world.", "Your profile will be transferred in:", field170 / 60 + " seconds.");
+            if (--field170 <= 0) {
                loginState = 0;
             }
-
          } else {
-            if(loginState == 11 && ((AbstractSocket)var1).available() >= 1) {
-               __client_eo = ((AbstractSocket)var1).readUnsignedByte();
+            if (loginState == 11 && ((AbstractSocket)var1).available() >= 1) {
+               field171 = ((AbstractSocket)var1).readUnsignedByte();
                loginState = 12;
             }
 
-            if(loginState == 12 && ((AbstractSocket)var1).available() >= __client_eo) {
-               var12 = ((AbstractSocket)var1).readUnsignedByte() == 1;
+            if (loginState == 12 && ((AbstractSocket)var1).available() >= field171) {
+               var16 = ((AbstractSocket)var1).readUnsignedByte() == 1;
                ((AbstractSocket)var1).read(var2.array, 0, 4);
                var2.index = 0;
-               boolean var26 = false;
-               if(var12) {
-                  var13 = var2.readByteIsaac() << 24;
-                  var13 |= var2.readByteIsaac() << 16;
-                  var13 |= var2.readByteIsaac() << 8;
-                  var13 |= var2.readByteIsaac();
-                  int var15 = class279.method5357(Login.Login_username);
-                  if(ReflectionCheck.clientPreferences.parameters.size() >= 10 && !ReflectionCheck.clientPreferences.parameters.containsKey(Integer.valueOf(var15))) {
-                     Iterator var24 = ReflectionCheck.clientPreferences.parameters.entrySet().iterator();
-                     var24.next();
-                     var24.remove();
+               boolean var17 = false;
+               if (var16) {
+                  var4 = var2.readByteIsaac() << 24;
+                  var4 |= var2.readByteIsaac() << 16;
+                  var4 |= var2.readByteIsaac() << 8;
+                  var4 |= var2.readByteIsaac();
+                  int var20 = class279.method5357(Login.Login_username);
+                  if (ReflectionCheck.clientPreferences.parameters.size() >= 10 && !ReflectionCheck.clientPreferences.parameters.containsKey(var20)) {
+                     Iterator var23 = ReflectionCheck.clientPreferences.parameters.entrySet().iterator();
+                     var23.next();
+                     var23.remove();
                   }
 
-                  ReflectionCheck.clientPreferences.parameters.put(Integer.valueOf(var15), Integer.valueOf(var13));
+                  ReflectionCheck.clientPreferences.parameters.put(var20, var4);
                }
 
-               if(Login_isUsernameRemembered) {
+               if (Login_isUsernameRemembered) {
                   ReflectionCheck.clientPreferences.rememberedUsername = Login.Login_username;
                } else {
                   ReflectionCheck.clientPreferences.rememberedUsername = null;
@@ -3689,157 +3435,156 @@ public final class Client extends GameShell implements Usernamed {
 
                WorldMapSection0.savePreferences();
                rights = ((AbstractSocket)var1).readUnsignedByte();
-               __client_mn = ((AbstractSocket)var1).readUnsignedByte() == 1;
+               field155 = ((AbstractSocket)var1).readUnsignedByte() == 1;
                localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte();
                localPlayerIndex <<= 8;
                localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte();
-               __client_jo = ((AbstractSocket)var1).readUnsignedByte();
+               field209 = ((AbstractSocket)var1).readUnsignedByte();
                ((AbstractSocket)var1).read(var2.array, 0, 1);
                var2.index = 0;
-               ServerPacket[] var5 = class27.method429();
-               int var16 = var2.readSmartByteShortIsaac();
-               if(var16 < 0 || var16 >= var5.length) {
-                  throw new IOException(var16 + " " + var2.index);
+               ServerPacket[] var21 = class27.method429();
+               int var24 = var2.readSmartByteShortIsaac();
+               if (var24 < 0 || var24 >= var21.length) {
+                  throw new IOException(var24 + " " + var2.index);
                }
 
-               packetWriter.serverPacket0 = var5[var16];
+               packetWriter.serverPacket0 = var21[var24];
                packetWriter.serverPacket0Length = packetWriter.serverPacket0.length;
                ((AbstractSocket)var1).read(var2.array, 0, 2);
                var2.index = 0;
-               packetWriter.serverPacket0Length = var2.__ag_302();
+               packetWriter.serverPacket0Length = var2.method43();
 
                try {
-                  Client var7 = TextureProvider.client;
-                  JSObject.getWindow(var7).call("zap", (Object[])null);
-               } catch (Throwable var17) {
-                  ;
+                  Client var25 = TextureProvider.client;
+                  JSObject.getWindow(var25).call("zap", (Object[])null);
+               } catch (Throwable var14) {
                }
 
                loginState = 13;
             }
 
-            if(loginState == 13) {
-               if(((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) {
+            if (loginState == 13) {
+               if (((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) {
                   var2.index = 0;
                   ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length);
-                  timer.__w_456();
+                  timer.method332();
                   WorldMapSection1.method808();
                   class11.updatePlayer(var2);
-                  GameObject.__eh_fy = -1;
+                  GameObject.field359 = -1;
                   class50.loadRegions(false, var2);
                   packetWriter.serverPacket0 = null;
                }
-
             } else {
-               if(loginState == 14 && ((AbstractSocket)var1).available() >= 2) {
+               if (loginState == 14 && ((AbstractSocket)var1).available() >= 2) {
                   var2.index = 0;
                   ((AbstractSocket)var1).read(var2.array, 0, 2);
                   var2.index = 0;
-                  IndexCacheLoader.__bd_er = var2.__ag_302();
+                  IndexCacheLoader.field407 = var2.method43();
                   loginState = 15;
                }
 
-               if(loginState == 15 && ((AbstractSocket)var1).available() >= IndexCacheLoader.__bd_er) {
+               if (loginState == 15 && ((AbstractSocket)var1).available() >= IndexCacheLoader.field407) {
                   var2.index = 0;
-                  ((AbstractSocket)var1).read(var2.array, 0, IndexCacheLoader.__bd_er);
+                  ((AbstractSocket)var1).read(var2.array, 0, IndexCacheLoader.field407);
                   var2.index = 0;
-                  String var19 = var2.readStringCp1252NullTerminated();
-                  String var21 = var2.readStringCp1252NullTerminated();
+                  String var18 = var2.readStringCp1252NullTerminated();
                   String var22 = var2.readStringCp1252NullTerminated();
-                  class54.method1089(var19, var21, var22);
+                  String var26 = var2.readStringCp1252NullTerminated();
+                  class54.method1089(var18, var22, var26);
                   GameShell.updateGameState(10);
                }
 
-               if(loginState != 16) {
-                  ++__client_ex;
-                  if(__client_ex > 2000) {
-                     if(__client_ej < 1) {
-                        if(class203.port3 == class2.port1) {
+               if (loginState != 16) {
+                  ++field168;
+                  if (field168 > 2000) {
+                     if (field169 < 1) {
+                        if (class203.port3 == class2.port1) {
                            class203.port3 = WorldMapArea.port2;
                         } else {
                            class203.port3 = class2.port1;
                         }
 
-                        ++__client_ej;
+                        ++field169;
                         loginState = 0;
                      } else {
                         IsaacCipher.method4093(-3);
                      }
                   }
                } else {
-                  if(packetWriter.serverPacket0Length == -1) {
-                     if(((AbstractSocket)var1).available() < 2) {
+                  if (packetWriter.serverPacket0Length == -1) {
+                     if (((AbstractSocket)var1).available() < 2) {
                         return;
                      }
 
                      ((AbstractSocket)var1).read(var2.array, 0, 2);
                      var2.index = 0;
-                     packetWriter.serverPacket0Length = var2.__ag_302();
+                     packetWriter.serverPacket0Length = var2.method43();
                   }
 
-                  if(((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) {
+                  if (((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) {
                      ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length);
                      var2.index = 0;
-                     var25 = packetWriter.serverPacket0Length;
-                     timer.__u_458();
-                     packetWriter.__m_165();
+                     var5 = packetWriter.serverPacket0Length;
+                     timer.method334();
+                     packetWriter.method239();
                      packetWriter.packetBuffer.index = 0;
                      packetWriter.serverPacket0 = null;
-                     packetWriter.__k = null;
-                     packetWriter.__n = null;
-                     packetWriter.__i = null;
+                     packetWriter.field676 = null;
+                     packetWriter.field677 = null;
+                     packetWriter.field678 = null;
                      packetWriter.serverPacket0Length = 0;
-                     packetWriter.__x = 0;
+                     packetWriter.field674 = 0;
                      rebootTimer = 0;
                      menuOptionsCount = 0;
                      isMenuOpen = false;
                      minimapState = 0;
                      destinationX = 0;
 
-                     for(var13 = 0; var13 < 2048; ++var13) {
-                        players[var13] = null;
+                     for (var4 = 0; var4 < 2048; ++var4) {
+                        players[var4] = null;
                      }
 
                      Canvas.localPlayer = null;
 
-                     for(var13 = 0; var13 < npcs.length; ++var13) {
-                        Npc var23 = npcs[var13];
-                        if(var23 != null) {
-                           var23.targetIndex = -1;
-                           var23.false0 = false;
+                     for (var4 = 0; var4 < npcs.length; ++var4) {
+                        NPC var19 = npcs[var4];
+                        if (var19 != null) {
+                           var19.targetIndex = -1;
+                           var19.false0 = false;
                         }
                      }
 
                      SpriteMask.method4389();
                      GameShell.updateGameState(30);
 
-                     for(var13 = 0; var13 < 100; ++var13) {
-                        __client_od[var13] = true;
+                     for (var4 = 0; var4 < 100; ++var4) {
+                        field100[var4] = true;
                      }
 
                      AbstractByteArrayCopier.method4024();
                      class11.updatePlayer(var2);
-                     if(var25 != var2.index) {
+                     if (var5 != var2.index) {
                         throw new RuntimeException();
                      }
                   }
                }
             }
          }
-      } catch (IOException var18) {
-         if(__client_ej < 1) {
-            if(class2.port1 == class203.port3) {
+      } catch (IOException var15) {
+         if (field169 < 1) {
+            if (class2.port1 == class203.port3) {
                class203.port3 = WorldMapArea.port2;
             } else {
                class203.port3 = class2.port1;
             }
 
-            ++__client_ej;
+            ++field169;
             loginState = 0;
          } else {
             IsaacCipher.method4093(-2);
          }
       }
+
    }
 
    @ObfuscatedName("fx")
@@ -3849,666 +3594,669 @@ public final class Client extends GameShell implements Usernamed {
    )
    @Export("doCycleLoggedIn")
    final void doCycleLoggedIn() {
-      if(rebootTimer > 1) {
+      if (rebootTimer > 1) {
          --rebootTimer;
       }
 
-      if(__client_fd > 0) {
-         --__client_fd;
+      if (field175 > 0) {
+         --field175;
       }
 
-      if(__client_fh) {
-         __client_fh = false;
+      if (field176) {
+         field176 = false;
          class48.method868();
       } else {
-         if(!isMenuOpen) {
+         if (!isMenuOpen) {
             class30.resetMenuEntries();
          }
 
          int var1;
-         for(var1 = 0; var1 < 100 && this.__hg_138(packetWriter); ++var1) {
-            ;
+         for (var1 = 0; var1 < 100 && this.method85(packetWriter); ++var1) {
          }
 
-         if(gameState == 30) {
-            while(true) {
+         if (gameState == 30) {
+            while (true) {
                ReflectionCheck var2 = (ReflectionCheck)class322.reflectionChecks.last();
-               boolean var29;
-               if(var2 == null) {
-                  var29 = false;
+               boolean var3;
+               if (var2 == null) {
+                  var3 = false;
                } else {
-                  var29 = true;
+                  var3 = true;
                }
 
-               int var3;
-               PacketBufferNode var30;
-               if(!var29) {
-                  PacketBufferNode var14;
-                  int var15;
-                  if(timer.__q) {
-                     var14 = Interpreter.method1915(ClientPacket.__gs_o, packetWriter.isaacCipher);
-                     var14.packetBuffer.writeByte(0);
-                     var15 = var14.packetBuffer.index;
-                     timer.write(var14.packetBuffer);
-                     var14.packetBuffer.__h_300(var14.packetBuffer.index - var15);
-                     packetWriter.__q_167(var14);
-                     timer.__o_457();
+               int var4;
+               PacketBufferNode var5;
+               if (!var3) {
+                  PacketBufferNode var6;
+                  int var7;
+                  if (timer.field921) {
+                     var6 = Interpreter.method1915(ClientPacket.field226, packetWriter.isaacCipher);
+                     var6.packetBuffer.writeByte(0);
+                     var7 = var6.packetBuffer.index;
+                     timer.write(var6.packetBuffer);
+                     var6.packetBuffer.method41(var6.packetBuffer.index - var7);
+                     packetWriter.method241(var6);
+                     timer.method333();
                   }
 
-                  Object var34 = Projectile.mouseRecorder.lock;
-                  int var4;
-                  int var5;
-                  int var6;
-                  int var7;
-                  int var8;
+                  Object var8 = Projectile.mouseRecorder.lock;
                   int var9;
                   int var10;
                   int var11;
                   int var12;
+                  int var13;
+                  int var14;
+                  int var15;
+                  int var16;
+                  int var17;
                   synchronized(Projectile.mouseRecorder.lock) {
-                     if(!__client_ai) {
+                     if (!field161) {
                         Projectile.mouseRecorder.index = 0;
-                     } else if(MouseHandler.MouseHandler_lastButton != 0 || Projectile.mouseRecorder.index >= 40) {
-                        var30 = null;
-                        var3 = 0;
+                     } else if (MouseHandler.MouseHandler_lastButton != 0 || Projectile.mouseRecorder.index >= 40) {
+                        var5 = null;
                         var4 = 0;
-                        var5 = 0;
-                        var6 = 0;
+                        var9 = 0;
+                        var10 = 0;
+                        var11 = 0;
 
-                        for(var7 = 0; var7 < Projectile.mouseRecorder.index && (var30 == null || var30.packetBuffer.index - var3 < 246); ++var7) {
-                           var4 = var7;
-                           var8 = Projectile.mouseRecorder.ys[var7];
-                           if(var8 < -1) {
-                              var8 = -1;
-                           } else if(var8 > 65534) {
-                              var8 = 65534;
+                        for (var12 = 0; var12 < Projectile.mouseRecorder.index && (var5 == null || var5.packetBuffer.index - var4 < 246); ++var12) {
+                           var9 = var12;
+                           var13 = Projectile.mouseRecorder.ys[var12];
+                           if (var13 < -1) {
+                              var13 = -1;
+                           } else if (var13 > 65534) {
+                              var13 = 65534;
                            }
 
-                           var9 = Projectile.mouseRecorder.xs[var7];
-                           if(var9 < -1) {
-                              var9 = -1;
-                           } else if(var9 > 65534) {
-                              var9 = 65534;
+                           var14 = Projectile.mouseRecorder.xs[var12];
+                           if (var14 < -1) {
+                              var14 = -1;
+                           } else if (var14 > 65534) {
+                              var14 = 65534;
                            }
 
-                           if(var9 != __client_cn || var8 != __client_cq) {
-                              if(var30 == null) {
-                                 var30 = Interpreter.method1915(ClientPacket.__gs_ak, packetWriter.isaacCipher);
-                                 var30.packetBuffer.writeByte(0);
-                                 var3 = var30.packetBuffer.index;
-                                 var30.packetBuffer.index += 2;
-                                 var5 = 0;
-                                 var6 = 0;
+                           if (var14 != field163 || var13 != field164) {
+                              if (var5 == null) {
+                                 var5 = Interpreter.method1915(ClientPacket.field256, packetWriter.isaacCipher);
+                                 var5.packetBuffer.writeByte(0);
+                                 var4 = var5.packetBuffer.index;
+                                 PacketBuffer var10000 = var5.packetBuffer;
+                                 var10000.index += 2;
+                                 var10 = 0;
+                                 var11 = 0;
                               }
 
-                              if(-1L != __client_ch) {
-                                 var10 = var9 - __client_cn;
-                                 var11 = var8 - __client_cq;
-                                 var12 = (int)((Projectile.mouseRecorder.millis[var7] - __client_ch) / 20L);
-                                 var5 = (int)((long)var5 + (Projectile.mouseRecorder.millis[var7] - __client_ch) % 20L);
+                              if (-1L != field165) {
+                                 var15 = var14 - field163;
+                                 var16 = var13 - field164;
+                                 var17 = (int)((Projectile.mouseRecorder.millis[var12] - field165) / 20L);
+                                 var10 = (int)((long)var10 + (Projectile.mouseRecorder.millis[var12] - field165) % 20L);
                               } else {
-                                 var10 = var9;
-                                 var11 = var8;
-                                 var12 = Integer.MAX_VALUE;
+                                 var15 = var14;
+                                 var16 = var13;
+                                 var17 = Integer.MAX_VALUE;
                               }
 
-                              __client_cn = var9;
-                              __client_cq = var8;
-                              if(var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) {
-                                 var10 += 32;
-                                 var11 += 32;
-                                 var30.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6));
-                              } else if(var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) {
-                                 var10 += 128;
-                                 var11 += 128;
-                                 var30.packetBuffer.writeByte(var12 + 128);
-                                 var30.packetBuffer.writeShort(var11 + (var10 << 8));
-                              } else if(var12 < 32) {
-                                 var30.packetBuffer.writeByte(var12 + 192);
-                                 if(var9 != -1 && var8 != -1) {
-                                    var30.packetBuffer.writeInt(var9 | var8 << 16);
+                              field163 = var14;
+                              field164 = var13;
+                              if (var17 < 8 && var15 >= -32 && var15 <= 31 && var16 >= -32 && var16 <= 31) {
+                                 var15 += 32;
+                                 var16 += 32;
+                                 var5.packetBuffer.writeShort((var17 << 12) + var16 + (var15 << 6));
+                              } else if (var17 < 32 && var15 >= -128 && var15 <= 127 && var16 >= -128 && var16 <= 127) {
+                                 var15 += 128;
+                                 var16 += 128;
+                                 var5.packetBuffer.writeByte(var17 + 128);
+                                 var5.packetBuffer.writeShort(var16 + (var15 << 8));
+                              } else if (var17 < 32) {
+                                 var5.packetBuffer.writeByte(var17 + 192);
+                                 if (var14 != -1 && var13 != -1) {
+                                    var5.packetBuffer.writeInt(var14 | var13 << 16);
                                  } else {
-                                    var30.packetBuffer.writeInt(Integer.MIN_VALUE);
+                                    var5.packetBuffer.writeInt(Integer.MIN_VALUE);
                                  }
                               } else {
-                                 var30.packetBuffer.writeShort((var12 & 8191) + 57344);
-                                 if(var9 != -1 && var8 != -1) {
-                                    var30.packetBuffer.writeInt(var9 | var8 << 16);
+                                 var5.packetBuffer.writeShort((var17 & 8191) + 57344);
+                                 if (var14 != -1 && var13 != -1) {
+                                    var5.packetBuffer.writeInt(var14 | var13 << 16);
                                  } else {
-                                    var30.packetBuffer.writeInt(Integer.MIN_VALUE);
+                                    var5.packetBuffer.writeInt(Integer.MIN_VALUE);
                                  }
                               }
 
-                              ++var6;
-                              __client_ch = Projectile.mouseRecorder.millis[var7];
+                              ++var11;
+                              field165 = Projectile.mouseRecorder.millis[var12];
                            }
                         }
 
-                        if(var30 != null) {
-                           var30.packetBuffer.__h_300(var30.packetBuffer.index - var3);
-                           var7 = var30.packetBuffer.index;
-                           var30.packetBuffer.index = var3;
-                           var30.packetBuffer.writeByte(var5 / var6);
-                           var30.packetBuffer.writeByte(var5 % var6);
-                           var30.packetBuffer.index = var7;
-                           packetWriter.__q_167(var30);
+                        if (var5 != null) {
+                           var5.packetBuffer.method41(var5.packetBuffer.index - var4);
+                           var12 = var5.packetBuffer.index;
+                           var5.packetBuffer.index = var4;
+                           var5.packetBuffer.writeByte(var10 / var11);
+                           var5.packetBuffer.writeByte(var10 % var11);
+                           var5.packetBuffer.index = var12;
+                           packetWriter.method241(var5);
                         }
 
-                        if(var4 >= Projectile.mouseRecorder.index) {
+                        if (var9 >= Projectile.mouseRecorder.index) {
                            Projectile.mouseRecorder.index = 0;
                         } else {
-                           Projectile.mouseRecorder.index -= var4;
-                           System.arraycopy(Projectile.mouseRecorder.xs, var4, Projectile.mouseRecorder.xs, 0, Projectile.mouseRecorder.index);
-                           System.arraycopy(Projectile.mouseRecorder.ys, var4, Projectile.mouseRecorder.ys, 0, Projectile.mouseRecorder.index);
-                           System.arraycopy(Projectile.mouseRecorder.millis, var4, Projectile.mouseRecorder.millis, 0, Projectile.mouseRecorder.index);
+                           MouseRecorder var36 = Projectile.mouseRecorder;
+                           var36.index -= var9;
+                           System.arraycopy(Projectile.mouseRecorder.xs, var9, Projectile.mouseRecorder.xs, 0, Projectile.mouseRecorder.index);
+                           System.arraycopy(Projectile.mouseRecorder.ys, var9, Projectile.mouseRecorder.ys, 0, Projectile.mouseRecorder.index);
+                           System.arraycopy(Projectile.mouseRecorder.millis, var9, Projectile.mouseRecorder.millis, 0, Projectile.mouseRecorder.index);
                         }
                      }
                   }
 
                   PacketBufferNode var18;
-                  if(MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) {
-                     long var16 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L;
-                     if(var16 > 4095L) {
-                        var16 = 4095L;
+                  long var19;
+                  if (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) {
+                     var19 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L;
+                     if (var19 > 4095L) {
+                        var19 = 4095L;
                      }
 
                      mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis * -1L;
-                     var3 = MouseHandler.MouseHandler_lastPressedY;
-                     if(var3 < 0) {
-                        var3 = 0;
-                     } else if(var3 > Huffman.canvasHeight) {
-                        var3 = Huffman.canvasHeight;
-                     }
-
-                     var4 = MouseHandler.MouseHandler_lastPressedX;
-                     if(var4 < 0) {
+                     var4 = MouseHandler.MouseHandler_lastPressedY;
+                     if (var4 < 0) {
                         var4 = 0;
-                     } else if(var4 > SoundCache.canvasWidth) {
-                        var4 = SoundCache.canvasWidth;
+                     } else if (var4 > Huffman.canvasHeight) {
+                        var4 = Huffman.canvasHeight;
                      }
 
-                     var5 = (int)var16;
-                     var18 = Interpreter.method1915(ClientPacket.__gs_ap, packetWriter.isaacCipher);
-                     var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2?1:0));
+                     var9 = MouseHandler.MouseHandler_lastPressedX;
+                     if (var9 < 0) {
+                        var9 = 0;
+                     } else if (var9 > SoundCache.canvasWidth) {
+                        var9 = SoundCache.canvasWidth;
+                     }
+
+                     var10 = (int)var19;
+                     var18 = Interpreter.method1915(ClientPacket.field263, packetWriter.isaacCipher);
+                     var18.packetBuffer.writeShort((var10 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0));
+                     var18.packetBuffer.writeShort(var9);
                      var18.packetBuffer.writeShort(var4);
-                     var18.packetBuffer.writeShort(var3);
-                     packetWriter.__q_167(var18);
+                     packetWriter.method241(var18);
                   }
 
-                  if(KeyHandler.__an_cl > 0) {
-                     var14 = Interpreter.method1915(ClientPacket.__gs_bj, packetWriter.isaacCipher);
-                     var14.packetBuffer.writeShort(0);
-                     var15 = var14.packetBuffer.index;
-                     long var19 = class203.currentTimeMs();
+                  if (KeyHandler.field452 > 0) {
+                     var6 = Interpreter.method1915(ClientPacket.field289, packetWriter.isaacCipher);
+                     var6.packetBuffer.writeShort(0);
+                     var7 = var6.packetBuffer.index;
+                     var19 = class203.currentTimeMs();
 
-                     for(var5 = 0; var5 < KeyHandler.__an_cl; ++var5) {
-                        long var21 = var19 - __client_pp;
-                        if(var21 > 16777215L) {
+                     for (var10 = 0; var10 < KeyHandler.field452; ++var10) {
+                        long var21 = var19 - field126;
+                        if (var21 > 16777215L) {
                            var21 = 16777215L;
                         }
 
-                        __client_pp = var19;
-                        var14.packetBuffer.__ai_315(KeyHandler.__an_cp[var5]);
-                        var14.packetBuffer.writeMedium((int)var21);
+                        field126 = var19;
+                        var6.packetBuffer.method56(KeyHandler.field451[var10]);
+                        var6.packetBuffer.writeMedium((int)var21);
                      }
 
-                     var14.packetBuffer.__y_299(var14.packetBuffer.index - var15);
-                     packetWriter.__q_167(var14);
+                     var6.packetBuffer.method40(var6.packetBuffer.index - var7);
+                     packetWriter.method241(var6);
                   }
 
-                  if(__client_iy > 0) {
-                     --__client_iy;
+                  if (field200 > 0) {
+                     --field200;
                   }
 
-                  if(KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) {
-                     __client_is = true;
+                  if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) {
+                     field201 = true;
                   }
 
-                  if(__client_is && __client_iy <= 0) {
-                     __client_iy = 20;
-                     __client_is = false;
-                     var14 = Interpreter.method1915(ClientPacket.__gs_at, packetWriter.isaacCipher);
-                     var14.packetBuffer.__bx_323(cameraPitchTarget);
-                     var14.packetBuffer.writeShortLE(minimapOrientation);
-                     packetWriter.__q_167(var14);
+                  if (field201 && field200 <= 0) {
+                     field200 = 20;
+                     field201 = false;
+                     var6 = Interpreter.method1915(ClientPacket.field261, packetWriter.isaacCipher);
+                     var6.packetBuffer.method64(cameraPitchTarget);
+                     var6.packetBuffer.writeShortLE(minimapOrientation);
+                     packetWriter.method241(var6);
                   }
 
-                  if(class230.__hy_az && !__client_cw) {
-                     __client_cw = true;
-                     var14 = Interpreter.method1915(ClientPacket.__gs_bf, packetWriter.isaacCipher);
-                     var14.packetBuffer.writeByte(1);
-                     packetWriter.__q_167(var14);
+                  if (class230.field1138 && !field166) {
+                     field166 = true;
+                     var6 = Interpreter.method1915(ClientPacket.field295, packetWriter.isaacCipher);
+                     var6.packetBuffer.writeByte(1);
+                     packetWriter.method241(var6);
                   }
 
-                  if(!class230.__hy_az && __client_cw) {
-                     __client_cw = false;
-                     var14 = Interpreter.method1915(ClientPacket.__gs_bf, packetWriter.isaacCipher);
-                     var14.packetBuffer.writeByte(0);
-                     packetWriter.__q_167(var14);
+                  if (!class230.field1138 && field166) {
+                     field166 = false;
+                     var6 = Interpreter.method1915(ClientPacket.field295, packetWriter.isaacCipher);
+                     var6.packetBuffer.writeByte(0);
+                     packetWriter.method241(var6);
                   }
 
-                  if(class60.worldMap0 != null) {
-                     class60.worldMap0.__f_518();
+                  if (class60.worldMap0 != null) {
+                     class60.worldMap0.method360();
                   }
 
                   class266.method5120();
                   Message.method1228();
-                  if(gameState != 30) {
+                  if (gameState != 30) {
                      return;
                   }
 
                   Canvas.method855();
                   WorldMapIcon1.method212();
-                  ++packetWriter.__x;
-                  if(packetWriter.__x > 750) {
+                  ++packetWriter.field674;
+                  if (packetWriter.field674 > 750) {
                      class48.method868();
                      return;
                   }
 
                   var1 = Players.Players_count;
-                  int[] var31 = Players.Players_indices;
+                  int[] var30 = Players.Players_indices;
 
-                  for(var3 = 0; var3 < var1; ++var3) {
-                     Player var23 = players[var31[var3]];
-                     if(var23 != null) {
-                        class65.method1232(var23, 1);
+                  for (var4 = 0; var4 < var1; ++var4) {
+                     Player var20 = players[var30[var4]];
+                     if (var20 != null) {
+                        class65.method1232(var20, 1);
                      }
                   }
 
-                  for(var1 = 0; var1 < npcCount; ++var1) {
-                     var15 = npcIndices[var1];
-                     Npc var24 = npcs[var15];
-                     if(var24 != null) {
-                        class65.method1232(var24, var24.definition.size);
+                  for (var1 = 0; var1 < npcCount; ++var1) {
+                     var7 = npcIndices[var1];
+                     NPC var31 = npcs[var7];
+                     if (var31 != null) {
+                        class65.method1232(var31, var31.definition.size);
                      }
                   }
 
                   Buddy.processOverheadText();
-                  ++__client_gy;
-                  if(mouseCrossColor != 0) {
+                  ++field183;
+                  if (mouseCrossColor != 0) {
                      mouseCrossState += 20;
-                     if(mouseCrossState >= 400) {
+                     if (mouseCrossState >= 400) {
                         mouseCrossColor = 0;
                      }
                   }
 
-                  if(BoundaryObject.__ej_jv != null) {
-                     ++__client_ju;
-                     if(__client_ju >= 15) {
-                        class22.method295(BoundaryObject.__ej_jv);
-                        BoundaryObject.__ej_jv = null;
+                  if (BoundaryObject.field40 != null) {
+                     ++field203;
+                     if (field203 >= 15) {
+                        class22.method295(BoundaryObject.field40);
+                        BoundaryObject.field40 = null;
                      }
                   }
 
-                  Widget var35 = Clock.mousedOverWidgetIf1;
-                  Widget var32 = AccessFile.__dk_lm;
+                  Widget var32 = Clock.mousedOverWidgetIf1;
+                  Widget var33 = AccessFile.field8;
                   Clock.mousedOverWidgetIf1 = null;
-                  AccessFile.__dk_lm = null;
+                  AccessFile.field8 = null;
                   draggedOnWidget = null;
-                  __client_nt = false;
-                  __client_nn = false;
-                  __client_pm = 0;
+                  field103 = false;
+                  field106 = false;
+                  field137 = 0;
 
-                  while(Decimator.method2490() && __client_pm < 128) {
-                     if(rights >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && IndexStoreAction.__ik_cn == 66) {
-                        String var37 = KeyHandler.method839();
-                        TextureProvider.client.clipboardSetString(var37);
-                     } else if(oculusOrbState != 1 || GzipDecompressor.__go_ck <= 0) {
-                        __client_pn[__client_pm] = IndexStoreAction.__ik_cn;
-                        __client_pq[__client_pm] = GzipDecompressor.__go_ck;
-                        ++__client_pm;
+                  while (Decimator.method2490() && field137 < 128) {
+                     if (rights >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && IndexStoreAction.field411 == 66) {
+                        String var22 = KeyHandler.method839();
+                        TextureProvider.client.clipboardSetString(var22);
+                     } else if (oculusOrbState != 1 || GzipDecompressor.field378 <= 0) {
+                        field145[field137] = IndexStoreAction.field411;
+                        field146[field137] = GzipDecompressor.field378;
+                        ++field137;
                      }
                   }
 
-                  if(FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) {
-                     var3 = Canvas.localPlayer.plane - mouseWheelRotation;
-                     if(var3 < 0) {
-                        var3 = 0;
-                     } else if(var3 > 3) {
-                        var3 = 3;
+                  if (FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) {
+                     var4 = Canvas.localPlayer.plane - mouseWheelRotation;
+                     if (var4 < 0) {
+                        var4 = 0;
+                     } else if (var4 > 3) {
+                        var4 = 3;
                      }
 
-                     if(var3 != Canvas.localPlayer.plane) {
-                        var4 = Canvas.localPlayer.pathX[0] + class50.baseX;
-                        var5 = Canvas.localPlayer.pathY[0] + GraphicsObject.baseY;
-                        var18 = Interpreter.method1915(ClientPacket.__gs_bx, packetWriter.isaacCipher);
+                     if (var4 != Canvas.localPlayer.plane) {
+                        var9 = Canvas.localPlayer.pathX[0] + class50.baseX;
+                        var10 = Canvas.localPlayer.pathY[0] + GraphicsObject.baseY;
+                        var18 = Interpreter.method1915(ClientPacket.field283, packetWriter.isaacCipher);
                         var18.packetBuffer.writeIntME(0);
-                        var18.packetBuffer.writeShortLE(var5);
-                        var18.packetBuffer.__ai_315(var3);
-                        var18.packetBuffer.writeShort(var4);
-                        packetWriter.__q_167(var18);
+                        var18.packetBuffer.writeShortLE(var10);
+                        var18.packetBuffer.method56(var4);
+                        var18.packetBuffer.writeShort(var9);
+                        packetWriter.method241(var18);
                      }
 
                      mouseWheelRotation = 0;
                   }
 
-                  if(rootWidgetGroup != -1) {
+                  if (rootWidgetGroup != -1) {
                      class231.method4517(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0);
                   }
 
                   ++cycleCntr;
 
-                  while(true) {
-                     Widget var25;
-                     Widget var36;
-                     ScriptEvent var38;
+                  while (true) {
+                     Widget var23;
+                     ScriptEvent var24;
+                     Widget var34;
                      do {
-                        var38 = (ScriptEvent)__client_oh.removeLast();
-                        if(var38 == null) {
-                           while(true) {
+                        var24 = (ScriptEvent)field147.removeLast();
+                        if (var24 == null) {
+                           while (true) {
                               do {
-                                 var38 = (ScriptEvent)__client_oc.removeLast();
-                                 if(var38 == null) {
-                                    while(true) {
+                                 var24 = (ScriptEvent)field148.removeLast();
+                                 if (var24 == null) {
+                                    while (true) {
                                        do {
-                                          var38 = (ScriptEvent)scriptEvents.removeLast();
-                                          if(var38 == null) {
-                                             this.__hi_139();
+                                          var24 = (ScriptEvent)scriptEvents.removeLast();
+                                          if (var24 == null) {
+                                             this.method86();
                                              WorldMapSectionType.method254();
-                                             if(clickedWidget != null) {
-                                                this.__jh_142();
+                                             if (clickedWidget != null) {
+                                                this.method88();
                                              }
 
-                                             PacketBufferNode var40;
-                                             if(DevicePcmPlayerProvider.dragInventoryWidget != null) {
+                                             PacketBufferNode var25;
+                                             if (DevicePcmPlayerProvider.dragInventoryWidget != null) {
                                                 class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
                                                 ++itemDragDuration;
-                                                if(MouseHandler.MouseHandler_currentButton == 0) {
-                                                   if(__client_jl) {
-                                                      if(UserComparator6.__fg_jh == DevicePcmPlayerProvider.dragInventoryWidget && dragItemSlotSource != dragItemSlotDestination) {
-                                                         Widget var39 = DevicePcmPlayerProvider.dragInventoryWidget;
-                                                         byte var33 = 0;
-                                                         if(__client_mb == 1 && var39.contentType == 206) {
-                                                            var33 = 1;
+                                                if (MouseHandler.MouseHandler_currentButton == 0) {
+                                                   if (field207) {
+                                                      if (UserComparator6.field937 == DevicePcmPlayerProvider.dragInventoryWidget && dragItemSlotSource != dragItemSlotDestination) {
+                                                         Widget var26 = DevicePcmPlayerProvider.dragInventoryWidget;
+                                                         byte var27 = 0;
+                                                         if (field136 == 1 && var26.contentType == 206) {
+                                                            var27 = 1;
                                                          }
 
-                                                         if(var39.itemIds[dragItemSlotDestination] <= 0) {
-                                                            var33 = 0;
+                                                         if (var26.itemIds[dragItemSlotDestination] <= 0) {
+                                                            var27 = 0;
                                                          }
 
-                                                         if(class168.method3461(class1.getWidgetClickMask(var39))) {
-                                                            var5 = dragItemSlotSource;
-                                                            var6 = dragItemSlotDestination;
-                                                            var39.itemIds[var6] = var39.itemIds[var5];
-                                                            var39.itemQuantities[var6] = var39.itemQuantities[var5];
-                                                            var39.itemIds[var5] = -1;
-                                                            var39.itemQuantities[var5] = 0;
-                                                         } else if(var33 == 1) {
-                                                            var5 = dragItemSlotSource;
-                                                            var6 = dragItemSlotDestination;
+                                                         if (class168.method3461(class1.getWidgetClickMask(var26))) {
+                                                            var10 = dragItemSlotSource;
+                                                            var11 = dragItemSlotDestination;
+                                                            var26.itemIds[var11] = var26.itemIds[var10];
+                                                            var26.itemQuantities[var11] = var26.itemQuantities[var10];
+                                                            var26.itemIds[var10] = -1;
+                                                            var26.itemQuantities[var10] = 0;
+                                                         } else if (var27 == 1) {
+                                                            var10 = dragItemSlotSource;
+                                                            var11 = dragItemSlotDestination;
 
-                                                            while(var5 != var6) {
-                                                               if(var5 > var6) {
-                                                                  var39.swapItems(var5 - 1, var5);
-                                                                  --var5;
-                                                               } else if(var5 < var6) {
-                                                                  var39.swapItems(var5 + 1, var5);
-                                                                  ++var5;
+                                                            while (var10 != var11) {
+                                                               if (var10 > var11) {
+                                                                  var26.swapItems(var10 - 1, var10);
+                                                                  --var10;
+                                                               } else if (var10 < var11) {
+                                                                  var26.swapItems(var10 + 1, var10);
+                                                                  ++var10;
                                                                }
                                                             }
                                                          } else {
-                                                            var39.swapItems(dragItemSlotDestination, dragItemSlotSource);
+                                                            var26.swapItems(dragItemSlotDestination, dragItemSlotSource);
                                                          }
 
-                                                         var40 = Interpreter.method1915(ClientPacket.__gs_ce, packetWriter.isaacCipher);
-                                                         var40.packetBuffer.writeShort(dragItemSlotDestination);
-                                                         var40.packetBuffer.writeShortLE(dragItemSlotSource);
-                                                         var40.packetBuffer.writeInt(DevicePcmPlayerProvider.dragInventoryWidget.id);
-                                                         var40.packetBuffer.__ai_315(var33);
-                                                         packetWriter.__q_167(var40);
+                                                         var25 = Interpreter.method1915(ClientPacket.field302, packetWriter.isaacCipher);
+                                                         var25.packetBuffer.writeShort(dragItemSlotDestination);
+                                                         var25.packetBuffer.writeShortLE(dragItemSlotSource);
+                                                         var25.packetBuffer.writeInt(DevicePcmPlayerProvider.dragInventoryWidget.id);
+                                                         var25.packetBuffer.method56(var27);
+                                                         packetWriter.method241(var25);
                                                       }
-                                                   } else if(this.shouldLeftClickOpenMenu()) {
-                                                      this.openMenu(__client_ja, __client_je);
-                                                   } else if(menuOptionsCount > 0) {
-                                                      var3 = __client_ja;
-                                                      var4 = __client_je;
-                                                      class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var3, var4);
+                                                   } else if (this.shouldLeftClickOpenMenu()) {
+                                                      this.openMenu(field205, field206);
+                                                   } else if (menuOptionsCount > 0) {
+                                                      var4 = field205;
+                                                      var9 = field206;
+                                                      class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var4, var9);
                                                       UnitPriceComparator.tempMenuAction = null;
                                                    }
 
-                                                   __client_ju = 10;
+                                                   field203 = 10;
                                                    MouseHandler.MouseHandler_lastButton = 0;
                                                    DevicePcmPlayerProvider.dragInventoryWidget = null;
-                                                } else if(itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > __client_ja + 5 || MouseHandler.MouseHandler_x < __client_ja - 5 || MouseHandler.MouseHandler_y > __client_je + 5 || MouseHandler.MouseHandler_y < __client_je - 5)) {
-                                                   __client_jl = true;
+                                                } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > field205 + 5 || MouseHandler.MouseHandler_x < field205 - 5 || MouseHandler.MouseHandler_y > field206 + 5 || MouseHandler.MouseHandler_y < field206 - 5)) {
+                                                   field207 = true;
                                                 }
                                              }
 
-                                             if(Scene.method3187()) {
-                                                var3 = Scene.Scene_selectedX;
-                                                var4 = Scene.Scene_selectedY;
-                                                var40 = Interpreter.method1915(ClientPacket.__gs_ct, packetWriter.isaacCipher);
-                                                var40.packetBuffer.writeByte(5);
-                                                var40.packetBuffer.__bo_322(var4 + GraphicsObject.baseY);
-                                                var40.packetBuffer.__bo_322(var3 + class50.baseX);
-                                                var40.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?(KeyHandler.KeyHandler_pressedKeys[81]?2:1):0);
-                                                packetWriter.__q_167(var40);
+                                             if (Scene.method3187()) {
+                                                var4 = Scene.Scene_selectedX;
+                                                var9 = Scene.Scene_selectedY;
+                                                var25 = Interpreter.method1915(ClientPacket.field318, packetWriter.isaacCipher);
+                                                var25.packetBuffer.writeByte(5);
+                                                var25.packetBuffer.method63(var9 + GraphicsObject.baseY);
+                                                var25.packetBuffer.method63(var4 + class50.baseX);
+                                                var25.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0);
+                                                packetWriter.method241(var25);
                                                 Scene.method3103();
                                                 mouseCrossX = MouseHandler.MouseHandler_lastPressedX;
                                                 mouseCrossY = MouseHandler.MouseHandler_lastPressedY;
                                                 mouseCrossColor = 1;
                                                 mouseCrossState = 0;
-                                                destinationX = var3;
-                                                destinationY = var4;
+                                                destinationX = var4;
+                                                destinationY = var9;
                                              }
 
-                                             if(var35 != Clock.mousedOverWidgetIf1) {
-                                                if(var35 != null) {
-                                                   class22.method295(var35);
+                                             if (var32 != Clock.mousedOverWidgetIf1) {
+                                                if (var32 != null) {
+                                                   class22.method295(var32);
                                                 }
 
-                                                if(Clock.mousedOverWidgetIf1 != null) {
+                                                if (Clock.mousedOverWidgetIf1 != null) {
                                                    class22.method295(Clock.mousedOverWidgetIf1);
                                                 }
                                              }
 
-                                             if(var32 != AccessFile.__dk_lm && __client_lb == __client_ls) {
-                                                if(var32 != null) {
-                                                   class22.method295(var32);
+                                             if (var33 != AccessFile.field8 && field218 == field219) {
+                                                if (var33 != null) {
+                                                   class22.method295(var33);
                                                 }
 
-                                                if(AccessFile.__dk_lm != null) {
-                                                   class22.method295(AccessFile.__dk_lm);
+                                                if (AccessFile.field8 != null) {
+                                                   class22.method295(AccessFile.field8);
                                                 }
                                              }
 
-                                             if(AccessFile.__dk_lm != null) {
-                                                if(__client_lb < __client_ls) {
-                                                   ++__client_lb;
-                                                   if(__client_ls == __client_lb) {
-                                                      class22.method295(AccessFile.__dk_lm);
+                                             if (AccessFile.field8 != null) {
+                                                if (field218 < field219) {
+                                                   ++field218;
+                                                   if (field219 == field218) {
+                                                      class22.method295(AccessFile.field8);
                                                    }
                                                 }
-                                             } else if(__client_lb > 0) {
-                                                --__client_lb;
+                                             } else if (field218 > 0) {
+                                                --field218;
                                              }
 
                                              class54.method1091();
-                                             if(isCameraLocked) {
-                                                var3 = class3.__w_qs * 128 + 64;
-                                                var4 = MusicPatchPcmStream.__hq_qg * 128 + 64;
-                                                var5 = class32.getTileHeight(var3, var4, SoundSystem.plane) - AbstractWorldMapIcon.__ak_qj;
-                                                if(WorldMapSection1.cameraX < var3) {
-                                                   WorldMapSection1.cameraX = (var3 - WorldMapSection1.cameraX) * class30.__ar_qw / 1000 + WorldMapSection1.cameraX + ClientPacket.__gs_qh;
-                                                   if(WorldMapSection1.cameraX > var3) {
-                                                      WorldMapSection1.cameraX = var3;
+                                             if (isCameraLocked) {
+                                                var4 = class3.field1146 * 128 + 64;
+                                                var9 = MusicPatchPcmStream.field602 * 128 + 64;
+                                                var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - AbstractWorldMapIcon.field4;
+                                                if (WorldMapSection1.cameraX < var4) {
+                                                   WorldMapSection1.cameraX = (var4 - WorldMapSection1.cameraX) * class30.field1148 / 1000 + WorldMapSection1.cameraX + ClientPacket.field221;
+                                                   if (WorldMapSection1.cameraX > var4) {
+                                                      WorldMapSection1.cameraX = var4;
                                                    }
                                                 }
 
-                                                if(WorldMapSection1.cameraX > var3) {
-                                                   WorldMapSection1.cameraX -= class30.__ar_qw * (WorldMapSection1.cameraX - var3) / 1000 + ClientPacket.__gs_qh;
-                                                   if(WorldMapSection1.cameraX < var3) {
-                                                      WorldMapSection1.cameraX = var3;
+                                                if (WorldMapSection1.cameraX > var4) {
+                                                   WorldMapSection1.cameraX -= class30.field1148 * (WorldMapSection1.cameraX - var4) / 1000 + ClientPacket.field221;
+                                                   if (WorldMapSection1.cameraX < var4) {
+                                                      WorldMapSection1.cameraX = var4;
                                                    }
                                                 }
 
-                                                if(GrandExchangeEvents.cameraY < var5) {
-                                                   GrandExchangeEvents.cameraY = (var5 - GrandExchangeEvents.cameraY) * class30.__ar_qw / 1000 + GrandExchangeEvents.cameraY + ClientPacket.__gs_qh;
-                                                   if(GrandExchangeEvents.cameraY > var5) {
-                                                      GrandExchangeEvents.cameraY = var5;
+                                                if (GrandExchangeEvents.cameraY < var10) {
+                                                   GrandExchangeEvents.cameraY = (var10 - GrandExchangeEvents.cameraY) * class30.field1148 / 1000 + GrandExchangeEvents.cameraY + ClientPacket.field221;
+                                                   if (GrandExchangeEvents.cameraY > var10) {
+                                                      GrandExchangeEvents.cameraY = var10;
                                                    }
                                                 }
 
-                                                if(GrandExchangeEvents.cameraY > var5) {
-                                                   GrandExchangeEvents.cameraY -= class30.__ar_qw * (GrandExchangeEvents.cameraY - var5) / 1000 + ClientPacket.__gs_qh;
-                                                   if(GrandExchangeEvents.cameraY < var5) {
-                                                      GrandExchangeEvents.cameraY = var5;
+                                                if (GrandExchangeEvents.cameraY > var10) {
+                                                   GrandExchangeEvents.cameraY -= class30.field1148 * (GrandExchangeEvents.cameraY - var10) / 1000 + ClientPacket.field221;
+                                                   if (GrandExchangeEvents.cameraY < var10) {
+                                                      GrandExchangeEvents.cameraY = var10;
                                                    }
                                                 }
 
-                                                if(class11.cameraZ < var4) {
-                                                   class11.cameraZ = (var4 - class11.cameraZ) * class30.__ar_qw / 1000 + class11.cameraZ + ClientPacket.__gs_qh;
-                                                   if(class11.cameraZ > var4) {
-                                                      class11.cameraZ = var4;
+                                                if (class11.cameraZ < var9) {
+                                                   class11.cameraZ = (var9 - class11.cameraZ) * class30.field1148 / 1000 + class11.cameraZ + ClientPacket.field221;
+                                                   if (class11.cameraZ > var9) {
+                                                      class11.cameraZ = var9;
                                                    }
                                                 }
 
-                                                if(class11.cameraZ > var4) {
-                                                   class11.cameraZ -= class30.__ar_qw * (class11.cameraZ - var4) / 1000 + ClientPacket.__gs_qh;
-                                                   if(class11.cameraZ < var4) {
-                                                      class11.cameraZ = var4;
+                                                if (class11.cameraZ > var9) {
+                                                   class11.cameraZ -= class30.field1148 * (class11.cameraZ - var9) / 1000 + ClientPacket.field221;
+                                                   if (class11.cameraZ < var9) {
+                                                      class11.cameraZ = var9;
                                                    }
                                                 }
 
-                                                var3 = GrandExchangeOffer.__x_rg * 128 + 64;
-                                                var4 = KeyHandler.__an_ra * 128 + 64;
-                                                var5 = class32.getTileHeight(var3, var4, SoundSystem.plane) - IndexStoreAction.__ik_rt;
-                                                var6 = var3 - WorldMapSection1.cameraX;
-                                                var7 = var5 - GrandExchangeEvents.cameraY;
-                                                var8 = var4 - class11.cameraZ;
-                                                var9 = (int)Math.sqrt((double)(var8 * var8 + var6 * var6));
-                                                var10 = (int)(Math.atan2((double)var7, (double)var9) * 325.949D) & 2047;
-                                                var11 = (int)(Math.atan2((double)var6, (double)var8) * -325.949D) & 2047;
-                                                if(var10 < 128) {
-                                                   var10 = 128;
+                                                var4 = GrandExchangeOffer.field376 * 128 + 64;
+                                                var9 = KeyHandler.field445 * 128 + 64;
+                                                var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - IndexStoreAction.field410;
+                                                var11 = var4 - WorldMapSection1.cameraX;
+                                                var12 = var10 - GrandExchangeEvents.cameraY;
+                                                var13 = var9 - class11.cameraZ;
+                                                var14 = (int)Math.sqrt((double)(var13 * var13 + var11 * var11));
+                                                var15 = (int)(Math.atan2((double)var12, (double)var14) * 325.949D) & 2047;
+                                                var16 = (int)(Math.atan2((double)var11, (double)var13) * -325.949D) & 2047;
+                                                if (var15 < 128) {
+                                                   var15 = 128;
                                                 }
 
-                                                if(var10 > 383) {
-                                                   var10 = 383;
+                                                if (var15 > 383) {
+                                                   var15 = 383;
                                                 }
 
-                                                if(WorldMapIcon1.cameraPitch < var10) {
-                                                   WorldMapIcon1.cameraPitch = (var10 - WorldMapIcon1.cameraPitch) * class171.__fo_ro / 1000 + WorldMapIcon1.cameraPitch + VertexNormal.__dq_rq;
-                                                   if(WorldMapIcon1.cameraPitch > var10) {
-                                                      WorldMapIcon1.cameraPitch = var10;
+                                                if (WorldMapIcon1.cameraPitch < var15) {
+                                                   WorldMapIcon1.cameraPitch = (var15 - WorldMapIcon1.cameraPitch) * class171.field1116 / 1000 + WorldMapIcon1.cameraPitch + VertexNormal.field946;
+                                                   if (WorldMapIcon1.cameraPitch > var15) {
+                                                      WorldMapIcon1.cameraPitch = var15;
                                                    }
                                                 }
 
-                                                if(WorldMapIcon1.cameraPitch > var10) {
-                                                   WorldMapIcon1.cameraPitch -= class171.__fo_ro * (WorldMapIcon1.cameraPitch - var10) / 1000 + VertexNormal.__dq_rq;
-                                                   if(WorldMapIcon1.cameraPitch < var10) {
-                                                      WorldMapIcon1.cameraPitch = var10;
+                                                if (WorldMapIcon1.cameraPitch > var15) {
+                                                   WorldMapIcon1.cameraPitch -= class171.field1116 * (WorldMapIcon1.cameraPitch - var15) / 1000 + VertexNormal.field946;
+                                                   if (WorldMapIcon1.cameraPitch < var15) {
+                                                      WorldMapIcon1.cameraPitch = var15;
                                                    }
                                                 }
 
-                                                var12 = var11 - MusicPatchNode.cameraYaw;
-                                                if(var12 > 1024) {
-                                                   var12 -= 2048;
+                                                var17 = var16 - MusicPatchNode.cameraYaw;
+                                                if (var17 > 1024) {
+                                                   var17 -= 2048;
                                                 }
 
-                                                if(var12 < -1024) {
-                                                   var12 += 2048;
+                                                if (var17 < -1024) {
+                                                   var17 += 2048;
                                                 }
 
-                                                if(var12 > 0) {
-                                                   MusicPatchNode.cameraYaw = MusicPatchNode.cameraYaw + VertexNormal.__dq_rq + var12 * class171.__fo_ro / 1000;
+                                                if (var17 > 0) {
+                                                   MusicPatchNode.cameraYaw = MusicPatchNode.cameraYaw + VertexNormal.field946 + var17 * class171.field1116 / 1000;
                                                    MusicPatchNode.cameraYaw &= 2047;
                                                 }
 
-                                                if(var12 < 0) {
-                                                   MusicPatchNode.cameraYaw -= VertexNormal.__dq_rq + -var12 * class171.__fo_ro / 1000;
+                                                if (var17 < 0) {
+                                                   MusicPatchNode.cameraYaw -= VertexNormal.field946 + -var17 * class171.field1116 / 1000;
                                                    MusicPatchNode.cameraYaw &= 2047;
                                                 }
 
-                                                int var26 = var11 - MusicPatchNode.cameraYaw;
-                                                if(var26 > 1024) {
-                                                   var26 -= 2048;
+                                                int var35 = var16 - MusicPatchNode.cameraYaw;
+                                                if (var35 > 1024) {
+                                                   var35 -= 2048;
                                                 }
 
-                                                if(var26 < -1024) {
-                                                   var26 += 2048;
+                                                if (var35 < -1024) {
+                                                   var35 += 2048;
                                                 }
 
-                                                if(var26 < 0 && var12 > 0 || var26 > 0 && var12 < 0) {
-                                                   MusicPatchNode.cameraYaw = var11;
+                                                if (var35 < 0 && var17 > 0 || var35 > 0 && var17 < 0) {
+                                                   MusicPatchNode.cameraYaw = var16;
                                                 }
                                              }
 
-                                             for(var3 = 0; var3 < 5; ++var3) {
-                                                ++__client_rk[var3];
+                                             for (var4 = 0; var4 < 5; ++var4) {
+                                                int var10002 = field144[var4]++;
                                              }
 
                                              class196.varcs.tryWrite();
-                                             var3 = class22.method297();
-                                             var4 = KeyHandler.KeyHandler_idleCycles;
-                                             if(var3 > 15000 && var4 > 15000) {
-                                                __client_fd = 250;
+                                             var4 = class22.method297();
+                                             var9 = KeyHandler.KeyHandler_idleCycles;
+                                             if (var4 > 15000 && var9 > 15000) {
+                                                field175 = 250;
                                                 MouseHandler.MouseHandler_idleCycles = 14500;
-                                                var18 = Interpreter.method1915(ClientPacket.__gs_ax, packetWriter.isaacCipher);
-                                                packetWriter.__q_167(var18);
+                                                var18 = Interpreter.method1915(ClientPacket.field271, packetWriter.isaacCipher);
+                                                packetWriter.method241(var18);
                                              }
 
-                                             WorldMapArea.friendSystem.__w_154();
-                                             ++packetWriter.__d;
-                                             if(packetWriter.__d > 50) {
-                                                var18 = Interpreter.method1915(ClientPacket.__gs_c, packetWriter.isaacCipher);
-                                                packetWriter.__q_167(var18);
+                                             WorldMapArea.friendSystem.method102();
+                                             ++packetWriter.field675;
+                                             if (packetWriter.field675 > 50) {
+                                                var18 = Interpreter.method1915(ClientPacket.field244, packetWriter.isaacCipher);
+                                                packetWriter.method241(var18);
                                              }
 
                                              try {
-                                                packetWriter.__f_166();
-                                             } catch (IOException var27) {
+                                                packetWriter.method240();
+                                             } catch (IOException var28) {
                                                 class48.method868();
                                              }
 
                                              return;
                                           }
 
-                                          var36 = var38.widget;
-                                          if(var36.childIndex < 0) {
+                                          var23 = var24.widget;
+                                          if (var23.childIndex < 0) {
                                              break;
                                           }
 
-                                          var25 = Huffman.getWidget(var36.parentId);
-                                       } while(var25 == null || var25.children == null || var36.childIndex >= var25.children.length || var36 != var25.children[var36.childIndex]);
+                                          var34 = Huffman.getWidget(var23.parentId);
+                                       } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]);
 
-                                       AbstractIndexCache.runScript(var38);
+                                       AbstractIndexCache.runScript(var24);
                                     }
                                  }
 
-                                 var36 = var38.widget;
-                                 if(var36.childIndex < 0) {
+                                 var23 = var24.widget;
+                                 if (var23.childIndex < 0) {
                                     break;
                                  }
 
-                                 var25 = Huffman.getWidget(var36.parentId);
-                              } while(var25 == null || var25.children == null || var36.childIndex >= var25.children.length || var36 != var25.children[var36.childIndex]);
+                                 var34 = Huffman.getWidget(var23.parentId);
+                              } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]);
 
-                              AbstractIndexCache.runScript(var38);
+                              AbstractIndexCache.runScript(var24);
                            }
                         }
 
-                        var36 = var38.widget;
-                        if(var36.childIndex < 0) {
+                        var23 = var24.widget;
+                        if (var23.childIndex < 0) {
                            break;
                         }
 
-                        var25 = Huffman.getWidget(var36.parentId);
-                     } while(var25 == null || var25.children == null || var36.childIndex >= var25.children.length || var36 != var25.children[var36.childIndex]);
+                        var34 = Huffman.getWidget(var23.parentId);
+                     } while(var34 == null || var34.children == null || var23.childIndex >= var34.children.length || var23 != var34.children[var23.childIndex]);
 
-                     AbstractIndexCache.runScript(var38);
+                     AbstractIndexCache.runScript(var24);
                   }
                }
 
-               var30 = Interpreter.method1915(ClientPacket.__gs_cw, packetWriter.isaacCipher);
-               var30.packetBuffer.writeByte(0);
-               var3 = var30.packetBuffer.index;
-               WorldMapLabel.method443(var30.packetBuffer);
-               var30.packetBuffer.__h_300(var30.packetBuffer.index - var3);
-               packetWriter.__q_167(var30);
+               var5 = Interpreter.method1915(ClientPacket.field313, packetWriter.isaacCipher);
+               var5.packetBuffer.writeByte(0);
+               var4 = var5.packetBuffer.index;
+               WorldMapLabel.method443(var5.packetBuffer);
+               var5.packetBuffer.method41(var5.packetBuffer.index - var4);
+               packetWriter.method241(var5);
             }
          }
       }
+
    }
 
    @ObfuscatedName("ge")
@@ -4516,24 +4264,23 @@ public final class Client extends GameShell implements Usernamed {
       signature = "(I)V",
       garbageValue = "-1792846917"
    )
-   void __ge_137() {
+   void method84() {
       int var1 = SoundCache.canvasWidth;
       int var2 = Huffman.canvasHeight;
-      if(super.contentWidth < var1) {
+      if (super.contentWidth < var1) {
          var1 = super.contentWidth;
       }
 
-      if(super.contentHeight < var2) {
+      if (super.contentHeight < var2) {
          var2 = super.contentHeight;
       }
 
-      if(ReflectionCheck.clientPreferences != null) {
+      if (ReflectionCheck.clientPreferences != null) {
          try {
             Client var3 = TextureProvider.client;
-            Object[] var4 = new Object[]{Integer.valueOf(SpotAnimationDefinition.method4822())};
+            Object[] var4 = new Object[]{SpotAnimationDefinition.method4822()};
             JSObject.getWindow(var3).call("resize", var4);
          } catch (Throwable var5) {
-            ;
          }
       }
 
@@ -4546,36 +4293,36 @@ public final class Client extends GameShell implements Usernamed {
    )
    @Export("drawLoggedIn")
    final void drawLoggedIn() {
-      if(rootWidgetGroup != -1) {
+      if (rootWidgetGroup != -1) {
          ClientPreferences.method1809(rootWidgetGroup);
       }
 
       int var1;
-      for(var1 = 0; var1 < rootWidgetCount; ++var1) {
-         if(__client_od[var1]) {
-            __client_ot[var1] = true;
+      for (var1 = 0; var1 < rootWidgetCount; ++var1) {
+         if (field100[var1]) {
+            field102[var1] = true;
          }
 
-         __client_oq[var1] = __client_od[var1];
-         __client_od[var1] = false;
+         field101[var1] = field100[var1];
+         field100[var1] = false;
       }
 
-      __client_oo = cycle;
-      __client_lq = -1;
-      __client_ln = -1;
-      UserComparator6.__fg_jh = null;
-      if(rootWidgetGroup != -1) {
+      field98 = cycle;
+      field216 = -1;
+      field217 = -1;
+      UserComparator6.field937 = null;
+      if (rootWidgetGroup != -1) {
          rootWidgetCount = 0;
          Interpreter.drawWidgets(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1);
       }
 
       Rasterizer2D.Rasterizer2D_resetClip();
-      if(showMouseCross) {
-         if(mouseCrossColor == 1) {
+      if (showMouseCross) {
+         if (mouseCrossColor == 1) {
             KeyHandler.crossSprites[mouseCrossState / 100].drawAt2(mouseCrossX - 8, mouseCrossY - 8);
          }
 
-         if(mouseCrossColor == 2) {
+         if (mouseCrossColor == 2) {
             KeyHandler.crossSprites[mouseCrossState / 100 + 4].drawAt2(mouseCrossX - 8, mouseCrossY - 8);
          }
       }
@@ -4583,66 +4330,66 @@ public final class Client extends GameShell implements Usernamed {
       int var2;
       int var3;
       int var4;
+      int var5;
       int var6;
       int var7;
-      int var8;
-      if(!isMenuOpen) {
-         if(__client_lq != -1) {
-            class39.drawMenuActionTextAt(__client_lq, __client_ln);
+      if (!isMenuOpen) {
+         if (field216 != -1) {
+            class39.drawMenuActionTextAt(field216, field217);
          }
       } else {
          var1 = class25.menuX;
          var2 = GameShell.menuY;
          var3 = class214.menuWidth;
          var4 = AbstractWorldMapIcon.menuHeight;
-         int var5 = 0x5d5447;
-         Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5);
+         int var8 = 6116423;
+         Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var8);
          Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0);
          Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0);
-         class2.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1);
-         var6 = MouseHandler.MouseHandler_x;
-         var7 = MouseHandler.MouseHandler_y;
+         class2.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var8, -1);
+         var5 = MouseHandler.MouseHandler_x;
+         var6 = MouseHandler.MouseHandler_y;
 
          int var9;
          int var10;
-         for(var8 = 0; var8 < menuOptionsCount; ++var8) {
-            var9 = var2 + (menuOptionsCount - 1 - var8) * 15 + 31;
-            var10 = 0xffffff;
-            if(var6 > var1 && var6 < var3 + var1 && var7 > var9 - 13 && var7 < var9 + 3) {
-               var10 = 0xffff00;
+         for (var7 = 0; var7 < menuOptionsCount; ++var7) {
+            var9 = var2 + (menuOptionsCount - 1 - var7) * 15 + 31;
+            var10 = 16777215;
+            if (var5 > var1 && var5 < var3 + var1 && var6 > var9 - 13 && var6 < var9 + 3) {
+               var10 = 16776960;
             }
 
             Font var11 = class2.fontBold12;
             String var12;
-            if(var8 < 0) {
+            if (var7 < 0) {
                var12 = "";
-            } else if(menuTargetNames[var8].length() > 0) {
-               var12 = menuActions[var8] + " " + menuTargetNames[var8];
+            } else if (menuTargetNames[var7].length() > 0) {
+               var12 = menuActions[var7] + " " + menuTargetNames[var7];
             } else {
-               var12 = menuActions[var8];
+               var12 = menuActions[var7];
             }
 
             var11.draw(var12, var1 + 3, var9, var10, 0);
          }
 
-         var8 = class25.menuX;
+         var7 = class25.menuX;
          var9 = GameShell.menuY;
          var10 = class214.menuWidth;
-         int var13 = AbstractWorldMapIcon.menuHeight;
+         int var15 = AbstractWorldMapIcon.menuHeight;
 
-         for(int var14 = 0; var14 < rootWidgetCount; ++var14) {
-            if(rootWidgetXs[var14] + rootWidgetWidths[var14] > var8 && rootWidgetXs[var14] < var8 + var10 && rootWidgetYs[var14] + rootWidgetHeights[var14] > var9 && rootWidgetYs[var14] < var9 + var13) {
-               __client_ot[var14] = true;
+         for (int var18 = 0; var18 < rootWidgetCount; ++var18) {
+            if (rootWidgetXs[var18] + rootWidgetWidths[var18] > var7 && rootWidgetXs[var18] < var7 + var10 && rootWidgetYs[var18] + rootWidgetHeights[var18] > var9 && rootWidgetYs[var18] < var9 + var15) {
+               field102[var18] = true;
             }
          }
       }
 
-      if(gameDrawingMode == 3) {
-         for(var1 = 0; var1 < rootWidgetCount; ++var1) {
-            if(__client_oq[var1]) {
-               Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff00ff, 128);
-            } else if(__client_ot[var1]) {
-               Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff0000, 128);
+      if (gameDrawingMode == 3) {
+         for (var1 = 0; var1 < rootWidgetCount; ++var1) {
+            if (field101[var1]) {
+               Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128);
+            } else if (field102[var1]) {
+               Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128);
             }
          }
       }
@@ -4650,82 +4397,85 @@ public final class Client extends GameShell implements Usernamed {
       var1 = SoundSystem.plane;
       var2 = Canvas.localPlayer.x;
       var3 = Canvas.localPlayer.y;
-      var4 = __client_gy;
+      var4 = field183;
 
-      for(ObjectSound var15 = (ObjectSound)ObjectSound.objectSounds.last(); var15 != null; var15 = (ObjectSound)ObjectSound.objectSounds.previous()) {
-         if(var15.soundEffectId != -1 || var15.soundEffectIds != null) {
-            var6 = 0;
-            if(var2 > var15.__o) {
-               var6 += var2 - var15.__o;
-            } else if(var2 < var15.__q) {
-               var6 += var15.__q - var2;
+      for (ObjectSound var13 = (ObjectSound)ObjectSound.objectSounds.last(); var13 != null; var13 = (ObjectSound)ObjectSound.objectSounds.previous()) {
+         if (var13.soundEffectId != -1 || var13.soundEffectIds != null) {
+            var5 = 0;
+            if (var2 > var13.field650) {
+               var5 += var2 - var13.field650;
+            } else if (var2 < var13.field648) {
+               var5 += var13.field648 - var2;
             }
 
-            if(var3 > var15.__u) {
-               var6 += var3 - var15.__u;
-            } else if(var3 < var15.__w) {
-               var6 += var15.__w - var3;
+            if (var3 > var13.field651) {
+               var5 += var3 - var13.field651;
+            } else if (var3 < var13.field649) {
+               var5 += var13.field649 - var3;
             }
 
-            if(var6 - 64 <= var15.__g && __client_qc != 0 && var1 == var15.__f) {
-               var6 -= 64;
-               if(var6 < 0) {
-                  var6 = 0;
+            if (var5 - 64 <= var13.field652 && field115 != 0 && var1 == var13.field647) {
+               var5 -= 64;
+               if (var5 < 0) {
+                  var5 = 0;
                }
 
-               var7 = (var15.__g - var6) * __client_qc / var15.__g;
-               Object var10000;
-               if(var15.stream1 == null) {
-                  if(var15.soundEffectId >= 0) {
-                     var10000 = null;
-                     SoundEffect var16 = SoundEffect.readSoundEffect(class25.indexCache4, var15.soundEffectId, 0);
-                     if(var16 != null) {
-                        RawSound var17 = var16.toRawSound().resample(MilliClock.decimator);
-                        RawPcmStream var18 = RawPcmStream.createRawPcmStream(var17, 100, var7);
-                        var18.setNumLoops(-1);
-                        TaskHandler.pcmStreamMixer.addSubStream(var18);
-                        var15.stream1 = var18;
+               var6 = (var13.field652 - var5) * field115 / var13.field652;
+               Object var14;
+               SoundEffect var16;
+               RawSound var17;
+               RawPcmStream var19;
+               if (var13.stream1 == null) {
+                  if (var13.soundEffectId >= 0) {
+                     var14 = null;
+                     var16 = SoundEffect.readSoundEffect(class25.indexCache4, var13.soundEffectId, 0);
+                     if (var16 != null) {
+                        var17 = var16.toRawSound().resample(MilliClock.decimator);
+                        var19 = RawPcmStream.createRawPcmStream(var17, 100, var6);
+                        var19.setNumLoops(-1);
+                        TaskHandler.pcmStreamMixer.addSubStream(var19);
+                        var13.stream1 = var19;
                      }
                   }
                } else {
-                  var15.stream1.__a_182(var7);
+                  var13.stream1.method265(var6);
                }
 
-               if(var15.stream2 == null) {
-                  if(var15.soundEffectIds != null && (var15.__n -= var4) <= 0) {
-                     var8 = (int)(Math.random() * (double)var15.soundEffectIds.length);
-                     var10000 = null;
-                     SoundEffect var20 = SoundEffect.readSoundEffect(class25.indexCache4, var15.soundEffectIds[var8], 0);
-                     if(var20 != null) {
-                        RawSound var21 = var20.toRawSound().resample(MilliClock.decimator);
-                        RawPcmStream var19 = RawPcmStream.createRawPcmStream(var21, 100, var7);
+               if (var13.stream2 == null) {
+                  if (var13.soundEffectIds != null && (var13.field655 -= var4) <= 0) {
+                     var7 = (int)(Math.random() * (double)var13.soundEffectIds.length);
+                     var14 = null;
+                     var16 = SoundEffect.readSoundEffect(class25.indexCache4, var13.soundEffectIds[var7], 0);
+                     if (var16 != null) {
+                        var17 = var16.toRawSound().resample(MilliClock.decimator);
+                        var19 = RawPcmStream.createRawPcmStream(var17, 100, var6);
                         var19.setNumLoops(0);
                         TaskHandler.pcmStreamMixer.addSubStream(var19);
-                        var15.stream2 = var19;
-                        var15.__n = var15.__x + (int)(Math.random() * (double)(var15.__d - var15.__x));
+                        var13.stream2 = var19;
+                        var13.field655 = var13.field653 + (int)(Math.random() * (double)(var13.field654 - var13.field653));
                      }
                   }
                } else {
-                  var15.stream2.__a_182(var7);
-                  if(!var15.stream2.hasNext()) {
-                     var15.stream2 = null;
+                  var13.stream2.method265(var6);
+                  if (!var13.stream2.hasNext()) {
+                     var13.stream2 = null;
                   }
                }
             } else {
-               if(var15.stream1 != null) {
-                  TaskHandler.pcmStreamMixer.removeSubStream(var15.stream1);
-                  var15.stream1 = null;
+               if (var13.stream1 != null) {
+                  TaskHandler.pcmStreamMixer.removeSubStream(var13.stream1);
+                  var13.stream1 = null;
                }
 
-               if(var15.stream2 != null) {
-                  TaskHandler.pcmStreamMixer.removeSubStream(var15.stream2);
-                  var15.stream2 = null;
+               if (var13.stream2 != null) {
+                  TaskHandler.pcmStreamMixer.removeSubStream(var13.stream2);
+                  var13.stream2 = null;
                }
             }
          }
       }
 
-      __client_gy = 0;
+      field183 = 0;
    }
 
    @ObfuscatedName("hg")
@@ -4733,50 +4483,50 @@ public final class Client extends GameShell implements Usernamed {
       signature = "(Lcl;I)Z",
       garbageValue = "1488446149"
    )
-   final boolean __hg_138(PacketWriter var1) {
+   final boolean method85(PacketWriter var1) {
       AbstractSocket var2 = var1.getSocket();
       PacketBuffer var3 = var1.packetBuffer;
-      if(var2 == null) {
+      if (var2 == null) {
          return false;
       } else {
-         String var17;
-         int var18;
+         String var4;
+         int var5;
          try {
-            int var5;
-            if(var1.serverPacket0 == null) {
-               if(var1.__e) {
-                  if(!var2.isAvailable(1)) {
+            int var6;
+            if (var1.serverPacket0 == null) {
+               if (var1.field673) {
+                  if (!var2.isAvailable(1)) {
                      return false;
                   }
 
                   var2.read(var1.packetBuffer.array, 0, 1);
-                  var1.__x = 0;
-                  var1.__e = false;
+                  var1.field674 = 0;
+                  var1.field673 = false;
                }
 
                var3.index = 0;
-               if(var3.__ig_334()) {
-                  if(!var2.isAvailable(1)) {
+               if (var3.method236()) {
+                  if (!var2.isAvailable(1)) {
                      return false;
                   }
 
                   var2.read(var1.packetBuffer.array, 1, 1);
-                  var1.__x = 0;
+                  var1.field674 = 0;
                }
 
-               var1.__e = true;
-               ServerPacket[] var4 = class27.method429();
-               var5 = var3.readSmartByteShortIsaac();
-               if(var5 < 0 || var5 >= var4.length) {
-                  throw new IOException(var5 + " " + var3.index);
+               var1.field673 = true;
+               ServerPacket[] var7 = class27.method429();
+               var6 = var3.readSmartByteShortIsaac();
+               if (var6 < 0 || var6 >= var7.length) {
+                  throw new IOException(var6 + " " + var3.index);
                }
 
-               var1.serverPacket0 = var4[var5];
+               var1.serverPacket0 = var7[var6];
                var1.serverPacket0Length = var1.serverPacket0.length;
             }
 
-            if(var1.serverPacket0Length == -1) {
-               if(!var2.isAvailable(1)) {
+            if (var1.serverPacket0Length == -1) {
+               if (!var2.isAvailable(1)) {
                   return false;
                }
 
@@ -4784,61 +4534,61 @@ public final class Client extends GameShell implements Usernamed {
                var1.serverPacket0Length = var3.array[0] & 255;
             }
 
-            if(var1.serverPacket0Length == -2) {
-               if(!var2.isAvailable(2)) {
+            if (var1.serverPacket0Length == -2) {
+               if (!var2.isAvailable(2)) {
                   return false;
                }
 
                var1.getSocket().read(var3.array, 0, 2);
                var3.index = 0;
-               var1.serverPacket0Length = var3.__ag_302();
+               var1.serverPacket0Length = var3.method43();
             }
 
-            if(!var2.isAvailable(var1.serverPacket0Length)) {
+            if (!var2.isAvailable(var1.serverPacket0Length)) {
                return false;
             }
 
             var3.index = 0;
             var2.read(var3.array, 0, var1.serverPacket0Length);
-            var1.__x = 0;
-            timer.__m_453();
-            var1.__i = var1.__n;
-            var1.__n = var1.__k;
-            var1.__k = var1.serverPacket0;
-            if(ServerPacket.__ge_ax == var1.serverPacket0) {
+            var1.field674 = 0;
+            timer.method329();
+            var1.field678 = var1.field677;
+            var1.field677 = var1.field676;
+            var1.field676 = var1.serverPacket0;
+            if (ServerPacket.field838 == var1.serverPacket0) {
                class16.method189(class190.field2344);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_be == var1.serverPacket0) {
+            if (ServerPacket.field864 == var1.serverPacket0) {
                isCameraLocked = true;
-               class3.__w_qs = var3.readUnsignedByte();
-               MusicPatchPcmStream.__hq_qg = var3.readUnsignedByte();
-               AbstractWorldMapIcon.__ak_qj = var3.__ag_302();
-               ClientPacket.__gs_qh = var3.readUnsignedByte();
-               class30.__ar_qw = var3.readUnsignedByte();
-               if(class30.__ar_qw >= 100) {
-                  WorldMapSection1.cameraX = class3.__w_qs * 128 + 64;
-                  class11.cameraZ = MusicPatchPcmStream.__hq_qg * 128 + 64;
-                  GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.__ak_qj;
+               class3.field1146 = var3.readUnsignedByte();
+               MusicPatchPcmStream.field602 = var3.readUnsignedByte();
+               AbstractWorldMapIcon.field4 = var3.method43();
+               ClientPacket.field221 = var3.readUnsignedByte();
+               class30.field1148 = var3.readUnsignedByte();
+               if (class30.field1148 >= 100) {
+                  WorldMapSection1.cameraX = class3.field1146 * 128 + 64;
+                  class11.cameraZ = MusicPatchPcmStream.field602 * 128 + 64;
+                  GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.field4;
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            int var16;
-            if(ServerPacket.__ge_aj == var1.serverPacket0) {
-               for(var16 = 0; var16 < players.length; ++var16) {
-                  if(players[var16] != null) {
-                     players[var16].sequence = -1;
+            int var37;
+            if (ServerPacket.field817 == var1.serverPacket0) {
+               for (var37 = 0; var37 < players.length; ++var37) {
+                  if (players[var37] != null) {
+                     players[var37].sequence = -1;
                   }
                }
 
-               for(var16 = 0; var16 < npcs.length; ++var16) {
-                  if(npcs[var16] != null) {
-                     npcs[var16].sequence = -1;
+               for (var37 = 0; var37 < npcs.length; ++var37) {
+                  if (npcs[var37] != null) {
+                     npcs[var37].sequence = -1;
                   }
                }
 
@@ -4846,300 +4596,300 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_s == var1.serverPacket0) {
-               Canvas.__ao_gk = var3.__bq_318();
-               WorldMapSection3.__p_go = var3.readUnsignedByteNegate();
+            if (ServerPacket.field806 == var1.serverPacket0) {
+               Canvas.field95 = var3.method59();
+               WorldMapSection3.field1089 = var3.readUnsignedByteNegate();
 
-               while(var3.index < var1.serverPacket0Length) {
-                  var16 = var3.readUnsignedByte();
-                  class190 var56 = RunException.method3430()[var16];
-                  class16.method189(var56);
+               while (var3.index < var1.serverPacket0Length) {
+                  var37 = var3.readUnsignedByte();
+                  class190 var38 = RunException.method3430()[var37];
+                  class16.method189(var38);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            Widget var41;
-            if(ServerPacket.__ge_bx == var1.serverPacket0) {
-               var16 = var3.__aq_303();
-               var5 = var3.__bf_332();
-               var41 = Huffman.getWidget(var5);
-               if(var16 != var41.sequenceId || var16 == -1) {
-                  var41.sequenceId = var16;
-                  var41.modelFrame = 0;
-                  var41.modelFrameCycle = 0;
-                  class22.method295(var41);
+            Widget var8;
+            if (ServerPacket.field850 == var1.serverPacket0) {
+               var37 = var3.method44();
+               var6 = var3.method73();
+               var8 = Huffman.getWidget(var6);
+               if (var37 != var8.sequenceId || var37 == -1) {
+                  var8.sequenceId = var37;
+                  var8.modelFrame = 0;
+                  var8.modelFrameCycle = 0;
+                  class22.method295(var8);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            Widget var52;
-            if(ServerPacket.__ge_ar == var1.serverPacket0) {
-               var16 = var3.__bf_332();
-               var52 = Huffman.getWidget(var16);
-               var52.modelType = 3;
-               var52.modelId = Canvas.localPlayer.appearance.getChatHeadId();
-               class22.method295(var52);
+            Widget var9;
+            if (ServerPacket.field819 == var1.serverPacket0) {
+               var37 = var3.method73();
+               var9 = Huffman.getWidget(var37);
+               var9.modelType = 3;
+               var9.modelId = Canvas.localPlayer.appearance.getChatHeadId();
+               class22.method295(var9);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_f == var1.serverPacket0) {
+            if (ServerPacket.field790 == var1.serverPacket0) {
                TextureProvider.method2773();
                var1.serverPacket0 = null;
                return false;
             }
 
-            if(ServerPacket.__ge_l == var1.serverPacket0) {
-               var16 = var3.__bp_331();
-               var52 = Huffman.getWidget(var16);
+            if (ServerPacket.field796 == var1.serverPacket0) {
+               var37 = var3.method72();
+               var9 = Huffman.getWidget(var37);
 
-               for(var18 = 0; var18 < var52.itemIds.length; ++var18) {
-                  var52.itemIds[var18] = -1;
-                  var52.itemIds[var18] = 0;
+               for (var5 = 0; var5 < var9.itemIds.length; ++var5) {
+                  var9.itemIds[var5] = -1;
+                  var9.itemIds[var5] = 0;
                }
 
-               class22.method295(var52);
+               class22.method295(var9);
                var1.serverPacket0 = null;
                return true;
             }
 
-            int var7;
-            int var8;
-            int var9;
             int var10;
-            if(ServerPacket.__ge_bg == var1.serverPacket0) {
-               var16 = var3.readInt();
-               var5 = var3.__ag_302();
-               if(var16 < -70000) {
-                  var5 += 32768;
+            int var11;
+            int var12;
+            int var13;
+            if (ServerPacket.field859 == var1.serverPacket0) {
+               var37 = var3.readInt();
+               var6 = var3.method43();
+               if (var37 < -70000) {
+                  var6 += 32768;
                }
 
-               if(var16 >= 0) {
-                  var41 = Huffman.getWidget(var16);
+               if (var37 >= 0) {
+                  var8 = Huffman.getWidget(var37);
                } else {
-                  var41 = null;
+                  var8 = null;
                }
 
-               if(var41 != null) {
-                  for(var7 = 0; var7 < var41.itemIds.length; ++var7) {
-                     var41.itemIds[var7] = 0;
-                     var41.itemQuantities[var7] = 0;
+               if (var8 != null) {
+                  for (var10 = 0; var10 < var8.itemIds.length; ++var10) {
+                     var8.itemIds[var10] = 0;
+                     var8.itemQuantities[var10] = 0;
                   }
                }
 
-               PlayerType.clearItemContainer(var5);
-               var7 = var3.__ag_302();
+               PlayerType.clearItemContainer(var6);
+               var10 = var3.method43();
 
-               for(var8 = 0; var8 < var7; ++var8) {
-                  var9 = var3.__ag_302();
-                  var10 = var3.readUnsignedByte();
-                  if(var10 == 255) {
-                     var10 = var3.__bf_332();
+               for (var11 = 0; var11 < var10; ++var11) {
+                  var12 = var3.method43();
+                  var13 = var3.readUnsignedByte();
+                  if (var13 == 255) {
+                     var13 = var3.method73();
                   }
 
-                  if(var41 != null && var8 < var41.itemIds.length) {
-                     var41.itemIds[var8] = var9;
-                     var41.itemQuantities[var8] = var10;
+                  if (var8 != null && var11 < var8.itemIds.length) {
+                     var8.itemIds[var11] = var12;
+                     var8.itemQuantities[var11] = var13;
                   }
 
-                  WorldMapManager.itemContainerSetItem(var5, var8, var9 - 1, var10);
+                  WorldMapManager.itemContainerSetItem(var6, var11, var12 - 1, var13);
                }
 
-               if(var41 != null) {
-                  class22.method295(var41);
+               if (var8 != null) {
+                  class22.method295(var8);
                }
 
                class12.method159();
-               __client_nz[++__client_ns - 1 & 31] = var5 & 32767;
+               field116[++field117 - 1 & 31] = var6 & 32767;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_e == var1.serverPacket0) {
+            if (ServerPacket.field797 == var1.serverPacket0) {
                class16.method189(class190.field2341);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bb == var1.serverPacket0) {
+            if (ServerPacket.field842 == var1.serverPacket0) {
                UserComparator7.method3360(var3, var1.serverPacket0Length);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bm == var1.serverPacket0) {
-               WorldMapSection3.__p_go = var3.readUnsignedByteNegate();
-               Canvas.__ao_gk = var3.__bq_318();
+            if (ServerPacket.field853 == var1.serverPacket0) {
+               WorldMapSection3.field1089 = var3.readUnsignedByteNegate();
+               Canvas.field95 = var3.method59();
                var1.serverPacket0 = null;
                return true;
             }
 
-            boolean var47;
-            if(ServerPacket.__ge_b == var1.serverPacket0) {
-               var16 = var3.readInt();
-               var47 = var3.readUnsignedByte() == 1;
-               var41 = Huffman.getWidget(var16);
-               if(var47 != var41.isHidden) {
-                  var41.isHidden = var47;
-                  class22.method295(var41);
+            boolean var14;
+            if (ServerPacket.field810 == var1.serverPacket0) {
+               var37 = var3.readInt();
+               var14 = var3.readUnsignedByte() == 1;
+               var8 = Huffman.getWidget(var37);
+               if (var14 != var8.isHidden) {
+                  var8.isHidden = var14;
+                  class22.method295(var8);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bu == var1.serverPacket0) {
-               byte var60 = var3.__bn_319();
-               var5 = var3.__bu_325();
-               Varps.Varps_temp[var5] = var60;
-               if(Varps.Varps_main[var5] != var60) {
-                  Varps.Varps_main[var5] = var60;
+            if (ServerPacket.field852 == var1.serverPacket0) {
+               byte var39 = var3.method60();
+               var6 = var3.method66();
+               Varps.Varps_temp[var6] = var39;
+               if (Varps.Varps_main[var6] != var39) {
+                  Varps.Varps_main[var6] = var39;
                }
 
-               IndexCache.method4703(var5);
-               __client_nr[++__client_nd - 1 & 31] = var5;
+               IndexCache.method4703(var6);
+               field121[++field123 - 1 & 31] = var6;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_a == var1.serverPacket0) {
+            if (ServerPacket.field803 == var1.serverPacket0) {
                class16.method189(class190.field2347);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bq == var1.serverPacket0) {
-               var16 = var3.readUnsignedByte();
-               if(var3.readUnsignedByte() == 0) {
-                  grandExchangeOffers[var16] = new GrandExchangeOffer();
+            if (ServerPacket.field844 == var1.serverPacket0) {
+               var37 = var3.readUnsignedByte();
+               if (var3.readUnsignedByte() == 0) {
+                  grandExchangeOffers[var37] = new GrandExchangeOffer();
                   var3.index += 18;
                } else {
                   --var3.index;
-                  grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false);
+                  grandExchangeOffers[var37] = new GrandExchangeOffer(var3, false);
                }
 
-               __client_nv = cycleCntr;
+               field122 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_cj == var1.serverPacket0) {
-               var16 = var3.__bm_326();
-               rootWidgetGroup = var16;
-               this.__iu_141(false);
-               DevicePcmPlayerProvider.method845(var16);
+            if (ServerPacket.field873 == var1.serverPacket0) {
+               var37 = var3.method67();
+               rootWidgetGroup = var37;
+               this.method87(false);
+               DevicePcmPlayerProvider.method845(var37);
                WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup);
 
-               for(var5 = 0; var5 < 100; ++var5) {
-                  __client_od[var5] = true;
+               for (var6 = 0; var6 < 100; ++var6) {
+                  field100[var6] = true;
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bo == var1.serverPacket0) {
+            if (ServerPacket.field849 == var1.serverPacket0) {
                class12.method159();
                runEnergy = var3.readUnsignedByte();
-               __client_ni = cycleCntr;
+               field124 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            Widget var19;
-            if(ServerPacket.__ge_af == var1.serverPacket0) {
-               var16 = var3.__bm_326();
-               var5 = var3.__bm_326();
-               var18 = var3.__bm_326();
-               var7 = var3.__bf_332();
-               var19 = Huffman.getWidget(var7);
-               if(var16 != var19.modelAngleX || var18 != var19.modelAngleY || var5 != var19.modelZoom) {
-                  var19.modelAngleX = var16;
-                  var19.modelAngleY = var18;
-                  var19.modelZoom = var5;
-                  class22.method295(var19);
+            Widget var15;
+            if (ServerPacket.field839 == var1.serverPacket0) {
+               var37 = var3.method67();
+               var6 = var3.method67();
+               var5 = var3.method67();
+               var10 = var3.method73();
+               var15 = Huffman.getWidget(var10);
+               if (var37 != var15.modelAngleX || var5 != var15.modelAngleY || var6 != var15.modelZoom) {
+                  var15.modelAngleX = var37;
+                  var15.modelAngleY = var5;
+                  var15.modelZoom = var6;
+                  class22.method295(var15);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_al == var1.serverPacket0) {
+            if (ServerPacket.field825 == var1.serverPacket0) {
                hintArrowType = var3.readUnsignedByte();
-               if(hintArrowType == 1) {
-                  hintArrowNpcIndex = var3.__ag_302();
+               if (hintArrowType == 1) {
+                  hintArrowNpcIndex = var3.method43();
                }
 
-               if(hintArrowType >= 2 && hintArrowType <= 6) {
-                  if(hintArrowType == 2) {
+               if (hintArrowType >= 2 && hintArrowType <= 6) {
+                  if (hintArrowType == 2) {
                      hintArrowSubX = 64;
                      hintArrowSubY = 64;
                   }
 
-                  if(hintArrowType == 3) {
+                  if (hintArrowType == 3) {
                      hintArrowSubX = 0;
                      hintArrowSubY = 64;
                   }
 
-                  if(hintArrowType == 4) {
+                  if (hintArrowType == 4) {
                      hintArrowSubX = 128;
                      hintArrowSubY = 64;
                   }
 
-                  if(hintArrowType == 5) {
+                  if (hintArrowType == 5) {
                      hintArrowSubX = 64;
                      hintArrowSubY = 0;
                   }
 
-                  if(hintArrowType == 6) {
+                  if (hintArrowType == 6) {
                      hintArrowSubX = 64;
                      hintArrowSubY = 128;
                   }
 
                   hintArrowType = 2;
-                  hintArrowX = var3.__ag_302();
-                  hintArrowY = var3.__ag_302();
+                  hintArrowX = var3.method43();
+                  hintArrowY = var3.method43();
                   hintArrowHeight = var3.readUnsignedByte();
                }
 
-               if(hintArrowType == 10) {
-                  hintArrowPlayerIndex = var3.__ag_302();
+               if (hintArrowType == 10) {
+                  hintArrowPlayerIndex = var3.method43();
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_cv == var1.serverPacket0) {
+            if (ServerPacket.field868 == var1.serverPacket0) {
                Skeleton.method3062(var3, var1.serverPacket0Length);
                ScriptFrame.method1138();
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_m == var1.serverPacket0) {
+            if (ServerPacket.field789 == var1.serverPacket0) {
                class50.loadRegions(false, var1.packetBuffer);
                var1.serverPacket0 = null;
                return true;
             }
 
-            Widget var58;
-            if(ServerPacket.__ge_ap == var1.serverPacket0) {
-               var16 = var3.__bu_325();
-               var5 = var3.__by_324();
-               var18 = var3.__bp_331();
-               var58 = Huffman.getWidget(var18);
-               var58.__bh = var16 + (var5 << 16);
+            Widget var16;
+            if (ServerPacket.field830 == var1.serverPacket0) {
+               var37 = var3.method66();
+               var6 = var3.method65();
+               var5 = var3.method72();
+               var16 = Huffman.getWidget(var5);
+               var16.field963 = var37 + (var6 << 16);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ba == var1.serverPacket0) {
-               if(rootWidgetGroup != -1) {
+            if (ServerPacket.field841 == var1.serverPacket0) {
+               if (rootWidgetGroup != -1) {
                   GrandExchangeEvents.method74(rootWidgetGroup, 0);
                }
 
@@ -5147,98 +4897,98 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_h == var1.serverPacket0) {
-               var16 = var3.readInt();
-               var5 = var3.__ag_302();
-               if(var5 == 65535) {
-                  var5 = -1;
+            if (ServerPacket.field809 == var1.serverPacket0) {
+               var37 = var3.readInt();
+               var6 = var3.method43();
+               if (var6 == 65535) {
+                  var6 = -1;
                }
 
-               var18 = var3.__bf_332();
-               var58 = Huffman.getWidget(var16);
-               ItemDefinition var54;
-               if(!var58.isIf3) {
-                  if(var5 == -1) {
-                     var58.modelType = 0;
+               var5 = var3.method73();
+               var16 = Huffman.getWidget(var37);
+               ItemDefinition var40;
+               if (!var16.isIf3) {
+                  if (var6 == -1) {
+                     var16.modelType = 0;
                      var1.serverPacket0 = null;
                      return true;
                   }
 
-                  var54 = Skills.getItemDefinition(var5);
-                  var58.modelType = 4;
-                  var58.modelId = var5;
-                  var58.modelAngleX = var54.xan2d;
-                  var58.modelAngleY = var54.yan2d;
-                  var58.modelZoom = var54.zoom2d * 100 / var18;
-                  class22.method295(var58);
+                  var40 = Skills.getItemDefinition(var6);
+                  var16.modelType = 4;
+                  var16.modelId = var6;
+                  var16.modelAngleX = var40.xan2d;
+                  var16.modelAngleY = var40.yan2d;
+                  var16.modelZoom = var40.zoom2d * 100 / var5;
+                  class22.method295(var16);
                } else {
-                  var58.itemId = var5;
-                  var58.itemQuantity = var18;
-                  var54 = Skills.getItemDefinition(var5);
-                  var58.modelAngleX = var54.xan2d;
-                  var58.modelAngleY = var54.yan2d;
-                  var58.modelAngleZ = var54.zan2d;
-                  var58.modelOffsetX = var54.offsetX2d;
-                  var58.modelOffsetY = var54.offsetY2d;
-                  var58.modelZoom = var54.zoom2d;
-                  if(var54.isStackable == 1) {
-                     var58.itemQuantityMode = 1;
+                  var16.itemId = var6;
+                  var16.itemQuantity = var5;
+                  var40 = Skills.getItemDefinition(var6);
+                  var16.modelAngleX = var40.xan2d;
+                  var16.modelAngleY = var40.yan2d;
+                  var16.modelAngleZ = var40.zan2d;
+                  var16.modelOffsetX = var40.offsetX2d;
+                  var16.modelOffsetY = var40.offsetY2d;
+                  var16.modelZoom = var40.zoom2d;
+                  if (var40.isStackable == 1) {
+                     var16.itemQuantityMode = 1;
                   } else {
-                     var58.itemQuantityMode = 2;
+                     var16.itemQuantityMode = 2;
                   }
 
-                  if(var58.__bf > 0) {
-                     var58.modelZoom = var58.modelZoom * 32 / var58.__bf;
-                  } else if(var58.rawWidth > 0) {
-                     var58.modelZoom = var58.modelZoom * 32 / var58.rawWidth;
+                  if (var16.field962 > 0) {
+                     var16.modelZoom = var16.modelZoom * 32 / var16.field962;
+                  } else if (var16.rawWidth > 0) {
+                     var16.modelZoom = var16.modelZoom * 32 / var16.rawWidth;
                   }
 
-                  class22.method295(var58);
+                  class22.method295(var16);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            String var6;
-            if(ServerPacket.__ge_w == var1.serverPacket0) {
-               var16 = var3.__ae_307();
-               var47 = var3.readUnsignedByte() == 1;
-               var6 = "";
-               boolean var44 = false;
-               if(var47) {
-                  var6 = var3.readStringCp1252NullTerminated();
-                  if(WorldMapArea.friendSystem.isIgnored(new Username(var6, KeyHandler.loginType))) {
-                     var44 = true;
+            String var17;
+            boolean var18;
+            if (ServerPacket.field792 == var1.serverPacket0) {
+               var37 = var3.method48();
+               var14 = var3.readUnsignedByte() == 1;
+               var17 = "";
+               var18 = false;
+               if (var14) {
+                  var17 = var3.readStringCp1252NullTerminated();
+                  if (WorldMapArea.friendSystem.isIgnored(new Username(var17, KeyHandler.loginType))) {
+                     var18 = true;
                   }
                }
 
-               String var53 = var3.readStringCp1252NullTerminated();
-               if(!var44) {
-                  WorldMapIcon1.method219(var16, var6, var53);
+               String var41 = var3.readStringCp1252NullTerminated();
+               if (!var18) {
+                  WorldMapIcon1.method219(var37, var17, var41);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bi == var1.serverPacket0) {
+            if (ServerPacket.field857 == var1.serverPacket0) {
                IndexCacheLoader.field512 = WorldMapElement.method4783(var3.readUnsignedByte());
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_n == var1.serverPacket0) {
+            if (ServerPacket.field801 == var1.serverPacket0) {
                class16.method189(class190.field2345);
                var1.serverPacket0 = null;
                return true;
             }
 
-            boolean var55;
-            if(ServerPacket.__ge_j == var1.serverPacket0) {
-               var55 = var3.readBoolean();
-               if(var55) {
-                  if(ClientParameter.field3645 == null) {
+            if (ServerPacket.field805 == var1.serverPacket0) {
+               var18 = var3.readBoolean();
+               if (var18) {
+                  if (ClientParameter.field3645 == null) {
                      ClientParameter.field3645 = new class248();
                   }
                } else {
@@ -5249,43 +4999,43 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            long var21;
-            if(ServerPacket.__ge_aa == var1.serverPacket0) {
-               var16 = var3.__bt_330();
-               var5 = var3.__bu_325();
-               if(var5 == 65535) {
-                  var5 = -1;
+            long var19;
+            if (ServerPacket.field837 == var1.serverPacket0) {
+               var37 = var3.method71();
+               var6 = var3.method66();
+               if (var6 == 65535) {
+                  var6 = -1;
                }
 
-               var18 = var3.__bf_332();
-               var7 = var3.__ag_302();
-               if(var7 == 65535) {
-                  var7 = -1;
+               var5 = var3.method73();
+               var10 = var3.method43();
+               if (var10 == 65535) {
+                  var10 = -1;
                }
 
-               for(var8 = var7; var8 <= var5; ++var8) {
-                  var21 = (long)var8 + ((long)var18 << 32);
-                  Node var45 = widgetClickMasks.get(var21);
-                  if(var45 != null) {
-                     var45.remove();
+               for (var11 = var10; var11 <= var6; ++var11) {
+                  var19 = (long)var11 + ((long)var5 << 32);
+                  Node var42 = widgetClickMasks.get(var19);
+                  if (var42 != null) {
+                     var42.remove();
                   }
 
-                  widgetClickMasks.put(new IntegerNode(var16), var21);
+                  widgetClickMasks.put(new IntegerNode(var37), var19);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_cy == var1.serverPacket0) {
+            if (ServerPacket.field870 == var1.serverPacket0) {
                class3.updateNpcs(true, var3);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_az == var1.serverPacket0) {
-               if(PacketWriter.clanChat != null) {
-                  PacketWriter.clanChat.__a_474(var3);
+            if (ServerPacket.field834 == var1.serverPacket0) {
+               if (PacketWriter.clanChat != null) {
+                  PacketWriter.clanChat.method78(var3);
                }
 
                UserComparator8.method3349();
@@ -5293,53 +5043,53 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_z == var1.serverPacket0) {
+            if (ServerPacket.field804 == var1.serverPacket0) {
                class16.method189(class190.field2346);
                var1.serverPacket0 = null;
                return true;
             }
 
-            String var37;
-            if(ServerPacket.__ge_by == var1.serverPacket0) {
-               var37 = var3.readStringCp1252NullTerminated();
-               Object[] var51 = new Object[var37.length() + 1];
+            String var21;
+            if (ServerPacket.field851 == var1.serverPacket0) {
+               var21 = var3.readStringCp1252NullTerminated();
+               Object[] var46 = new Object[var21.length() + 1];
 
-               for(var18 = var37.length() - 1; var18 >= 0; --var18) {
-                  if(var37.charAt(var18) == 's') {
-                     var51[var18 + 1] = var3.readStringCp1252NullTerminated();
+               for (var5 = var21.length() - 1; var5 >= 0; --var5) {
+                  if (var21.charAt(var5) == 's') {
+                     var46[var5 + 1] = var3.readStringCp1252NullTerminated();
                   } else {
-                     var51[var18 + 1] = new Integer(var3.readInt());
+                     var46[var5 + 1] = new Integer(var3.readInt());
                   }
                }
 
-               var51[0] = new Integer(var3.readInt());
-               ScriptEvent var43 = new ScriptEvent();
-               var43.args0 = var51;
-               AbstractIndexCache.runScript(var43);
+               var46[0] = new Integer(var3.readInt());
+               ScriptEvent var49 = new ScriptEvent();
+               var49.args0 = var46;
+               AbstractIndexCache.runScript(var49);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ag == var1.serverPacket0) {
+            if (ServerPacket.field815 == var1.serverPacket0) {
                class16.method189(class190.field2343);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_i == var1.serverPacket0) {
+            if (ServerPacket.field802 == var1.serverPacket0) {
                class16.method189(class190.field2350);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bj == var1.serverPacket0) {
+            if (ServerPacket.field856 == var1.serverPacket0) {
                destinationX = var3.readUnsignedByte();
-               if(destinationX == 255) {
+               if (destinationX == 255) {
                   destinationX = 0;
                }
 
                destinationY = var3.readUnsignedByte();
-               if(destinationY == 255) {
+               if (destinationY == 255) {
                   destinationY = 0;
                }
 
@@ -5347,84 +5097,84 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_cr == var1.serverPacket0) {
-               for(var16 = 0; var16 < VarpDefinition.__ix_f; ++var16) {
-                  VarpDefinition var50 = SecureRandomCallable.method1140(var16);
-                  if(var50 != null) {
-                     Varps.Varps_temp[var16] = 0;
-                     Varps.Varps_main[var16] = 0;
+            if (ServerPacket.field867 == var1.serverPacket0) {
+               for (var37 = 0; var37 < VarpDefinition.field944; ++var37) {
+                  VarpDefinition var44 = SecureRandomCallable.method1140(var37);
+                  if (var44 != null) {
+                     Varps.Varps_temp[var37] = 0;
+                     Varps.Varps_main[var37] = 0;
                   }
                }
 
                class12.method159();
-               __client_nd += 32;
+               field123 += 32;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_an == var1.serverPacket0) {
-               var16 = var3.readInt();
-               var5 = var3.__ag_302();
-               if(var16 < -70000) {
-                  var5 += 32768;
+            if (ServerPacket.field833 == var1.serverPacket0) {
+               var37 = var3.readInt();
+               var6 = var3.method43();
+               if (var37 < -70000) {
+                  var6 += 32768;
                }
 
-               if(var16 >= 0) {
-                  var41 = Huffman.getWidget(var16);
+               if (var37 >= 0) {
+                  var8 = Huffman.getWidget(var37);
                } else {
-                  var41 = null;
+                  var8 = null;
                }
 
-               for(; var3.index < var1.serverPacket0Length; WorldMapManager.itemContainerSetItem(var5, var7, var8 - 1, var9)) {
-                  var7 = var3.__ae_307();
-                  var8 = var3.__ag_302();
-                  var9 = 0;
-                  if(var8 != 0) {
-                     var9 = var3.readUnsignedByte();
-                     if(var9 == 255) {
-                        var9 = var3.readInt();
+               for (; var3.index < var1.serverPacket0Length; WorldMapManager.itemContainerSetItem(var6, var10, var11 - 1, var12)) {
+                  var10 = var3.method48();
+                  var11 = var3.method43();
+                  var12 = 0;
+                  if (var11 != 0) {
+                     var12 = var3.readUnsignedByte();
+                     if (var12 == 255) {
+                        var12 = var3.readInt();
                      }
                   }
 
-                  if(var41 != null && var7 >= 0 && var7 < var41.itemIds.length) {
-                     var41.itemIds[var7] = var8;
-                     var41.itemQuantities[var7] = var9;
+                  if (var8 != null && var10 >= 0 && var10 < var8.itemIds.length) {
+                     var8.itemIds[var10] = var11;
+                     var8.itemQuantities[var10] = var12;
                   }
                }
 
-               if(var41 != null) {
-                  class22.method295(var41);
+               if (var8 != null) {
+                  class22.method295(var8);
                }
 
                class12.method159();
-               __client_nz[++__client_ns - 1 & 31] = var5 & 32767;
+               field116[++field117 - 1 & 31] = var6 & 32767;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bl == var1.serverPacket0) {
-               var16 = var3.__ag_302();
-               var5 = var3.readUnsignedByte();
-               var18 = var3.__ag_302();
-               Ignored.queueSoundEffect(var16, var5, var18);
+            if (ServerPacket.field854 == var1.serverPacket0) {
+               var37 = var3.method43();
+               var6 = var3.readUnsignedByte();
+               var5 = var3.method43();
+               Ignored.queueSoundEffect(var37, var6, var5);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bc == var1.serverPacket0) {
-               var16 = var3.__bp_331();
-               var5 = var3.__br_328();
-               var18 = var3.__bl_327();
-               var58 = Huffman.getWidget(var16);
-               if(var18 != var58.rawX || var5 != var58.rawY || var58.xAlignment != 0 || var58.yAlignment != 0) {
-                  var58.rawX = var18;
-                  var58.rawY = var5;
-                  var58.xAlignment = 0;
-                  var58.yAlignment = 0;
-                  class22.method295(var58);
-                  this.alignWidget(var58);
-                  if(var58.type == 0) {
-                     class39.revalidateWidgetScroll(Widget.widgets[var16 >> 16], var58, false);
+            if (ServerPacket.field848 == var1.serverPacket0) {
+               var37 = var3.method72();
+               var6 = var3.method69();
+               var5 = var3.method68();
+               var16 = Huffman.getWidget(var37);
+               if (var5 != var16.rawX || var6 != var16.rawY || var16.xAlignment != 0 || var16.yAlignment != 0) {
+                  var16.rawX = var5;
+                  var16.rawY = var6;
+                  var16.xAlignment = 0;
+                  var16.yAlignment = 0;
+                  class22.method295(var16);
+                  this.alignWidget(var16);
+                  if (var16.type == 0) {
+                     class39.revalidateWidgetScroll(Widget.widgets[var37 >> 16], var16, false);
                   }
                }
 
@@ -5432,75 +5182,75 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_aw == var1.serverPacket0) {
-               var16 = var3.__bm_326();
-               var5 = var3.__bf_332();
-               var41 = Huffman.getWidget(var5);
-               if(var41.modelType != 2 || var16 != var41.modelId) {
-                  var41.modelType = 2;
-                  var41.modelId = var16;
-                  class22.method295(var41);
+            if (ServerPacket.field824 == var1.serverPacket0) {
+               var37 = var3.method67();
+               var6 = var3.method73();
+               var8 = Huffman.getWidget(var6);
+               if (var8.modelType != 2 || var37 != var8.modelId) {
+                  var8.modelType = 2;
+                  var8.modelId = var37;
+                  class22.method295(var8);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ao == var1.serverPacket0) {
-               World var40 = new World();
-               var40.host = var3.readStringCp1252NullTerminated();
-               var40.id = var3.__ag_302();
-               var5 = var3.readInt();
-               var40.properties = var5;
+            if (ServerPacket.field836 == var1.serverPacket0) {
+               World var43 = new World();
+               var43.host = var3.readStringCp1252NullTerminated();
+               var43.id = var3.method43();
+               var6 = var3.readInt();
+               var43.properties = var6;
                GameShell.updateGameState(45);
                var2.close();
                var2 = null;
-               class31.changeWorld(var40);
+               class31.changeWorld(var43);
                var1.serverPacket0 = null;
                return false;
             }
 
-            if(ServerPacket.__ge_ay == var1.serverPacket0) {
+            if (ServerPacket.field821 == var1.serverPacket0) {
                WorldMapArea.friendSystem.ignoreList.read(var3, var1.serverPacket0Length);
                class229.method4512();
-               __client_na = cycleCntr;
+               field105 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ah == var1.serverPacket0) {
+            if (ServerPacket.field822 == var1.serverPacket0) {
                class3.updateNpcs(false, var3);
                var1.serverPacket0 = null;
                return true;
             }
 
-            WidgetGroupParent var20;
-            if(ServerPacket.__ge_cs == var1.serverPacket0) {
-               var16 = var3.readInt();
-               var5 = var3.readInt();
-               WidgetGroupParent var42 = (WidgetGroupParent)widgetGroupParents.get((long)var5);
-               var20 = (WidgetGroupParent)widgetGroupParents.get((long)var16);
-               if(var20 != null) {
-                  MenuAction.closeWidgetGroup(var20, var42 == null || var42.group != var20.group);
+            WidgetGroupParent var22;
+            if (ServerPacket.field871 == var1.serverPacket0) {
+               var37 = var3.readInt();
+               var6 = var3.readInt();
+               WidgetGroupParent var48 = (WidgetGroupParent)widgetGroupParents.get((long)var6);
+               var22 = (WidgetGroupParent)widgetGroupParents.get((long)var37);
+               if (var22 != null) {
+                  MenuAction.closeWidgetGroup(var22, var48 == null || var48.group != var22.group);
                }
 
-               if(var42 != null) {
-                  var42.remove();
-                  widgetGroupParents.put(var42, (long)var16);
+               if (var48 != null) {
+                  var48.remove();
+                  widgetGroupParents.put(var48, (long)var37);
                }
 
-               var19 = Huffman.getWidget(var5);
-               if(var19 != null) {
-                  class22.method295(var19);
+               var15 = Huffman.getWidget(var6);
+               if (var15 != null) {
+                  class22.method295(var15);
                }
 
-               var19 = Huffman.getWidget(var16);
-               if(var19 != null) {
-                  class22.method295(var19);
-                  class39.revalidateWidgetScroll(Widget.widgets[var19.id >>> 16], var19, true);
+               var15 = Huffman.getWidget(var37);
+               if (var15 != null) {
+                  class22.method295(var15);
+                  class39.revalidateWidgetScroll(Widget.widgets[var15.id >>> 16], var15, true);
                }
 
-               if(rootWidgetGroup != -1) {
+               if (rootWidgetGroup != -1) {
                   GrandExchangeEvents.method74(rootWidgetGroup, 1);
                }
 
@@ -5508,67 +5258,67 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_p == var1.serverPacket0) {
-               var16 = var3.__bp_331();
-               var5 = var3.__bu_325();
-               var18 = var5 >> 10 & 31;
-               var7 = var5 >> 5 & 31;
-               var8 = var5 & 31;
-               var9 = (var7 << 11) + (var18 << 19) + (var8 << 3);
-               Widget var59 = Huffman.getWidget(var16);
-               if(var9 != var59.color) {
-                  var59.color = var9;
-                  class22.method295(var59);
+            if (ServerPacket.field813 == var1.serverPacket0) {
+               var37 = var3.method72();
+               var6 = var3.method66();
+               var5 = var6 >> 10 & 31;
+               var10 = var6 >> 5 & 31;
+               var11 = var6 & 31;
+               var12 = (var10 << 11) + (var5 << 19) + (var11 << 3);
+               Widget var47 = Huffman.getWidget(var37);
+               if (var12 != var47.color) {
+                  var47.color = var12;
+                  class22.method295(var47);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_at == var1.serverPacket0) {
-               var16 = var3.readUnsignedByte();
+            if (ServerPacket.field828 == var1.serverPacket0) {
+               var37 = var3.readUnsignedByte();
+               var6 = var3.readUnsignedByte();
                var5 = var3.readUnsignedByte();
-               var18 = var3.readUnsignedByte();
-               var7 = var3.readUnsignedByte();
-               __client_rh[var16] = true;
-               __client_rd[var16] = var5;
-               __client_rl[var16] = var18;
-               __client_rj[var16] = var7;
-               __client_rk[var16] = 0;
+               var10 = var3.readUnsignedByte();
+               field139[var37] = true;
+               field141[var37] = var6;
+               field142[var37] = var5;
+               field143[var37] = var10;
+               field144[var37] = 0;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ce == var1.serverPacket0) {
-               __client_pl = var3.readUnsignedByteNegate();
+            if (ServerPacket.field869 == var1.serverPacket0) {
+               field138 = var3.readUnsignedByteNegate();
                publicChatMode = var3.readUnsignedByteNegate();
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bp == var1.serverPacket0) {
-               rebootTimer = var3.__ag_302() * 30;
-               __client_ni = cycleCntr;
+            if (ServerPacket.field861 == var1.serverPacket0) {
+               rebootTimer = var3.method43() * 30;
+               field124 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_v == var1.serverPacket0) {
-               Canvas.__ao_gk = var3.readUnsignedByteNegate();
-               WorldMapSection3.__p_go = var3.readUnsignedByte();
+            if (ServerPacket.field814 == var1.serverPacket0) {
+               Canvas.field95 = var3.readUnsignedByteNegate();
+               WorldMapSection3.field1089 = var3.readUnsignedByte();
 
-               for(var16 = WorldMapSection3.__p_go; var16 < WorldMapSection3.__p_go + 8; ++var16) {
-                  for(var5 = Canvas.__ao_gk; var5 < Canvas.__ao_gk + 8; ++var5) {
-                     if(groundItems[SoundSystem.plane][var16][var5] != null) {
-                        groundItems[SoundSystem.plane][var16][var5] = null;
-                        TilePaint.method3061(var16, var5);
+               for (var37 = WorldMapSection3.field1089; var37 < WorldMapSection3.field1089 + 8; ++var37) {
+                  for (var6 = Canvas.field95; var6 < Canvas.field95 + 8; ++var6) {
+                     if (groundItems[SoundSystem.plane][var37][var6] != null) {
+                        groundItems[SoundSystem.plane][var37][var6] = null;
+                        TilePaint.method3061(var37, var6);
                      }
                   }
                }
 
-               for(class68 var39 = (class68)__client_kh.last(); var39 != null; var39 = (class68)__client_kh.previous()) {
-                  if(var39.field913 >= WorldMapSection3.__p_go && var39.field913 < WorldMapSection3.__p_go + 8 && var39.field901 >= Canvas.__ao_gk && var39.field901 < Canvas.__ao_gk + 8 && var39.field911 == SoundSystem.plane) {
-                     var39.field910 = 0;
+               for (class68 var45 = (class68)field214.last(); var45 != null; var45 = (class68)field214.previous()) {
+                  if (var45.field913 >= WorldMapSection3.field1089 && var45.field913 < WorldMapSection3.field1089 + 8 && var45.field901 >= Canvas.field95 && var45.field901 < Canvas.field95 + 8 && var45.field911 == SoundSystem.plane) {
+                     var45.field910 = 0;
                   }
                }
 
@@ -5576,58 +5326,59 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_ac == var1.serverPacket0) {
-               var16 = var3.__bf_332();
-               var5 = var3.__bm_326();
-               var41 = Huffman.getWidget(var16);
-               if(var41.modelType != 1 || var5 != var41.modelId) {
-                  var41.modelType = 1;
-                  var41.modelId = var5;
-                  class22.method295(var41);
+            if (ServerPacket.field820 == var1.serverPacket0) {
+               var37 = var3.method73();
+               var6 = var3.method67();
+               var8 = Huffman.getWidget(var37);
+               if (var8.modelType != 1 || var6 != var8.modelId) {
+                  var8.modelType = 1;
+                  var8.modelId = var6;
+                  class22.method295(var8);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ak == var1.serverPacket0) {
-               var16 = var3.readUnsignedByte();
-               BufferedNetSocket.method3500(var16);
+            if (ServerPacket.field823 == var1.serverPacket0) {
+               var37 = var3.readUnsignedByte();
+               BufferedNetSocket.method3500(var37);
                var1.serverPacket0 = null;
                return true;
             }
 
-            long var12;
-            long var24;
-            long var26;
-            if(ServerPacket.__ge_bs == var1.serverPacket0) {
-               var37 = var3.readStringCp1252NullTerminated();
-               var24 = var3.readLong();
-               var26 = (long)var3.__ag_302();
-               var21 = (long)var3.readMedium();
-               PlayerType var11 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte());
-               var12 = (var26 << 32) + var21;
-               boolean var46 = false;
+            long var23;
+            long var25;
+            long var27;
+            PlayerType var29;
+            if (ServerPacket.field843 == var1.serverPacket0) {
+               var21 = var3.readStringCp1252NullTerminated();
+               var25 = var3.readLong();
+               var27 = (long)var3.method43();
+               var19 = (long)var3.readMedium();
+               var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte());
+               var23 = (var27 << 32) + var19;
+               boolean var53 = false;
 
-               for(int var15 = 0; var15 < 100; ++var15) {
-                  if(__client_pu[var15] == var12) {
-                     var46 = true;
+               for (int var31 = 0; var31 < 100; ++var31) {
+                  if (field152[var31] == var23) {
+                     var53 = true;
                      break;
                   }
                }
 
-               if(var11.isUser && WorldMapArea.friendSystem.isIgnored(new Username(var37, KeyHandler.loginType))) {
-                  var46 = true;
+               if (var29.isUser && WorldMapArea.friendSystem.isIgnored(new Username(var21, KeyHandler.loginType))) {
+                  var53 = true;
                }
 
-               if(!var46 && __client_jc == 0) {
-                  __client_pu[__client_pb] = var12;
-                  __client_pb = (__client_pb + 1) % 100;
-                  String var28 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
-                  if(var11.modIcon != -1) {
-                     GrandExchangeEvents.addChatMessage(9, ItemContainer.method1170(var11.modIcon) + var37, var28, Clock.method3534(var24));
+               if (!var53 && field208 == 0) {
+                  field152[field156] = var23;
+                  field156 = (field156 + 1) % 100;
+                  String var55 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
+                  if (var29.modIcon != -1) {
+                     GrandExchangeEvents.addChatMessage(9, ItemContainer.method1170(var29.modIcon) + var21, var55, Clock.method3534(var25));
                   } else {
-                     GrandExchangeEvents.addChatMessage(9, var37, var28, Clock.method3534(var24));
+                     GrandExchangeEvents.addChatMessage(9, var21, var55, Clock.method3534(var25));
                   }
                }
 
@@ -5635,64 +5386,64 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_as == var1.serverPacket0) {
+            if (ServerPacket.field831 == var1.serverPacket0) {
                class16.method189(class190.field2342);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_y == var1.serverPacket0) {
-               var16 = var3.readInt();
-               var17 = var3.readStringCp1252NullTerminated();
-               var41 = Huffman.getWidget(var16);
-               if(!var17.equals(var41.text)) {
-                  var41.text = var17;
-                  class22.method295(var41);
+            if (ServerPacket.field808 == var1.serverPacket0) {
+               var37 = var3.readInt();
+               var4 = var3.readStringCp1252NullTerminated();
+               var8 = Huffman.getWidget(var37);
+               if (!var4.equals(var8.text)) {
+                  var8.text = var4;
+                  class22.method295(var8);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ai == var1.serverPacket0) {
+            if (ServerPacket.field840 == var1.serverPacket0) {
                class50.loadRegions(true, var1.packetBuffer);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_q == var1.serverPacket0) {
+            if (ServerPacket.field791 == var1.serverPacket0) {
                isCameraLocked = false;
 
-               for(var16 = 0; var16 < 5; ++var16) {
-                  __client_rh[var16] = false;
+               for (var37 = 0; var37 < 5; ++var37) {
+                  field139[var37] = false;
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_cm == var1.serverPacket0) {
+            if (ServerPacket.field872 == var1.serverPacket0) {
                isCameraLocked = true;
-               GrandExchangeOffer.__x_rg = var3.readUnsignedByte();
-               KeyHandler.__an_ra = var3.readUnsignedByte();
-               IndexStoreAction.__ik_rt = var3.__ag_302();
-               VertexNormal.__dq_rq = var3.readUnsignedByte();
-               class171.__fo_ro = var3.readUnsignedByte();
-               if(class171.__fo_ro >= 100) {
-                  var16 = GrandExchangeOffer.__x_rg * 128 + 64;
-                  var5 = KeyHandler.__an_ra * 128 + 64;
-                  var18 = class32.getTileHeight(var16, var5, SoundSystem.plane) - IndexStoreAction.__ik_rt;
-                  var7 = var16 - WorldMapSection1.cameraX;
-                  var8 = var18 - GrandExchangeEvents.cameraY;
-                  var9 = var5 - class11.cameraZ;
-                  var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7));
-                  WorldMapIcon1.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047;
-                  MusicPatchNode.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047;
-                  if(WorldMapIcon1.cameraPitch < 128) {
+               GrandExchangeOffer.field376 = var3.readUnsignedByte();
+               KeyHandler.field445 = var3.readUnsignedByte();
+               IndexStoreAction.field410 = var3.method43();
+               VertexNormal.field946 = var3.readUnsignedByte();
+               class171.field1116 = var3.readUnsignedByte();
+               if (class171.field1116 >= 100) {
+                  var37 = GrandExchangeOffer.field376 * 128 + 64;
+                  var6 = KeyHandler.field445 * 128 + 64;
+                  var5 = class32.getTileHeight(var37, var6, SoundSystem.plane) - IndexStoreAction.field410;
+                  var10 = var37 - WorldMapSection1.cameraX;
+                  var11 = var5 - GrandExchangeEvents.cameraY;
+                  var12 = var6 - class11.cameraZ;
+                  var13 = (int)Math.sqrt((double)(var12 * var12 + var10 * var10));
+                  WorldMapIcon1.cameraPitch = (int)(Math.atan2((double)var11, (double)var13) * 325.949D) & 2047;
+                  MusicPatchNode.cameraYaw = (int)(Math.atan2((double)var10, (double)var12) * -325.949D) & 2047;
+                  if (WorldMapIcon1.cameraPitch < 128) {
                      WorldMapIcon1.cameraPitch = 128;
                   }
 
-                  if(WorldMapIcon1.cameraPitch > 383) {
+                  if (WorldMapIcon1.cameraPitch > 383) {
                      WorldMapIcon1.cameraPitch = 383;
                   }
                }
@@ -5701,22 +5452,22 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_bv == var1.serverPacket0) {
-               var16 = var3.__bf_332();
-               var5 = var3.__bm_326();
-               var41 = Huffman.getWidget(var16);
-               if(var41 != null && var41.type == 0) {
-                  if(var5 > var41.scrollHeight - var41.height) {
-                     var5 = var41.scrollHeight - var41.height;
+            if (ServerPacket.field865 == var1.serverPacket0) {
+               var37 = var3.method73();
+               var6 = var3.method67();
+               var8 = Huffman.getWidget(var37);
+               if (var8 != null && var8.type == 0) {
+                  if (var6 > var8.scrollHeight - var8.height) {
+                     var6 = var8.scrollHeight - var8.height;
                   }
 
-                  if(var5 < 0) {
-                     var5 = 0;
+                  if (var6 < 0) {
+                     var6 = 0;
                   }
 
-                  if(var5 != var41.scrollY) {
-                     var41.scrollY = var5;
-                     class22.method295(var41);
+                  if (var6 != var8.scrollY) {
+                     var8.scrollY = var6;
+                     class22.method295(var8);
                   }
                }
 
@@ -5724,17 +5475,17 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_au == var1.serverPacket0) {
-               var16 = var3.__by_324();
-               Script.method2216(var16);
-               __client_nz[++__client_ns - 1 & 31] = var16 & 32767;
+            if (ServerPacket.field835 == var1.serverPacket0) {
+               var37 = var3.method65();
+               Script.method2216(var37);
+               field116[++field117 - 1 & 31] = var37 & 32767;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bk == var1.serverPacket0) {
+            if (ServerPacket.field846 == var1.serverPacket0) {
                var3.index += 28;
-               if(var3.__ax_313()) {
+               if (var3.method54()) {
                   class234.method4535(var3, var3.index - 28);
                }
 
@@ -5742,135 +5493,135 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_c == var1.serverPacket0) {
+            if (ServerPacket.field811 == var1.serverPacket0) {
                class12.method159();
-               var16 = var3.__bt_330();
-               var5 = var3.readUnsignedByteNegate();
-               var18 = var3.readUnsignedByte();
-               experience[var5] = var16;
-               currentLevels[var5] = var18;
-               levels[var5] = 1;
+               var37 = var3.method71();
+               var6 = var3.readUnsignedByteNegate();
+               var5 = var3.readUnsignedByte();
+               experience[var6] = var37;
+               currentLevels[var6] = var5;
+               levels[var6] = 1;
 
-               for(var7 = 0; var7 < 98; ++var7) {
-                  if(var16 >= Skills.Skills_experienceTable[var7]) {
-                     levels[var5] = var7 + 2;
+               for (var10 = 0; var10 < 98; ++var10) {
+                  if (var37 >= Skills.Skills_experienceTable[var10]) {
+                     levels[var6] = var10 + 2;
                   }
                }
 
-               changedSkills[++changedSkillsCount - 1 & 31] = var5;
+               changedSkills[++changedSkillsCount - 1 & 31] = var6;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bz == var1.serverPacket0) {
-               var16 = var3.readInt();
-               var5 = var3.readInt();
-               var18 = DynamicObject.method2222();
-               PacketBufferNode var57 = Interpreter.method1915(ClientPacket.__gs_k, packetWriter.isaacCipher);
-               var57.packetBuffer.__ai_315(var18);
-               var57.packetBuffer.writeByte(GameShell.fps);
-               var57.packetBuffer.writeIntME(var16);
-               var57.packetBuffer.writeIntLE(var5);
-               packetWriter.__q_167(var57);
+            if (ServerPacket.field858 == var1.serverPacket0) {
+               var37 = var3.readInt();
+               var6 = var3.readInt();
+               var5 = DynamicObject.method2222();
+               PacketBufferNode var56 = Interpreter.method1915(ClientPacket.field233, packetWriter.isaacCipher);
+               var56.packetBuffer.method56(var5);
+               var56.packetBuffer.writeByte(GameShell.fps);
+               var56.packetBuffer.writeIntME(var37);
+               var56.packetBuffer.writeIntLE(var6);
+               packetWriter.method241(var56);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bt == var1.serverPacket0) {
+            if (ServerPacket.field860 == var1.serverPacket0) {
                class12.method159();
-               weight = var3.__aq_303();
-               __client_ni = cycleCntr;
+               weight = var3.method44();
+               field124 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_aq == var1.serverPacket0) {
-               var55 = var3.readUnsignedByte() == 1;
-               if(var55) {
-                  class15.__z_si = class203.currentTimeMs() - var3.readLong();
+            if (ServerPacket.field816 == var1.serverPacket0) {
+               var18 = var3.readUnsignedByte() == 1;
+               if (var18) {
+                  class15.field1113 = class203.currentTimeMs() - var3.readLong();
                   FloorDecoration.grandExchangeEvents = new GrandExchangeEvents(var3, true);
                } else {
                   FloorDecoration.grandExchangeEvents = null;
                }
 
-               __client_nc = cycleCntr;
+               field154 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_av == var1.serverPacket0) {
-               WorldMapArea.friendSystem.__f_152();
-               __client_na = cycleCntr;
+            if (ServerPacket.field818 == var1.serverPacket0) {
+               WorldMapArea.friendSystem.method100();
+               field105 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_t == var1.serverPacket0) {
-               byte[] var38 = new byte[var1.serverPacket0Length];
-               var3.__jb_335(var38, 0, var38.length);
-               Buffer var49 = new Buffer(var38);
-               var6 = var49.readStringCp1252NullTerminated();
-               WorldMapCacheName.method635(var6, true, false);
+            if (ServerPacket.field807 == var1.serverPacket0) {
+               byte[] var54 = new byte[var1.serverPacket0Length];
+               var3.method237(var54, 0, var54.length);
+               Buffer var52 = new Buffer(var54);
+               var17 = var52.readStringCp1252NullTerminated();
+               WorldMapCacheName.method635(var17, true, false);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_k == var1.serverPacket0) {
+            if (ServerPacket.field800 == var1.serverPacket0) {
                class16.method189(class190.field2352);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bn == var1.serverPacket0) {
-               var16 = var3.index + var1.serverPacket0Length;
-               var5 = var3.__ag_302();
-               var18 = var3.__ag_302();
-               if(var5 != rootWidgetGroup) {
-                  rootWidgetGroup = var5;
-                  this.__iu_141(false);
+            WidgetGroupParent var50;
+            if (ServerPacket.field845 == var1.serverPacket0) {
+               var37 = var3.index + var1.serverPacket0Length;
+               var6 = var3.method43();
+               var5 = var3.method43();
+               if (var6 != rootWidgetGroup) {
+                  rootWidgetGroup = var6;
+                  this.method87(false);
                   DevicePcmPlayerProvider.method845(rootWidgetGroup);
                   WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup);
 
-                  for(var7 = 0; var7 < 100; ++var7) {
-                     __client_od[var7] = true;
+                  for (var10 = 0; var10 < 100; ++var10) {
+                     field100[var10] = true;
                   }
                }
 
-               WidgetGroupParent var23;
-               for(; var18-- > 0; var23.keep = true) {
-                  var7 = var3.readInt();
-                  var8 = var3.__ag_302();
-                  var9 = var3.readUnsignedByte();
-                  var23 = (WidgetGroupParent)widgetGroupParents.get((long)var7);
-                  if(var23 != null && var8 != var23.group) {
-                     MenuAction.closeWidgetGroup(var23, true);
-                     var23 = null;
+               for (; var5-- > 0; var50.keep = true) {
+                  var10 = var3.readInt();
+                  var11 = var3.method43();
+                  var12 = var3.readUnsignedByte();
+                  var50 = (WidgetGroupParent)widgetGroupParents.get((long)var10);
+                  if (var50 != null && var11 != var50.group) {
+                     MenuAction.closeWidgetGroup(var50, true);
+                     var50 = null;
                   }
 
-                  if(var23 == null) {
-                     var23 = SecureRandomCallable.method1143(var7, var8, var9);
+                  if (var50 == null) {
+                     var50 = SecureRandomCallable.method1143(var10, var11, var12);
                   }
                }
 
-               for(var20 = (WidgetGroupParent)widgetGroupParents.first(); var20 != null; var20 = (WidgetGroupParent)widgetGroupParents.next()) {
-                  if(var20.keep) {
-                     var20.keep = false;
+               for (var22 = (WidgetGroupParent)widgetGroupParents.first(); var22 != null; var22 = (WidgetGroupParent)widgetGroupParents.next()) {
+                  if (var22.keep) {
+                     var22.keep = false;
                   } else {
-                     MenuAction.closeWidgetGroup(var20, true);
+                     MenuAction.closeWidgetGroup(var22, true);
                   }
                }
 
                widgetClickMasks = new NodeHashTable(512);
 
-               while(var3.index < var16) {
-                  var7 = var3.readInt();
-                  var8 = var3.__ag_302();
-                  var9 = var3.__ag_302();
+               while (var3.index < var37) {
                   var10 = var3.readInt();
+                  var11 = var3.method43();
+                  var12 = var3.method43();
+                  var13 = var3.readInt();
 
-                  for(int var29 = var8; var29 <= var9; ++var29) {
-                     var12 = (long)var29 + ((long)var7 << 32);
-                     widgetClickMasks.put(new IntegerNode(var10), var12);
+                  for (int var51 = var11; var51 <= var12; ++var51) {
+                     var23 = (long)var51 + ((long)var10 << 32);
+                     widgetClickMasks.put(new IntegerNode(var13), var23);
                   }
                }
 
@@ -5878,34 +5629,34 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_br == var1.serverPacket0) {
-               var16 = var3.__bb_317();
-               var5 = var3.__bb_317();
-               var6 = var3.readStringCp1252NullTerminated();
-               if(var5 >= 1 && var5 <= 8) {
-                  if(var6.equalsIgnoreCase("null")) {
-                     var6 = null;
+            if (ServerPacket.field855 == var1.serverPacket0) {
+               var37 = var3.method58();
+               var6 = var3.method58();
+               var17 = var3.readStringCp1252NullTerminated();
+               if (var6 >= 1 && var6 <= 8) {
+                  if (var17.equalsIgnoreCase("null")) {
+                     var17 = null;
                   }
 
-                  playerMenuActions[var5 - 1] = var6;
-                  playerOptionsPriorities[var5 - 1] = var16 == 0;
+                  playerMenuActions[var6 - 1] = var17;
+                  playerOptionsPriorities[var6 - 1] = var37 == 0;
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ab == var1.serverPacket0) {
+            if (ServerPacket.field826 == var1.serverPacket0) {
                Clock.method3533(var3.readStringCp1252NullTerminated());
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_am == var1.serverPacket0) {
-               if(var1.serverPacket0Length == 0) {
+            if (ServerPacket.field832 == var1.serverPacket0) {
+               if (var1.serverPacket0Length == 0) {
                   PacketWriter.clanChat = null;
                } else {
-                  if(PacketWriter.clanChat == null) {
+                  if (PacketWriter.clanChat == null) {
                      PacketWriter.clanChat = new ClanChat(KeyHandler.loginType, TextureProvider.client);
                   }
 
@@ -5917,48 +5668,48 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_o == var1.serverPacket0) {
-               var16 = var3.__ag_302();
-               var5 = var3.readInt();
-               Varps.Varps_temp[var16] = var5;
-               if(Varps.Varps_main[var16] != var5) {
-                  Varps.Varps_main[var16] = var5;
+            if (ServerPacket.field793 == var1.serverPacket0) {
+               var37 = var3.method43();
+               var6 = var3.readInt();
+               Varps.Varps_temp[var37] = var6;
+               if (Varps.Varps_main[var37] != var6) {
+                  Varps.Varps_main[var37] = var6;
                }
 
-               IndexCache.method4703(var16);
-               __client_nr[++__client_nd - 1 & 31] = var16;
+               IndexCache.method4703(var37);
+               field121[++field123 - 1 & 31] = var37;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_g == var1.serverPacket0) {
+            if (ServerPacket.field795 == var1.serverPacket0) {
                class16.method189(class190.field2349);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_x == var1.serverPacket0) {
-               var16 = var3.readInt();
-               WidgetGroupParent var48 = (WidgetGroupParent)widgetGroupParents.get((long)var16);
-               if(var48 != null) {
-                  MenuAction.closeWidgetGroup(var48, true);
+            if (ServerPacket.field798 == var1.serverPacket0) {
+               var37 = var3.readInt();
+               var50 = (WidgetGroupParent)widgetGroupParents.get((long)var37);
+               if (var50 != null) {
+                  MenuAction.closeWidgetGroup(var50, true);
                }
 
-               if(__client_mo != null) {
-                  class22.method295(__client_mo);
-                  __client_mo = null;
+               if (field127 != null) {
+                  class22.method295(field127);
+                  field127 = null;
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bf == var1.serverPacket0) {
-               for(var16 = 0; var16 < Varps.Varps_main.length; ++var16) {
-                  if(Varps.Varps_temp[var16] != Varps.Varps_main[var16]) {
-                     Varps.Varps_main[var16] = Varps.Varps_temp[var16];
-                     IndexCache.method4703(var16);
-                     __client_nr[++__client_nd - 1 & 31] = var16;
+            if (ServerPacket.field862 == var1.serverPacket0) {
+               for (var37 = 0; var37 < Varps.Varps_main.length; ++var37) {
+                  if (Varps.Varps_temp[var37] != Varps.Varps_main[var37]) {
+                     Varps.Varps_main[var37] = Varps.Varps_temp[var37];
+                     IndexCache.method4703(var37);
+                     field121[++field123 - 1 & 31] = var37;
                   }
                }
 
@@ -5966,84 +5717,84 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_bd == var1.serverPacket0) {
-               WorldMapArea.friendSystem.__q_153(var3, var1.serverPacket0Length);
-               __client_na = cycleCntr;
+            if (ServerPacket.field847 == var1.serverPacket0) {
+               WorldMapArea.friendSystem.method101(var3, var1.serverPacket0Length);
+               field105 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_r == var1.serverPacket0) {
-               var16 = var3.__bm_326();
-               if(var16 == 65535) {
-                  var16 = -1;
+            if (ServerPacket.field812 == var1.serverPacket0) {
+               var37 = var3.method67();
+               if (var37 == 65535) {
+                  var37 = -1;
                }
 
-               AbstractUserComparator.method5437(var16);
+               AbstractUserComparator.method5437(var37);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ad == var1.serverPacket0) {
-               var16 = var3.__bj_329();
-               var5 = var3.__bu_325();
-               if(var5 == 65535) {
-                  var5 = -1;
+            if (ServerPacket.field829 == var1.serverPacket0) {
+               var37 = var3.method70();
+               var6 = var3.method66();
+               if (var6 == 65535) {
+                  var6 = -1;
                }
 
-               HealthBar.method1994(var5, var16);
+               HealthBar.method1994(var6, var37);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bw == var1.serverPacket0) {
-               var16 = var3.__bb_317();
-               var5 = var3.__bp_331();
-               var18 = var3.__bm_326();
-               var20 = (WidgetGroupParent)widgetGroupParents.get((long)var5);
-               if(var20 != null) {
-                  MenuAction.closeWidgetGroup(var20, var18 != var20.group);
+            if (ServerPacket.field866 == var1.serverPacket0) {
+               var37 = var3.method58();
+               var6 = var3.method72();
+               var5 = var3.method67();
+               var22 = (WidgetGroupParent)widgetGroupParents.get((long)var6);
+               if (var22 != null) {
+                  MenuAction.closeWidgetGroup(var22, var5 != var22.group);
                }
 
-               SecureRandomCallable.method1143(var5, var18, var16);
+               SecureRandomCallable.method1143(var6, var5, var37);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_d == var1.serverPacket0) {
-               var37 = var3.readStringCp1252NullTerminated();
-               var24 = (long)var3.__ag_302();
-               var26 = (long)var3.readMedium();
-               PlayerType var30 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte());
-               long var31 = (var24 << 32) + var26;
-               boolean var33 = false;
+            if (ServerPacket.field799 == var1.serverPacket0) {
+               var21 = var3.readStringCp1252NullTerminated();
+               var25 = (long)var3.method43();
+               var27 = (long)var3.readMedium();
+               var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte());
+               long var30 = (var25 << 32) + var27;
+               boolean var32 = false;
 
-               for(int var13 = 0; var13 < 100; ++var13) {
-                  if(var31 == __client_pu[var13]) {
-                     var33 = true;
+               for (int var33 = 0; var33 < 100; ++var33) {
+                  if (var30 == field152[var33]) {
+                     var32 = true;
                      break;
                   }
                }
 
-               if(WorldMapArea.friendSystem.isIgnored(new Username(var37, KeyHandler.loginType))) {
-                  var33 = true;
+               if (WorldMapArea.friendSystem.isIgnored(new Username(var21, KeyHandler.loginType))) {
+                  var32 = true;
                }
 
-               if(!var33 && __client_jc == 0) {
-                  __client_pu[__client_pb] = var31;
-                  __client_pb = (__client_pb + 1) % 100;
-                  String var34 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
-                  byte var14;
-                  if(var30.isPrivileged) {
-                     var14 = 7;
+               if (!var32 && field208 == 0) {
+                  field152[field156] = var30;
+                  field156 = (field156 + 1) % 100;
+                  String var57 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
+                  byte var34;
+                  if (var29.isPrivileged) {
+                     var34 = 7;
                   } else {
-                     var14 = 3;
+                     var34 = 3;
                   }
 
-                  if(var30.modIcon != -1) {
-                     WorldMapIcon1.method219(var14, ItemContainer.method1170(var30.modIcon) + var37, var34);
+                  if (var29.modIcon != -1) {
+                     WorldMapIcon1.method219(var34, ItemContainer.method1170(var29.modIcon) + var21, var57);
                   } else {
-                     WorldMapIcon1.method219(var14, var37, var34);
+                     WorldMapIcon1.method219(var34, var21, var57);
                   }
                }
 
@@ -6051,10 +5802,10 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_u == var1.serverPacket0) {
-               var16 = var3.readInt();
-               if(var16 != __client_il) {
-                  __client_il = var16;
+            if (ServerPacket.field794 == var1.serverPacket0) {
+               var37 = var3.readInt();
+               if (var37 != field198) {
+                  field198 = var37;
                   WorldMapArea.method428();
                }
 
@@ -6062,32 +5813,32 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_bh == var1.serverPacket0) {
+            if (ServerPacket.field863 == var1.serverPacket0) {
                minimapState = var3.readUnsignedByte();
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ae == var1.serverPacket0) {
-               var37 = var3.readStringCp1252NullTerminated();
-               var17 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
-               WorldMapIcon1.method219(6, var37, var17);
+            if (ServerPacket.field827 == var1.serverPacket0) {
+               var21 = var3.readStringCp1252NullTerminated();
+               var4 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
+               WorldMapIcon1.method219(6, var21, var4);
                var1.serverPacket0 = null;
                return true;
             }
 
-            NpcDefinition.sendStackTrace("" + (var1.serverPacket0 != null?var1.serverPacket0.id:-1) + "," + (var1.__n != null?var1.__n.id:-1) + "," + (var1.__i != null?var1.__i.id:-1) + "," + var1.serverPacket0Length, (Throwable)null);
+            NPCDefinition.sendStackTrace("" + (var1.serverPacket0 != null ? var1.serverPacket0.id : -1) + "," + (var1.field677 != null ? var1.field677.id : -1) + "," + (var1.field678 != null ? var1.field678.id : -1) + "," + var1.serverPacket0Length, (Throwable)null);
             TextureProvider.method2773();
          } catch (IOException var35) {
             class48.method868();
          } catch (Exception var36) {
-            var17 = "" + (var1.serverPacket0 != null?var1.serverPacket0.id:-1) + "," + (var1.__n != null?var1.__n.id:-1) + "," + (var1.__i != null?var1.__i.id:-1) + "," + var1.serverPacket0Length + "," + (Canvas.localPlayer.pathX[0] + class50.baseX) + "," + (Canvas.localPlayer.pathY[0] + GraphicsObject.baseY) + ",";
+            var4 = "" + (var1.serverPacket0 != null ? var1.serverPacket0.id : -1) + "," + (var1.field677 != null ? var1.field677.id : -1) + "," + (var1.field678 != null ? var1.field678.id : -1) + "," + var1.serverPacket0Length + "," + (Canvas.localPlayer.pathX[0] + class50.baseX) + "," + (Canvas.localPlayer.pathY[0] + GraphicsObject.baseY) + ",";
 
-            for(var18 = 0; var18 < var1.serverPacket0Length && var18 < 50; ++var18) {
-               var17 = var17 + var3.array[var18] + ",";
+            for (var5 = 0; var5 < var1.serverPacket0Length && var5 < 50; ++var5) {
+               var4 = var4 + var3.array[var5] + ",";
             }
 
-            NpcDefinition.sendStackTrace(var17, var36);
+            NPCDefinition.sendStackTrace(var4, var36);
             TextureProvider.method2773();
          }
 
@@ -6100,34 +5851,34 @@ public final class Client extends GameShell implements Usernamed {
       signature = "(I)V",
       garbageValue = "-387903382"
    )
-   final void __hi_139() {
+   final void method86() {
       boolean var1 = false;
 
       int var2;
-      int var5;
-      while(!var1) {
+      int var3;
+      while (!var1) {
          var1 = true;
 
-         for(var2 = 0; var2 < menuOptionsCount - 1; ++var2) {
-            if(menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) {
-               String var3 = menuTargetNames[var2];
+         for (var2 = 0; var2 < menuOptionsCount - 1; ++var2) {
+            if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) {
+               String var4 = menuTargetNames[var2];
                menuTargetNames[var2] = menuTargetNames[var2 + 1];
-               menuTargetNames[var2 + 1] = var3;
-               String var4 = menuActions[var2];
+               menuTargetNames[var2 + 1] = var4;
+               String var5 = menuActions[var2];
                menuActions[var2] = menuActions[var2 + 1];
-               menuActions[var2 + 1] = var4;
-               var5 = menuOpcodes[var2];
+               menuActions[var2 + 1] = var5;
+               var3 = menuOpcodes[var2];
                menuOpcodes[var2] = menuOpcodes[var2 + 1];
-               menuOpcodes[var2 + 1] = var5;
-               var5 = menuArguments1[var2];
+               menuOpcodes[var2 + 1] = var3;
+               var3 = menuArguments1[var2];
                menuArguments1[var2] = menuArguments1[var2 + 1];
-               menuArguments1[var2 + 1] = var5;
-               var5 = menuArguments2[var2];
+               menuArguments1[var2 + 1] = var3;
+               var3 = menuArguments2[var2];
                menuArguments2[var2] = menuArguments2[var2 + 1];
-               menuArguments2[var2 + 1] = var5;
-               var5 = menuArguments0[var2];
+               menuArguments2[var2 + 1] = var3;
+               var3 = menuArguments0[var2];
                menuArguments0[var2] = menuArguments0[var2 + 1];
-               menuArguments0[var2 + 1] = var5;
+               menuArguments0[var2 + 1] = var3;
                boolean var6 = menuShiftClick[var2];
                menuShiftClick[var2] = menuShiftClick[var2 + 1];
                menuShiftClick[var2 + 1] = var6;
@@ -6136,111 +5887,107 @@ public final class Client extends GameShell implements Usernamed {
          }
       }
 
-      if(DevicePcmPlayerProvider.dragInventoryWidget == null) {
-         if(clickedWidget == null) {
-            int var16;
-            label279: {
-               int var15 = MouseHandler.MouseHandler_lastButton;
-               int var9;
-               int var13;
-               if(isMenuOpen) {
-                  int var12;
-                  if(var15 != 1 && (AbstractRasterProvider.mouseCam || var15 != 4)) {
-                     var2 = MouseHandler.MouseHandler_x;
-                     var12 = MouseHandler.MouseHandler_y;
-                     if(var2 < class25.menuX - 10 || var2 > class25.menuX + class214.menuWidth + 10 || var12 < GameShell.menuY - 10 || var12 > AbstractWorldMapIcon.menuHeight + GameShell.menuY + 10) {
-                        isMenuOpen = false;
-                        Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight);
-                     }
-                  }
+      if (DevicePcmPlayerProvider.dragInventoryWidget == null && clickedWidget == null) {
+         int var12 = MouseHandler.MouseHandler_lastButton;
+         int var7;
+         int var11;
+         int var13;
+         if (isMenuOpen) {
+            int var14;
+            if (var12 != 1 && (AbstractRasterProvider.mouseCam || var12 != 4)) {
+               var2 = MouseHandler.MouseHandler_x;
+               var14 = MouseHandler.MouseHandler_y;
+               if (var2 < class25.menuX - 10 || var2 > class25.menuX + class214.menuWidth + 10 || var14 < GameShell.menuY - 10 || var14 > AbstractWorldMapIcon.menuHeight + GameShell.menuY + 10) {
+                  isMenuOpen = false;
+                  Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight);
+               }
+            }
 
-                  if(var15 == 1 || !AbstractRasterProvider.mouseCam && var15 == 4) {
-                     var2 = class25.menuX;
-                     var12 = GameShell.menuY;
-                     var13 = class214.menuWidth;
-                     var5 = MouseHandler.MouseHandler_lastPressedX;
-                     var16 = MouseHandler.MouseHandler_lastPressedY;
-                     int var7 = -1;
+            if (var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) {
+               var2 = class25.menuX;
+               var14 = GameShell.menuY;
+               var7 = class214.menuWidth;
+               var3 = MouseHandler.MouseHandler_lastPressedX;
+               var11 = MouseHandler.MouseHandler_lastPressedY;
+               int var15 = -1;
 
-                     for(int var17 = 0; var17 < menuOptionsCount; ++var17) {
-                        var9 = (menuOptionsCount - 1 - var17) * 15 + var12 + 31;
-                        if(var5 > var2 && var5 < var13 + var2 && var16 > var9 - 13 && var16 < var9 + 3) {
-                           var7 = var17;
-                        }
-                     }
-
-                     if(var7 != -1) {
-                        WorldMapSection0.method245(var7);
-                     }
-
-                     isMenuOpen = false;
-                     Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight);
-                  }
-               } else {
-                  var2 = menuOptionsCount - 1;
-                  if((var15 == 1 || !AbstractRasterProvider.mouseCam && var15 == 4) && var2 >= 0) {
-                     var13 = menuOpcodes[var2];
-                     if(var13 == 39 || var13 == 40 || var13 == 41 || var13 == 42 || var13 == 43 || var13 == 33 || var13 == 34 || var13 == 35 || var13 == 36 || var13 == 37 || var13 == 38 || var13 == 1005) {
-                        var5 = menuArguments1[var2];
-                        var16 = menuArguments2[var2];
-                        Widget var14 = Huffman.getWidget(var16);
-                        var9 = class1.getWidgetClickMask(var14);
-                        boolean var8 = (var9 >> 28 & 1) != 0;
-                        if(var8) {
-                           break label279;
-                        }
-
-                        Object var10000 = null;
-                        if(class168.method3461(class1.getWidgetClickMask(var14))) {
-                           break label279;
-                        }
-                     }
-                  }
-
-                  if((var15 == 1 || !AbstractRasterProvider.mouseCam && var15 == 4) && this.shouldLeftClickOpenMenu()) {
-                     var15 = 2;
-                  }
-
-                  if((var15 == 1 || !AbstractRasterProvider.mouseCam && var15 == 4) && menuOptionsCount > 0) {
-                     WorldMapSection0.method245(var2);
-                  }
-
-                  if(var15 == 2 && menuOptionsCount > 0) {
-                     this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
+               for (int var16 = 0; var16 < menuOptionsCount; ++var16) {
+                  var13 = (menuOptionsCount - 1 - var16) * 15 + var14 + 31;
+                  if (var3 > var2 && var3 < var7 + var2 && var11 > var13 - 13 && var11 < var13 + 3) {
+                     var15 = var16;
                   }
                }
 
-               return;
+               if (var15 != -1) {
+                  WorldMapSection0.method245(var15);
+               }
+
+               isMenuOpen = false;
+               Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight);
+            }
+         } else {
+            var2 = menuOptionsCount - 1;
+            if ((var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) && var2 >= 0) {
+               var7 = menuOpcodes[var2];
+               if (var7 == 39 || var7 == 40 || var7 == 41 || var7 == 42 || var7 == 43 || var7 == 33 || var7 == 34 || var7 == 35 || var7 == 36 || var7 == 37 || var7 == 38 || var7 == 1005) {
+                  label223: {
+                     var3 = menuArguments1[var2];
+                     var11 = menuArguments2[var2];
+                     Widget var8 = Huffman.getWidget(var11);
+                     var13 = class1.getWidgetClickMask(var8);
+                     boolean var9 = (var13 >> 28 & 1) != 0;
+                     if (!var9) {
+                        Object var10 = null;
+                        if (!class168.method3461(class1.getWidgetClickMask(var8))) {
+                           break label223;
+                        }
+                     }
+
+                     if (DevicePcmPlayerProvider.dragInventoryWidget != null && !field207 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) {
+                        var12 = field205;
+                        var13 = field206;
+                        class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var12, var13);
+                        UnitPriceComparator.tempMenuAction = null;
+                     }
+
+                     field207 = false;
+                     itemDragDuration = 0;
+                     if (DevicePcmPlayerProvider.dragInventoryWidget != null) {
+                        class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
+                     }
+
+                     DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var11);
+                     dragItemSlotSource = var3;
+                     field205 = MouseHandler.MouseHandler_lastPressedX;
+                     field206 = MouseHandler.MouseHandler_lastPressedY;
+                     if (var2 >= 0) {
+                        UnitPriceComparator.tempMenuAction = new MenuAction();
+                        UnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2];
+                        UnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2];
+                        UnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2];
+                        UnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2];
+                        UnitPriceComparator.tempMenuAction.action = menuActions[var2];
+                     }
+
+                     class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
+                     return;
+                  }
+               }
             }
 
-            if(DevicePcmPlayerProvider.dragInventoryWidget != null && !__client_jl && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) {
-               int var10 = __client_ja;
-               int var11 = __client_je;
-               class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var10, var11);
-               UnitPriceComparator.tempMenuAction = null;
+            if ((var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) && this.shouldLeftClickOpenMenu()) {
+               var12 = 2;
             }
 
-            __client_jl = false;
-            itemDragDuration = 0;
-            if(DevicePcmPlayerProvider.dragInventoryWidget != null) {
-               class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
+            if ((var12 == 1 || !AbstractRasterProvider.mouseCam && var12 == 4) && menuOptionsCount > 0) {
+               WorldMapSection0.method245(var2);
             }
 
-            DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var16);
-            dragItemSlotSource = var5;
-            __client_ja = MouseHandler.MouseHandler_lastPressedX;
-            __client_je = MouseHandler.MouseHandler_lastPressedY;
-            if(var2 >= 0) {
-               UnitPriceComparator.tempMenuAction = new MenuAction();
-               UnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2];
-               UnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2];
-               UnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2];
-               UnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2];
-               UnitPriceComparator.tempMenuAction.action = menuActions[var2];
+            if (var12 == 2 && menuOptionsCount > 0) {
+               this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
             }
-
-            class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
          }
+
       }
    }
 
@@ -6252,7 +5999,7 @@ public final class Client extends GameShell implements Usernamed {
    @Export("shouldLeftClickOpenMenu")
    final boolean shouldLeftClickOpenMenu() {
       int var1 = menuOptionsCount - 1;
-      return (__client_ku == 1 && menuOptionsCount > 2 || UserComparator7.method3364(var1)) && !menuShiftClick[var1];
+      return (field215 == 1 && menuOptionsCount > 2 || UserComparator7.method3364(var1)) && !menuShiftClick[var1];
    }
 
    @ObfuscatedName("hj")
@@ -6265,19 +6012,19 @@ public final class Client extends GameShell implements Usernamed {
       int var3 = class2.fontBold12.stringWidth("Choose Option");
 
       int var4;
-      for(var4 = 0; var4 < menuOptionsCount; ++var4) {
+      for (var4 = 0; var4 < menuOptionsCount; ++var4) {
          Font var5 = class2.fontBold12;
          String var6;
-         if(var4 < 0) {
+         if (var4 < 0) {
             var6 = "";
-         } else if(menuTargetNames[var4].length() > 0) {
+         } else if (menuTargetNames[var4].length() > 0) {
             var6 = menuActions[var4] + " " + menuTargetNames[var4];
          } else {
             var6 = menuActions[var4];
          }
 
          int var7 = var5.stringWidth(var6);
-         if(var7 > var3) {
+         if (var7 > var3) {
             var3 = var7;
          }
       }
@@ -6285,20 +6032,20 @@ public final class Client extends GameShell implements Usernamed {
       var3 += 8;
       var4 = menuOptionsCount * 15 + 22;
       int var8 = var1 - var3 / 2;
-      if(var3 + var8 > SoundCache.canvasWidth) {
+      if (var3 + var8 > SoundCache.canvasWidth) {
          var8 = SoundCache.canvasWidth - var3;
       }
 
-      if(var8 < 0) {
+      if (var8 < 0) {
          var8 = 0;
       }
 
       int var9 = var2;
-      if(var4 + var2 > Huffman.canvasHeight) {
+      if (var4 + var2 > Huffman.canvasHeight) {
          var9 = Huffman.canvasHeight - var4;
       }
 
-      if(var9 < 0) {
+      if (var9 < 0) {
          var9 = 0;
       }
 
@@ -6315,11 +6062,11 @@ public final class Client extends GameShell implements Usernamed {
       signature = "(ZI)V",
       garbageValue = "-271438207"
    )
-   final void __iu_141(boolean var1) {
+   final void method87(boolean var1) {
       int var2 = rootWidgetGroup;
       int var3 = SoundCache.canvasWidth;
       int var4 = Huffman.canvasHeight;
-      if(GroundItemPile.loadWidgetGroup(var2)) {
+      if (GroundItemPile.loadWidgetGroup(var2)) {
          WorldMapRegion.notRevalidateWidgetScroll(Widget.widgets[var2], -1, var3, var4, var1);
       }
 
@@ -6332,10 +6079,10 @@ public final class Client extends GameShell implements Usernamed {
    )
    @Export("alignWidget")
    void alignWidget(Widget var1) {
-      Widget var2 = var1.parentId == -1?null:Huffman.getWidget(var1.parentId);
+      Widget var2 = var1.parentId == -1 ? null : Huffman.getWidget(var1.parentId);
       int var3;
       int var4;
-      if(var2 == null) {
+      if (var2 == null) {
          var3 = SoundCache.canvasWidth;
          var4 = Huffman.canvasHeight;
       } else {
@@ -6352,41 +6099,41 @@ public final class Client extends GameShell implements Usernamed {
       signature = "(I)V",
       garbageValue = "715978124"
    )
-   final void __jh_142() {
+   final void method88() {
       class22.method295(clickedWidget);
       ++MouseRecorder.widgetDragDuration;
-      if(__client_nt && __client_nn) {
+      if (field103 && field106) {
          int var1 = MouseHandler.MouseHandler_x;
          int var2 = MouseHandler.MouseHandler_y;
          var1 -= widgetClickX;
          var2 -= widgetClickY;
-         if(var1 < __client_nw) {
-            var1 = __client_nw;
+         if (var1 < field108) {
+            var1 = field108;
          }
 
-         if(var1 + clickedWidget.width > __client_nw + clickedWidgetParent.width) {
-            var1 = __client_nw + clickedWidgetParent.width - clickedWidget.width;
+         if (var1 + clickedWidget.width > field108 + clickedWidgetParent.width) {
+            var1 = field108 + clickedWidgetParent.width - clickedWidget.width;
          }
 
-         if(var2 < __client_nl) {
-            var2 = __client_nl;
+         if (var2 < field109) {
+            var2 = field109;
          }
 
-         if(var2 + clickedWidget.height > __client_nl + clickedWidgetParent.height) {
-            var2 = __client_nl + clickedWidgetParent.height - clickedWidget.height;
+         if (var2 + clickedWidget.height > field109 + clickedWidgetParent.height) {
+            var2 = field109 + clickedWidgetParent.height - clickedWidget.height;
          }
 
-         int var3 = var1 - __client_nk;
-         int var4 = var2 - __client_np;
+         int var3 = var1 - field110;
+         int var4 = var2 - field111;
          int var5 = clickedWidget.dragZoneSize;
-         if(MouseRecorder.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) {
+         if (MouseRecorder.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) {
             isDraggingWidget = true;
          }
 
-         int var6 = var1 - __client_nw + clickedWidgetParent.scrollX;
-         int var7 = var2 - __client_nl + clickedWidgetParent.scrollY;
+         int var6 = var1 - field108 + clickedWidgetParent.scrollX;
+         int var7 = var2 - field109 + clickedWidgetParent.scrollY;
          ScriptEvent var8;
-         if(clickedWidget.onDrag != null && isDraggingWidget) {
+         if (clickedWidget.onDrag != null && isDraggingWidget) {
             var8 = new ScriptEvent();
             var8.widget = clickedWidget;
             var8.mouseX = var6;
@@ -6395,9 +6142,10 @@ public final class Client extends GameShell implements Usernamed {
             AbstractIndexCache.runScript(var8);
          }
 
-         if(MouseHandler.MouseHandler_currentButton == 0) {
-            if(isDraggingWidget) {
-               if(clickedWidget.onDragComplete != null) {
+         if (MouseHandler.MouseHandler_currentButton == 0) {
+            int var10;
+            if (isDraggingWidget) {
+               if (clickedWidget.onDragComplete != null) {
                   var8 = new ScriptEvent();
                   var8.widget = clickedWidget;
                   var8.mouseX = var6;
@@ -6407,60 +6155,52 @@ public final class Client extends GameShell implements Usernamed {
                   AbstractIndexCache.runScript(var8);
                }
 
-               if(draggedOnWidget != null) {
-                  Widget var9 = clickedWidget;
-                  int var10 = WorldMapRegion.method568(class1.getWidgetClickMask(var9));
-                  Widget var15;
-                  if(var10 == 0) {
-                     var15 = null;
+               if (draggedOnWidget != null) {
+                  Widget var13 = clickedWidget;
+                  var10 = WorldMapRegion.method568(class1.getWidgetClickMask(var13));
+                  Widget var11;
+                  if (var10 == 0) {
+                     var11 = null;
                   } else {
-                     int var11 = 0;
-
-                     while(true) {
-                        if(var11 >= var10) {
-                           var15 = var9;
-                           break;
+                     label100: {
+                        for (int var12 = 0; var12 < var10; ++var12) {
+                           var13 = Huffman.getWidget(var13.parentId);
+                           if (var13 == null) {
+                              var11 = null;
+                              break label100;
+                           }
                         }
 
-                        var9 = Huffman.getWidget(var9.parentId);
-                        if(var9 == null) {
-                           var15 = null;
-                           break;
-                        }
-
-                        ++var11;
+                        var11 = var13;
                      }
                   }
 
-                  if(var15 != null) {
-                     PacketBufferNode var12 = Interpreter.method1915(ClientPacket.__gs_bk, packetWriter.isaacCipher);
-                     var12.packetBuffer.__bo_322(clickedWidget.childIndex);
-                     var12.packetBuffer.__bo_322(draggedOnWidget.itemId);
-                     var12.packetBuffer.writeShort(draggedOnWidget.childIndex);
-                     var12.packetBuffer.writeIntLE(clickedWidget.id);
-                     var12.packetBuffer.writeIntME(draggedOnWidget.id);
-                     var12.packetBuffer.writeShort(clickedWidget.itemId);
-                     packetWriter.__q_167(var12);
+                  if (var11 != null) {
+                     PacketBufferNode var14 = Interpreter.method1915(ClientPacket.field279, packetWriter.isaacCipher);
+                     var14.packetBuffer.method63(clickedWidget.childIndex);
+                     var14.packetBuffer.method63(draggedOnWidget.itemId);
+                     var14.packetBuffer.writeShort(draggedOnWidget.childIndex);
+                     var14.packetBuffer.writeIntLE(clickedWidget.id);
+                     var14.packetBuffer.writeIntME(draggedOnWidget.id);
+                     var14.packetBuffer.writeShort(clickedWidget.itemId);
+                     packetWriter.method241(var14);
                   }
                }
-            } else if(this.shouldLeftClickOpenMenu()) {
-               this.openMenu(__client_nk + widgetClickX, __client_np + widgetClickY);
-            } else if(menuOptionsCount > 0) {
-               int var13 = widgetClickX + __client_nk;
-               int var14 = widgetClickY + __client_np;
-               class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var13, var14);
+            } else if (this.shouldLeftClickOpenMenu()) {
+               this.openMenu(field110 + widgetClickX, field111 + widgetClickY);
+            } else if (menuOptionsCount > 0) {
+               int var9 = widgetClickX + field110;
+               var10 = widgetClickY + field111;
+               class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var9, var10);
                UnitPriceComparator.tempMenuAction = null;
             }
 
             clickedWidget = null;
          }
-
-      } else {
-         if(MouseRecorder.widgetDragDuration > 1) {
-            clickedWidget = null;
-         }
-
+      } else if (MouseRecorder.widgetDragDuration > 1) {
+         clickedWidget = null;
       }
+
    }
 
    @ObfuscatedName("kr")
@@ -6470,7 +6210,7 @@ public final class Client extends GameShell implements Usernamed {
    )
    @Export("username")
    public Username username() {
-      return Canvas.localPlayer != null?Canvas.localPlayer.username:null;
+      return Canvas.localPlayer != null ? Canvas.localPlayer.username : null;
    }
 
    @ObfuscatedName("l")
@@ -6483,7 +6223,7 @@ public final class Client extends GameShell implements Usernamed {
       int var1 = var0.length();
       int var2 = 0;
 
-      for(int var3 = 0; var3 < var1; ++var3) {
+      for (int var3 = 0; var3 < var1; ++var3) {
          var2 = (var2 << 5) - var2 + HealthBar.charToByteCp1252(var0.charAt(var3));
       }
 
@@ -6498,4 +6238,282 @@ public final class Client extends GameShell implements Usernamed {
    public static int method1692(String var0) {
       return var0.length() + 2;
    }
+
+   static {
+      field161 = true;
+      worldId = 1;
+      worldProperties = 0;
+      gameBuild = 0;
+      isMembersWorld = false;
+      isLowDetail = false;
+      language = 0;
+      clientType = -1;
+      field162 = false;
+      gameState = 0;
+      isLoading = true;
+      cycle = 0;
+      mouseLastLastPressedTimeMillis = 1L;
+      field163 = -1;
+      field164 = -1;
+      field165 = -1L;
+      field166 = true;
+      displayFps = false;
+      rebootTimer = 0;
+      hintArrowType = 0;
+      hintArrowNpcIndex = 0;
+      hintArrowPlayerIndex = 0;
+      hintArrowX = 0;
+      hintArrowY = 0;
+      hintArrowHeight = 0;
+      hintArrowSubX = 0;
+      hintArrowSubY = 0;
+      playerAttackOption = AttackOption.AttackOption_hidden;
+      npcAttackOption = AttackOption.AttackOption_hidden;
+      titleLoadingStage = 0;
+      js5ConnectState = 0;
+      field167 = 0;
+      js5Errors = 0;
+      loginState = 0;
+      field168 = 0;
+      field169 = 0;
+      field170 = 0;
+      field658 = class159.field1985;
+      Login_isUsernameRemembered = false;
+      secureRandomFuture = new SecureRandomFuture();
+      field172 = null;
+      npcs = new NPC[32768];
+      npcCount = 0;
+      npcIndices = new int[32768];
+      field173 = 0;
+      field174 = new int[250];
+      packetWriter = new PacketWriter();
+      field175 = 0;
+      field176 = false;
+      useBufferedSocket = true;
+      timer = new Timer();
+      fontsMap = new HashMap();
+      field177 = 0;
+      field178 = 1;
+      field179 = 0;
+      field180 = 1;
+      field181 = 0;
+      collisionMaps = new CollisionMap[4];
+      isInInstance = false;
+      instanceChunkTemplates = new int[4][13][13];
+      field182 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3};
+      field183 = 0;
+      field184 = 2301979;
+      field185 = 5063219;
+      field186 = 3353893;
+      field187 = 7759444;
+      field188 = false;
+      field189 = 0;
+      cameraPitchTarget = 128;
+      minimapOrientation = 0;
+      field190 = 0;
+      field191 = 0;
+      field192 = 0;
+      field193 = 0;
+      oculusOrbState = 0;
+      cameraFollowHeight = 50;
+      field194 = 0;
+      field195 = 0;
+      field196 = 0;
+      oculusOrbNormalSpeed = 12;
+      field197 = 6;
+      field198 = 0;
+      field199 = false;
+      field200 = 0;
+      field201 = false;
+      field202 = 0;
+      overheadTextCount = 0;
+      overheadTextLimit = 50;
+      overheadTextXs = new int[overheadTextLimit];
+      overheadTextYs = new int[overheadTextLimit];
+      overheadTextAscents = new int[overheadTextLimit];
+      overheadTextXOffsets = new int[overheadTextLimit];
+      overheadTextColors = new int[overheadTextLimit];
+      overheadTextEffects = new int[overheadTextLimit];
+      overheadTextCyclesRemaining = new int[overheadTextLimit];
+      overheadText = new String[overheadTextLimit];
+      tileLastDrawnActor = new int[104][104];
+      viewportDrawCount = 0;
+      viewportTempX = -1;
+      viewportTempY = -1;
+      mouseCrossX = 0;
+      mouseCrossY = 0;
+      mouseCrossState = 0;
+      mouseCrossColor = 0;
+      showMouseCross = true;
+      field203 = 0;
+      field204 = 0;
+      dragItemSlotSource = 0;
+      field205 = 0;
+      field206 = 0;
+      dragItemSlotDestination = 0;
+      field207 = false;
+      itemDragDuration = 0;
+      field208 = 0;
+      showLoadingMessages = true;
+      players = new Player[2048];
+      localPlayerIndex = -1;
+      field209 = 0;
+      renderSelf = true;
+      field210 = 0;
+      field211 = 0;
+      field212 = new int[1000];
+      playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51};
+      playerMenuActions = new String[8];
+      playerOptionsPriorities = new boolean[8];
+      field213 = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792};
+      combatTargetPlayerIndex = -1;
+      groundItems = new NodeDeque[4][104][104];
+      field214 = new NodeDeque();
+      projectiles = new NodeDeque();
+      graphicsObjects = new NodeDeque();
+      currentLevels = new int[25];
+      levels = new int[25];
+      experience = new int[25];
+      field215 = 0;
+      isMenuOpen = false;
+      menuOptionsCount = 0;
+      menuArguments1 = new int[500];
+      menuArguments2 = new int[500];
+      menuOpcodes = new int[500];
+      menuArguments0 = new int[500];
+      menuActions = new String[500];
+      menuTargetNames = new String[500];
+      menuShiftClick = new boolean[500];
+      followerOpsLowPriority = false;
+      shiftClickDrop = false;
+      tapToDrop = false;
+      showMouseOverText = true;
+      field216 = -1;
+      field217 = -1;
+      field218 = 0;
+      field219 = 50;
+      isItemSelected = 0;
+      selectedItemName = null;
+      isSpellSelected = false;
+      field220 = -1;
+      field157 = -1;
+      selectedSpellActionName = null;
+      selectedSpellName = null;
+      rootWidgetGroup = -1;
+      widgetGroupParents = new NodeHashTable(8);
+      field151 = 0;
+      field153 = -1;
+      chatEffects = 0;
+      field136 = 0;
+      field127 = null;
+      runEnergy = 0;
+      weight = 0;
+      rights = 0;
+      followerIndex = -1;
+      field155 = false;
+      viewportWidget = null;
+      clickedWidget = null;
+      clickedWidgetParent = null;
+      widgetClickX = 0;
+      widgetClickY = 0;
+      draggedOnWidget = null;
+      field106 = false;
+      field108 = -1;
+      field109 = -1;
+      field103 = false;
+      field110 = -1;
+      field111 = -1;
+      isDraggingWidget = false;
+      cycleCntr = 1;
+      field121 = new int[32];
+      field123 = 0;
+      field116 = new int[32];
+      field117 = 0;
+      changedSkills = new int[32];
+      changedSkillsCount = 0;
+      chatCycle = 0;
+      field105 = 0;
+      field129 = 0;
+      field122 = 0;
+      field154 = 0;
+      field124 = 0;
+      mouseWheelRotation = 0;
+      scriptEvents = new NodeDeque();
+      field147 = new NodeDeque();
+      field148 = new NodeDeque();
+      widgetClickMasks = new NodeHashTable(512);
+      rootWidgetCount = 0;
+      field98 = -2;
+      field100 = new boolean[100];
+      field102 = new boolean[100];
+      field101 = new boolean[100];
+      rootWidgetXs = new int[100];
+      rootWidgetYs = new int[100];
+      rootWidgetWidths = new int[100];
+      rootWidgetHeights = new int[100];
+      gameDrawingMode = 0;
+      field99 = 0L;
+      isResizable = true;
+      field160 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215};
+      publicChatMode = 0;
+      field138 = 0;
+      field158 = "";
+      field152 = new long[100];
+      field156 = 0;
+      field137 = 0;
+      field146 = new int[128];
+      field145 = new int[128];
+      field126 = -1L;
+      field125 = -1;
+      mapIconCount = 0;
+      mapIconXs = new int[1000];
+      mapIconYs = new int[1000];
+      mapIcons = new Sprite[1000];
+      destinationX = 0;
+      destinationY = 0;
+      minimapState = 0;
+      field128 = 255;
+      field112 = -1;
+      field107 = false;
+      soundEffectVolume = 127;
+      field115 = 127;
+      soundEffectCount = 0;
+      soundEffectIds = new int[50];
+      queuedSoundEffectLoops = new int[50];
+      queuedSoundEffectDelays = new int[50];
+      soundLocations = new int[50];
+      soundEffects = new SoundEffect[50];
+      isCameraLocked = false;
+      field139 = new boolean[5];
+      field141 = new int[5];
+      field142 = new int[5];
+      field143 = new int[5];
+      field144 = new int[5];
+      field130 = 256;
+      field131 = 205;
+      field150 = 256;
+      field149 = 320;
+      field135 = 1;
+      field134 = 32767;
+      field132 = 1;
+      field133 = 32767;
+      viewportOffsetX = 0;
+      viewportOffsetY = 0;
+      viewportWidth = 0;
+      viewportHeight = 0;
+      viewportZoom = 0;
+      field119 = new PlayerAppearance();
+      field118 = -1;
+      field120 = -1;
+      platformInfoProvider = new DesktopPlatformInfoProvider();
+      grandExchangeOffers = new GrandExchangeOffer[8];
+      field159 = new OwnWorldComparator();
+      field104 = -1;
+      indexCacheLoaders = new ArrayList(10);
+      indexCacheLoaderIndex = 0;
+      field140 = 0;
+      field895 = new class65();
+      field113 = new int[50];
+      field114 = new int[50];
+   }
 }
diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java
index cf9ef3997d..cc684eabd8 100644
--- a/runescape-client/src/main/java/ClientPacket.java
+++ b/runescape-client/src/main/java/ClientPacket.java
@@ -11,507 +11,507 @@ public class ClientPacket implements ClientPacketMarker {
    @ObfuscatedGetter(
       intValue = 1076448827
    )
-   static int __gs_qh;
+   static int field221;
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_m;
+   public static final ClientPacket field222;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_f;
+   public static final ClientPacket field223;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_q;
+   public static final ClientPacket field224;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_w;
+   public static final ClientPacket field225;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_o;
+   public static final ClientPacket field226;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_u;
+   public static final ClientPacket field227;
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_g;
+   public static final ClientPacket field228;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_l;
+   public static final ClientPacket field229;
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_e;
+   public static final ClientPacket field230;
    @ObfuscatedName("x")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_x;
+   public static final ClientPacket field231;
    @ObfuscatedName("d")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_d;
+   public static final ClientPacket field232;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_k;
+   public static final ClientPacket field233;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_n;
+   public static final ClientPacket field234;
    @ObfuscatedName("i")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_i;
+   public static final ClientPacket field235;
    @ObfuscatedName("a")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_a;
+   public static final ClientPacket field236;
    @ObfuscatedName("z")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_z;
+   public static final ClientPacket field237;
    @ObfuscatedName("j")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_j;
+   public static final ClientPacket field238;
    @ObfuscatedName("s")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_s;
+   public static final ClientPacket field239;
    @ObfuscatedName("t")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_t;
+   public static final ClientPacket field240;
    @ObfuscatedName("y")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_y;
+   public static final ClientPacket field241;
    @ObfuscatedName("h")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_h;
+   public static final ClientPacket field242;
    @ObfuscatedName("b")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_b;
+   public static final ClientPacket field243;
    @ObfuscatedName("c")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_c;
+   public static final ClientPacket field244;
    @ObfuscatedName("r")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_r;
+   public static final ClientPacket field245;
    @ObfuscatedName("p")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_p;
+   public static final ClientPacket field246;
    @ObfuscatedName("v")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_v;
+   public static final ClientPacket field247;
    @ObfuscatedName("ag")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ag;
+   public static final ClientPacket field248;
    @ObfuscatedName("aq")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_aq;
+   public static final ClientPacket field249;
    @ObfuscatedName("aj")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_aj;
+   public static final ClientPacket field250;
    @ObfuscatedName("av")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_av;
+   public static final ClientPacket field251;
    @ObfuscatedName("ar")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ar;
+   public static final ClientPacket field252;
    @ObfuscatedName("ac")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ac;
+   public static final ClientPacket field253;
    @ObfuscatedName("ay")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ay;
+   public static final ClientPacket field254;
    @ObfuscatedName("ah")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ah;
+   public static final ClientPacket field255;
    @ObfuscatedName("ak")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ak;
+   public static final ClientPacket field256;
    @ObfuscatedName("aw")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_aw;
+   public static final ClientPacket field257;
    @ObfuscatedName("al")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_al;
+   public static final ClientPacket field258;
    @ObfuscatedName("ab")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ab;
+   public static final ClientPacket field259;
    @ObfuscatedName("ae")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ae;
+   public static final ClientPacket field260;
    @ObfuscatedName("at")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_at;
+   public static final ClientPacket field261;
    @ObfuscatedName("ad")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ad;
+   public static final ClientPacket field262;
    @ObfuscatedName("ap")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ap;
+   public static final ClientPacket field263;
    @ObfuscatedName("as")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_as;
+   public static final ClientPacket field264;
    @ObfuscatedName("am")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   static final ClientPacket __gs_am;
+   static final ClientPacket field265;
    @ObfuscatedName("an")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_an;
+   public static final ClientPacket field266;
    @ObfuscatedName("az")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_az;
+   public static final ClientPacket field267;
    @ObfuscatedName("au")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_au;
+   public static final ClientPacket field268;
    @ObfuscatedName("ao")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ao;
+   public static final ClientPacket field269;
    @ObfuscatedName("aa")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_aa;
+   public static final ClientPacket field270;
    @ObfuscatedName("ax")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ax;
+   public static final ClientPacket field271;
    @ObfuscatedName("af")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_af;
+   public static final ClientPacket field272;
    @ObfuscatedName("ai")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ai;
+   public static final ClientPacket field273;
    @ObfuscatedName("ba")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ba;
+   public static final ClientPacket field274;
    @ObfuscatedName("bb")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bb;
+   public static final ClientPacket field275;
    @ObfuscatedName("bs")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bs;
+   public static final ClientPacket field276;
    @ObfuscatedName("bq")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bq;
+   public static final ClientPacket field277;
    @ObfuscatedName("bn")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bn;
+   public static final ClientPacket field278;
    @ObfuscatedName("bk")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bk;
+   public static final ClientPacket field279;
    @ObfuscatedName("bd")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bd;
+   public static final ClientPacket field280;
    @ObfuscatedName("bc")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bc;
+   public static final ClientPacket field281;
    @ObfuscatedName("bo")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bo;
+   public static final ClientPacket field282;
    @ObfuscatedName("bx")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bx;
+   public static final ClientPacket field283;
    @ObfuscatedName("by")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_by;
+   public static final ClientPacket field284;
    @ObfuscatedName("bu")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bu;
+   public static final ClientPacket field285;
    @ObfuscatedName("bm")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bm;
+   public static final ClientPacket field286;
    @ObfuscatedName("bl")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bl;
+   public static final ClientPacket field287;
    @ObfuscatedName("br")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_br;
+   public static final ClientPacket field288;
    @ObfuscatedName("bj")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bj;
+   public static final ClientPacket field289;
    @ObfuscatedName("bi")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bi;
+   public static final ClientPacket field290;
    @ObfuscatedName("bz")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bz;
+   public static final ClientPacket field291;
    @ObfuscatedName("bg")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bg;
+   public static final ClientPacket field292;
    @ObfuscatedName("bt")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bt;
+   public static final ClientPacket field293;
    @ObfuscatedName("bp")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bp;
+   public static final ClientPacket field294;
    @ObfuscatedName("bf")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bf;
+   public static final ClientPacket field295;
    @ObfuscatedName("bh")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bh;
+   public static final ClientPacket field296;
    @ObfuscatedName("be")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_be;
+   public static final ClientPacket field297;
    @ObfuscatedName("bv")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bv;
+   public static final ClientPacket field298;
    @ObfuscatedName("bw")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bw;
+   public static final ClientPacket field299;
    @ObfuscatedName("cr")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cr;
+   public static final ClientPacket field300;
    @ObfuscatedName("cv")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cv;
+   public static final ClientPacket field301;
    @ObfuscatedName("ce")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ce;
+   public static final ClientPacket field302;
    @ObfuscatedName("cy")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cy;
+   public static final ClientPacket field303;
    @ObfuscatedName("cs")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cs;
+   public static final ClientPacket field304;
    @ObfuscatedName("cm")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cm;
+   public static final ClientPacket field305;
    @ObfuscatedName("cj")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cj;
+   public static final ClientPacket field306;
    @ObfuscatedName("cu")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cu;
+   public static final ClientPacket field307;
    @ObfuscatedName("cb")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cb;
+   public static final ClientPacket field308;
    @ObfuscatedName("ck")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ck;
+   public static final ClientPacket field309;
    @ObfuscatedName("cn")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cn;
+   public static final ClientPacket field310;
    @ObfuscatedName("cq")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cq;
+   public static final ClientPacket field311;
    @ObfuscatedName("ch")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ch;
+   public static final ClientPacket field312;
    @ObfuscatedName("cw")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cw;
+   public static final ClientPacket field313;
    @ObfuscatedName("cg")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cg;
+   public static final ClientPacket field314;
    @ObfuscatedName("cf")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cf;
+   public static final ClientPacket field315;
    @ObfuscatedName("cp")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cp;
+   public static final ClientPacket field316;
    @ObfuscatedName("cl")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cl;
+   public static final ClientPacket field317;
    @ObfuscatedName("ct")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ct;
+   public static final ClientPacket field318;
    @ObfuscatedName("cz")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cz;
+   public static final ClientPacket field319;
    @ObfuscatedName("cc")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cc;
+   public static final ClientPacket field320;
    @ObfuscatedName("ci")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   static final ClientPacket __gs_ci;
+   static final ClientPacket field321;
    @ObfuscatedName("cd")
    @ObfuscatedGetter(
       intValue = -286923745
@@ -525,109 +525,6 @@ public class ClientPacket implements ClientPacketMarker {
    @Export("length")
    final int length;
 
-   static {
-      __gs_m = new ClientPacket(0, 8);
-      __gs_f = new ClientPacket(1, 3);
-      __gs_q = new ClientPacket(2, 14);
-      __gs_w = new ClientPacket(3, 7);
-      __gs_o = new ClientPacket(4, -1);
-      __gs_u = new ClientPacket(5, 7);
-      __gs_g = new ClientPacket(6, 7);
-      __gs_l = new ClientPacket(7, 8);
-      __gs_e = new ClientPacket(8, -1);
-      __gs_x = new ClientPacket(9, 4);
-      __gs_d = new ClientPacket(10, 7);
-      __gs_k = new ClientPacket(11, 10);
-      __gs_n = new ClientPacket(12, 13);
-      __gs_i = new ClientPacket(13, -1);
-      __gs_a = new ClientPacket(14, 8);
-      __gs_z = new ClientPacket(15, 3);
-      __gs_j = new ClientPacket(16, -2);
-      __gs_s = new ClientPacket(17, 4);
-      __gs_t = new ClientPacket(18, 15);
-      __gs_y = new ClientPacket(19, 8);
-      __gs_h = new ClientPacket(20, 0);
-      __gs_b = new ClientPacket(21, 8);
-      __gs_c = new ClientPacket(22, 0);
-      __gs_r = new ClientPacket(23, 11);
-      __gs_p = new ClientPacket(24, 2);
-      __gs_v = new ClientPacket(25, -2);
-      __gs_ag = new ClientPacket(26, 8);
-      __gs_aq = new ClientPacket(27, 3);
-      __gs_aj = new ClientPacket(28, -1);
-      __gs_av = new ClientPacket(29, 7);
-      __gs_ar = new ClientPacket(30, 2);
-      __gs_ac = new ClientPacket(31, 3);
-      __gs_ay = new ClientPacket(32, 8);
-      __gs_ah = new ClientPacket(33, 3);
-      __gs_ak = new ClientPacket(34, -1);
-      __gs_aw = new ClientPacket(35, 5);
-      __gs_al = new ClientPacket(36, 2);
-      __gs_ab = new ClientPacket(37, 0);
-      __gs_ae = new ClientPacket(38, -1);
-      __gs_at = new ClientPacket(39, 4);
-      __gs_ad = new ClientPacket(40, 8);
-      __gs_ap = new ClientPacket(41, 6);
-      __gs_as = new ClientPacket(42, 2);
-      __gs_am = new ClientPacket(43, -1);
-      __gs_an = new ClientPacket(44, 15);
-      __gs_az = new ClientPacket(45, 4);
-      __gs_au = new ClientPacket(46, 8);
-      __gs_ao = new ClientPacket(47, 3);
-      __gs_aa = new ClientPacket(48, 8);
-      __gs_ax = new ClientPacket(49, 0);
-      __gs_af = new ClientPacket(50, 3);
-      __gs_ai = new ClientPacket(51, 7);
-      __gs_ba = new ClientPacket(52, -1);
-      __gs_bb = new ClientPacket(53, 13);
-      __gs_bs = new ClientPacket(54, -1);
-      __gs_bq = new ClientPacket(55, 9);
-      __gs_bn = new ClientPacket(56, 3);
-      __gs_bk = new ClientPacket(57, 16);
-      __gs_bd = new ClientPacket(58, 8);
-      __gs_bc = new ClientPacket(59, 3);
-      __gs_bo = new ClientPacket(60, -1);
-      __gs_bx = new ClientPacket(61, 9);
-      __gs_by = new ClientPacket(62, 3);
-      __gs_bu = new ClientPacket(63, 16);
-      __gs_bm = new ClientPacket(64, 8);
-      __gs_bl = new ClientPacket(65, 8);
-      __gs_br = new ClientPacket(66, 8);
-      __gs_bj = new ClientPacket(67, -2);
-      __gs_bi = new ClientPacket(68, 8);
-      __gs_bz = new ClientPacket(69, 4);
-      __gs_bg = new ClientPacket(70, 6);
-      __gs_bt = new ClientPacket(71, 3);
-      __gs_bp = new ClientPacket(72, 8);
-      __gs_bf = new ClientPacket(73, 1);
-      __gs_bh = new ClientPacket(74, 7);
-      __gs_be = new ClientPacket(75, 3);
-      __gs_bv = new ClientPacket(76, 0);
-      __gs_bw = new ClientPacket(77, -1);
-      __gs_cr = new ClientPacket(78, -1);
-      __gs_cv = new ClientPacket(79, 7);
-      __gs_ce = new ClientPacket(80, 9);
-      __gs_cy = new ClientPacket(81, 11);
-      __gs_cs = new ClientPacket(82, 16);
-      __gs_cm = new ClientPacket(83, 3);
-      __gs_cj = new ClientPacket(84, 8);
-      __gs_cu = new ClientPacket(85, 8);
-      __gs_cb = new ClientPacket(86, 9);
-      __gs_ck = new ClientPacket(87, 8);
-      __gs_cn = new ClientPacket(88, -1);
-      __gs_cq = new ClientPacket(89, 7);
-      __gs_ch = new ClientPacket(90, -1);
-      __gs_cw = new ClientPacket(91, -1);
-      __gs_cg = new ClientPacket(92, 13);
-      __gs_cf = new ClientPacket(93, 3);
-      __gs_cp = new ClientPacket(94, 7);
-      __gs_cl = new ClientPacket(95, -1);
-      __gs_ct = new ClientPacket(96, -1);
-      __gs_cz = new ClientPacket(97, -1);
-      __gs_cc = new ClientPacket(98, 8);
-      __gs_ci = new ClientPacket(99, 7);
-   }
-
    ClientPacket(int var1, int var2) {
       this.id = var1;
       this.length = var2;
@@ -639,7 +536,7 @@ public class ClientPacket implements ClientPacketMarker {
       garbageValue = "-26"
    )
    public static StudioGame[] method3664() {
-      return new StudioGame[]{StudioGame.__is_q, StudioGame.__is_m, StudioGame.__is_o, StudioGame.__is_u, StudioGame.__is_f, StudioGame.__is_w};
+      return new StudioGame[]{StudioGame.field889, StudioGame.field887, StudioGame.field891, StudioGame.field892, StudioGame.field888, StudioGame.field890};
    }
 
    @ObfuscatedName("m")
@@ -650,4 +547,107 @@ public class ClientPacket implements ClientPacketMarker {
    static AttackOption[] method3665() {
       return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels};
    }
+
+   static {
+      field222 = new ClientPacket(0, 8);
+      field223 = new ClientPacket(1, 3);
+      field224 = new ClientPacket(2, 14);
+      field225 = new ClientPacket(3, 7);
+      field226 = new ClientPacket(4, -1);
+      field227 = new ClientPacket(5, 7);
+      field228 = new ClientPacket(6, 7);
+      field229 = new ClientPacket(7, 8);
+      field230 = new ClientPacket(8, -1);
+      field231 = new ClientPacket(9, 4);
+      field232 = new ClientPacket(10, 7);
+      field233 = new ClientPacket(11, 10);
+      field234 = new ClientPacket(12, 13);
+      field235 = new ClientPacket(13, -1);
+      field236 = new ClientPacket(14, 8);
+      field237 = new ClientPacket(15, 3);
+      field238 = new ClientPacket(16, -2);
+      field239 = new ClientPacket(17, 4);
+      field240 = new ClientPacket(18, 15);
+      field241 = new ClientPacket(19, 8);
+      field242 = new ClientPacket(20, 0);
+      field243 = new ClientPacket(21, 8);
+      field244 = new ClientPacket(22, 0);
+      field245 = new ClientPacket(23, 11);
+      field246 = new ClientPacket(24, 2);
+      field247 = new ClientPacket(25, -2);
+      field248 = new ClientPacket(26, 8);
+      field249 = new ClientPacket(27, 3);
+      field250 = new ClientPacket(28, -1);
+      field251 = new ClientPacket(29, 7);
+      field252 = new ClientPacket(30, 2);
+      field253 = new ClientPacket(31, 3);
+      field254 = new ClientPacket(32, 8);
+      field255 = new ClientPacket(33, 3);
+      field256 = new ClientPacket(34, -1);
+      field257 = new ClientPacket(35, 5);
+      field258 = new ClientPacket(36, 2);
+      field259 = new ClientPacket(37, 0);
+      field260 = new ClientPacket(38, -1);
+      field261 = new ClientPacket(39, 4);
+      field262 = new ClientPacket(40, 8);
+      field263 = new ClientPacket(41, 6);
+      field264 = new ClientPacket(42, 2);
+      field265 = new ClientPacket(43, -1);
+      field266 = new ClientPacket(44, 15);
+      field267 = new ClientPacket(45, 4);
+      field268 = new ClientPacket(46, 8);
+      field269 = new ClientPacket(47, 3);
+      field270 = new ClientPacket(48, 8);
+      field271 = new ClientPacket(49, 0);
+      field272 = new ClientPacket(50, 3);
+      field273 = new ClientPacket(51, 7);
+      field274 = new ClientPacket(52, -1);
+      field275 = new ClientPacket(53, 13);
+      field276 = new ClientPacket(54, -1);
+      field277 = new ClientPacket(55, 9);
+      field278 = new ClientPacket(56, 3);
+      field279 = new ClientPacket(57, 16);
+      field280 = new ClientPacket(58, 8);
+      field281 = new ClientPacket(59, 3);
+      field282 = new ClientPacket(60, -1);
+      field283 = new ClientPacket(61, 9);
+      field284 = new ClientPacket(62, 3);
+      field285 = new ClientPacket(63, 16);
+      field286 = new ClientPacket(64, 8);
+      field287 = new ClientPacket(65, 8);
+      field288 = new ClientPacket(66, 8);
+      field289 = new ClientPacket(67, -2);
+      field290 = new ClientPacket(68, 8);
+      field291 = new ClientPacket(69, 4);
+      field292 = new ClientPacket(70, 6);
+      field293 = new ClientPacket(71, 3);
+      field294 = new ClientPacket(72, 8);
+      field295 = new ClientPacket(73, 1);
+      field296 = new ClientPacket(74, 7);
+      field297 = new ClientPacket(75, 3);
+      field298 = new ClientPacket(76, 0);
+      field299 = new ClientPacket(77, -1);
+      field300 = new ClientPacket(78, -1);
+      field301 = new ClientPacket(79, 7);
+      field302 = new ClientPacket(80, 9);
+      field303 = new ClientPacket(81, 11);
+      field304 = new ClientPacket(82, 16);
+      field305 = new ClientPacket(83, 3);
+      field306 = new ClientPacket(84, 8);
+      field307 = new ClientPacket(85, 8);
+      field308 = new ClientPacket(86, 9);
+      field309 = new ClientPacket(87, 8);
+      field310 = new ClientPacket(88, -1);
+      field311 = new ClientPacket(89, 7);
+      field312 = new ClientPacket(90, -1);
+      field313 = new ClientPacket(91, -1);
+      field314 = new ClientPacket(92, 13);
+      field315 = new ClientPacket(93, 3);
+      field316 = new ClientPacket(94, 7);
+      field317 = new ClientPacket(95, -1);
+      field318 = new ClientPacket(96, -1);
+      field319 = new ClientPacket(97, -1);
+      field320 = new ClientPacket(98, 8);
+      field321 = new ClientPacket(99, 7);
+   }
 }
diff --git a/runescape-client/src/main/java/ClientParameter.java b/runescape-client/src/main/java/ClientParameter.java
index 19961d5bed..f2c8156aea 100644
--- a/runescape-client/src/main/java/ClientParameter.java
+++ b/runescape-client/src/main/java/ClientParameter.java
@@ -16,128 +16,106 @@ public class ClientParameter {
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_m;
+   static final ClientParameter field322;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_f;
+   static final ClientParameter field323;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_q;
+   static final ClientParameter field324;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_w;
+   static final ClientParameter field325;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_o;
+   static final ClientParameter field326;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_u;
+   static final ClientParameter field327;
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_g;
+   static final ClientParameter field328;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_l;
+   static final ClientParameter field329;
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_e;
+   static final ClientParameter field330;
    @ObfuscatedName("x")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_x;
+   static final ClientParameter field331;
    @ObfuscatedName("d")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_d;
+   static final ClientParameter field332;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_k;
+   static final ClientParameter field333;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   public static final ClientParameter __ji_n;
+   public static final ClientParameter field334;
    @ObfuscatedName("i")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   public static final ClientParameter __ji_i;
+   public static final ClientParameter field335;
    @ObfuscatedName("a")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_a;
+   static final ClientParameter field336;
    @ObfuscatedName("z")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_z;
+   static final ClientParameter field337;
    @ObfuscatedName("j")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_j;
+   static final ClientParameter field338;
    @ObfuscatedName("s")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_s;
+   static final ClientParameter field339;
    @ObfuscatedName("t")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_t;
+   static final ClientParameter field340;
    @ObfuscatedName("fp")
    @ObfuscatedSignature(
       signature = "Lfu;"
    )
-   static AbstractSocket __ji_fp;
+   static AbstractSocket field341;
    @ObfuscatedName("y")
    @Export("id")
    public final String id;
 
-   static {
-      __ji_m = new ClientParameter("8", "8");
-      __ji_f = new ClientParameter("15", "15");
-      __ji_q = new ClientParameter("7", "7");
-      __ji_w = new ClientParameter("10", "10");
-      __ji_o = new ClientParameter("16", "16");
-      __ji_u = new ClientParameter("12", "12");
-      __ji_g = new ClientParameter("3", "3");
-      __ji_l = new ClientParameter("6", "6");
-      __ji_e = new ClientParameter("17", "17");
-      __ji_x = new ClientParameter("5", "5");
-      __ji_d = new ClientParameter("9", "9");
-      __ji_k = new ClientParameter("14", "14");
-      __ji_n = new ClientParameter("18", "18");
-      __ji_i = new ClientParameter("13", "13");
-      __ji_a = new ClientParameter("4", "4");
-      __ji_z = new ClientParameter("1", "1");
-      __ji_j = new ClientParameter("11", "11");
-      __ji_s = new ClientParameter("2", "2");
-      __ji_t = new ClientParameter("19", "19");
-   }
-
    ClientParameter(String var1, String var2) {
       this.id = var2;
    }
@@ -150,35 +128,57 @@ public class ClientParameter {
    @Export("loadWorlds")
    static boolean loadWorlds() {
       try {
-         if(FriendLoginUpdate.__kn_x == null) {
-            FriendLoginUpdate.__kn_x = TriBool.urlRequester.request(new URL(ServerBuild.worldsUrl));
-         } else if(FriendLoginUpdate.__kn_x.isDone()) {
-            byte[] var0 = FriendLoginUpdate.__kn_x.getResponse();
+         if (FriendLoginUpdate.field356 == null) {
+            FriendLoginUpdate.field356 = TriBool.urlRequester.request(new URL(ServerBuild.worldsUrl));
+         } else if (FriendLoginUpdate.field356.isDone()) {
+            byte[] var0 = FriendLoginUpdate.field356.getResponse();
             Buffer var1 = new Buffer(var0);
             var1.readInt();
-            World.worldsCount = var1.__ag_302();
+            World.worldsCount = var1.method43();
             ItemContainer.worlds = new World[World.worldsCount];
 
-            World var3;
-            for(int var2 = 0; var2 < World.worldsCount; var3.index = var2++) {
-               var3 = ItemContainer.worlds[var2] = new World();
-               var3.id = var1.__ag_302();
-               var3.properties = var1.readInt();
-               var3.host = var1.readStringCp1252NullTerminated();
-               var3.activity = var1.readStringCp1252NullTerminated();
-               var3.location = var1.readUnsignedByte();
-               var3.population = var1.__aq_303();
+            World var2;
+            for (int var3 = 0; var3 < World.worldsCount; var2.index = var3++) {
+               var2 = ItemContainer.worlds[var3] = new World();
+               var2.id = var1.method43();
+               var2.properties = var1.readInt();
+               var2.host = var1.readStringCp1252NullTerminated();
+               var2.activity = var1.readStringCp1252NullTerminated();
+               var2.location = var1.readUnsignedByte();
+               var2.population = var1.method44();
             }
 
             MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2);
-            FriendLoginUpdate.__kn_x = null;
+            FriendLoginUpdate.field356 = null;
             return true;
          }
       } catch (Exception var4) {
          var4.printStackTrace();
-         FriendLoginUpdate.__kn_x = null;
+         FriendLoginUpdate.field356 = null;
       }
 
       return false;
    }
+
+   static {
+      field322 = new ClientParameter("8", "8");
+      field323 = new ClientParameter("15", "15");
+      field324 = new ClientParameter("7", "7");
+      field325 = new ClientParameter("10", "10");
+      field326 = new ClientParameter("16", "16");
+      field327 = new ClientParameter("12", "12");
+      field328 = new ClientParameter("3", "3");
+      field329 = new ClientParameter("6", "6");
+      field330 = new ClientParameter("17", "17");
+      field331 = new ClientParameter("5", "5");
+      field332 = new ClientParameter("9", "9");
+      field333 = new ClientParameter("14", "14");
+      field334 = new ClientParameter("18", "18");
+      field335 = new ClientParameter("13", "13");
+      field336 = new ClientParameter("4", "4");
+      field337 = new ClientParameter("1", "1");
+      field338 = new ClientParameter("11", "11");
+      field339 = new ClientParameter("2", "2");
+      field340 = new ClientParameter("19", "19");
+   }
 }
diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java
index 33ece76295..6383e1ba8e 100644
--- a/runescape-client/src/main/java/ClientPreferences.java
+++ b/runescape-client/src/main/java/ClientPreferences.java
@@ -14,7 +14,7 @@ public class ClientPreferences {
    @ObfuscatedGetter(
       intValue = 1548448409
    )
-   static int __bf_m;
+   static int field342;
    @ObfuscatedName("gr")
    @ObfuscatedSignature(
       signature = "[Lln;"
@@ -43,16 +43,12 @@ public class ClientPreferences {
    @Export("parameters")
    LinkedHashMap parameters;
 
-   static {
-      __bf_m = 6;
-   }
-
    ClientPreferences() {
       this.windowMode = 1;
       this.rememberedUsername = null;
       this.hideUsername = false;
       this.parameters = new LinkedHashMap();
-      this.__m_150(true);
+      this.method89(true);
    }
 
    @ObfuscatedSignature(
@@ -63,43 +59,43 @@ public class ClientPreferences {
       this.rememberedUsername = null;
       this.hideUsername = false;
       this.parameters = new LinkedHashMap();
-      if(var1 != null && var1.array != null) {
+      if (var1 != null && var1.array != null) {
          int var2 = var1.readUnsignedByte();
-         if(var2 >= 0 && var2 <= __bf_m) {
-            if(var1.readUnsignedByte() == 1) {
+         if (var2 >= 0 && var2 <= field342) {
+            if (var1.readUnsignedByte() == 1) {
                this.roofsHidden = true;
             }
 
-            if(var2 > 1) {
+            if (var2 > 1) {
                this.titleMusicDisabled = var1.readUnsignedByte() == 1;
             }
 
-            if(var2 > 3) {
+            if (var2 > 3) {
                this.windowMode = var1.readUnsignedByte();
             }
 
-            if(var2 > 2) {
+            if (var2 > 2) {
                int var3 = var1.readUnsignedByte();
 
-               for(int var4 = 0; var4 < var3; ++var4) {
+               for (int var4 = 0; var4 < var3; ++var4) {
                   int var5 = var1.readInt();
                   int var6 = var1.readInt();
-                  this.parameters.put(Integer.valueOf(var5), Integer.valueOf(var6));
+                  this.parameters.put(var5, var6);
                }
             }
 
-            if(var2 > 4) {
+            if (var2 > 4) {
                this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull();
             }
 
-            if(var2 > 5) {
+            if (var2 > 5) {
                this.hideUsername = var1.readBoolean();
             }
          } else {
-            this.__m_150(true);
+            this.method89(true);
          }
       } else {
-         this.__m_150(true);
+         this.method89(true);
       }
 
    }
@@ -109,7 +105,7 @@ public class ClientPreferences {
       signature = "(ZI)V",
       garbageValue = "1213718182"
    )
-   void __m_150(boolean var1) {
+   void method89(boolean var1) {
    }
 
    @ObfuscatedName("f")
@@ -120,20 +116,20 @@ public class ClientPreferences {
    @Export("toBuffer")
    Buffer toBuffer() {
       Buffer var1 = new Buffer(100);
-      var1.writeByte(__bf_m);
-      var1.writeByte(this.roofsHidden?1:0);
-      var1.writeByte(this.titleMusicDisabled?1:0);
+      var1.writeByte(field342);
+      var1.writeByte(this.roofsHidden ? 1 : 0);
+      var1.writeByte(this.titleMusicDisabled ? 1 : 0);
       var1.writeByte(this.windowMode);
       var1.writeByte(this.parameters.size());
       Iterator var2 = this.parameters.entrySet().iterator();
 
-      while(var2.hasNext()) {
+      while (var2.hasNext()) {
          Entry var3 = (Entry)var2.next();
-         var1.writeInt(((Integer)var3.getKey()).intValue());
-         var1.writeInt(((Integer)var3.getValue()).intValue());
+         var1.writeInt((Integer)var3.getKey());
+         var1.writeInt((Integer)var3.getValue());
       }
 
-      var1.writeStringCp1252NullTerminated(this.rememberedUsername != null?this.rememberedUsername:"");
+      var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : "");
       var1.writeBoolean(this.hideUsername);
       return var1;
    }
@@ -153,8 +149,13 @@ public class ClientPreferences {
       garbageValue = "0"
    )
    static final void method1809(int var0) {
-      if(GroundItemPile.loadWidgetGroup(var0)) {
+      if (GroundItemPile.loadWidgetGroup(var0)) {
          NetFileRequest.method4555(Widget.widgets[var0], -1);
       }
+
+   }
+
+   static {
+      field342 = 6;
    }
 }
diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java
index b814aa2d99..5b4f4b05b2 100644
--- a/runescape-client/src/main/java/Clock.java
+++ b/runescape-client/src/main/java/Clock.java
@@ -31,32 +31,32 @@ public abstract class Clock {
 
    @ObfuscatedName("m")
    public static String method3534(long var0) {
-      if(var0 > 0L && var0 < 6582952005840035281L) {
-         if(0L == var0 % 37L) {
+      if (var0 > 0L && var0 < 6582952005840035281L) {
+         if (0L == var0 % 37L) {
             return null;
          } else {
             int var2 = 0;
 
-            for(long var3 = var0; var3 != 0L; var3 /= 37L) {
+            for (long var3 = var0; var3 != 0L; var3 /= 37L) {
                ++var2;
             }
 
-            StringBuilder var5;
-            char var8;
-            for(var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) {
-               long var6 = var0;
+            char var4;
+            StringBuilder var8;
+            for (var8 = new StringBuilder(var2); var0 != 0L; var8.append(var4)) {
+               long var5 = var0;
                var0 /= 37L;
-               var8 = class306.base37Table[(int)(var6 - 37L * var0)];
-               if(var8 == '_') {
-                  int var9 = var5.length() - 1;
-                  var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9)));
-                  var8 = 160;
+               var4 = class306.base37Table[(int)(var5 - 37L * var0)];
+               if (var4 == '_') {
+                  int var7 = var8.length() - 1;
+                  var8.setCharAt(var7, Character.toUpperCase(var8.charAt(var7)));
+                  var4 = 160;
                }
             }
 
-            var5.reverse();
-            var5.setCharAt(0, Character.toUpperCase(var5.charAt(0)));
-            return var5.toString();
+            var8.reverse();
+            var8.setCharAt(0, Character.toUpperCase(var8.charAt(0)));
+            return var8.toString();
          }
       } else {
          return null;
@@ -69,13 +69,13 @@ public abstract class Clock {
       garbageValue = "-1555959688"
    )
    static void method3533(String var0) {
-      class21.__b_by = var0;
+      class21.field1123 = var0;
 
       try {
-         String var1 = TextureProvider.client.getParameter(ClientParameter.__ji_n.id);
-         String var2 = TextureProvider.client.getParameter(ClientParameter.__ji_i.id);
+         String var1 = TextureProvider.client.getParameter(ClientParameter.field334.id);
+         String var2 = TextureProvider.client.getParameter(ClientParameter.field335.id);
          String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2;
-         if(var0.length() == 0) {
+         if (var0.length() == 0) {
             var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
          } else {
             var3 = var3 + "; Expires=" + WorldMapSectionType.method252(class203.currentTimeMs() + 94608000000L) + "; Max-Age=" + 94608000L;
@@ -83,7 +83,6 @@ public abstract class Clock {
 
          class46.method850(TextureProvider.client, "document.cookie=\"" + var3 + "\"");
       } catch (Throwable var4) {
-         ;
       }
 
    }
diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java
index a55c80bc1b..1e1ac5e132 100644
--- a/runescape-client/src/main/java/CollisionMap.java
+++ b/runescape-client/src/main/java/CollisionMap.java
@@ -51,9 +51,9 @@ public class CollisionMap {
    )
    @Export("clear")
    public void clear() {
-      for(int var1 = 0; var1 < this.xSize; ++var1) {
-         for(int var2 = 0; var2 < this.ySize; ++var2) {
-            if(var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) {
+      for (int var1 = 0; var1 < this.xSize; ++var1) {
+         for (int var2 = 0; var2 < this.ySize; ++var2) {
+            if (var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) {
                this.flags[var1][var2] = 16777216;
             } else {
                this.flags[var1][var2] = 16777215;
@@ -68,147 +68,147 @@ public class CollisionMap {
       signature = "(IIIIZB)V",
       garbageValue = "2"
    )
-   public void __f_283(int var1, int var2, int var3, int var4, boolean var5) {
+   public void method90(int var1, int var2, int var3, int var4, boolean var5) {
       var1 -= this.xInset;
       var2 -= this.yInset;
-      if(var3 == 0) {
-         if(var4 == 0) {
-            this.__u_287(var1, var2, 128);
-            this.__u_287(var1 - 1, var2, 8);
+      if (var3 == 0) {
+         if (var4 == 0) {
+            this.method94(var1, var2, 128);
+            this.method94(var1 - 1, var2, 8);
          }
 
-         if(var4 == 1) {
-            this.__u_287(var1, var2, 2);
-            this.__u_287(var1, var2 + 1, 32);
+         if (var4 == 1) {
+            this.method94(var1, var2, 2);
+            this.method94(var1, var2 + 1, 32);
          }
 
-         if(var4 == 2) {
-            this.__u_287(var1, var2, 8);
-            this.__u_287(var1 + 1, var2, 128);
+         if (var4 == 2) {
+            this.method94(var1, var2, 8);
+            this.method94(var1 + 1, var2, 128);
          }
 
-         if(var4 == 3) {
-            this.__u_287(var1, var2, 32);
-            this.__u_287(var1, var2 - 1, 2);
+         if (var4 == 3) {
+            this.method94(var1, var2, 32);
+            this.method94(var1, var2 - 1, 2);
          }
       }
 
-      if(var3 == 1 || var3 == 3) {
-         if(var4 == 0) {
-            this.__u_287(var1, var2, 1);
-            this.__u_287(var1 - 1, var2 + 1, 16);
+      if (var3 == 1 || var3 == 3) {
+         if (var4 == 0) {
+            this.method94(var1, var2, 1);
+            this.method94(var1 - 1, var2 + 1, 16);
          }
 
-         if(var4 == 1) {
-            this.__u_287(var1, var2, 4);
-            this.__u_287(var1 + 1, var2 + 1, 64);
+         if (var4 == 1) {
+            this.method94(var1, var2, 4);
+            this.method94(var1 + 1, var2 + 1, 64);
          }
 
-         if(var4 == 2) {
-            this.__u_287(var1, var2, 16);
-            this.__u_287(var1 + 1, var2 - 1, 1);
+         if (var4 == 2) {
+            this.method94(var1, var2, 16);
+            this.method94(var1 + 1, var2 - 1, 1);
          }
 
-         if(var4 == 3) {
-            this.__u_287(var1, var2, 64);
-            this.__u_287(var1 - 1, var2 - 1, 4);
+         if (var4 == 3) {
+            this.method94(var1, var2, 64);
+            this.method94(var1 - 1, var2 - 1, 4);
          }
       }
 
-      if(var3 == 2) {
-         if(var4 == 0) {
-            this.__u_287(var1, var2, 130);
-            this.__u_287(var1 - 1, var2, 8);
-            this.__u_287(var1, var2 + 1, 32);
+      if (var3 == 2) {
+         if (var4 == 0) {
+            this.method94(var1, var2, 130);
+            this.method94(var1 - 1, var2, 8);
+            this.method94(var1, var2 + 1, 32);
          }
 
-         if(var4 == 1) {
-            this.__u_287(var1, var2, 10);
-            this.__u_287(var1, var2 + 1, 32);
-            this.__u_287(var1 + 1, var2, 128);
+         if (var4 == 1) {
+            this.method94(var1, var2, 10);
+            this.method94(var1, var2 + 1, 32);
+            this.method94(var1 + 1, var2, 128);
          }
 
-         if(var4 == 2) {
-            this.__u_287(var1, var2, 40);
-            this.__u_287(var1 + 1, var2, 128);
-            this.__u_287(var1, var2 - 1, 2);
+         if (var4 == 2) {
+            this.method94(var1, var2, 40);
+            this.method94(var1 + 1, var2, 128);
+            this.method94(var1, var2 - 1, 2);
          }
 
-         if(var4 == 3) {
-            this.__u_287(var1, var2, 160);
-            this.__u_287(var1, var2 - 1, 2);
-            this.__u_287(var1 - 1, var2, 8);
+         if (var4 == 3) {
+            this.method94(var1, var2, 160);
+            this.method94(var1, var2 - 1, 2);
+            this.method94(var1 - 1, var2, 8);
          }
       }
 
-      if(var5) {
-         if(var3 == 0) {
-            if(var4 == 0) {
-               this.__u_287(var1, var2, 65536);
-               this.__u_287(var1 - 1, var2, 4096);
+      if (var5) {
+         if (var3 == 0) {
+            if (var4 == 0) {
+               this.method94(var1, var2, 65536);
+               this.method94(var1 - 1, var2, 4096);
             }
 
-            if(var4 == 1) {
-               this.__u_287(var1, var2, 1024);
-               this.__u_287(var1, var2 + 1, 16384);
+            if (var4 == 1) {
+               this.method94(var1, var2, 1024);
+               this.method94(var1, var2 + 1, 16384);
             }
 
-            if(var4 == 2) {
-               this.__u_287(var1, var2, 4096);
-               this.__u_287(var1 + 1, var2, 65536);
+            if (var4 == 2) {
+               this.method94(var1, var2, 4096);
+               this.method94(var1 + 1, var2, 65536);
             }
 
-            if(var4 == 3) {
-               this.__u_287(var1, var2, 16384);
-               this.__u_287(var1, var2 - 1, 1024);
+            if (var4 == 3) {
+               this.method94(var1, var2, 16384);
+               this.method94(var1, var2 - 1, 1024);
             }
          }
 
-         if(var3 == 1 || var3 == 3) {
-            if(var4 == 0) {
-               this.__u_287(var1, var2, 512);
-               this.__u_287(var1 - 1, var2 + 1, 8192);
+         if (var3 == 1 || var3 == 3) {
+            if (var4 == 0) {
+               this.method94(var1, var2, 512);
+               this.method94(var1 - 1, var2 + 1, 8192);
             }
 
-            if(var4 == 1) {
-               this.__u_287(var1, var2, 2048);
-               this.__u_287(var1 + 1, var2 + 1, 32768);
+            if (var4 == 1) {
+               this.method94(var1, var2, 2048);
+               this.method94(var1 + 1, var2 + 1, 32768);
             }
 
-            if(var4 == 2) {
-               this.__u_287(var1, var2, 8192);
-               this.__u_287(var1 + 1, var2 - 1, 512);
+            if (var4 == 2) {
+               this.method94(var1, var2, 8192);
+               this.method94(var1 + 1, var2 - 1, 512);
             }
 
-            if(var4 == 3) {
-               this.__u_287(var1, var2, 32768);
-               this.__u_287(var1 - 1, var2 - 1, 2048);
+            if (var4 == 3) {
+               this.method94(var1, var2, 32768);
+               this.method94(var1 - 1, var2 - 1, 2048);
             }
          }
 
-         if(var3 == 2) {
-            if(var4 == 0) {
-               this.__u_287(var1, var2, 66560);
-               this.__u_287(var1 - 1, var2, 4096);
-               this.__u_287(var1, var2 + 1, 16384);
+         if (var3 == 2) {
+            if (var4 == 0) {
+               this.method94(var1, var2, 66560);
+               this.method94(var1 - 1, var2, 4096);
+               this.method94(var1, var2 + 1, 16384);
             }
 
-            if(var4 == 1) {
-               this.__u_287(var1, var2, 5120);
-               this.__u_287(var1, var2 + 1, 16384);
-               this.__u_287(var1 + 1, var2, 65536);
+            if (var4 == 1) {
+               this.method94(var1, var2, 5120);
+               this.method94(var1, var2 + 1, 16384);
+               this.method94(var1 + 1, var2, 65536);
             }
 
-            if(var4 == 2) {
-               this.__u_287(var1, var2, 20480);
-               this.__u_287(var1 + 1, var2, 65536);
-               this.__u_287(var1, var2 - 1, 1024);
+            if (var4 == 2) {
+               this.method94(var1, var2, 20480);
+               this.method94(var1 + 1, var2, 65536);
+               this.method94(var1, var2 - 1, 1024);
             }
 
-            if(var4 == 3) {
-               this.__u_287(var1, var2, 81920);
-               this.__u_287(var1, var2 - 1, 1024);
-               this.__u_287(var1 - 1, var2, 4096);
+            if (var4 == 3) {
+               this.method94(var1, var2, 81920);
+               this.method94(var1, var2 - 1, 1024);
+               this.method94(var1 - 1, var2, 4096);
             }
          }
       }
@@ -220,20 +220,20 @@ public class CollisionMap {
       signature = "(IIIIZI)V",
       garbageValue = "1813281219"
    )
-   public void __q_284(int var1, int var2, int var3, int var4, boolean var5) {
+   public void method91(int var1, int var2, int var3, int var4, boolean var5) {
       int var6 = 256;
-      if(var5) {
+      if (var5) {
          var6 += 131072;
       }
 
       var1 -= this.xInset;
       var2 -= this.yInset;
 
-      for(int var7 = var1; var7 < var3 + var1; ++var7) {
-         if(var7 >= 0 && var7 < this.xSize) {
-            for(int var8 = var2; var8 < var2 + var4; ++var8) {
-               if(var8 >= 0 && var8 < this.ySize) {
-                  this.__u_287(var7, var8, var6);
+      for (int var7 = var1; var7 < var3 + var1; ++var7) {
+         if (var7 >= 0 && var7 < this.xSize) {
+            for (int var8 = var2; var8 < var2 + var4; ++var8) {
+               if (var8 >= 0 && var8 < this.ySize) {
+                  this.method94(var7, var8, var6);
                }
             }
          }
@@ -246,10 +246,11 @@ public class CollisionMap {
       signature = "(III)V",
       garbageValue = "1082834717"
    )
-   public void __w_285(int var1, int var2) {
+   public void method92(int var1, int var2) {
       var1 -= this.xInset;
       var2 -= this.yInset;
-      this.flags[var1][var2] |= 2097152;
+      int[] var10000 = this.flags[var1];
+      var10000[var2] |= 2097152;
    }
 
    @ObfuscatedName("o")
@@ -257,10 +258,11 @@ public class CollisionMap {
       signature = "(III)V",
       garbageValue = "2022671149"
    )
-   public void __o_286(int var1, int var2) {
+   public void method93(int var1, int var2) {
       var1 -= this.xInset;
       var2 -= this.yInset;
-      this.flags[var1][var2] |= 262144;
+      int[] var10000 = this.flags[var1];
+      var10000[var2] |= 262144;
    }
 
    @ObfuscatedName("u")
@@ -268,8 +270,9 @@ public class CollisionMap {
       signature = "(IIII)V",
       garbageValue = "953350100"
    )
-   void __u_287(int var1, int var2, int var3) {
-      this.flags[var1][var2] |= var3;
+   void method94(int var1, int var2, int var3) {
+      int[] var10000 = this.flags[var1];
+      var10000[var2] |= var3;
    }
 
    @ObfuscatedName("g")
@@ -277,147 +280,147 @@ public class CollisionMap {
       signature = "(IIIIZB)V",
       garbageValue = "54"
    )
-   public void __g_288(int var1, int var2, int var3, int var4, boolean var5) {
+   public void method95(int var1, int var2, int var3, int var4, boolean var5) {
       var1 -= this.xInset;
       var2 -= this.yInset;
-      if(var3 == 0) {
-         if(var4 == 0) {
-            this.__e_290(var1, var2, 128);
-            this.__e_290(var1 - 1, var2, 8);
+      if (var3 == 0) {
+         if (var4 == 0) {
+            this.method97(var1, var2, 128);
+            this.method97(var1 - 1, var2, 8);
          }
 
-         if(var4 == 1) {
-            this.__e_290(var1, var2, 2);
-            this.__e_290(var1, var2 + 1, 32);
+         if (var4 == 1) {
+            this.method97(var1, var2, 2);
+            this.method97(var1, var2 + 1, 32);
          }
 
-         if(var4 == 2) {
-            this.__e_290(var1, var2, 8);
-            this.__e_290(var1 + 1, var2, 128);
+         if (var4 == 2) {
+            this.method97(var1, var2, 8);
+            this.method97(var1 + 1, var2, 128);
          }
 
-         if(var4 == 3) {
-            this.__e_290(var1, var2, 32);
-            this.__e_290(var1, var2 - 1, 2);
+         if (var4 == 3) {
+            this.method97(var1, var2, 32);
+            this.method97(var1, var2 - 1, 2);
          }
       }
 
-      if(var3 == 1 || var3 == 3) {
-         if(var4 == 0) {
-            this.__e_290(var1, var2, 1);
-            this.__e_290(var1 - 1, var2 + 1, 16);
+      if (var3 == 1 || var3 == 3) {
+         if (var4 == 0) {
+            this.method97(var1, var2, 1);
+            this.method97(var1 - 1, var2 + 1, 16);
          }
 
-         if(var4 == 1) {
-            this.__e_290(var1, var2, 4);
-            this.__e_290(var1 + 1, var2 + 1, 64);
+         if (var4 == 1) {
+            this.method97(var1, var2, 4);
+            this.method97(var1 + 1, var2 + 1, 64);
          }
 
-         if(var4 == 2) {
-            this.__e_290(var1, var2, 16);
-            this.__e_290(var1 + 1, var2 - 1, 1);
+         if (var4 == 2) {
+            this.method97(var1, var2, 16);
+            this.method97(var1 + 1, var2 - 1, 1);
          }
 
-         if(var4 == 3) {
-            this.__e_290(var1, var2, 64);
-            this.__e_290(var1 - 1, var2 - 1, 4);
+         if (var4 == 3) {
+            this.method97(var1, var2, 64);
+            this.method97(var1 - 1, var2 - 1, 4);
          }
       }
 
-      if(var3 == 2) {
-         if(var4 == 0) {
-            this.__e_290(var1, var2, 130);
-            this.__e_290(var1 - 1, var2, 8);
-            this.__e_290(var1, var2 + 1, 32);
+      if (var3 == 2) {
+         if (var4 == 0) {
+            this.method97(var1, var2, 130);
+            this.method97(var1 - 1, var2, 8);
+            this.method97(var1, var2 + 1, 32);
          }
 
-         if(var4 == 1) {
-            this.__e_290(var1, var2, 10);
-            this.__e_290(var1, var2 + 1, 32);
-            this.__e_290(var1 + 1, var2, 128);
+         if (var4 == 1) {
+            this.method97(var1, var2, 10);
+            this.method97(var1, var2 + 1, 32);
+            this.method97(var1 + 1, var2, 128);
          }
 
-         if(var4 == 2) {
-            this.__e_290(var1, var2, 40);
-            this.__e_290(var1 + 1, var2, 128);
-            this.__e_290(var1, var2 - 1, 2);
+         if (var4 == 2) {
+            this.method97(var1, var2, 40);
+            this.method97(var1 + 1, var2, 128);
+            this.method97(var1, var2 - 1, 2);
          }
 
-         if(var4 == 3) {
-            this.__e_290(var1, var2, 160);
-            this.__e_290(var1, var2 - 1, 2);
-            this.__e_290(var1 - 1, var2, 8);
+         if (var4 == 3) {
+            this.method97(var1, var2, 160);
+            this.method97(var1, var2 - 1, 2);
+            this.method97(var1 - 1, var2, 8);
          }
       }
 
-      if(var5) {
-         if(var3 == 0) {
-            if(var4 == 0) {
-               this.__e_290(var1, var2, 65536);
-               this.__e_290(var1 - 1, var2, 4096);
+      if (var5) {
+         if (var3 == 0) {
+            if (var4 == 0) {
+               this.method97(var1, var2, 65536);
+               this.method97(var1 - 1, var2, 4096);
             }
 
-            if(var4 == 1) {
-               this.__e_290(var1, var2, 1024);
-               this.__e_290(var1, var2 + 1, 16384);
+            if (var4 == 1) {
+               this.method97(var1, var2, 1024);
+               this.method97(var1, var2 + 1, 16384);
             }
 
-            if(var4 == 2) {
-               this.__e_290(var1, var2, 4096);
-               this.__e_290(var1 + 1, var2, 65536);
+            if (var4 == 2) {
+               this.method97(var1, var2, 4096);
+               this.method97(var1 + 1, var2, 65536);
             }
 
-            if(var4 == 3) {
-               this.__e_290(var1, var2, 16384);
-               this.__e_290(var1, var2 - 1, 1024);
+            if (var4 == 3) {
+               this.method97(var1, var2, 16384);
+               this.method97(var1, var2 - 1, 1024);
             }
          }
 
-         if(var3 == 1 || var3 == 3) {
-            if(var4 == 0) {
-               this.__e_290(var1, var2, 512);
-               this.__e_290(var1 - 1, var2 + 1, 8192);
+         if (var3 == 1 || var3 == 3) {
+            if (var4 == 0) {
+               this.method97(var1, var2, 512);
+               this.method97(var1 - 1, var2 + 1, 8192);
             }
 
-            if(var4 == 1) {
-               this.__e_290(var1, var2, 2048);
-               this.__e_290(var1 + 1, var2 + 1, 32768);
+            if (var4 == 1) {
+               this.method97(var1, var2, 2048);
+               this.method97(var1 + 1, var2 + 1, 32768);
             }
 
-            if(var4 == 2) {
-               this.__e_290(var1, var2, 8192);
-               this.__e_290(var1 + 1, var2 - 1, 512);
+            if (var4 == 2) {
+               this.method97(var1, var2, 8192);
+               this.method97(var1 + 1, var2 - 1, 512);
             }
 
-            if(var4 == 3) {
-               this.__e_290(var1, var2, 32768);
-               this.__e_290(var1 - 1, var2 - 1, 2048);
+            if (var4 == 3) {
+               this.method97(var1, var2, 32768);
+               this.method97(var1 - 1, var2 - 1, 2048);
             }
          }
 
-         if(var3 == 2) {
-            if(var4 == 0) {
-               this.__e_290(var1, var2, 66560);
-               this.__e_290(var1 - 1, var2, 4096);
-               this.__e_290(var1, var2 + 1, 16384);
+         if (var3 == 2) {
+            if (var4 == 0) {
+               this.method97(var1, var2, 66560);
+               this.method97(var1 - 1, var2, 4096);
+               this.method97(var1, var2 + 1, 16384);
             }
 
-            if(var4 == 1) {
-               this.__e_290(var1, var2, 5120);
-               this.__e_290(var1, var2 + 1, 16384);
-               this.__e_290(var1 + 1, var2, 65536);
+            if (var4 == 1) {
+               this.method97(var1, var2, 5120);
+               this.method97(var1, var2 + 1, 16384);
+               this.method97(var1 + 1, var2, 65536);
             }
 
-            if(var4 == 2) {
-               this.__e_290(var1, var2, 20480);
-               this.__e_290(var1 + 1, var2, 65536);
-               this.__e_290(var1, var2 - 1, 1024);
+            if (var4 == 2) {
+               this.method97(var1, var2, 20480);
+               this.method97(var1 + 1, var2, 65536);
+               this.method97(var1, var2 - 1, 1024);
             }
 
-            if(var4 == 3) {
-               this.__e_290(var1, var2, 81920);
-               this.__e_290(var1, var2 - 1, 1024);
-               this.__e_290(var1 - 1, var2, 4096);
+            if (var4 == 3) {
+               this.method97(var1, var2, 81920);
+               this.method97(var1, var2 - 1, 1024);
+               this.method97(var1 - 1, var2, 4096);
             }
          }
       }
@@ -429,26 +432,26 @@ public class CollisionMap {
       signature = "(IIIIIZB)V",
       garbageValue = "23"
    )
-   public void __l_289(int var1, int var2, int var3, int var4, int var5, boolean var6) {
+   public void method96(int var1, int var2, int var3, int var4, int var5, boolean var6) {
       int var7 = 256;
-      if(var6) {
+      if (var6) {
          var7 += 131072;
       }
 
       var1 -= this.xInset;
       var2 -= this.yInset;
       int var8;
-      if(var5 == 1 || var5 == 3) {
+      if (var5 == 1 || var5 == 3) {
          var8 = var3;
          var3 = var4;
          var4 = var8;
       }
 
-      for(var8 = var1; var8 < var3 + var1; ++var8) {
-         if(var8 >= 0 && var8 < this.xSize) {
-            for(int var9 = var2; var9 < var2 + var4; ++var9) {
-               if(var9 >= 0 && var9 < this.ySize) {
-                  this.__e_290(var8, var9, var7);
+      for (var8 = var1; var8 < var3 + var1; ++var8) {
+         if (var8 >= 0 && var8 < this.xSize) {
+            for (int var9 = var2; var9 < var2 + var4; ++var9) {
+               if (var9 >= 0 && var9 < this.ySize) {
+                  this.method97(var8, var9, var7);
                }
             }
          }
@@ -461,8 +464,9 @@ public class CollisionMap {
       signature = "(IIII)V",
       garbageValue = "52290294"
    )
-   void __e_290(int var1, int var2, int var3) {
-      this.flags[var1][var2] &= ~var3;
+   void method97(int var1, int var2, int var3) {
+      int[] var10000 = this.flags[var1];
+      var10000[var2] &= ~var3;
    }
 
    @ObfuscatedName("x")
@@ -470,10 +474,11 @@ public class CollisionMap {
       signature = "(IIB)V",
       garbageValue = "37"
    )
-   public void __x_291(int var1, int var2) {
+   public void method98(int var1, int var2) {
       var1 -= this.xInset;
       var2 -= this.yInset;
-      this.flags[var1][var2] &= -262145;
+      int[] var10000 = this.flags[var1];
+      var10000[var2] &= -262145;
    }
 
    @ObfuscatedName("m")
@@ -483,7 +488,7 @@ public class CollisionMap {
    )
    public static int method3632(int var0, int var1, int var2) {
       var2 &= 3;
-      return var2 == 0?var0:(var2 == 1?var1:(var2 == 2?7 - var0:7 - var1));
+      return var2 == 0 ? var0 : (var2 == 1 ? var1 : (var2 == 2 ? 7 - var0 : 7 - var1));
    }
 
    @ObfuscatedName("q")
@@ -493,7 +498,7 @@ public class CollisionMap {
    )
    static int method3631(char var0, int var1) {
       int var2 = var0 << 4;
-      if(Character.isUpperCase(var0) || Character.isTitleCase(var0)) {
+      if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) {
          var0 = Character.toLowerCase(var0);
          var2 = (var0 << 4) + 1;
       }
diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java
index 1d376b3d10..c063c4d198 100644
--- a/runescape-client/src/main/java/Decimator.java
+++ b/runescape-client/src/main/java/Decimator.java
@@ -24,52 +24,53 @@ public class Decimator {
    int[][] table;
 
    public Decimator(int var1, int var2) {
-      if(var2 != var1) {
-         int var4 = var1;
-         int var5 = var2;
-         if(var2 > var1) {
-            var4 = var2;
-            var5 = var1;
+      if (var2 != var1) {
+         int var3 = var1;
+         int var4 = var2;
+         if (var2 > var1) {
+            var3 = var2;
+            var4 = var1;
          }
 
-         while(var5 != 0) {
-            int var6 = var4 % var5;
+         int var5;
+         while (var4 != 0) {
+            var5 = var3 % var4;
+            var3 = var4;
             var4 = var5;
-            var5 = var6;
          }
 
-         var1 /= var4;
-         var2 /= var4;
+         var1 /= var3;
+         var2 /= var3;
          this.inputRate = var1;
          this.outputRate = var2;
          this.table = new int[var1][14];
 
-         for(int var7 = 0; var7 < var1; ++var7) {
-            int[] var8 = this.table[var7];
-            double var9 = (double)var7 / (double)var1 + 6.0D;
-            int var11 = (int)Math.floor(var9 - 7.0D + 1.0D);
-            if(var11 < 0) {
-               var11 = 0;
+         for (var5 = 0; var5 < var1; ++var5) {
+            int[] var6 = this.table[var5];
+            double var7 = (double)var5 / (double)var1 + 6.0D;
+            int var9 = (int)Math.floor(var7 - 7.0D + 1.0D);
+            if (var9 < 0) {
+               var9 = 0;
             }
 
-            int var12 = (int)Math.ceil(var9 + 7.0D);
-            if(var12 > 14) {
-               var12 = 14;
+            int var10 = (int)Math.ceil(var7 + 7.0D);
+            if (var10 > 14) {
+               var10 = 14;
             }
 
-            for(double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) {
-               double var15 = ((double)var11 - var9) * 3.141592653589793D;
-               double var17 = var13;
-               if(var15 < -1.0E-4D || var15 > 1.0E-4D) {
-                  var17 = var13 * (Math.sin(var15) / var15);
+            for (double var11 = (double)var2 / (double)var1; var9 < var10; ++var9) {
+               double var13 = ((double)var9 - var7) * 3.141592653589793D;
+               double var15 = var11;
+               if (var13 < -1.0E-4D || var13 > 1.0E-4D) {
+                  var15 = var11 * (Math.sin(var13) / var13);
                }
 
-               var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D);
-               var8[var11] = (int)Math.floor(0.5D + var17 * 65536.0D);
+               var15 *= 0.54D + 0.46D * Math.cos(((double)var9 - var7) * 0.2243994752564138D);
+               var6[var9] = (int)Math.floor(0.5D + var15 * 65536.0D);
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("m")
@@ -79,19 +80,19 @@ public class Decimator {
    )
    @Export("resample")
    byte[] resample(byte[] var1) {
-      if(this.table != null) {
+      if (this.table != null) {
          int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14;
          int[] var3 = new int[var2];
          int var4 = 0;
          int var5 = 0;
 
          int var6;
-         for(var6 = 0; var6 < var1.length; ++var6) {
+         for (var6 = 0; var6 < var1.length; ++var6) {
             byte var7 = var1[var6];
             int[] var8 = this.table[var5];
 
             int var9;
-            for(var9 = 0; var9 < 14; ++var9) {
+            for (var9 = 0; var9 < 14; ++var9) {
                var3[var9 + var4] += var8[var9] * var7;
             }
 
@@ -103,11 +104,11 @@ public class Decimator {
 
          var1 = new byte[var2];
 
-         for(var6 = 0; var6 < var2; ++var6) {
+         for (var6 = 0; var6 < var2; ++var6) {
             int var10 = var3[var6] + 32768 >> 16;
-            if(var10 < -128) {
+            if (var10 < -128) {
                var1[var6] = -128;
-            } else if(var10 > 127) {
+            } else if (var10 > 127) {
                var1[var6] = 127;
             } else {
                var1[var6] = (byte)var10;
@@ -125,7 +126,7 @@ public class Decimator {
    )
    @Export("scaleRate")
    int scaleRate(int var1) {
-      if(this.table != null) {
+      if (this.table != null) {
          var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate);
       }
 
@@ -139,7 +140,7 @@ public class Decimator {
    )
    @Export("scalePosition")
    int scalePosition(int var1) {
-      if(this.table != null) {
+      if (this.table != null) {
          var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6;
       }
 
@@ -154,12 +155,12 @@ public class Decimator {
    public static final boolean method2490() {
       KeyHandler var0 = KeyHandler.KeyHandler_instance;
       synchronized(KeyHandler.KeyHandler_instance) {
-         if(KeyHandler.__an_ct == KeyHandler.__an_cc) {
+         if (KeyHandler.field453 == KeyHandler.field455) {
             return false;
          } else {
-            IndexStoreAction.__ik_cn = KeyHandler.__an_cf[KeyHandler.__an_ct];
-            GzipDecompressor.__go_ck = KeyHandler.__an_cg[KeyHandler.__an_ct];
-            KeyHandler.__an_ct = KeyHandler.__an_ct + 1 & 127;
+            IndexStoreAction.field411 = KeyHandler.field450[KeyHandler.field453];
+            GzipDecompressor.field378 = KeyHandler.field449[KeyHandler.field453];
+            KeyHandler.field453 = KeyHandler.field453 + 1 & 127;
             return true;
          }
       }
@@ -172,61 +173,61 @@ public class Decimator {
    )
    static final boolean method2491(Model var0, int var1, int var2, int var3) {
       boolean var4 = ViewportMouse.ViewportMouse_isInViewport;
-      if(!var4) {
+      if (!var4) {
          return false;
       } else {
          int var5;
          int var6;
          int var7;
          int var8;
+         int var9;
+         int var10;
          int var11;
          int var12;
          int var13;
-         int var16;
-         int var17;
-         if(!ViewportMouse.ViewportMouse_false0) {
+         if (!ViewportMouse.ViewportMouse_false0) {
             var5 = Scene.Scene_cameraPitchSine;
             var6 = Scene.Scene_cameraPitchCosine;
             var7 = Scene.Scene_cameraYawSine;
             var8 = Scene.Scene_cameraYawCosine;
-            byte clickboxClose = 50;
-            short clickboxFar = 3500;
-            var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * clickboxClose / Rasterizer3D.Rasterizer3D_zoom;
-            var12 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * clickboxClose / Rasterizer3D.Rasterizer3D_zoom;
-            var13 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * clickboxFar / Rasterizer3D.Rasterizer3D_zoom;
-            int var14 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * clickboxFar / Rasterizer3D.Rasterizer3D_zoom;
-            int var15 = Rasterizer3D.rot1(var12, clickboxClose, var6, var5);
-            var16 = Rasterizer3D.rot2(var12, clickboxClose, var6, var5);
-            var12 = var15;
-            var15 = Rasterizer3D.rot1(var14, clickboxFar, var6, var5);
-            var17 = Rasterizer3D.rot2(var14, clickboxFar, var6, var5);
-            var14 = var15;
-            var15 = Rasterizer3D.rot3(var11, var16, var8, var7);
-            var16 = Rasterizer3D.rot4(var11, var16, var8, var7);
-            var11 = var15;
-            var15 = Rasterizer3D.rot3(var13, var17, var8, var7);
-            var17 = Rasterizer3D.rot4(var13, var17, var8, var7);
-            AccessFile.__dk_o = (var11 + var15) / 2;
-            ViewportMouse.__dm_u = (var14 + var12) / 2;
-            ViewportMouse.__dm_g = (var17 + var16) / 2;
-            ViewportMouse.__dm_l = (var15 - var11) / 2;
-            class311.__ka_e = (var14 - var12) / 2;
-            Skeleton.__ek_x = (var17 - var16) / 2;
-            GraphicsObject.__bw_d = Math.abs(ViewportMouse.__dm_l);
-            ViewportMouse.__dm_k = Math.abs(class311.__ka_e);
-            class248.__iu_n = Math.abs(Skeleton.__ek_x);
+            byte var14 = 50;
+            short var15 = 3500;
+            var9 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var14 / Rasterizer3D.Rasterizer3D_zoom;
+            var10 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var14 / Rasterizer3D.Rasterizer3D_zoom;
+            var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var15 / Rasterizer3D.Rasterizer3D_zoom;
+            int var16 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var15 / Rasterizer3D.Rasterizer3D_zoom;
+            int var17 = Rasterizer3D.rot1(var10, var14, var6, var5);
+            var12 = Rasterizer3D.rot2(var10, var14, var6, var5);
+            var10 = var17;
+            var17 = Rasterizer3D.rot1(var16, var15, var6, var5);
+            var13 = Rasterizer3D.rot2(var16, var15, var6, var5);
+            var16 = var17;
+            var17 = Rasterizer3D.rot3(var9, var12, var8, var7);
+            var12 = Rasterizer3D.rot4(var9, var12, var8, var7);
+            var9 = var17;
+            var17 = Rasterizer3D.rot3(var11, var13, var8, var7);
+            var13 = Rasterizer3D.rot4(var11, var13, var8, var7);
+            AccessFile.field7 = (var9 + var17) / 2;
+            ViewportMouse.field951 = (var16 + var10) / 2;
+            ViewportMouse.field952 = (var13 + var12) / 2;
+            ViewportMouse.field953 = (var17 - var9) / 2;
+            class311.field1156 = (var16 - var10) / 2;
+            Skeleton.field874 = (var13 - var12) / 2;
+            GraphicsObject.field377 = Math.abs(ViewportMouse.field953);
+            ViewportMouse.field954 = Math.abs(class311.field1156);
+            class248.field1142 = Math.abs(Skeleton.field874);
          }
 
          var5 = var0.xMid + var1;
          var6 = var2 + var0.yMid;
          var7 = var3 + var0.zMid;
          var8 = var0.xMidOffset;
-         var16 = var0.yMidOffset;
-         var17 = var0.zMidOffset;
-         var11 = AccessFile.__dk_o - var5;
-         var12 = ViewportMouse.__dm_u - var6;
-         var13 = ViewportMouse.__dm_g - var7;
-         return Math.abs(var11) > var8 + GraphicsObject.__bw_d?false:(Math.abs(var12) > var16 + ViewportMouse.__dm_k?false:(Math.abs(var13) > var17 + class248.__iu_n?false:(Math.abs(var13 * class311.__ka_e - var12 * Skeleton.__ek_x) > var17 * ViewportMouse.__dm_k + var16 * class248.__iu_n?false:(Math.abs(var11 * Skeleton.__ek_x - var13 * ViewportMouse.__dm_l) > var8 * class248.__iu_n + var17 * GraphicsObject.__bw_d?false:Math.abs(var12 * ViewportMouse.__dm_l - var11 * class311.__ka_e) <= var8 * ViewportMouse.__dm_k + var16 * GraphicsObject.__bw_d))));
+         var12 = var0.yMidOffset;
+         var13 = var0.zMidOffset;
+         var9 = AccessFile.field7 - var5;
+         var10 = ViewportMouse.field951 - var6;
+         var11 = ViewportMouse.field952 - var7;
+         return Math.abs(var9) > var8 + GraphicsObject.field377 ? false : (Math.abs(var10) > var12 + ViewportMouse.field954 ? false : (Math.abs(var11) > var13 + class248.field1142 ? false : (Math.abs(var11 * class311.field1156 - var10 * Skeleton.field874) > var13 * ViewportMouse.field954 + var12 * class248.field1142 ? false : (Math.abs(var9 * Skeleton.field874 - var11 * ViewportMouse.field953) > var8 * class248.field1142 + var13 * GraphicsObject.field377 ? false : Math.abs(var10 * ViewportMouse.field953 - var9 * class311.field1156) <= var8 * ViewportMouse.field954 + var12 * GraphicsObject.field377))));
       }
    }
 
@@ -236,8 +237,8 @@ public class Decimator {
       garbageValue = "-858740470"
    )
    static int method2492(int var0, Script var1, boolean var2) {
-      if(var0 == 5630) {
-         Client.__client_fd = 250;
+      if (var0 == 5630) {
+         Client.field175 = 250;
          return 1;
       } else {
          return 2;
diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java
index 58ac1934ac..60c70c651a 100644
--- a/runescape-client/src/main/java/DemotingHashTable.java
+++ b/runescape-client/src/main/java/DemotingHashTable.java
@@ -31,8 +31,7 @@ public final class DemotingHashTable {
       this.remaining = var1;
 
       int var3;
-      for(var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) {
-         ;
+      for (var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) {
       }
 
       this.hashTable = new IterableNodeHashTable(var3);
@@ -42,17 +41,17 @@ public final class DemotingHashTable {
    @Export("get")
    public Object get(long var1) {
       Wrapper var3 = (Wrapper)this.hashTable.get(var1);
-      if(var3 == null) {
+      if (var3 == null) {
          return null;
       } else {
          Object var4 = var3.get();
-         if(var4 == null) {
+         if (var4 == null) {
             var3.remove();
             var3.removeDual();
             this.remaining += var3.size;
             return null;
          } else {
-            if(var3.isSoft()) {
+            if (var3.isSoft()) {
                DirectWrapper var5 = new DirectWrapper(var4, var3.size);
                this.hashTable.put(var5, var3.key);
                this.queue.add(var5);
@@ -82,7 +81,7 @@ public final class DemotingHashTable {
    )
    @Export("removeWrapper")
    void removeWrapper(Wrapper var1) {
-      if(var1 != null) {
+      if (var1 != null) {
          var1.remove();
          var1.removeDual();
          this.remaining += var1.size;
@@ -93,14 +92,14 @@ public final class DemotingHashTable {
    @ObfuscatedName("w")
    @Export("put")
    public void put(Object var1, long var2, int var4) {
-      if(var4 > this.capacity) {
+      if (var4 > this.capacity) {
          throw new IllegalStateException();
       } else {
          this.remove(var2);
          this.remaining -= var4;
 
-         while(this.remaining < 0) {
-            Wrapper var5 = (Wrapper)this.queue.__q_448();
+         while (this.remaining < 0) {
+            Wrapper var5 = (Wrapper)this.queue.method149();
             this.removeWrapper(var5);
          }
 
@@ -114,14 +113,14 @@ public final class DemotingHashTable {
    @ObfuscatedName("o")
    @Export("demote")
    public void demote(int var1) {
-      for(Wrapper var2 = (Wrapper)this.queue.__w_449(); var2 != null; var2 = (Wrapper)this.queue.__u_451()) {
-         if(var2.isSoft()) {
-            if(var2.get() == null) {
+      for (Wrapper var2 = (Wrapper)this.queue.method150(); var2 != null; var2 = (Wrapper)this.queue.method152()) {
+         if (var2.isSoft()) {
+            if (var2.get() == null) {
                var2.remove();
                var2.removeDual();
                this.remaining += var2.size;
             }
-         } else if(++var2.keyDual > (long)var1) {
+         } else if (++var2.keyDual > (long)var1) {
             SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size);
             this.hashTable.put(var3, var2.key);
             DualNodeDeque.method5220(var3, var2);
diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
index b04a824018..34868b1afd 100644
--- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
+++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
@@ -15,11 +15,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
    @Export("get")
    public PlatformInfo get() {
       byte var1;
-      if(WorldMapSection3.osNameLowerCase.startsWith("win")) {
+      if (WorldMapSection3.osNameLowerCase.startsWith("win")) {
          var1 = 1;
-      } else if(WorldMapSection3.osNameLowerCase.startsWith("mac")) {
+      } else if (WorldMapSection3.osNameLowerCase.startsWith("mac")) {
          var1 = 2;
-      } else if(WorldMapSection3.osNameLowerCase.startsWith("linux")) {
+      } else if (WorldMapSection3.osNameLowerCase.startsWith("linux")) {
          var1 = 3;
       } else {
          var1 = 4;
@@ -28,14 +28,14 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
       String var2;
       try {
          var2 = System.getProperty("os.arch").toLowerCase();
-      } catch (Exception var35) {
+      } catch (Exception var25) {
          var2 = "";
       }
 
       String var3;
       try {
          var3 = System.getProperty("os.version").toLowerCase();
-      } catch (Exception var34) {
+      } catch (Exception var24) {
          var3 = "";
       }
 
@@ -45,74 +45,73 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
       try {
          var4 = System.getProperty("java.vendor");
          var5 = System.getProperty("java.version");
-      } catch (Exception var33) {
-         ;
+      } catch (Exception var23) {
       }
 
-      boolean var29;
-      if(!var2.startsWith("amd64") && !var2.startsWith("x86_64")) {
-         var29 = false;
+      boolean var6;
+      if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) {
+         var6 = false;
       } else {
-         var29 = true;
+         var6 = true;
       }
 
       byte var7 = 0;
-      if(var1 == 1) {
-         if(var3.indexOf("4.0") != -1) {
+      if (var1 == 1) {
+         if (var3.indexOf("4.0") != -1) {
             var7 = 1;
-         } else if(var3.indexOf("4.1") != -1) {
+         } else if (var3.indexOf("4.1") != -1) {
             var7 = 2;
-         } else if(var3.indexOf("4.9") != -1) {
+         } else if (var3.indexOf("4.9") != -1) {
             var7 = 3;
-         } else if(var3.indexOf("5.0") != -1) {
+         } else if (var3.indexOf("5.0") != -1) {
             var7 = 4;
-         } else if(var3.indexOf("5.1") != -1) {
+         } else if (var3.indexOf("5.1") != -1) {
             var7 = 5;
-         } else if(var3.indexOf("5.2") != -1) {
+         } else if (var3.indexOf("5.2") != -1) {
             var7 = 8;
-         } else if(var3.indexOf("6.0") != -1) {
+         } else if (var3.indexOf("6.0") != -1) {
             var7 = 6;
-         } else if(var3.indexOf("6.1") != -1) {
+         } else if (var3.indexOf("6.1") != -1) {
             var7 = 7;
-         } else if(var3.indexOf("6.2") != -1) {
+         } else if (var3.indexOf("6.2") != -1) {
             var7 = 9;
-         } else if(var3.indexOf("6.3") != -1) {
+         } else if (var3.indexOf("6.3") != -1) {
             var7 = 10;
-         } else if(var3.indexOf("10.0") != -1) {
+         } else if (var3.indexOf("10.0") != -1) {
             var7 = 11;
          }
-      } else if(var1 == 2) {
-         if(var3.indexOf("10.4") != -1) {
+      } else if (var1 == 2) {
+         if (var3.indexOf("10.4") != -1) {
             var7 = 20;
-         } else if(var3.indexOf("10.5") != -1) {
+         } else if (var3.indexOf("10.5") != -1) {
             var7 = 21;
-         } else if(var3.indexOf("10.6") != -1) {
+         } else if (var3.indexOf("10.6") != -1) {
             var7 = 22;
-         } else if(var3.indexOf("10.7") != -1) {
+         } else if (var3.indexOf("10.7") != -1) {
             var7 = 23;
-         } else if(var3.indexOf("10.8") != -1) {
+         } else if (var3.indexOf("10.8") != -1) {
             var7 = 24;
-         } else if(var3.indexOf("10.9") != -1) {
+         } else if (var3.indexOf("10.9") != -1) {
             var7 = 25;
-         } else if(var3.indexOf("10.10") != -1) {
+         } else if (var3.indexOf("10.10") != -1) {
             var7 = 26;
-         } else if(var3.indexOf("10.11") != -1) {
+         } else if (var3.indexOf("10.11") != -1) {
             var7 = 27;
-         } else if(var3.indexOf("10.12") != -1) {
+         } else if (var3.indexOf("10.12") != -1) {
             var7 = 28;
-         } else if(var3.indexOf("10.13") != -1) {
+         } else if (var3.indexOf("10.13") != -1) {
             var7 = 29;
          }
       }
 
       byte var8;
-      if(var4.toLowerCase().indexOf("sun") != -1) {
+      if (var4.toLowerCase().indexOf("sun") != -1) {
          var8 = 1;
-      } else if(var4.toLowerCase().indexOf("microsoft") != -1) {
+      } else if (var4.toLowerCase().indexOf("microsoft") != -1) {
          var8 = 2;
-      } else if(var4.toLowerCase().indexOf("apple") != -1) {
+      } else if (var4.toLowerCase().indexOf("apple") != -1) {
          var8 = 3;
-      } else if(var4.toLowerCase().indexOf("oracle") != -1) {
+      } else if (var4.toLowerCase().indexOf("oracle") != -1) {
          var8 = 5;
       } else {
          var8 = 4;
@@ -122,72 +121,69 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
       int var10 = 0;
 
       try {
-         while(var9 < var5.length()) {
+         while (var9 < var5.length()) {
             char var11 = var5.charAt(var9);
-            if(var11 < '0' || var11 > '9') {
+            if (var11 < '0' || var11 > '9') {
                break;
             }
 
             var10 = var10 * 10 + (var11 - '0');
             ++var9;
          }
-      } catch (Exception var38) {
-         ;
+      } catch (Exception var28) {
       }
 
-      int var39 = var10;
+      int var29 = var10;
       var9 = var5.indexOf(46, 2) + 1;
       var10 = 0;
 
       try {
-         while(var9 < var5.length()) {
+         while (var9 < var5.length()) {
             char var12 = var5.charAt(var9);
-            if(var12 < '0' || var12 > '9') {
+            if (var12 < '0' || var12 > '9') {
                break;
             }
 
             var10 = var12 - '0' + var10 * 10;
             ++var9;
          }
-      } catch (Exception var37) {
-         ;
+      } catch (Exception var27) {
       }
 
-      int var40 = var10;
+      int var30 = var10;
       var9 = var5.indexOf(95, 4) + 1;
       var10 = 0;
 
       try {
-         while(var9 < var5.length()) {
+         while (var9 < var5.length()) {
             char var13 = var5.charAt(var9);
-            if(var13 < '0' || var13 > '9') {
+            if (var13 < '0' || var13 > '9') {
                break;
             }
 
             var10 = var13 - '0' + var10 * 10;
             ++var9;
          }
-      } catch (Exception var36) {
-         ;
+      } catch (Exception var26) {
       }
 
       Runtime.getRuntime();
-      int var15 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1;
-      int var16;
-      if(var39 > 3) {
-         var16 = Runtime.getRuntime().availableProcessors();
+      int var31 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1;
+      int var14;
+      if (var29 > 3) {
+         var14 = Runtime.getRuntime().availableProcessors();
       } else {
-         var16 = 0;
+         var14 = 0;
       }
 
-      byte var17 = 0;
+      byte var15 = 0;
+      String var16 = "";
+      String var17 = "";
       String var18 = "";
       String var19 = "";
       String var20 = "";
       String var21 = "";
-      String var22 = "";
-      String var23 = "";
-      int[] var28 = new int[3];
-      return new PlatformInfo(var1, var29, var7, var8, var39, var40, var10, false, var15, var16, var17, 0, var18, var19, var20, var21, 0, 0, 0, 0, var22, var23, var28, 0, "");
+      int[] var22 = new int[3];
+      return new PlatformInfo(var1, var6, var7, var8, var29, var30, var10, false, var31, var14, var15, 0, var16, var17, var18, var19, 0, 0, 0, 0, var20, var21, var22, 0, "");
    }
 }
diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java
index b76b322285..894db8a282 100644
--- a/runescape-client/src/main/java/DevicePcmPlayer.java
+++ b/runescape-client/src/main/java/DevicePcmPlayer.java
@@ -1,8 +1,8 @@
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.DataLine.Info;
 import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.SourceDataLine;
+import javax.sound.sampled.DataLine.Info;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
@@ -35,8 +35,8 @@ public class DevicePcmPlayer extends PcmPlayer {
    )
    @Export("init")
    protected void init() {
-      this.format = new AudioFormat((float)class309.PcmPlayer_sampleRate, 16, PcmPlayer.isStereo?2:1, true, false);
-      this.byteSamples = new byte[256 << (PcmPlayer.isStereo?2:1)];
+      this.format = new AudioFormat((float)class309.PcmPlayer_sampleRate, 16, PcmPlayer.isStereo ? 2 : 1, true, false);
+      this.byteSamples = new byte[256 << (PcmPlayer.isStereo ? 2 : 1)];
    }
 
    @ObfuscatedName("f")
@@ -47,25 +47,26 @@ public class DevicePcmPlayer extends PcmPlayer {
    @Export("open")
    protected void open(int var1) throws LineUnavailableException {
       try {
-         Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.isStereo?2:1));
+         Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.isStereo ? 2 : 1));
          this.line = (SourceDataLine)AudioSystem.getLine(var2);
          this.line.open();
          this.line.start();
          this.capacity2 = var1;
       } catch (LineUnavailableException var5) {
-         int var4 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765);
-         var4 = (var4 >>> 2 & 858993459) + (var4 & 858993459);
-         var4 = (var4 >>> 4) + var4 & 252645135;
-         var4 += var4 >>> 8;
-         var4 += var4 >>> 16;
-         int var3 = var4 & 255;
-         if(var3 != 1) {
-            this.open(World.method1759(var1));
-         } else {
+         int var3 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765);
+         var3 = (var3 >>> 2 & 858993459) + (var3 & 858993459);
+         var3 = (var3 >>> 4) + var3 & 252645135;
+         var3 += var3 >>> 8;
+         var3 += var3 >>> 16;
+         int var4 = var3 & 255;
+         if (var4 == 1) {
             this.line = null;
             throw var5;
          }
+
+         this.open(World.method1759(var1));
       }
+
    }
 
    @ObfuscatedName("q")
@@ -75,20 +76,20 @@ public class DevicePcmPlayer extends PcmPlayer {
    )
    @Export("position")
    protected int position() {
-      return this.capacity2 - (this.line.available() >> (PcmPlayer.isStereo?2:1));
+      return this.capacity2 - (this.line.available() >> (PcmPlayer.isStereo ? 2 : 1));
    }
 
    @ObfuscatedName("w")
    @Export("write")
    protected void write() {
       int var1 = 256;
-      if(PcmPlayer.isStereo) {
+      if (PcmPlayer.isStereo) {
          var1 <<= 1;
       }
 
-      for(int var2 = 0; var2 < var1; ++var2) {
+      for (int var2 = 0; var2 < var1; ++var2) {
          int var3 = super.samples[var2];
-         if((var3 + 8388608 & -16777216) != 0) {
+         if ((var3 + 8388608 & -16777216) != 0) {
             var3 = 8388607 ^ var3 >> 31;
          }
 
@@ -106,7 +107,7 @@ public class DevicePcmPlayer extends PcmPlayer {
    )
    @Export("close")
    protected void close() {
-      if(this.line != null) {
+      if (this.line != null) {
          this.line.close();
          this.line = null;
       }
diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
index 91034e8a5c..dfbf94b5c9 100644
--- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java
+++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
@@ -44,7 +44,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
          var2.write(var3);
          var2.seek(0L);
          var2.close();
-         if(var1) {
+         if (var1) {
             var0.delete();
          }
 
@@ -72,47 +72,47 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
    static void decodeSprite(byte[] var0) {
       Buffer var1 = new Buffer(var0);
       var1.index = var0.length - 2;
-      class328.indexedSpriteCount = var1.__ag_302();
+      class328.indexedSpriteCount = var1.method43();
       class328.indexedSpriteOffsetXs = new int[class328.indexedSpriteCount];
       class328.indexedSpriteOffsetYs = new int[class328.indexedSpriteCount];
       VarbitDefinition.indexedSpriteWidths = new int[class328.indexedSpriteCount];
       SecureRandomCallable.indexedSpriteHeights = new int[class328.indexedSpriteCount];
       class328.spritePixels = new byte[class328.indexedSpriteCount][];
       var1.index = var0.length - 7 - class328.indexedSpriteCount * 8;
-      class328.indexedSpriteWidth = var1.__ag_302();
-      class328.indexedSpriteHeight = var1.__ag_302();
+      class328.indexedSpriteWidth = var1.method43();
+      class328.indexedSpriteHeight = var1.method43();
       int var2 = (var1.readUnsignedByte() & 255) + 1;
 
       int var3;
-      for(var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
-         class328.indexedSpriteOffsetXs[var3] = var1.__ag_302();
+      for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
+         class328.indexedSpriteOffsetXs[var3] = var1.method43();
       }
 
-      for(var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
-         class328.indexedSpriteOffsetYs[var3] = var1.__ag_302();
+      for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
+         class328.indexedSpriteOffsetYs[var3] = var1.method43();
       }
 
-      for(var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
-         VarbitDefinition.indexedSpriteWidths[var3] = var1.__ag_302();
+      for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
+         VarbitDefinition.indexedSpriteWidths[var3] = var1.method43();
       }
 
-      for(var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
-         SecureRandomCallable.indexedSpriteHeights[var3] = var1.__ag_302();
+      for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
+         SecureRandomCallable.indexedSpriteHeights[var3] = var1.method43();
       }
 
       var1.index = var0.length - 7 - class328.indexedSpriteCount * 8 - (var2 - 1) * 3;
       class328.indexedSpritePalette = new int[var2];
 
-      for(var3 = 1; var3 < var2; ++var3) {
+      for (var3 = 1; var3 < var2; ++var3) {
          class328.indexedSpritePalette[var3] = var1.readMedium();
-         if(class328.indexedSpritePalette[var3] == 0) {
+         if (class328.indexedSpritePalette[var3] == 0) {
             class328.indexedSpritePalette[var3] = 1;
          }
       }
 
       var1.index = 0;
 
-      for(var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
+      for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
          int var4 = VarbitDefinition.indexedSpriteWidths[var3];
          int var5 = SecureRandomCallable.indexedSpriteHeights[var3];
          int var6 = var4 * var5;
@@ -120,13 +120,13 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
          class328.spritePixels[var3] = var7;
          int var8 = var1.readUnsignedByte();
          int var9;
-         if(var8 == 0) {
-            for(var9 = 0; var9 < var6; ++var9) {
+         if (var8 == 0) {
+            for (var9 = 0; var9 < var6; ++var9) {
                var7[var9] = var1.readByte();
             }
-         } else if(var8 == 1) {
-            for(var9 = 0; var9 < var4; ++var9) {
-               for(int var10 = 0; var10 < var5; ++var10) {
+         } else if (var8 == 1) {
+            for (var9 = 0; var9 < var4; ++var9) {
+               for (int var10 = 0; var10 < var5; ++var10) {
                   var7[var9 + var10 * var4] = var1.readByte();
                }
             }
@@ -154,11 +154,11 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
       Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
       Rasterizer3D.Rasterizer3D_method1();
 
-      for(int var9 = 0; var9 < var0.length; ++var9) {
+      for (int var9 = 0; var9 < var0.length; ++var9) {
          Widget var10 = var0[var9];
-         if(var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) {
+         if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) {
             int var11;
-            if(var8 == -1) {
+            if (var8 == -1) {
                Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6;
                Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y;
                Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width;
@@ -170,8 +170,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
 
             var10.rootIndex = var11;
             var10.cycle = Client.cycle;
-            if(!var10.isIf3 || !PacketBufferNode.method3673(var10)) {
-               if(var10.contentType > 0) {
+            if (!var10.isIf3 || !PacketBufferNode.method3673(var10)) {
+               if (var10.contentType > 0) {
                   class15.method186(var10);
                }
 
@@ -180,266 +180,266 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
                int var14 = var10.transparency;
                int var15;
                int var16;
-               if(var10 == Client.clickedWidget) {
-                  if(var1 != -1412584499 && !var10.isScrollBar) {
-                     class279.__jx_ne = var0;
-                     class54.__bs_nb = var6;
-                     class157.__fw_nm = var7;
+               if (var10 == Client.clickedWidget) {
+                  if (var1 != -1412584499 && !var10.isScrollBar) {
+                     class279.field1145 = var0;
+                     class54.field1161 = var6;
+                     class157.field1114 = var7;
                      continue;
                   }
 
-                  if(Client.isDraggingWidget && Client.__client_nn) {
+                  if (Client.isDraggingWidget && Client.field106) {
                      var15 = MouseHandler.MouseHandler_x;
                      var16 = MouseHandler.MouseHandler_y;
                      var15 -= Client.widgetClickX;
                      var16 -= Client.widgetClickY;
-                     if(var15 < Client.__client_nw) {
-                        var15 = Client.__client_nw;
+                     if (var15 < Client.field108) {
+                        var15 = Client.field108;
                      }
 
-                     if(var15 + var10.width > Client.__client_nw + Client.clickedWidgetParent.width) {
-                        var15 = Client.__client_nw + Client.clickedWidgetParent.width - var10.width;
+                     if (var15 + var10.width > Client.field108 + Client.clickedWidgetParent.width) {
+                        var15 = Client.field108 + Client.clickedWidgetParent.width - var10.width;
                      }
 
-                     if(var16 < Client.__client_nl) {
-                        var16 = Client.__client_nl;
+                     if (var16 < Client.field109) {
+                        var16 = Client.field109;
                      }
 
-                     if(var16 + var10.height > Client.__client_nl + Client.clickedWidgetParent.height) {
-                        var16 = Client.__client_nl + Client.clickedWidgetParent.height - var10.height;
+                     if (var16 + var10.height > Client.field109 + Client.clickedWidgetParent.height) {
+                        var16 = Client.field109 + Client.clickedWidgetParent.height - var10.height;
                      }
 
                      var12 = var15;
                      var13 = var16;
                   }
 
-                  if(!var10.isScrollBar) {
+                  if (!var10.isScrollBar) {
                      var14 = 128;
                   }
                }
 
                int var17;
                int var18;
+               int var19;
                int var20;
                int var21;
                int var22;
-               int var30;
-               if(var10.type == 2) {
+               if (var10.type == 2) {
                   var15 = var2;
                   var16 = var3;
                   var17 = var4;
                   var18 = var5;
-               } else if(var10.type == 9) {
-                  var30 = var12;
-                  var20 = var13;
-                  var21 = var12 + var10.width;
-                  var22 = var13 + var10.height;
-                  if(var21 < var12) {
-                     var30 = var21;
-                     var21 = var12;
+               } else if (var10.type == 9) {
+                  var22 = var12;
+                  var19 = var13;
+                  var20 = var12 + var10.width;
+                  var21 = var13 + var10.height;
+                  if (var20 < var12) {
+                     var22 = var20;
+                     var20 = var12;
                   }
 
-                  if(var22 < var13) {
-                     var20 = var22;
-                     var22 = var13;
+                  if (var21 < var13) {
+                     var19 = var21;
+                     var21 = var13;
                   }
 
+                  ++var20;
                   ++var21;
-                  ++var22;
-                  var15 = var30 > var2?var30:var2;
-                  var16 = var20 > var3?var20:var3;
-                  var17 = var21 < var4?var21:var4;
-                  var18 = var22 < var5?var22:var5;
+                  var15 = var22 > var2 ? var22 : var2;
+                  var16 = var19 > var3 ? var19 : var3;
+                  var17 = var20 < var4 ? var20 : var4;
+                  var18 = var21 < var5 ? var21 : var5;
                } else {
-                  var30 = var12 + var10.width;
-                  var20 = var13 + var10.height;
-                  var15 = var12 > var2?var12:var2;
-                  var16 = var13 > var3?var13:var3;
-                  var17 = var30 < var4?var30:var4;
-                  var18 = var20 < var5?var20:var5;
+                  var22 = var12 + var10.width;
+                  var19 = var13 + var10.height;
+                  var15 = var12 > var2 ? var12 : var2;
+                  var16 = var13 > var3 ? var13 : var3;
+                  var17 = var22 < var4 ? var22 : var4;
+                  var18 = var19 < var5 ? var19 : var5;
                }
 
-               if(!var10.isIf3 || var15 < var17 && var16 < var18) {
-                  if(var10.contentType != 0) {
-                     if(var10.contentType == 1336) {
-                        if(Client.displayFps) {
+               if (!var10.isIf3 || var15 < var17 && var16 < var18) {
+                  if (var10.contentType != 0) {
+                     if (var10.contentType == 1336) {
+                        if (Client.displayFps) {
                            var13 += 15;
                            fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1);
                            var13 += 15;
-                           Runtime var38 = Runtime.getRuntime();
-                           var20 = (int)((var38.totalMemory() - var38.freeMemory()) / 1024L);
-                           var21 = 16776960;
-                           if(var20 > 327680 && !Client.isLowDetail) {
-                              var21 = 16711680;
+                           Runtime var34 = Runtime.getRuntime();
+                           var19 = (int)((var34.totalMemory() - var34.freeMemory()) / 1024L);
+                           var20 = 16776960;
+                           if (var19 > 327680 && !Client.isLowDetail) {
+                              var20 = 16711680;
                            }
 
-                           fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1);
+                           fontPlain12.drawRightAligned("Mem:" + var19 + "k", var12 + var10.width, var13, var20, -1);
                            var13 += 15;
                         }
                         continue;
                      }
 
-                     if(var10.contentType == 1337) {
-                        Client.__client_lq = var12;
-                        Client.__client_ln = var13;
+                     if (var10.contentType == 1337) {
+                        Client.field216 = var12;
+                        Client.field217 = var13;
                         class40.drawEntities(var12, var13, var10.width, var10.height);
-                        Client.__client_od[var10.rootIndex] = true;
+                        Client.field100[var10.rootIndex] = true;
                         Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
                         continue;
                      }
 
-                     if(var10.contentType == 1338) {
+                     if (var10.contentType == 1338) {
                         MouseRecorder.method1189(var10, var12, var13, var11);
                         Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
                         continue;
                      }
 
-                     if(var10.contentType == 1339) {
+                     if (var10.contentType == 1339) {
                         class22.method296(var10, var12, var13, var11);
                         Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
                         continue;
                      }
 
-                     if(var10.contentType == 1400) {
+                     if (var10.contentType == 1400) {
                         class60.worldMap0.draw(var12, var13, var10.width, var10.height, Client.cycle);
                      }
 
-                     if(var10.contentType == 1401) {
+                     if (var10.contentType == 1401) {
                         class60.worldMap0.drawOverview(var12, var13, var10.width, var10.height);
                      }
 
-                     if(var10.contentType == 1402) {
+                     if (var10.contentType == 1402) {
                         class16.loginScreenRunesAnimation.method1782(var12, Client.cycle);
                      }
                   }
 
-                  if(var10.type == 0) {
-                     if(!var10.isIf3 && PacketBufferNode.method3673(var10) && var10 != Clock.mousedOverWidgetIf1) {
+                  if (var10.type == 0) {
+                     if (!var10.isIf3 && PacketBufferNode.method3673(var10) && var10 != Clock.mousedOverWidgetIf1) {
                         continue;
                      }
 
-                     if(!var10.isIf3) {
-                        if(var10.scrollY > var10.scrollHeight - var10.height) {
+                     if (!var10.isIf3) {
+                        if (var10.scrollY > var10.scrollHeight - var10.height) {
                            var10.scrollY = var10.scrollHeight - var10.height;
                         }
 
-                        if(var10.scrollY < 0) {
+                        if (var10.scrollY < 0) {
                            var10.scrollY = 0;
                         }
                      }
 
                      drawWidgetGroup(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
-                     if(var10.children != null) {
+                     if (var10.children != null) {
                         drawWidgetGroup(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
                      }
 
-                     WidgetGroupParent var19 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var10.id);
-                     if(var19 != null) {
-                        Interpreter.drawWidgets(var19.group, var15, var16, var17, var18, var12, var13, var11);
+                     WidgetGroupParent var23 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var10.id);
+                     if (var23 != null) {
+                        Interpreter.drawWidgets(var23.group, var15, var16, var17, var18, var12, var13, var11);
                      }
 
                      Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
                      Rasterizer3D.Rasterizer3D_method1();
                   }
 
-                  if(Client.isResizable || Client.__client_oq[var11] || Client.gameDrawingMode > 1) {
-                     if(var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) {
+                  if (Client.isResizable || Client.field101[var11] || Client.gameDrawingMode > 1) {
+                     if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) {
                         class11.method148(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight);
                      }
 
-                     if(var10.type != 1) {
-                        int var23;
+                     if (var10.type != 1) {
                         int var24;
                         int var25;
                         int var26;
-                        if(var10.type == 2) {
-                           var30 = 0;
+                        int var33;
+                        if (var10.type == 2) {
+                           var22 = 0;
 
-                           for(var20 = 0; var20 < var10.rawHeight; ++var20) {
-                              for(var21 = 0; var21 < var10.rawWidth; ++var21) {
-                                 var22 = var12 + var21 * (var10.paddingX + 32);
-                                 var23 = var13 + var20 * (var10.paddingY + 32);
-                                 if(var30 < 20) {
-                                    var22 += var10.inventoryXOffsets[var30];
-                                    var23 += var10.inventoryYOffsets[var30];
+                           for (var19 = 0; var19 < var10.rawHeight; ++var19) {
+                              for (var20 = 0; var20 < var10.rawWidth; ++var20) {
+                                 var21 = var12 + var20 * (var10.paddingX + 32);
+                                 var33 = var13 + var19 * (var10.paddingY + 32);
+                                 if (var22 < 20) {
+                                    var21 += var10.inventoryXOffsets[var22];
+                                    var33 += var10.inventoryYOffsets[var22];
                                  }
 
-                                 if(var10.itemIds[var30] <= 0) {
-                                    if(var10.inventorySprites != null && var30 < 20) {
-                                       Sprite var42 = var10.getInventorySprite(var30);
-                                       if(var42 != null) {
-                                          var42.drawAt2(var22, var23);
-                                       } else if(Widget.__ho_j) {
+                                 if (var10.itemIds[var22] <= 0) {
+                                    if (var10.inventorySprites != null && var22 < 20) {
+                                       Sprite var36 = var10.getInventorySprite(var22);
+                                       if (var36 != null) {
+                                          var36.drawAt2(var21, var33);
+                                       } else if (Widget.field957) {
                                           class22.method295(var10);
                                        }
                                     }
                                  } else {
-                                    boolean var39 = false;
-                                    boolean var40 = false;
-                                    var26 = var10.itemIds[var30] - 1;
-                                    if(var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == dragInventoryWidget && var30 == Client.dragItemSlotSource) {
-                                       Sprite var27;
-                                       if(Client.isItemSelected == 1 && var30 == HealthBarDefinition.selectedItemSlot && var10.id == ServerPacket.selectedItemWidget) {
-                                          var27 = class226.getItemSprite(var26, var10.itemQuantities[var30], 2, 0, 2, false);
+                                    boolean var35 = false;
+                                    boolean var46 = false;
+                                    var26 = var10.itemIds[var22] - 1;
+                                    if (var21 + 32 > var2 && var21 < var4 && var33 + 32 > var3 && var33 < var5 || var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) {
+                                       Sprite var42;
+                                       if (Client.isItemSelected == 1 && var22 == HealthBarDefinition.selectedItemSlot && var10.id == ServerPacket.selectedItemWidget) {
+                                          var42 = class226.getItemSprite(var26, var10.itemQuantities[var22], 2, 0, 2, false);
                                        } else {
-                                          var27 = class226.getItemSprite(var26, var10.itemQuantities[var30], 1, 3153952, 2, false);
+                                          var42 = class226.getItemSprite(var26, var10.itemQuantities[var22], 1, 3153952, 2, false);
                                        }
 
-                                       if(var27 != null) {
-                                          if(var10 == dragInventoryWidget && var30 == Client.dragItemSlotSource) {
-                                             var24 = MouseHandler.MouseHandler_x - Client.__client_ja;
-                                             var25 = MouseHandler.MouseHandler_y - Client.__client_je;
-                                             if(var24 < 5 && var24 > -5) {
+                                       if (var42 != null) {
+                                          if (var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) {
+                                             var24 = MouseHandler.MouseHandler_x - Client.field205;
+                                             var25 = MouseHandler.MouseHandler_y - Client.field206;
+                                             if (var24 < 5 && var24 > -5) {
                                                 var24 = 0;
                                              }
 
-                                             if(var25 < 5 && var25 > -5) {
+                                             if (var25 < 5 && var25 > -5) {
                                                 var25 = 0;
                                              }
 
-                                             if(Client.itemDragDuration < 5) {
+                                             if (Client.itemDragDuration < 5) {
                                                 var24 = 0;
                                                 var25 = 0;
                                              }
 
-                                             var27.__h_508(var22 + var24, var23 + var25, 128);
-                                             if(var1 != -1) {
-                                                Widget var28 = var0[var1 & 65535];
-                                                int var29;
-                                                if(var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) {
-                                                   var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.__client_gy / 3;
-                                                   if(var29 > Client.__client_gy * 10) {
-                                                      var29 = Client.__client_gy * 10;
+                                             var42.method310(var21 + var24, var33 + var25, 128);
+                                             if (var1 != -1) {
+                                                Widget var47 = var0[var1 & 65535];
+                                                int var45;
+                                                if (var33 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var47.scrollY > 0) {
+                                                   var45 = (Rasterizer2D.Rasterizer2D_yClipStart - var33 - var25) * Client.field183 / 3;
+                                                   if (var45 > Client.field183 * 10) {
+                                                      var45 = Client.field183 * 10;
                                                    }
 
-                                                   if(var29 > var28.scrollY) {
-                                                      var29 = var28.scrollY;
+                                                   if (var45 > var47.scrollY) {
+                                                      var45 = var47.scrollY;
                                                    }
 
-                                                   var28.scrollY -= var29;
-                                                   Client.__client_je += var29;
-                                                   class22.method295(var28);
+                                                   var47.scrollY -= var45;
+                                                   Client.field206 += var45;
+                                                   class22.method295(var47);
                                                 }
 
-                                                if(var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) {
-                                                   var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.__client_gy / 3;
-                                                   if(var29 > Client.__client_gy * 10) {
-                                                      var29 = Client.__client_gy * 10;
+                                                if (var25 + var33 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var47.scrollY < var47.scrollHeight - var47.height) {
+                                                   var45 = (var33 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field183 / 3;
+                                                   if (var45 > Client.field183 * 10) {
+                                                      var45 = Client.field183 * 10;
                                                    }
 
-                                                   if(var29 > var28.scrollHeight - var28.height - var28.scrollY) {
-                                                      var29 = var28.scrollHeight - var28.height - var28.scrollY;
+                                                   if (var45 > var47.scrollHeight - var47.height - var47.scrollY) {
+                                                      var45 = var47.scrollHeight - var47.height - var47.scrollY;
                                                    }
 
-                                                   var28.scrollY += var29;
-                                                   Client.__client_je -= var29;
-                                                   class22.method295(var28);
+                                                   var47.scrollY += var45;
+                                                   Client.field206 -= var45;
+                                                   class22.method295(var47);
                                                 }
                                              }
-                                          } else if(var10 == BoundaryObject.__ej_jv && var30 == Client.__client_jz) {
-                                             var27.__h_508(var22, var23, 128);
+                                          } else if (var10 == BoundaryObject.field40 && var22 == Client.field204) {
+                                             var42.method310(var21, var33, 128);
                                           } else {
-                                             var27.drawAt2(var22, var23);
+                                             var42.drawAt2(var21, var33);
                                           }
                                        } else {
                                           class22.method295(var10);
@@ -447,138 +447,138 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
                                     }
                                  }
 
-                                 ++var30;
+                                 ++var22;
                               }
                            }
-                        } else if(var10.type == 3) {
-                           if(class238.runCs1(var10)) {
-                              var30 = var10.color2;
-                              if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
-                                 var30 = var10.mouseOverColor2;
+                        } else if (var10.type == 3) {
+                           if (class238.runCs1(var10)) {
+                              var22 = var10.color2;
+                              if (var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
+                                 var22 = var10.mouseOverColor2;
                               }
                            } else {
-                              var30 = var10.color;
-                              if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
-                                 var30 = var10.mouseOverColor;
+                              var22 = var10.color;
+                              if (var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
+                                 var22 = var10.mouseOverColor;
                               }
                            }
 
-                           if(var10.fill) {
+                           if (var10.fill) {
                               switch(var10.rectangleMode.id) {
                               case 1:
                                  Rasterizer2D.drawGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2);
                                  break;
                               case 2:
-                                 Rasterizer2D.drawGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparency & 255), 255 - (var10.__af & 255));
+                                 Rasterizer2D.drawGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparency & 255), 255 - (var10.field960 & 255));
                                  break;
                               default:
-                                 if(var14 == 0) {
-                                    Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var30);
+                                 if (var14 == 0) {
+                                    Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var22);
                                  } else {
-                                    Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255));
+                                    Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var22, 256 - (var14 & 255));
                                  }
                               }
-                           } else if(var14 == 0) {
-                              Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var30);
+                           } else if (var14 == 0) {
+                              Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var22);
                            } else {
-                              Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255));
+                              Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var22, 256 - (var14 & 255));
                            }
                         } else {
-                           Font var36;
-                           if(var10.type == 4) {
-                              var36 = var10.getFont();
-                              if(var36 == null) {
-                                 if(Widget.__ho_j) {
+                           Font var27;
+                           if (var10.type == 4) {
+                              var27 = var10.getFont();
+                              if (var27 == null) {
+                                 if (Widget.field957) {
                                     class22.method295(var10);
                                  }
                               } else {
-                                 String var45 = var10.text;
-                                 if(class238.runCs1(var10)) {
-                                    var20 = var10.color2;
-                                    if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
-                                       var20 = var10.mouseOverColor2;
+                                 String var38 = var10.text;
+                                 if (class238.runCs1(var10)) {
+                                    var19 = var10.color2;
+                                    if (var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
+                                       var19 = var10.mouseOverColor2;
                                     }
 
-                                    if(var10.text2.length() > 0) {
-                                       var45 = var10.text2;
+                                    if (var10.text2.length() > 0) {
+                                       var38 = var10.text2;
                                     }
                                  } else {
-                                    var20 = var10.color;
-                                    if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
-                                       var20 = var10.mouseOverColor;
+                                    var19 = var10.color;
+                                    if (var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
+                                       var19 = var10.mouseOverColor;
                                     }
                                  }
 
-                                 if(var10.isIf3 && var10.itemId != -1) {
-                                    ItemDefinition var46 = Skills.getItemDefinition(var10.itemId);
-                                    var45 = var46.name;
-                                    if(var45 == null) {
-                                       var45 = "null";
+                                 if (var10.isIf3 && var10.itemId != -1) {
+                                    ItemDefinition var41 = Skills.getItemDefinition(var10.itemId);
+                                    var38 = var41.name;
+                                    if (var38 == null) {
+                                       var38 = "null";
                                     }
 
-                                    if((var46.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) {
-                                       var45 = BufferedFile.colorStartTag(16748608) + var45 + "</col>" + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantity);
+                                    if ((var41.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) {
+                                       var38 = BufferedFile.colorStartTag(16748608) + var38 + "</col> " + 'x' + GrandExchangeEvent.method88(var10.itemQuantity);
                                     }
                                  }
 
-                                 if(var10 == Client.__client_mo) {
-                                    var45 = "Please wait...";
-                                    var20 = var10.color;
+                                 if (var10 == Client.field127) {
+                                    var38 = "Please wait...";
+                                    var19 = var10.color;
                                  }
 
-                                 if(!var10.isIf3) {
-                                    var45 = MouseRecorder.method1194(var45, var10);
+                                 if (!var10.isIf3) {
+                                    var38 = MouseRecorder.method1194(var38, var10);
                                  }
 
-                                 var36.drawLines(var45, var12, var13, var10.width, var10.height, var20, var10.textShadowed?0:-1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight);
+                                 var27.drawLines(var38, var12, var13, var10.width, var10.height, var19, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight);
                               }
-                           } else if(var10.type == 5) {
+                           } else if (var10.type == 5) {
                               Sprite var37;
-                              if(!var10.isIf3) {
+                              if (!var10.isIf3) {
                                  var37 = var10.getSprite(class238.runCs1(var10));
-                                 if(var37 != null) {
+                                 if (var37 != null) {
                                     var37.drawAt2(var12, var13);
-                                 } else if(Widget.__ho_j) {
+                                 } else if (Widget.field957) {
                                     class22.method295(var10);
                                  }
                               } else {
-                                 if(var10.itemId != -1) {
+                                 if (var10.itemId != -1) {
                                     var37 = class226.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false);
                                  } else {
                                     var37 = var10.getSprite(false);
                                  }
 
-                                 if(var37 == null) {
-                                    if(Widget.__ho_j) {
+                                 if (var37 == null) {
+                                    if (Widget.field957) {
                                        class22.method295(var10);
                                     }
                                  } else {
-                                    var20 = var37.width;
-                                    var21 = var37.height;
-                                    if(!var10.spriteTiling) {
-                                       var22 = var10.width * 4096 / var20;
-                                       if(var10.spriteAngle != 0) {
-                                          var37.__ak_515(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22);
-                                       } else if(var14 != 0) {
-                                          var37.__c_509(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
-                                       } else if(var20 == var10.width && var21 == var10.height) {
+                                    var19 = var37.width;
+                                    var20 = var37.height;
+                                    if (!var10.spriteTiling) {
+                                       var21 = var10.width * 4096 / var19;
+                                       if (var10.spriteAngle != 0) {
+                                          var37.method317(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var21);
+                                       } else if (var14 != 0) {
+                                          var37.method311(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
+                                       } else if (var19 == var10.width && var20 == var10.height) {
                                           var37.drawAt2(var12, var13);
                                        } else {
-                                          var37.__j_506(var12, var13, var10.width, var10.height);
+                                          var37.method309(var12, var13, var10.width, var10.height);
                                        }
                                     } else {
                                        Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height);
-                                       var22 = (var20 - 1 + var10.width) / var20;
-                                       var23 = (var21 - 1 + var10.height) / var21;
+                                       var21 = (var19 - 1 + var10.width) / var19;
+                                       var33 = (var20 - 1 + var10.height) / var20;
 
-                                       for(var24 = 0; var24 < var22; ++var24) {
-                                          for(var25 = 0; var25 < var23; ++var25) {
-                                             if(var10.spriteAngle != 0) {
-                                                var37.__ak_515(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096);
-                                             } else if(var14 != 0) {
-                                                var37.__h_508(var12 + var20 * var24, var13 + var21 * var25, 256 - (var14 & 255));
+                                       for (var24 = 0; var24 < var21; ++var24) {
+                                          for (var25 = 0; var25 < var33; ++var25) {
+                                             if (var10.spriteAngle != 0) {
+                                                var37.method317(var19 / 2 + var12 + var19 * var24, var20 / 2 + var13 + var25 * var20, var10.spriteAngle, 4096);
+                                             } else if (var14 != 0) {
+                                                var37.method310(var12 + var19 * var24, var13 + var20 * var25, 256 - (var14 & 255));
                                              } else {
-                                                var37.drawAt2(var12 + var20 * var24, var13 + var25 * var21);
+                                                var37.drawAt2(var12 + var19 * var24, var13 + var25 * var20);
                                              }
                                           }
                                        }
@@ -588,179 +588,179 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
                                  }
                               }
                            } else {
-                              ItemDefinition var34;
-                              if(var10.type == 6) {
-                                 boolean var43 = class238.runCs1(var10);
-                                 if(var43) {
-                                    var20 = var10.sequenceId2;
+                              ItemDefinition var28;
+                              if (var10.type == 6) {
+                                 boolean var40 = class238.runCs1(var10);
+                                 if (var40) {
+                                    var19 = var10.sequenceId2;
                                  } else {
-                                    var20 = var10.sequenceId;
+                                    var19 = var10.sequenceId;
                                  }
 
-                                 Model var41 = null;
-                                 var22 = 0;
-                                 if(var10.itemId != -1) {
-                                    var34 = Skills.getItemDefinition(var10.itemId);
-                                    if(var34 != null) {
-                                       var34 = var34.__x_430(var10.itemQuantity);
-                                       var41 = var34.getModel(1);
-                                       if(var41 != null) {
-                                          var41.calculateBoundsCylinder();
-                                          var22 = var41.height / 2;
+                                 Model var43 = null;
+                                 var21 = 0;
+                                 if (var10.itemId != -1) {
+                                    var28 = Skills.getItemDefinition(var10.itemId);
+                                    if (var28 != null) {
+                                       var28 = var28.method144(var10.itemQuantity);
+                                       var43 = var28.getModel(1);
+                                       if (var43 != null) {
+                                          var43.calculateBoundsCylinder();
+                                          var21 = var43.height / 2;
                                        } else {
                                           class22.method295(var10);
                                        }
                                     }
-                                 } else if(var10.modelType == 5) {
-                                    if(var10.modelId == 0) {
-                                       var41 = Client.__client_ru.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
+                                 } else if (var10.modelType == 5) {
+                                    if (var10.modelId == 0) {
+                                       var43 = Client.field119.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
                                     } else {
-                                       var41 = Canvas.localPlayer.getModel();
+                                       var43 = Canvas.localPlayer.getModel();
                                     }
-                                 } else if(var20 == -1) {
-                                    var41 = var10.getModel((SequenceDefinition)null, -1, var43, Canvas.localPlayer.appearance);
-                                    if(var41 == null && Widget.__ho_j) {
+                                 } else if (var19 == -1) {
+                                    var43 = var10.getModel((SequenceDefinition)null, -1, var40, Canvas.localPlayer.appearance);
+                                    if (var43 == null && Widget.field957) {
                                        class22.method295(var10);
                                     }
                                  } else {
-                                    SequenceDefinition var47 = WorldMapAreaData.getSequenceDefinition(var20);
-                                    var41 = var10.getModel(var47, var10.modelFrame, var43, Canvas.localPlayer.appearance);
-                                    if(var41 == null && Widget.__ho_j) {
+                                    SequenceDefinition var44 = WorldMapAreaData.getSequenceDefinition(var19);
+                                    var43 = var10.getModel(var44, var10.modelFrame, var40, Canvas.localPlayer.appearance);
+                                    if (var43 == null && Widget.field957) {
                                        class22.method295(var10);
                                     }
                                  }
 
                                  Rasterizer3D.method2989(var10.width / 2 + var12, var10.height / 2 + var13);
-                                 var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16;
+                                 var33 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16;
                                  var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16;
-                                 if(var41 != null) {
-                                    if(!var10.isIf3) {
-                                       var41.__c_234(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24);
+                                 if (var43 != null) {
+                                    if (!var10.isIf3) {
+                                       var43.method199(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var33, var24);
                                     } else {
-                                       var41.calculateBoundsCylinder();
-                                       if(var10.modelOrthog) {
-                                          var41.__p_235(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom);
+                                       var43.calculateBoundsCylinder();
+                                       if (var10.modelOrthog) {
+                                          var43.method200(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var21 + var33 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom);
                                        } else {
-                                          var41.__c_234(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY);
+                                          var43.method199(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var33 + var21 + var10.modelOffsetY, var24 + var10.modelOffsetY);
                                        }
                                     }
                                  }
 
                                  Rasterizer3D.Rasterizer3D_method3();
                               } else {
-                                 if(var10.type == 7) {
-                                    var36 = var10.getFont();
-                                    if(var36 == null) {
-                                       if(Widget.__ho_j) {
+                                 if (var10.type == 7) {
+                                    var27 = var10.getFont();
+                                    if (var27 == null) {
+                                       if (Widget.field957) {
                                           class22.method295(var10);
                                        }
                                        continue;
                                     }
 
-                                    var20 = 0;
+                                    var19 = 0;
 
-                                    for(var21 = 0; var21 < var10.rawHeight; ++var21) {
-                                       for(var22 = 0; var22 < var10.rawWidth; ++var22) {
-                                          if(var10.itemIds[var20] > 0) {
-                                             var34 = Skills.getItemDefinition(var10.itemIds[var20] - 1);
-                                             String var31;
-                                             if(var34.isStackable != 1 && var10.itemQuantities[var20] == 1) {
-                                                var31 = BufferedFile.colorStartTag(16748608) + var34.name + "</col>";
+                                    for (var20 = 0; var20 < var10.rawHeight; ++var20) {
+                                       for (var21 = 0; var21 < var10.rawWidth; ++var21) {
+                                          if (var10.itemIds[var19] > 0) {
+                                             var28 = Skills.getItemDefinition(var10.itemIds[var19] - 1);
+                                             String var29;
+                                             if (var28.isStackable != 1 && var10.itemQuantities[var19] == 1) {
+                                                var29 = BufferedFile.colorStartTag(16748608) + var28.name + "</col>";
                                              } else {
-                                                var31 = BufferedFile.colorStartTag(16748608) + var34.name + "</col>" + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantities[var20]);
+                                                var29 = BufferedFile.colorStartTag(16748608) + var28.name + "</col> " + 'x' + GrandExchangeEvent.method88(var10.itemQuantities[var19]);
                                              }
 
-                                             var25 = var22 * (var10.paddingX + 115) + var12;
-                                             var26 = var21 * (var10.paddingY + 12) + var13;
-                                             if(var10.textXAlignment == 0) {
-                                                var36.draw(var31, var25, var26, var10.color, var10.textShadowed?0:-1);
-                                             } else if(var10.textXAlignment == 1) {
-                                                var36.drawCentered(var31, var10.width / 2 + var25, var26, var10.color, var10.textShadowed?0:-1);
+                                             var25 = var21 * (var10.paddingX + 115) + var12;
+                                             var26 = var20 * (var10.paddingY + 12) + var13;
+                                             if (var10.textXAlignment == 0) {
+                                                var27.draw(var29, var25, var26, var10.color, var10.textShadowed ? 0 : -1);
+                                             } else if (var10.textXAlignment == 1) {
+                                                var27.drawCentered(var29, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1);
                                              } else {
-                                                var36.drawRightAligned(var31, var25 + var10.width - 1, var26, var10.color, var10.textShadowed?0:-1);
+                                                var27.drawRightAligned(var29, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1);
                                              }
                                           }
 
-                                          ++var20;
+                                          ++var19;
                                        }
                                     }
                                  }
 
-                                 if(var10.type == 8 && var10 == AccessFile.__dk_lm && Client.__client_ls == Client.__client_lb) {
-                                    var30 = 0;
-                                    var20 = 0;
-                                    Font var32 = fontPlain12;
-                                    String var33 = var10.text;
+                                 if (var10.type == 8 && var10 == AccessFile.field8 && Client.field219 == Client.field218) {
+                                    var22 = 0;
+                                    var19 = 0;
+                                    Font var39 = fontPlain12;
+                                    String var30 = var10.text;
 
-                                    String var44;
-                                    for(var33 = MouseRecorder.method1194(var33, var10); var33.length() > 0; var20 = var20 + var32.ascent + 1) {
-                                       var24 = var33.indexOf("<br>");
-                                       if(var24 != -1) {
-                                          var44 = var33.substring(0, var24);
-                                          var33 = var33.substring(var24 + 4);
+                                    String var31;
+                                    for (var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var19 = var19 + var39.ascent + 1) {
+                                       var24 = var30.indexOf("<br>");
+                                       if (var24 != -1) {
+                                          var31 = var30.substring(0, var24);
+                                          var30 = var30.substring(var24 + 4);
                                        } else {
-                                          var44 = var33;
-                                          var33 = "";
+                                          var31 = var30;
+                                          var30 = "";
                                        }
 
-                                       var25 = var32.stringWidth(var44);
-                                       if(var25 > var30) {
-                                          var30 = var25;
+                                       var25 = var39.stringWidth(var31);
+                                       if (var25 > var22) {
+                                          var22 = var25;
                                        }
                                     }
 
-                                    var30 += 6;
-                                    var20 += 7;
-                                    var24 = var12 + var10.width - 5 - var30;
+                                    var22 += 6;
+                                    var19 += 7;
+                                    var24 = var12 + var10.width - 5 - var22;
                                     var25 = var13 + var10.height + 5;
-                                    if(var24 < var12 + 5) {
+                                    if (var24 < var12 + 5) {
                                        var24 = var12 + 5;
                                     }
 
-                                    if(var30 + var24 > var4) {
-                                       var24 = var4 - var30;
+                                    if (var22 + var24 > var4) {
+                                       var24 = var4 - var22;
                                     }
 
-                                    if(var25 + var20 > var5) {
-                                       var25 = var5 - var20;
+                                    if (var25 + var19 > var5) {
+                                       var25 = var5 - var19;
                                     }
 
-                                    Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var30, var20, 16777120);
-                                    Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var30, var20, 0);
-                                    var33 = var10.text;
-                                    var26 = var25 + var32.ascent + 2;
+                                    Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var22, var19, 16777120);
+                                    Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var22, var19, 0);
+                                    var30 = var10.text;
+                                    var26 = var25 + var39.ascent + 2;
 
-                                    for(var33 = MouseRecorder.method1194(var33, var10); var33.length() > 0; var26 = var26 + var32.ascent + 1) {
-                                       int var35 = var33.indexOf("<br>");
-                                       if(var35 != -1) {
-                                          var44 = var33.substring(0, var35);
-                                          var33 = var33.substring(var35 + 4);
+                                    for (var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var26 = var26 + var39.ascent + 1) {
+                                       int var32 = var30.indexOf("<br>");
+                                       if (var32 != -1) {
+                                          var31 = var30.substring(0, var32);
+                                          var30 = var30.substring(var32 + 4);
                                        } else {
-                                          var44 = var33;
-                                          var33 = "";
+                                          var31 = var30;
+                                          var30 = "";
                                        }
 
-                                       var32.draw(var44, var24 + 3, var26, 0, -1);
+                                       var39.draw(var31, var24 + 3, var26, 0, -1);
                                     }
                                  }
 
-                                 if(var10.type == 9) {
-                                    if(var10.__ba) {
-                                       var30 = var12;
-                                       var20 = var13 + var10.height;
-                                       var21 = var12 + var10.width;
-                                       var22 = var13;
+                                 if (var10.type == 9) {
+                                    if (var10.field961) {
+                                       var22 = var12;
+                                       var19 = var13 + var10.height;
+                                       var20 = var12 + var10.width;
+                                       var21 = var13;
                                     } else {
-                                       var30 = var12;
-                                       var20 = var13;
-                                       var21 = var12 + var10.width;
-                                       var22 = var13 + var10.height;
+                                       var22 = var12;
+                                       var19 = var13;
+                                       var20 = var12 + var10.width;
+                                       var21 = var13 + var10.height;
                                     }
 
-                                    if(var10.lineWid == 1) {
-                                       Rasterizer2D.Rasterizer2D_drawLine(var30, var20, var21, var22, var10.color);
+                                    if (var10.lineWid == 1) {
+                                       Rasterizer2D.Rasterizer2D_drawLine(var22, var19, var20, var21, var10.color);
                                     } else {
-                                       class190.method3669(var30, var20, var21, var22, var10.color, var10.lineWid);
+                                       class190.method3669(var22, var19, var20, var21, var10.color, var10.lineWid);
                                     }
                                  }
                               }
@@ -781,17 +781,17 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
       garbageValue = "-1666917204"
    )
    static final void method845(int var0) {
-      if(GroundItemPile.loadWidgetGroup(var0)) {
+      if (GroundItemPile.loadWidgetGroup(var0)) {
          Widget[] var1 = Widget.widgets[var0];
 
-         for(int var2 = 0; var2 < var1.length; ++var2) {
+         for (int var2 = 0; var2 < var1.length; ++var2) {
             Widget var3 = var1[var2];
-            if(var3 != null) {
+            if (var3 != null) {
                var3.modelFrame = 0;
                var3.modelFrameCycle = 0;
             }
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java
index 434d68ecff..640d22b969 100644
--- a/runescape-client/src/main/java/DualNode.java
+++ b/runescape-client/src/main/java/DualNode.java
@@ -25,11 +25,12 @@ public class DualNode extends Node {
    @ObfuscatedName("cg")
    @Export("removeDual")
    public void removeDual() {
-      if(this.nextDual != null) {
+      if (this.nextDual != null) {
          this.nextDual.previousDual = this.previousDual;
          this.previousDual.nextDual = this.nextDual;
          this.previousDual = null;
          this.nextDual = null;
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java
index b84ff91bd3..89f3fa326b 100644
--- a/runescape-client/src/main/java/DualNodeDeque.java
+++ b/runescape-client/src/main/java/DualNodeDeque.java
@@ -25,7 +25,7 @@ public final class DualNodeDeque {
    )
    @Export("addFirst")
    public void addFirst(DualNode var1) {
-      if(var1.nextDual != null) {
+      if (var1.nextDual != null) {
          var1.removeDual();
       }
 
@@ -41,7 +41,7 @@ public final class DualNodeDeque {
    )
    @Export("addLast")
    public void addLast(DualNode var1) {
-      if(var1.nextDual != null) {
+      if (var1.nextDual != null) {
          var1.removeDual();
       }
 
@@ -58,7 +58,7 @@ public final class DualNodeDeque {
    @Export("removeLast")
    public DualNode removeLast() {
       DualNode var1 = this.sentinel.previousDual;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          return null;
       } else {
          var1.removeDual();
@@ -73,15 +73,15 @@ public final class DualNodeDeque {
    @Export("last")
    public DualNode last() {
       DualNode var1 = this.sentinel.previousDual;
-      return var1 == this.sentinel?null:var1;
+      return var1 == this.sentinel ? null : var1;
    }
 
    @ObfuscatedName("u")
    @Export("clear")
    public void clear() {
-      while(true) {
+      while (true) {
          DualNode var1 = this.sentinel.previousDual;
-         if(var1 == this.sentinel) {
+         if (var1 == this.sentinel) {
             return;
          }
 
@@ -94,7 +94,7 @@ public final class DualNodeDeque {
       signature = "(Lfn;Lfn;)V"
    )
    public static void method5220(DualNode var0, DualNode var1) {
-      if(var0.nextDual != null) {
+      if (var0.nextDual != null) {
          var0.removeDual();
       }
 
diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java
index af0b3ff97a..31c8470632 100644
--- a/runescape-client/src/main/java/DynamicObject.java
+++ b/runescape-client/src/main/java/DynamicObject.java
@@ -74,27 +74,27 @@ public class DynamicObject extends Entity {
    @ObfuscatedSignature(
       signature = "(IIIIIIIZLex;)V"
    )
-   DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int animationID, boolean var8, Entity var9) {
+   DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) {
       this.id = var1;
       this.type = var2;
       this.orientation = var3;
       this.plane = var4;
       this.x = var5;
       this.y = var6;
-      if(animationID != -1) {
-         this.sequenceDefinition = WorldMapAreaData.getSequenceDefinition(animationID);
+      if (var7 != -1) {
+         this.sequenceDefinition = WorldMapAreaData.getSequenceDefinition(var7);
          this.frame = 0;
          this.cycleStart = Client.cycle - 1;
-         if(this.sequenceDefinition.__t == 0 && var9 != null && var9 instanceof DynamicObject) {
+         if (this.sequenceDefinition.field783 == 0 && var9 != null && var9 instanceof DynamicObject) {
             DynamicObject var10 = (DynamicObject)var9;
-            if(this.sequenceDefinition == var10.sequenceDefinition) {
+            if (this.sequenceDefinition == var10.sequenceDefinition) {
                this.frame = var10.frame;
                this.cycleStart = var10.cycleStart;
                return;
             }
          }
 
-         if(var8 && this.sequenceDefinition.frameCount != -1) {
+         if (var8 && this.sequenceDefinition.frameCount != -1) {
             this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length);
             this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]);
          }
@@ -109,17 +109,17 @@ public class DynamicObject extends Entity {
    )
    @Export("getModel")
    protected final Model getModel() {
-      if(this.sequenceDefinition != null) {
+      if (this.sequenceDefinition != null) {
          int var1 = Client.cycle - this.cycleStart;
-         if(var1 > 100 && this.sequenceDefinition.frameCount > 0) {
+         if (var1 > 100 && this.sequenceDefinition.frameCount > 0) {
             var1 = 100;
          }
 
-         label55: {
+         label47: {
             do {
                do {
-                  if(var1 <= this.sequenceDefinition.frameLengths[this.frame]) {
-                     break label55;
+                  if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) {
+                     break label47;
                   }
 
                   var1 -= this.sequenceDefinition.frameLengths[this.frame];
@@ -136,16 +136,16 @@ public class DynamicObject extends Entity {
       }
 
       ObjectDefinition var12 = class50.getObjectDefinition(this.id);
-      if(var12.transforms != null) {
+      if (var12.transforms != null) {
          var12 = var12.transform();
       }
 
-      if(var12 == null) {
+      if (var12 == null) {
          return null;
       } else {
          int var2;
          int var3;
-         if(this.orientation != 1 && this.orientation != 3) {
+         if (this.orientation != 1 && this.orientation != 3) {
             var2 = var12.sizeX;
             var3 = var12.sizeY;
          } else {
@@ -171,7 +171,7 @@ public class DynamicObject extends Entity {
       garbageValue = "1172859329"
    )
    static void method2218(String[] var0, short[] var1, int var2, int var3) {
-      if(var2 < var3) {
+      if (var2 < var3) {
          int var4 = (var3 + var2) / 2;
          int var5 = var2;
          String var6 = var0[var4];
@@ -181,8 +181,8 @@ public class DynamicObject extends Entity {
          var1[var4] = var1[var3];
          var1[var3] = var7;
 
-         for(int var8 = var2; var8 < var3; ++var8) {
-            if(var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) {
+         for (int var8 = var2; var8 < var3; ++var8) {
+            if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) {
                String var9 = var0[var8];
                var0[var8] = var0[var5];
                var0[var5] = var9;
@@ -208,53 +208,54 @@ public class DynamicObject extends Entity {
       garbageValue = "-83"
    )
    static int method2223(int var0, Script var1, boolean var2) {
-      if(var0 == 5000) {
+      if (var0 == 5000) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.publicChatMode;
          return 1;
-      } else if(var0 == 5001) {
+      } else if (var0 == 5001) {
          RouteStrategy.Interpreter_intStackSize -= 3;
          Client.publicChatMode = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          IndexCacheLoader.field512 = WorldMapElement.method4783(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
-         if(IndexCacheLoader.field512 == null) {
+         if (IndexCacheLoader.field512 == null) {
             IndexCacheLoader.field512 = class310.field3805;
          }
 
-         Client.__client_pl = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-         PacketBufferNode var18 = Interpreter.method1915(ClientPacket.__gs_z, Client.packetWriter.isaacCipher);
-         var18.packetBuffer.writeByte(Client.publicChatMode);
-         var18.packetBuffer.writeByte(IndexCacheLoader.field512.field3804);
-         var18.packetBuffer.writeByte(Client.__client_pl);
-         Client.packetWriter.__q_167(var18);
+         Client.field138 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+         PacketBufferNode var15 = Interpreter.method1915(ClientPacket.field237, Client.packetWriter.isaacCipher);
+         var15.packetBuffer.writeByte(Client.publicChatMode);
+         var15.packetBuffer.writeByte(IndexCacheLoader.field512.field3804);
+         var15.packetBuffer.writeByte(Client.field138);
+         Client.packetWriter.method241(var15);
          return 1;
       } else {
          String var3;
          int var4;
-         if(var0 == 5002) {
+         int var5;
+         if (var0 == 5002) {
             var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
             RouteStrategy.Interpreter_intStackSize -= 2;
             var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-            int var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-            PacketBufferNode var6 = Interpreter.method1915(ClientPacket.__gs_ae, Client.packetWriter.isaacCipher);
-            var6.packetBuffer.writeByte(WorldMapRegion.method550(var3) + 2);
-            var6.packetBuffer.writeStringCp1252NullTerminated(var3);
-            var6.packetBuffer.writeByte(var4 - 1);
-            var6.packetBuffer.writeByte(var5);
-            Client.packetWriter.__q_167(var6);
+            var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+            PacketBufferNode var13 = Interpreter.method1915(ClientPacket.field260, Client.packetWriter.isaacCipher);
+            var13.packetBuffer.writeByte(WorldMapRegion.method550(var3) + 2);
+            var13.packetBuffer.writeStringCp1252NullTerminated(var3);
+            var13.packetBuffer.writeByte(var4 - 1);
+            var13.packetBuffer.writeByte(var5);
+            Client.packetWriter.method241(var13);
             return 1;
          } else {
-            int var10;
-            if(var0 == 5003) {
+            Message var11;
+            if (var0 == 5003) {
                RouteStrategy.Interpreter_intStackSize -= 2;
-               var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+               var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
                var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-               Message var15 = Message.method1226(var10, var4);
-               if(var15 != null) {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.count;
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.cycle;
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.sender != null?var15.sender:"";
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.prefix != null?var15.prefix:"";
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.text != null?var15.text:"";
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.isFromFriend()?1:(var15.isFromIgnored()?2:0);
+               var11 = Message.method1226(var5, var4);
+               if (var11 != null) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.count;
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.cycle;
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.sender != null ? var11.sender : "";
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.prefix != null ? var11.prefix : "";
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.text != null ? var11.text : "";
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.isFromFriend() ? 1 : (var11.isFromIgnored() ? 2 : 0);
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -265,16 +266,16 @@ public class DynamicObject extends Entity {
                }
 
                return 1;
-            } else if(var0 == 5004) {
-               var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               Message var16 = NetCache.method4708(var10);
-               if(var16 != null) {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var16.type;
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var16.cycle;
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.sender != null?var16.sender:"";
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.prefix != null?var16.prefix:"";
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.text != null?var16.text:"";
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var16.isFromFriend()?1:(var16.isFromIgnored()?2:0);
+            } else if (var0 == 5004) {
+               var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               var11 = NetCache.method4708(var5);
+               if (var11 != null) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.type;
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.cycle;
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.sender != null ? var11.sender : "";
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.prefix != null ? var11.prefix : "";
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.text != null ? var11.text : "";
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.isFromFriend() ? 1 : (var11.isFromIgnored() ? 2 : 0);
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -285,195 +286,198 @@ public class DynamicObject extends Entity {
                }
 
                return 1;
-            } else if(var0 == 5005) {
-               if(IndexCacheLoader.field512 == null) {
+            } else if (var0 == 5005) {
+               if (IndexCacheLoader.field512 == null) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = IndexCacheLoader.field512.field3804;
                }
 
                return 1;
-            } else if(var0 == 5008) {
-               var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               String var14 = var3.toLowerCase();
-               byte var17 = 0;
-               if(var14.startsWith("yellow:")) {
-                  var17 = 0;
-                  var3 = var3.substring("yellow:".length());
-               } else if(var14.startsWith("red:")) {
-                  var17 = 1;
-                  var3 = var3.substring("red:".length());
-               } else if(var14.startsWith("green:")) {
-                  var17 = 2;
-                  var3 = var3.substring("green:".length());
-               } else if(var14.startsWith("cyan:")) {
-                  var17 = 3;
-                  var3 = var3.substring("cyan:".length());
-               } else if(var14.startsWith("purple:")) {
-                  var17 = 4;
-                  var3 = var3.substring("purple:".length());
-               } else if(var14.startsWith("white:")) {
-                  var17 = 5;
-                  var3 = var3.substring("white:".length());
-               } else if(var14.startsWith("flash1:")) {
-                  var17 = 6;
-                  var3 = var3.substring("flash1:".length());
-               } else if(var14.startsWith("flash2:")) {
-                  var17 = 7;
-                  var3 = var3.substring("flash2:".length());
-               } else if(var14.startsWith("flash3:")) {
-                  var17 = 8;
-                  var3 = var3.substring("flash3:".length());
-               } else if(var14.startsWith("glow1:")) {
-                  var17 = 9;
-                  var3 = var3.substring("glow1:".length());
-               } else if(var14.startsWith("glow2:")) {
-                  var17 = 10;
-                  var3 = var3.substring("glow2:".length());
-               } else if(var14.startsWith("glow3:")) {
-                  var17 = 11;
-                  var3 = var3.substring("glow3:".length());
-               } else if(Client.language != 0) {
-                  if(var14.startsWith("yellow:")) {
-                     var17 = 0;
-                     var3 = var3.substring("yellow:".length());
-                  } else if(var14.startsWith("red:")) {
-                     var17 = 1;
-                     var3 = var3.substring("red:".length());
-                  } else if(var14.startsWith("green:")) {
-                     var17 = 2;
-                     var3 = var3.substring("green:".length());
-                  } else if(var14.startsWith("cyan:")) {
-                     var17 = 3;
-                     var3 = var3.substring("cyan:".length());
-                  } else if(var14.startsWith("purple:")) {
-                     var17 = 4;
-                     var3 = var3.substring("purple:".length());
-                  } else if(var14.startsWith("white:")) {
-                     var17 = 5;
-                     var3 = var3.substring("white:".length());
-                  } else if(var14.startsWith("flash1:")) {
-                     var17 = 6;
-                     var3 = var3.substring("flash1:".length());
-                  } else if(var14.startsWith("flash2:")) {
-                     var17 = 7;
-                     var3 = var3.substring("flash2:".length());
-                  } else if(var14.startsWith("flash3:")) {
-                     var17 = 8;
-                     var3 = var3.substring("flash3:".length());
-                  } else if(var14.startsWith("glow1:")) {
-                     var17 = 9;
-                     var3 = var3.substring("glow1:".length());
-                  } else if(var14.startsWith("glow2:")) {
-                     var17 = 10;
-                     var3 = var3.substring("glow2:".length());
-                  } else if(var14.startsWith("glow3:")) {
-                     var17 = 11;
-                     var3 = var3.substring("glow3:".length());
-                  }
-               }
-
-               var14 = var3.toLowerCase();
-               byte var7 = 0;
-               if(var14.startsWith("wave:")) {
-                  var7 = 1;
-                  var3 = var3.substring("wave:".length());
-               } else if(var14.startsWith("wave2:")) {
-                  var7 = 2;
-                  var3 = var3.substring("wave2:".length());
-               } else if(var14.startsWith("shake:")) {
-                  var7 = 3;
-                  var3 = var3.substring("shake:".length());
-               } else if(var14.startsWith("scroll:")) {
-                  var7 = 4;
-                  var3 = var3.substring("scroll:".length());
-               } else if(var14.startsWith("slide:")) {
-                  var7 = 5;
-                  var3 = var3.substring("slide:".length());
-               } else if(Client.language != 0) {
-                  if(var14.startsWith("wave:")) {
-                     var7 = 1;
-                     var3 = var3.substring("wave:".length());
-                  } else if(var14.startsWith("wave2:")) {
-                     var7 = 2;
-                     var3 = var3.substring("wave2:".length());
-                  } else if(var14.startsWith("shake:")) {
-                     var7 = 3;
-                     var3 = var3.substring("shake:".length());
-                  } else if(var14.startsWith("scroll:")) {
-                     var7 = 4;
-                     var3 = var3.substring("scroll:".length());
-                  } else if(var14.startsWith("slide:")) {
-                     var7 = 5;
-                     var3 = var3.substring("slide:".length());
-                  }
-               }
-
-               PacketBufferNode var8 = Interpreter.method1915(ClientPacket.__gs_cz, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.writeByte(0);
-               int var9 = var8.packetBuffer.index;
-               var8.packetBuffer.writeByte(var4);
-               var8.packetBuffer.writeByte(var17);
-               var8.packetBuffer.writeByte(var7);
-               TextureProvider.method2777(var8.packetBuffer, var3);
-               var8.packetBuffer.__h_300(var8.packetBuffer.index - var9);
-               Client.packetWriter.__q_167(var8);
-               return 1;
-            } else if(var0 == 5009) {
-               Interpreter.Interpreter_stringStackSize -= 2;
-               var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-               String var12 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-               PacketBufferNode var11 = Interpreter.method1915(ClientPacket.__gs_v, Client.packetWriter.isaacCipher);
-               var11.packetBuffer.writeShort(0);
-               int var13 = var11.packetBuffer.index;
-               var11.packetBuffer.writeStringCp1252NullTerminated(var3);
-               TextureProvider.method2777(var11.packetBuffer, var12);
-               var11.packetBuffer.__y_299(var11.packetBuffer.index - var13);
-               Client.packetWriter.__q_167(var11);
-               return 1;
-            } else if(var0 != 5015) {
-               if(var0 == 5016) {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_pl;
-                  return 1;
-               } else if(var0 == 5017) {
-                  var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WidgetGroupParent.method1174(var10);
-                  return 1;
-               } else if(var0 == 5018) {
-                  var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class12.method161(var10);
-                  return 1;
-               } else if(var0 == 5019) {
-                  var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpriteMask.method4391(var10);
-                  return 1;
-               } else if(var0 == 5020) {
-                  var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-                  BoundaryObject.doCheat(var3);
-                  return 1;
-               } else if(var0 == 5021) {
-                  Client.__client_pz = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim();
-                  return 1;
-               } else if(var0 == 5022) {
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.__client_pz;
-                  return 1;
-               } else if(var0 == 5023) {
-                  var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-                  System.out.println(var3);
-                  return 1;
-               } else {
-                  return 2;
-               }
             } else {
-               if(Canvas.localPlayer != null && Canvas.localPlayer.username != null) {
-                  var3 = Canvas.localPlayer.username.getName();
-               } else {
-                  var3 = "";
-               }
+               String var6;
+               if (var0 == 5008) {
+                  var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+                  var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                  var6 = var3.toLowerCase();
+                  byte var12 = 0;
+                  if (var6.startsWith("yellow:")) {
+                     var12 = 0;
+                     var3 = var3.substring("yellow:".length());
+                  } else if (var6.startsWith("red:")) {
+                     var12 = 1;
+                     var3 = var3.substring("red:".length());
+                  } else if (var6.startsWith("green:")) {
+                     var12 = 2;
+                     var3 = var3.substring("green:".length());
+                  } else if (var6.startsWith("cyan:")) {
+                     var12 = 3;
+                     var3 = var3.substring("cyan:".length());
+                  } else if (var6.startsWith("purple:")) {
+                     var12 = 4;
+                     var3 = var3.substring("purple:".length());
+                  } else if (var6.startsWith("white:")) {
+                     var12 = 5;
+                     var3 = var3.substring("white:".length());
+                  } else if (var6.startsWith("flash1:")) {
+                     var12 = 6;
+                     var3 = var3.substring("flash1:".length());
+                  } else if (var6.startsWith("flash2:")) {
+                     var12 = 7;
+                     var3 = var3.substring("flash2:".length());
+                  } else if (var6.startsWith("flash3:")) {
+                     var12 = 8;
+                     var3 = var3.substring("flash3:".length());
+                  } else if (var6.startsWith("glow1:")) {
+                     var12 = 9;
+                     var3 = var3.substring("glow1:".length());
+                  } else if (var6.startsWith("glow2:")) {
+                     var12 = 10;
+                     var3 = var3.substring("glow2:".length());
+                  } else if (var6.startsWith("glow3:")) {
+                     var12 = 11;
+                     var3 = var3.substring("glow3:".length());
+                  } else if (Client.language != 0) {
+                     if (var6.startsWith("yellow:")) {
+                        var12 = 0;
+                        var3 = var3.substring("yellow:".length());
+                     } else if (var6.startsWith("red:")) {
+                        var12 = 1;
+                        var3 = var3.substring("red:".length());
+                     } else if (var6.startsWith("green:")) {
+                        var12 = 2;
+                        var3 = var3.substring("green:".length());
+                     } else if (var6.startsWith("cyan:")) {
+                        var12 = 3;
+                        var3 = var3.substring("cyan:".length());
+                     } else if (var6.startsWith("purple:")) {
+                        var12 = 4;
+                        var3 = var3.substring("purple:".length());
+                     } else if (var6.startsWith("white:")) {
+                        var12 = 5;
+                        var3 = var3.substring("white:".length());
+                     } else if (var6.startsWith("flash1:")) {
+                        var12 = 6;
+                        var3 = var3.substring("flash1:".length());
+                     } else if (var6.startsWith("flash2:")) {
+                        var12 = 7;
+                        var3 = var3.substring("flash2:".length());
+                     } else if (var6.startsWith("flash3:")) {
+                        var12 = 8;
+                        var3 = var3.substring("flash3:".length());
+                     } else if (var6.startsWith("glow1:")) {
+                        var12 = 9;
+                        var3 = var3.substring("glow1:".length());
+                     } else if (var6.startsWith("glow2:")) {
+                        var12 = 10;
+                        var3 = var3.substring("glow2:".length());
+                     } else if (var6.startsWith("glow3:")) {
+                        var12 = 11;
+                        var3 = var3.substring("glow3:".length());
+                     }
+                  }
 
-               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
-               return 1;
+                  var6 = var3.toLowerCase();
+                  byte var14 = 0;
+                  if (var6.startsWith("wave:")) {
+                     var14 = 1;
+                     var3 = var3.substring("wave:".length());
+                  } else if (var6.startsWith("wave2:")) {
+                     var14 = 2;
+                     var3 = var3.substring("wave2:".length());
+                  } else if (var6.startsWith("shake:")) {
+                     var14 = 3;
+                     var3 = var3.substring("shake:".length());
+                  } else if (var6.startsWith("scroll:")) {
+                     var14 = 4;
+                     var3 = var3.substring("scroll:".length());
+                  } else if (var6.startsWith("slide:")) {
+                     var14 = 5;
+                     var3 = var3.substring("slide:".length());
+                  } else if (Client.language != 0) {
+                     if (var6.startsWith("wave:")) {
+                        var14 = 1;
+                        var3 = var3.substring("wave:".length());
+                     } else if (var6.startsWith("wave2:")) {
+                        var14 = 2;
+                        var3 = var3.substring("wave2:".length());
+                     } else if (var6.startsWith("shake:")) {
+                        var14 = 3;
+                        var3 = var3.substring("shake:".length());
+                     } else if (var6.startsWith("scroll:")) {
+                        var14 = 4;
+                        var3 = var3.substring("scroll:".length());
+                     } else if (var6.startsWith("slide:")) {
+                        var14 = 5;
+                        var3 = var3.substring("slide:".length());
+                     }
+                  }
+
+                  PacketBufferNode var9 = Interpreter.method1915(ClientPacket.field319, Client.packetWriter.isaacCipher);
+                  var9.packetBuffer.writeByte(0);
+                  int var10 = var9.packetBuffer.index;
+                  var9.packetBuffer.writeByte(var4);
+                  var9.packetBuffer.writeByte(var12);
+                  var9.packetBuffer.writeByte(var14);
+                  TextureProvider.method2777(var9.packetBuffer, var3);
+                  var9.packetBuffer.method41(var9.packetBuffer.index - var10);
+                  Client.packetWriter.method241(var9);
+                  return 1;
+               } else if (var0 == 5009) {
+                  Interpreter.Interpreter_stringStackSize -= 2;
+                  var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
+                  var6 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+                  PacketBufferNode var7 = Interpreter.method1915(ClientPacket.field247, Client.packetWriter.isaacCipher);
+                  var7.packetBuffer.writeShort(0);
+                  int var8 = var7.packetBuffer.index;
+                  var7.packetBuffer.writeStringCp1252NullTerminated(var3);
+                  TextureProvider.method2777(var7.packetBuffer, var6);
+                  var7.packetBuffer.method40(var7.packetBuffer.index - var8);
+                  Client.packetWriter.method241(var7);
+                  return 1;
+               } else if (var0 != 5015) {
+                  if (var0 == 5016) {
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field138;
+                     return 1;
+                  } else if (var0 == 5017) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WidgetGroupParent.method1174(var5);
+                     return 1;
+                  } else if (var0 == 5018) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class12.method161(var5);
+                     return 1;
+                  } else if (var0 == 5019) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpriteMask.method4391(var5);
+                     return 1;
+                  } else if (var0 == 5020) {
+                     var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+                     BoundaryObject.doCheat(var3);
+                     return 1;
+                  } else if (var0 == 5021) {
+                     Client.field158 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim();
+                     return 1;
+                  } else if (var0 == 5022) {
+                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field158;
+                     return 1;
+                  } else if (var0 == 5023) {
+                     var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+                     System.out.println(var3);
+                     return 1;
+                  } else {
+                     return 2;
+                  }
+               } else {
+                  if (Canvas.localPlayer != null && Canvas.localPlayer.username != null) {
+                     var3 = Canvas.localPlayer.username.getName();
+                  } else {
+                     var3 = "";
+                  }
+
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
+                  return 1;
+               }
             }
          }
       }
@@ -486,36 +490,35 @@ public class DynamicObject extends Entity {
    )
    protected static int method2222() {
       int var0 = 0;
-      if(AbstractIndexCache.garbageCollector == null || !AbstractIndexCache.garbageCollector.isValid()) {
+      if (AbstractIndexCache.garbageCollector == null || !AbstractIndexCache.garbageCollector.isValid()) {
          try {
             Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator();
 
-            while(var1.hasNext()) {
+            while (var1.hasNext()) {
                GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next();
-               if(var2.isValid()) {
+               if (var2.isValid()) {
                   AbstractIndexCache.garbageCollector = var2;
                   GameShell.garbageCollectorLastCheckTimeMs = -1L;
                   GameShell.garbageCollectorLastCollectionTime = -1L;
                }
             }
-         } catch (Throwable var11) {
-            ;
+         } catch (Throwable var9) {
          }
       }
 
-      if(AbstractIndexCache.garbageCollector != null) {
-         long var9 = class203.currentTimeMs();
+      if (AbstractIndexCache.garbageCollector != null) {
+         long var10 = class203.currentTimeMs();
          long var3 = AbstractIndexCache.garbageCollector.getCollectionTime();
-         if(GameShell.garbageCollectorLastCollectionTime != -1L) {
+         if (GameShell.garbageCollectorLastCollectionTime != -1L) {
             long var5 = var3 - GameShell.garbageCollectorLastCollectionTime;
-            long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs;
-            if(0L != var7) {
+            long var7 = var10 - GameShell.garbageCollectorLastCheckTimeMs;
+            if (0L != var7) {
                var0 = (int)(var5 * 100L / var7);
             }
          }
 
          GameShell.garbageCollectorLastCollectionTime = var3;
-         GameShell.garbageCollectorLastCheckTimeMs = var9;
+         GameShell.garbageCollectorLastCheckTimeMs = var10;
       }
 
       return var0;
@@ -527,9 +530,9 @@ public class DynamicObject extends Entity {
       garbageValue = "2072073729"
    )
    static final void method2224(int var0, int var1, boolean var2) {
-      if(!var2 || var0 != GameObject.__eh_fy || WorldMapLabelSize.__s_fi != var1) {
-         GameObject.__eh_fy = var0;
-         WorldMapLabelSize.__s_fi = var1;
+      if (!var2 || var0 != GameObject.field359 || WorldMapLabelSize.field1041 != var1) {
+         GameObject.field359 = var0;
+         WorldMapLabelSize.field1041 = var1;
          GameShell.updateGameState(25);
          class68.drawLoadingMessage("Loading - please wait.", true);
          int var3 = class50.baseX;
@@ -542,76 +545,81 @@ public class DynamicObject extends Entity {
          var4 = GraphicsObject.baseY;
 
          int var7;
-         int var9;
-         for(var7 = 0; var7 < 32768; ++var7) {
-            Npc var8 = Client.npcs[var7];
-            if(var8 != null) {
-               for(var9 = 0; var9 < 10; ++var9) {
-                  var8.pathX[var9] -= var5;
-                  var8.pathY[var9] -= var6;
+         int var8;
+         int[] var10000;
+         for (var7 = 0; var7 < 32768; ++var7) {
+            NPC var9 = Client.npcs[var7];
+            if (var9 != null) {
+               for (var8 = 0; var8 < 10; ++var8) {
+                  var10000 = var9.pathX;
+                  var10000[var8] -= var5;
+                  var10000 = var9.pathY;
+                  var10000[var8] -= var6;
                }
 
-               var8.x -= var5 * 128;
-               var8.y -= var6 * 128;
+               var9.x -= var5 * 128;
+               var9.y -= var6 * 128;
             }
          }
 
-         for(var7 = 0; var7 < 2048; ++var7) {
-            Player var21 = Client.players[var7];
-            if(var21 != null) {
-               for(var9 = 0; var9 < 10; ++var9) {
-                  var21.pathX[var9] -= var5;
-                  var21.pathY[var9] -= var6;
+         for (var7 = 0; var7 < 2048; ++var7) {
+            Player var20 = Client.players[var7];
+            if (var20 != null) {
+               for (var8 = 0; var8 < 10; ++var8) {
+                  var10000 = var20.pathX;
+                  var10000[var8] -= var5;
+                  var10000 = var20.pathY;
+                  var10000[var8] -= var6;
                }
 
-               var21.x -= var5 * 128;
-               var21.y -= var6 * 128;
+               var20.x -= var5 * 128;
+               var20.y -= var6 * 128;
             }
          }
 
-         byte var20 = 0;
-         byte var18 = 104;
-         byte var22 = 1;
-         if(var5 < 0) {
-            var20 = 103;
-            var18 = -1;
-            var22 = -1;
-         }
-
-         byte var10 = 0;
-         byte var11 = 104;
-         byte var12 = 1;
-         if(var6 < 0) {
-            var10 = 103;
+         byte var21 = 0;
+         byte var10 = 104;
+         byte var11 = 1;
+         if (var5 < 0) {
+            var21 = 103;
+            var10 = -1;
             var11 = -1;
-            var12 = -1;
          }
 
-         int var14;
-         for(int var13 = var20; var13 != var18; var13 += var22) {
-            for(var14 = var10; var11 != var14; var14 += var12) {
-               int var15 = var13 + var5;
-               int var16 = var14 + var6;
+         byte var12 = 0;
+         byte var13 = 104;
+         byte var14 = 1;
+         if (var6 < 0) {
+            var12 = 103;
+            var13 = -1;
+            var14 = -1;
+         }
 
-               for(int var17 = 0; var17 < 4; ++var17) {
-                  if(var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) {
-                     Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16];
+         int var15;
+         for (int var16 = var21; var16 != var10; var16 += var11) {
+            for (var15 = var12; var13 != var15; var15 += var14) {
+               int var17 = var16 + var5;
+               int var18 = var15 + var6;
+
+               for (int var19 = 0; var19 < 4; ++var19) {
+                  if (var17 >= 0 && var18 >= 0 && var17 < 104 && var18 < 104) {
+                     Client.groundItems[var19][var16][var15] = Client.groundItems[var19][var17][var18];
                   } else {
-                     Client.groundItems[var17][var13][var14] = null;
+                     Client.groundItems[var19][var16][var15] = null;
                   }
                }
             }
          }
 
-         for(class68 var19 = (class68)Client.__client_kh.last(); var19 != null; var19 = (class68)Client.__client_kh.previous()) {
-            var19.field913 -= var5;
-            var19.field901 -= var6;
-            if(var19.field913 < 0 || var19.field901 < 0 || var19.field913 >= 104 || var19.field901 >= 104) {
-               var19.remove();
+         for (class68 var22 = (class68)Client.field214.last(); var22 != null; var22 = (class68)Client.field214.previous()) {
+            var22.field913 -= var5;
+            var22.field901 -= var6;
+            if (var22.field913 < 0 || var22.field901 < 0 || var22.field913 >= 104 || var22.field901 >= 104) {
+               var22.remove();
             }
          }
 
-         if(Client.destinationX != 0) {
+         if (Client.destinationX != 0) {
             Client.destinationX -= var5;
             Client.destinationY -= var6;
          }
@@ -622,14 +630,14 @@ public class DynamicObject extends Entity {
          class11.cameraZ -= var6 << 7;
          MouseHandler.oculusOrbFocalPointX -= var5 << 7;
          ScriptEvent.oculusOrbFocalPointY -= var6 << 7;
-         Client.__client_ph = -1;
+         Client.field125 = -1;
          Client.graphicsObjects.clear();
          Client.projectiles.clear();
 
-         for(var14 = 0; var14 < 4; ++var14) {
-            Client.collisionMaps[var14].clear();
+         for (var15 = 0; var15 < 4; ++var15) {
+            Client.collisionMaps[var15].clear();
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java
index e1b55d193e..e0778c1f42 100644
--- a/runescape-client/src/main/java/Entity.java
+++ b/runescape-client/src/main/java/Entity.java
@@ -32,7 +32,7 @@ public abstract class Entity extends DualNode {
    @Export("renderDraw")
    void renderDraw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
       Model var11 = this.getModel();
-      if(var11 != null) {
+      if (var11 != null) {
          this.height = var11.height;
          var11.renderDraw(var1, var2, var3, var4, var5, var6, var7, var8, var9);
       }
diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java
index 28d6576ba4..c66cf81e96 100644
--- a/runescape-client/src/main/java/EnumDefinition.java
+++ b/runescape-client/src/main/java/EnumDefinition.java
@@ -50,10 +50,6 @@ public class EnumDefinition extends DualNode {
    @Export("stringVals")
    public String[] stringVals;
 
-   static {
-      EnumDefinition_cached = new EvictingDualNodeHashTable(64);
-   }
-
    EnumDefinition() {
       this.defaultString = "null";
       this.size0 = 0;
@@ -66,9 +62,9 @@ public class EnumDefinition extends DualNode {
    )
    @Export("read")
    void read(Buffer var1) {
-      while(true) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
@@ -83,31 +79,31 @@ public class EnumDefinition extends DualNode {
    )
    @Export("readNext")
    void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
+      if (var2 == 1) {
          this.keyType = (char)var1.readUnsignedByte();
-      } else if(var2 == 2) {
+      } else if (var2 == 2) {
          this.valType = (char)var1.readUnsignedByte();
-      } else if(var2 == 3) {
+      } else if (var2 == 3) {
          this.defaultString = var1.readStringCp1252NullTerminated();
-      } else if(var2 == 4) {
+      } else if (var2 == 4) {
          this.defaultInt = var1.readInt();
       } else {
          int var3;
-         if(var2 == 5) {
-            this.size0 = var1.__ag_302();
+         if (var2 == 5) {
+            this.size0 = var1.method43();
             this.keys = new int[this.size0];
             this.stringVals = new String[this.size0];
 
-            for(var3 = 0; var3 < this.size0; ++var3) {
+            for (var3 = 0; var3 < this.size0; ++var3) {
                this.keys[var3] = var1.readInt();
                this.stringVals[var3] = var1.readStringCp1252NullTerminated();
             }
-         } else if(var2 == 6) {
-            this.size0 = var1.__ag_302();
+         } else if (var2 == 6) {
+            this.size0 = var1.method43();
             this.keys = new int[this.size0];
             this.intVals = new int[this.size0];
 
-            for(var3 = 0; var3 < this.size0; ++var3) {
+            for (var3 = 0; var3 < this.size0; ++var3) {
                this.keys[var3] = var1.readInt();
                this.intVals[var3] = var1.readInt();
             }
@@ -125,4 +121,8 @@ public class EnumDefinition extends DualNode {
    public int size() {
       return this.size0;
    }
+
+   static {
+      EnumDefinition_cached = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java
index c655b8180b..f05386d31e 100644
--- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java
+++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java
@@ -10,7 +10,7 @@ public final class EvictingDualNodeHashTable {
    @ObfuscatedSignature(
       signature = "Lfn;"
    )
-   DualNode __m;
+   DualNode field343;
    @ObfuscatedName("f")
    @Export("capacity")
    int capacity;
@@ -31,14 +31,13 @@ public final class EvictingDualNodeHashTable {
    DualNodeDeque deque;
 
    public EvictingDualNodeHashTable(int var1) {
-      this.__m = new DualNode();
+      this.field343 = new DualNode();
       this.deque = new DualNodeDeque();
       this.capacity = var1;
       this.remainingCapacity = var1;
 
       int var2;
-      for(var2 = 1; var2 + var2 < var1; var2 += var2) {
-         ;
+      for (var2 = 1; var2 + var2 < var1; var2 += var2) {
       }
 
       this.hashTable = new NodeHashTable(var2);
@@ -51,7 +50,7 @@ public final class EvictingDualNodeHashTable {
    @Export("get")
    public DualNode get(long var1) {
       DualNode var3 = (DualNode)this.hashTable.get(var1);
-      if(var3 != null) {
+      if (var3 != null) {
          this.deque.addFirst(var3);
       }
 
@@ -62,7 +61,7 @@ public final class EvictingDualNodeHashTable {
    @Export("remove")
    public void remove(long var1) {
       DualNode var3 = (DualNode)this.hashTable.get(var1);
-      if(var3 != null) {
+      if (var3 != null) {
          var3.remove();
          var3.removeDual();
          ++this.remainingCapacity;
@@ -76,11 +75,11 @@ public final class EvictingDualNodeHashTable {
    )
    @Export("put")
    public void put(DualNode var1, long var2) {
-      if(this.remainingCapacity == 0) {
+      if (this.remainingCapacity == 0) {
          DualNode var4 = this.deque.removeLast();
          var4.remove();
          var4.removeDual();
-         if(var4 == this.__m) {
+         if (var4 == this.field343) {
             var4 = this.deque.removeLast();
             var4.remove();
             var4.removeDual();
@@ -98,7 +97,7 @@ public final class EvictingDualNodeHashTable {
    public void clear() {
       this.deque.clear();
       this.hashTable.clear();
-      this.__m = new DualNode();
+      this.field343 = new DualNode();
       this.remainingCapacity = this.capacity;
    }
 }
diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java
index 88ab031bd5..4257d4d4b5 100644
--- a/runescape-client/src/main/java/FaceNormal.java
+++ b/runescape-client/src/main/java/FaceNormal.java
@@ -1,6 +1,5 @@
 import java.applet.Applet;
 import java.net.URL;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
@@ -14,27 +13,27 @@ public class FaceNormal {
    @ObfuscatedGetter(
       intValue = 422473713
    )
-   public static int __el_x;
+   public static int field344;
    @ObfuscatedName("gm")
    @ObfuscatedSignature(
       signature = "Lln;"
    )
-   static Sprite __el_gm;
+   static Sprite field345;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = -2074333261
    )
-   int __m;
+   int field346;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = -1376860893
    )
-   int __f;
+   int field347;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 2619977
    )
-   int __q;
+   int field348;
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
@@ -44,12 +43,12 @@ public class FaceNormal {
    static Script method3236(int var0, int var1, int var2) {
       int var3 = UnitPriceComparator.method125(var1, var0);
       Script var4 = WidgetGroupParent.method1175(var3, var0);
-      if(var4 != null) {
+      if (var4 != null) {
          return var4;
       } else {
          var3 = PacketBuffer.method4081(var2, var0);
          var4 = WidgetGroupParent.method1175(var3, var0);
-         return var4 != null?var4:null;
+         return var4 != null ? var4 : null;
       }
    }
 
@@ -59,17 +58,17 @@ public class FaceNormal {
       garbageValue = "-1495992318"
    )
    static boolean method3237(String var0, int var1, String var2) {
-      if(var1 == 0) {
+      if (var1 == 0) {
          try {
-            if(!class50.__af_f.startsWith("win")) {
+            if (!class50.field1160.startsWith("win")) {
                throw new Exception();
-            } else if(!var0.startsWith("http://") && !var0.startsWith("https://")) {
+            } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) {
                throw new Exception();
             } else {
-               String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*";
+               String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*";
 
-               for(int var4 = 0; var4 < var0.length(); ++var4) {
-                  if(var13.indexOf(var0.charAt(var4)) == -1) {
+               for (int var12 = 0; var12 < var0.length(); ++var12) {
+                  if (var11.indexOf(var0.charAt(var12)) == -1) {
                      throw new Exception();
                   }
                }
@@ -77,36 +76,35 @@ public class FaceNormal {
                Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\"");
                return true;
             }
-         } catch (Throwable var8) {
+         } catch (Throwable var6) {
             return false;
          }
-      } else if(var1 == 1) {
+      } else if (var1 == 1) {
          try {
-            Applet var7 = class50.__af_m;
-            Object[] var5 = new Object[]{(new URL(class50.__af_m.getCodeBase(), var0)).toString()};
-            Object var3 = JSObject.getWindow(var7).call(var2, var5);
-            return var3 != null;
-         } catch (Throwable var9) {
+            Applet var3 = class50.field1159;
+            Object[] var4 = new Object[]{(new URL(class50.field1159.getCodeBase(), var0)).toString()};
+            Object var5 = JSObject.getWindow(var3).call(var2, var4);
+            return var5 != null;
+         } catch (Throwable var7) {
             return false;
          }
-      } else if(var1 == 2) {
+      } else if (var1 == 2) {
          try {
-            class50.__af_m.getAppletContext().showDocument(new URL(class50.__af_m.getCodeBase(), var0), "_blank");
+            class50.field1159.getAppletContext().showDocument(new URL(class50.field1159.getCodeBase(), var0), "_blank");
             return true;
-         } catch (Exception var10) {
+         } catch (Exception var8) {
             return false;
          }
-      } else if(var1 == 3) {
+      } else if (var1 == 3) {
          try {
-            class46.method851(class50.__af_m, "loggedout");
-         } catch (Throwable var12) {
-            ;
+            class46.method851(class50.field1159, "loggedout");
+         } catch (Throwable var10) {
          }
 
          try {
-            class50.__af_m.getAppletContext().showDocument(new URL(class50.__af_m.getCodeBase(), var0), "_top");
+            class50.field1159.getAppletContext().showDocument(new URL(class50.field1159.getCodeBase(), var0), "_top");
             return true;
-         } catch (Exception var11) {
+         } catch (Exception var9) {
             return false;
          }
       } else {
diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java
index da05438d44..83b04eb080 100644
--- a/runescape-client/src/main/java/FloorDecoration.java
+++ b/runescape-client/src/main/java/FloorDecoration.java
@@ -63,47 +63,47 @@ public final class FloorDecoration {
    )
    static int method2853(AbstractIndexCache var0, AbstractIndexCache var1) {
       int var2 = 0;
-      if(var0.tryLoadRecordByNames("title.jpg", "")) {
+      if (var0.tryLoadRecordByNames("title.jpg", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("logo", "")) {
+      if (var1.tryLoadRecordByNames("logo", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("logo_deadman_mode", "")) {
+      if (var1.tryLoadRecordByNames("logo_deadman_mode", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("titlebox", "")) {
+      if (var1.tryLoadRecordByNames("titlebox", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("titlebutton", "")) {
+      if (var1.tryLoadRecordByNames("titlebutton", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("runes", "")) {
+      if (var1.tryLoadRecordByNames("runes", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("title_mute", "")) {
+      if (var1.tryLoadRecordByNames("title_mute", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("options_radio_buttons,0", "")) {
+      if (var1.tryLoadRecordByNames("options_radio_buttons,0", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("options_radio_buttons,2", "")) {
+      if (var1.tryLoadRecordByNames("options_radio_buttons,2", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("options_radio_buttons,4", "")) {
+      if (var1.tryLoadRecordByNames("options_radio_buttons,4", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("options_radio_buttons,6", "")) {
+      if (var1.tryLoadRecordByNames("options_radio_buttons,6", "")) {
          ++var2;
       }
 
diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java
index 55ef8f5fe3..ca70b027cd 100644
--- a/runescape-client/src/main/java/Font.java
+++ b/runescape-client/src/main/java/Font.java
@@ -21,7 +21,7 @@ public final class Font extends AbstractFont {
       int var9 = 0;
       int var10 = 0;
       int var11;
-      if(var3 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var11 = Rasterizer2D.Rasterizer2D_yClipStart - var3;
          var5 -= var11;
          var3 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -29,11 +29,11 @@ public final class Font extends AbstractFont {
          var7 += var11 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var2 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var11 = Rasterizer2D.Rasterizer2D_xClipStart - var2;
          var4 -= var11;
          var2 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -43,16 +43,17 @@ public final class Font extends AbstractFont {
          var8 += var11;
       }
 
-      if(var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var11 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var4 -= var11;
          var9 += var11;
          var8 += var11;
       }
 
-      if(var4 > 0 && var5 > 0) {
+      if (var4 > 0 && var5 > 0) {
          AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var10, var7, var4, var5, var8, var9);
       }
+
    }
 
    @ObfuscatedName("f")
@@ -63,7 +64,7 @@ public final class Font extends AbstractFont {
       int var10 = 0;
       int var11 = 0;
       int var12;
-      if(var3 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var12 = Rasterizer2D.Rasterizer2D_yClipStart - var3;
          var5 -= var12;
          var3 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -71,11 +72,11 @@ public final class Font extends AbstractFont {
          var8 += var12 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var2 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var12 = Rasterizer2D.Rasterizer2D_xClipStart - var2;
          var4 -= var12;
          var2 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -85,15 +86,16 @@ public final class Font extends AbstractFont {
          var9 += var12;
       }
 
-      if(var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var12 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var4 -= var12;
          var10 += var12;
          var9 += var12;
       }
 
-      if(var4 > 0 && var5 > 0) {
+      if (var4 > 0 && var5 > 0) {
          AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7);
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java
index 89099885cc..7e7b4c6584 100644
--- a/runescape-client/src/main/java/FontName.java
+++ b/runescape-client/src/main/java/FontName.java
@@ -43,19 +43,10 @@ public class FontName {
    @Export("FontName_verdana15")
    public static final FontName FontName_verdana15;
    @ObfuscatedName("g")
-   String __g;
-
-   static {
-      FontName_plain11 = new FontName("p11_full");
-      FontName_plain12 = new FontName("p12_full");
-      FontName_bold12 = new FontName("b12_full");
-      FontName_verdana11 = new FontName("verdana_11pt_regular");
-      FontName_verdana13 = new FontName("verdana_13pt_regular");
-      FontName_verdana15 = new FontName("verdana_15pt_regular");
-   }
+   String field349;
 
    FontName(String var1) {
-      this.__g = var1;
+      this.field349 = var1;
    }
 
    @ObfuscatedName("u")
@@ -65,7 +56,7 @@ public class FontName {
    )
    public static long method5637(int var0, int var1, int var2, boolean var3, int var4) {
       long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17;
-      if(var3) {
+      if (var3) {
          var5 |= 65536L;
       }
 
@@ -91,11 +82,11 @@ public class FontName {
       garbageValue = "-871458249"
    )
    static final void method5638(String var0, int var1) {
-      PacketBufferNode var2 = Interpreter.method1915(ClientPacket.__gs_bw, Client.packetWriter.isaacCipher);
+      PacketBufferNode var2 = Interpreter.method1915(ClientPacket.field299, Client.packetWriter.isaacCipher);
       var2.packetBuffer.writeByte(WorldMapRegion.method550(var0) + 1);
       var2.packetBuffer.writeStringCp1252NullTerminated(var0);
       var2.packetBuffer.writeByte(var1);
-      Client.packetWriter.__q_167(var2);
+      Client.packetWriter.method241(var2);
    }
 
    @ObfuscatedName("av")
@@ -104,10 +95,10 @@ public class FontName {
       garbageValue = "-1336396061"
    )
    static int method5639(int var0, Script var1, boolean var2) {
-      if(var0 == 3600) {
-         if(WorldMapArea.friendSystem.__g == 0) {
+      if (var0 == 3600) {
+         if (WorldMapArea.friendSystem.field357 == 0) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -2;
-         } else if(WorldMapArea.friendSystem.__g == 1) {
+         } else if (WorldMapArea.friendSystem.field357 == 1) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
          } else {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.friendsList.size();
@@ -116,30 +107,30 @@ public class FontName {
          return 1;
       } else {
          int var3;
-         if(var0 == 3601) {
+         if (var0 == 3601) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
-               Friend var8 = (Friend)WorldMapArea.friendSystem.friendsList.get(var3);
-               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.name();
-               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.previousName();
+            if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
+               Friend var6 = (Friend)WorldMapArea.friendSystem.friendsList.get(var3);
+               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.name();
+               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.previousName();
             } else {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
             }
 
             return 1;
-         } else if(var0 == 3602) {
+         } else if (var0 == 3602) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
+            if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).world0;
             } else {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
             }
 
             return 1;
-         } else if(var0 == 3603) {
+         } else if (var0 == 3603) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
+            if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).rank;
             } else {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -147,297 +138,297 @@ public class FontName {
 
             return 1;
          } else {
-            String var5;
-            if(var0 == 3604) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               int var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               method5638(var5, var6);
+            String var4;
+            if (var0 == 3604) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               int var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               method5638(var4, var8);
                return 1;
-            } else if(var0 == 3605) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               WorldMapArea.friendSystem.__l_157(var5);
+            } else if (var0 == 3605) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               WorldMapArea.friendSystem.method103(var4);
                return 1;
-            } else if(var0 == 3606) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               WorldMapArea.friendSystem.removeFriend(var5);
+            } else if (var0 == 3606) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               WorldMapArea.friendSystem.removeFriend(var4);
                return 1;
-            } else if(var0 == 3607) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               WorldMapArea.friendSystem.__x_159(var5);
+            } else if (var0 == 3607) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               WorldMapArea.friendSystem.method105(var4);
                return 1;
-            } else if(var0 == 3608) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               WorldMapArea.friendSystem.removeIgnore(var5);
+            } else if (var0 == 3608) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               WorldMapArea.friendSystem.removeIgnore(var4);
                return 1;
-            } else if(var0 == 3609) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               var5 = NpcDefinition.method5161(var5);
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isFriended(new Username(var5, KeyHandler.loginType), false)?1:0;
+            } else if (var0 == 3609) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               var4 = NPCDefinition.method5161(var4);
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isFriended(new Username(var4, KeyHandler.loginType), false) ? 1 : 0;
                return 1;
-            } else if(var0 == 3611) {
-               if(PacketWriter.clanChat != null) {
+            } else if (var0 == 3611) {
+               if (PacketWriter.clanChat != null) {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.name;
                } else {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                }
 
                return 1;
-            } else if(var0 == 3612) {
-               if(PacketWriter.clanChat != null) {
+            } else if (var0 == 3612) {
+               if (PacketWriter.clanChat != null) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat.size();
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                }
 
                return 1;
-            } else if(var0 == 3613) {
+            } else if (var0 == 3613) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) {
+               if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.get(var3).username().getName();
                } else {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                }
 
                return 1;
-            } else if(var0 == 3614) {
+            } else if (var0 == 3614) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) {
+               if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).world();
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                }
 
                return 1;
-            } else if(var0 == 3615) {
+            } else if (var0 == 3615) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) {
+               if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).rank;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                }
 
                return 1;
-            } else if(var0 == 3616) {
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.__k:0;
+            } else if (var0 == 3616) {
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.field96 : 0;
                return 1;
-            } else if(var0 == 3617) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               IndexStoreActionHandler.method4655(var5);
+            } else if (var0 == 3617) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               IndexStoreActionHandler.method4655(var4);
                return 1;
-            } else if(var0 == 3618) {
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.rank:0;
+            } else if (var0 == 3618) {
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.rank : 0;
                return 1;
-            } else if(var0 == 3619) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               class31.method574(var5);
+            } else if (var0 == 3619) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               class31.method574(var4);
                return 1;
-            } else if(var0 == 3620) {
+            } else if (var0 == 3620) {
                class12.method158();
                return 1;
-            } else if(var0 == 3621) {
-               if(!WorldMapArea.friendSystem.__m_151()) {
+            } else if (var0 == 3621) {
+               if (!WorldMapArea.friendSystem.method99()) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.ignoreList.size();
                }
 
                return 1;
-            } else if(var0 == 3622) {
+            } else if (var0 == 3622) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.ignoreList.size()) {
-                  Ignored var4 = (Ignored)WorldMapArea.friendSystem.ignoreList.get(var3);
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.name();
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.previousName();
+               if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.ignoreList.size()) {
+                  Ignored var7 = (Ignored)WorldMapArea.friendSystem.ignoreList.get(var3);
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.name();
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.previousName();
                } else {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                }
 
                return 1;
-            } else if(var0 == 3623) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               var5 = NpcDefinition.method5161(var5);
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isIgnored(new Username(var5, KeyHandler.loginType))?1:0;
+            } else if (var0 == 3623) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               var4 = NPCDefinition.method5161(var4);
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isIgnored(new Username(var4, KeyHandler.loginType)) ? 1 : 0;
                return 1;
-            } else if(var0 == 3624) {
+            } else if (var0 == 3624) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && PacketWriter.clanChat.get(var3).username().equals(Canvas.localPlayer.username)) {
+               if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && PacketWriter.clanChat.get(var3).username().equals(Canvas.localPlayer.username)) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                }
 
                return 1;
-            } else if(var0 == 3625) {
-               if(PacketWriter.clanChat != null && PacketWriter.clanChat.owner != null) {
+            } else if (var0 == 3625) {
+               if (PacketWriter.clanChat != null && PacketWriter.clanChat.owner != null) {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.owner;
                } else {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                }
 
                return 1;
-            } else if(var0 == 3626) {
+            } else if (var0 == 3626) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isFriend()) {
+               if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isFriend()) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                }
 
                return 1;
-            } else if(var0 != 3627) {
-               if(var0 == 3628) {
+            } else if (var0 != 3627) {
+               if (var0 == 3628) {
                   WorldMapArea.friendSystem.friendsList.removeComparator();
                   return 1;
                } else {
-                  boolean var7;
-                  if(var0 == 3629) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator1(var7));
+                  boolean var5;
+                  if (var0 == 3629) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator1(var5));
                      return 1;
-                  } else if(var0 == 3630) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator2(var7));
+                  } else if (var0 == 3630) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator2(var5));
                      return 1;
-                  } else if(var0 == 3631) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator3(var7));
+                  } else if (var0 == 3631) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator3(var5));
                      return 1;
-                  } else if(var0 == 3632) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator4(var7));
+                  } else if (var0 == 3632) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator4(var5));
                      return 1;
-                  } else if(var0 == 3633) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator5(var7));
+                  } else if (var0 == 3633) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator5(var5));
                      return 1;
-                  } else if(var0 == 3634) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator6(var7));
+                  } else if (var0 == 3634) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator6(var5));
                      return 1;
-                  } else if(var0 == 3635) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator7(var7));
+                  } else if (var0 == 3635) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator7(var5));
                      return 1;
-                  } else if(var0 == 3636) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator8(var7));
+                  } else if (var0 == 3636) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator8(var5));
                      return 1;
-                  } else if(var0 == 3637) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator9(var7));
+                  } else if (var0 == 3637) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator9(var5));
                      return 1;
-                  } else if(var0 == 3638) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator10(var7));
+                  } else if (var0 == 3638) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator10(var5));
                      return 1;
-                  } else if(var0 == 3639) {
+                  } else if (var0 == 3639) {
                      WorldMapArea.friendSystem.friendsList.sort();
                      return 1;
-                  } else if(var0 == 3640) {
+                  } else if (var0 == 3640) {
                      WorldMapArea.friendSystem.ignoreList.removeComparator();
                      return 1;
-                  } else if(var0 == 3641) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator1(var7));
+                  } else if (var0 == 3641) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator1(var5));
                      return 1;
-                  } else if(var0 == 3642) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator2(var7));
+                  } else if (var0 == 3642) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator2(var5));
                      return 1;
-                  } else if(var0 == 3643) {
+                  } else if (var0 == 3643) {
                      WorldMapArea.friendSystem.ignoreList.sort();
                      return 1;
-                  } else if(var0 == 3644) {
-                     if(PacketWriter.clanChat != null) {
+                  } else if (var0 == 3644) {
+                     if (PacketWriter.clanChat != null) {
                         PacketWriter.clanChat.removeComparator();
                      }
 
                      return 1;
-                  } else if(var0 == 3645) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator1(var7));
+                  } else if (var0 == 3645) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator1(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3646) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator2(var7));
+                  } else if (var0 == 3646) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator2(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3647) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator3(var7));
+                  } else if (var0 == 3647) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator3(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3648) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator4(var7));
+                  } else if (var0 == 3648) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator4(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3649) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator5(var7));
+                  } else if (var0 == 3649) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator5(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3650) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator6(var7));
+                  } else if (var0 == 3650) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator6(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3651) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator7(var7));
+                  } else if (var0 == 3651) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator7(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3652) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator8(var7));
+                  } else if (var0 == 3652) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator8(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3653) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator9(var7));
+                  } else if (var0 == 3653) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator9(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3654) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator10(var7));
+                  } else if (var0 == 3654) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator10(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3655) {
-                     if(PacketWriter.clanChat != null) {
+                  } else if (var0 == 3655) {
+                     if (PacketWriter.clanChat != null) {
                         PacketWriter.clanChat.sort();
                      }
 
                      return 1;
-                  } else if(var0 == 3656) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new class157(var7));
+                  } else if (var0 == 3656) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new class157(var5));
                      return 1;
-                  } else if(var0 == 3657) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new class157(var7));
+                  } else if (var0 == 3657) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new class157(var5));
                      }
 
                      return 1;
@@ -447,7 +438,7 @@ public class FontName {
                }
             } else {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isIgnored()) {
+               if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isIgnored()) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -472,31 +463,31 @@ public class FontName {
       WorldMapLabel.method440();
       LoginScreenAnimation.method1780();
       SequenceDefinition.SequenceDefinition_cached.clear();
-      SequenceDefinition.__jh_o.clear();
+      SequenceDefinition.field775.clear();
       UserComparator3.method3379();
       VarbitDefinition.VarbitDefinition_cached.clear();
       VarpDefinition.VarpDefinition_cached.clear();
       GrandExchangeEvents.method69();
       Buffer.clearHealthbarCaches();
-      StructDefinition.__jq_f.clear();
+      StructDefinition.field886.clear();
       InvDefinition.method4754();
       Projectile.method2089();
       PlayerAppearance.PlayerAppearance_cachedModels.clear();
       class157.method3382();
       ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear();
       Script.Script_cached.clear();
-      AbstractIndexCache.indexCache0.__b_400();
-      Skeleton.indexCache1.__b_400();
-      WorldMapIcon1.indexCache3.__b_400();
-      class25.indexCache4.__b_400();
-      SecureRandomFuture.indexCache5.__b_400();
-      UserComparator3.indexCache6.__b_400();
-      class40.indexCache7.__b_400();
-      WorldMapSection3.indexCache8.__b_400();
-      class238.indexCache9.__b_400();
-      class16.indexCache10.__b_400();
-      Login.indexCache11.__b_400();
-      Formatting.indexCache12.__b_400();
+      AbstractIndexCache.indexCache0.method8();
+      Skeleton.indexCache1.method8();
+      WorldMapIcon1.indexCache3.method8();
+      class25.indexCache4.method8();
+      SecureRandomFuture.indexCache5.method8();
+      UserComparator3.indexCache6.method8();
+      class40.indexCache7.method8();
+      WorldMapSection3.indexCache8.method8();
+      class238.indexCache9.method8();
+      class16.indexCache10.method8();
+      Login.indexCache11.method8();
+      Formatting.indexCache12.method8();
    }
 
    @ObfuscatedName("gg")
@@ -506,36 +497,36 @@ public class FontName {
    )
    @Export("setViewportShape")
    static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
-      if(var2 < 1) {
+      if (var2 < 1) {
          var2 = 1;
       }
 
-      if(var3 < 1) {
+      if (var3 < 1) {
          var3 = 1;
       }
 
       int var5 = var3 - 334;
       int var6;
-      if(var5 < 0) {
-         var6 = Client.__client_rw;
-      } else if(var5 >= 100) {
-         var6 = Client.__client_rm;
+      if (var5 < 0) {
+         var6 = Client.field130;
+      } else if (var5 >= 100) {
+         var6 = Client.field131;
       } else {
-         var6 = (Client.__client_rm - Client.__client_rw) * var5 / 100 + Client.__client_rw;
+         var6 = (Client.field131 - Client.field130) * var5 / 100 + Client.field130;
       }
 
       int var7 = var3 * var6 * 512 / (var2 * 334);
       int var8;
       int var9;
       short var10;
-      if(var7 < Client.__client_rs) {
-         var10 = Client.__client_rs;
+      if (var7 < Client.field132) {
+         var10 = Client.field132;
          var6 = var10 * var2 * 334 / (var3 * 512);
-         if(var6 > Client.__client_ri) {
-            var6 = Client.__client_ri;
+         if (var6 > Client.field134) {
+            var6 = Client.field134;
             var8 = var3 * var6 * 512 / (var10 * 334);
             var9 = (var2 - var8) / 2;
-            if(var4) {
+            if (var4) {
                Rasterizer2D.Rasterizer2D_resetClip();
                Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216);
                Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216);
@@ -544,14 +535,14 @@ public class FontName {
             var0 += var9;
             var2 -= var9 * 2;
          }
-      } else if(var7 > Client.__client_rp) {
-         var10 = Client.__client_rp;
+      } else if (var7 > Client.field133) {
+         var10 = Client.field133;
          var6 = var10 * var2 * 334 / (var3 * 512);
-         if(var6 < Client.__client_rv) {
-            var6 = Client.__client_rv;
+         if (var6 < Client.field135) {
+            var6 = Client.field135;
             var8 = var10 * var2 * 334 / (var6 * 512);
             var9 = (var3 - var8) / 2;
-            if(var4) {
+            if (var4) {
                Rasterizer2D.Rasterizer2D_resetClip();
                Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216);
                Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216);
@@ -563,7 +554,7 @@ public class FontName {
       }
 
       Client.viewportZoom = var3 * var6 / 334;
-      if(var2 != Client.viewportWidth || var3 != Client.viewportHeight) {
+      if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) {
          ScriptEvent.method1183(var2, var3);
       }
 
@@ -579,10 +570,19 @@ public class FontName {
       garbageValue = "51"
    )
    static final void method5635() {
-      for(int var0 = 0; var0 < Players.Players_count; ++var0) {
+      for (int var0 = 0; var0 < Players.Players_count; ++var0) {
          Player var1 = Client.players[Players.Players_indices[var0]];
          var1.clearIsInClanChat();
       }
 
    }
+
+   static {
+      FontName_plain11 = new FontName("p11_full");
+      FontName_plain12 = new FontName("p12_full");
+      FontName_bold12 = new FontName("b12_full");
+      FontName_verdana11 = new FontName("verdana_11pt_regular");
+      FontName_verdana13 = new FontName("verdana_13pt_regular");
+      FontName_verdana15 = new FontName("verdana_15pt_regular");
+   }
 }
diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java
index 98f2077878..dd41db27c5 100644
--- a/runescape-client/src/main/java/Fonts.java
+++ b/runescape-client/src/main/java/Fonts.java
@@ -14,7 +14,7 @@ public class Fonts {
    @Export("indexStore255")
    static IndexStore indexStore255;
    @ObfuscatedName("o")
-   static byte[][][] __kz_o;
+   static byte[][][] field350;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "Lln;"
@@ -25,12 +25,12 @@ public class Fonts {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   AbstractIndexCache __m;
+   AbstractIndexCache field351;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   AbstractIndexCache __f;
+   AbstractIndexCache field352;
    @ObfuscatedName("q")
    @Export("map")
    HashMap map;
@@ -39,8 +39,8 @@ public class Fonts {
       signature = "(Lir;Lir;)V"
    )
    public Fonts(AbstractIndexCache var1, AbstractIndexCache var2) {
-      this.__m = var1;
-      this.__f = var2;
+      this.field351 = var1;
+      this.field352 = var2;
       this.map = new HashMap();
    }
 
@@ -54,20 +54,20 @@ public class Fonts {
       HashMap var2 = new HashMap();
       FontName[] var3 = var1;
 
-      for(int var4 = 0; var4 < var3.length; ++var4) {
+      for (int var4 = 0; var4 < var3.length; ++var4) {
          FontName var5 = var3[var4];
-         if(this.map.containsKey(var5)) {
+         if (this.map.containsKey(var5)) {
             var2.put(var5, this.map.get(var5));
          } else {
-            AbstractIndexCache var7 = this.__m;
-            AbstractIndexCache var8 = this.__f;
-            String var9 = var5.__g;
-            int var10 = var7.getArchiveId(var9);
-            int var11 = var7.getRecordId(var10, "");
-            Font var6 = SpriteIds.method5823(var7, var8, var10, var11);
-            if(var6 != null) {
-               this.map.put(var5, var6);
-               var2.put(var5, var6);
+            AbstractIndexCache var6 = this.field351;
+            AbstractIndexCache var7 = this.field352;
+            String var8 = var5.field349;
+            int var9 = var6.getArchiveId(var8);
+            int var10 = var6.getRecordId(var9, "");
+            Font var11 = SpriteIds.method5823(var6, var7, var9, var10);
+            if (var11 != null) {
+               this.map.put(var5, var11);
+               var2.put(var5, var11);
             }
          }
       }
@@ -81,6 +81,6 @@ public class Fonts {
       garbageValue = "2102006478"
    )
    static World method5647() {
-      return World.__bt_g < World.worldsCount?ItemContainer.worlds[++World.__bt_g - 1]:null;
+      return World.field987 < World.worldsCount ? ItemContainer.worlds[++World.field987 - 1] : null;
    }
 }
diff --git a/runescape-client/src/main/java/Formatting.java b/runescape-client/src/main/java/Formatting.java
index 1a656b9e0a..789f058734 100644
--- a/runescape-client/src/main/java/Formatting.java
+++ b/runescape-client/src/main/java/Formatting.java
@@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Formatting")
 public class Formatting {
    @ObfuscatedName("d")
-   static int[] __cy_d;
+   static int[] field353;
    @ObfuscatedName("dh")
    @ObfuscatedSignature(
       signature = "Lit;"
@@ -21,19 +21,19 @@ public class Formatting {
       garbageValue = "1654486766"
    )
    static int method2023(int var0, Script var1, boolean var2) {
-      Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
-      if(var0 == 1700) {
+      Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+      if (var0 == 1700) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemId;
          return 1;
-      } else if(var0 == 1701) {
-         if(var3.itemId != -1) {
+      } else if (var0 == 1701) {
+         if (var3.itemId != -1) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemQuantity;
          } else {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
          }
 
          return 1;
-      } else if(var0 == 1702) {
+      } else if (var0 == 1702) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.childIndex;
          return 1;
       } else {
@@ -49,34 +49,34 @@ public class Formatting {
    static int method2022(int var0, Script var1, boolean var2) {
       int var3;
       int var4;
-      int var6;
-      if(var0 == 3400) {
+      int var5;
+      EnumDefinition var9;
+      if (var0 == 3400) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         EnumDefinition var5 = Interpreter.getEnum(var3);
-         if(var5.valType != 's') {
-            ;
+         var9 = Interpreter.getEnum(var3);
+         if (var9.valType != 's') {
          }
 
-         for(var6 = 0; var6 < var5.size0; ++var6) {
-            if(var4 == var5.keys[var6]) {
-               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.stringVals[var6];
-               var5 = null;
+         for (var5 = 0; var5 < var9.size0; ++var5) {
+            if (var4 == var9.keys[var5]) {
+               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.stringVals[var5];
+               var9 = null;
                break;
             }
          }
 
-         if(var5 != null) {
-            Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.defaultString;
+         if (var9 != null) {
+            Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.defaultString;
          }
 
          return 1;
-      } else if(var0 != 3408) {
-         if(var0 == 3411) {
+      } else if (var0 != 3408) {
+         if (var0 == 3411) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            EnumDefinition var10 = Interpreter.getEnum(var3);
-            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.size();
+            var9 = Interpreter.getEnum(var3);
+            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var9.size();
             return 1;
          } else {
             return 2;
@@ -85,13 +85,13 @@ public class Formatting {
          RouteStrategy.Interpreter_intStackSize -= 4;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         int var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-         var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
-         EnumDefinition var7 = Interpreter.getEnum(var9);
-         if(var3 == var7.keyType && var4 == var7.valType) {
-            for(int var8 = 0; var8 < var7.size0; ++var8) {
-               if(var6 == var7.keys[var8]) {
-                  if(var4 == 115) {
+         int var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+         var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
+         EnumDefinition var7 = Interpreter.getEnum(var6);
+         if (var3 == var7.keyType && var4 == var7.valType) {
+            for (int var8 = 0; var8 < var7.size0; ++var8) {
+               if (var5 == var7.keys[var8]) {
+                  if (var4 == 115) {
                      Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.stringVals[var8];
                   } else {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.intVals[var8];
@@ -102,8 +102,8 @@ public class Formatting {
                }
             }
 
-            if(var7 != null) {
-               if(var4 == 115) {
+            if (var7 != null) {
+               if (var4 == 115) {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultString;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.defaultInt;
@@ -112,7 +112,7 @@ public class Formatting {
 
             return 1;
          } else {
-            if(var4 == 115) {
+            if (var4 == 115) {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "null";
             } else {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java
index cca71579cf..434c8880c6 100644
--- a/runescape-client/src/main/java/Frames.java
+++ b/runescape-client/src/main/java/Frames.java
@@ -28,23 +28,23 @@ public class Frames extends DualNode {
    )
    public Frames(AbstractIndexCache var1, AbstractIndexCache var2, int var3, boolean var4) {
       NodeDeque var5 = new NodeDeque();
-      int var6 = var1.__s_396(var3);
+      int var6 = var1.method4(var3);
       this.frames = new Animation[var6];
-      int[] var7 = var1.__j_395(var3);
+      int[] var7 = var1.method3(var3);
 
-      for(int var8 = 0; var8 < var7.length; ++var8) {
+      for (int var8 = 0; var8 < var7.length; ++var8) {
          byte[] var9 = var1.takeRecord(var3, var7[var8]);
          Skeleton var10 = null;
          int var11 = (var9[0] & 255) << 8 | var9[1] & 255;
 
-         for(Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) {
-            if(var11 == var12.id) {
+         for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) {
+            if (var11 == var12.id) {
                var10 = var12;
                break;
             }
          }
 
-         if(var10 == null) {
+         if (var10 == null) {
             byte[] var13 = var2.getRecord(var11, 0);
             var10 = new Skeleton(var11, var13);
             var5.addFirst(var10);
@@ -71,7 +71,7 @@ public class Frames extends DualNode {
       garbageValue = "1204337492"
    )
    public static void method3241(AbstractIndexCache var0) {
-      VarcInt.__iw_m = var0;
+      VarcInt.field942 = var0;
    }
 
    @ObfuscatedName("f")
@@ -80,11 +80,11 @@ public class Frames extends DualNode {
       garbageValue = "1776656760"
    )
    static String method3238(IterableNodeHashTable var0, int var1, String var2) {
-      if(var0 == null) {
+      if (var0 == null) {
          return var2;
       } else {
          ObjectNode var3 = (ObjectNode)var0.get((long)var1);
-         return var3 == null?var2:(String)var3.obj;
+         return var3 == null ? var2 : (String)var3.obj;
       }
    }
 }
diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java
index 946be4825c..af3960acfd 100644
--- a/runescape-client/src/main/java/Friend.java
+++ b/runescape-client/src/main/java/Friend.java
@@ -11,9 +11,9 @@ public class Friend extends Buddy {
    @Export("soundSystemExecutor")
    static ScheduledExecutorService soundSystemExecutor;
    @ObfuscatedName("m")
-   boolean __m;
+   boolean field354;
    @ObfuscatedName("f")
-   boolean __f;
+   boolean field355;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -22,7 +22,7 @@ public class Friend extends Buddy {
    )
    @Export("compareTo00")
    int compareTo00(Friend var1) {
-      return super.world0 == Client.worldId && Client.worldId != var1.world0?-1:(Client.worldId == var1.world0 && super.world0 != Client.worldId?1:(super.world0 != 0 && var1.world0 == 0?-1:(var1.world0 != 0 && super.world0 == 0?1:(this.__m && !var1.__m?-1:(!this.__m && var1.__m?1:(this.__f && !var1.__f?-1:(!this.__f && var1.__f?1:(super.world0 != 0?super.int2 - var1.int2:var1.int2 - super.int2))))))));
+      return super.world0 == Client.worldId && Client.worldId != var1.world0 ? -1 : (Client.worldId == var1.world0 && super.world0 != Client.worldId ? 1 : (super.world0 != 0 && var1.world0 == 0 ? -1 : (var1.world0 != 0 && super.world0 == 0 ? 1 : (this.field354 && !var1.field354 ? -1 : (!this.field354 && var1.field354 ? 1 : (this.field355 && !var1.field355 ? -1 : (!this.field355 && var1.field355 ? 1 : (super.world0 != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2))))))));
    }
 
    @ObfuscatedName("aj")
diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java
index 8745b5bdc2..19b191955c 100644
--- a/runescape-client/src/main/java/FriendLoginUpdate.java
+++ b/runescape-client/src/main/java/FriendLoginUpdate.java
@@ -11,7 +11,7 @@ public class FriendLoginUpdate extends Link {
    @ObfuscatedSignature(
       signature = "Ley;"
    )
-   static UrlRequest __kn_x;
+   static UrlRequest field356;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = -1390885889
diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java
index 908cc6f100..2032c738be 100644
--- a/runescape-client/src/main/java/FriendSystem.java
+++ b/runescape-client/src/main/java/FriendSystem.java
@@ -29,13 +29,13 @@ public class FriendSystem {
    @ObfuscatedGetter(
       intValue = 1477282369
    )
-   int __g;
+   int field357;
 
    @ObfuscatedSignature(
       signature = "(Llx;)V"
    )
    FriendSystem(LoginType var1) {
-      this.__g = 0;
+      this.field357 = 0;
       this.loginType = var1;
       this.friendsList = new FriendsList(var1);
       this.ignoreList = new IgnoreList(var1);
@@ -46,8 +46,8 @@ public class FriendSystem {
       signature = "(B)Z",
       garbageValue = "-114"
    )
-   boolean __m_151() {
-      return this.__g == 2;
+   boolean method99() {
+      return this.field357 == 2;
    }
 
    @ObfuscatedName("f")
@@ -55,8 +55,8 @@ public class FriendSystem {
       signature = "(I)V",
       garbageValue = "-2125539725"
    )
-   final void __f_152() {
-      this.__g = 1;
+   final void method100() {
+      this.field357 = 1;
    }
 
    @ObfuscatedName("q")
@@ -64,9 +64,9 @@ public class FriendSystem {
       signature = "(Lgr;II)V",
       garbageValue = "-1440726810"
    )
-   final void __q_153(Buffer var1, int var2) {
+   final void method101(Buffer var1, int var2) {
       this.friendsList.read(var1, var2);
-      this.__g = 2;
+      this.field357 = 2;
       GrandExchangeOffer.method121();
    }
 
@@ -75,14 +75,14 @@ public class FriendSystem {
       signature = "(I)V",
       garbageValue = "-1408945788"
    )
-   final void __w_154() {
-      for(FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.__f_438(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.__q_439()) {
-         if((long)var1.time < class203.currentTimeMs() / 1000L - 5L) {
-            if(var1.world > 0) {
+   final void method102() {
+      for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.method164(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.method165()) {
+         if ((long)var1.time < class203.currentTimeMs() / 1000L - 5L) {
+            if (var1.world > 0) {
                WorldMapIcon1.method219(5, "", var1.username + " has logged in.");
             }
 
-            if(var1.world == 0) {
+            if (var1.world == 0) {
                WorldMapIcon1.method219(5, "", var1.username + " has logged out.");
             }
 
@@ -99,7 +99,7 @@ public class FriendSystem {
    )
    @Export("clear")
    final void clear() {
-      this.__g = 0;
+      this.field357 = 0;
       this.friendsList.clear();
       this.ignoreList.clear();
    }
@@ -129,43 +129,44 @@ public class FriendSystem {
       signature = "(Ljava/lang/String;I)V",
       garbageValue = "-1721017960"
    )
-   final void __l_157(String var1) {
-      if(var1 != null) {
+   final void method103(String var1) {
+      if (var1 != null) {
          Username var2 = new Username(var1, this.loginType);
-         if(var2.hasCleanName()) {
-            StringBuilder var10000;
+         if (var2.hasCleanName()) {
+            StringBuilder var3;
             String var4;
-            if(this.__e_158()) {
-               var10000 = null;
+            if (this.method104()) {
+               var3 = null;
                var4 = "Your friend list is full. Max of 200 for free users, and 400 for members";
                WorldMapIcon1.method219(30, "", var4);
-            } else if(Canvas.localPlayer.username.equals(var2)) {
-               var10000 = null;
-               var4 = "You can\'t add yourself to your own friend list";
+            } else if (Canvas.localPlayer.username.equals(var2)) {
+               var3 = null;
+               var4 = "You can't add yourself to your own friend list";
                WorldMapIcon1.method219(30, "", var4);
             } else {
-               Object var10001;
-               if(this.isFriended(var2, false)) {
-                  var10000 = (new StringBuilder()).append(var1);
-                  var10001 = null;
-                  var4 = var10000.append(" is already on your friend list").toString();
+               Object var5;
+               if (this.isFriended(var2, false)) {
+                  var3 = (new StringBuilder()).append(var1);
+                  var5 = null;
+                  var4 = var3.append(" is already on your friend list").toString();
                   WorldMapIcon1.method219(30, "", var4);
-               } else if(this.isIgnored(var2)) {
-                  var10000 = new StringBuilder();
-                  var10001 = null;
-                  var10000 = var10000.append("Please remove ").append(var1);
-                  var10001 = null;
-                  var4 = var10000.append(" from your ignore list first").toString();
+               } else if (this.isIgnored(var2)) {
+                  var3 = new StringBuilder();
+                  var5 = null;
+                  var3 = var3.append("Please remove ").append(var1);
+                  var5 = null;
+                  var4 = var3.append(" from your ignore list first").toString();
                   WorldMapIcon1.method219(30, "", var4);
                } else {
-                  PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_cn, Client.packetWriter.isaacCipher);
-                  var3.packetBuffer.writeByte(WorldMapRegion.method550(var1));
-                  var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-                  Client.packetWriter.__q_167(var3);
+                  PacketBufferNode var6 = Interpreter.method1915(ClientPacket.field310, Client.packetWriter.isaacCipher);
+                  var6.packetBuffer.writeByte(WorldMapRegion.method550(var1));
+                  var6.packetBuffer.writeStringCp1252NullTerminated(var1);
+                  Client.packetWriter.method241(var6);
                }
             }
          }
       }
+
    }
 
    @ObfuscatedName("e")
@@ -173,8 +174,8 @@ public class FriendSystem {
       signature = "(B)Z",
       garbageValue = "57"
    )
-   final boolean __e_158() {
-      return this.friendsList.isFull() || this.friendsList.size() >= 200 && Client.__client_jo != 1;
+   final boolean method104() {
+      return this.friendsList.isFull() || this.friendsList.size() >= 200 && Client.field209 != 1;
    }
 
    @ObfuscatedName("x")
@@ -182,37 +183,41 @@ public class FriendSystem {
       signature = "(Ljava/lang/String;B)V",
       garbageValue = "30"
    )
-   final void __x_159(String var1) {
-      if(var1 != null) {
+   final void method105(String var1) {
+      if (var1 != null) {
          Username var2 = new Username(var1, this.loginType);
-         if(var2.hasCleanName()) {
-            StringBuilder var10000;
+         if (var2.hasCleanName()) {
+            StringBuilder var3;
             String var4;
-            if(this.__a_160()) {
-               var10000 = null;
+            if (this.method106()) {
+               var3 = null;
                var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members";
                WorldMapIcon1.method219(30, "", var4);
-            } else if(Canvas.localPlayer.username.equals(var2)) {
-               var10000 = null;
-               var4 = "You can\'t add yourself to your own ignore list";
+            } else if (Canvas.localPlayer.username.equals(var2)) {
+               var3 = null;
+               var4 = "You can't add yourself to your own ignore list";
                WorldMapIcon1.method219(30, "", var4);
-            } else if(this.isIgnored(var2)) {
+            } else if (this.isIgnored(var2)) {
                class22.method294(var1);
-            } else if(this.isFriended(var2, false)) {
-               var10000 = new StringBuilder();
-               Object var10001 = null;
-               var10000 = var10000.append("Please remove ").append(var1);
-               var10001 = null;
-               var4 = var10000.append(" from your friend list first").toString();
-               WorldMapIcon1.method219(30, "", var4);
             } else {
-               PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_ch, Client.packetWriter.isaacCipher);
-               var3.packetBuffer.writeByte(WorldMapRegion.method550(var1));
-               var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-               Client.packetWriter.__q_167(var3);
+               PacketBufferNode var5;
+               if (this.isFriended(var2, false)) {
+                  var3 = new StringBuilder();
+                  var5 = null;
+                  var3 = var3.append("Please remove ").append(var1);
+                  var5 = null;
+                  var4 = var3.append(" from your friend list first").toString();
+                  WorldMapIcon1.method219(30, "", var4);
+               } else {
+                  var5 = Interpreter.method1915(ClientPacket.field312, Client.packetWriter.isaacCipher);
+                  var5.packetBuffer.writeByte(WorldMapRegion.method550(var1));
+                  var5.packetBuffer.writeStringCp1252NullTerminated(var1);
+                  Client.packetWriter.method241(var5);
+               }
             }
          }
       }
+
    }
 
    @ObfuscatedName("a")
@@ -220,8 +225,8 @@ public class FriendSystem {
       signature = "(B)Z",
       garbageValue = "120"
    )
-   final boolean __a_160() {
-      return this.ignoreList.isFull() || this.ignoreList.size() >= 100 && Client.__client_jo != 1;
+   final boolean method106() {
+      return this.ignoreList.isFull() || this.ignoreList.size() >= 100 && Client.field209 != 1;
    }
 
    @ObfuscatedName("z")
@@ -231,20 +236,21 @@ public class FriendSystem {
    )
    @Export("removeFriend")
    final void removeFriend(String var1) {
-      if(var1 != null) {
+      if (var1 != null) {
          Username var2 = new Username(var1, this.loginType);
-         if(var2.hasCleanName()) {
-            if(this.friendsList.removeByUsername(var2)) {
+         if (var2.hasCleanName()) {
+            if (this.friendsList.removeByUsername(var2)) {
                WorldMapManager.method668();
-               PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_bs, Client.packetWriter.isaacCipher);
+               PacketBufferNode var3 = Interpreter.method1915(ClientPacket.field276, Client.packetWriter.isaacCipher);
                var3.packetBuffer.writeByte(WorldMapRegion.method550(var1));
                var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-               Client.packetWriter.__q_167(var3);
+               Client.packetWriter.method241(var3);
             }
 
             GrandExchangeOffer.method121();
          }
       }
+
    }
 
    @ObfuscatedName("j")
@@ -254,20 +260,21 @@ public class FriendSystem {
    )
    @Export("removeIgnore")
    final void removeIgnore(String var1) {
-      if(var1 != null) {
+      if (var1 != null) {
          Username var2 = new Username(var1, this.loginType);
-         if(var2.hasCleanName()) {
-            if(this.ignoreList.removeByUsername(var2)) {
+         if (var2.hasCleanName()) {
+            if (this.ignoreList.removeByUsername(var2)) {
                WorldMapManager.method668();
-               PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_aj, Client.packetWriter.isaacCipher);
+               PacketBufferNode var3 = Interpreter.method1915(ClientPacket.field250, Client.packetWriter.isaacCipher);
                var3.packetBuffer.writeByte(WorldMapRegion.method550(var1));
                var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-               Client.packetWriter.__q_167(var3);
+               Client.packetWriter.method241(var3);
             }
 
             class229.method4512();
          }
       }
+
    }
 
    @ObfuscatedName("t")
@@ -288,23 +295,23 @@ public class FriendSystem {
    )
    static int method1867(int var0, Script var1, boolean var2) {
       Widget var3;
-      if(var0 >= 2000) {
+      if (var0 >= 2000) {
          var0 -= 1000;
          var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
       } else {
-         var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
+         var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
       }
 
-      if(var0 == 1927) {
-         if(Interpreter.__bv_y >= 10) {
+      if (var0 == 1927) {
+         if (Interpreter.field425 >= 10) {
             throw new RuntimeException();
-         } else if(var3.__ee == null) {
+         } else if (var3.field975 == null) {
             return 0;
          } else {
             ScriptEvent var4 = new ScriptEvent();
             var4.widget = var3;
-            var4.args0 = var3.__ee;
-            var4.__d = Interpreter.__bv_y + 1;
+            var4.args0 = var3.field975;
+            var4.field772 = Interpreter.field425 + 1;
             Client.scriptEvents.addFirst(var4);
             return 1;
          }
diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java
index b39fda53a7..aec0b08c1f 100644
--- a/runescape-client/src/main/java/FriendsList.java
+++ b/runescape-client/src/main/java/FriendsList.java
@@ -17,7 +17,7 @@ public class FriendsList extends UserList {
    @ObfuscatedGetter(
       intValue = -217526077
    )
-   int __x;
+   int field358;
    @ObfuscatedName("d")
    @ObfuscatedSignature(
       signature = "Ljy;"
@@ -30,7 +30,7 @@ public class FriendsList extends UserList {
    )
    public FriendsList(LoginType var1) {
       super(400);
-      this.__x = 1;
+      this.field358 = 1;
       this.friendLoginUpdates = new LinkDeque();
       this.loginType = var1;
    }
@@ -73,29 +73,29 @@ public class FriendsList extends UserList {
    )
    @Export("read")
    public void read(Buffer var1, int var2) {
-      while(true) {
-         if(var1.index < var2) {
+      while (true) {
+         if (var1.index < var2) {
             boolean var3 = var1.readUnsignedByte() == 1;
             Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
             Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
-            int var6 = var1.__ag_302();
+            int var6 = var1.method43();
             int var7 = var1.readUnsignedByte();
             int var8 = var1.readUnsignedByte();
             boolean var9 = (var8 & 2) != 0;
             boolean var10 = (var8 & 1) != 0;
-            if(var6 > 0) {
+            if (var6 > 0) {
                var1.readStringCp1252NullTerminated();
                var1.readUnsignedByte();
                var1.readInt();
             }
 
             var1.readStringCp1252NullTerminated();
-            if(var4 != null && var4.hasCleanName()) {
+            if (var4 != null && var4.hasCleanName()) {
                Friend var11 = (Friend)this.getByCurrentUsername(var4);
-               if(var3) {
+               if (var3) {
                   Friend var12 = (Friend)this.getByCurrentUsername(var5);
-                  if(var12 != null && var12 != var11) {
-                     if(var11 != null) {
+                  if (var12 != null && var12 != var11) {
+                     if (var11 != null) {
                         this.remove(var12);
                      } else {
                         var11 = var12;
@@ -103,38 +103,38 @@ public class FriendsList extends UserList {
                   }
                }
 
-               if(var11 != null) {
+               if (var11 != null) {
                   this.changeName(var11, var4, var5);
-                  if(var6 != var11.world0) {
+                  if (var6 != var11.world0) {
                      boolean var14 = true;
 
-                     for(FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.__f_438(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.__q_439()) {
-                        if(var13.username.equals(var4)) {
-                           if(var6 != 0 && var13.world == 0) {
+                     for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.method164(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.method165()) {
+                        if (var13.username.equals(var4)) {
+                           if (var6 != 0 && var13.world == 0) {
                               var13.remove();
                               var14 = false;
-                           } else if(var6 == 0 && var13.world != 0) {
+                           } else if (var6 == 0 && var13.world != 0) {
                               var13.remove();
                               var14 = false;
                            }
                         }
                      }
 
-                     if(var14) {
-                        this.friendLoginUpdates.__m_437(new FriendLoginUpdate(var4, var6));
+                     if (var14) {
+                        this.friendLoginUpdates.method163(new FriendLoginUpdate(var4, var6));
                      }
                   }
                } else {
-                  if(this.size() >= 400) {
+                  if (this.size() >= 400) {
                      continue;
                   }
 
                   var11 = (Friend)this.addLast(var4, var5);
                }
 
-               if(var6 != var11.world0) {
-                  var11.int2 = ++this.__x - 1;
-                  if(var11.world0 == -1 && var6 == 0) {
+               if (var6 != var11.world0) {
+                  var11.int2 = ++this.field358 - 1;
+                  if (var11.world0 == -1 && var6 == 0) {
                      var11.int2 = -(var11.int2 * -1377538447) * 120689297;
                   }
 
@@ -142,8 +142,8 @@ public class FriendsList extends UserList {
                }
 
                var11.rank = var7;
-               var11.__m = var9;
-               var11.__f = var10;
+               var11.field354 = var9;
+               var11.field355 = var10;
                continue;
             }
 
diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java
index 8bb9660616..48cdc5d053 100644
--- a/runescape-client/src/main/java/GameObject.java
+++ b/runescape-client/src/main/java/GameObject.java
@@ -17,7 +17,7 @@ public final class GameObject {
    @ObfuscatedGetter(
       intValue = -457229589
    )
-   static int __eh_fy;
+   static int field359;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 1393658667
@@ -82,7 +82,7 @@ public final class GameObject {
    @ObfuscatedGetter(
       intValue = 1941106389
    )
-   int __d;
+   int field360;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = -1043687633
diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java
index dad3bf2500..11d8c7dd6e 100644
--- a/runescape-client/src/main/java/GameShell.java
+++ b/runescape-client/src/main/java/GameShell.java
@@ -43,7 +43,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @ObfuscatedGetter(
       intValue = -281664295
    )
-   static int __ba_q;
+   static int field361;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       longValue = 5666519919949401915L
@@ -57,17 +57,17 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @ObfuscatedGetter(
       intValue = -1179083285
    )
-   static int __ba_l;
+   static int field362;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -1698831905
    )
-   static int __ba_e;
+   static int field363;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = 425367827
    )
-   static int __ba_d;
+   static int field364;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = 1789653893
@@ -75,19 +75,19 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @Export("fps")
    protected static int fps;
    @ObfuscatedName("a")
-   static long[] __ba_a;
+   static long[] field365;
    @ObfuscatedName("j")
-   static long[] __ba_j;
+   static long[] field366;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = -2078849253
    )
-   static int __ba_s;
+   static int field367;
    @ObfuscatedName("aw")
    @ObfuscatedGetter(
       intValue = -1042005999
    )
-   static int __ba_aw;
+   static int field368;
    @ObfuscatedName("an")
    @Export("hasFocus")
    static volatile boolean hasFocus;
@@ -167,7 +167,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @Export("canvas")
    java.awt.Canvas canvas;
    @ObfuscatedName("ah")
-   volatile boolean __ah;
+   volatile boolean field369;
    @ObfuscatedName("al")
    @Export("resizeCanvasNextFrame")
    boolean resizeCanvasNextFrame;
@@ -193,27 +193,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @Export("eventQueue")
    final EventQueue eventQueue;
 
-   static {
-      gameShell = null;
-      __ba_q = 0;
-      stopTimeMs = 0L;
-      isKilled = false;
-      __ba_e = 20;
-      __ba_d = 1;
-      fps = 0;
-      __ba_a = new long[32];
-      __ba_j = new long[32];
-      __ba_aw = 500;
-      hasFocus = true;
-      garbageCollectorLastCollectionTime = -1L;
-      garbageCollectorLastCheckTimeMs = -1L;
-   }
-
    protected GameShell() {
       this.hasErrored = false;
       this.canvasX = 0;
       this.canvasY = 0;
-      this.__ah = true;
+      this.field369 = true;
       this.resizeCanvasNextFrame = false;
       this.isCanvasInvalid = false;
       this.canvasSetTimeMs = 0L;
@@ -222,7 +206,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       try {
          var1 = Toolkit.getDefaultToolkit().getSystemEventQueue();
       } catch (Throwable var3) {
-         ;
       }
 
       this.eventQueue = var1;
@@ -237,8 +220,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    )
    @Export("setMaxCanvasSize")
    protected final void setMaxCanvasSize(int var1, int var2) {
-      if(this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) {
-         this.__ay_96();
+      if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) {
+         this.method111();
       }
 
       this.maxCanvasWidth = var1;
@@ -252,16 +235,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    )
    @Export("post")
    final void post(Object var1) {
-      if(this.eventQueue != null) {
-         for(int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) {
+      if (this.eventQueue != null) {
+         for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) {
             class203.method4010(1L);
          }
 
-         if(var1 != null) {
+         if (var1 != null) {
             this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy"));
          }
-
       }
+
    }
 
    @ObfuscatedName("l")
@@ -271,7 +254,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    )
    @Export("mouseWheel")
    protected MouseWheel mouseWheel() {
-      if(this.mouseWheelHandler == null) {
+      if (this.mouseWheelHandler == null) {
          this.mouseWheelHandler = new MouseWheelHandler();
          this.mouseWheelHandler.addTo(this.canvas);
       }
@@ -306,7 +289,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    )
    @Export("setUpKeyboard")
    protected final void setUpKeyboard() {
-      if(TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) {
+      if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) {
          KeyHandler.KeyHandler_keyCodes[186] = 57;
          KeyHandler.KeyHandler_keyCodes[187] = 27;
          KeyHandler.KeyHandler_keyCodes[188] = 71;
@@ -361,15 +344,15 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @Export("resizeCanvas")
    final void resizeCanvas() {
       Container var1 = this.container();
-      if(var1 != null) {
+      if (var1 != null) {
          Bounds var2 = this.getFrameContentBounds();
-         this.contentWidth = Math.max(var2.__q, this.contentWidth0);
-         this.contentHeight = Math.max(var2.__w, this.contentHeight0);
-         if(this.contentWidth <= 0) {
+         this.contentWidth = Math.max(var2.field43, this.contentWidth0);
+         this.contentHeight = Math.max(var2.field44, this.contentHeight0);
+         if (this.contentWidth <= 0) {
             this.contentWidth = 1;
          }
 
-         if(this.contentHeight <= 0) {
+         if (this.contentHeight <= 0) {
             this.contentHeight = 1;
          }
 
@@ -379,16 +362,17 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
          this.canvasY = 0;
          this.canvas.setSize(SoundCache.canvasWidth, Huffman.canvasHeight);
          class197.rasterProvider = new RasterProvider(SoundCache.canvasWidth, Huffman.canvasHeight, this.canvas);
-         if(var1 == this.frame) {
+         if (var1 == this.frame) {
             Insets var3 = this.frame.getInsets();
             this.canvas.setLocation(this.canvasX + var3.left, var3.top + this.canvasY);
          } else {
             this.canvas.setLocation(this.canvasX, this.canvasY);
          }
 
-         this.__ah = true;
-         this.__j_113();
+         this.field369 = true;
+         this.vmethod107();
       }
+
    }
 
    @ObfuscatedName("j")
@@ -396,7 +380,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(I)V",
       garbageValue = "-1773624745"
    )
-   protected abstract void __j_113();
+   protected abstract void vmethod107();
 
    @ObfuscatedName("p")
    @ObfuscatedSignature(
@@ -409,12 +393,12 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       int var2 = this.canvasY;
       int var3 = this.contentWidth - SoundCache.canvasWidth - var1;
       int var4 = this.contentHeight - Huffman.canvasHeight - var2;
-      if(var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) {
+      if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) {
          try {
             Container var5 = this.container();
             int var6 = 0;
             int var7 = 0;
-            if(var5 == this.frame) {
+            if (var5 == this.frame) {
                Insets var8 = this.frame.getInsets();
                var6 = var8.left;
                var7 = var8.top;
@@ -422,23 +406,22 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
             Graphics var10 = var5.getGraphics();
             var10.setColor(Color.black);
-            if(var1 > 0) {
+            if (var1 > 0) {
                var10.fillRect(var6, var7, var1, this.contentHeight);
             }
 
-            if(var2 > 0) {
+            if (var2 > 0) {
                var10.fillRect(var6, var7, this.contentWidth, var2);
             }
 
-            if(var3 > 0) {
+            if (var3 > 0) {
                var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight);
             }
 
-            if(var4 > 0) {
+            if (var4 > 0) {
                var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4);
             }
          } catch (Exception var9) {
-            ;
          }
       }
 
@@ -454,13 +437,13 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       java.awt.Canvas var1 = this.canvas;
       var1.removeKeyListener(KeyHandler.KeyHandler_instance);
       var1.removeFocusListener(KeyHandler.KeyHandler_instance);
-      KeyHandler.__an_cw = -1;
+      KeyHandler.field448 = -1;
       java.awt.Canvas var2 = this.canvas;
       var2.removeMouseListener(MouseHandler.MouseHandler_instance);
       var2.removeMouseMotionListener(MouseHandler.MouseHandler_instance);
       var2.removeFocusListener(MouseHandler.MouseHandler_instance);
       MouseHandler.MouseHandler_currentButton0 = 0;
-      if(this.mouseWheelHandler != null) {
+      if (this.mouseWheelHandler != null) {
          this.mouseWheelHandler.removeFrom(this.canvas);
       }
 
@@ -473,11 +456,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       var4.addMouseListener(MouseHandler.MouseHandler_instance);
       var4.addMouseMotionListener(MouseHandler.MouseHandler_instance);
       var4.addFocusListener(MouseHandler.MouseHandler_instance);
-      if(this.mouseWheelHandler != null) {
+      if (this.mouseWheelHandler != null) {
          this.mouseWheelHandler.addTo(this.canvas);
       }
 
-      this.__ay_96();
+      this.method111();
    }
 
    @ObfuscatedName("ag")
@@ -488,9 +471,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @Export("startThread")
    protected final void startThread(int var1, int var2, int var3) {
       try {
-         if(gameShell != null) {
-            ++__ba_q;
-            if(__ba_q >= 3) {
+         if (gameShell != null) {
+            ++field361;
+            if (field361 >= 3) {
                this.error("alreadyloaded");
                return;
             }
@@ -504,13 +487,13 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
          Huffman.canvasHeight = var2;
          RunException.revision = var3;
          RunException.applet = this;
-         if(taskHandler == null) {
+         if (taskHandler == null) {
             taskHandler = new TaskHandler();
          }
 
          taskHandler.newThreadTask(this, 1);
       } catch (Exception var5) {
-         NpcDefinition.sendStackTrace((String)null, var5);
+         NPCDefinition.sendStackTrace((String)null, var5);
          this.error("crash");
       }
 
@@ -524,7 +507,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @Export("addCanvas")
    final synchronized void addCanvas() {
       Container var1 = this.container();
-      if(this.canvas != null) {
+      if (this.canvas != null) {
          this.canvas.removeFocusListener(this);
          var1.remove(this.canvas);
       }
@@ -532,7 +515,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       SoundCache.canvasWidth = Math.max(var1.getWidth(), this.contentWidth0);
       Huffman.canvasHeight = Math.max(var1.getHeight(), this.contentHeight0);
       Insets var2;
-      if(this.frame != null) {
+      if (this.frame != null) {
          var2 = this.frame.getInsets();
          SoundCache.canvasWidth -= var2.right + var2.left;
          Huffman.canvasHeight -= var2.top + var2.bottom;
@@ -545,7 +528,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       this.canvas.setSize(SoundCache.canvasWidth, Huffman.canvasHeight);
       this.canvas.setVisible(true);
       this.canvas.setBackground(Color.BLACK);
-      if(var1 == this.frame) {
+      if (var1 == this.frame) {
          var2 = this.frame.getInsets();
          this.canvas.setLocation(var2.left + this.canvasX, var2.top + this.canvasY);
       } else {
@@ -554,8 +537,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
       this.canvas.addFocusListener(this);
       this.canvas.requestFocus();
-      this.__ah = true;
-      if(class197.rasterProvider != null && SoundCache.canvasWidth == class197.rasterProvider.width && Huffman.canvasHeight == class197.rasterProvider.height) {
+      this.field369 = true;
+      if (class197.rasterProvider != null && SoundCache.canvasWidth == class197.rasterProvider.width && Huffman.canvasHeight == class197.rasterProvider.height) {
          ((RasterProvider)class197.rasterProvider).setComponent(this.canvas);
          class197.rasterProvider.drawFull(0, 0);
       } else {
@@ -574,16 +557,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @Export("checkHost")
    protected final boolean checkHost() {
       String var1 = this.getDocumentBase().getHost().toLowerCase();
-      if(!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) {
-         if(!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) {
-            if(var1.endsWith("127.0.0.1")) {
+      if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) {
+         if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) {
+            if (var1.endsWith("127.0.0.1")) {
                return true;
             } else {
-               while(var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') {
+               while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') {
                   var1 = var1.substring(0, var1.length() - 1);
                }
 
-               if(var1.endsWith("192.168.1.")) {
+               if (var1.endsWith("192.168.1.")) {
                   return true;
                } else {
                   this.error("invalidhost");
@@ -603,20 +586,19 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(B)V",
       garbageValue = "0"
    )
-   void __av_93() {
+   void method108() {
       long var1 = class203.currentTimeMs();
-      long var3 = __ba_j[__ba_s];
-      __ba_j[__ba_s] = var1;
-      __ba_s = __ba_s + 1 & 31;
-      if(var3 != 0L && var1 > var3) {
-         ;
+      long var3 = field366[field367];
+      field366[field367] = var1;
+      field367 = field367 + 1 & 31;
+      if (var3 != 0L && var1 > var3) {
       }
 
       synchronized(this) {
-         class230.__hy_az = hasFocus;
+         class230.field1138 = hasFocus;
       }
 
-      this.__al_111();
+      this.vmethod112();
    }
 
    @ObfuscatedName("ar")
@@ -624,23 +606,23 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(B)V",
       garbageValue = "-2"
    )
-   void __ar_94() {
+   void method109() {
       Container var1 = this.container();
       long var2 = class203.currentTimeMs();
-      long var4 = __ba_a[GrandExchangeEvents.__g_z];
-      __ba_a[GrandExchangeEvents.__g_z] = var2;
-      GrandExchangeEvents.__g_z = GrandExchangeEvents.__g_z + 1 & 31;
-      if(var4 != 0L && var2 > var4) {
+      long var4 = field365[GrandExchangeEvents.field375];
+      field365[GrandExchangeEvents.field375] = var2;
+      GrandExchangeEvents.field375 = GrandExchangeEvents.field375 + 1 & 31;
+      if (var4 != 0L && var2 > var4) {
          int var6 = (int)(var2 - var4);
          fps = ((var6 >> 1) + 32000) / var6;
       }
 
-      if(++__ba_aw - 1 > 50) {
-         __ba_aw -= 50;
-         this.__ah = true;
+      if (++field368 - 1 > 50) {
+         field368 -= 50;
+         this.field369 = true;
          this.canvas.setSize(SoundCache.canvasWidth, Huffman.canvasHeight);
          this.canvas.setVisible(true);
-         if(var1 == this.frame) {
+         if (var1 == this.frame) {
             Insets var7 = this.frame.getInsets();
             this.canvas.setLocation(var7.left + this.canvasX, this.canvasY + var7.top);
          } else {
@@ -648,17 +630,17 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
          }
       }
 
-      if(this.isCanvasInvalid) {
+      if (this.isCanvasInvalid) {
          this.replaceCanvas();
       }
 
-      this.__ac_95();
-      this.methodDraw(this.__ah);
-      if(this.__ah) {
+      this.method110();
+      this.methodDraw(this.field369);
+      if (this.field369) {
          this.clearBackground();
       }
 
-      this.__ah = false;
+      this.field369 = false;
    }
 
    @ObfuscatedName("ac")
@@ -666,9 +648,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(I)V",
       garbageValue = "-1999661001"
    )
-   final void __ac_95() {
+   final void method110() {
       Bounds var1 = this.getFrameContentBounds();
-      if(var1.__q != this.contentWidth || this.contentHeight != var1.__w || this.resizeCanvasNextFrame) {
+      if (var1.field43 != this.contentWidth || this.contentHeight != var1.field44 || this.resizeCanvasNextFrame) {
          this.resizeCanvas();
          this.resizeCanvasNextFrame = false;
       }
@@ -680,7 +662,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(I)V",
       garbageValue = "1147427427"
    )
-   final void __ay_96() {
+   final void method111() {
       this.resizeCanvasNextFrame = true;
    }
 
@@ -691,39 +673,36 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    )
    @Export("kill")
    final synchronized void kill() {
-      if(!isKilled) {
+      if (!isKilled) {
          isKilled = true;
 
          try {
             this.canvas.removeFocusListener(this);
          } catch (Exception var5) {
-            ;
          }
 
          try {
             this.kill0();
          } catch (Exception var4) {
-            ;
          }
 
-         if(this.frame != null) {
+         if (this.frame != null) {
             try {
                System.exit(0);
             } catch (Throwable var3) {
-               ;
             }
          }
 
-         if(taskHandler != null) {
+         if (taskHandler != null) {
             try {
                taskHandler.close();
             } catch (Exception var2) {
-               ;
             }
          }
 
-         this.__au_110();
+         this.vmethod114();
       }
+
    }
 
    @ObfuscatedName("aw")
@@ -739,7 +718,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(I)V",
       garbageValue = "1445885427"
    )
-   protected abstract void __al_111();
+   protected abstract void vmethod112();
 
    @ObfuscatedName("ab")
    @ObfuscatedSignature(
@@ -766,12 +745,12 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    protected final void drawInitial(int var1, String var2, boolean var3) {
       try {
          Graphics var4 = this.canvas.getGraphics();
-         if(class231.__hb_av == null) {
-            class231.__hb_av = new java.awt.Font("Helvetica", 1, 13);
-            class60.__bo_ar = this.canvas.getFontMetrics(class231.__hb_av);
+         if (class231.field1140 == null) {
+            class231.field1140 = new java.awt.Font("Helvetica", 1, 13);
+            class60.field1162 = this.canvas.getFontMetrics(class231.field1140);
          }
 
-         if(var3) {
+         if (var3) {
             var4.setColor(Color.black);
             var4.fillRect(0, 0, SoundCache.canvasWidth, Huffman.canvasHeight);
          }
@@ -779,21 +758,21 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
          Color var5 = new Color(140, 17, 17);
 
          try {
-            if(PlayerType.__ij_ak == null) {
-               PlayerType.__ij_ak = this.canvas.createImage(304, 34);
+            if (PlayerType.field730 == null) {
+               PlayerType.field730 = this.canvas.createImage(304, 34);
             }
 
-            Graphics var6 = PlayerType.__ij_ak.getGraphics();
+            Graphics var6 = PlayerType.field730.getGraphics();
             var6.setColor(var5);
             var6.drawRect(0, 0, 303, 33);
             var6.fillRect(2, 2, var1 * 3, 30);
             var6.setColor(Color.black);
             var6.drawRect(1, 1, 301, 31);
             var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30);
-            var6.setFont(class231.__hb_av);
+            var6.setFont(class231.field1140);
             var6.setColor(Color.white);
-            var6.drawString(var2, (304 - class60.__bo_ar.stringWidth(var2)) / 2, 22);
-            var4.drawImage(PlayerType.__ij_ak, SoundCache.canvasWidth / 2 - 152, Huffman.canvasHeight / 2 - 18, (ImageObserver)null);
+            var6.drawString(var2, (304 - class60.field1162.stringWidth(var2)) / 2, 22);
+            var4.drawImage(PlayerType.field730, SoundCache.canvasWidth / 2 - 152, Huffman.canvasHeight / 2 - 18, (ImageObserver)null);
          } catch (Exception var9) {
             int var7 = SoundCache.canvasWidth / 2 - 152;
             int var8 = Huffman.canvasHeight / 2 - 18;
@@ -803,9 +782,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
             var4.setColor(Color.black);
             var4.drawRect(var7 + 1, var8 + 1, 301, 31);
             var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30);
-            var4.setFont(class231.__hb_av);
+            var4.setFont(class231.field1140);
             var4.setColor(Color.white);
-            var4.drawString(var2, var7 + (304 - class60.__bo_ar.stringWidth(var2)) / 2, var8 + 22);
+            var4.drawString(var2, var7 + (304 - class60.field1162.stringWidth(var2)) / 2, var8 + 22);
          }
       } catch (Exception var10) {
          this.canvas.repaint();
@@ -818,10 +797,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(I)V",
       garbageValue = "-1283386969"
    )
-   protected final void __ad_108() {
-      PlayerType.__ij_ak = null;
-      class231.__hb_av = null;
-      class60.__bo_ar = null;
+   protected final void method113() {
+      PlayerType.field730 = null;
+      class231.field1140 = null;
+      class60.field1162 = null;
    }
 
    @ObfuscatedName("ap")
@@ -831,17 +810,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    )
    @Export("error")
    protected void error(String var1) {
-      if(!this.hasErrored) {
+      if (!this.hasErrored) {
          this.hasErrored = true;
          System.out.println("error_game_" + var1);
 
          try {
             this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self");
          } catch (Exception var3) {
-            ;
          }
-
       }
+
    }
 
    @ObfuscatedName("as")
@@ -851,7 +829,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    )
    @Export("container")
    Container container() {
-      return (Container)(this.frame != null?this.frame:this);
+      return (Container)(this.frame != null ? this.frame : this);
    }
 
    @ObfuscatedName("am")
@@ -864,7 +842,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       Container var1 = this.container();
       int var2 = Math.max(var1.getWidth(), this.contentWidth0);
       int var3 = Math.max(var1.getHeight(), this.contentHeight0);
-      if(this.frame != null) {
+      if (this.frame != null) {
          Insets var4 = this.frame.getInsets();
          var2 -= var4.right + var4.left;
          var3 -= var4.bottom + var4.top;
@@ -888,59 +866,59 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(I)V",
       garbageValue = "1860808291"
    )
-   protected abstract void __au_110();
+   protected abstract void vmethod114();
 
    @ObfuscatedName("destroy")
-   public final void __destroy_99() {
-      if(this == gameShell && !isKilled) {
+   public final void method115() {
+      if (this == gameShell && !isKilled) {
          stopTimeMs = class203.currentTimeMs();
          class203.method4010(5000L);
          this.kill();
       }
+
    }
 
    @Export("paint")
    @ObfuscatedName("paint")
    public final synchronized void paint(Graphics var1) {
-      if(this == gameShell && !isKilled) {
-         this.__ah = true;
-         if(class203.currentTimeMs() - this.canvasSetTimeMs > 1000L) {
+      if (this == gameShell && !isKilled) {
+         this.field369 = true;
+         if (class203.currentTimeMs() - this.canvasSetTimeMs > 1000L) {
             Rectangle var2 = var1.getClipBounds();
-            if(var2 == null || var2.width >= SoundCache.canvasWidth && var2.height >= Huffman.canvasHeight) {
+            if (var2 == null || var2.width >= SoundCache.canvasWidth && var2.height >= Huffman.canvasHeight) {
                this.isCanvasInvalid = true;
             }
          }
-
       }
+
    }
 
    @Export("run")
    @ObfuscatedName("run")
    public void run() {
       try {
-         if(TaskHandler.javaVendor != null) {
+         if (TaskHandler.javaVendor != null) {
             String var1 = TaskHandler.javaVendor.toLowerCase();
-            if(var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) {
+            if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) {
                String var2 = TaskHandler.javaVersion;
-               if(var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) {
+               if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) {
                   this.error("wrongjava");
                   return;
                }
 
-               if(var2.startsWith("1.6.0_")) {
+               if (var2.startsWith("1.6.0_")) {
                   int var3;
-                  for(var3 = 6; var3 < var2.length() && class159.method3394(var2.charAt(var3)); ++var3) {
-                     ;
+                  for (var3 = 6; var3 < var2.length() && class159.method3394(var2.charAt(var3)); ++var3) {
                   }
 
                   String var4 = var2.substring(6, var3);
-                  if(UserComparator4.method3336(var4) && MouseHandler.method1085(var4) < 10) {
+                  if (UserComparator4.method3336(var4) && MouseHandler.method1085(var4) < 10) {
                      this.error("wrongjava");
                      return;
                   }
                }
 
-               __ba_d = 5;
+               field364 = 5;
             }
          }
 
@@ -948,27 +926,27 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
          this.addCanvas();
          this.setUp();
 
-         Object var8;
+         Object var7;
          try {
-            var8 = new NanoClock();
-         } catch (Throwable var6) {
-            var8 = new MilliClock();
+            var7 = new NanoClock();
+         } catch (Throwable var5) {
+            var7 = new MilliClock();
          }
 
-         UserComparator6.clock = (Clock)var8;
+         UserComparator6.clock = (Clock)var7;
 
-         while(0L == stopTimeMs || class203.currentTimeMs() < stopTimeMs) {
-            __ba_l = UserComparator6.clock.wait(__ba_e, __ba_d);
+         while (0L == stopTimeMs || class203.currentTimeMs() < stopTimeMs) {
+            field362 = UserComparator6.clock.wait(field363, field364);
 
-            for(int var5 = 0; var5 < __ba_l; ++var5) {
-               this.__av_93();
+            for (int var8 = 0; var8 < field362; ++var8) {
+               this.method108();
             }
 
-            this.__ar_94();
+            this.method109();
             this.post(this.canvas);
          }
-      } catch (Exception var7) {
-         NpcDefinition.sendStackTrace((String)null, var7);
+      } catch (Exception var6) {
+         NPCDefinition.sendStackTrace((String)null, var6);
          this.error("crash");
       }
 
@@ -976,10 +954,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    }
 
    @ObfuscatedName("start")
-   public final void __start_97() {
-      if(this == gameShell && !isKilled) {
+   public final void method116() {
+      if (this == gameShell && !isKilled) {
          stopTimeMs = 0L;
       }
+
    }
 
    @Export("update")
@@ -992,7 +971,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @ObfuscatedName("focusGained")
    public final void focusGained(FocusEvent var1) {
       hasFocus = true;
-      this.__ah = true;
+      this.field369 = true;
    }
 
    @Export("windowActivated")
@@ -1008,7 +987,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @Export("windowClosing")
    @ObfuscatedName("windowClosing")
    public final void windowClosing(WindowEvent var1) {
-      this.__destroy_99();
+      this.method115();
    }
 
    @Export("windowDeiconified")
@@ -1022,13 +1001,14 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    }
 
    @ObfuscatedName("init")
-   public abstract void __init_109();
+   public abstract void vmethod117();
 
    @ObfuscatedName("stop")
-   public final void __stop_98() {
-      if(this == gameShell && !isKilled) {
+   public final void method118() {
+      if (this == gameShell && !isKilled) {
          stopTimeMs = class203.currentTimeMs() + 4000L;
       }
+
    }
 
    @Export("windowIconified")
@@ -1054,38 +1034,38 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    )
    @Export("updateGameState")
    static void updateGameState(int var0) {
-      if(var0 != Client.gameState) {
-         if(Client.gameState == 0) {
-            TextureProvider.client.__ad_108();
+      if (var0 != Client.gameState) {
+         if (Client.gameState == 0) {
+            TextureProvider.client.method113();
          }
 
-         if(var0 == 20 || var0 == 40 || var0 == 45) {
+         if (var0 == 20 || var0 == 40 || var0 == 45) {
             Client.loginState = 0;
-            Client.__client_ex = 0;
-            Client.__client_ej = 0;
-            Client.timer.__q_455(var0);
-            if(var0 != 20) {
+            Client.field168 = 0;
+            Client.field169 = 0;
+            Client.timer.method331(var0);
+            if (var0 != 20) {
                class15.method184(false);
             }
          }
 
-         if(var0 != 20 && var0 != 40 && ClientParameter.__ji_fp != null) {
-            ClientParameter.__ji_fp.close();
-            ClientParameter.__ji_fp = null;
+         if (var0 != 20 && var0 != 40 && ClientParameter.field341 != null) {
+            ClientParameter.field341.close();
+            ClientParameter.field341 = null;
          }
 
-         if(Client.gameState == 25) {
-            Client.__client_gh = 0;
-            Client.__client_fe = 0;
-            Client.__client_fn = 1;
-            Client.__client_fk = 0;
-            Client.__client_gp = 1;
+         if (Client.gameState == 25) {
+            Client.field181 = 0;
+            Client.field177 = 0;
+            Client.field178 = 1;
+            Client.field179 = 0;
+            Client.field180 = 1;
          }
 
-         if(var0 != 5 && var0 != 10) {
-            if(var0 == 20) {
-               class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, true, Client.gameState == 11?4:0);
-            } else if(var0 == 11) {
+         if (var0 != 5 && var0 != 10) {
+            if (var0 == 20) {
+               class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, true, Client.gameState == 11 ? 4 : 0);
+            } else if (var0 == 11) {
                class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, false, 4);
             } else {
                class80.method2015();
@@ -1096,6 +1076,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
          Client.gameState = var0;
       }
+
    }
 
    @ObfuscatedName("kv")
@@ -1104,8 +1085,24 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       garbageValue = "2016931356"
    )
    static String method1060(Widget var0, int var1) {
-      int var3 = class1.getWidgetClickMask(var0);
-      boolean var2 = (var3 >> var1 + 1 & 1) != 0;
-      return !var2 && var0.onOp == null?null:(var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0?var0.actions[var1]:null);
+      int var2 = class1.getWidgetClickMask(var0);
+      boolean var3 = (var2 >> var1 + 1 & 1) != 0;
+      return !var3 && var0.onOp == null ? null : (var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null);
+   }
+
+   static {
+      gameShell = null;
+      field361 = 0;
+      stopTimeMs = 0L;
+      isKilled = false;
+      field363 = 20;
+      field364 = 1;
+      fps = 0;
+      field365 = new long[32];
+      field366 = new long[32];
+      field368 = 500;
+      hasFocus = true;
+      garbageCollectorLastCollectionTime = -1L;
+      garbageCollectorLastCheckTimeMs = -1L;
    }
 }
diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java
index 07f41da157..fc5e9170a5 100644
--- a/runescape-client/src/main/java/GrandExchangeEvent.java
+++ b/runescape-client/src/main/java/GrandExchangeEvent.java
@@ -17,7 +17,7 @@ public class GrandExchangeEvent {
    @ObfuscatedGetter(
       longValue = -6503890758391257651L
    )
-   public final long __f;
+   public final long field370;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lx;"
@@ -37,13 +37,13 @@ public class GrandExchangeEvent {
    GrandExchangeEvent(Buffer var1, byte var2, int var3) {
       this.string1 = var1.readStringCp1252NullTerminated();
       this.string2 = var1.readStringCp1252NullTerminated();
-      this.world = var1.__ag_302();
-      this.__f = var1.readLong();
+      this.world = var1.method43();
+      this.field370 = var1.readLong();
       int var4 = var1.readInt();
       int var5 = var1.readInt();
       this.grandExchangeOffer = new GrandExchangeOffer();
-      this.grandExchangeOffer.__o_9(2);
-      this.grandExchangeOffer.__u_10(var2);
+      this.grandExchangeOffer.method121(2);
+      this.grandExchangeOffer.method122(var2);
       this.grandExchangeOffer.unitPrice = var4;
       this.grandExchangeOffer.totalQuantity = var5;
       this.grandExchangeOffer.currentQuantity = 0;
@@ -56,7 +56,7 @@ public class GrandExchangeEvent {
       signature = "(I)Ljava/lang/String;",
       garbageValue = "1672323214"
    )
-   public String __m_3() {
+   public String method119() {
       return this.string1;
    }
 
@@ -65,7 +65,7 @@ public class GrandExchangeEvent {
       signature = "(I)Ljava/lang/String;",
       garbageValue = "-271438207"
    )
-   public String __f_4() {
+   public String method120() {
       return this.string2;
    }
 
@@ -78,108 +78,108 @@ public class GrandExchangeEvent {
    static void runScript0(ScriptEvent var0, int var1) {
       Object[] var2 = var0.args0;
       Script var3;
-      int var17;
-      if(class12.method162(var0.type0)) {
+      int var4;
+      if (class12.method162(var0.type0)) {
          class15.worldMapEvent = (WorldMapEvent)var2[0];
-         WorldMapElement var4 = ViewportMouse.getWorldMapElement(class15.worldMapEvent.mapElement);
-         var3 = FaceNormal.method3236(var0.type0, var4.__o, var4.category);
+         WorldMapElement var5 = ViewportMouse.getWorldMapElement(class15.worldMapEvent.mapElement);
+         var3 = FaceNormal.method3236(var0.type0, var5.field1020, var5.category);
       } else {
-         var17 = ((Integer)var2[0]).intValue();
-         var3 = SoundSystem.method2451(var17);
+         var4 = (Integer)var2[0];
+         var3 = SoundSystem.method2451(var4);
       }
 
-      if(var3 != null) {
+      if (var3 != null) {
          RouteStrategy.Interpreter_intStackSize = 0;
          Interpreter.Interpreter_stringStackSize = 0;
-         var17 = -1;
-         int[] var5 = var3.opcodes;
+         var4 = -1;
+         int[] var25 = var3.opcodes;
          int[] var6 = var3.intOperands;
          byte var7 = -1;
          Interpreter.Interpreter_frameDepth = 0;
-         Interpreter.__bv_s = false;
+         Interpreter.field423 = false;
 
          try {
-            int var10;
+            int var8;
             try {
                Username.Interpreter_intLocals = new int[var3.localIntCount];
-               int var8 = 0;
-               Interpreter.Interpreter_stringLocals = new String[var3.localStringCount];
                int var9 = 0;
+               Interpreter.Interpreter_stringLocals = new String[var3.localStringCount];
+               int var26 = 0;
 
                int var11;
-               String var18;
-               for(var10 = 1; var10 < var2.length; ++var10) {
-                  if(var2[var10] instanceof Integer) {
-                     var11 = ((Integer)var2[var10]).intValue();
-                     if(var11 == -2147483647) {
+               String var12;
+               for (var8 = 1; var8 < var2.length; ++var8) {
+                  if (var2[var8] instanceof Integer) {
+                     var11 = (Integer)var2[var8];
+                     if (var11 == -2147483647) {
                         var11 = var0.mouseX;
                      }
 
-                     if(var11 == -2147483646) {
+                     if (var11 == -2147483646) {
                         var11 = var0.mouseY;
                      }
 
-                     if(var11 == -2147483645) {
-                        var11 = var0.widget != null?var0.widget.id:-1;
+                     if (var11 == -2147483645) {
+                        var11 = var0.widget != null ? var0.widget.id : -1;
                      }
 
-                     if(var11 == -2147483644) {
+                     if (var11 == -2147483644) {
                         var11 = var0.opIndex;
                      }
 
-                     if(var11 == -2147483643) {
-                        var11 = var0.widget != null?var0.widget.childIndex:-1;
+                     if (var11 == -2147483643) {
+                        var11 = var0.widget != null ? var0.widget.childIndex : -1;
                      }
 
-                     if(var11 == -2147483642) {
-                        var11 = var0.dragTarget != null?var0.dragTarget.id:-1;
+                     if (var11 == -2147483642) {
+                        var11 = var0.dragTarget != null ? var0.dragTarget.id : -1;
                      }
 
-                     if(var11 == -2147483641) {
-                        var11 = var0.dragTarget != null?var0.dragTarget.childIndex:-1;
+                     if (var11 == -2147483641) {
+                        var11 = var0.dragTarget != null ? var0.dragTarget.childIndex : -1;
                      }
 
-                     if(var11 == -2147483640) {
+                     if (var11 == -2147483640) {
                         var11 = var0.keyTyped;
                      }
 
-                     if(var11 == -2147483639) {
+                     if (var11 == -2147483639) {
                         var11 = var0.keyPressed;
                      }
 
-                     Username.Interpreter_intLocals[var8++] = var11;
-                  } else if(var2[var10] instanceof String) {
-                     var18 = (String)var2[var10];
-                     if(var18.equals("event_opbase")) {
-                        var18 = var0.targetName;
+                     Username.Interpreter_intLocals[var9++] = var11;
+                  } else if (var2[var8] instanceof String) {
+                     var12 = (String)var2[var8];
+                     if (var12.equals("event_opbase")) {
+                        var12 = var0.targetName;
                      }
 
-                     Interpreter.Interpreter_stringLocals[var9++] = var18;
+                     Interpreter.Interpreter_stringLocals[var26++] = var12;
                   }
                }
 
-               var10 = 0;
-               Interpreter.__bv_y = var0.__d;
+               var8 = 0;
+               Interpreter.field425 = var0.field772;
 
-               while(true) {
-                  ++var10;
-                  if(var10 > var1) {
+               while (true) {
+                  ++var8;
+                  if (var8 > var1) {
                      throw new RuntimeException();
                   }
 
-                  ++var17;
-                  int var29 = var5[var17];
-                  int var20;
-                  if(var29 >= 100) {
+                  ++var4;
+                  int var13 = var25[var4];
+                  int var14;
+                  if (var13 >= 100) {
                      boolean var32;
-                     if(var3.intOperands[var17] == 1) {
+                     if (var3.intOperands[var4] == 1) {
                         var32 = true;
                      } else {
                         var32 = false;
                      }
 
-                     var20 = class196.method3736(var29, var3, var32);
-                     switch(var20) {
+                     var14 = class196.method3736(var13, var3, var32);
+                     switch(var14) {
                      case 0:
                         return;
                      case 1:
@@ -188,198 +188,198 @@ public class GrandExchangeEvent {
                      case 2:
                         throw new IllegalStateException();
                      }
-                  } else if(var29 == 0) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6[var17];
-                  } else if(var29 == 1) {
-                     var11 = var6[var17];
+                  } else if (var13 == 0) {
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6[var4];
+                  } else if (var13 == 1) {
+                     var11 = var6[var4];
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Varps.Varps_main[var11];
-                  } else if(var29 == 2) {
-                     var11 = var6[var17];
+                  } else if (var13 == 2) {
+                     var11 = var6[var4];
                      Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                      IndexCache.method4703(var11);
-                  } else if(var29 == 3) {
-                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var17];
-                  } else if(var29 == 6) {
-                     var17 += var6[var17];
-                  } else if(var29 == 7) {
+                  } else if (var13 == 3) {
+                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var4];
+                  } else if (var13 == 6) {
+                     var4 += var6[var4];
+                  } else if (var13 == 7) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
-                        var17 += var6[var17];
+                     if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
+                        var4 += var6[var4];
                      }
-                  } else if(var29 == 8) {
+                  } else if (var13 == 8) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
-                        var17 += var6[var17];
+                     if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
+                        var4 += var6[var4];
                      }
-                  } else if(var29 == 9) {
+                  } else if (var13 == 9) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
-                        var17 += var6[var17];
+                     if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
+                        var4 += var6[var4];
                      }
-                  } else if(var29 == 10) {
+                  } else if (var13 == 10) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
-                        var17 += var6[var17];
+                     if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
+                        var4 += var6[var4];
                      }
-                  } else if(var29 == 21) {
-                     if(Interpreter.Interpreter_frameDepth == 0) {
+                  } else if (var13 == 21) {
+                     if (Interpreter.Interpreter_frameDepth == 0) {
                         return;
                      }
 
-                     ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth];
-                     var3 = var34.script;
-                     var5 = var3.opcodes;
+                     ScriptFrame var30 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth];
+                     var3 = var30.script;
+                     var25 = var3.opcodes;
                      var6 = var3.intOperands;
-                     var17 = var34.pc;
-                     Username.Interpreter_intLocals = var34.intLocals;
-                     Interpreter.Interpreter_stringLocals = var34.stringLocals;
-                  } else if(var29 == 25) {
-                     var11 = var6[var17];
+                     var4 = var30.pc;
+                     Username.Interpreter_intLocals = var30.intLocals;
+                     Interpreter.Interpreter_stringLocals = var30.stringLocals;
+                  } else if (var13 == 25) {
+                     var11 = var6[var4];
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection2.getVarbit(var11);
-                  } else if(var29 == 27) {
-                     var11 = var6[var17];
+                  } else if (var13 == 27) {
+                     var11 = var6[var4];
                      class68.method1695(var11, Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-                  } else if(var29 == 31) {
+                  } else if (var13 == 31) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
-                        var17 += var6[var17];
+                     if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
+                        var4 += var6[var4];
                      }
-                  } else if(var29 == 32) {
+                  } else if (var13 == 32) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
-                        var17 += var6[var17];
+                     if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
+                        var4 += var6[var4];
                      }
-                  } else if(var29 == 33) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Username.Interpreter_intLocals[var6[var17]];
-                  } else if(var29 == 34) {
-                     Username.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  } else if(var29 == 35) {
-                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var17]];
-                  } else if(var29 == 36) {
-                     Interpreter.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-                  } else if(var29 == 37) {
-                     var11 = var6[var17];
+                  } else if (var13 == 33) {
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Username.Interpreter_intLocals[var6[var4]];
+                  } else if (var13 == 34) {
+                     Username.Interpreter_intLocals[var6[var4]] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                  } else if (var13 == 35) {
+                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var4]];
+                  } else if (var13 == 36) {
+                     Interpreter.Interpreter_stringLocals[var6[var4]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+                  } else if (var13 == 37) {
+                     var11 = var6[var4];
                      Interpreter.Interpreter_stringStackSize -= var11;
-                     String var31 = class277.method5356(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11);
-                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var31;
-                  } else if(var29 == 38) {
+                     String var29 = class277.method5356(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11);
+                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var29;
+                  } else if (var13 == 38) {
                      --RouteStrategy.Interpreter_intStackSize;
-                  } else if(var29 == 39) {
+                  } else if (var13 == 39) {
                      --Interpreter.Interpreter_stringStackSize;
                   } else {
                      int var15;
-                     if(var29 != 40) {
-                        if(var29 == 42) {
-                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class196.varcs.getInt(var6[var17]);
-                        } else if(var29 == 43) {
-                           class196.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-                        } else if(var29 == 44) {
-                           var11 = var6[var17] >> 16;
-                           var20 = var6[var17] & 65535;
-                           int var21 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                           if(var21 < 0 || var21 > 5000) {
+                     if (var13 != 40) {
+                        if (var13 == 42) {
+                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class196.varcs.getInt(var6[var4]);
+                        } else if (var13 == 43) {
+                           class196.varcs.setInt(var6[var4], Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+                        } else if (var13 == 44) {
+                           var11 = var6[var4] >> 16;
+                           var14 = var6[var4] & 65535;
+                           int var28 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                           if (var28 < 0 || var28 > 5000) {
                               throw new RuntimeException();
                            }
 
-                           Interpreter.Interpreter_arrayLengths[var11] = var21;
-                           byte var22 = -1;
-                           if(var20 == 105) {
-                              var22 = 0;
+                           Interpreter.Interpreter_arrayLengths[var11] = var28;
+                           byte var33 = -1;
+                           if (var14 == 105) {
+                              var33 = 0;
                            }
 
-                           for(var15 = 0; var15 < var21; ++var15) {
-                              Interpreter.Interpreter_arrays[var11][var15] = var22;
+                           for (var15 = 0; var15 < var28; ++var15) {
+                              Interpreter.Interpreter_arrays[var11][var15] = var33;
                            }
-                        } else if(var29 == 45) {
-                           var11 = var6[var17];
-                           var20 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                           if(var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) {
+                        } else if (var13 == 45) {
+                           var11 = var6[var4];
+                           var14 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                           if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var11]) {
                               throw new RuntimeException();
                            }
 
-                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20];
-                        } else if(var29 == 46) {
-                           var11 = var6[var17];
+                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var14];
+                        } else if (var13 == 46) {
+                           var11 = var6[var4];
                            RouteStrategy.Interpreter_intStackSize -= 2;
-                           var20 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                           if(var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) {
+                           var14 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+                           if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var11]) {
                               throw new RuntimeException();
                            }
 
-                           Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                        } else if(var29 == 47) {
-                           var18 = class196.varcs.getStringOld(var6[var17]);
-                           if(var18 == null) {
-                              var18 = "null";
+                           Interpreter.Interpreter_arrays[var11][var14] = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                        } else if (var13 == 47) {
+                           var12 = class196.varcs.getStringOld(var6[var4]);
+                           if (var12 == null) {
+                              var12 = "null";
                            }
 
-                           Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18;
-                        } else if(var29 == 48) {
-                           class196.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
-                        } else if(var29 == 49) {
-                           var18 = class196.varcs.getString(var6[var17]);
-                           Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18;
-                        } else if(var29 == 50) {
-                           class196.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
+                           Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12;
+                        } else if (var13 == 48) {
+                           class196.varcs.setStringOld(var6[var4], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
+                        } else if (var13 == 49) {
+                           var12 = class196.varcs.getString(var6[var4]);
+                           Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12;
+                        } else if (var13 == 50) {
+                           class196.varcs.setString(var6[var4], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
                         } else {
-                           if(var29 != 60) {
+                           if (var13 != 60) {
                               throw new IllegalStateException();
                            }
 
-                           IterableNodeHashTable var33 = var3.switches[var6[var17]];
-                           IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-                           if(var30 != null) {
-                              var17 += var30.integer;
+                           IterableNodeHashTable var27 = var3.switches[var6[var4]];
+                           IntegerNode var31 = (IntegerNode)var27.get((long)Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+                           if (var31 != null) {
+                              var4 += var31.integer;
                            }
                         }
                      } else {
-                        var11 = var6[var17];
-                        Script var12 = SoundSystem.method2451(var11);
-                        int[] var13 = new int[var12.localIntCount];
-                        String[] var14 = new String[var12.localStringCount];
+                        var11 = var6[var4];
+                        Script var16 = SoundSystem.method2451(var11);
+                        int[] var17 = new int[var16.localIntCount];
+                        String[] var18 = new String[var16.localStringCount];
 
-                        for(var15 = 0; var15 < var12.intArgumentCount; ++var15) {
-                           var13[var15] = Interpreter.Interpreter_intStack[var15 + (RouteStrategy.Interpreter_intStackSize - var12.intArgumentCount)];
+                        for (var15 = 0; var15 < var16.intArgumentCount; ++var15) {
+                           var17[var15] = Interpreter.Interpreter_intStack[var15 + (RouteStrategy.Interpreter_intStackSize - var16.intArgumentCount)];
                         }
 
-                        for(var15 = 0; var15 < var12.stringArgumentCount; ++var15) {
-                           var14[var15] = Interpreter.Interpreter_stringStack[var15 + (Interpreter.Interpreter_stringStackSize - var12.stringArgumentCount)];
+                        for (var15 = 0; var15 < var16.stringArgumentCount; ++var15) {
+                           var18[var15] = Interpreter.Interpreter_stringStack[var15 + (Interpreter.Interpreter_stringStackSize - var16.stringArgumentCount)];
                         }
 
-                        RouteStrategy.Interpreter_intStackSize -= var12.intArgumentCount;
-                        Interpreter.Interpreter_stringStackSize -= var12.stringArgumentCount;
+                        RouteStrategy.Interpreter_intStackSize -= var16.intArgumentCount;
+                        Interpreter.Interpreter_stringStackSize -= var16.stringArgumentCount;
                         ScriptFrame var19 = new ScriptFrame();
                         var19.script = var3;
-                        var19.pc = var17;
+                        var19.pc = var4;
                         var19.intLocals = Username.Interpreter_intLocals;
                         var19.stringLocals = Interpreter.Interpreter_stringLocals;
                         Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19;
-                        var3 = var12;
-                        var5 = var12.opcodes;
-                        var6 = var12.intOperands;
-                        var17 = -1;
-                        Username.Interpreter_intLocals = var13;
-                        Interpreter.Interpreter_stringLocals = var14;
+                        var3 = var16;
+                        var25 = var16.opcodes;
+                        var6 = var16.intOperands;
+                        var4 = -1;
+                        Username.Interpreter_intLocals = var17;
+                        Interpreter.Interpreter_stringLocals = var18;
                      }
                   }
                }
-            } catch (Exception var27) {
-               StringBuilder var24 = new StringBuilder(30);
-               var24.append("").append(var3.key).append(" ");
+            } catch (Exception var23) {
+               StringBuilder var10 = new StringBuilder(30);
+               var10.append("").append(var3.key).append(" ");
 
-               for(var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) {
-                  var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" ");
+               for (var8 = Interpreter.Interpreter_frameDepth - 1; var8 >= 0; --var8) {
+                  var10.append("").append(Interpreter.Interpreter_frames[var8].script.key).append(" ");
                }
 
-               var24.append("").append(var7);
-               NpcDefinition.sendStackTrace(var24.toString(), var27);
+               var10.append("").append(var7);
+               NPCDefinition.sendStackTrace(var10.toString(), var23);
             }
          } finally {
-            if(Interpreter.__bv_s) {
-               Interpreter.__bv_t = true;
+            if (Interpreter.field423) {
+               Interpreter.field424 = true;
                WorldMapLabelSize.method198();
-               Interpreter.__bv_t = false;
-               Interpreter.__bv_s = false;
+               Interpreter.field424 = false;
+               Interpreter.field423 = false;
             }
 
          }
@@ -392,9 +392,9 @@ public class GrandExchangeEvent {
       garbageValue = "1404"
    )
    public static int method80(int var0) {
-      long var2 = ViewportMouse.ViewportMouse_entityTags[var0];
-      int var1 = (int)(var2 >>> 14 & 3L);
-      return var1;
+      long var1 = ViewportMouse.ViewportMouse_entityTags[var0];
+      int var3 = (int)(var1 >>> 14 & 3L);
+      return var3;
    }
 
    @ObfuscatedName("w")
@@ -404,7 +404,7 @@ public class GrandExchangeEvent {
    )
    public static int method87(int var0, int var1) {
       int var2;
-      for(var2 = 0; var1 > 0; --var1) {
+      for (var2 = 0; var1 > 0; --var1) {
          var2 = var2 << 1 | var0 & 1;
          var0 >>>= 1;
       }
@@ -420,10 +420,10 @@ public class GrandExchangeEvent {
    static final String method88(int var0) {
       String var1 = Integer.toString(var0);
 
-      for(int var2 = var1.length() - 3; var2 > 0; var2 -= 3) {
+      for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) {
          var1 = var1.substring(0, var2) + "," + var1.substring(var2);
       }
 
-      return var1.length() > 9?" " + BufferedFile.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "</col>":(var1.length() > 6?" " + BufferedFile.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "</col>":" " + BufferedFile.colorStartTag(16776960) + var1 + "</col>");
+      return var1.length() > 9 ? " " + BufferedFile.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M  (" + var1 + ")</col>" : (var1.length() > 6 ? " " + BufferedFile.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K  (" + var1 + ")</col>" : " " + BufferedFile.colorStartTag(16776960) + var1 + "</col>");
    }
 }
diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java
index fba00b388a..78452aadf2 100644
--- a/runescape-client/src/main/java/GrandExchangeEvents.java
+++ b/runescape-client/src/main/java/GrandExchangeEvents.java
@@ -12,18 +12,18 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("GrandExchangeEvents")
 public class GrandExchangeEvents {
    @ObfuscatedName("f")
-   public static Comparator __g_f;
+   public static Comparator field371;
    @ObfuscatedName("q")
-   public static Comparator __g_q;
+   public static Comparator field372;
    @ObfuscatedName("w")
-   public static Comparator __g_w;
+   public static Comparator field373;
    @ObfuscatedName("o")
-   public static Comparator __g_o;
+   public static Comparator field374;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = -1605454211
    )
-   static int __g_z;
+   static int field375;
    @ObfuscatedName("hs")
    @ObfuscatedGetter(
       intValue = 1326137897
@@ -34,32 +34,24 @@ public class GrandExchangeEvents {
    @Export("events")
    public final List events;
 
-   static {
-      __g_f = new class12();
-      new WorldComparator();
-      __g_q = new UnitPriceComparator();
-      __g_w = new class11();
-      __g_o = new TotalQuantityComparator();
-   }
-
    @ObfuscatedSignature(
       signature = "(Lgr;Z)V",
       garbageValue = "1"
    )
    public GrandExchangeEvents(Buffer var1, boolean var2) {
-      int var3 = var1.__ag_302();
+      int var3 = var1.method43();
       boolean var4 = var1.readUnsignedByte() == 1;
       byte var5;
-      if(var4) {
+      if (var4) {
          var5 = 1;
       } else {
          var5 = 0;
       }
 
-      int var6 = var1.__ag_302();
+      int var6 = var1.method43();
       this.events = new ArrayList(var6);
 
-      for(int var7 = 0; var7 < var6; ++var7) {
+      for (int var7 = 0; var7 < var6; ++var7) {
          this.events.add(new GrandExchangeEvent(var1, var5, var3));
       }
 
@@ -72,7 +64,7 @@ public class GrandExchangeEvents {
    )
    @Export("sort")
    public void sort(Comparator var1, boolean var2) {
-      if(var2) {
+      if (var2) {
          Collections.sort(this.events, var1);
       } else {
          Collections.sort(this.events, Collections.reverseOrder(var1));
@@ -87,10 +79,10 @@ public class GrandExchangeEvents {
    )
    @Export("addChatMessage")
    static void addChatMessage(int var0, String var1, String var2, String var3) {
-      ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(Integer.valueOf(var0));
-      if(var4 == null) {
+      ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0);
+      if (var4 == null) {
          var4 = new ChatChannel();
-         Messages.Messages_channels.put(Integer.valueOf(var0), var4);
+         Messages.Messages_channels.put(var0, var4);
       }
 
       Message var5 = var4.addMessage(var0, var1, var2, var3);
@@ -106,7 +98,7 @@ public class GrandExchangeEvents {
    )
    public static void method69() {
       HitSplatDefinition.HitSplatDefinition_cached.clear();
-      HitSplatDefinition.__jm_o.clear();
+      HitSplatDefinition.field385.clear();
       HitSplatDefinition.HitSplatDefinition_cachedFonts.clear();
    }
 
@@ -117,50 +109,50 @@ public class GrandExchangeEvents {
    )
    static int method75(int var0, Script var1, boolean var2) {
       Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-      if(var0 == 2600) {
+      if (var0 == 2600) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollX;
          return 1;
-      } else if(var0 == 2601) {
+      } else if (var0 == 2601) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollY;
          return 1;
-      } else if(var0 == 2602) {
+      } else if (var0 == 2602) {
          Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text;
          return 1;
-      } else if(var0 == 2603) {
+      } else if (var0 == 2603) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollWidth;
          return 1;
-      } else if(var0 == 2604) {
+      } else if (var0 == 2604) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollHeight;
          return 1;
-      } else if(var0 == 2605) {
+      } else if (var0 == 2605) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelZoom;
          return 1;
-      } else if(var0 == 2606) {
+      } else if (var0 == 2606) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleX;
          return 1;
-      } else if(var0 == 2607) {
+      } else if (var0 == 2607) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleZ;
          return 1;
-      } else if(var0 == 2608) {
+      } else if (var0 == 2608) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleY;
          return 1;
-      } else if(var0 == 2609) {
+      } else if (var0 == 2609) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.transparency;
          return 1;
-      } else if(var0 == 2610) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__af;
+      } else if (var0 == 2610) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field960;
          return 1;
-      } else if(var0 == 2611) {
+      } else if (var0 == 2611) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color;
          return 1;
-      } else if(var0 == 2612) {
+      } else if (var0 == 2612) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color2;
          return 1;
-      } else if(var0 == 2613) {
+      } else if (var0 == 2613) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal();
          return 1;
-      } else if(var0 == 2614) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__bv?1:0;
+      } else if (var0 == 2614) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field964 ? 1 : 0;
          return 1;
       } else {
          return 2;
@@ -173,8 +165,17 @@ public class GrandExchangeEvents {
       garbageValue = "-635606409"
    )
    static final void method74(int var0, int var1) {
-      if(GroundItemPile.loadWidgetGroup(var0)) {
+      if (GroundItemPile.loadWidgetGroup(var0)) {
          class30.method570(Widget.widgets[var0], var1);
       }
+
+   }
+
+   static {
+      field371 = new class12();
+      new WorldComparator();
+      field372 = new UnitPriceComparator();
+      field373 = new class11();
+      field374 = new TotalQuantityComparator();
    }
 }
diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java
index 07df2e51e1..c98cd110d1 100644
--- a/runescape-client/src/main/java/GrandExchangeOffer.java
+++ b/runescape-client/src/main/java/GrandExchangeOffer.java
@@ -12,7 +12,7 @@ public class GrandExchangeOffer {
    @ObfuscatedGetter(
       intValue = -1286287981
    )
-   static int __x_rg;
+   static int field376;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -812708185
@@ -62,7 +62,7 @@ public class GrandExchangeOffer {
    )
    public GrandExchangeOffer(Buffer var1, boolean var2) {
       this.state = var1.readByte();
-      this.id = var1.__ag_302();
+      this.id = var1.method43();
       this.unitPrice = var1.readInt();
       this.totalQuantity = var1.readInt();
       this.currentQuantity = var1.readInt();
@@ -86,7 +86,7 @@ public class GrandExchangeOffer {
    )
    @Export("type")
    public int type() {
-      return (this.state & 8) == 8?1:0;
+      return (this.state & 8) == 8 ? 1 : 0;
    }
 
    @ObfuscatedName("o")
@@ -94,7 +94,7 @@ public class GrandExchangeOffer {
       signature = "(II)V",
       garbageValue = "1339285061"
    )
-   void __o_9(int var1) {
+   void method121(int var1) {
       this.state &= -8;
       this.state = (byte)(this.state | var1 & 7);
    }
@@ -104,9 +104,9 @@ public class GrandExchangeOffer {
       signature = "(II)V",
       garbageValue = "743094900"
    )
-   void __u_10(int var1) {
+   void method122(int var1) {
       this.state &= -9;
-      if(var1 == 1) {
+      if (var1 == 1) {
          this.state = (byte)(this.state | 8);
       }
 
@@ -120,11 +120,11 @@ public class GrandExchangeOffer {
    static int method105(PacketBuffer var0) {
       int var1 = var0.readBits(2);
       int var2;
-      if(var1 == 0) {
+      if (var1 == 0) {
          var2 = 0;
-      } else if(var1 == 1) {
+      } else if (var1 == 1) {
          var2 = var0.readBits(5);
-      } else if(var1 == 2) {
+      } else if (var1 == 2) {
          var2 = var0.readBits(8);
       } else {
          var2 = var0.readBits(11);
@@ -139,14 +139,14 @@ public class GrandExchangeOffer {
       garbageValue = "50"
    )
    static int method101() {
-      if(Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) {
+      if (Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) {
          int var0 = 0;
 
-         for(int var1 = 0; var1 <= Client.indexCacheLoaderIndex; ++var1) {
-            var0 += ((IndexCacheLoader)Client.indexCacheLoaders.get(var1)).__w;
+         for (int var1 = 0; var1 <= Client.indexCacheLoaderIndex; ++var1) {
+            var0 += ((IndexCacheLoader)Client.indexCacheLoaders.get(var1)).field409;
          }
 
-         return var0 * 10000 / Client.__client_sx;
+         return var0 * 10000 / Client.field140;
       } else {
          return 10000;
       }
@@ -158,19 +158,19 @@ public class GrandExchangeOffer {
       garbageValue = "-304562381"
    )
    static final void method121() {
-      for(int var0 = 0; var0 < Players.Players_count; ++var0) {
+      for (int var0 = 0; var0 < Players.Players_count; ++var0) {
          Player var1 = Client.players[Players.Players_indices[var0]];
          var1.clearIsFriend();
       }
 
       Iterator var2 = Messages.Messages_hashTable.iterator();
 
-      while(var2.hasNext()) {
+      while (var2.hasNext()) {
          Message var3 = (Message)var2.next();
          var3.clearIsFromFriend();
       }
 
-      if(PacketWriter.clanChat != null) {
+      if (PacketWriter.clanChat != null) {
          PacketWriter.clanChat.clearFriends();
       }
 
diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java
index e717317aa6..e6c943d2e2 100644
--- a/runescape-client/src/main/java/GraphicsObject.java
+++ b/runescape-client/src/main/java/GraphicsObject.java
@@ -11,7 +11,7 @@ public final class GraphicsObject extends Entity {
    @ObfuscatedGetter(
       intValue = -1807262579
    )
-   static int __bw_d;
+   static int field377;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "Llq;"
@@ -93,7 +93,7 @@ public final class GraphicsObject extends Entity {
       this.height = var5;
       this.cycleStart = var7 + var6;
       int var8 = class50.getSpotAnimationDefinition(this.id).sequence;
-      if(var8 != -1) {
+      if (var8 != -1) {
          this.isFinished = false;
          this.sequenceDefinition = WorldMapAreaData.getSequenceDefinition(var8);
       } else {
@@ -109,19 +109,19 @@ public final class GraphicsObject extends Entity {
    )
    @Export("advance")
    final void advance(int var1) {
-      if(!this.isFinished) {
+      if (!this.isFinished) {
          this.frameCycle += var1;
 
-         while(this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) {
+         while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) {
             this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame];
             ++this.frame;
-            if(this.frame >= this.sequenceDefinition.frameIds.length) {
+            if (this.frame >= this.sequenceDefinition.frameIds.length) {
                this.isFinished = true;
                break;
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("e")
@@ -133,13 +133,13 @@ public final class GraphicsObject extends Entity {
    protected final Model getModel() {
       SpotAnimationDefinition var1 = class50.getSpotAnimationDefinition(this.id);
       Model var2;
-      if(!this.isFinished) {
+      if (!this.isFinished) {
          var2 = var1.getModel(this.frame);
       } else {
          var2 = var1.getModel(-1);
       }
 
-      return var2 == null?null:var2;
+      return var2 == null ? null : var2;
    }
 
    @ObfuscatedName("x")
diff --git a/runescape-client/src/main/java/GroundItem.java b/runescape-client/src/main/java/GroundItem.java
index 515facdfdb..076a89f0e3 100644
--- a/runescape-client/src/main/java/GroundItem.java
+++ b/runescape-client/src/main/java/GroundItem.java
@@ -48,20 +48,20 @@ public final class GroundItem extends Entity {
       garbageValue = "411352848"
    )
    static void method2095(int var0) {
-      Client.__client_oa = 0L;
-      if(var0 >= 2) {
+      Client.field99 = 0L;
+      if (var0 >= 2) {
          Client.isResizable = true;
       } else {
          Client.isResizable = false;
       }
 
-      if(SpotAnimationDefinition.method4822() == 1) {
+      if (SpotAnimationDefinition.method4822() == 1) {
          TextureProvider.client.setMaxCanvasSize(765, 503);
       } else {
          TextureProvider.client.setMaxCanvasSize(7680, 2160);
       }
 
-      if(Client.gameState >= 25) {
+      if (Client.gameState >= 25) {
          AbstractByteArrayCopier.method4024();
       }
 
diff --git a/runescape-client/src/main/java/GroundItemPile.java b/runescape-client/src/main/java/GroundItemPile.java
index 4b9c5708bd..dbbc9aa6d2 100644
--- a/runescape-client/src/main/java/GroundItemPile.java
+++ b/runescape-client/src/main/java/GroundItemPile.java
@@ -69,27 +69,27 @@ public final class GroundItemPile {
    )
    @Export("loadWidgetGroup")
    public static boolean loadWidgetGroup(int var0) {
-      if(Widget.loadedWidgetGroups[var0]) {
+      if (Widget.loadedWidgetGroups[var0]) {
          return true;
-      } else if(!Widget.Widget_indexCache.tryLoadArchive(var0)) {
+      } else if (!Widget.Widget_indexCache.tryLoadArchive(var0)) {
          return false;
       } else {
-         int var1 = Widget.Widget_indexCache.__s_396(var0);
-         if(var1 == 0) {
+         int var1 = Widget.Widget_indexCache.method4(var0);
+         if (var1 == 0) {
             Widget.loadedWidgetGroups[var0] = true;
             return true;
          } else {
-            if(Widget.widgets[var0] == null) {
+            if (Widget.widgets[var0] == null) {
                Widget.widgets[var0] = new Widget[var1];
             }
 
-            for(int var2 = 0; var2 < var1; ++var2) {
-               if(Widget.widgets[var0][var2] == null) {
+            for (int var2 = 0; var2 < var1; ++var2) {
+               if (Widget.widgets[var0][var2] == null) {
                   byte[] var3 = Widget.Widget_indexCache.takeRecord(var0, var2);
-                  if(var3 != null) {
+                  if (var3 != null) {
                      Widget.widgets[var0][var2] = new Widget();
                      Widget.widgets[var0][var2].id = var2 + (var0 << 16);
-                     if(var3[0] == -1) {
+                     if (var3[0] == -1) {
                         Widget.widgets[var0][var2].decode(new Buffer(var3));
                      } else {
                         Widget.widgets[var0][var2].decodeLegacy(new Buffer(var3));
diff --git a/runescape-client/src/main/java/GzipDecompressor.java b/runescape-client/src/main/java/GzipDecompressor.java
index 26ba4cbf74..2c1a5225b7 100644
--- a/runescape-client/src/main/java/GzipDecompressor.java
+++ b/runescape-client/src/main/java/GzipDecompressor.java
@@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("GzipDecompressor")
 public class GzipDecompressor {
    @ObfuscatedName("ck")
-   public static char __go_ck;
+   public static char field378;
    @ObfuscatedName("m")
    @Export("inflater")
    Inflater inflater;
@@ -31,8 +31,8 @@ public class GzipDecompressor {
    )
    @Export("decompress")
    public void decompress(Buffer var1, byte[] var2) {
-      if(var1.array[var1.index] == 31 && var1.array[var1.index + 1] == -117) {
-         if(this.inflater == null) {
+      if (var1.array[var1.index] == 31 && var1.array[var1.index + 1] == -117) {
+         if (this.inflater == null) {
             this.inflater = new Inflater(true);
          }
 
@@ -56,18 +56,18 @@ public class GzipDecompressor {
       garbageValue = "-1060388349"
    )
    public static StructDefinition method3702(int var0) {
-      StructDefinition var1 = (StructDefinition)StructDefinition.__jq_f.get((long)var0);
-      if(var1 != null) {
+      StructDefinition var1 = (StructDefinition)StructDefinition.field886.get((long)var0);
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = StructDefinition.__jq_m.takeRecord(34, var0);
+         byte[] var2 = StructDefinition.field885.takeRecord(34, var0);
          var1 = new StructDefinition();
-         if(var2 != null) {
+         if (var2 != null) {
             var1.read(new Buffer(var2));
          }
 
          var1.init();
-         StructDefinition.__jq_f.put(var1, (long)var0);
+         StructDefinition.field886.put(var1, (long)var0);
          return var1;
       }
    }
diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java
index 5e59f095ee..30b7bcba53 100644
--- a/runescape-client/src/main/java/HealthBar.java
+++ b/runescape-client/src/main/java/HealthBar.java
@@ -37,30 +37,29 @@ public class HealthBar extends Node {
       HealthBarUpdate var5 = null;
       int var6 = 0;
 
-      for(HealthBarUpdate var7 = (HealthBarUpdate)this.updates.last(); var7 != null; var7 = (HealthBarUpdate)this.updates.previous()) {
+      for (HealthBarUpdate var7 = (HealthBarUpdate)this.updates.last(); var7 != null; var7 = (HealthBarUpdate)this.updates.previous()) {
          ++var6;
-         if(var7.cycle == var1) {
+         if (var7.cycle == var1) {
             var7.set(var1, var2, var3, var4);
             return;
          }
 
-         if(var7.cycle <= var1) {
+         if (var7.cycle <= var1) {
             var5 = var7;
          }
       }
 
-      if(var5 == null) {
-         if(var6 < 4) {
+      if (var5 == null) {
+         if (var6 < 4) {
             this.updates.addLast(new HealthBarUpdate(var1, var2, var3, var4));
          }
-
       } else {
          IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5);
-         if(var6 >= 4) {
+         if (var6 >= 4) {
             this.updates.last().remove();
          }
-
       }
+
    }
 
    @ObfuscatedName("f")
@@ -71,13 +70,13 @@ public class HealthBar extends Node {
    @Export("get")
    HealthBarUpdate get(int var1) {
       HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last();
-      if(var2 != null && var2.cycle <= var1) {
-         for(HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) {
+      if (var2 != null && var2.cycle <= var1) {
+         for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) {
             var2.remove();
             var2 = var3;
          }
 
-         if(this.definition.int5 + var2.cycleOffset + var2.cycle > var1) {
+         if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) {
             return var2;
          } else {
             var2.remove();
@@ -106,64 +105,66 @@ public class HealthBar extends Node {
    @Export("charToByteCp1252")
    public static byte charToByteCp1252(char var0) {
       byte var1;
-      if(var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) {
-         var1 = (byte)var0;
-      } else if(var0 == 8364) {
-         var1 = -128;
-      } else if(var0 == 8218) {
-         var1 = -126;
-      } else if(var0 == 402) {
-         var1 = -125;
-      } else if(var0 == 8222) {
-         var1 = -124;
-      } else if(var0 == 8230) {
-         var1 = -123;
-      } else if(var0 == 8224) {
-         var1 = -122;
-      } else if(var0 == 8225) {
-         var1 = -121;
-      } else if(var0 == 710) {
-         var1 = -120;
-      } else if(var0 == 8240) {
-         var1 = -119;
-      } else if(var0 == 352) {
-         var1 = -118;
-      } else if(var0 == 8249) {
-         var1 = -117;
-      } else if(var0 == 338) {
-         var1 = -116;
-      } else if(var0 == 381) {
-         var1 = -114;
-      } else if(var0 == 8216) {
-         var1 = -111;
-      } else if(var0 == 8217) {
-         var1 = -110;
-      } else if(var0 == 8220) {
-         var1 = -109;
-      } else if(var0 == 8221) {
-         var1 = -108;
-      } else if(var0 == 8226) {
-         var1 = -107;
-      } else if(var0 == 8211) {
-         var1 = -106;
-      } else if(var0 == 8212) {
-         var1 = -105;
-      } else if(var0 == 732) {
-         var1 = -104;
-      } else if(var0 == 8482) {
-         var1 = -103;
-      } else if(var0 == 353) {
-         var1 = -102;
-      } else if(var0 == 8250) {
-         var1 = -101;
-      } else if(var0 == 339) {
-         var1 = -100;
-      } else if(var0 == 382) {
-         var1 = -98;
-      } else if(var0 == 376) {
-         var1 = -97;
+      if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) {
+         if (var0 == 8364) {
+            var1 = -128;
+         } else if (var0 == 8218) {
+            var1 = -126;
+         } else if (var0 == 402) {
+            var1 = -125;
+         } else if (var0 == 8222) {
+            var1 = -124;
+         } else if (var0 == 8230) {
+            var1 = -123;
+         } else if (var0 == 8224) {
+            var1 = -122;
+         } else if (var0 == 8225) {
+            var1 = -121;
+         } else if (var0 == 710) {
+            var1 = -120;
+         } else if (var0 == 8240) {
+            var1 = -119;
+         } else if (var0 == 352) {
+            var1 = -118;
+         } else if (var0 == 8249) {
+            var1 = -117;
+         } else if (var0 == 338) {
+            var1 = -116;
+         } else if (var0 == 381) {
+            var1 = -114;
+         } else if (var0 == 8216) {
+            var1 = -111;
+         } else if (var0 == 8217) {
+            var1 = -110;
+         } else if (var0 == 8220) {
+            var1 = -109;
+         } else if (var0 == 8221) {
+            var1 = -108;
+         } else if (var0 == 8226) {
+            var1 = -107;
+         } else if (var0 == 8211) {
+            var1 = -106;
+         } else if (var0 == 8212) {
+            var1 = -105;
+         } else if (var0 == 732) {
+            var1 = -104;
+         } else if (var0 == 8482) {
+            var1 = -103;
+         } else if (var0 == 353) {
+            var1 = -102;
+         } else if (var0 == 8250) {
+            var1 = -101;
+         } else if (var0 == 339) {
+            var1 = -100;
+         } else if (var0 == 382) {
+            var1 = -98;
+         } else if (var0 == 376) {
+            var1 = -97;
+         } else {
+            var1 = 63;
+         }
       } else {
-         var1 = 63;
+         var1 = (byte)var0;
       }
 
       return var1;
@@ -175,9 +176,9 @@ public class HealthBar extends Node {
       garbageValue = "-1326999134"
    )
    static void method1994(int var0, int var1) {
-      if(Client.__client_qf != 0 && var0 != -1) {
-         Login.method2076(Login.indexCache11, var0, 0, Client.__client_qf, false);
-         Client.__client_qq = true;
+      if (Client.field128 != 0 && var0 != -1) {
+         Login.method2076(Login.indexCache11, var0, 0, Client.field128, false);
+         Client.field107 = true;
       }
 
    }
diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java
index b147b45c00..a898b9a8d2 100644
--- a/runescape-client/src/main/java/HealthBarDefinition.java
+++ b/runescape-client/src/main/java/HealthBarDefinition.java
@@ -11,12 +11,12 @@ public class HealthBarDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __ii_m;
+   public static AbstractIndexCache field379;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __ii_f;
+   public static AbstractIndexCache field380;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -39,7 +39,7 @@ public class HealthBarDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = 1515955705
    )
-   public int __o;
+   public int field381;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = 390656615
@@ -95,11 +95,6 @@ public class HealthBarDefinition extends DualNode {
    @Export("widthPadding")
    public int widthPadding;
 
-   static {
-      HealthBarDefinition_cached = new EvictingDualNodeHashTable(64);
-      HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64);
-   }
-
    public HealthBarDefinition() {
       this.int1 = 255;
       this.int2 = 255;
@@ -119,9 +114,9 @@ public class HealthBarDefinition extends DualNode {
    )
    @Export("read")
    public void read(Buffer var1) {
-      while(true) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
@@ -136,27 +131,27 @@ public class HealthBarDefinition extends DualNode {
    )
    @Export("readNext")
    void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         var1.__ag_302();
-      } else if(var2 == 2) {
+      if (var2 == 1) {
+         var1.method43();
+      } else if (var2 == 2) {
          this.int1 = var1.readUnsignedByte();
-      } else if(var2 == 3) {
+      } else if (var2 == 3) {
          this.int2 = var1.readUnsignedByte();
-      } else if(var2 == 4) {
+      } else if (var2 == 4) {
          this.int3 = 0;
-      } else if(var2 == 5) {
-         this.int5 = var1.__ag_302();
-      } else if(var2 == 6) {
+      } else if (var2 == 5) {
+         this.int5 = var1.method43();
+      } else if (var2 == 6) {
          var1.readUnsignedByte();
-      } else if(var2 == 7) {
-         this.spriteId1 = var1.__ap_310();
-      } else if(var2 == 8) {
-         this.spriteId2 = var1.__ap_310();
-      } else if(var2 == 11) {
-         this.int3 = var1.__ag_302();
-      } else if(var2 == 14) {
+      } else if (var2 == 7) {
+         this.spriteId1 = var1.method51();
+      } else if (var2 == 8) {
+         this.spriteId2 = var1.method51();
+      } else if (var2 == 11) {
+         this.int3 = var1.method43();
+      } else if (var2 == 14) {
          this.width = var1.readUnsignedByte();
-      } else if(var2 == 15) {
+      } else if (var2 == 15) {
          this.widthPadding = var1.readUnsignedByte();
       }
 
@@ -169,15 +164,15 @@ public class HealthBarDefinition extends DualNode {
    )
    @Export("getSprite1")
    public Sprite getSprite1() {
-      if(this.spriteId1 < 0) {
+      if (this.spriteId1 < 0) {
          return null;
       } else {
          Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.spriteId1);
-         if(var1 != null) {
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = class322.readSprite(__ii_f, this.spriteId1, 0);
-            if(var1 != null) {
+            var1 = class322.readSprite(field380, this.spriteId1, 0);
+            if (var1 != null) {
                HealthBarDefinition_cachedSprites.put(var1, (long)this.spriteId1);
             }
 
@@ -193,15 +188,15 @@ public class HealthBarDefinition extends DualNode {
    )
    @Export("getSprite2")
    public Sprite getSprite2() {
-      if(this.spriteId2 < 0) {
+      if (this.spriteId2 < 0) {
          return null;
       } else {
          Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.spriteId2);
-         if(var1 != null) {
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = class322.readSprite(__ii_f, this.spriteId2, 0);
-            if(var1 != null) {
+            var1 = class322.readSprite(field380, this.spriteId2, 0);
+            if (var1 != null) {
                HealthBarDefinition_cachedSprites.put(var1, (long)this.spriteId2);
             }
 
@@ -209,4 +204,9 @@ public class HealthBarDefinition extends DualNode {
          }
       }
    }
+
+   static {
+      HealthBarDefinition_cached = new EvictingDualNodeHashTable(64);
+      HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java
index 4970ba4bd4..0cab72dbf6 100644
--- a/runescape-client/src/main/java/HealthBarUpdate.java
+++ b/runescape-client/src/main/java/HealthBarUpdate.java
@@ -61,34 +61,34 @@ public class HealthBarUpdate extends Node {
       garbageValue = "342552136"
    )
    public static String method1722(CharSequence var0) {
-      long var3 = 0L;
-      int var5 = var0.length();
+      long var1 = 0L;
+      int var3 = var0.length();
 
-      for(int var6 = 0; var6 < var5; ++var6) {
-         var3 *= 37L;
-         char var7 = var0.charAt(var6);
-         if(var7 >= 'A' && var7 <= 'Z') {
-            var3 += (long)(var7 + 1 - 65);
-         } else if(var7 >= 'a' && var7 <= 'z') {
-            var3 += (long)(var7 + 1 - 97);
-         } else if(var7 >= '0' && var7 <= '9') {
-            var3 += (long)(var7 + 27 - 48);
+      for (int var4 = 0; var4 < var3; ++var4) {
+         var1 *= 37L;
+         char var5 = var0.charAt(var4);
+         if (var5 >= 'A' && var5 <= 'Z') {
+            var1 += (long)(var5 + 1 - 65);
+         } else if (var5 >= 'a' && var5 <= 'z') {
+            var1 += (long)(var5 + 1 - 97);
+         } else if (var5 >= '0' && var5 <= '9') {
+            var1 += (long)(var5 + 27 - 48);
          }
 
-         if(var3 >= 177917621779460413L) {
+         if (var1 >= 177917621779460413L) {
             break;
          }
       }
 
-      while(0L == var3 % 37L && var3 != 0L) {
-         var3 /= 37L;
+      while (0L == var1 % 37L && var1 != 0L) {
+         var1 /= 37L;
       }
 
-      String var8 = Clock.method3534(var3);
-      if(var8 == null) {
-         var8 = "";
+      String var6 = Clock.method3534(var1);
+      if (var6 == null) {
+         var6 = "";
       }
 
-      return var8;
+      return var6;
    }
 }
diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java
index 961a1c899c..a31e8cb465 100644
--- a/runescape-client/src/main/java/HitSplatDefinition.java
+++ b/runescape-client/src/main/java/HitSplatDefinition.java
@@ -11,17 +11,17 @@ public class HitSplatDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   static AbstractIndexCache __jm_m;
+   static AbstractIndexCache field382;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   static AbstractIndexCache __jm_f;
+   static AbstractIndexCache field383;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   static AbstractIndexCache __jm_q;
+   static AbstractIndexCache field384;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -32,7 +32,7 @@ public class HitSplatDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   static EvictingDualNodeHashTable __jm_o;
+   static EvictingDualNodeHashTable field385;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -49,59 +49,59 @@ public class HitSplatDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = -1151968735
    )
-   public int __n;
+   public int field386;
    @ObfuscatedName("i")
    @ObfuscatedGetter(
       intValue = -102270561
    )
-   public int __i;
+   public int field387;
    @ObfuscatedName("a")
    @ObfuscatedGetter(
       intValue = -1533306389
    )
-   int __a;
+   int field388;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = -1677628889
    )
-   int __z;
+   int field389;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = 1683792491
    )
-   int __j;
+   int field390;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = 1845590719
    )
-   int __s;
+   int field391;
    @ObfuscatedName("t")
    @ObfuscatedGetter(
       intValue = -389283589
    )
-   public int __t;
+   public int field392;
    @ObfuscatedName("y")
    @ObfuscatedGetter(
       intValue = 1751286975
    )
-   public int __y;
+   public int field393;
    @ObfuscatedName("h")
    @ObfuscatedGetter(
       intValue = 199815415
    )
-   public int __h;
+   public int field394;
    @ObfuscatedName("b")
-   String __b;
+   String field395;
    @ObfuscatedName("c")
    @ObfuscatedGetter(
       intValue = 1003116765
    )
-   public int __c;
+   public int field396;
    @ObfuscatedName("r")
    @ObfuscatedGetter(
       intValue = 1498880475
    )
-   public int __r;
+   public int field397;
    @ObfuscatedName("p")
    @Export("transforms")
    public int[] transforms;
@@ -118,26 +118,20 @@ public class HitSplatDefinition extends DualNode {
    @Export("transformVarp")
    int transformVarp;
 
-   static {
-      HitSplatDefinition_cached = new EvictingDualNodeHashTable(64);
-      __jm_o = new EvictingDualNodeHashTable(64);
-      HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
-   }
-
    HitSplatDefinition() {
       this.fontId = -1;
-      this.__n = 16777215;
-      this.__i = 70;
-      this.__a = -1;
-      this.__z = -1;
-      this.__j = -1;
-      this.__s = -1;
-      this.__t = 0;
-      this.__y = 0;
-      this.__h = -1;
-      this.__b = "";
-      this.__c = -1;
-      this.__r = 0;
+      this.field386 = 16777215;
+      this.field387 = 70;
+      this.field388 = -1;
+      this.field389 = -1;
+      this.field390 = -1;
+      this.field391 = -1;
+      this.field392 = 0;
+      this.field393 = 0;
+      this.field394 = -1;
+      this.field395 = "";
+      this.field396 = -1;
+      this.field397 = 0;
       this.transformVarbit = -1;
       this.transformVarp = -1;
    }
@@ -149,9 +143,9 @@ public class HitSplatDefinition extends DualNode {
    )
    @Export("read")
    void read(Buffer var1) {
-      while(true) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
@@ -166,49 +160,49 @@ public class HitSplatDefinition extends DualNode {
    )
    @Export("readNext")
    void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         this.fontId = var1.__ap_310();
-      } else if(var2 == 2) {
-         this.__n = var1.readMedium();
-      } else if(var2 == 3) {
-         this.__a = var1.__ap_310();
-      } else if(var2 == 4) {
-         this.__j = var1.__ap_310();
-      } else if(var2 == 5) {
-         this.__z = var1.__ap_310();
-      } else if(var2 == 6) {
-         this.__s = var1.__ap_310();
-      } else if(var2 == 7) {
-         this.__t = var1.__aq_303();
-      } else if(var2 == 8) {
-         this.__b = var1.readStringCp1252NullCircumfixed();
-      } else if(var2 == 9) {
-         this.__i = var1.__ag_302();
-      } else if(var2 == 10) {
-         this.__y = var1.__aq_303();
-      } else if(var2 == 11) {
-         this.__h = 0;
-      } else if(var2 == 12) {
-         this.__c = var1.readUnsignedByte();
-      } else if(var2 == 13) {
-         this.__r = var1.__aq_303();
-      } else if(var2 == 14) {
-         this.__h = var1.__ag_302();
-      } else if(var2 == 17 || var2 == 18) {
-         this.transformVarbit = var1.__ag_302();
-         if(this.transformVarbit == 65535) {
+      if (var2 == 1) {
+         this.fontId = var1.method51();
+      } else if (var2 == 2) {
+         this.field386 = var1.readMedium();
+      } else if (var2 == 3) {
+         this.field388 = var1.method51();
+      } else if (var2 == 4) {
+         this.field390 = var1.method51();
+      } else if (var2 == 5) {
+         this.field389 = var1.method51();
+      } else if (var2 == 6) {
+         this.field391 = var1.method51();
+      } else if (var2 == 7) {
+         this.field392 = var1.method44();
+      } else if (var2 == 8) {
+         this.field395 = var1.readStringCp1252NullCircumfixed();
+      } else if (var2 == 9) {
+         this.field387 = var1.method43();
+      } else if (var2 == 10) {
+         this.field393 = var1.method44();
+      } else if (var2 == 11) {
+         this.field394 = 0;
+      } else if (var2 == 12) {
+         this.field396 = var1.readUnsignedByte();
+      } else if (var2 == 13) {
+         this.field397 = var1.method44();
+      } else if (var2 == 14) {
+         this.field394 = var1.method43();
+      } else if (var2 == 17 || var2 == 18) {
+         this.transformVarbit = var1.method43();
+         if (this.transformVarbit == 65535) {
             this.transformVarbit = -1;
          }
 
-         this.transformVarp = var1.__ag_302();
-         if(this.transformVarp == 65535) {
+         this.transformVarp = var1.method43();
+         if (this.transformVarp == 65535) {
             this.transformVarp = -1;
          }
 
          int var3 = -1;
-         if(var2 == 18) {
-            var3 = var1.__ag_302();
-            if(var3 == 65535) {
+         if (var2 == 18) {
+            var3 = var1.method43();
+            if (var3 == 65535) {
                var3 = -1;
             }
          }
@@ -216,9 +210,9 @@ public class HitSplatDefinition extends DualNode {
          int var4 = var1.readUnsignedByte();
          this.transforms = new int[var4 + 2];
 
-         for(int var5 = 0; var5 <= var4; ++var5) {
-            this.transforms[var5] = var1.__ag_302();
-            if(this.transforms[var5] == 65535) {
+         for (int var5 = 0; var5 <= var4; ++var5) {
+            this.transforms[var5] = var1.method43();
+            if (this.transforms[var5] == 65535) {
                this.transforms[var5] = -1;
             }
          }
@@ -236,20 +230,20 @@ public class HitSplatDefinition extends DualNode {
    @Export("transform")
    public final HitSplatDefinition transform() {
       int var1 = -1;
-      if(this.transformVarbit != -1) {
+      if (this.transformVarbit != -1) {
          var1 = WorldMapSection2.getVarbit(this.transformVarbit);
-      } else if(this.transformVarp != -1) {
+      } else if (this.transformVarp != -1) {
          var1 = Varps.Varps_main[this.transformVarp];
       }
 
       int var2;
-      if(var1 >= 0 && var1 < this.transforms.length - 1) {
+      if (var1 >= 0 && var1 < this.transforms.length - 1) {
          var2 = this.transforms[var1];
       } else {
          var2 = this.transforms[this.transforms.length - 1];
       }
 
-      return var2 != -1? LoginScreenAnimation.getHitSplatDefinition(var2):null;
+      return var2 != -1 ? LoginScreenAnimation.getHitSplatDefinition(var2) : null;
    }
 
    @ObfuscatedName("u")
@@ -259,11 +253,11 @@ public class HitSplatDefinition extends DualNode {
    )
    @Export("getString")
    public String getString(int var1) {
-      String var2 = this.__b;
+      String var2 = this.field395;
 
-      while(true) {
+      while (true) {
          int var3 = var2.indexOf("%1");
-         if(var3 < 0) {
+         if (var3 < 0) {
             return var2;
          }
 
@@ -276,17 +270,17 @@ public class HitSplatDefinition extends DualNode {
       signature = "(I)Lln;",
       garbageValue = "-1692599381"
    )
-   public Sprite __g_417() {
-      if(this.__a < 0) {
+   public Sprite method123() {
+      if (this.field388 < 0) {
          return null;
       } else {
-         Sprite var1 = (Sprite)__jm_o.get((long)this.__a);
-         if(var1 != null) {
+         Sprite var1 = (Sprite)field385.get((long)this.field388);
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = class322.readSprite(__jm_f, this.__a, 0);
-            if(var1 != null) {
-               __jm_o.put(var1, (long)this.__a);
+            var1 = class322.readSprite(field383, this.field388, 0);
+            if (var1 != null) {
+               field385.put(var1, (long)this.field388);
             }
 
             return var1;
@@ -299,17 +293,17 @@ public class HitSplatDefinition extends DualNode {
       signature = "(B)Lln;",
       garbageValue = "-15"
    )
-   public Sprite __l_418() {
-      if(this.__z < 0) {
+   public Sprite method124() {
+      if (this.field389 < 0) {
          return null;
       } else {
-         Sprite var1 = (Sprite)__jm_o.get((long)this.__z);
-         if(var1 != null) {
+         Sprite var1 = (Sprite)field385.get((long)this.field389);
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = class322.readSprite(__jm_f, this.__z, 0);
-            if(var1 != null) {
-               __jm_o.put(var1, (long)this.__z);
+            var1 = class322.readSprite(field383, this.field389, 0);
+            if (var1 != null) {
+               field385.put(var1, (long)this.field389);
             }
 
             return var1;
@@ -322,17 +316,17 @@ public class HitSplatDefinition extends DualNode {
       signature = "(B)Lln;",
       garbageValue = "-49"
    )
-   public Sprite __e_419() {
-      if(this.__j < 0) {
+   public Sprite method125() {
+      if (this.field390 < 0) {
          return null;
       } else {
-         Sprite var1 = (Sprite)__jm_o.get((long)this.__j);
-         if(var1 != null) {
+         Sprite var1 = (Sprite)field385.get((long)this.field390);
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = class322.readSprite(__jm_f, this.__j, 0);
-            if(var1 != null) {
-               __jm_o.put(var1, (long)this.__j);
+            var1 = class322.readSprite(field383, this.field390, 0);
+            if (var1 != null) {
+               field385.put(var1, (long)this.field390);
             }
 
             return var1;
@@ -345,17 +339,17 @@ public class HitSplatDefinition extends DualNode {
       signature = "(I)Lln;",
       garbageValue = "393569067"
    )
-   public Sprite __x_420() {
-      if(this.__s < 0) {
+   public Sprite method126() {
+      if (this.field391 < 0) {
          return null;
       } else {
-         Sprite var1 = (Sprite)__jm_o.get((long)this.__s);
-         if(var1 != null) {
+         Sprite var1 = (Sprite)field385.get((long)this.field391);
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = class322.readSprite(__jm_f, this.__s, 0);
-            if(var1 != null) {
-               __jm_o.put(var1, (long)this.__s);
+            var1 = class322.readSprite(field383, this.field391, 0);
+            if (var1 != null) {
+               field385.put(var1, (long)this.field391);
             }
 
             return var1;
@@ -370,15 +364,15 @@ public class HitSplatDefinition extends DualNode {
    )
    @Export("getFont")
    public Font getFont() {
-      if(this.fontId == -1) {
+      if (this.fontId == -1) {
          return null;
       } else {
          Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId);
-         if(var1 != null) {
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = SpriteIds.method5823(__jm_f, __jm_q, this.fontId, 0);
-            if(var1 != null) {
+            var1 = SpriteIds.method5823(field383, field384, this.fontId, 0);
+            if (var1 != null) {
                HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId);
             }
 
@@ -391,4 +385,10 @@ public class HitSplatDefinition extends DualNode {
    public static int method4972(long var0) {
       return (int)(var0 >>> 17 & 4294967295L);
    }
+
+   static {
+      HitSplatDefinition_cached = new EvictingDualNodeHashTable(64);
+      field385 = new EvictingDualNodeHashTable(64);
+      HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
+   }
 }
diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java
index cf37ace67f..b8de92c5b8 100644
--- a/runescape-client/src/main/java/Huffman.java
+++ b/runescape-client/src/main/java/Huffman.java
@@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Huffman")
 public class Huffman {
    @ObfuscatedName("e")
-   static int[][] __gd_e;
+   static int[][] field398;
    @ObfuscatedName("p")
    @ObfuscatedGetter(
       intValue = -842662451
@@ -16,43 +16,43 @@ public class Huffman {
    @Export("canvasHeight")
    public static int canvasHeight;
    @ObfuscatedName("m")
-   int[] __m;
+   int[] field399;
    @ObfuscatedName("f")
-   byte[] __f;
+   byte[] field400;
    @ObfuscatedName("q")
-   int[] __q;
+   int[] field401;
 
    public Huffman(byte[] var1) {
       int var2 = var1.length;
-      this.__m = new int[var2];
-      this.__f = var1;
+      this.field399 = new int[var2];
+      this.field400 = var1;
       int[] var3 = new int[33];
-      this.__q = new int[8];
+      this.field401 = new int[8];
       int var4 = 0;
 
-      for(int var5 = 0; var5 < var2; ++var5) {
+      for (int var5 = 0; var5 < var2; ++var5) {
          byte var6 = var1[var5];
-         if(var6 != 0) {
+         if (var6 != 0) {
             int var7 = 1 << 32 - var6;
             int var8 = var3[var6];
-            this.__m[var5] = var8;
+            this.field399[var5] = var8;
             int var9;
             int var10;
             int var11;
             int var12;
-            if((var8 & var7) != 0) {
+            if ((var8 & var7) != 0) {
                var9 = var3[var6 - 1];
             } else {
                var9 = var8 | var7;
 
-               for(var10 = var6 - 1; var10 >= 1; --var10) {
+               for (var10 = var6 - 1; var10 >= 1; --var10) {
                   var11 = var3[var10];
-                  if(var11 != var8) {
+                  if (var11 != var8) {
                      break;
                   }
 
                   var12 = 1 << 32 - var10;
-                  if((var11 & var12) != 0) {
+                  if ((var11 & var12) != 0) {
                      var3[var10] = var3[var10 - 1];
                      break;
                   }
@@ -63,41 +63,41 @@ public class Huffman {
 
             var3[var6] = var9;
 
-            for(var10 = var6 + 1; var10 <= 32; ++var10) {
-               if(var8 == var3[var10]) {
+            for (var10 = var6 + 1; var10 <= 32; ++var10) {
+               if (var8 == var3[var10]) {
                   var3[var10] = var9;
                }
             }
 
             var10 = 0;
 
-            for(var11 = 0; var11 < var6; ++var11) {
+            for (var11 = 0; var11 < var6; ++var11) {
                var12 = Integer.MIN_VALUE >>> var11;
-               if((var8 & var12) != 0) {
-                  if(this.__q[var10] == 0) {
-                     this.__q[var10] = var4;
+               if ((var8 & var12) != 0) {
+                  if (this.field401[var10] == 0) {
+                     this.field401[var10] = var4;
                   }
 
-                  var10 = this.__q[var10];
+                  var10 = this.field401[var10];
                } else {
                   ++var10;
                }
 
-               if(var10 >= this.__q.length) {
-                  int[] var13 = new int[this.__q.length * 2];
+               if (var10 >= this.field401.length) {
+                  int[] var13 = new int[this.field401.length * 2];
 
-                  for(int var14 = 0; var14 < this.__q.length; ++var14) {
-                     var13[var14] = this.__q[var14];
+                  for (int var14 = 0; var14 < this.field401.length; ++var14) {
+                     var13[var14] = this.field401[var14];
                   }
 
-                  this.__q = var13;
+                  this.field401 = var13;
                }
 
                var12 >>>= 1;
             }
 
-            this.__q[var10] = ~var5;
-            if(var10 >= var4) {
+            this.field401[var10] = ~var5;
+            if (var10 >= var4) {
                var4 = var10 + 1;
             }
          }
@@ -110,15 +110,15 @@ public class Huffman {
       signature = "([BII[BIB)I",
       garbageValue = "64"
    )
-   public int __m_293(byte[] var1, int var2, int var3, byte[] var4, int var5) {
+   public int method127(byte[] var1, int var2, int var3, byte[] var4, int var5) {
       int var6 = 0;
       int var7 = var5 << 3;
 
-      for(var3 += var2; var2 < var3; ++var2) {
+      for (var3 += var2; var2 < var3; ++var2) {
          int var8 = var1[var2] & 255;
-         int var9 = this.__m[var8];
-         byte var10 = this.__f[var8];
-         if(var10 == 0) {
+         int var9 = this.field399[var8];
+         byte var10 = this.field400[var8];
+         if (var10 == 0) {
             throw new RuntimeException("");
          }
 
@@ -128,19 +128,19 @@ public class Huffman {
          int var13 = (var10 + var12 - 1 >> 3) + var11;
          var12 += 24;
          var4[var11] = (byte)(var6 |= var9 >>> var12);
-         if(var11 < var13) {
+         if (var11 < var13) {
             ++var11;
             var12 -= 8;
             var4[var11] = (byte)(var6 = var9 >>> var12);
-            if(var11 < var13) {
+            if (var11 < var13) {
                ++var11;
                var12 -= 8;
                var4[var11] = (byte)(var6 = var9 >>> var12);
-               if(var11 < var13) {
+               if (var11 < var13) {
                   ++var11;
                   var12 -= 8;
                   var4[var11] = (byte)(var6 = var9 >>> var12);
-                  if(var11 < var13) {
+                  if (var11 < var13) {
                      ++var11;
                      var12 -= 8;
                      var4[var11] = (byte)(var6 = var9 << -var12);
@@ -160,131 +160,131 @@ public class Huffman {
       signature = "([BI[BIII)I",
       garbageValue = "-2094399899"
    )
-   public int __f_294(byte[] var1, int var2, byte[] var3, int var4, int var5) {
-      if(var5 == 0) {
+   public int method128(byte[] var1, int var2, byte[] var3, int var4, int var5) {
+      if (var5 == 0) {
          return 0;
       } else {
          int var6 = 0;
          var5 += var4;
          int var7 = var2;
 
-         while(true) {
+         while (true) {
             byte var8 = var1[var7];
-            if(var8 < 0) {
-               var6 = this.__q[var6];
+            if (var8 < 0) {
+               var6 = this.field401[var6];
             } else {
                ++var6;
             }
 
             int var9;
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.field401[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
                var6 = 0;
             }
 
-            if((var8 & 64) != 0) {
-               var6 = this.__q[var6];
+            if ((var8 & 64) != 0) {
+               var6 = this.field401[var6];
             } else {
                ++var6;
             }
 
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.field401[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
                var6 = 0;
             }
 
-            if((var8 & 32) != 0) {
-               var6 = this.__q[var6];
+            if ((var8 & 32) != 0) {
+               var6 = this.field401[var6];
             } else {
                ++var6;
             }
 
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.field401[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
                var6 = 0;
             }
 
-            if((var8 & 16) != 0) {
-               var6 = this.__q[var6];
+            if ((var8 & 16) != 0) {
+               var6 = this.field401[var6];
             } else {
                ++var6;
             }
 
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.field401[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
                var6 = 0;
             }
 
-            if((var8 & 8) != 0) {
-               var6 = this.__q[var6];
+            if ((var8 & 8) != 0) {
+               var6 = this.field401[var6];
             } else {
                ++var6;
             }
 
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.field401[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
                var6 = 0;
             }
 
-            if((var8 & 4) != 0) {
-               var6 = this.__q[var6];
+            if ((var8 & 4) != 0) {
+               var6 = this.field401[var6];
             } else {
                ++var6;
             }
 
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.field401[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
                var6 = 0;
             }
 
-            if((var8 & 2) != 0) {
-               var6 = this.__q[var6];
+            if ((var8 & 2) != 0) {
+               var6 = this.field401[var6];
             } else {
                ++var6;
             }
 
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.field401[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
                var6 = 0;
             }
 
-            if((var8 & 1) != 0) {
-               var6 = this.__q[var6];
+            if ((var8 & 1) != 0) {
+               var6 = this.field401[var6];
             } else {
                ++var6;
             }
 
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.field401[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
@@ -307,9 +307,9 @@ public class Huffman {
    public static Widget getWidget(int var0) {
       int var1 = var0 >> 16;
       int var2 = var0 & 65535;
-      if(Widget.widgets[var1] == null || Widget.widgets[var1][var2] == null) {
+      if (Widget.widgets[var1] == null || Widget.widgets[var1][var2] == null) {
          boolean var3 = GroundItemPile.loadWidgetGroup(var1);
-         if(!var3) {
+         if (!var3) {
             return null;
          }
       }
diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java
index 3257e5fa90..2ba085647a 100644
--- a/runescape-client/src/main/java/IgnoreList.java
+++ b/runescape-client/src/main/java/IgnoreList.java
@@ -48,19 +48,19 @@ public class IgnoreList extends UserList {
    )
    @Export("read")
    public void read(Buffer var1, int var2) {
-      while(true) {
-         if(var1.index < var2) {
+      while (true) {
+         if (var1.index < var2) {
             int var3 = var1.readUnsignedByte();
             boolean var4 = (var3 & 1) == 1;
             Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
             Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
             var1.readStringCp1252NullTerminated();
-            if(var5 != null && var5.hasCleanName()) {
+            if (var5 != null && var5.hasCleanName()) {
                Ignored var7 = (Ignored)this.getByCurrentUsername(var5);
-               if(var4) {
+               if (var4) {
                   Ignored var8 = (Ignored)this.getByCurrentUsername(var6);
-                  if(var8 != null && var8 != var7) {
-                     if(var7 != null) {
+                  if (var8 != null && var8 != var7) {
+                     if (var7 != null) {
                         this.remove(var8);
                      } else {
                         var7 = var8;
@@ -68,12 +68,12 @@ public class IgnoreList extends UserList {
                   }
                }
 
-               if(var7 != null) {
+               if (var7 != null) {
                   this.changeName(var7, var5, var6);
                   continue;
                }
 
-               if(this.size() < 400) {
+               if (this.size() < 400) {
                   int var9 = this.size();
                   var7 = (Ignored)this.addLast(var5, var6);
                   var7.id = var9;
@@ -94,56 +94,56 @@ public class IgnoreList extends UserList {
       garbageValue = "5"
    )
    static int method5438(CharSequence var0, int var1, boolean var2) {
-      if(var1 >= 2 && var1 <= 36) {
+      if (var1 >= 2 && var1 <= 36) {
          boolean var3 = false;
          boolean var4 = false;
          int var5 = 0;
          int var6 = var0.length();
 
-         for(int var7 = 0; var7 < var6; ++var7) {
+         for (int var7 = 0; var7 < var6; ++var7) {
             char var8 = var0.charAt(var7);
-            if(var7 == 0) {
-               if(var8 == '-') {
+            if (var7 == 0) {
+               if (var8 == '-') {
                   var3 = true;
                   continue;
                }
 
-               if(var8 == '+') {
+               if (var8 == '+') {
                   continue;
                }
             }
 
-            int var10;
-            if(var8 >= '0' && var8 <= '9') {
-               var10 = var8 - '0';
-            } else if(var8 >= 'A' && var8 <= 'Z') {
-               var10 = var8 - '7';
+            int var9;
+            if (var8 >= '0' && var8 <= '9') {
+               var9 = var8 - '0';
+            } else if (var8 >= 'A' && var8 <= 'Z') {
+               var9 = var8 - '7';
             } else {
-               if(var8 < 'a' || var8 > 'z') {
+               if (var8 < 'a' || var8 > 'z') {
                   throw new NumberFormatException();
                }
 
-               var10 = var8 - 'W';
+               var9 = var8 - 'W';
             }
 
-            if(var10 >= var1) {
+            if (var9 >= var1) {
                throw new NumberFormatException();
             }
 
-            if(var3) {
-               var10 = -var10;
+            if (var3) {
+               var9 = -var9;
             }
 
-            int var9 = var10 + var5 * var1;
-            if(var9 / var1 != var5) {
+            int var10 = var9 + var5 * var1;
+            if (var10 / var1 != var5) {
                throw new NumberFormatException();
             }
 
-            var5 = var9;
+            var5 = var10;
             var4 = true;
          }
 
-         if(!var4) {
+         if (!var4) {
             throw new NumberFormatException();
          } else {
             return var5;
diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java
index 87c2827f60..dca7210b00 100644
--- a/runescape-client/src/main/java/Ignored.java
+++ b/runescape-client/src/main/java/Ignored.java
@@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Ignored")
 public class Ignored extends User {
    @ObfuscatedName("at")
-   protected static String __ks_at;
+   protected static String field402;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 344024525
@@ -47,7 +47,7 @@ public class Ignored extends User {
    )
    @Export("queueSoundEffect")
    static void queueSoundEffect(int var0, int var1, int var2) {
-      if(Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) {
+      if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) {
          Client.soundEffectIds[Client.soundEffectCount] = var0;
          Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1;
          Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2;
diff --git a/runescape-client/src/main/java/IndexCache.java b/runescape-client/src/main/java/IndexCache.java
index 6f39f6bf7b..20676bbfbe 100644
--- a/runescape-client/src/main/java/IndexCache.java
+++ b/runescape-client/src/main/java/IndexCache.java
@@ -30,9 +30,9 @@ public class IndexCache extends AbstractIndexCache {
    @Export("index")
    int index;
    @ObfuscatedName("v")
-   volatile boolean __v;
+   volatile boolean field403;
    @ObfuscatedName("ag")
-   boolean __ag;
+   boolean field404;
    @ObfuscatedName("aq")
    @Export("validArchives")
    volatile boolean[] validArchives;
@@ -52,33 +52,29 @@ public class IndexCache extends AbstractIndexCache {
    @ObfuscatedGetter(
       intValue = -1884661133
    )
-   int __ac;
-
-   static {
-      IndexCache_crc = new CRC32();
-   }
+   int field405;
 
    @ObfuscatedSignature(
       signature = "(Lff;Lff;IZZZ)V"
    )
    public IndexCache(IndexStore var1, IndexStore var2, int var3, boolean var4, boolean var5, boolean var6) {
       super(var4, var5);
-      this.__v = false;
-      this.__ag = false;
-      this.__ac = -1;
+      this.field403 = false;
+      this.field404 = false;
+      this.field405 = -1;
       this.indexStore = var1;
       this.referenceStore = var2;
       this.index = var3;
-      this.__ag = var6;
-      int var8 = this.index;
-      if(Players.NetCache_reference != null) {
-         Players.NetCache_reference.index = var8 * 8 + 5;
+      this.field404 = var6;
+      int var7 = this.index;
+      if (Players.NetCache_reference != null) {
+         Players.NetCache_reference.index = var7 * 8 + 5;
+         int var8 = Players.NetCache_reference.readInt();
          int var9 = Players.NetCache_reference.readInt();
-         int var10 = Players.NetCache_reference.readInt();
-         this.loadIndexReference(var9, var10);
+         this.loadIndexReference(var8, var9);
       } else {
          PacketBuffer.requestNetFile((IndexCache)null, 255, 255, 0, (byte)0, true);
-         NetCache.NetCache_indexCaches[var8] = this;
+         NetCache.NetCache_indexCaches[var7] = this;
       }
 
    }
@@ -88,11 +84,11 @@ public class IndexCache extends AbstractIndexCache {
       signature = "(II)V",
       garbageValue = "2102142648"
    )
-   void __f_392(int var1) {
+   void vmethod129(int var1) {
       int var2 = this.index;
       long var3 = (long)((var2 << 16) + var1);
       NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3);
-      if(var5 != null) {
+      if (var5 != null) {
          NetCache.NetCache_pendingWritesQueue.addLast(var5);
       }
 
@@ -105,7 +101,7 @@ public class IndexCache extends AbstractIndexCache {
    )
    @Export("archiveLoadPercent")
    int archiveLoadPercent(int var1) {
-      return super.archives[var1] != null?100:(this.validArchives[var1]?100:class54.method1086(this.index, var1));
+      return super.archives[var1] != null ? 100 : (this.validArchives[var1] ? 100 : class54.method1086(this.index, var1));
    }
 
    @ObfuscatedName("z")
@@ -115,24 +111,24 @@ public class IndexCache extends AbstractIndexCache {
    )
    @Export("loadArchive")
    void loadArchive(int var1) {
-      if(this.indexStore != null && this.validArchives != null && this.validArchives[var1]) {
+      if (this.indexStore != null && this.validArchives != null && this.validArchives[var1]) {
          IndexStore var2 = this.indexStore;
-         byte[] var4 = null;
-         NodeDeque var5 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
+         byte[] var3 = null;
+         NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
          synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) {
-            for(IndexStoreAction var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var6 != null; var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) {
-               if(var6.key == (long)var1 && var2 == var6.indexStore && var6.type == 0) {
-                  var4 = var6.data;
+            for (IndexStoreAction var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var6 != null; var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) {
+               if (var6.key == (long)var1 && var2 == var6.indexStore && var6.type == 0) {
+                  var3 = var6.data;
                   break;
                }
             }
          }
 
-         if(var4 != null) {
-            this.load(var2, var1, var4, true);
+         if (var3 != null) {
+            this.load(var2, var1, var3, true);
          } else {
-            byte[] var9 = var2.read(var1);
-            this.load(var2, var1, var9, true);
+            byte[] var5 = var2.read(var1);
+            this.load(var2, var1, var5, true);
          }
       } else {
          PacketBuffer.requestNetFile(this, this.index, var1, super.archiveCrcs[var1], (byte)2, true);
@@ -145,8 +141,8 @@ public class IndexCache extends AbstractIndexCache {
       signature = "(I)Z",
       garbageValue = "1750279412"
    )
-   public boolean __cx_404() {
-      return this.__v;
+   public boolean method130() {
+      return this.field403;
    }
 
    @ObfuscatedName("ca")
@@ -154,14 +150,14 @@ public class IndexCache extends AbstractIndexCache {
       signature = "(I)I",
       garbageValue = "1671499504"
    )
-   public int __ca_405() {
-      if(this.__v) {
+   public int method131() {
+      if (this.field403) {
          return 100;
-      } else if(super.archives != null) {
+      } else if (super.archives != null) {
          return 99;
       } else {
          int var1 = class54.method1086(255, this.index);
-         if(var1 >= 100) {
+         if (var1 >= 100) {
             var1 = 99;
          }
 
@@ -178,25 +174,25 @@ public class IndexCache extends AbstractIndexCache {
    public void loadIndexReference(int var1, int var2) {
       this.indexReferenceCrc = var1;
       this.indexReferenceVersion = var2;
-      if(this.referenceStore != null) {
+      if (this.referenceStore != null) {
          int var3 = this.index;
          IndexStore var4 = this.referenceStore;
-         byte[] var6 = null;
-         NodeDeque var7 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
+         byte[] var5 = null;
+         NodeDeque var6 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
          synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) {
-            for(IndexStoreAction var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var8 != null; var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) {
-               if(var8.key == (long)var3 && var4 == var8.indexStore && var8.type == 0) {
-                  var6 = var8.data;
+            for (IndexStoreAction var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var8 != null; var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) {
+               if (var8.key == (long)var3 && var4 == var8.indexStore && var8.type == 0) {
+                  var5 = var8.data;
                   break;
                }
             }
          }
 
-         if(var6 != null) {
-            this.load(var4, var3, var6, true);
+         if (var5 != null) {
+            this.load(var4, var3, var5, true);
          } else {
-            byte[] var11 = var4.read(var3);
-            this.load(var4, var3, var11, true);
+            byte[] var7 = var4.read(var3);
+            this.load(var4, var3, var7, true);
          }
       } else {
          PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true);
@@ -211,12 +207,12 @@ public class IndexCache extends AbstractIndexCache {
    )
    @Export("write")
    public void write(int var1, byte[] var2, boolean var3, boolean var4) {
-      if(var3) {
-         if(this.__v) {
+      if (var3) {
+         if (this.field403) {
             throw new RuntimeException();
          }
 
-         if(this.referenceStore != null) {
+         if (this.referenceStore != null) {
             Widget.method4499(this.index, var2, this.referenceStore);
          }
 
@@ -225,12 +221,12 @@ public class IndexCache extends AbstractIndexCache {
       } else {
          var2[var2.length - 2] = (byte)(super.archiveVersions[var1] >> 8);
          var2[var2.length - 1] = (byte)super.archiveVersions[var1];
-         if(this.indexStore != null) {
+         if (this.indexStore != null) {
             Widget.method4499(var1, var2, this.indexStore);
             this.validArchives[var1] = true;
          }
 
-         if(var4) {
+         if (var4) {
             super.archives[var1] = Projectile.byteArrayToObject(var2, false);
          }
       }
@@ -245,75 +241,68 @@ public class IndexCache extends AbstractIndexCache {
    @Export("load")
    void load(IndexStore var1, int var2, byte[] var3, boolean var4) {
       int var5;
-      if(var1 == this.referenceStore) {
-         if(this.__v) {
+      if (var1 == this.referenceStore) {
+         if (this.field403) {
             throw new RuntimeException();
-         }
-
-         if(var3 == null) {
+         } else if (var3 == null) {
             PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true);
-            return;
-         }
+         } else {
+            IndexCache_crc.reset();
+            IndexCache_crc.update(var3, 0, var3.length);
+            var5 = (int)IndexCache_crc.getValue();
+            if (var5 != this.indexReferenceCrc) {
+               PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true);
+            } else {
+               Buffer var9 = new Buffer(Strings.decompressBytes(var3));
+               int var7 = var9.readUnsignedByte();
+               if (var7 != 5 && var7 != 6) {
+                  throw new RuntimeException(var7 + "," + this.index + "," + var2);
+               } else {
+                  int var8 = 0;
+                  if (var7 >= 6) {
+                     var8 = var9.readInt();
+                  }
 
-         IndexCache_crc.reset();
-         IndexCache_crc.update(var3, 0, var3.length);
-         var5 = (int)IndexCache_crc.getValue();
-         if(var5 != this.indexReferenceCrc) {
-            PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true);
-            return;
+                  if (var8 != this.indexReferenceVersion) {
+                     PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true);
+                  } else {
+                     this.setIndexReference(var3);
+                     this.loadAllLocal();
+                  }
+               }
+            }
          }
-
-         Buffer var9 = new Buffer(Strings.decompressBytes(var3));
-         int var7 = var9.readUnsignedByte();
-         if(var7 != 5 && var7 != 6) {
-            throw new RuntimeException(var7 + "," + this.index + "," + var2);
-         }
-
-         int var8 = 0;
-         if(var7 >= 6) {
-            var8 = var9.readInt();
-         }
-
-         if(var8 != this.indexReferenceVersion) {
-            PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true);
-            return;
-         }
-
-         this.setIndexReference(var3);
-         this.loadAllLocal();
       } else {
-         if(!var4 && var2 == this.__ac) {
-            this.__v = true;
+         if (!var4 && var2 == this.field405) {
+            this.field403 = true;
          }
 
-         if(var3 == null || var3.length <= 2) {
+         if (var3 != null && var3.length > 2) {
+            IndexCache_crc.reset();
+            IndexCache_crc.update(var3, 0, var3.length - 2);
+            var5 = (int)IndexCache_crc.getValue();
+            int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255);
+            if (var5 == super.archiveCrcs[var2] && var6 == super.archiveVersions[var2]) {
+               this.validArchives[var2] = true;
+               if (var4) {
+                  super.archives[var2] = Projectile.byteArrayToObject(var3, false);
+               }
+
+            } else {
+               this.validArchives[var2] = false;
+               if (this.field404 || var4) {
+                  PacketBuffer.requestNetFile(this, this.index, var2, super.archiveCrcs[var2], (byte)2, var4);
+               }
+
+            }
+         } else {
             this.validArchives[var2] = false;
-            if(this.__ag || var4) {
+            if (this.field404 || var4) {
                PacketBuffer.requestNetFile(this, this.index, var2, super.archiveCrcs[var2], (byte)2, var4);
             }
 
-            return;
-         }
-
-         IndexCache_crc.reset();
-         IndexCache_crc.update(var3, 0, var3.length - 2);
-         var5 = (int)IndexCache_crc.getValue();
-         int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255);
-         if(var5 != super.archiveCrcs[var2] || var6 != super.archiveVersions[var2]) {
-            this.validArchives[var2] = false;
-            if(this.__ag || var4) {
-               PacketBuffer.requestNetFile(this, this.index, var2, super.archiveCrcs[var2], (byte)2, var4);
-            }
-
-            return;
-         }
-
-         this.validArchives[var2] = true;
-         if(var4) {
-            super.archives[var2] = Projectile.byteArrayToObject(var3, false);
          }
       }
-
    }
 
    @ObfuscatedName("dt")
@@ -326,27 +315,27 @@ public class IndexCache extends AbstractIndexCache {
       this.validArchives = new boolean[super.archives.length];
 
       int var1;
-      for(var1 = 0; var1 < this.validArchives.length; ++var1) {
+      for (var1 = 0; var1 < this.validArchives.length; ++var1) {
          this.validArchives[var1] = false;
       }
 
-      if(this.indexStore == null) {
-         this.__v = true;
+      if (this.indexStore == null) {
+         this.field403 = true;
       } else {
-         this.__ac = -1;
+         this.field405 = -1;
 
-         for(var1 = 0; var1 < this.validArchives.length; ++var1) {
-            if(super.recordCounts[var1] > 0) {
-               Npc.method2009(var1, this.indexStore, this);
-               this.__ac = var1;
+         for (var1 = 0; var1 < this.validArchives.length; ++var1) {
+            if (super.recordCounts[var1] > 0) {
+               NPC.method2009(var1, this.indexStore, this);
+               this.field405 = var1;
             }
          }
 
-         if(this.__ac == -1) {
-            this.__v = true;
+         if (this.field405 == -1) {
+            this.field403 = true;
          }
-
       }
+
    }
 
    @ObfuscatedName("dn")
@@ -354,7 +343,7 @@ public class IndexCache extends AbstractIndexCache {
       signature = "(IB)Z",
       garbageValue = "0"
    )
-   public boolean __dn_407(int var1) {
+   public boolean method132(int var1) {
       return this.validArchives[var1];
    }
 
@@ -363,8 +352,8 @@ public class IndexCache extends AbstractIndexCache {
       signature = "(II)Z",
       garbageValue = "1419648188"
    )
-   public boolean __df_408(int var1) {
-      return this.__j_395(var1) != null;
+   public boolean method133(int var1) {
+      return this.method3(var1) != null;
    }
 
    @ObfuscatedName("da")
@@ -378,14 +367,14 @@ public class IndexCache extends AbstractIndexCache {
       int var2 = 0;
 
       int var3;
-      for(var3 = 0; var3 < super.archives.length; ++var3) {
-         if(super.recordCounts[var3] > 0) {
+      for (var3 = 0; var3 < super.archives.length; ++var3) {
+         if (super.recordCounts[var3] > 0) {
             var1 += 100;
             var2 += this.archiveLoadPercent(var3);
          }
       }
 
-      if(var1 == 0) {
+      if (var1 == 0) {
          return 100;
       } else {
          var3 = var2 * 100 / var1;
@@ -401,32 +390,32 @@ public class IndexCache extends AbstractIndexCache {
    static final void method4703(int var0) {
       class12.method159();
 
-      for(ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) {
-         if(var1.obj != null) {
+      for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) {
+         if (var1.obj != null) {
             var1.set();
          }
       }
 
       int var4 = SecureRandomCallable.method1140(var0).type;
-      if(var4 != 0) {
+      if (var4 != 0) {
          int var2 = Varps.Varps_main[var0];
-         if(var4 == 1) {
-            if(var2 == 1) {
+         if (var4 == 1) {
+            if (var2 == 1) {
                Rasterizer3D.Rasterizer3D_setBrightness(0.9D);
                ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D);
             }
 
-            if(var2 == 2) {
+            if (var2 == 2) {
                Rasterizer3D.Rasterizer3D_setBrightness(0.8D);
                ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D);
             }
 
-            if(var2 == 3) {
+            if (var2 == 3) {
                Rasterizer3D.Rasterizer3D_setBrightness(0.7D);
                ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D);
             }
 
-            if(var2 == 4) {
+            if (var2 == 4) {
                Rasterizer3D.Rasterizer3D_setBrightness(0.6D);
                ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D);
             }
@@ -434,127 +423,131 @@ public class IndexCache extends AbstractIndexCache {
             ObjectDefinition.method5041();
          }
 
-         if(var4 == 3) {
+         if (var4 == 3) {
             short var3 = 0;
-            if(var2 == 0) {
+            if (var2 == 0) {
                var3 = 255;
             }
 
-            if(var2 == 1) {
+            if (var2 == 1) {
                var3 = 192;
             }
 
-            if(var2 == 2) {
+            if (var2 == 2) {
                var3 = 128;
             }
 
-            if(var2 == 3) {
+            if (var2 == 3) {
                var3 = 64;
             }
 
-            if(var2 == 4) {
+            if (var2 == 4) {
                var3 = 0;
             }
 
-            if(var3 != Client.__client_qf) {
-               if(Client.__client_qf == 0 && Client.__client_qy != -1) {
-                  Login.method2076(UserComparator3.indexCache6, Client.__client_qy, 0, var3, false);
-                  Client.__client_qq = false;
-               } else if(var3 == 0) {
+            if (var3 != Client.field128) {
+               if (Client.field128 == 0 && Client.field112 != -1) {
+                  Login.method2076(UserComparator3.indexCache6, Client.field112, 0, var3, false);
+                  Client.field107 = false;
+               } else if (var3 == 0) {
                   class214.midiPcmStream.clear();
-                  class214.__hf_o = 1;
-                  class214.__hf_u = null;
-                  Client.__client_qq = false;
+                  class214.field1129 = 1;
+                  class214.field1130 = null;
+                  Client.field107 = false;
                } else {
                   class203.method4008(var3);
                }
 
-               Client.__client_qf = var3;
+               Client.field128 = var3;
             }
          }
 
-         if(var4 == 4) {
-            if(var2 == 0) {
+         if (var4 == 4) {
+            if (var2 == 0) {
                Client.soundEffectVolume = 127;
             }
 
-            if(var2 == 1) {
+            if (var2 == 1) {
                Client.soundEffectVolume = 96;
             }
 
-            if(var2 == 2) {
+            if (var2 == 2) {
                Client.soundEffectVolume = 64;
             }
 
-            if(var2 == 3) {
+            if (var2 == 3) {
                Client.soundEffectVolume = 32;
             }
 
-            if(var2 == 4) {
+            if (var2 == 4) {
                Client.soundEffectVolume = 0;
             }
          }
 
-         if(var4 == 5) {
-            Client.__client_ku = var2;
+         if (var4 == 5) {
+            Client.field215 = var2;
          }
 
-         if(var4 == 6) {
+         if (var4 == 6) {
             Client.chatEffects = var2;
          }
 
-         if(var4 == 9) {
-            Client.__client_mb = var2;
+         if (var4 == 9) {
+            Client.field136 = var2;
          }
 
-         if(var4 == 10) {
-            if(var2 == 0) {
-               Client.__client_qc = 127;
+         if (var4 == 10) {
+            if (var2 == 0) {
+               Client.field115 = 127;
             }
 
-            if(var2 == 1) {
-               Client.__client_qc = 96;
+            if (var2 == 1) {
+               Client.field115 = 96;
             }
 
-            if(var2 == 2) {
-               Client.__client_qc = 64;
+            if (var2 == 2) {
+               Client.field115 = 64;
             }
 
-            if(var2 == 3) {
-               Client.__client_qc = 32;
+            if (var2 == 3) {
+               Client.field115 = 32;
             }
 
-            if(var2 == 4) {
-               Client.__client_qc = 0;
+            if (var2 == 4) {
+               Client.field115 = 0;
             }
          }
 
-         if(var4 == 17) {
+         if (var4 == 17) {
             Client.followerIndex = var2 & 65535;
          }
 
-         if(var4 == 18) {
+         if (var4 == 18) {
             Client.playerAttackOption = (AttackOption)ScriptFrame.findEnumerated(ClientPacket.method3665(), var2);
-            if(Client.playerAttackOption == null) {
+            if (Client.playerAttackOption == null) {
                Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
             }
          }
 
-         if(var4 == 19) {
-            if(var2 == -1) {
+         if (var4 == 19) {
+            if (var2 == -1) {
                Client.combatTargetPlayerIndex = -1;
             } else {
                Client.combatTargetPlayerIndex = var2 & 2047;
             }
          }
 
-         if(var4 == 22) {
+         if (var4 == 22) {
             Client.npcAttackOption = (AttackOption)ScriptFrame.findEnumerated(ClientPacket.method3665(), var2);
-            if(Client.npcAttackOption == null) {
+            if (Client.npcAttackOption == null) {
                Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
             }
          }
-
       }
+
+   }
+
+   static {
+      IndexCache_crc = new CRC32();
    }
 }
diff --git a/runescape-client/src/main/java/IndexCacheLoader.java b/runescape-client/src/main/java/IndexCacheLoader.java
index 352fa614f5..c4c05568d9 100644
--- a/runescape-client/src/main/java/IndexCacheLoader.java
+++ b/runescape-client/src/main/java/IndexCacheLoader.java
@@ -19,12 +19,12 @@ public class IndexCacheLoader {
    @Export("titlebuttonSprite")
    static IndexedSprite titlebuttonSprite;
    @ObfuscatedName("x")
-   public static short[][] __bd_x;
+   public static short[][] field406;
    @ObfuscatedName("er")
    @ObfuscatedGetter(
       intValue = 636454135
    )
-   static int __bd_er;
+   static int field407;
    @ObfuscatedName("gw")
    @Export("regionMapArchiveIds")
    static int[] regionMapArchiveIds;
@@ -38,20 +38,20 @@ public class IndexCacheLoader {
    @ObfuscatedGetter(
       intValue = 1459455501
    )
-   final int __q;
+   final int field408;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = 782003089
    )
-   int __w;
+   int field409;
 
    @ObfuscatedSignature(
       signature = "(Lit;Ljava/lang/String;)V"
    )
    IndexCacheLoader(IndexCache var1, String var2) {
-      this.__w = 0;
+      this.field409 = 0;
       this.indexCache = var1;
-      this.__q = var1.__t_397();
+      this.field408 = var1.method5();
    }
 
    @ObfuscatedName("m")
@@ -59,16 +59,16 @@ public class IndexCacheLoader {
       signature = "(I)Z",
       garbageValue = "1352221725"
    )
-   boolean __m_122() {
-      this.__w = 0;
+   boolean method134() {
+      this.field409 = 0;
 
-      for(int var1 = 0; var1 < this.__q; ++var1) {
-         if(!this.indexCache.__df_408(var1) || this.indexCache.__dn_407(var1)) {
-            ++this.__w;
+      for (int var1 = 0; var1 < this.field408; ++var1) {
+         if (!this.indexCache.method133(var1) || this.indexCache.method132(var1)) {
+            ++this.field409;
          }
       }
 
-      return this.__w >= this.__q;
+      return this.field409 >= this.field408;
    }
 
    @ObfuscatedName("x")
@@ -81,67 +81,68 @@ public class IndexCacheLoader {
       Login.xPadding = (SoundCache.canvasWidth - 765) / 2;
       Login.loginBoxX = Login.xPadding + 202;
       Varps.loginBoxCenter = Login.loginBoxX + 180;
+      int var3;
+      int var4;
+      int var5;
+      byte var6;
+      int var7;
+      int var8;
       int var9;
-      int var11;
-      int var19;
-      byte var23;
-      int var24;
-      int var27;
-      int var28;
-      int var48;
-      if(Login.worldSelectOpen) {
-         if(class30.worldSelectBackSprites == null) {
+      int var10;
+      boolean var20;
+      if (Login.worldSelectOpen) {
+         if (class30.worldSelectBackSprites == null) {
             class30.worldSelectBackSprites = class2.method20(WorldMapSection3.indexCache8, "sl_back", "");
          }
 
-         IndexCache var36;
-         int var37;
-         int var39;
-         IndexedSprite[] var40;
-         if(Frames.worldSelectFlagSprites == null) {
-            var36 = WorldMapSection3.indexCache8;
-            var39 = var36.getArchiveId("sl_flags");
-            var37 = var36.getRecordId(var39, "");
-            if(!SpriteMask.loadSprite(var36, var39, var37)) {
-               var40 = null;
+         IndexCache var11;
+         int var12;
+         int var13;
+         IndexedSprite[] var14;
+         if (Frames.worldSelectFlagSprites == null) {
+            var11 = WorldMapSection3.indexCache8;
+            var13 = var11.getArchiveId("sl_flags");
+            var12 = var11.getRecordId(var13, "");
+            if (!SpriteMask.loadSprite(var11, var13, var12)) {
+               var14 = null;
             } else {
-               var40 = WorldMapLabel.createIndexedSpriteArray();
+               var14 = WorldMapLabel.createIndexedSpriteArray();
             }
 
-            Frames.worldSelectFlagSprites = var40;
+            Frames.worldSelectFlagSprites = var14;
          }
 
-         if(AttackOption.worldSelectArrows == null) {
-            var36 = WorldMapSection3.indexCache8;
-            var39 = var36.getArchiveId("sl_arrows");
-            var37 = var36.getRecordId(var39, "");
-            if(!SpriteMask.loadSprite(var36, var39, var37)) {
-               var40 = null;
+         if (AttackOption.worldSelectArrows == null) {
+            var11 = WorldMapSection3.indexCache8;
+            var13 = var11.getArchiveId("sl_arrows");
+            var12 = var11.getRecordId(var13, "");
+            if (!SpriteMask.loadSprite(var11, var13, var12)) {
+               var14 = null;
             } else {
-               var40 = WorldMapLabel.createIndexedSpriteArray();
+               var14 = WorldMapLabel.createIndexedSpriteArray();
             }
 
-            AttackOption.worldSelectArrows = var40;
+            AttackOption.worldSelectArrows = var14;
          }
 
-         if(UrlRequest.worldSelectStars == null) {
-            var36 = WorldMapSection3.indexCache8;
-            var39 = var36.getArchiveId("sl_stars");
-            var37 = var36.getRecordId(var39, "");
-            if(!SpriteMask.loadSprite(var36, var39, var37)) {
-               var40 = null;
+         if (UrlRequest.worldSelectStars == null) {
+            var11 = WorldMapSection3.indexCache8;
+            var13 = var11.getArchiveId("sl_stars");
+            var12 = var11.getRecordId(var13, "");
+            if (!SpriteMask.loadSprite(var11, var13, var12)) {
+               var14 = null;
             } else {
-               var40 = WorldMapLabel.createIndexedSpriteArray();
+               var14 = WorldMapLabel.createIndexedSpriteArray();
             }
 
-            UrlRequest.worldSelectStars = var40;
+            UrlRequest.worldSelectStars = var14;
          }
 
-         if(SecureRandomFuture.worldSelectLeftSprite == null) {
+         if (SecureRandomFuture.worldSelectLeftSprite == null) {
             SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "leftarrow", "");
          }
 
-         if(NetSocket.worldSelectRightSprite == null) {
+         if (NetSocket.worldSelectRightSprite == null) {
             NetSocket.worldSelectRightSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "rightarrow", "");
          }
 
@@ -149,200 +150,203 @@ public class IndexCacheLoader {
          Rasterizer2D.drawGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624);
          Rasterizer2D.drawGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513);
          var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1);
-         if(UrlRequest.worldSelectStars != null) {
+         if (UrlRequest.worldSelectStars != null) {
             UrlRequest.worldSelectStars[1].drawAt(Login.xPadding + 140, 1);
             var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1);
             UrlRequest.worldSelectStars[0].drawAt(Login.xPadding + 140, 12);
             var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1);
          }
 
-         if(AttackOption.worldSelectArrows != null) {
-            var48 = Login.xPadding + 280;
-            if(World.sortOption1[0] == 0 && World.sortOption2[0] == 0) {
-               AttackOption.worldSelectArrows[2].drawAt(var48, 4);
+         if (AttackOption.worldSelectArrows != null) {
+            var10 = Login.xPadding + 280;
+            if (World.sortOption1[0] == 0 && World.sortOption2[0] == 0) {
+               AttackOption.worldSelectArrows[2].drawAt(var10, 4);
             } else {
-               AttackOption.worldSelectArrows[0].drawAt(var48, 4);
+               AttackOption.worldSelectArrows[0].drawAt(var10, 4);
             }
 
-            if(World.sortOption1[0] == 0 && World.sortOption2[0] == 1) {
-               AttackOption.worldSelectArrows[3].drawAt(var48 + 15, 4);
+            if (World.sortOption1[0] == 0 && World.sortOption2[0] == 1) {
+               AttackOption.worldSelectArrows[3].drawAt(var10 + 15, 4);
             } else {
-               AttackOption.worldSelectArrows[1].drawAt(var48 + 15, 4);
+               AttackOption.worldSelectArrows[1].drawAt(var10 + 15, 4);
             }
 
-            var0.draw("World", var48 + 32, 17, 16777215, -1);
-            var24 = Login.xPadding + 390;
-            if(World.sortOption1[0] == 1 && World.sortOption2[0] == 0) {
-               AttackOption.worldSelectArrows[2].drawAt(var24, 4);
+            var0.draw("World", var10 + 32, 17, 16777215, -1);
+            var7 = Login.xPadding + 390;
+            if (World.sortOption1[0] == 1 && World.sortOption2[0] == 0) {
+               AttackOption.worldSelectArrows[2].drawAt(var7, 4);
             } else {
-               AttackOption.worldSelectArrows[0].drawAt(var24, 4);
+               AttackOption.worldSelectArrows[0].drawAt(var7, 4);
             }
 
-            if(World.sortOption1[0] == 1 && World.sortOption2[0] == 1) {
-               AttackOption.worldSelectArrows[3].drawAt(var24 + 15, 4);
+            if (World.sortOption1[0] == 1 && World.sortOption2[0] == 1) {
+               AttackOption.worldSelectArrows[3].drawAt(var7 + 15, 4);
             } else {
-               AttackOption.worldSelectArrows[1].drawAt(var24 + 15, 4);
+               AttackOption.worldSelectArrows[1].drawAt(var7 + 15, 4);
             }
 
-            var0.draw("Players", var24 + 32, 17, 16777215, -1);
-            var39 = Login.xPadding + 500;
-            if(World.sortOption1[0] == 2 && World.sortOption2[0] == 0) {
-               AttackOption.worldSelectArrows[2].drawAt(var39, 4);
+            var0.draw("Players", var7 + 32, 17, 16777215, -1);
+            var13 = Login.xPadding + 500;
+            if (World.sortOption1[0] == 2 && World.sortOption2[0] == 0) {
+               AttackOption.worldSelectArrows[2].drawAt(var13, 4);
             } else {
-               AttackOption.worldSelectArrows[0].drawAt(var39, 4);
+               AttackOption.worldSelectArrows[0].drawAt(var13, 4);
             }
 
-            if(World.sortOption1[0] == 2 && World.sortOption2[0] == 1) {
-               AttackOption.worldSelectArrows[3].drawAt(var39 + 15, 4);
+            if (World.sortOption1[0] == 2 && World.sortOption2[0] == 1) {
+               AttackOption.worldSelectArrows[3].drawAt(var13 + 15, 4);
             } else {
-               AttackOption.worldSelectArrows[1].drawAt(var39 + 15, 4);
+               AttackOption.worldSelectArrows[1].drawAt(var13 + 15, 4);
             }
 
-            var0.draw("Location", var39 + 32, 17, 16777215, -1);
-            var37 = Login.xPadding + 610;
-            if(World.sortOption1[0] == 3 && World.sortOption2[0] == 0) {
-               AttackOption.worldSelectArrows[2].drawAt(var37, 4);
+            var0.draw("Location", var13 + 32, 17, 16777215, -1);
+            var12 = Login.xPadding + 610;
+            if (World.sortOption1[0] == 3 && World.sortOption2[0] == 0) {
+               AttackOption.worldSelectArrows[2].drawAt(var12, 4);
             } else {
-               AttackOption.worldSelectArrows[0].drawAt(var37, 4);
+               AttackOption.worldSelectArrows[0].drawAt(var12, 4);
             }
 
-            if(World.sortOption1[0] == 3 && World.sortOption2[0] == 1) {
-               AttackOption.worldSelectArrows[3].drawAt(var37 + 15, 4);
+            if (World.sortOption1[0] == 3 && World.sortOption2[0] == 1) {
+               AttackOption.worldSelectArrows[3].drawAt(var12 + 15, 4);
             } else {
-               AttackOption.worldSelectArrows[1].drawAt(var37 + 15, 4);
+               AttackOption.worldSelectArrows[1].drawAt(var12 + 15, 4);
             }
 
-            var0.draw("Type", var37 + 32, 17, 16777215, -1);
+            var0.draw("Type", var12 + 32, 17, 16777215, -1);
          }
 
          Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0);
          var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1);
          Login.hoveredWorldIndex = -1;
-         if(class30.worldSelectBackSprites != null) {
-            var23 = 88;
-            byte var51 = 19;
-            var39 = 765 / (var23 + 1) - 1;
-            var37 = 480 / (var51 + 1);
+         if (class30.worldSelectBackSprites != null) {
+            var6 = 88;
+            byte var15 = 19;
+            var13 = 765 / (var6 + 1) - 1;
+            var12 = 480 / (var15 + 1);
 
-            do {
-               var27 = var37;
-               var28 = var39;
-               if(var37 * (var39 - 1) >= World.worldsCount) {
-                  --var39;
+            while (true) {
+               var8 = var12;
+               var9 = var13;
+               if (var12 * (var13 - 1) >= World.worldsCount) {
+                  --var13;
                }
 
-               if(var39 * (var37 - 1) >= World.worldsCount) {
-                  --var37;
+               if (var13 * (var12 - 1) >= World.worldsCount) {
+                  --var12;
                }
 
-               if(var39 * (var37 - 1) >= World.worldsCount) {
-                  --var37;
-               }
-            } while(var37 != var27 || var39 != var28);
-
-            var27 = (765 - var23 * var39) / (var39 + 1);
-            if(var27 > 5) {
-               var27 = 5;
-            }
-
-            var28 = (480 - var51 * var37) / (var37 + 1);
-            if(var28 > 5) {
-               var28 = 5;
-            }
-
-            var9 = (765 - var39 * var23 - var27 * (var39 - 1)) / 2;
-            int var10 = (480 - var37 * var51 - var28 * (var37 - 1)) / 2;
-            var11 = (var37 + World.worldsCount - 1) / var37;
-            Login.worldSelectPagesCount = var11 - var39;
-            if(SecureRandomFuture.worldSelectLeftSprite != null && Login.worldSelectPage > 0) {
-               SecureRandomFuture.worldSelectLeftSprite.drawAt(8, Huffman.canvasHeight / 2 - SecureRandomFuture.worldSelectLeftSprite.subHeight / 2);
-            }
-
-            if(NetSocket.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) {
-               NetSocket.worldSelectRightSprite.drawAt(SoundCache.canvasWidth - NetSocket.worldSelectRightSprite.subWidth - 8, Huffman.canvasHeight / 2 - NetSocket.worldSelectRightSprite.subHeight / 2);
-            }
-
-            int var41 = var10 + 23;
-            int var42 = var9 + Login.xPadding;
-            int var43 = 0;
-            boolean var15 = false;
-            int var16 = Login.worldSelectPage;
-
-            int var44;
-            for(var44 = var37 * var16; var44 < World.worldsCount && var16 - Login.worldSelectPage < var39; ++var44) {
-               World var29 = ItemContainer.worlds[var44];
-               boolean var46 = true;
-               String var20 = Integer.toString(var29.population);
-               if(var29.population == -1) {
-                  var20 = "OFF";
-                  var46 = false;
-               } else if(var29.population > 1980) {
-                  var20 = "FULL";
-                  var46 = false;
+               if (var13 * (var12 - 1) >= World.worldsCount) {
+                  --var12;
                }
 
-               int var22 = 0;
-               byte var21;
-               if(var29.isBeta()) {
-                  if(var29.isMembersOnly()) {
-                     var21 = 7;
-                  } else {
-                     var21 = 6;
+               if (var12 == var8 && var13 == var9) {
+                  var8 = (765 - var6 * var13) / (var13 + 1);
+                  if (var8 > 5) {
+                     var8 = 5;
                   }
-               } else if(var29.isDeadman()) {
-                  var22 = 0xff0000;
-                  if(var29.isMembersOnly()) {
-                     var21 = 5;
-                  } else {
-                     var21 = 4;
+
+                  var9 = (480 - var15 * var12) / (var12 + 1);
+                  if (var9 > 5) {
+                     var9 = 5;
                   }
-               } else if(var29.isPvp()) {
-                  if(var29.isMembersOnly()) {
-                     var21 = 3;
-                  } else {
-                     var21 = 2;
+
+                  var3 = (765 - var13 * var6 - var8 * (var13 - 1)) / 2;
+                  int var16 = (480 - var12 * var15 - var9 * (var12 - 1)) / 2;
+                  var4 = (var12 + World.worldsCount - 1) / var12;
+                  Login.worldSelectPagesCount = var4 - var13;
+                  if (SecureRandomFuture.worldSelectLeftSprite != null && Login.worldSelectPage > 0) {
+                     SecureRandomFuture.worldSelectLeftSprite.drawAt(8, Huffman.canvasHeight / 2 - SecureRandomFuture.worldSelectLeftSprite.subHeight / 2);
                   }
-               } else if(var29.isMembersOnly()) {
-                  var21 = 1;
-               } else {
-                  var21 = 0;
-               }
 
-               if(MouseHandler.MouseHandler_x >= var42 && MouseHandler.MouseHandler_y >= var41 && MouseHandler.MouseHandler_x < var42 + var23 && MouseHandler.MouseHandler_y < var51 + var41 && var46) {
-                  Login.hoveredWorldIndex = var44;
-                  class30.worldSelectBackSprites[var21].drawAtTransOverlay(var42, var41, 128, 0xffffff);
-                  var15 = true;
-               } else {
-                  class30.worldSelectBackSprites[var21].drawAt(var42, var41);
-               }
+                  if (NetSocket.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) {
+                     NetSocket.worldSelectRightSprite.drawAt(SoundCache.canvasWidth - NetSocket.worldSelectRightSprite.subWidth - 8, Huffman.canvasHeight / 2 - NetSocket.worldSelectRightSprite.subHeight / 2);
+                  }
 
-               if(Frames.worldSelectFlagSprites != null) {
-                  Frames.worldSelectFlagSprites[(var29.isMembersOnly()?8:0) + var29.location].drawAt(var42 + 29, var41);
-               }
+                  int var17 = var16 + 23;
+                  int var18 = var3 + Login.xPadding;
+                  int var19 = 0;
+                  var20 = false;
+                  int var21 = Login.worldSelectPage;
 
-               var0.drawCentered(Integer.toString(var29.id), var42 + 15, var51 / 2 + var41 + 5, var22, -1);
-               var1.drawCentered(var20, var42 + 60, var51 / 2 + var41 + 5, 268435455, -1);
-               var41 = var41 + var28 + var51;
-               ++var43;
-               if(var43 >= var37) {
-                  var41 = var10 + 23;
-                  var42 = var42 + var23 + var27;
-                  var43 = 0;
-                  ++var16;
-               }
-            }
+                  int var22;
+                  for (var22 = var12 * var21; var22 < World.worldsCount && var21 - Login.worldSelectPage < var13; ++var22) {
+                     World var23 = ItemContainer.worlds[var22];
+                     boolean var24 = true;
+                     String var25 = Integer.toString(var23.population);
+                     if (var23.population == -1) {
+                        var25 = "OFF";
+                        var24 = false;
+                     } else if (var23.population > 1980) {
+                        var25 = "FULL";
+                        var24 = false;
+                     }
 
-            if(var15) {
-               var44 = var1.stringWidth(ItemContainer.worlds[Login.hoveredWorldIndex].activity) + 6;
-               int var45 = var1.ascent + 8;
-               var19 = MouseHandler.MouseHandler_y + 25;
-               if(var45 + var19 > 480) {
-                  var19 = MouseHandler.MouseHandler_y - 25 - var45;
-               }
+                     int var26 = 0;
+                     byte var27;
+                     if (var23.isBeta()) {
+                        if (var23.isMembersOnly()) {
+                           var27 = 7;
+                        } else {
+                           var27 = 6;
+                        }
+                     } else if (var23.isDeadman()) {
+                        var26 = 16711680;
+                        if (var23.isMembersOnly()) {
+                           var27 = 5;
+                        } else {
+                           var27 = 4;
+                        }
+                     } else if (var23.isPvp()) {
+                        if (var23.isMembersOnly()) {
+                           var27 = 3;
+                        } else {
+                           var27 = 2;
+                        }
+                     } else if (var23.isMembersOnly()) {
+                        var27 = 1;
+                     } else {
+                        var27 = 0;
+                     }
 
-               Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var44 / 2, var19, var44, var45, 16777120);
-               Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var44 / 2, var19, var44, var45, 0);
-               var1.drawCentered(ItemContainer.worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var19 + var1.ascent + 4, 0, -1);
+                     if (MouseHandler.MouseHandler_x >= var18 && MouseHandler.MouseHandler_y >= var17 && MouseHandler.MouseHandler_x < var18 + var6 && MouseHandler.MouseHandler_y < var15 + var17 && var24) {
+                        Login.hoveredWorldIndex = var22;
+                        class30.worldSelectBackSprites[var27].drawAtTransOverlay(var18, var17, 128, 16777215);
+                        var20 = true;
+                     } else {
+                        class30.worldSelectBackSprites[var27].drawAt(var18, var17);
+                     }
+
+                     if (Frames.worldSelectFlagSprites != null) {
+                        Frames.worldSelectFlagSprites[(var23.isMembersOnly() ? 8 : 0) + var23.location].drawAt(var18 + 29, var17);
+                     }
+
+                     var0.drawCentered(Integer.toString(var23.id), var18 + 15, var15 / 2 + var17 + 5, var26, -1);
+                     var1.drawCentered(var25, var18 + 60, var15 / 2 + var17 + 5, 268435455, -1);
+                     var17 = var17 + var9 + var15;
+                     ++var19;
+                     if (var19 >= var12) {
+                        var17 = var16 + 23;
+                        var18 = var18 + var6 + var8;
+                        var19 = 0;
+                        ++var21;
+                     }
+                  }
+
+                  if (var20) {
+                     var22 = var1.stringWidth(ItemContainer.worlds[Login.hoveredWorldIndex].activity) + 6;
+                     int var47 = var1.ascent + 8;
+                     var5 = MouseHandler.MouseHandler_y + 25;
+                     if (var47 + var5 > 480) {
+                        var5 = MouseHandler.MouseHandler_y - 25 - var47;
+                     }
+
+                     Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var47, 16777120);
+                     Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var47, 0);
+                     var1.drawCentered(ItemContainer.worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var5 + var1.ascent + 4, 0, -1);
+                  }
+                  break;
+               }
             }
          }
 
@@ -351,354 +355,353 @@ public class IndexCacheLoader {
          Login.leftTitleSprite.drawAt(Login.xPadding, 0);
          Fonts.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
          WorldMapSectionType.logoSprite.drawAt(Login.xPadding + 382 - WorldMapSectionType.logoSprite.subWidth / 2, 18);
-         if(Client.gameState == 0 || Client.gameState == 5) {
-            var23 = 20;
-            var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var23, 16777215, -1);
-            var24 = 253 - var23;
-            Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var24, 304, 34, 9179409);
-            Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var24 + 1, 302, 32, 0);
-            Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var24 + 2, Login.Login_loadingPercent * 3, 30, 9179409);
-            Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var24 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0);
-            var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var23, 16777215, -1);
+         if (Client.gameState == 0 || Client.gameState == 5) {
+            var6 = 20;
+            var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var6, 16777215, -1);
+            var7 = 253 - var6;
+            Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var7, 304, 34, 9179409);
+            Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var7 + 1, 302, 32, 0);
+            Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var7 + 2, Login.Login_loadingPercent * 3, 30, 9179409);
+            Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var7 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0);
+            var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var6, 16777215, -1);
          }
 
-         String var7;
-         String var8;
-         String var25;
+         String var28;
+         String var29;
          String var30;
          String var31;
-         short var47;
-         short var49;
-         if(Client.gameState == 20) {
+         short var32;
+         String var33;
+         short var34;
+         if (Client.gameState == 20) {
             Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2);
-            var47 = 201;
-            var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16776960, 0);
-            var48 = var47 + 15;
-            var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16776960, 0);
-            var48 += 15;
-            var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16776960, 0);
-            var48 += 15;
-            var48 += 7;
-            if(Login.loginIndex != 4) {
-               var0.draw("Login: ", Login.loginBoxX + 180 - 110, var48, 16777215, 0);
-               var49 = 200;
-               if(ReflectionCheck.clientPreferences.hideUsername) {
-                  var8 = Login.Login_username;
-                  var7 = class168.method3450('*', var8.length());
-                  var25 = var7;
+            var32 = 201;
+            var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0);
+            var10 = var32 + 15;
+            var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0);
+            var10 += 15;
+            var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0);
+            var10 += 15;
+            var10 += 7;
+            if (Login.loginIndex != 4) {
+               var0.draw("Login: ", Login.loginBoxX + 180 - 110, var10, 16777215, 0);
+               var34 = 200;
+               if (ReflectionCheck.clientPreferences.hideUsername) {
+                  var29 = Login.Login_username;
+                  var28 = class168.method3450('*', var29.length());
+                  var30 = var28;
                } else {
-                  var25 = Login.Login_username;
+                  var30 = Login.Login_username;
                }
 
-               for(var25 = var25; var0.stringWidth(var25) > var49; var25 = var25.substring(0, var25.length() - 1)) {
-                  ;
+               for (var30 = var30; var0.stringWidth(var30) > var34; var30 = var30.substring(0, var30.length() - 1)) {
                }
 
-               var0.draw(AbstractFont.escapeBrackets(var25), Login.loginBoxX + 180 - 70, var48, 16777215, 0);
-               var48 += 15;
-               var8 = "Password: ";
-               var30 = Login.Login_password;
-               var31 = class168.method3450('*', var30.length());
-               var0.draw(var8 + var31, Login.loginBoxX + 180 - 108, var48, 16777215, 0);
-               var48 += 15;
+               var0.draw(AbstractFont.escapeBrackets(var30), Login.loginBoxX + 180 - 70, var10, 16777215, 0);
+               var10 += 15;
+               var29 = "Password: ";
+               var33 = Login.Login_password;
+               var31 = class168.method3450('*', var33.length());
+               var0.draw(var29 + var31, Login.loginBoxX + 180 - 108, var10, 16777215, 0);
+               var10 += 15;
             }
          }
 
-         if(Client.gameState == 10 || Client.gameState == 11) {
+         if (Client.gameState == 10 || Client.gameState == 11) {
             Login.titleboxSprite.drawAt(Login.loginBoxX, 171);
-            short var5;
-            if(Login.loginIndex == 0) {
-               var47 = 251;
-               var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var47, 16776960, 0);
-               var48 = var47 + 30;
-               var24 = Login.loginBoxX + 180 - 80;
-               var5 = 291;
-               titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-               var0.drawLines("New User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0);
-               var24 = Login.loginBoxX + 180 + 80;
-               titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-               var0.drawLines("Existing User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0);
-            } else if(Login.loginIndex == 1) {
+            short var35;
+            if (Login.loginIndex == 0) {
+               var32 = 251;
+               var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var32, 16776960, 0);
+               var10 = var32 + 30;
+               var7 = Login.loginBoxX + 180 - 80;
+               var35 = 291;
+               titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+               var0.drawLines("New User", var7 - 73, var35 - 20, 144, 40, 16777215, 0, 1, 1, 0);
+               var7 = Login.loginBoxX + 180 + 80;
+               titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+               var0.drawLines("Existing User", var7 - 73, var35 - 20, 144, 40, 16777215, 0, 1, 1, 0);
+            } else if (Login.loginIndex == 1) {
                var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0);
-               var47 = 236;
-               var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16777215, 0);
-               var48 = var47 + 15;
-               var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16777215, 0);
-               var48 += 15;
-               var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16777215, 0);
-               var48 += 15;
-               var24 = Login.loginBoxX + 180 - 80;
-               var5 = 321;
-               titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-               var0.drawCentered("Continue", var24, var5 + 5, 16777215, 0);
-               var24 = Login.loginBoxX + 180 + 80;
-               titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-               var0.drawCentered("Cancel", var24, var5 + 5, 16777215, 0);
-            } else if(Login.loginIndex == 2) {
-               var47 = 201;
-               var0.drawCentered(Login.Login_response1, Varps.loginBoxCenter, var47, 16776960, 0);
-               var48 = var47 + 15;
-               var0.drawCentered(Login.Login_response2, Varps.loginBoxCenter, var48, 16776960, 0);
-               var48 += 15;
-               var0.drawCentered(Login.Login_response3, Varps.loginBoxCenter, var48, 16776960, 0);
-               var48 += 15;
-               var48 += 7;
-               var0.draw("Login: ", Varps.loginBoxCenter - 110, var48, 16777215, 0);
-               var49 = 200;
-               if(ReflectionCheck.clientPreferences.hideUsername) {
-                  var8 = Login.Login_username;
-                  var7 = class168.method3450('*', var8.length());
-                  var25 = var7;
+               var32 = 236;
+               var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0);
+               var10 = var32 + 15;
+               var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16777215, 0);
+               var10 += 15;
+               var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16777215, 0);
+               var10 += 15;
+               var7 = Login.loginBoxX + 180 - 80;
+               var35 = 321;
+               titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+               var0.drawCentered("Continue", var7, var35 + 5, 16777215, 0);
+               var7 = Login.loginBoxX + 180 + 80;
+               titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+               var0.drawCentered("Cancel", var7, var35 + 5, 16777215, 0);
+            } else if (Login.loginIndex == 2) {
+               var32 = 201;
+               var0.drawCentered(Login.Login_response1, Varps.loginBoxCenter, var32, 16776960, 0);
+               var10 = var32 + 15;
+               var0.drawCentered(Login.Login_response2, Varps.loginBoxCenter, var10, 16776960, 0);
+               var10 += 15;
+               var0.drawCentered(Login.Login_response3, Varps.loginBoxCenter, var10, 16776960, 0);
+               var10 += 15;
+               var10 += 7;
+               var0.draw("Login: ", Varps.loginBoxCenter - 110, var10, 16777215, 0);
+               var34 = 200;
+               if (ReflectionCheck.clientPreferences.hideUsername) {
+                  var29 = Login.Login_username;
+                  var28 = class168.method3450('*', var29.length());
+                  var30 = var28;
                } else {
-                  var25 = Login.Login_username;
+                  var30 = Login.Login_username;
                }
 
-               for(var25 = var25; var0.stringWidth(var25) > var49; var25 = var25.substring(1)) {
-                  ;
+               for (var30 = var30; var0.stringWidth(var30) > var34; var30 = var30.substring(1)) {
                }
 
-               var0.draw(AbstractFont.escapeBrackets(var25) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Varps.loginBoxCenter - 70, var48, 16777215, 0);
-               var48 += 15;
-               var8 = "Password: ";
-               var30 = Login.Login_password;
-               var31 = class168.method3450('*', var30.length());
-               var0.draw(var8 + var31 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Varps.loginBoxCenter - 108, var48, 16777215, 0);
-               var48 += 15;
-               var47 = 277;
-               var11 = Varps.loginBoxCenter + -117;
-               boolean var13 = Client.Login_isUsernameRemembered;
-               boolean var14 = Login.__cu_aa;
-               IndexedSprite var32 = var13?(var14?KeyHandler.options_buttons_6Sprite :class308.options_buttons_2Sprite):(var14?GraphicsObject.options_buttons_4Sprite :Login.options_buttons_0Sprite);
-               var32.drawAt(var11, var47);
-               var11 = var11 + var32.subWidth + 5;
-               var1.draw("Remember username", var11, var47 + 13, 16776960, 0);
-               var11 = Varps.loginBoxCenter + 24;
-               boolean var17 = ReflectionCheck.clientPreferences.hideUsername;
-               boolean var18 = Login.__cu_ax;
-               IndexedSprite var34 = var17?(var18?KeyHandler.options_buttons_6Sprite :class308.options_buttons_2Sprite):(var18?GraphicsObject.options_buttons_4Sprite :Login.options_buttons_0Sprite);
-               var34.drawAt(var11, var47);
-               var11 = var11 + var34.subWidth + 5;
-               var1.draw("Hide username", var11, var47 + 13, 16776960, 0);
-               var48 = var47 + 15;
-               var19 = Varps.loginBoxCenter - 80;
-               short var35 = 321;
-               titlebuttonSprite.drawAt(var19 - 73, var35 - 20);
-               var0.drawCentered("Login", var19, var35 + 5, 16777215, 0);
-               var19 = Varps.loginBoxCenter + 80;
-               titlebuttonSprite.drawAt(var19 - 73, var35 - 20);
-               var0.drawCentered("Cancel", var19, var35 + 5, 16777215, 0);
-               var47 = 357;
-               switch(Login.__cu_ac) {
+               var0.draw(AbstractFont.escapeBrackets(var30) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Varps.loginBoxCenter - 70, var10, 16777215, 0);
+               var10 += 15;
+               var29 = "Password: ";
+               var33 = Login.Login_password;
+               var31 = class168.method3450('*', var33.length());
+               var0.draw(var29 + var31 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Varps.loginBoxCenter - 108, var10, 16777215, 0);
+               var10 += 15;
+               var32 = 277;
+               var4 = Varps.loginBoxCenter + -117;
+               boolean var40 = Client.Login_isUsernameRemembered;
+               var20 = Login.field468;
+               IndexedSprite var46 = var40 ? (var20 ? KeyHandler.options_buttons_6Sprite : class308.options_buttons_2Sprite) : (var20 ? GraphicsObject.options_buttons_4Sprite : Login.options_buttons_0Sprite);
+               var46.drawAt(var4, var32);
+               var4 = var4 + var46.subWidth + 5;
+               var1.draw("Remember username", var4, var32 + 13, 16776960, 0);
+               var4 = Varps.loginBoxCenter + 24;
+               boolean var44 = ReflectionCheck.clientPreferences.hideUsername;
+               boolean var48 = Login.field469;
+               IndexedSprite var49 = var44 ? (var48 ? KeyHandler.options_buttons_6Sprite : class308.options_buttons_2Sprite) : (var48 ? GraphicsObject.options_buttons_4Sprite : Login.options_buttons_0Sprite);
+               var49.drawAt(var4, var32);
+               var4 = var4 + var49.subWidth + 5;
+               var1.draw("Hide username", var4, var32 + 13, 16776960, 0);
+               var10 = var32 + 15;
+               var5 = Varps.loginBoxCenter - 80;
+               short var50 = 321;
+               titlebuttonSprite.drawAt(var5 - 73, var50 - 20);
+               var0.drawCentered("Login", var5, var50 + 5, 16777215, 0);
+               var5 = Varps.loginBoxCenter + 80;
+               titlebuttonSprite.drawAt(var5 - 73, var50 - 20);
+               var0.drawCentered("Cancel", var5, var50 + 5, 16777215, 0);
+               var32 = 357;
+               switch(Login.field467) {
                case 2:
-                  AttackOption.__cj_ay = "Having trouble logging in?";
+                  AttackOption.field31 = "Having trouble logging in?";
                   break;
                default:
-                  AttackOption.__cj_ay = "Can\'t login? Click here.";
+                  AttackOption.field31 = "Can't login? Click here.";
                }
 
-               TilePaint.__eb_ah = new Bounds(Varps.loginBoxCenter, var47, var1.stringWidth(AttackOption.__cj_ay), 11);
-               UrlRequester.__eo_ak = new Bounds(Varps.loginBoxCenter, var47, var1.stringWidth("Still having trouble logging in?"), 11);
-               var1.drawCentered(AttackOption.__cj_ay, Varps.loginBoxCenter, var47, 16777215, 0);
-            } else if(Login.loginIndex == 3) {
-               var47 = 201;
-               var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var47, 16776960, 0);
-               var48 = var47 + 20;
-               var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var48, 16776960, 0);
-               var48 += 15;
-               var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var48, 16776960, 0);
-               var48 += 15;
-               var24 = Login.loginBoxX + 180;
-               var5 = 276;
-               titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-               var2.drawCentered("Try again", var24, var5 + 5, 16777215, 0);
-               var24 = Login.loginBoxX + 180;
-               var5 = 326;
-               titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-               var2.drawCentered("Forgotten password?", var24, var5 + 5, 16777215, 0);
+               TilePaint.field907 = new Bounds(Varps.loginBoxCenter, var32, var1.stringWidth(AttackOption.field31), 11);
+               UrlRequester.field930 = new Bounds(Varps.loginBoxCenter, var32, var1.stringWidth("Still having trouble logging in?"), 11);
+               var1.drawCentered(AttackOption.field31, Varps.loginBoxCenter, var32, 16777215, 0);
+            } else if (Login.loginIndex == 3) {
+               var32 = 201;
+               var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var32, 16776960, 0);
+               var10 = var32 + 20;
+               var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var10, 16776960, 0);
+               var10 += 15;
+               var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var10, 16776960, 0);
+               var10 += 15;
+               var7 = Login.loginBoxX + 180;
+               var35 = 276;
+               titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+               var2.drawCentered("Try again", var7, var35 + 5, 16777215, 0);
+               var7 = Login.loginBoxX + 180;
+               var35 = 326;
+               titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+               var2.drawCentered("Forgotten password?", var7, var35 + 5, 16777215, 0);
             } else {
-               String var26;
-               if(Login.loginIndex == 4) {
+               String var36;
+               if (Login.loginIndex == 4) {
                   var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0);
-                  var47 = 236;
-                  var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16777215, 0);
-                  var48 = var47 + 15;
-                  var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16777215, 0);
-                  var48 += 15;
-                  var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16777215, 0);
-                  var48 += 15;
-                  var26 = "PIN: ";
-                  var7 = Login.otp;
-                  var25 = class168.method3450('*', var7.length());
-                  var0.draw(var26 + var25 + (Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Login.loginBoxX + 180 - 108, var48, 16777215, 0);
-                  var48 -= 8;
-                  var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var48, 16776960, 0);
-                  var48 += 15;
-                  var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var48, 16776960, 0);
-                  var28 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15;
-                  var9 = var48 - var0.ascent;
-                  IndexedSprite var52;
-                  if(Login.__cu_ba) {
-                     var52 = class308.options_buttons_2Sprite;
+                  var32 = 236;
+                  var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16777215, 0);
+                  var10 = var32 + 15;
+                  var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16777215, 0);
+                  var10 += 15;
+                  var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16777215, 0);
+                  var10 += 15;
+                  var36 = "PIN: ";
+                  var28 = Login.otp;
+                  var30 = class168.method3450('*', var28.length());
+                  var0.draw(var36 + var30 + (Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var10, 16777215, 0);
+                  var10 -= 8;
+                  var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var10, 16776960, 0);
+                  var10 += 15;
+                  var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var10, 16776960, 0);
+                  var9 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15;
+                  var3 = var10 - var0.ascent;
+                  IndexedSprite var43;
+                  if (Login.field470) {
+                     var43 = class308.options_buttons_2Sprite;
                   } else {
-                     var52 = Login.options_buttons_0Sprite;
+                     var43 = Login.options_buttons_0Sprite;
                   }
 
-                  var52.drawAt(var28, var9);
-                  var48 += 15;
-                  var11 = Login.loginBoxX + 180 - 80;
-                  short var12 = 321;
-                  titlebuttonSprite.drawAt(var11 - 73, var12 - 20);
-                  var0.drawCentered("Continue", var11, var12 + 5, 16777215, 0);
-                  var11 = Login.loginBoxX + 180 + 80;
-                  titlebuttonSprite.drawAt(var11 - 73, var12 - 20);
-                  var0.drawCentered("Cancel", var11, var12 + 5, 16777215, 0);
-                  var1.drawCentered("<u=ff>Can\'t Log In?</u>", Login.loginBoxX + 180, var12 + 36, 255, 0);
+                  var43.drawAt(var9, var3);
+                  var10 += 15;
+                  var4 = Login.loginBoxX + 180 - 80;
+                  short var45 = 321;
+                  titlebuttonSprite.drawAt(var4 - 73, var45 - 20);
+                  var0.drawCentered("Continue", var4, var45 + 5, 16777215, 0);
+                  var4 = Login.loginBoxX + 180 + 80;
+                  titlebuttonSprite.drawAt(var4 - 73, var45 - 20);
+                  var0.drawCentered("Cancel", var4, var45 + 5, 16777215, 0);
+                  var1.drawCentered("<u=ff>Can't Log In?</u>", Login.loginBoxX + 180, var45 + 36, 255, 0);
                } else {
-                  short var50;
-                  if(Login.loginIndex == 5) {
+                  short var37;
+                  if (Login.loginIndex != 5) {
+                     if (Login.loginIndex == 6) {
+                        var32 = 201;
+                        var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0);
+                        var10 = var32 + 15;
+                        var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0);
+                        var10 += 15;
+                        var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0);
+                        var10 += 15;
+                        var7 = Login.loginBoxX + 180;
+                        var35 = 321;
+                        titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+                        var0.drawCentered("Back", var7, var35 + 5, 16777215, 0);
+                     } else if (Login.loginIndex == 7) {
+                        var32 = 216;
+                        var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var32, 16776960, 0);
+                        var10 = var32 + 15;
+                        var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var10, 16776960, 0);
+                        var10 += 15;
+                        var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var10, 16776960, 0);
+                        var10 += 15;
+                        var7 = Login.loginBoxX + 180 - 80;
+                        var35 = 321;
+                        titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+                        var0.drawCentered("Set Date of Birth", var7, var35 + 5, 16777215, 0);
+                        var7 = Login.loginBoxX + 180 + 80;
+                        titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+                        var0.drawCentered("Back", var7, var35 + 5, 16777215, 0);
+                     } else if (Login.loginIndex == 8) {
+                        var32 = 216;
+                        var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var32, 16776960, 0);
+                        var10 = var32 + 15;
+                        var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var10, 16776960, 0);
+                        var10 += 15;
+                        var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var10, 16776960, 0);
+                        var10 += 15;
+                        var7 = Login.loginBoxX + 180 - 80;
+                        var35 = 321;
+                        titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+                        var0.drawCentered("Privacy Policy", var7, var35 + 5, 16777215, 0);
+                        var7 = Login.loginBoxX + 180 + 80;
+                        titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+                        var0.drawCentered("Back", var7, var35 + 5, 16777215, 0);
+                     } else if (Login.loginIndex == 12) {
+                        var32 = 201;
+                        String var41 = "";
+                        var36 = "";
+                        var30 = "";
+                        switch(Login.field466) {
+                        case 0:
+                           var41 = "Your account has been disabled.";
+                           var36 = Strings.field880;
+                           var30 = "";
+                           break;
+                        case 1:
+                           var41 = "Account locked as we suspect it has been stolen.";
+                           var36 = Strings.field881;
+                           var30 = "";
+                           break;
+                        default:
+                           MouseHandler.method1084(false);
+                        }
+
+                        var0.drawCentered(var41, Login.loginBoxX + 180, var32, 16776960, 0);
+                        var10 = var32 + 15;
+                        var2.drawCentered(var36, Login.loginBoxX + 180, var10, 16776960, 0);
+                        var10 += 15;
+                        var2.drawCentered(var30, Login.loginBoxX + 180, var10, 16776960, 0);
+                        var10 += 15;
+                        var8 = Login.loginBoxX + 180;
+                        var37 = 276;
+                        titlebuttonSprite.drawAt(var8 - 73, var37 - 20);
+                        var0.drawCentered("Support Page", var8, var37 + 5, 16777215, 0);
+                        var8 = Login.loginBoxX + 180;
+                        var37 = 326;
+                        titlebuttonSprite.drawAt(var8 - 73, var37 - 20);
+                        var0.drawCentered("Back", var8, var37 + 5, 16777215, 0);
+                     }
+                  } else {
                      var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0);
-                     var47 = 221;
-                     var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16776960, 0);
-                     var48 = var47 + 15;
-                     var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var48 += 14;
-                     var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var48, 16777215, 0);
-                     var49 = 174;
-                     if(ReflectionCheck.clientPreferences.hideUsername) {
-                        var8 = Login.Login_username;
-                        var7 = class168.method3450('*', var8.length());
-                        var25 = var7;
+                     var32 = 221;
+                     var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var32, 16776960, 0);
+                     var10 = var32 + 15;
+                     var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0);
+                     var10 += 15;
+                     var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0);
+                     var10 += 15;
+                     var10 += 14;
+                     var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var10, 16777215, 0);
+                     var34 = 174;
+                     if (ReflectionCheck.clientPreferences.hideUsername) {
+                        var29 = Login.Login_username;
+                        var28 = class168.method3450('*', var29.length());
+                        var30 = var28;
                      } else {
-                        var25 = Login.Login_username;
+                        var30 = Login.Login_username;
                      }
 
-                     for(var25 = var25; var0.stringWidth(var25) > var49; var25 = var25.substring(1)) {
-                        ;
+                     for (var30 = var30; var0.stringWidth(var30) > var34; var30 = var30.substring(1)) {
                      }
 
-                     var0.draw(AbstractFont.escapeBrackets(var25) + (Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Login.loginBoxX + 180 - 34, var48, 16777215, 0);
-                     var48 += 15;
-                     var27 = Login.loginBoxX + 180 - 80;
-                     var50 = 321;
-                     titlebuttonSprite.drawAt(var27 - 73, var50 - 20);
-                     var0.drawCentered("Recover", var27, var50 + 5, 16777215, 0);
-                     var27 = Login.loginBoxX + 180 + 80;
-                     titlebuttonSprite.drawAt(var27 - 73, var50 - 20);
-                     var0.drawCentered("Back", var27, var50 + 5, 16777215, 0);
-                     var50 = 356;
-                     var1.drawCentered("Still having trouble logging in?", Varps.loginBoxCenter, var50, 268435455, 0);
-                  } else if(Login.loginIndex == 6) {
-                     var47 = 201;
-                     var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16776960, 0);
-                     var48 = var47 + 15;
-                     var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var24 = Login.loginBoxX + 180;
-                     var5 = 321;
-                     titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-                     var0.drawCentered("Back", var24, var5 + 5, 16777215, 0);
-                  } else if(Login.loginIndex == 7) {
-                     var47 = 216;
-                     var0.drawCentered("Your date of birth isn\'t set.", Login.loginBoxX + 180, var47, 16776960, 0);
-                     var48 = var47 + 15;
-                     var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var24 = Login.loginBoxX + 180 - 80;
-                     var5 = 321;
-                     titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-                     var0.drawCentered("Set Date of Birth", var24, var5 + 5, 16777215, 0);
-                     var24 = Login.loginBoxX + 180 + 80;
-                     titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-                     var0.drawCentered("Back", var24, var5 + 5, 16777215, 0);
-                  } else if(Login.loginIndex == 8) {
-                     var47 = 216;
-                     var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var47, 16776960, 0);
-                     var48 = var47 + 15;
-                     var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var24 = Login.loginBoxX + 180 - 80;
-                     var5 = 321;
-                     titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-                     var0.drawCentered("Privacy Policy", var24, var5 + 5, 16777215, 0);
-                     var24 = Login.loginBoxX + 180 + 80;
-                     titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-                     var0.drawCentered("Back", var24, var5 + 5, 16777215, 0);
-                  } else if(Login.loginIndex == 12) {
-                     var47 = 201;
-                     String var4 = "";
-                     var26 = "";
-                     var25 = "";
-                     switch(Login.__cu_aj) {
-                     case 0:
-                        var4 = "Your account has been disabled.";
-                        var26 = Strings.__id_bq;
-                        var25 = "";
-                        break;
-                     case 1:
-                        var4 = "Account locked as we suspect it has been stolen.";
-                        var26 = Strings.__id_cp;
-                        var25 = "";
-                        break;
-                     default:
-                        MouseHandler.method1084(false);
-                     }
-
-                     var0.drawCentered(var4, Login.loginBoxX + 180, var47, 16776960, 0);
-                     var48 = var47 + 15;
-                     var2.drawCentered(var26, Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var2.drawCentered(var25, Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var27 = Login.loginBoxX + 180;
-                     var50 = 276;
-                     titlebuttonSprite.drawAt(var27 - 73, var50 - 20);
-                     var0.drawCentered("Support Page", var27, var50 + 5, 16777215, 0);
-                     var27 = Login.loginBoxX + 180;
-                     var50 = 326;
-                     titlebuttonSprite.drawAt(var27 - 73, var50 - 20);
-                     var0.drawCentered("Back", var27, var50 + 5, 16777215, 0);
+                     var0.draw(AbstractFont.escapeBrackets(var30) + (Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var10, 16777215, 0);
+                     var10 += 15;
+                     var8 = Login.loginBoxX + 180 - 80;
+                     var37 = 321;
+                     titlebuttonSprite.drawAt(var8 - 73, var37 - 20);
+                     var0.drawCentered("Recover", var8, var37 + 5, 16777215, 0);
+                     var8 = Login.loginBoxX + 180 + 80;
+                     titlebuttonSprite.drawAt(var8 - 73, var37 - 20);
+                     var0.drawCentered("Back", var8, var37 + 5, 16777215, 0);
+                     var37 = 356;
+                     var1.drawCentered("Still having trouble logging in?", Varps.loginBoxCenter, var37, 268435455, 0);
                   }
                }
             }
          }
 
-         if(Client.gameState >= 10) {
-            int[] var3 = new int[4];
-            Rasterizer2D.Rasterizer2D_getClipArray(var3);
+         if (Client.gameState >= 10) {
+            int[] var38 = new int[4];
+            Rasterizer2D.Rasterizer2D_getClipArray(var38);
             Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, Huffman.canvasHeight);
             class16.loginScreenRunesAnimation.method1782(Login.xPadding - 22, Client.cycle);
             class16.loginScreenRunesAnimation.method1782(Login.xPadding + 22 + 765 - 128, Client.cycle);
-            Rasterizer2D.Rasterizer2D_setClipArray(var3);
+            Rasterizer2D.Rasterizer2D_setClipArray(var38);
          }
 
-         KeyHandler.title_muteSprite[ReflectionCheck.clientPreferences.titleMusicDisabled?1:0].drawAt(Login.xPadding + 765 - 40, 463);
-         if(Client.gameState > 5 && Client.language == 0) {
-            if(class277.__jn_by != null) {
-               var48 = Login.xPadding + 5;
-               var49 = 463;
-               byte var38 = 100;
-               byte var6 = 35;
-               class277.__jn_by.drawAt(var48, var49);
-               var0.drawCentered("World" + " " + Client.worldId, var38 / 2 + var48, var6 / 2 + var49 - 2, 16777215, 0);
-               if(FriendLoginUpdate.__kn_x != null) {
-                  var1.drawCentered("Loading...", var38 / 2 + var48, var6 / 2 + var49 + 12, 16777215, 0);
+         KeyHandler.title_muteSprite[ReflectionCheck.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463);
+         if (Client.gameState > 5 && Client.language == 0) {
+            if (class277.field1144 != null) {
+               var10 = Login.xPadding + 5;
+               var34 = 463;
+               byte var39 = 100;
+               byte var42 = 35;
+               class277.field1144.drawAt(var10, var34);
+               var0.drawCentered("World " + Client.worldId, var39 / 2 + var10, var42 / 2 + var34 - 2, 16777215, 0);
+               if (FriendLoginUpdate.field356 != null) {
+                  var1.drawCentered("Loading...", var39 / 2 + var10, var42 / 2 + var34 + 12, 16777215, 0);
                } else {
-                  var1.drawCentered("Click to switch", var38 / 2 + var48, var6 / 2 + var49 + 12, 16777215, 0);
+                  var1.drawCentered("Click to switch", var39 / 2 + var10, var42 / 2 + var34 + 12, 16777215, 0);
                }
             } else {
-               class277.__jn_by = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "sl_button", "");
+               class277.field1144 = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "sl_button", "");
             }
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/IndexStore.java b/runescape-client/src/main/java/IndexStore.java
index c17efeb20a..673372a309 100644
--- a/runescape-client/src/main/java/IndexStore.java
+++ b/runescape-client/src/main/java/IndexStore.java
@@ -37,10 +37,6 @@ public final class IndexStore {
    @Export("maxEntrySize")
    int maxEntrySize;
 
-   static {
-      IndexStore_buffer = new byte[520];
-   }
-
    @ObfuscatedSignature(
       signature = "(ILdy;Ldy;I)V"
    )
@@ -63,70 +59,80 @@ public final class IndexStore {
    public byte[] read(int var1) {
       BufferedFile var2 = this.dataFile;
       synchronized(this.dataFile) {
+         byte[] var10000;
          try {
-            Object var10000;
-            if(this.indexFile.length() < (long)(var1 * 6 + 6)) {
-               var10000 = null;
-               return (byte[])var10000;
-            } else {
-               this.indexFile.seek((long)(var1 * 6));
-               this.indexFile.read(IndexStore_buffer, 0, 6);
-               int var3 = ((IndexStore_buffer[0] & 255) << 16) + (IndexStore_buffer[2] & 255) + ((IndexStore_buffer[1] & 255) << 8);
-               int var4 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8);
-               if(var3 < 0 || var3 > this.maxEntrySize) {
-                  var10000 = null;
-                  return (byte[])var10000;
-               } else if(var4 <= 0 || (long)var4 > this.dataFile.length() / 520L) {
-                  var10000 = null;
-                  return (byte[])var10000;
-               } else {
-                  byte[] var5 = new byte[var3];
-                  int var6 = 0;
-                  int var7 = 0;
+            Object var4;
+            if (this.indexFile.length() < (long)(var1 * 6 + 6)) {
+               var4 = null;
+               var10000 = (byte[])((byte[])var4);
+               return var10000;
+            }
 
-                  while(var6 < var3) {
-                     if(var4 == 0) {
-                        var10000 = null;
-                        return (byte[])var10000;
-                     }
+            this.indexFile.seek((long)(var1 * 6));
+            this.indexFile.read(IndexStore_buffer, 0, 6);
+            int var5 = ((IndexStore_buffer[0] & 255) << 16) + (IndexStore_buffer[2] & 255) + ((IndexStore_buffer[1] & 255) << 8);
+            int var6 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8);
+            if (var5 < 0 || var5 > this.maxEntrySize) {
+               var4 = null;
+               var10000 = (byte[])((byte[])var4);
+               return var10000;
+            }
 
-                     this.dataFile.seek((long)(var4 * 520));
-                     int var8 = var3 - var6;
-                     if(var8 > 512) {
-                        var8 = 512;
-                     }
+            if (var6 > 0 && (long)var6 <= this.dataFile.length() / 520L) {
+               byte[] var7 = new byte[var5];
+               int var8 = 0;
+               int var9 = 0;
 
-                     this.dataFile.read(IndexStore_buffer, 0, var8 + 8);
-                     int var9 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8);
-                     int var10 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8);
-                     int var11 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255);
-                     int var12 = IndexStore_buffer[7] & 255;
-                     if(var9 == var1 && var7 == var10 && var12 == this.index) {
-                        if(var11 >= 0 && (long)var11 <= this.dataFile.length() / 520L) {
-                           for(int var13 = 0; var13 < var8; ++var13) {
-                              var5[var6++] = IndexStore_buffer[var13 + 8];
-                           }
-
-                           var4 = var11;
-                           ++var7;
-                           continue;
-                        }
-
-                        var10000 = null;
-                        return (byte[])var10000;
-                     }
-
-                     var10000 = null;
-                     return (byte[])var10000;
+               while (var8 < var5) {
+                  if (var6 == 0) {
+                     var4 = null;
+                     var10000 = (byte[])((byte[])var4);
+                     return var10000;
                   }
 
-                  byte[] var18 = var5;
-                  return var18;
+                  this.dataFile.seek((long)(var6 * 520));
+                  int var10 = var5 - var8;
+                  if (var10 > 512) {
+                     var10 = 512;
+                  }
+
+                  this.dataFile.read(IndexStore_buffer, 0, var10 + 8);
+                  int var11 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8);
+                  int var12 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8);
+                  int var13 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255);
+                  int var14 = IndexStore_buffer[7] & 255;
+                  if (var11 == var1 && var9 == var12 && var14 == this.index) {
+                     if (var13 >= 0 && (long)var13 <= this.dataFile.length() / 520L) {
+                        for (int var15 = 0; var15 < var10; ++var15) {
+                           var7[var8++] = IndexStore_buffer[var15 + 8];
+                        }
+
+                        var6 = var13;
+                        ++var9;
+                        continue;
+                     }
+
+                     var4 = null;
+                     var10000 = (byte[])((byte[])var4);
+                     return var10000;
+                  }
+
+                  var4 = null;
+                  var10000 = (byte[])((byte[])var4);
+                  return var10000;
                }
+
+               var10000 = var7;
+               return var10000;
             }
-         } catch (IOException var16) {
+
+            var4 = null;
+            var10000 = (byte[])((byte[])var4);
+         } catch (IOException var17) {
             return null;
          }
+
+         return var10000;
       }
    }
 
@@ -139,13 +145,13 @@ public final class IndexStore {
    public boolean write(int var1, byte[] var2, int var3) {
       BufferedFile var4 = this.dataFile;
       synchronized(this.dataFile) {
-         if(var3 >= 0 && var3 <= this.maxEntrySize) {
-            boolean var5 = this.write0(var1, var2, var3, true);
-            if(!var5) {
-               var5 = this.write0(var1, var2, var3, false);
+         if (var3 >= 0 && var3 <= this.maxEntrySize) {
+            boolean var6 = this.write0(var1, var2, var3, true);
+            if (!var6) {
+               var6 = this.write0(var1, var2, var3, false);
             }
 
-            return var5;
+            return var6;
          } else {
             throw new IllegalArgumentException();
          }
@@ -162,108 +168,114 @@ public final class IndexStore {
       BufferedFile var5 = this.dataFile;
       synchronized(this.dataFile) {
          try {
-            int var6;
+            int var7;
+            boolean var8;
             boolean var10000;
-            if(var4) {
-               if(this.indexFile.length() < (long)(var1 * 6 + 6)) {
-                  var10000 = false;
+            if (var4) {
+               if (this.indexFile.length() < (long)(var1 * 6 + 6)) {
+                  var8 = false;
+                  var10000 = var8;
                   return var10000;
                }
 
                this.indexFile.seek((long)(var1 * 6));
                this.indexFile.read(IndexStore_buffer, 0, 6);
-               var6 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8);
-               if(var6 <= 0 || (long)var6 > this.dataFile.length() / 520L) {
-                  var10000 = false;
+               var7 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8);
+               if (var7 <= 0 || (long)var7 > this.dataFile.length() / 520L) {
+                  var8 = false;
+                  var10000 = var8;
                   return var10000;
                }
             } else {
-               var6 = (int)((this.dataFile.length() + 519L) / 520L);
-               if(var6 == 0) {
-                  var6 = 1;
+               var7 = (int)((this.dataFile.length() + 519L) / 520L);
+               if (var7 == 0) {
+                  var7 = 1;
                }
             }
 
             IndexStore_buffer[0] = (byte)(var3 >> 16);
             IndexStore_buffer[1] = (byte)(var3 >> 8);
             IndexStore_buffer[2] = (byte)var3;
-            IndexStore_buffer[3] = (byte)(var6 >> 16);
-            IndexStore_buffer[4] = (byte)(var6 >> 8);
-            IndexStore_buffer[5] = (byte)var6;
+            IndexStore_buffer[3] = (byte)(var7 >> 16);
+            IndexStore_buffer[4] = (byte)(var7 >> 8);
+            IndexStore_buffer[5] = (byte)var7;
             this.indexFile.seek((long)(var1 * 6));
             this.indexFile.write(IndexStore_buffer, 0, 6);
-            int var7 = 0;
-            int var8 = 0;
+            int var9 = 0;
+            int var10 = 0;
 
-            while(true) {
-               if(var7 < var3) {
-                  label142: {
-                     int var9 = 0;
-                     int var14;
-                     if(var4) {
-                        this.dataFile.seek((long)(var6 * 520));
+            while (true) {
+               if (var9 < var3) {
+                  label129: {
+                     int var11 = 0;
+                     int var12;
+                     if (var4) {
+                        this.dataFile.seek((long)(var7 * 520));
 
                         try {
                            this.dataFile.read(IndexStore_buffer, 0, 8);
                         } catch (EOFException var16) {
-                           break label142;
+                           break label129;
                         }
 
-                        var14 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8);
-                        int var11 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8);
-                        var9 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255);
-                        int var12 = IndexStore_buffer[7] & 255;
-                        if(var14 != var1 || var11 != var8 || var12 != this.index) {
-                           var10000 = false;
+                        var12 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8);
+                        int var13 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8);
+                        var11 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255);
+                        int var14 = IndexStore_buffer[7] & 255;
+                        if (var12 != var1 || var13 != var10 || var14 != this.index) {
+                           var8 = false;
+                           var10000 = var8;
                            return var10000;
                         }
 
-                        if(var9 < 0 || (long)var9 > this.dataFile.length() / 520L) {
-                           var10000 = false;
+                        if (var11 < 0 || (long)var11 > this.dataFile.length() / 520L) {
+                           var8 = false;
+                           var10000 = var8;
                            return var10000;
                         }
                      }
 
-                     if(var9 == 0) {
+                     if (var11 == 0) {
                         var4 = false;
-                        var9 = (int)((this.dataFile.length() + 519L) / 520L);
-                        if(var9 == 0) {
-                           ++var9;
+                        var11 = (int)((this.dataFile.length() + 519L) / 520L);
+                        if (var11 == 0) {
+                           ++var11;
                         }
 
-                        if(var6 == var9) {
-                           ++var9;
+                        if (var7 == var11) {
+                           ++var11;
                         }
                      }
 
-                     if(var3 - var7 <= 512) {
-                        var9 = 0;
+                     if (var3 - var9 <= 512) {
+                        var11 = 0;
                      }
 
                      IndexStore_buffer[0] = (byte)(var1 >> 8);
                      IndexStore_buffer[1] = (byte)var1;
-                     IndexStore_buffer[2] = (byte)(var8 >> 8);
-                     IndexStore_buffer[3] = (byte)var8;
-                     IndexStore_buffer[4] = (byte)(var9 >> 16);
-                     IndexStore_buffer[5] = (byte)(var9 >> 8);
-                     IndexStore_buffer[6] = (byte)var9;
+                     IndexStore_buffer[2] = (byte)(var10 >> 8);
+                     IndexStore_buffer[3] = (byte)var10;
+                     IndexStore_buffer[4] = (byte)(var11 >> 16);
+                     IndexStore_buffer[5] = (byte)(var11 >> 8);
+                     IndexStore_buffer[6] = (byte)var11;
                      IndexStore_buffer[7] = (byte)this.index;
-                     this.dataFile.seek((long)(var6 * 520));
+                     this.dataFile.seek((long)(var7 * 520));
                      this.dataFile.write(IndexStore_buffer, 0, 8);
-                     var14 = var3 - var7;
-                     if(var14 > 512) {
-                        var14 = 512;
+                     var12 = var3 - var9;
+                     if (var12 > 512) {
+                        var12 = 512;
                      }
 
-                     this.dataFile.write(var2, var7, var14);
-                     var7 += var14;
-                     var6 = var9;
-                     ++var8;
+                     this.dataFile.write(var2, var9, var12);
+                     var9 += var12;
+                     var7 = var11;
+                     ++var10;
                      continue;
                   }
                }
 
-               var10000 = true;
+               var8 = true;
+               var10000 = var8;
                return var10000;
             }
          } catch (IOException var17) {
@@ -289,200 +301,195 @@ public final class IndexStore {
       byte var11 = 0;
       int var12 = 0;
       class178.bufferX[var11] = var0;
-      int var20 = var11 + 1;
+      int var13 = var11 + 1;
       class178.bufferY[var11] = var1;
-      int[][] var13 = var4.flags;
+      int[][] var14 = var4.flags;
 
-      while(true) {
-         label300:
-         while(true) {
-            int var14;
-            int var15;
-            int var16;
-            int var17;
-            int var18;
-            int var19;
-            do {
-               do {
-                  do {
-                     label277:
-                     do {
-                        if(var20 == var12) {
-                           WidgetGroupParent.__bx_o = var5;
-                           UrlRequester.__eo_u = var6;
-                           return false;
-                        }
+      label204:
+      while (var13 != var12) {
+         var5 = class178.bufferX[var12];
+         var6 = class178.bufferY[var12];
+         var12 = var12 + 1 & 4095;
+         int var19 = var5 - var9;
+         int var20 = var6 - var10;
+         int var15 = var5 - var4.xInset;
+         int var16 = var6 - var4.yInset;
+         if (var3.vmethod3644(var2, var5, var6, var4)) {
+            WidgetGroupParent.field986 = var5;
+            UrlRequester.field929 = var6;
+            return true;
+         }
 
-                        var5 = class178.bufferX[var12];
-                        var6 = class178.bufferY[var12];
-                        var12 = var12 + 1 & 4095;
-                        var18 = var5 - var9;
-                        var19 = var6 - var10;
-                        var14 = var5 - var4.xInset;
-                        var15 = var6 - var4.yInset;
-                        if(var3.vmethod3644(var2, var5, var6, var4)) {
-                           WidgetGroupParent.__bx_o = var5;
-                           UrlRequester.__eo_u = var6;
-                           return true;
-                        }
+         int var17 = class178.distances[var19][var20] + 1;
+         int var18;
+         if (var19 > 0 && class178.directions[var19 - 1][var20] == 0 && (var14[var15 - 1][var16] & 19136782) == 0 && (var14[var15 - 1][var16 + var2 - 1] & 19136824) == 0) {
+            var18 = 1;
 
-                        var16 = class178.distances[var18][var19] + 1;
-                        if(var18 > 0 && class178.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) {
-                           var17 = 1;
+            while (true) {
+               if (var18 >= var2 - 1) {
+                  class178.bufferX[var13] = var5 - 1;
+                  class178.bufferY[var13] = var6;
+                  var13 = var13 + 1 & 4095;
+                  class178.directions[var19 - 1][var20] = 2;
+                  class178.distances[var19 - 1][var20] = var17;
+                  break;
+               }
 
-                           while(true) {
-                              if(var17 >= var2 - 1) {
-                                 class178.bufferX[var20] = var5 - 1;
-                                 class178.bufferY[var20] = var6;
-                                 var20 = var20 + 1 & 4095;
-                                 class178.directions[var18 - 1][var19] = 2;
-                                 class178.distances[var18 - 1][var19] = var16;
-                                 break;
-                              }
+               if ((var14[var15 - 1][var18 + var16] & 19136830) != 0) {
+                  break;
+               }
 
-                              if((var13[var14 - 1][var17 + var15] & 19136830) != 0) {
-                                 break;
-                              }
+               ++var18;
+            }
+         }
 
-                              ++var17;
-                           }
-                        }
+         if (var19 < 128 - var2 && class178.directions[var19 + 1][var20] == 0 && (var14[var15 + var2][var16] & 19136899) == 0 && (var14[var15 + var2][var16 + var2 - 1] & 19136992) == 0) {
+            var18 = 1;
 
-                        if(var18 < 128 - var2 && class178.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) {
-                           var17 = 1;
+            while (true) {
+               if (var18 >= var2 - 1) {
+                  class178.bufferX[var13] = var5 + 1;
+                  class178.bufferY[var13] = var6;
+                  var13 = var13 + 1 & 4095;
+                  class178.directions[var19 + 1][var20] = 8;
+                  class178.distances[var19 + 1][var20] = var17;
+                  break;
+               }
 
-                           while(true) {
-                              if(var17 >= var2 - 1) {
-                                 class178.bufferX[var20] = var5 + 1;
-                                 class178.bufferY[var20] = var6;
-                                 var20 = var20 + 1 & 4095;
-                                 class178.directions[var18 + 1][var19] = 8;
-                                 class178.distances[var18 + 1][var19] = var16;
-                                 break;
-                              }
+               if ((var14[var15 + var2][var16 + var18] & 19136995) != 0) {
+                  break;
+               }
 
-                              if((var13[var14 + var2][var15 + var17] & 19136995) != 0) {
-                                 break;
-                              }
+               ++var18;
+            }
+         }
 
-                              ++var17;
-                           }
-                        }
+         if (var20 > 0 && class178.directions[var19][var20 - 1] == 0 && (var14[var15][var16 - 1] & 19136782) == 0 && (var14[var15 + var2 - 1][var16 - 1] & 19136899) == 0) {
+            var18 = 1;
 
-                        if(var19 > 0 && class178.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) {
-                           var17 = 1;
+            while (true) {
+               if (var18 >= var2 - 1) {
+                  class178.bufferX[var13] = var5;
+                  class178.bufferY[var13] = var6 - 1;
+                  var13 = var13 + 1 & 4095;
+                  class178.directions[var19][var20 - 1] = 1;
+                  class178.distances[var19][var20 - 1] = var17;
+                  break;
+               }
 
-                           while(true) {
-                              if(var17 >= var2 - 1) {
-                                 class178.bufferX[var20] = var5;
-                                 class178.bufferY[var20] = var6 - 1;
-                                 var20 = var20 + 1 & 4095;
-                                 class178.directions[var18][var19 - 1] = 1;
-                                 class178.distances[var18][var19 - 1] = var16;
-                                 break;
-                              }
+               if ((var14[var18 + var15][var16 - 1] & 19136911) != 0) {
+                  break;
+               }
 
-                              if((var13[var17 + var14][var15 - 1] & 19136911) != 0) {
-                                 break;
-                              }
+               ++var18;
+            }
+         }
 
-                              ++var17;
-                           }
-                        }
+         if (var20 < 128 - var2 && class178.directions[var19][var20 + 1] == 0 && (var14[var15][var16 + var2] & 19136824) == 0 && (var14[var15 + var2 - 1][var16 + var2] & 19136992) == 0) {
+            var18 = 1;
 
-                        if(var19 < 128 - var2 && class178.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) {
-                           var17 = 1;
+            while (true) {
+               if (var18 >= var2 - 1) {
+                  class178.bufferX[var13] = var5;
+                  class178.bufferY[var13] = var6 + 1;
+                  var13 = var13 + 1 & 4095;
+                  class178.directions[var19][var20 + 1] = 4;
+                  class178.distances[var19][var20 + 1] = var17;
+                  break;
+               }
 
-                           while(true) {
-                              if(var17 >= var2 - 1) {
-                                 class178.bufferX[var20] = var5;
-                                 class178.bufferY[var20] = var6 + 1;
-                                 var20 = var20 + 1 & 4095;
-                                 class178.directions[var18][var19 + 1] = 4;
-                                 class178.distances[var18][var19 + 1] = var16;
-                                 break;
-                              }
+               if ((var14[var18 + var15][var16 + var2] & 19137016) != 0) {
+                  break;
+               }
 
-                              if((var13[var17 + var14][var15 + var2] & 19137016) != 0) {
-                                 break;
-                              }
+               ++var18;
+            }
+         }
 
-                              ++var17;
-                           }
-                        }
+         if (var19 > 0 && var20 > 0 && class178.directions[var19 - 1][var20 - 1] == 0 && (var14[var15 - 1][var16 - 1] & 19136782) == 0) {
+            var18 = 1;
 
-                        if(var18 > 0 && var19 > 0 && class178.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) {
-                           var17 = 1;
+            while (true) {
+               if (var18 >= var2) {
+                  class178.bufferX[var13] = var5 - 1;
+                  class178.bufferY[var13] = var6 - 1;
+                  var13 = var13 + 1 & 4095;
+                  class178.directions[var19 - 1][var20 - 1] = 3;
+                  class178.distances[var19 - 1][var20 - 1] = var17;
+                  break;
+               }
 
-                           while(true) {
-                              if(var17 >= var2) {
-                                 class178.bufferX[var20] = var5 - 1;
-                                 class178.bufferY[var20] = var6 - 1;
-                                 var20 = var20 + 1 & 4095;
-                                 class178.directions[var18 - 1][var19 - 1] = 3;
-                                 class178.distances[var18 - 1][var19 - 1] = var16;
-                                 break;
-                              }
+               if ((var14[var15 - 1][var18 + (var16 - 1)] & 19136830) != 0 || (var14[var18 + (var15 - 1)][var16 - 1] & 19136911) != 0) {
+                  break;
+               }
 
-                              if((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) {
-                                 break;
-                              }
+               ++var18;
+            }
+         }
 
-                              ++var17;
-                           }
-                        }
+         if (var19 < 128 - var2 && var20 > 0 && class178.directions[var19 + 1][var20 - 1] == 0 && (var14[var15 + var2][var16 - 1] & 19136899) == 0) {
+            var18 = 1;
 
-                        if(var18 < 128 - var2 && var19 > 0 && class178.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) {
-                           var17 = 1;
+            while (true) {
+               if (var18 >= var2) {
+                  class178.bufferX[var13] = var5 + 1;
+                  class178.bufferY[var13] = var6 - 1;
+                  var13 = var13 + 1 & 4095;
+                  class178.directions[var19 + 1][var20 - 1] = 9;
+                  class178.distances[var19 + 1][var20 - 1] = var17;
+                  break;
+               }
 
-                           while(true) {
-                              if(var17 >= var2) {
-                                 class178.bufferX[var20] = var5 + 1;
-                                 class178.bufferY[var20] = var6 - 1;
-                                 var20 = var20 + 1 & 4095;
-                                 class178.directions[var18 + 1][var19 - 1] = 9;
-                                 class178.distances[var18 + 1][var19 - 1] = var16;
-                                 break;
-                              }
+               if ((var14[var15 + var2][var18 + (var16 - 1)] & 19136995) != 0 || (var14[var18 + var15][var16 - 1] & 19136911) != 0) {
+                  break;
+               }
 
-                              if((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var17 + var14][var15 - 1] & 19136911) != 0) {
-                                 break;
-                              }
+               ++var18;
+            }
+         }
 
-                              ++var17;
-                           }
-                        }
+         if (var19 > 0 && var20 < 128 - var2 && class178.directions[var19 - 1][var20 + 1] == 0 && (var14[var15 - 1][var16 + var2] & 19136824) == 0) {
+            var18 = 1;
 
-                        if(var18 > 0 && var19 < 128 - var2 && class178.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) {
-                           for(var17 = 1; var17 < var2; ++var17) {
-                              if((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) {
-                                 continue label277;
-                              }
-                           }
+            while (true) {
+               if (var18 >= var2) {
+                  class178.bufferX[var13] = var5 - 1;
+                  class178.bufferY[var13] = var6 + 1;
+                  var13 = var13 + 1 & 4095;
+                  class178.directions[var19 - 1][var20 + 1] = 6;
+                  class178.distances[var19 - 1][var20 + 1] = var17;
+                  break;
+               }
 
-                           class178.bufferX[var20] = var5 - 1;
-                           class178.bufferY[var20] = var6 + 1;
-                           var20 = var20 + 1 & 4095;
-                           class178.directions[var18 - 1][var19 + 1] = 6;
-                           class178.distances[var18 - 1][var19 + 1] = var16;
-                        }
-                     } while(var18 >= 128 - var2);
-                  } while(var19 >= 128 - var2);
-               } while(class178.directions[var18 + 1][var19 + 1] != 0);
-            } while((var13[var14 + var2][var15 + var2] & 19136992) != 0);
+               if ((var14[var15 - 1][var16 + var18] & 19136830) != 0 || (var14[var18 + (var15 - 1)][var16 + var2] & 19137016) != 0) {
+                  break;
+               }
 
-            for(var17 = 1; var17 < var2; ++var17) {
-               if((var13[var14 + var17][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) {
-                  continue label300;
+               ++var18;
+            }
+         }
+
+         if (var19 < 128 - var2 && var20 < 128 - var2 && class178.directions[var19 + 1][var20 + 1] == 0 && (var14[var15 + var2][var16 + var2] & 19136992) == 0) {
+            for (var18 = 1; var18 < var2; ++var18) {
+               if ((var14[var15 + var18][var16 + var2] & 19137016) != 0 || (var14[var15 + var2][var18 + var16] & 19136995) != 0) {
+                  continue label204;
                }
             }
 
-            class178.bufferX[var20] = var5 + 1;
-            class178.bufferY[var20] = var6 + 1;
-            var20 = var20 + 1 & 4095;
-            class178.directions[var18 + 1][var19 + 1] = 12;
-            class178.distances[var18 + 1][var19 + 1] = var16;
+            class178.bufferX[var13] = var5 + 1;
+            class178.bufferY[var13] = var6 + 1;
+            var13 = var13 + 1 & 4095;
+            class178.directions[var19 + 1][var20 + 1] = 12;
+            class178.distances[var19 + 1][var20 + 1] = var17;
          }
       }
+
+      WidgetGroupParent.field986 = var5;
+      UrlRequester.field929 = var6;
+      return false;
+   }
+
+   static {
+      IndexStore_buffer = new byte[520];
    }
 }
diff --git a/runescape-client/src/main/java/IndexStoreAction.java b/runescape-client/src/main/java/IndexStoreAction.java
index 99aa4acd1b..c8b7bdd8da 100644
--- a/runescape-client/src/main/java/IndexStoreAction.java
+++ b/runescape-client/src/main/java/IndexStoreAction.java
@@ -11,7 +11,7 @@ public class IndexStoreAction extends Node {
    @ObfuscatedGetter(
       intValue = -1086790653
    )
-   static int __ik_rt;
+   static int field410;
    @ObfuscatedName("a")
    @ObfuscatedSignature(
       signature = "[Ldy;"
@@ -22,7 +22,7 @@ public class IndexStoreAction extends Node {
    @ObfuscatedGetter(
       intValue = -1753937079
    )
-   public static int __ik_cn;
+   public static int field411;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = -1942326733
@@ -51,66 +51,66 @@ public class IndexStoreAction extends Node {
       garbageValue = "483387730"
    )
    static final void method4553(Actor var0) {
-      if(var0.__cj != 0) {
-         if(var0.targetIndex != -1) {
+      if (var0.field23 != 0) {
+         if (var0.targetIndex != -1) {
             Object var1 = null;
-            if(var0.targetIndex < 32768) {
+            if (var0.targetIndex < 32768) {
                var1 = Client.npcs[var0.targetIndex];
-            } else if(var0.targetIndex >= 32768) {
+            } else if (var0.targetIndex >= 32768) {
                var1 = Client.players[var0.targetIndex - 32768];
             }
 
-            if(var1 != null) {
+            if (var1 != null) {
                int var2 = var0.x - ((Actor)var1).x;
                int var3 = var0.y - ((Actor)var1).y;
-               if(var2 != 0 || var3 != 0) {
+               if (var2 != 0 || var3 != 0) {
                   var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047;
                }
-            } else if(var0.false0) {
+            } else if (var0.false0) {
                var0.targetIndex = -1;
                var0.false0 = false;
             }
          }
 
-         if(var0.__bc != -1 && (var0.pathLength == 0 || var0.__cq > 0)) {
-            var0.orientation = var0.__bc;
-            var0.__bc = -1;
+         if (var0.field12 != -1 && (var0.pathLength == 0 || var0.field24 > 0)) {
+            var0.orientation = var0.field12;
+            var0.field12 = -1;
          }
 
-         int var4 = var0.orientation - var0.__ac & 2047;
-         if(var4 == 0 && var0.false0) {
+         int var4 = var0.orientation - var0.field9 & 2047;
+         if (var4 == 0 && var0.false0) {
             var0.targetIndex = -1;
             var0.false0 = false;
          }
 
-         if(var4 != 0) {
-            ++var0.__cm;
-            boolean var6;
-            if(var4 > 1024) {
-               var0.__ac -= var0.__cj;
-               var6 = true;
-               if(var4 < var0.__cj || var4 > 2048 - var0.__cj) {
-                  var0.__ac = var0.orientation;
-                  var6 = false;
+         if (var4 != 0) {
+            ++var0.field22;
+            boolean var5;
+            if (var4 > 1024) {
+               var0.field9 -= var0.field23;
+               var5 = true;
+               if (var4 < var0.field23 || var4 > 2048 - var0.field23) {
+                  var0.field9 = var0.orientation;
+                  var5 = false;
                }
 
-               if(var0.movementSequence == var0.idleSequence && (var0.__cm > 25 || var6)) {
-                  if(var0.turnLeftSequence != -1) {
+               if (var0.movementSequence == var0.idleSequence && (var0.field22 > 25 || var5)) {
+                  if (var0.turnLeftSequence != -1) {
                      var0.movementSequence = var0.turnLeftSequence;
                   } else {
                      var0.movementSequence = var0.walkSequence;
                   }
                }
             } else {
-               var0.__ac += var0.__cj;
-               var6 = true;
-               if(var4 < var0.__cj || var4 > 2048 - var0.__cj) {
-                  var0.__ac = var0.orientation;
-                  var6 = false;
+               var0.field9 += var0.field23;
+               var5 = true;
+               if (var4 < var0.field23 || var4 > 2048 - var0.field23) {
+                  var0.field9 = var0.orientation;
+                  var5 = false;
                }
 
-               if(var0.movementSequence == var0.idleSequence && (var0.__cm > 25 || var6)) {
-                  if(var0.turnRightSequence != -1) {
+               if (var0.movementSequence == var0.idleSequence && (var0.field22 > 25 || var5)) {
+                  if (var0.turnRightSequence != -1) {
                      var0.movementSequence = var0.turnRightSequence;
                   } else {
                      var0.movementSequence = var0.walkSequence;
@@ -118,11 +118,11 @@ public class IndexStoreAction extends Node {
                }
             }
 
-            var0.__ac &= 2047;
+            var0.field9 &= 2047;
          } else {
-            var0.__cm = 0;
+            var0.field22 = 0;
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/IndexStoreActionHandler.java b/runescape-client/src/main/java/IndexStoreActionHandler.java
index 5d0c97e34c..608fb79d1e 100644
--- a/runescape-client/src/main/java/IndexStoreActionHandler.java
+++ b/runescape-client/src/main/java/IndexStoreActionHandler.java
@@ -23,71 +23,64 @@ public class IndexStoreActionHandler implements Runnable {
    @ObfuscatedGetter(
       intValue = -1282224505
    )
-   static int __iv_q;
+   static int field412;
    @ObfuscatedName("w")
    @Export("IndexStoreActionHandler_lock")
    static Object IndexStoreActionHandler_lock;
 
-   static {
-      IndexStoreActionHandler_requestQueue = new NodeDeque();
-      IndexStoreActionHandler_responseQueue = new NodeDeque();
-      __iv_q = 0;
-      IndexStoreActionHandler_lock = new Object();
-   }
-
    @Export("run")
    @ObfuscatedName("run")
    public void run() {
       try {
-         while(true) {
-            NodeDeque var2 = IndexStoreActionHandler_requestQueue;
-            IndexStoreAction var1;
+         while (true) {
+            NodeDeque var1 = IndexStoreActionHandler_requestQueue;
+            IndexStoreAction var2;
             synchronized(IndexStoreActionHandler_requestQueue) {
-               var1 = (IndexStoreAction)IndexStoreActionHandler_requestQueue.last();
+               var2 = (IndexStoreAction)IndexStoreActionHandler_requestQueue.last();
             }
 
-            Object var14;
-            if(var1 != null) {
-               if(var1.type == 0) {
-                  var1.indexStore.write((int)var1.key, var1.data, var1.data.length);
-                  var2 = IndexStoreActionHandler_requestQueue;
+            Object var3;
+            if (var2 != null) {
+               if (var2.type == 0) {
+                  var2.indexStore.write((int)var2.key, var2.data, var2.data.length);
+                  var1 = IndexStoreActionHandler_requestQueue;
                   synchronized(IndexStoreActionHandler_requestQueue) {
-                     var1.remove();
+                     var2.remove();
                   }
-               } else if(var1.type == 1) {
-                  var1.data = var1.indexStore.read((int)var1.key);
-                  var2 = IndexStoreActionHandler_requestQueue;
+               } else if (var2.type == 1) {
+                  var2.data = var2.indexStore.read((int)var2.key);
+                  var1 = IndexStoreActionHandler_requestQueue;
                   synchronized(IndexStoreActionHandler_requestQueue) {
-                     IndexStoreActionHandler_responseQueue.addFirst(var1);
+                     IndexStoreActionHandler_responseQueue.addFirst(var2);
                   }
                }
 
-               var14 = IndexStoreActionHandler_lock;
+               var3 = IndexStoreActionHandler_lock;
                synchronized(IndexStoreActionHandler_lock) {
-                  if(__iv_q <= 1) {
-                     __iv_q = 0;
+                  if (field412 <= 1) {
+                     field412 = 0;
                      IndexStoreActionHandler_lock.notifyAll();
                      return;
                   }
 
-                  __iv_q = 600;
+                  field412 = 600;
                }
             } else {
                class203.method4010(100L);
-               var14 = IndexStoreActionHandler_lock;
+               var3 = IndexStoreActionHandler_lock;
                synchronized(IndexStoreActionHandler_lock) {
-                  if(__iv_q <= 1) {
-                     __iv_q = 0;
+                  if (field412 <= 1) {
+                     field412 = 0;
                      IndexStoreActionHandler_lock.notifyAll();
                      return;
                   }
 
-                  --__iv_q;
+                  --field412;
                }
             }
          }
-      } catch (Exception var13) {
-         NpcDefinition.sendStackTrace((String)null, var13);
+      } catch (Exception var14) {
+         NPCDefinition.sendStackTrace((String)null, var14);
       }
    }
 
@@ -97,11 +90,19 @@ public class IndexStoreActionHandler implements Runnable {
       garbageValue = "67"
    )
    static final void method4655(String var0) {
-      if(PacketWriter.clanChat != null) {
-         PacketBufferNode var1 = Interpreter.method1915(ClientPacket.__gs_i, Client.packetWriter.isaacCipher);
+      if (PacketWriter.clanChat != null) {
+         PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field235, Client.packetWriter.isaacCipher);
          var1.packetBuffer.writeByte(WorldMapRegion.method550(var0));
          var1.packetBuffer.writeStringCp1252NullTerminated(var0);
-         Client.packetWriter.__q_167(var1);
+         Client.packetWriter.method241(var1);
       }
+
+   }
+
+   static {
+      IndexStoreActionHandler_requestQueue = new NodeDeque();
+      IndexStoreActionHandler_responseQueue = new NodeDeque();
+      field412 = 0;
+      IndexStoreActionHandler_lock = new Object();
    }
 }
diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java
index 9a0e481697..85002bdf4e 100644
--- a/runescape-client/src/main/java/IndexedSprite.java
+++ b/runescape-client/src/main/java/IndexedSprite.java
@@ -33,12 +33,12 @@ public final class IndexedSprite extends Rasterizer2D {
    @ObfuscatedName("m")
    @Export("normalize")
    public void normalize() {
-      if(this.subWidth != this.width || this.subHeight != this.height) {
+      if (this.subWidth != this.width || this.subHeight != this.height) {
          byte[] var1 = new byte[this.width * this.height];
          int var2 = 0;
 
-         for(int var3 = 0; var3 < this.subHeight; ++var3) {
-            for(int var4 = 0; var4 < this.subWidth; ++var4) {
+         for (int var3 = 0; var3 < this.subHeight; ++var3) {
+            for (int var4 = 0; var4 < this.subWidth; ++var4) {
                var1[var4 + (var3 + this.yOffset) * this.width + this.xOffset] = this.pixels[var2++];
             }
          }
@@ -49,33 +49,34 @@ public final class IndexedSprite extends Rasterizer2D {
          this.xOffset = 0;
          this.yOffset = 0;
       }
+
    }
 
    @ObfuscatedName("f")
    @Export("shiftColors")
    public void shiftColors(int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < this.palette.length; ++var4) {
+      for (int var4 = 0; var4 < this.palette.length; ++var4) {
          int var5 = this.palette[var4] >> 16 & 255;
          var5 += var1;
-         if(var5 < 0) {
+         if (var5 < 0) {
             var5 = 0;
-         } else if(var5 > 255) {
+         } else if (var5 > 255) {
             var5 = 255;
          }
 
          int var6 = this.palette[var4] >> 8 & 255;
          var6 += var2;
-         if(var6 < 0) {
+         if (var6 < 0) {
             var6 = 0;
-         } else if(var6 > 255) {
+         } else if (var6 > 255) {
             var6 = 255;
          }
 
          int var7 = this.palette[var4] & 255;
          var7 += var3;
-         if(var7 < 0) {
+         if (var7 < 0) {
             var7 = 0;
-         } else if(var7 > 255) {
+         } else if (var7 > 255) {
             var7 = 255;
          }
 
@@ -86,52 +87,53 @@ public final class IndexedSprite extends Rasterizer2D {
 
    @ObfuscatedName("q")
    @Export("drawAt")
-   public void drawAt(int x, int y) {
-      x += this.xOffset;
-      y += this.yOffset;
-      int var3 = x + y * Rasterizer2D.Rasterizer2D_width;
+   public void drawAt(int var1, int var2) {
+      var1 += this.xOffset;
+      var2 += this.yOffset;
+      int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
       int var4 = 0;
       int var5 = this.subHeight;
       int var6 = this.subWidth;
       int var7 = Rasterizer2D.Rasterizer2D_width - var6;
       int var8 = 0;
       int var9;
-      if(y < Rasterizer2D.Rasterizer2D_yClipStart) {
-         var9 = Rasterizer2D.Rasterizer2D_yClipStart - y;
+      if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+         var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
          var5 -= var9;
-         y = Rasterizer2D.Rasterizer2D_yClipStart;
+         var2 = Rasterizer2D.Rasterizer2D_yClipStart;
          var4 += var9 * var6;
          var3 += var9 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var5 + y > Rasterizer2D.Rasterizer2D_yClipEnd) {
-         var5 -= var5 + y - Rasterizer2D.Rasterizer2D_yClipEnd;
+      if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(x < Rasterizer2D.Rasterizer2D_xClipStart) {
-         var9 = Rasterizer2D.Rasterizer2D_xClipStart - x;
+      if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+         var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
          var6 -= var9;
-         x = Rasterizer2D.Rasterizer2D_xClipStart;
+         var1 = Rasterizer2D.Rasterizer2D_xClipStart;
          var4 += var9;
          var3 += var9;
          var8 += var9;
          var7 += var9;
       }
 
-      if(var6 + x > Rasterizer2D.Rasterizer2D_xClipEnd) {
-         var9 = var6 + x - Rasterizer2D.Rasterizer2D_xClipEnd;
+      if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var6 -= var9;
          var8 += var9;
          var7 += var9;
       }
 
-      if(var6 > 0 && var5 > 0) {
+      if (var6 > 0 && var5 > 0) {
          IndexedSprite_two(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var4, var3, var6, var5, var7, var8);
       }
+
    }
 
    @ObfuscatedName("o")
-   public void __o_497(int var1, int var2, int var3, int var4) {
+   public void method135(int var1, int var2, int var3, int var4) {
       int var5 = this.subWidth;
       int var6 = this.subHeight;
       int var7 = 0;
@@ -141,47 +143,47 @@ public final class IndexedSprite extends Rasterizer2D {
       int var11 = (var9 << 16) / var3;
       int var12 = (var10 << 16) / var4;
       int var13;
-      if(this.xOffset > 0) {
+      if (this.xOffset > 0) {
          var13 = (var11 + (this.xOffset << 16) - 1) / var11;
          var1 += var13;
          var7 += var13 * var11 - (this.xOffset << 16);
       }
 
-      if(this.yOffset > 0) {
+      if (this.yOffset > 0) {
          var13 = (var12 + (this.yOffset << 16) - 1) / var12;
          var2 += var13;
          var8 += var13 * var12 - (this.yOffset << 16);
       }
 
-      if(var5 < var9) {
+      if (var5 < var9) {
          var3 = (var11 + ((var5 << 16) - var7) - 1) / var11;
       }
 
-      if(var6 < var10) {
+      if (var6 < var10) {
          var4 = (var12 + ((var6 << 16) - var8) - 1) / var12;
       }
 
       var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
       int var14 = Rasterizer2D.Rasterizer2D_width - var3;
-      if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
       int var15;
-      if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
          var4 -= var15;
          var13 += var15 * Rasterizer2D.Rasterizer2D_width;
          var8 += var12 * var15;
       }
 
-      if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var3 -= var15;
          var14 += var15;
       }
 
-      if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
          var3 -= var15;
          var13 += var15;
@@ -198,42 +200,42 @@ public final class IndexedSprite extends Rasterizer2D {
       int var9 = -(var5 >> 2);
       var5 = -(var5 & 3);
 
-      for(int var10 = -var6; var10 < 0; ++var10) {
+      for (int var10 = -var6; var10 < 0; ++var10) {
          int var11;
          byte var12;
-         for(var11 = var9; var11 < 0; ++var11) {
+         for (var11 = var9; var11 < 0; ++var11) {
             var12 = var1[var3++];
-            if(var12 != 0) {
+            if (var12 != 0) {
                var0[var4++] = var2[var12 & 255];
             } else {
                ++var4;
             }
 
             var12 = var1[var3++];
-            if(var12 != 0) {
+            if (var12 != 0) {
                var0[var4++] = var2[var12 & 255];
             } else {
                ++var4;
             }
 
             var12 = var1[var3++];
-            if(var12 != 0) {
+            if (var12 != 0) {
                var0[var4++] = var2[var12 & 255];
             } else {
                ++var4;
             }
 
             var12 = var1[var3++];
-            if(var12 != 0) {
+            if (var12 != 0) {
                var0[var4++] = var2[var12 & 255];
             } else {
                ++var4;
             }
          }
 
-         for(var11 = var5; var11 < 0; ++var11) {
+         for (var11 = var5; var11 < 0; ++var11) {
             var12 = var1[var3++];
-            if(var12 != 0) {
+            if (var12 != 0) {
                var0[var4++] = var2[var12 & 255];
             } else {
                ++var4;
@@ -251,12 +253,12 @@ public final class IndexedSprite extends Rasterizer2D {
    static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) {
       int var12 = var3;
 
-      for(int var13 = -var8; var13 < 0; ++var13) {
+      for (int var13 = -var8; var13 < 0; ++var13) {
          int var14 = var11 * (var4 >> 16);
 
-         for(int var15 = -var7; var15 < 0; ++var15) {
+         for (int var15 = -var7; var15 < 0; ++var15) {
             byte var16 = var1[(var3 >> 16) + var14];
-            if(var16 != 0) {
+            if (var16 != 0) {
                var0[var5++] = var2[var16 & 255];
             } else {
                ++var5;
diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java
index e6f6ae9645..d8f97202b4 100644
--- a/runescape-client/src/main/java/Instrument.java
+++ b/runescape-client/src/main/java/Instrument.java
@@ -35,42 +35,42 @@ public class Instrument {
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __m;
+   SoundEnvelope field413;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __f;
+   SoundEnvelope field414;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __q;
+   SoundEnvelope field415;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __w;
+   SoundEnvelope field416;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __o;
+   SoundEnvelope field417;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __u;
+   SoundEnvelope field418;
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __g;
+   SoundEnvelope field419;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __l;
+   SoundEnvelope field420;
    @ObfuscatedName("e")
    @Export("oscillatorVolume")
    int[] oscillatorVolume;
@@ -96,7 +96,7 @@ public class Instrument {
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __a;
+   SoundEnvelope field421;
    @ObfuscatedName("z")
    @Export("duration")
    int duration;
@@ -104,29 +104,6 @@ public class Instrument {
    @Export("offset")
    int offset;
 
-   static {
-      Instrument_noise = new int['耀'];
-      Random var0 = new Random(0L);
-
-      int var1;
-      for(var1 = 0; var1 < 32768; ++var1) {
-         Instrument_noise[var1] = (var0.nextInt() & 2) - 1;
-      }
-
-      Instrument_sine = new int['耀'];
-
-      for(var1 = 0; var1 < 32768; ++var1) {
-         Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D);
-      }
-
-      Instrument_samples = new int[220500];
-      Instrument_phases = new int[5];
-      Instrument_delays = new int[5];
-      Instrument_volumeSteps = new int[5];
-      Instrument_pitchSteps = new int[5];
-      Instrument_pitchBaseSteps = new int[5];
-   }
-
    Instrument() {
       this.oscillatorVolume = new int[]{0, 0, 0, 0, 0};
       this.oscillatorPitch = new int[]{0, 0, 0, 0, 0};
@@ -141,40 +118,40 @@ public class Instrument {
    @Export("synthesize")
    final int[] synthesize(int var1, int var2) {
       class212.clearIntArray(Instrument_samples, 0, var1);
-      if(var2 < 10) {
+      if (var2 < 10) {
          return Instrument_samples;
       } else {
          double var3 = (double)var1 / ((double)var2 + 0.0D);
-         this.__m.reset();
-         this.__f.reset();
+         this.field413.reset();
+         this.field414.reset();
          int var5 = 0;
          int var6 = 0;
          int var7 = 0;
-         if(this.__q != null) {
-            this.__q.reset();
-            this.__w.reset();
-            var5 = (int)((double)(this.__q.end - this.__q.start) * 32.768D / var3);
-            var6 = (int)((double)this.__q.start * 32.768D / var3);
+         if (this.field415 != null) {
+            this.field415.reset();
+            this.field416.reset();
+            var5 = (int)((double)(this.field415.end - this.field415.start) * 32.768D / var3);
+            var6 = (int)((double)this.field415.start * 32.768D / var3);
          }
 
          int var8 = 0;
          int var9 = 0;
          int var10 = 0;
-         if(this.__o != null) {
-            this.__o.reset();
-            this.__u.reset();
-            var8 = (int)((double)(this.__o.end - this.__o.start) * 32.768D / var3);
-            var9 = (int)((double)this.__o.start * 32.768D / var3);
+         if (this.field417 != null) {
+            this.field417.reset();
+            this.field418.reset();
+            var8 = (int)((double)(this.field417.end - this.field417.start) * 32.768D / var3);
+            var9 = (int)((double)this.field417.start * 32.768D / var3);
          }
 
          int var11;
-         for(var11 = 0; var11 < 5; ++var11) {
-            if(this.oscillatorVolume[var11] != 0) {
+         for (var11 = 0; var11 < 5; ++var11) {
+            if (this.oscillatorVolume[var11] != 0) {
                Instrument_phases[var11] = 0;
                Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3);
                Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100;
-               Instrument_pitchSteps[var11] = (int)((double)(this.__m.end - this.__m.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3);
-               Instrument_pitchBaseSteps[var11] = (int)((double)this.__m.start * 32.768D / var3);
+               Instrument_pitchSteps[var11] = (int)((double)(this.field413.end - this.field413.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3);
+               Instrument_pitchBaseSteps[var11] = (int)((double)this.field413.start * 32.768D / var3);
             }
          }
 
@@ -182,156 +159,160 @@ public class Instrument {
          int var13;
          int var14;
          int var15;
-         for(var11 = 0; var11 < var1; ++var11) {
-            var12 = this.__m.doStep(var1);
-            var13 = this.__f.doStep(var1);
-            if(this.__q != null) {
-               var14 = this.__q.doStep(var1);
-               var15 = this.__w.doStep(var1);
-               var12 += this.evaluateWave(var7, var15, this.__q.form) >> 1;
+         int[] var10000;
+         for (var11 = 0; var11 < var1; ++var11) {
+            var12 = this.field413.doStep(var1);
+            var13 = this.field414.doStep(var1);
+            if (this.field415 != null) {
+               var14 = this.field415.doStep(var1);
+               var15 = this.field416.doStep(var1);
+               var12 += this.evaluateWave(var7, var15, this.field415.form) >> 1;
                var7 = var7 + var6 + (var14 * var5 >> 16);
             }
 
-            if(this.__o != null) {
-               var14 = this.__o.doStep(var1);
-               var15 = this.__u.doStep(var1);
-               var13 = var13 * ((this.evaluateWave(var10, var15, this.__o.form) >> 1) + 32768) >> 15;
+            if (this.field417 != null) {
+               var14 = this.field417.doStep(var1);
+               var15 = this.field418.doStep(var1);
+               var13 = var13 * ((this.evaluateWave(var10, var15, this.field417.form) >> 1) + 32768) >> 15;
                var10 = var10 + var9 + (var14 * var8 >> 16);
             }
 
-            for(var14 = 0; var14 < 5; ++var14) {
-               if(this.oscillatorVolume[var14] != 0) {
+            for (var14 = 0; var14 < 5; ++var14) {
+               if (this.oscillatorVolume[var14] != 0) {
                   var15 = Instrument_delays[var14] + var11;
-                  if(var15 < var1) {
-                     Instrument_samples[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.__m.form);
-                     Instrument_phases[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14];
+                  if (var15 < var1) {
+                     var10000 = Instrument_samples;
+                     var10000[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.field413.form);
+                     var10000 = Instrument_phases;
+                     var10000[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14];
                   }
                }
             }
          }
 
          int var16;
-         if(this.__g != null) {
-            this.__g.reset();
-            this.__l.reset();
+         if (this.field419 != null) {
+            this.field419.reset();
+            this.field420.reset();
             var11 = 0;
-            boolean var19 = false;
-            boolean var20 = true;
+            boolean var17 = false;
+            boolean var18 = true;
 
-            for(var14 = 0; var14 < var1; ++var14) {
-               var15 = this.__g.doStep(var1);
-               var16 = this.__l.doStep(var1);
-               if(var20) {
-                  var12 = (var15 * (this.__g.end - this.__g.start) >> 8) + this.__g.start;
+            for (var14 = 0; var14 < var1; ++var14) {
+               var15 = this.field419.doStep(var1);
+               var16 = this.field420.doStep(var1);
+               if (var18) {
+                  var12 = (var15 * (this.field419.end - this.field419.start) >> 8) + this.field419.start;
                } else {
-                  var12 = (var16 * (this.__g.end - this.__g.start) >> 8) + this.__g.start;
+                  var12 = (var16 * (this.field419.end - this.field419.start) >> 8) + this.field419.start;
                }
 
                var11 += 256;
-               if(var11 >= var12) {
+               if (var11 >= var12) {
                   var11 = 0;
-                  var20 = !var20;
+                  var18 = !var18;
                }
 
-               if(var20) {
+               if (var18) {
                   Instrument_samples[var14] = 0;
                }
             }
          }
 
-         if(this.delayTime > 0 && this.delayDecay > 0) {
+         if (this.delayTime > 0 && this.delayDecay > 0) {
             var11 = (int)((double)this.delayTime * var3);
 
-            for(var12 = var11; var12 < var1; ++var12) {
-               Instrument_samples[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100;
+            for (var12 = var11; var12 < var1; ++var12) {
+               var10000 = Instrument_samples;
+               var10000[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100;
             }
          }
 
-         if(this.filter.__m[0] > 0 || this.filter.__m[1] > 0) {
-            this.__a.reset();
-            var11 = this.__a.doStep(var1 + 1);
-            var12 = this.filter.__w_207(0, (float)var11 / 65536.0F);
-            var13 = this.filter.__w_207(1, (float)var11 / 65536.0F);
-            if(var1 >= var12 + var13) {
+         if (this.filter.field36[0] > 0 || this.filter.field36[1] > 0) {
+            this.field421.reset();
+            var11 = this.field421.doStep(var1 + 1);
+            var12 = this.filter.method26(0, (float)var11 / 65536.0F);
+            var13 = this.filter.method26(1, (float)var11 / 65536.0F);
+            if (var1 >= var12 + var13) {
                var14 = 0;
                var15 = var13;
-               if(var13 > var1 - var12) {
+               if (var13 > var1 - var12) {
                   var15 = var1 - var12;
                }
 
-               int var17;
-               while(var14 < var15) {
-                  var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.__di_e >> 16);
+               int var19;
+               while (var14 < var15) {
+                  var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16);
 
-                  for(var17 = 0; var17 < var12; ++var17) {
-                     var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.__di_g[0][var17] >> 16);
+                  for (var19 = 0; var19 < var12; ++var19) {
+                     var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var19] * (long)AudioFilter.field33[0][var19] >> 16);
                   }
 
-                  for(var17 = 0; var17 < var14; ++var17) {
-                     var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.__di_g[1][var17] >> 16);
+                  for (var19 = 0; var19 < var14; ++var19) {
+                     var16 -= (int)((long)Instrument_samples[var14 - 1 - var19] * (long)AudioFilter.field33[1][var19] >> 16);
                   }
 
                   Instrument_samples[var14] = var16;
-                  var11 = this.__a.doStep(var1 + 1);
+                  var11 = this.field421.doStep(var1 + 1);
                   ++var14;
                }
 
                var15 = 128;
 
-               while(true) {
-                  if(var15 > var1 - var12) {
+               while (true) {
+                  if (var15 > var1 - var12) {
                      var15 = var1 - var12;
                   }
 
-                  int var18;
-                  while(var14 < var15) {
-                     var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.__di_e >> 16);
+                  int var20;
+                  while (var14 < var15) {
+                     var19 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.field35 >> 16);
 
-                     for(var18 = 0; var18 < var12; ++var18) {
-                        var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.__di_g[0][var18] >> 16);
+                     for (var20 = 0; var20 < var12; ++var20) {
+                        var19 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.field33[0][var20] >> 16);
                      }
 
-                     for(var18 = 0; var18 < var13; ++var18) {
-                        var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.__di_g[1][var18] >> 16);
+                     for (var20 = 0; var20 < var13; ++var20) {
+                        var19 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.field33[1][var20] >> 16);
                      }
 
-                     Instrument_samples[var14] = var17;
-                     var11 = this.__a.doStep(var1 + 1);
+                     Instrument_samples[var14] = var19;
+                     var11 = this.field421.doStep(var1 + 1);
                      ++var14;
                   }
 
-                  if(var14 >= var1 - var12) {
-                     while(var14 < var1) {
-                        var17 = 0;
+                  if (var14 >= var1 - var12) {
+                     while (var14 < var1) {
+                        var19 = 0;
 
-                        for(var18 = var14 + var12 - var1; var18 < var12; ++var18) {
-                           var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.__di_g[0][var18] >> 16);
+                        for (var20 = var14 + var12 - var1; var20 < var12; ++var20) {
+                           var19 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.field33[0][var20] >> 16);
                         }
 
-                        for(var18 = 0; var18 < var13; ++var18) {
-                           var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.__di_g[1][var18] >> 16);
+                        for (var20 = 0; var20 < var13; ++var20) {
+                           var19 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.field33[1][var20] >> 16);
                         }
 
-                        Instrument_samples[var14] = var17;
-                        this.__a.doStep(var1 + 1);
+                        Instrument_samples[var14] = var19;
+                        this.field421.doStep(var1 + 1);
                         ++var14;
                      }
                      break;
                   }
 
-                  var12 = this.filter.__w_207(0, (float)var11 / 65536.0F);
-                  var13 = this.filter.__w_207(1, (float)var11 / 65536.0F);
+                  var12 = this.filter.method26(0, (float)var11 / 65536.0F);
+                  var13 = this.filter.method26(1, (float)var11 / 65536.0F);
                   var15 += 128;
                }
             }
          }
 
-         for(var11 = 0; var11 < var1; ++var11) {
-            if(Instrument_samples[var11] < -32768) {
+         for (var11 = 0; var11 < var1; ++var11) {
+            if (Instrument_samples[var11] < -32768) {
                Instrument_samples[var11] = -32768;
             }
 
-            if(Instrument_samples[var11] > 32767) {
+            if (Instrument_samples[var11] > 32767) {
                Instrument_samples[var11] = 32767;
             }
          }
@@ -343,7 +324,7 @@ public class Instrument {
    @ObfuscatedName("f")
    @Export("evaluateWave")
    final int evaluateWave(int var1, int var2, int var3) {
-      return var3 == 1?((var1 & 32767) < 16384?var2:-var2):(var3 == 2?Instrument_sine[var1 & 32767] * var2 >> 14:(var3 == 3?(var2 * (var1 & 32767) >> 14) - var2:(var3 == 4?var2 * Instrument_noise[var1 / 2607 & 32767]:0)));
+      return var3 == 1 ? ((var1 & 32767) < 16384 ? var2 : -var2) : (var3 == 2 ? Instrument_sine[var1 & 32767] * var2 >> 14 : (var3 == 3 ? (var2 * (var1 & 32767) >> 14) - var2 : (var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0)));
    }
 
    @ObfuscatedName("q")
@@ -352,54 +333,77 @@ public class Instrument {
    )
    @Export("decode")
    final void decode(Buffer var1) {
-      this.__m = new SoundEnvelope();
-      this.__m.decode(var1);
-      this.__f = new SoundEnvelope();
-      this.__f.decode(var1);
+      this.field413 = new SoundEnvelope();
+      this.field413.decode(var1);
+      this.field414 = new SoundEnvelope();
+      this.field414.decode(var1);
       int var2 = var1.readUnsignedByte();
-      if(var2 != 0) {
+      if (var2 != 0) {
          --var1.index;
-         this.__q = new SoundEnvelope();
-         this.__q.decode(var1);
-         this.__w = new SoundEnvelope();
-         this.__w.decode(var1);
+         this.field415 = new SoundEnvelope();
+         this.field415.decode(var1);
+         this.field416 = new SoundEnvelope();
+         this.field416.decode(var1);
       }
 
       var2 = var1.readUnsignedByte();
-      if(var2 != 0) {
+      if (var2 != 0) {
          --var1.index;
-         this.__o = new SoundEnvelope();
-         this.__o.decode(var1);
-         this.__u = new SoundEnvelope();
-         this.__u.decode(var1);
+         this.field417 = new SoundEnvelope();
+         this.field417.decode(var1);
+         this.field418 = new SoundEnvelope();
+         this.field418.decode(var1);
       }
 
       var2 = var1.readUnsignedByte();
-      if(var2 != 0) {
+      if (var2 != 0) {
          --var1.index;
-         this.__g = new SoundEnvelope();
-         this.__g.decode(var1);
-         this.__l = new SoundEnvelope();
-         this.__l.decode(var1);
+         this.field419 = new SoundEnvelope();
+         this.field419.decode(var1);
+         this.field420 = new SoundEnvelope();
+         this.field420.decode(var1);
       }
 
-      for(int var3 = 0; var3 < 10; ++var3) {
-         int var4 = var1.__ae_307();
-         if(var4 == 0) {
+      for (int var3 = 0; var3 < 10; ++var3) {
+         int var4 = var1.method48();
+         if (var4 == 0) {
             break;
          }
 
          this.oscillatorVolume[var3] = var4;
-         this.oscillatorPitch[var3] = var1.__ab_306();
-         this.oscillatorDelays[var3] = var1.__ae_307();
+         this.oscillatorPitch[var3] = var1.method47();
+         this.oscillatorDelays[var3] = var1.method48();
       }
 
-      this.delayTime = var1.__ae_307();
-      this.delayDecay = var1.__ae_307();
-      this.duration = var1.__ag_302();
-      this.offset = var1.__ag_302();
+      this.delayTime = var1.method48();
+      this.delayDecay = var1.method48();
+      this.duration = var1.method43();
+      this.offset = var1.method43();
       this.filter = new AudioFilter();
-      this.__a = new SoundEnvelope();
-      this.filter.__o_208(var1, this.__a);
+      this.field421 = new SoundEnvelope();
+      this.filter.method27(var1, this.field421);
+   }
+
+   static {
+      Instrument_noise = new int[32768];
+      Random var0 = new Random(0L);
+
+      int var1;
+      for (var1 = 0; var1 < 32768; ++var1) {
+         Instrument_noise[var1] = (var0.nextInt() & 2) - 1;
+      }
+
+      Instrument_sine = new int[32768];
+
+      for (var1 = 0; var1 < 32768; ++var1) {
+         Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D);
+      }
+
+      Instrument_samples = new int[220500];
+      Instrument_phases = new int[5];
+      Instrument_delays = new int[5];
+      Instrument_volumeSteps = new int[5];
+      Instrument_pitchSteps = new int[5];
+      Instrument_pitchBaseSteps = new int[5];
    }
 }
diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java
index 8e94ce9a5f..44e2b9aa59 100644
--- a/runescape-client/src/main/java/IntHashTable.java
+++ b/runescape-client/src/main/java/IntHashTable.java
@@ -12,21 +12,19 @@ public class IntHashTable {
 
    public IntHashTable(int[] var1) {
       int var2;
-      for(var2 = 1; var2 <= (var1.length >> 1) + var1.length; var2 <<= 1) {
-         ;
+      for (var2 = 1; var2 <= (var1.length >> 1) + var1.length; var2 <<= 1) {
       }
 
       this.array = new int[var2 + var2];
 
       int var3;
-      for(var3 = 0; var3 < var2 + var2; ++var3) {
+      for (var3 = 0; var3 < var2 + var2; ++var3) {
          this.array[var3] = -1;
       }
 
       int var4;
-      for(var3 = 0; var3 < var1.length; this.array[var4 + var4 + 1] = var3++) {
-         for(var4 = var1[var3] & var2 - 1; this.array[var4 + var4 + 1] != -1; var4 = var4 + 1 & var2 - 1) {
-            ;
+      for (var3 = 0; var3 < var1.length; this.array[var4 + var4 + 1] = var3++) {
+         for (var4 = var1[var3] & var2 - 1; this.array[var4 + var4 + 1] != -1; var4 = var4 + 1 & var2 - 1) {
          }
 
          this.array[var4 + var4] = var1[var3];
@@ -44,13 +42,13 @@ public class IntHashTable {
       int var2 = (this.array.length >> 1) - 1;
       int var3 = var1 & var2;
 
-      while(true) {
+      while (true) {
          int var4 = this.array[var3 + var3 + 1];
-         if(var4 == -1) {
+         if (var4 == -1) {
             return -1;
          }
 
-         if(this.array[var3 + var3] == var1) {
+         if (this.array[var3 + var3] == var1) {
             return var4;
          }
 
diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java
index 61ace7fd65..80135fddbd 100644
--- a/runescape-client/src/main/java/Interpreter.java
+++ b/runescape-client/src/main/java/Interpreter.java
@@ -48,33 +48,18 @@ public class Interpreter {
    @Export("Interpreter_calendar")
    static Calendar Interpreter_calendar;
    @ObfuscatedName("z")
-   static final String[] __bv_z;
+   static final String[] field422;
    @ObfuscatedName("s")
-   static boolean __bv_s;
+   static boolean field423;
    @ObfuscatedName("t")
-   static boolean __bv_t;
+   static boolean field424;
    @ObfuscatedName("y")
    @ObfuscatedGetter(
       intValue = -1019558835
    )
-   static int __bv_y;
+   static int field425;
    @ObfuscatedName("r")
-   static final double __bv_r;
-
-   static {
-      Interpreter_arrayLengths = new int[5];
-      Interpreter_arrays = new int[5][5000];
-      Interpreter_intStack = new int[1000];
-      Interpreter_stringStack = new String[1000];
-      Interpreter_frameDepth = 0;
-      Interpreter_frames = new ScriptFrame[50];
-      Interpreter_calendar = Calendar.getInstance();
-      __bv_z = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-      __bv_s = false;
-      __bv_t = false;
-      __bv_y = 0;
-      __bv_r = Math.log(2.0D);
-   }
+   static final double field426;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -83,29 +68,29 @@ public class Interpreter {
    )
    public static PacketBufferNode method1915(ClientPacket var0, IsaacCipher var1) {
       PacketBufferNode var2;
-      if(PacketBufferNode.__gg_u == 0) {
+      if (PacketBufferNode.field668 == 0) {
          var2 = new PacketBufferNode();
       } else {
-         var2 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.__gg_u];
+         var2 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.field668];
       }
 
-      var2.__m = var0;
-      var2.__f = var0.length;
-      if(var2.__f == -1) {
+      var2.field669 = var0;
+      var2.field670 = var0.length;
+      if (var2.field670 == -1) {
          var2.packetBuffer = new PacketBuffer(260);
-      } else if(var2.__f == -2) {
+      } else if (var2.field670 == -2) {
          var2.packetBuffer = new PacketBuffer(10000);
-      } else if(var2.__f <= 18) {
+      } else if (var2.field670 <= 18) {
          var2.packetBuffer = new PacketBuffer(20);
-      } else if(var2.__f <= 98) {
+      } else if (var2.field670 <= 98) {
          var2.packetBuffer = new PacketBuffer(100);
       } else {
          var2.packetBuffer = new PacketBuffer(260);
       }
 
       var2.packetBuffer.setIsaacCipher(var1);
-      var2.packetBuffer.writeByteIsaac(var2.__m.id);
-      var2.__w = 0;
+      var2.packetBuffer.writeByteIsaac(var2.field669.id);
+      var2.field671 = 0;
       return var2;
    }
 
@@ -117,12 +102,12 @@ public class Interpreter {
    @Export("getEnum")
    public static EnumDefinition getEnum(int var0) {
       EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
          byte[] var2 = EnumDefinition.EnumDefinition_indexCache.takeRecord(8, var0);
          var1 = new EnumDefinition();
-         if(var2 != null) {
+         if (var2 != null) {
             var1.read(new Buffer(var2));
          }
 
@@ -144,8 +129,8 @@ public class Interpreter {
       var3[0] = var1;
       int var4 = 1;
 
-      for(int var5 = 0; var5 < 4; ++var5) {
-         if(World.sortOption1[var5] != var0) {
+      for (int var5 = 0; var5 < 4; ++var5) {
+         if (World.sortOption1[var5] != var0) {
             var2[var4] = World.sortOption1[var5];
             var3[var4] = World.sortOption2[var5];
             ++var4;
@@ -165,33 +150,32 @@ public class Interpreter {
    public static void method1976() {
       try {
          File var0 = new File(WorldMapSection1.userHomeDirectory, "random.dat");
-         int var2;
-         if(var0.exists()) {
+         int var1;
+         if (var0.exists()) {
             class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0);
          } else {
-            label38:
-            for(int var1 = 0; var1 < Canvas.__ao_s.length; ++var1) {
-               for(var2 = 0; var2 < WorldMapSection2.cacheDirectoryLocations.length; ++var2) {
-                  File var3 = new File(WorldMapSection2.cacheDirectoryLocations[var2] + Canvas.__ao_s[var1] + File.separatorChar + "random.dat");
-                  if(var3.exists()) {
+            label34:
+            for (int var2 = 0; var2 < Canvas.field94.length; ++var2) {
+               for (var1 = 0; var1 < WorldMapSection2.cacheDirectoryLocations.length; ++var1) {
+                  File var3 = new File(WorldMapSection2.cacheDirectoryLocations[var1] + Canvas.field94[var2] + File.separatorChar + "random.dat");
+                  if (var3.exists()) {
                      class168.randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0);
-                     break label38;
+                     break label34;
                   }
                }
             }
          }
 
-         if(class168.randomDat == null) {
-            RandomAccessFile var4 = new RandomAccessFile(var0, "rw");
-            var2 = var4.read();
-            var4.seek(0L);
-            var4.write(var2);
-            var4.seek(0L);
-            var4.close();
+         if (class168.randomDat == null) {
+            RandomAccessFile var5 = new RandomAccessFile(var0, "rw");
+            var1 = var5.read();
+            var5.seek(0L);
+            var5.write(var1);
+            var5.seek(0L);
+            var5.close();
             class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0);
          }
-      } catch (IOException var5) {
-         ;
+      } catch (IOException var4) {
       }
 
    }
@@ -203,23 +187,35 @@ public class Interpreter {
    )
    @Export("drawWidgets")
    static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-      if(GroundItemPile.loadWidgetGroup(var0)) {
-         class279.__jx_ne = null;
+      if (GroundItemPile.loadWidgetGroup(var0)) {
+         class279.field1145 = null;
          DevicePcmPlayerProvider.drawWidgetGroup(Widget.widgets[var0], -1, var1, var2, var3, var4, var5, var6, var7);
-         if(class279.__jx_ne != null) {
-            DevicePcmPlayerProvider.drawWidgetGroup(class279.__jx_ne, -1412584499, var1, var2, var3, var4, class54.__bs_nb, class157.__fw_nm, var7);
-            class279.__jx_ne = null;
+         if (class279.field1145 != null) {
+            DevicePcmPlayerProvider.drawWidgetGroup(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, class157.field1114, var7);
+            class279.field1145 = null;
          }
-
+      } else if (var7 != -1) {
+         Client.field100[var7] = true;
       } else {
-         if(var7 != -1) {
-            Client.__client_od[var7] = true;
-         } else {
-            for(int var8 = 0; var8 < 100; ++var8) {
-               Client.__client_od[var8] = true;
-            }
+         for (int var8 = 0; var8 < 100; ++var8) {
+            Client.field100[var8] = true;
          }
-
       }
+
+   }
+
+   static {
+      Interpreter_arrayLengths = new int[5];
+      Interpreter_arrays = new int[5][5000];
+      Interpreter_intStack = new int[1000];
+      Interpreter_stringStack = new String[1000];
+      Interpreter_frameDepth = 0;
+      Interpreter_frames = new ScriptFrame[50];
+      Interpreter_calendar = Calendar.getInstance();
+      field422 = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+      field423 = false;
+      field424 = false;
+      field425 = 0;
+      field426 = Math.log(2.0D);
    }
 }
diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java
index 922b60700a..c058dbea3e 100644
--- a/runescape-client/src/main/java/InvDefinition.java
+++ b/runescape-client/src/main/java/InvDefinition.java
@@ -11,7 +11,7 @@ public class InvDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   static EvictingDualNodeHashTable __ib_f;
+   static EvictingDualNodeHashTable field427;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 1358868971
@@ -19,10 +19,6 @@ public class InvDefinition extends DualNode {
    @Export("size")
    public int size;
 
-   static {
-      __ib_f = new EvictingDualNodeHashTable(64);
-   }
-
    InvDefinition() {
       this.size = 0;
    }
@@ -34,9 +30,9 @@ public class InvDefinition extends DualNode {
    )
    @Export("read")
    void read(Buffer var1) {
-      while(true) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
@@ -51,8 +47,8 @@ public class InvDefinition extends DualNode {
    )
    @Export("readNext")
    void readNext(Buffer var1, int var2) {
-      if(var2 == 2) {
-         this.size = var1.__ag_302();
+      if (var2 == 2) {
+         this.size = var1.method43();
       }
 
    }
@@ -65,4 +61,8 @@ public class InvDefinition extends DualNode {
    public static void method4754() {
       ParamKeyDefinition.ParamKeyDefinition_cached.clear();
    }
+
+   static {
+      field427 = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java
index 11f5951763..a1f33c11cd 100644
--- a/runescape-client/src/main/java/IsaacCipher.java
+++ b/runescape-client/src/main/java/IsaacCipher.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
@@ -11,36 +10,36 @@ public final class IsaacCipher {
    @ObfuscatedGetter(
       intValue = 1514845493
    )
-   int __w;
+   int field428;
    @ObfuscatedName("o")
-   int[] __o;
+   int[] field429;
    @ObfuscatedName("u")
-   int[] __u;
+   int[] field430;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = -1670027699
    )
-   int __g;
+   int field431;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -325762649
    )
-   int __l;
+   int field432;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -1951204929
    )
-   int __e;
+   int field433;
 
    public IsaacCipher(int[] var1) {
-      this.__u = new int[256];
-      this.__o = new int[256];
+      this.field430 = new int[256];
+      this.field429 = new int[256];
 
-      for(int var2 = 0; var2 < var1.length; ++var2) {
-         this.__o[var2] = var1[var2];
+      for (int var2 = 0; var2 < var1.length; ++var2) {
+         this.field429[var2] = var1[var2];
       }
 
-      this.__w_339();
+      this.method139();
    }
 
    @ObfuscatedName("m")
@@ -48,13 +47,13 @@ public final class IsaacCipher {
       signature = "(I)I",
       garbageValue = "-7509790"
    )
-   final int __m_336() {
-      if(0 == --this.__w + 1) {
-         this.__q_338();
-         this.__w = 255;
+   final int method136() {
+      if (0 == --this.field428 + 1) {
+         this.method138();
+         this.field428 = 255;
       }
 
-      return this.__o[this.__w];
+      return this.field429[this.field428];
    }
 
    @ObfuscatedName("f")
@@ -62,13 +61,13 @@ public final class IsaacCipher {
       signature = "(I)I",
       garbageValue = "-506873526"
    )
-   final int __f_337() {
-      if(this.__w == 0) {
-         this.__q_338();
-         this.__w = 256;
+   final int method137() {
+      if (this.field428 == 0) {
+         this.method138();
+         this.field428 = 256;
       }
 
-      return this.__o[this.__w - 1];
+      return this.field429[this.field428 - 1];
    }
 
    @ObfuscatedName("q")
@@ -76,27 +75,27 @@ public final class IsaacCipher {
       signature = "(B)V",
       garbageValue = "124"
    )
-   final void __q_338() {
-      this.__l += ++this.__e;
+   final void method138() {
+      this.field432 += ++this.field433;
 
-      for(int var1 = 0; var1 < 256; ++var1) {
-         int var2 = this.__u[var1];
-         if((var1 & 2) == 0) {
-            if((var1 & 1) == 0) {
-               this.__g ^= this.__g << 13;
+      for (int var1 = 0; var1 < 256; ++var1) {
+         int var2 = this.field430[var1];
+         if ((var1 & 2) == 0) {
+            if ((var1 & 1) == 0) {
+               this.field431 ^= this.field431 << 13;
             } else {
-               this.__g ^= this.__g >>> 6;
+               this.field431 ^= this.field431 >>> 6;
             }
-         } else if((var1 & 1) == 0) {
-            this.__g ^= this.__g << 2;
+         } else if ((var1 & 1) == 0) {
+            this.field431 ^= this.field431 << 2;
          } else {
-            this.__g ^= this.__g >>> 16;
+            this.field431 ^= this.field431 >>> 16;
          }
 
-         this.__g += this.__u[128 + var1 & 255];
+         this.field431 += this.field430[128 + var1 & 255];
          int var3;
-         this.__u[var1] = var3 = this.__u[(var2 & 1020) >> 2] + this.__l + this.__g;
-         this.__o[var1] = this.__l = this.__u[(var3 >> 8 & 1020) >> 2] + var2;
+         this.field430[var1] = var3 = this.field430[(var2 & 1020) >> 2] + this.field432 + this.field431;
+         this.field429[var1] = this.field432 = this.field430[(var3 >> 8 & 1020) >> 2] + var2;
       }
 
    }
@@ -106,132 +105,132 @@ public final class IsaacCipher {
       signature = "(I)V",
       garbageValue = "579890110"
    )
-   final void __w_339() {
-      int var9 = -1640531527;
-      int var8 = -1640531527;
-      int var7 = -1640531527;
-      int var6 = -1640531527;
-      int var5 = -1640531527;
-      int var4 = -1640531527;
-      int var3 = -1640531527;
+   final void method139() {
+      int var1 = -1640531527;
       int var2 = -1640531527;
+      int var3 = -1640531527;
+      int var4 = -1640531527;
+      int var5 = -1640531527;
+      int var6 = -1640531527;
+      int var7 = -1640531527;
+      int var8 = -1640531527;
 
-      int var1;
-      for(var1 = 0; var1 < 4; ++var1) {
-         var2 ^= var3 << 11;
-         var5 += var2;
-         var3 += var4;
-         var3 ^= var4 >>> 2;
-         var6 += var3;
-         var4 += var5;
-         var4 ^= var5 << 8;
-         var7 += var4;
-         var5 += var6;
-         var5 ^= var6 >>> 16;
-         var8 += var5;
-         var6 += var7;
-         var6 ^= var7 << 10;
-         var9 += var6;
-         var7 += var8;
-         var7 ^= var8 >>> 4;
-         var2 += var7;
-         var8 += var9;
-         var8 ^= var9 << 8;
-         var3 += var8;
-         var9 += var2;
-         var9 ^= var2 >>> 9;
-         var4 += var9;
-         var2 += var3;
+      int var9;
+      for (var9 = 0; var9 < 4; ++var9) {
+         var8 ^= var7 << 11;
+         var5 += var8;
+         var7 += var6;
+         var7 ^= var6 >>> 2;
+         var4 += var7;
+         var6 += var5;
+         var6 ^= var5 << 8;
+         var3 += var6;
+         var5 += var4;
+         var5 ^= var4 >>> 16;
+         var2 += var5;
+         var4 += var3;
+         var4 ^= var3 << 10;
+         var1 += var4;
+         var3 += var2;
+         var3 ^= var2 >>> 4;
+         var8 += var3;
+         var2 += var1;
+         var2 ^= var1 << 8;
+         var7 += var2;
+         var1 += var8;
+         var1 ^= var8 >>> 9;
+         var6 += var1;
+         var8 += var7;
       }
 
-      for(var1 = 0; var1 < 256; var1 += 8) {
-         var2 += this.__o[var1];
-         var3 += this.__o[var1 + 1];
-         var4 += this.__o[var1 + 2];
-         var5 += this.__o[var1 + 3];
-         var6 += this.__o[var1 + 4];
-         var7 += this.__o[var1 + 5];
-         var8 += this.__o[var1 + 6];
-         var9 += this.__o[var1 + 7];
-         var2 ^= var3 << 11;
-         var5 += var2;
-         var3 += var4;
-         var3 ^= var4 >>> 2;
-         var6 += var3;
-         var4 += var5;
-         var4 ^= var5 << 8;
-         var7 += var4;
-         var5 += var6;
-         var5 ^= var6 >>> 16;
-         var8 += var5;
-         var6 += var7;
-         var6 ^= var7 << 10;
-         var9 += var6;
-         var7 += var8;
-         var7 ^= var8 >>> 4;
-         var2 += var7;
-         var8 += var9;
-         var8 ^= var9 << 8;
-         var3 += var8;
-         var9 += var2;
-         var9 ^= var2 >>> 9;
-         var4 += var9;
-         var2 += var3;
-         this.__u[var1] = var2;
-         this.__u[var1 + 1] = var3;
-         this.__u[var1 + 2] = var4;
-         this.__u[var1 + 3] = var5;
-         this.__u[var1 + 4] = var6;
-         this.__u[var1 + 5] = var7;
-         this.__u[var1 + 6] = var8;
-         this.__u[var1 + 7] = var9;
+      for (var9 = 0; var9 < 256; var9 += 8) {
+         var8 += this.field429[var9];
+         var7 += this.field429[var9 + 1];
+         var6 += this.field429[var9 + 2];
+         var5 += this.field429[var9 + 3];
+         var4 += this.field429[var9 + 4];
+         var3 += this.field429[var9 + 5];
+         var2 += this.field429[var9 + 6];
+         var1 += this.field429[var9 + 7];
+         var8 ^= var7 << 11;
+         var5 += var8;
+         var7 += var6;
+         var7 ^= var6 >>> 2;
+         var4 += var7;
+         var6 += var5;
+         var6 ^= var5 << 8;
+         var3 += var6;
+         var5 += var4;
+         var5 ^= var4 >>> 16;
+         var2 += var5;
+         var4 += var3;
+         var4 ^= var3 << 10;
+         var1 += var4;
+         var3 += var2;
+         var3 ^= var2 >>> 4;
+         var8 += var3;
+         var2 += var1;
+         var2 ^= var1 << 8;
+         var7 += var2;
+         var1 += var8;
+         var1 ^= var8 >>> 9;
+         var6 += var1;
+         var8 += var7;
+         this.field430[var9] = var8;
+         this.field430[var9 + 1] = var7;
+         this.field430[var9 + 2] = var6;
+         this.field430[var9 + 3] = var5;
+         this.field430[var9 + 4] = var4;
+         this.field430[var9 + 5] = var3;
+         this.field430[var9 + 6] = var2;
+         this.field430[var9 + 7] = var1;
       }
 
-      for(var1 = 0; var1 < 256; var1 += 8) {
-         var2 += this.__u[var1];
-         var3 += this.__u[var1 + 1];
-         var4 += this.__u[var1 + 2];
-         var5 += this.__u[var1 + 3];
-         var6 += this.__u[var1 + 4];
-         var7 += this.__u[var1 + 5];
-         var8 += this.__u[var1 + 6];
-         var9 += this.__u[var1 + 7];
-         var2 ^= var3 << 11;
-         var5 += var2;
-         var3 += var4;
-         var3 ^= var4 >>> 2;
-         var6 += var3;
-         var4 += var5;
-         var4 ^= var5 << 8;
-         var7 += var4;
-         var5 += var6;
-         var5 ^= var6 >>> 16;
-         var8 += var5;
-         var6 += var7;
-         var6 ^= var7 << 10;
-         var9 += var6;
-         var7 += var8;
-         var7 ^= var8 >>> 4;
-         var2 += var7;
-         var8 += var9;
-         var8 ^= var9 << 8;
-         var3 += var8;
-         var9 += var2;
-         var9 ^= var2 >>> 9;
-         var4 += var9;
-         var2 += var3;
-         this.__u[var1] = var2;
-         this.__u[var1 + 1] = var3;
-         this.__u[var1 + 2] = var4;
-         this.__u[var1 + 3] = var5;
-         this.__u[var1 + 4] = var6;
-         this.__u[var1 + 5] = var7;
-         this.__u[var1 + 6] = var8;
-         this.__u[var1 + 7] = var9;
+      for (var9 = 0; var9 < 256; var9 += 8) {
+         var8 += this.field430[var9];
+         var7 += this.field430[var9 + 1];
+         var6 += this.field430[var9 + 2];
+         var5 += this.field430[var9 + 3];
+         var4 += this.field430[var9 + 4];
+         var3 += this.field430[var9 + 5];
+         var2 += this.field430[var9 + 6];
+         var1 += this.field430[var9 + 7];
+         var8 ^= var7 << 11;
+         var5 += var8;
+         var7 += var6;
+         var7 ^= var6 >>> 2;
+         var4 += var7;
+         var6 += var5;
+         var6 ^= var5 << 8;
+         var3 += var6;
+         var5 += var4;
+         var5 ^= var4 >>> 16;
+         var2 += var5;
+         var4 += var3;
+         var4 ^= var3 << 10;
+         var1 += var4;
+         var3 += var2;
+         var3 ^= var2 >>> 4;
+         var8 += var3;
+         var2 += var1;
+         var2 ^= var1 << 8;
+         var7 += var2;
+         var1 += var8;
+         var1 ^= var8 >>> 9;
+         var6 += var1;
+         var8 += var7;
+         this.field430[var9] = var8;
+         this.field430[var9 + 1] = var7;
+         this.field430[var9 + 2] = var6;
+         this.field430[var9 + 3] = var5;
+         this.field430[var9 + 4] = var4;
+         this.field430[var9 + 5] = var3;
+         this.field430[var9 + 6] = var2;
+         this.field430[var9 + 7] = var1;
       }
 
-      this.__q_338();
-      this.__w = 256;
+      this.method138();
+      this.field428 = 256;
    }
 
    @ObfuscatedName("m")
@@ -240,8 +239,8 @@ public final class IsaacCipher {
       garbageValue = "75867683"
    )
    public static void method4082(AbstractIndexCache var0, AbstractIndexCache var1) {
-      NpcDefinition.NpcDefinition_indexCache = var0;
-      NpcDefinition.NpcDefinition_modelIndexCache = var1;
+      NPCDefinition.NpcDefinition_indexCache = var0;
+      NPCDefinition.NpcDefinition_modelIndexCache = var1;
    }
 
    @ObfuscatedName("fl")
@@ -250,83 +249,83 @@ public final class IsaacCipher {
       garbageValue = "1676957578"
    )
    static void method4093(int var0) {
-      if(var0 == -3) {
+      if (var0 == -3) {
          class54.method1089("Connection timed out.", "Please try using a different world.", "");
-      } else if(var0 == -2) {
+      } else if (var0 == -2) {
          class54.method1089("", "Error connecting to server.", "");
-      } else if(var0 == -1) {
+      } else if (var0 == -1) {
          class54.method1089("No response from server.", "Please try using a different world.", "");
-      } else if(var0 == 3) {
+      } else if (var0 == 3) {
          Login.loginIndex = 3;
-         Login.__cu_ac = 1;
-      } else if(var0 == 4) {
+         Login.field467 = 1;
+      } else if (var0 == 4) {
          class32.method578(0);
-      } else if(var0 == 5) {
-         Login.__cu_ac = 2;
+      } else if (var0 == 5) {
+         Login.field467 = 2;
          class54.method1089("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes.");
-      } else if(var0 != 68 && (Client.__client_bl || var0 != 6)) {
-         if(var0 == 7) {
+      } else if (var0 != 68 && (Client.field162 || var0 != 6)) {
+         if (var0 == 7) {
             class54.method1089("This world is full.", "Please use a different world.", "");
-         } else if(var0 == 8) {
+         } else if (var0 == 8) {
             class54.method1089("Unable to connect.", "Login server offline.", "");
-         } else if(var0 == 9) {
+         } else if (var0 == 9) {
             class54.method1089("Login limit exceeded.", "Too many connections from your address.", "");
-         } else if(var0 == 10) {
+         } else if (var0 == 10) {
             class54.method1089("Unable to connect.", "Bad session id.", "");
-         } else if(var0 == 11) {
-            class54.method1089("We suspect someone knows your password.", "Press \'change your password\' on front page.", "");
-         } else if(var0 == 12) {
+         } else if (var0 == 11) {
+            class54.method1089("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
+         } else if (var0 == 12) {
             class54.method1089("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
-         } else if(var0 == 13) {
+         } else if (var0 == 13) {
             class54.method1089("Could not complete login.", "Please try using a different world.", "");
-         } else if(var0 == 14) {
+         } else if (var0 == 14) {
             class54.method1089("The server is being updated.", "Please wait 1 minute and try again.", "");
-         } else if(var0 == 16) {
+         } else if (var0 == 16) {
             class54.method1089("Too many login attempts.", "Please wait a few minutes before trying again.", "");
-         } else if(var0 == 17) {
+         } else if (var0 == 17) {
             class54.method1089("You are standing in a members-only area.", "To play on this world move to a free area first", "");
-         } else if(var0 == 18) {
+         } else if (var0 == 18) {
             class32.method578(1);
-         } else if(var0 == 19) {
+         } else if (var0 == 19) {
             class54.method1089("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
-         } else if(var0 == 20) {
+         } else if (var0 == 20) {
             class54.method1089("Invalid loginserver requested.", "Please try using a different world.", "");
-         } else if(var0 == 22) {
+         } else if (var0 == 22) {
             class54.method1089("Malformed login packet.", "Please try again.", "");
-         } else if(var0 == 23) {
+         } else if (var0 == 23) {
             class54.method1089("No reply from loginserver.", "Please wait 1 minute and try again.", "");
-         } else if(var0 == 24) {
+         } else if (var0 == 24) {
             class54.method1089("Error loading your profile.", "Please contact customer support.", "");
-         } else if(var0 == 25) {
+         } else if (var0 == 25) {
             class54.method1089("Unexpected loginserver response.", "Please try using a different world.", "");
-         } else if(var0 == 26) {
+         } else if (var0 == 26) {
             class54.method1089("This computers address has been blocked", "as it was used to break our rules.", "");
-         } else if(var0 == 27) {
+         } else if (var0 == 27) {
             class54.method1089("", "Service unavailable.", "");
-         } else if(var0 == 31) {
+         } else if (var0 == 31) {
             class54.method1089("Your account must have a displayname set", "in order to play the game.  Please set it", "via the website, or the main game.");
-         } else if(var0 == 32) {
-            class54.method1089("Your attempt to log into your account was", "unsuccessful.  Don\'t worry, you can sort", "this out by visiting the billing system.");
-         } else if(var0 == 37) {
+         } else if (var0 == 32) {
+            class54.method1089("Your attempt to log into your account was", "unsuccessful.  Don't worry, you can sort", "this out by visiting the billing system.");
+         } else if (var0 == 37) {
             class54.method1089("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
-         } else if(var0 == 38) {
+         } else if (var0 == 38) {
             class54.method1089("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
-         } else if(var0 == 55) {
+         } else if (var0 == 55) {
             Login.loginIndex = 8;
          } else {
-            if(var0 == 56) {
+            if (var0 == 56) {
                class54.method1089("Enter the 6-digit code generated by your", "authenticator app.", "");
                GameShell.updateGameState(11);
                return;
             }
 
-            if(var0 == 57) {
+            if (var0 == 57) {
                class54.method1089("The code you entered was incorrect.", "Please try again.", "");
                GameShell.updateGameState(11);
                return;
             }
 
-            if(var0 == 61) {
+            if (var0 == 61) {
                Login.loginIndex = 7;
             } else {
                class54.method1089("Unexpected server response", "Please try using a different world.", "");
diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java
index 8a99037d41..4404e399d1 100644
--- a/runescape-client/src/main/java/ItemContainer.java
+++ b/runescape-client/src/main/java/ItemContainer.java
@@ -22,7 +22,7 @@ public class ItemContainer extends Node {
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   static IndexCache __bc_dm;
+   static IndexCache field434;
    @ObfuscatedName("f")
    @Export("ids")
    int[] ids;
@@ -30,10 +30,6 @@ public class ItemContainer extends Node {
    @Export("quantities")
    int[] quantities;
 
-   static {
-      itemContainers = new NodeHashTable(32);
-   }
-
    ItemContainer() {
       this.ids = new int[]{-1};
       this.quantities = new int[]{0};
@@ -55,44 +51,48 @@ public class ItemContainer extends Node {
    )
    @Export("getFrames")
    static Frames getFrames(int var0) {
-      Frames var1 = (Frames)SequenceDefinition.__jh_o.get((long)var0);
-      if(var1 != null) {
+      Frames var1 = (Frames)SequenceDefinition.field775.get((long)var0);
+      if (var1 != null) {
          return var1;
       } else {
-         AbstractIndexCache var3 = SequenceDefinition.__jh_f;
-         AbstractIndexCache var4 = SequenceDefinition.__jh_q;
-         boolean var5 = true;
-         int[] var6 = var3.__j_395(var0);
+         AbstractIndexCache var2 = SequenceDefinition.field773;
+         AbstractIndexCache var3 = SequenceDefinition.field774;
+         boolean var4 = true;
+         int[] var5 = var2.method3(var0);
 
-         for(int var7 = 0; var7 < var6.length; ++var7) {
-            byte[] var8 = var3.getRecord(var0, var6[var7]);
-            if(var8 == null) {
-               var5 = false;
+         for (int var6 = 0; var6 < var5.length; ++var6) {
+            byte[] var7 = var2.getRecord(var0, var5[var6]);
+            if (var7 == null) {
+               var4 = false;
             } else {
-               int var9 = (var8[0] & 255) << 8 | var8[1] & 255;
-               byte[] var10 = var4.getRecord(var9, 0);
-               if(var10 == null) {
-                  var5 = false;
+               int var8 = (var7[0] & 255) << 8 | var7[1] & 255;
+               byte[] var9 = var3.getRecord(var8, 0);
+               if (var9 == null) {
+                  var4 = false;
                }
             }
          }
 
-         Frames var2;
-         if(!var5) {
-            var2 = null;
+         Frames var11;
+         if (!var4) {
+            var11 = null;
          } else {
             try {
-               var2 = new Frames(var3, var4, var0, false);
-            } catch (Exception var12) {
-               var2 = null;
+               var11 = new Frames(var2, var3, var0, false);
+            } catch (Exception var10) {
+               var11 = null;
             }
          }
 
-         if(var2 != null) {
-            SequenceDefinition.__jh_o.put(var2, (long)var0);
+         if (var11 != null) {
+            SequenceDefinition.field775.put(var11, (long)var0);
          }
 
-         return var2;
+         return var11;
       }
    }
+
+   static {
+      itemContainers = new NodeHashTable(32);
+   }
 }
diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java
index 79a6776a68..2e9fc77fde 100644
--- a/runescape-client/src/main/java/ItemDefinition.java
+++ b/runescape-client/src/main/java/ItemDefinition.java
@@ -47,7 +47,7 @@ public class ItemDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = 1070080857
    )
-   int __a;
+   int field435;
    @ObfuscatedName("z")
    @Export("name")
    public String name;
@@ -199,9 +199,9 @@ public class ItemDefinition extends DualNode {
    @Export("femaleHeadModel2")
    int femaleHeadModel2;
    @ObfuscatedName("az")
-   int[] __az;
+   int[] field436;
    @ObfuscatedName("au")
-   int[] __au;
+   int[] field437;
    @ObfuscatedName("ao")
    @ObfuscatedGetter(
       intValue = 619422509
@@ -284,12 +284,6 @@ public class ItemDefinition extends DualNode {
    @Export("placeholderTemplate")
    public int placeholderTemplate;
 
-   static {
-      ItemDefinition_cached = new EvictingDualNodeHashTable(64);
-      ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50);
-      Sprite_cached = new EvictingDualNodeHashTable(200);
-   }
-
    ItemDefinition() {
       this.name = "null";
       this.zoom2d = 2000;
@@ -347,9 +341,9 @@ public class ItemDefinition extends DualNode {
    )
    @Export("read")
    void read(Buffer var1) {
-      while(true) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
@@ -364,121 +358,121 @@ public class ItemDefinition extends DualNode {
    )
    @Export("readNext")
    void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         this.__a = var1.__ag_302();
-      } else if(var2 == 2) {
+      if (var2 == 1) {
+         this.field435 = var1.method43();
+      } else if (var2 == 2) {
          this.name = var1.readStringCp1252NullTerminated();
-      } else if(var2 == 4) {
-         this.zoom2d = var1.__ag_302();
-      } else if(var2 == 5) {
-         this.xan2d = var1.__ag_302();
-      } else if(var2 == 6) {
-         this.yan2d = var1.__ag_302();
-      } else if(var2 == 7) {
-         this.offsetX2d = var1.__ag_302();
-         if(this.offsetX2d > 32767) {
+      } else if (var2 == 4) {
+         this.zoom2d = var1.method43();
+      } else if (var2 == 5) {
+         this.xan2d = var1.method43();
+      } else if (var2 == 6) {
+         this.yan2d = var1.method43();
+      } else if (var2 == 7) {
+         this.offsetX2d = var1.method43();
+         if (this.offsetX2d > 32767) {
             this.offsetX2d -= 65536;
          }
-      } else if(var2 == 8) {
-         this.offsetY2d = var1.__ag_302();
-         if(this.offsetY2d > 32767) {
+      } else if (var2 == 8) {
+         this.offsetY2d = var1.method43();
+         if (this.offsetY2d > 32767) {
             this.offsetY2d -= 65536;
          }
-      } else if(var2 == 11) {
+      } else if (var2 == 11) {
          this.isStackable = 1;
-      } else if(var2 == 12) {
+      } else if (var2 == 12) {
          this.price = var1.readInt();
-      } else if(var2 == 16) {
+      } else if (var2 == 16) {
          this.isMembersOnly = true;
-      } else if(var2 == 23) {
-         this.maleModel = var1.__ag_302();
+      } else if (var2 == 23) {
+         this.maleModel = var1.method43();
          this.maleOffset = var1.readUnsignedByte();
-      } else if(var2 == 24) {
-         this.maleModel1 = var1.__ag_302();
-      } else if(var2 == 25) {
-         this.femaleModel = var1.__ag_302();
+      } else if (var2 == 24) {
+         this.maleModel1 = var1.method43();
+      } else if (var2 == 25) {
+         this.femaleModel = var1.method43();
          this.femaleOffset = var1.readUnsignedByte();
-      } else if(var2 == 26) {
-         this.femaleModel1 = var1.__ag_302();
-      } else if(var2 >= 30 && var2 < 35) {
+      } else if (var2 == 26) {
+         this.femaleModel1 = var1.method43();
+      } else if (var2 >= 30 && var2 < 35) {
          this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated();
-         if(this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) {
+         if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) {
             this.groundActions[var2 - 30] = null;
          }
-      } else if(var2 >= 35 && var2 < 40) {
+      } else if (var2 >= 35 && var2 < 40) {
          this.inventoryActions[var2 - 35] = var1.readStringCp1252NullTerminated();
       } else {
          int var3;
          int var4;
-         if(var2 == 40) {
+         if (var2 == 40) {
             var3 = var1.readUnsignedByte();
             this.recolorFrom = new short[var3];
             this.recolorTo = new short[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.recolorFrom[var4] = (short)var1.__ag_302();
-               this.recolorTo[var4] = (short)var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.recolorFrom[var4] = (short)var1.method43();
+               this.recolorTo[var4] = (short)var1.method43();
             }
-         } else if(var2 == 41) {
+         } else if (var2 == 41) {
             var3 = var1.readUnsignedByte();
             this.retextureFrom = new short[var3];
             this.retextureTo = new short[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.retextureFrom[var4] = (short)var1.__ag_302();
-               this.retextureTo[var4] = (short)var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.retextureFrom[var4] = (short)var1.method43();
+               this.retextureTo[var4] = (short)var1.method43();
             }
-         } else if(var2 == 42) {
+         } else if (var2 == 42) {
             this.shiftClickIndex0 = var1.readByte();
-         } else if(var2 == 65) {
+         } else if (var2 == 65) {
             this.isTradable = true;
-         } else if(var2 == 78) {
-            this.maleModel2 = var1.__ag_302();
-         } else if(var2 == 79) {
-            this.femaleModel2 = var1.__ag_302();
-         } else if(var2 == 90) {
-            this.maleHeadModel = var1.__ag_302();
-         } else if(var2 == 91) {
-            this.femaleHeadModel = var1.__ag_302();
-         } else if(var2 == 92) {
-            this.maleHeadModel2 = var1.__ag_302();
-         } else if(var2 == 93) {
-            this.femaleHeadModel2 = var1.__ag_302();
-         } else if(var2 == 95) {
-            this.zan2d = var1.__ag_302();
-         } else if(var2 == 97) {
-            this.note = var1.__ag_302();
-         } else if(var2 == 98) {
-            this.noteTemplate = var1.__ag_302();
-         } else if(var2 >= 100 && var2 < 110) {
-            if(this.__az == null) {
-               this.__az = new int[10];
-               this.__au = new int[10];
+         } else if (var2 == 78) {
+            this.maleModel2 = var1.method43();
+         } else if (var2 == 79) {
+            this.femaleModel2 = var1.method43();
+         } else if (var2 == 90) {
+            this.maleHeadModel = var1.method43();
+         } else if (var2 == 91) {
+            this.femaleHeadModel = var1.method43();
+         } else if (var2 == 92) {
+            this.maleHeadModel2 = var1.method43();
+         } else if (var2 == 93) {
+            this.femaleHeadModel2 = var1.method43();
+         } else if (var2 == 95) {
+            this.zan2d = var1.method43();
+         } else if (var2 == 97) {
+            this.note = var1.method43();
+         } else if (var2 == 98) {
+            this.noteTemplate = var1.method43();
+         } else if (var2 >= 100 && var2 < 110) {
+            if (this.field436 == null) {
+               this.field436 = new int[10];
+               this.field437 = new int[10];
             }
 
-            this.__az[var2 - 100] = var1.__ag_302();
-            this.__au[var2 - 100] = var1.__ag_302();
-         } else if(var2 == 110) {
-            this.resizeX = var1.__ag_302();
-         } else if(var2 == 111) {
-            this.resizeY = var1.__ag_302();
-         } else if(var2 == 112) {
-            this.resizeZ = var1.__ag_302();
-         } else if(var2 == 113) {
+            this.field436[var2 - 100] = var1.method43();
+            this.field437[var2 - 100] = var1.method43();
+         } else if (var2 == 110) {
+            this.resizeX = var1.method43();
+         } else if (var2 == 111) {
+            this.resizeY = var1.method43();
+         } else if (var2 == 112) {
+            this.resizeZ = var1.method43();
+         } else if (var2 == 113) {
             this.ambient = var1.readByte();
-         } else if(var2 == 114) {
+         } else if (var2 == 114) {
             this.contrast = var1.readByte();
-         } else if(var2 == 115) {
+         } else if (var2 == 115) {
             this.int1 = var1.readUnsignedByte();
-         } else if(var2 == 139) {
-            this.unnotedId = var1.__ag_302();
-         } else if(var2 == 140) {
-            this.notedId = var1.__ag_302();
-         } else if(var2 == 148) {
-            this.placeholder = var1.__ag_302();
-         } else if(var2 == 149) {
-            this.placeholderTemplate = var1.__ag_302();
-         } else if(var2 == 249) {
+         } else if (var2 == 139) {
+            this.unnotedId = var1.method43();
+         } else if (var2 == 140) {
+            this.notedId = var1.method43();
+         } else if (var2 == 148) {
+            this.placeholder = var1.method43();
+         } else if (var2 == 149) {
+            this.placeholderTemplate = var1.method43();
+         } else if (var2 == 249) {
             this.params = AbstractIndexCache.readStringIntParameters(var1, this.params);
          }
       }
@@ -490,8 +484,8 @@ public class ItemDefinition extends DualNode {
       signature = "(Ljv;Ljv;I)V",
       garbageValue = "2051877377"
    )
-   void __o_426(ItemDefinition var1, ItemDefinition var2) {
-      this.__a = var1.__a;
+   void method140(ItemDefinition var1, ItemDefinition var2) {
+      this.field435 = var1.field435;
       this.zoom2d = var1.zoom2d;
       this.xan2d = var1.xan2d;
       this.yan2d = var1.yan2d;
@@ -513,8 +507,8 @@ public class ItemDefinition extends DualNode {
       signature = "(Ljv;Ljv;I)V",
       garbageValue = "227754762"
    )
-   void __u_427(ItemDefinition var1, ItemDefinition var2) {
-      this.__a = var1.__a;
+   void method141(ItemDefinition var1, ItemDefinition var2) {
+      this.field435 = var1.field435;
       this.zoom2d = var1.zoom2d;
       this.xan2d = var1.xan2d;
       this.yan2d = var1.yan2d;
@@ -541,8 +535,8 @@ public class ItemDefinition extends DualNode {
       this.int1 = var2.int1;
       this.groundActions = var2.groundActions;
       this.inventoryActions = new String[5];
-      if(var2.inventoryActions != null) {
-         for(int var3 = 0; var3 < 4; ++var3) {
+      if (var2.inventoryActions != null) {
+         for (int var3 = 0; var3 < 4; ++var3) {
             this.inventoryActions[var3] = var2.inventoryActions[var3];
          }
       }
@@ -556,8 +550,8 @@ public class ItemDefinition extends DualNode {
       signature = "(Ljv;Ljv;I)V",
       garbageValue = "2084647027"
    )
-   void __g_428(ItemDefinition var1, ItemDefinition var2) {
-      this.__a = var1.__a;
+   void method142(ItemDefinition var1, ItemDefinition var2) {
+      this.field435 = var1.field435;
       this.zoom2d = var1.zoom2d;
       this.xan2d = var1.xan2d;
       this.yan2d = var1.yan2d;
@@ -580,39 +574,39 @@ public class ItemDefinition extends DualNode {
       signature = "(II)Ldw;",
       garbageValue = "-223149161"
    )
-   public final ModelData __l_429(int var1) {
-      int var3;
-      if(this.__az != null && var1 > 1) {
-         int var2 = -1;
+   public final ModelData method143(int var1) {
+      int var2;
+      if (this.field436 != null && var1 > 1) {
+         int var3 = -1;
 
-         for(var3 = 0; var3 < 10; ++var3) {
-            if(var1 >= this.__au[var3] && this.__au[var3] != 0) {
-               var2 = this.__az[var3];
+         for (var2 = 0; var2 < 10; ++var2) {
+            if (var1 >= this.field437[var2] && this.field437[var2] != 0) {
+               var3 = this.field436[var2];
             }
          }
 
-         if(var2 != -1) {
-            return Skills.getItemDefinition(var2).__l_429(1);
+         if (var3 != -1) {
+            return Skills.getItemDefinition(var3).method143(1);
          }
       }
 
-      ModelData var4 = ModelData.method2788(ItemDefinition_modelIndexCache, this.__a, 0);
-      if(var4 == null) {
+      ModelData var4 = ModelData.method2788(ItemDefinition_modelIndexCache, this.field435, 0);
+      if (var4 == null) {
          return null;
       } else {
-         if(this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
-            var4.__y_227(this.resizeX, this.resizeY, this.resizeZ);
+         if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
+            var4.method215(this.resizeX, this.resizeY, this.resizeZ);
          }
 
-         if(this.recolorFrom != null) {
-            for(var3 = 0; var3 < this.recolorFrom.length; ++var3) {
-               var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]);
+         if (this.recolorFrom != null) {
+            for (var2 = 0; var2 < this.recolorFrom.length; ++var2) {
+               var4.recolor(this.recolorFrom[var2], this.recolorTo[var2]);
             }
          }
 
-         if(this.retextureFrom != null) {
-            for(var3 = 0; var3 < this.retextureFrom.length; ++var3) {
-               var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]);
+         if (this.retextureFrom != null) {
+            for (var2 = 0; var2 < this.retextureFrom.length; ++var2) {
+               var4.retexture(this.retextureFrom[var2], this.retextureTo[var2]);
             }
          }
 
@@ -627,41 +621,41 @@ public class ItemDefinition extends DualNode {
    )
    @Export("getModel")
    public final Model getModel(int var1) {
-      if(this.__az != null && var1 > 1) {
+      if (this.field436 != null && var1 > 1) {
          int var2 = -1;
 
-         for(int var3 = 0; var3 < 10; ++var3) {
-            if(var1 >= this.__au[var3] && this.__au[var3] != 0) {
-               var2 = this.__az[var3];
+         for (int var3 = 0; var3 < 10; ++var3) {
+            if (var1 >= this.field437[var3] && this.field437[var3] != 0) {
+               var2 = this.field436[var3];
             }
          }
 
-         if(var2 != -1) {
+         if (var2 != -1) {
             return Skills.getItemDefinition(var2).getModel(1);
          }
       }
 
       Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id);
-      if(var5 != null) {
+      if (var5 != null) {
          return var5;
       } else {
-         ModelData var6 = ModelData.method2788(ItemDefinition_modelIndexCache, this.__a, 0);
-         if(var6 == null) {
+         ModelData var6 = ModelData.method2788(ItemDefinition_modelIndexCache, this.field435, 0);
+         if (var6 == null) {
             return null;
          } else {
-            if(this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
-               var6.__y_227(this.resizeX, this.resizeY, this.resizeZ);
+            if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
+               var6.method215(this.resizeX, this.resizeY, this.resizeZ);
             }
 
             int var4;
-            if(this.recolorFrom != null) {
-               for(var4 = 0; var4 < this.recolorFrom.length; ++var4) {
+            if (this.recolorFrom != null) {
+               for (var4 = 0; var4 < this.recolorFrom.length; ++var4) {
                   var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]);
                }
             }
 
-            if(this.retextureFrom != null) {
-               for(var4 = 0; var4 < this.retextureFrom.length; ++var4) {
+            if (this.retextureFrom != null) {
+               for (var4 = 0; var4 < this.retextureFrom.length; ++var4) {
                   var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]);
                }
             }
@@ -679,17 +673,17 @@ public class ItemDefinition extends DualNode {
       signature = "(IB)Ljv;",
       garbageValue = "0"
    )
-   public ItemDefinition __x_430(int var1) {
-      if(this.__az != null && var1 > 1) {
+   public ItemDefinition method144(int var1) {
+      if (this.field436 != null && var1 > 1) {
          int var2 = -1;
 
-         for(int var3 = 0; var3 < 10; ++var3) {
-            if(var1 >= this.__au[var3] && this.__au[var3] != 0) {
-               var2 = this.__az[var3];
+         for (int var3 = 0; var3 < 10; ++var3) {
+            if (var1 >= this.field437[var3] && this.field437[var3] != 0) {
+               var2 = this.field436[var3];
             }
          }
 
-         if(var2 != -1) {
+         if (var2 != -1) {
             return Skills.getItemDefinition(var2);
          }
       }
@@ -702,29 +696,29 @@ public class ItemDefinition extends DualNode {
       signature = "(ZI)Z",
       garbageValue = "-918880706"
    )
-   public final boolean __z_431(boolean var1) {
+   public final boolean method145(boolean var1) {
       int var2 = this.maleModel;
       int var3 = this.maleModel1;
       int var4 = this.maleModel2;
-      if(var1) {
+      if (var1) {
          var2 = this.femaleModel;
          var3 = this.femaleModel1;
          var4 = this.femaleModel2;
       }
 
-      if(var2 == -1) {
+      if (var2 == -1) {
          return true;
       } else {
          boolean var5 = true;
-         if(!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) {
+         if (!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) {
             var5 = false;
          }
 
-         if(var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) {
+         if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) {
             var5 = false;
          }
 
-         if(var4 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var4, 0)) {
+         if (var4 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var4, 0)) {
             var5 = false;
          }
 
@@ -737,23 +731,23 @@ public class ItemDefinition extends DualNode {
       signature = "(ZB)Ldw;",
       garbageValue = "-123"
    )
-   public final ModelData __j_432(boolean var1) {
+   public final ModelData method146(boolean var1) {
       int var2 = this.maleModel;
       int var3 = this.maleModel1;
       int var4 = this.maleModel2;
-      if(var1) {
+      if (var1) {
          var2 = this.femaleModel;
          var3 = this.femaleModel1;
          var4 = this.femaleModel2;
       }
 
-      if(var2 == -1) {
+      if (var2 == -1) {
          return null;
       } else {
          ModelData var5 = ModelData.method2788(ItemDefinition_modelIndexCache, var2, 0);
-         if(var3 != -1) {
+         if (var3 != -1) {
             ModelData var6 = ModelData.method2788(ItemDefinition_modelIndexCache, var3, 0);
-            if(var4 != -1) {
+            if (var4 != -1) {
                ModelData var7 = ModelData.method2788(ItemDefinition_modelIndexCache, var4, 0);
                ModelData[] var8 = new ModelData[]{var5, var6, var7};
                var5 = new ModelData(var8, 3);
@@ -763,23 +757,23 @@ public class ItemDefinition extends DualNode {
             }
          }
 
-         if(!var1 && this.maleOffset != 0) {
-            var5.__z_225(0, this.maleOffset, 0);
+         if (!var1 && this.maleOffset != 0) {
+            var5.method213(0, this.maleOffset, 0);
          }
 
-         if(var1 && this.femaleOffset != 0) {
-            var5.__z_225(0, this.femaleOffset, 0);
+         if (var1 && this.femaleOffset != 0) {
+            var5.method213(0, this.femaleOffset, 0);
          }
 
          int var9;
-         if(this.recolorFrom != null) {
-            for(var9 = 0; var9 < this.recolorFrom.length; ++var9) {
+         if (this.recolorFrom != null) {
+            for (var9 = 0; var9 < this.recolorFrom.length; ++var9) {
                var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]);
             }
          }
 
-         if(this.retextureFrom != null) {
-            for(var9 = 0; var9 < this.retextureFrom.length; ++var9) {
+         if (this.retextureFrom != null) {
+            for (var9 = 0; var9 < this.retextureFrom.length; ++var9) {
                var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]);
             }
          }
@@ -793,23 +787,23 @@ public class ItemDefinition extends DualNode {
       signature = "(ZI)Z",
       garbageValue = "-998582497"
    )
-   public final boolean __s_433(boolean var1) {
+   public final boolean method147(boolean var1) {
       int var2 = this.maleHeadModel;
       int var3 = this.maleHeadModel2;
-      if(var1) {
+      if (var1) {
          var2 = this.femaleHeadModel;
          var3 = this.femaleHeadModel2;
       }
 
-      if(var2 == -1) {
+      if (var2 == -1) {
          return true;
       } else {
          boolean var4 = true;
-         if(!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) {
+         if (!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) {
             var4 = false;
          }
 
-         if(var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) {
+         if (var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) {
             var4 = false;
          }
 
@@ -822,33 +816,33 @@ public class ItemDefinition extends DualNode {
       signature = "(ZI)Ldw;",
       garbageValue = "-1820885439"
    )
-   public final ModelData __t_434(boolean var1) {
+   public final ModelData method148(boolean var1) {
       int var2 = this.maleHeadModel;
       int var3 = this.maleHeadModel2;
-      if(var1) {
+      if (var1) {
          var2 = this.femaleHeadModel;
          var3 = this.femaleHeadModel2;
       }
 
-      if(var2 == -1) {
+      if (var2 == -1) {
          return null;
       } else {
          ModelData var4 = ModelData.method2788(ItemDefinition_modelIndexCache, var2, 0);
-         if(var3 != -1) {
+         if (var3 != -1) {
             ModelData var5 = ModelData.method2788(ItemDefinition_modelIndexCache, var3, 0);
             ModelData[] var6 = new ModelData[]{var4, var5};
             var4 = new ModelData(var6, 2);
          }
 
          int var7;
-         if(this.recolorFrom != null) {
-            for(var7 = 0; var7 < this.recolorFrom.length; ++var7) {
+         if (this.recolorFrom != null) {
+            for (var7 = 0; var7 < this.recolorFrom.length; ++var7) {
                var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]);
             }
          }
 
-         if(this.retextureFrom != null) {
-            for(var7 = 0; var7 < this.retextureFrom.length; ++var7) {
+         if (this.retextureFrom != null) {
+            for (var7 = 0; var7 < this.retextureFrom.length; ++var7) {
                var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]);
             }
          }
@@ -864,20 +858,20 @@ public class ItemDefinition extends DualNode {
    )
    @Export("getIntParam")
    public int getIntParam(int var1, int var2) {
-      IterableNodeHashTable var4 = this.params;
-      int var3;
-      if(var4 == null) {
-         var3 = var2;
+      IterableNodeHashTable var3 = this.params;
+      int var4;
+      if (var3 == null) {
+         var4 = var2;
       } else {
-         IntegerNode var5 = (IntegerNode)var4.get((long)var1);
-         if(var5 == null) {
-            var3 = var2;
+         IntegerNode var5 = (IntegerNode)var3.get((long)var1);
+         if (var5 == null) {
+            var4 = var2;
          } else {
-            var3 = var5.integer;
+            var4 = var5.integer;
          }
       }
 
-      return var3;
+      return var4;
    }
 
    @ObfuscatedName("h")
@@ -897,6 +891,12 @@ public class ItemDefinition extends DualNode {
    )
    @Export("getShiftClickIndex")
    public int getShiftClickIndex() {
-      return this.shiftClickIndex0 != -1 && this.inventoryActions != null?(this.shiftClickIndex0 >= 0?(this.inventoryActions[this.shiftClickIndex0] != null?this.shiftClickIndex0:-1):("Drop".equalsIgnoreCase(this.inventoryActions[4])?4:-1)):-1;
+      return this.shiftClickIndex0 != -1 && this.inventoryActions != null ? (this.shiftClickIndex0 >= 0 ? (this.inventoryActions[this.shiftClickIndex0] != null ? this.shiftClickIndex0 : -1) : ("Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1)) : -1;
+   }
+
+   static {
+      ItemDefinition_cached = new EvictingDualNodeHashTable(64);
+      ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50);
+      Sprite_cached = new EvictingDualNodeHashTable(200);
    }
 }
diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java
index da2bea045e..ed7ebad7ad 100644
--- a/runescape-client/src/main/java/IterableDualNodeQueue.java
+++ b/runescape-client/src/main/java/IterableDualNodeQueue.java
@@ -29,7 +29,7 @@ public class IterableDualNodeQueue implements Iterable {
    @ObfuscatedName("m")
    @Export("clear")
    public void clear() {
-      while(this.sentinel.previousDual != this.sentinel) {
+      while (this.sentinel.previousDual != this.sentinel) {
          this.sentinel.previousDual.removeDual();
       }
 
@@ -41,7 +41,7 @@ public class IterableDualNodeQueue implements Iterable {
    )
    @Export("add")
    public void add(DualNode var1) {
-      if(var1.nextDual != null) {
+      if (var1.nextDual != null) {
          var1.removeDual();
       }
 
@@ -55,9 +55,9 @@ public class IterableDualNodeQueue implements Iterable {
    @ObfuscatedSignature(
       signature = "()Lfn;"
    )
-   public DualNode __q_448() {
+   public DualNode method149() {
       DualNode var1 = this.sentinel.previousDual;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          return null;
       } else {
          var1.removeDual();
@@ -69,23 +69,23 @@ public class IterableDualNodeQueue implements Iterable {
    @ObfuscatedSignature(
       signature = "()Lfn;"
    )
-   public DualNode __w_449() {
-      return this.__o_450((DualNode)null);
+   public DualNode method150() {
+      return this.method151((DualNode)null);
    }
 
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "(Lfn;)Lfn;"
    )
-   DualNode __o_450(DualNode var1) {
+   DualNode method151(DualNode var1) {
       DualNode var2;
-      if(var1 == null) {
+      if (var1 == null) {
          var2 = this.sentinel.previousDual;
       } else {
          var2 = var1;
       }
 
-      if(var2 == this.sentinel) {
+      if (var2 == this.sentinel) {
          this.head = null;
          return null;
       } else {
@@ -98,9 +98,9 @@ public class IterableDualNodeQueue implements Iterable {
    @ObfuscatedSignature(
       signature = "()Lfn;"
    )
-   public DualNode __u_451() {
+   public DualNode method152() {
       DualNode var1 = this.head;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          this.head = null;
          return null;
       } else {
diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
index 76c1205ba7..336fe57531 100644
--- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
+++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
@@ -17,51 +17,51 @@ public class IterableDualNodeQueueIterator implements Iterator {
    @ObfuscatedSignature(
       signature = "Lfn;"
    )
-   DualNode __f;
+   DualNode field438;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lfn;"
    )
-   DualNode __q;
+   DualNode field439;
 
    @ObfuscatedSignature(
       signature = "(Ljc;)V"
    )
    IterableDualNodeQueueIterator(IterableDualNodeQueue var1) {
-      this.__q = null;
+      this.field439 = null;
       this.queue = var1;
-      this.__f = this.queue.sentinel.previousDual;
-      this.__q = null;
+      this.field438 = this.queue.sentinel.previousDual;
+      this.field439 = null;
    }
 
    @Export("next")
    @ObfuscatedName("next")
    public Object next() {
-      DualNode var1 = this.__f;
-      if(var1 == this.queue.sentinel) {
+      DualNode var1 = this.field438;
+      if (var1 == this.queue.sentinel) {
          var1 = null;
-         this.__f = null;
+         this.field438 = null;
       } else {
-         this.__f = var1.previousDual;
+         this.field438 = var1.previousDual;
       }
 
-      this.__q = var1;
+      this.field439 = var1;
       return var1;
    }
 
    @Export("hasNext")
    @ObfuscatedName("hasNext")
    public boolean hasNext() {
-      return this.queue.sentinel != this.__f;
+      return this.queue.sentinel != this.field438;
    }
 
    @ObfuscatedName("remove")
-   public void __remove_442() {
-      if(this.__q == null) {
+   public void method153() {
+      if (this.field439 == null) {
          throw new IllegalStateException();
       } else {
-         this.__q.removeDual();
-         this.__q = null;
+         this.field439.removeDual();
+         this.field439 = null;
       }
    }
 }
diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java
index 6a09c766a7..153160f944 100644
--- a/runescape-client/src/main/java/IterableNodeDeque.java
+++ b/runescape-client/src/main/java/IterableNodeDeque.java
@@ -29,7 +29,7 @@ public class IterableNodeDeque implements Iterable {
    @ObfuscatedName("m")
    @Export("clear")
    public void clear() {
-      while(this.sentinel.previous != this.sentinel) {
+      while (this.sentinel.previous != this.sentinel) {
          this.sentinel.previous.remove();
       }
 
@@ -41,7 +41,7 @@ public class IterableNodeDeque implements Iterable {
    )
    @Export("addFirst")
    public void addFirst(Node var1) {
-      if(var1.next != null) {
+      if (var1.next != null) {
          var1.remove();
       }
 
@@ -57,7 +57,7 @@ public class IterableNodeDeque implements Iterable {
    )
    @Export("addLast")
    public void addLast(Node var1) {
-      if(var1.next != null) {
+      if (var1.next != null) {
          var1.remove();
       }
 
@@ -83,13 +83,13 @@ public class IterableNodeDeque implements Iterable {
    @Export("previousOrLast")
    Node previousOrLast(Node var1) {
       Node var2;
-      if(var1 == null) {
+      if (var1 == null) {
          var2 = this.sentinel.previous;
       } else {
          var2 = var1;
       }
 
-      if(var2 == this.sentinel) {
+      if (var2 == this.sentinel) {
          this.current = null;
          return null;
       } else {
@@ -105,7 +105,7 @@ public class IterableNodeDeque implements Iterable {
    @Export("previous")
    public Node previous() {
       Node var1 = this.current;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          this.current = null;
          return null;
       } else {
@@ -132,7 +132,7 @@ public class IterableNodeDeque implements Iterable {
    )
    @Export("IterableNodeDeque_addBefore")
    public static void IterableNodeDeque_addBefore(Node var0, Node var1) {
-      if(var0.next != null) {
+      if (var0.next != null) {
          var0.remove();
       }
 
diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
index dd0e92ce91..0c3d2349f1 100644
--- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
+++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
@@ -17,64 +17,64 @@ public class IterableNodeDequeDescendingIterator implements Iterator {
    @ObfuscatedSignature(
       signature = "Lgw;"
    )
-   Node __f;
+   Node field440;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lgw;"
    )
-   Node __q;
+   Node field441;
 
    @ObfuscatedSignature(
       signature = "(Lja;)V"
    )
    IterableNodeDequeDescendingIterator(IterableNodeDeque var1) {
-      this.__q = null;
-      this.__u_443(var1);
+      this.field441 = null;
+      this.method154(var1);
    }
 
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "(Lja;)V"
    )
-   void __u_443(IterableNodeDeque var1) {
+   void method154(IterableNodeDeque var1) {
       this.deque = var1;
-      this.__g_444();
+      this.method155();
    }
 
    @ObfuscatedName("g")
-   void __g_444() {
-      this.__f = this.deque != null?this.deque.sentinel.previous:null;
-      this.__q = null;
+   void method155() {
+      this.field440 = this.deque != null ? this.deque.sentinel.previous : null;
+      this.field441 = null;
    }
 
    @Export("hasNext")
    @ObfuscatedName("hasNext")
    public boolean hasNext() {
-      return this.deque.sentinel != this.__f;
+      return this.deque.sentinel != this.field440;
    }
 
    @Export("next")
    @ObfuscatedName("next")
    public Object next() {
-      Node var1 = this.__f;
-      if(var1 == this.deque.sentinel) {
+      Node var1 = this.field440;
+      if (var1 == this.deque.sentinel) {
          var1 = null;
-         this.__f = null;
+         this.field440 = null;
       } else {
-         this.__f = var1.previous;
+         this.field440 = var1.previous;
       }
 
-      this.__q = var1;
+      this.field441 = var1;
       return var1;
    }
 
    @ObfuscatedName("remove")
-   public void __remove_447() {
-      if(this.__q == null) {
+   public void method156() {
+      if (this.field441 == null) {
          throw new IllegalStateException();
       } else {
-         this.__q.remove();
-         this.__q = null;
+         this.field441.remove();
+         this.field441 = null;
       }
    }
 }
diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java
index a3404858e8..93cecb53a0 100644
--- a/runescape-client/src/main/java/IterableNodeHashTable.java
+++ b/runescape-client/src/main/java/IterableNodeHashTable.java
@@ -37,7 +37,7 @@ public final class IterableNodeHashTable implements Iterable {
       this.size = var1;
       this.buckets = new Node[var1];
 
-      for(int var2 = 0; var2 < var1; ++var2) {
+      for (int var2 = 0; var2 < var1; ++var2) {
          Node var3 = this.buckets[var2] = new Node();
          var3.previous = var3;
          var3.next = var3;
@@ -53,8 +53,8 @@ public final class IterableNodeHashTable implements Iterable {
    public Node get(long var1) {
       Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))];
 
-      for(this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) {
-         if(this.currentGet.key == var1) {
+      for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) {
+         if (this.currentGet.key == var1) {
             Node var4 = this.currentGet;
             this.currentGet = this.currentGet.previous;
             return var4;
@@ -71,7 +71,7 @@ public final class IterableNodeHashTable implements Iterable {
    )
    @Export("put")
    public void put(Node var1, long var2) {
-      if(var1.next != null) {
+      if (var1.next != null) {
          var1.remove();
       }
 
@@ -86,12 +86,12 @@ public final class IterableNodeHashTable implements Iterable {
    @ObfuscatedName("q")
    @Export("clear")
    public void clear() {
-      for(int var1 = 0; var1 < this.size; ++var1) {
+      for (int var1 = 0; var1 < this.size; ++var1) {
          Node var2 = this.buckets[var1];
 
-         while(true) {
+         while (true) {
             Node var3 = var2.previous;
-            if(var3 == var2) {
+            if (var3 == var2) {
                break;
             }
 
@@ -120,21 +120,20 @@ public final class IterableNodeHashTable implements Iterable {
    @Export("next")
    public Node next() {
       Node var1;
-      if(this.index > 0 && this.buckets[this.index - 1] != this.current) {
+      if (this.index > 0 && this.buckets[this.index - 1] != this.current) {
          var1 = this.current;
          this.current = var1.previous;
          return var1;
       } else {
-         do {
-            if(this.index >= this.size) {
-               return null;
-            }
-
+         while (this.index < this.size) {
             var1 = this.buckets[this.index++].previous;
-         } while(var1 == this.buckets[this.index - 1]);
+            if (var1 != this.buckets[this.index - 1]) {
+               this.current = var1.previous;
+               return var1;
+            }
+         }
 
-         this.current = var1.previous;
-         return var1;
+         return null;
       }
    }
 
diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java
index 87ce727ad7..9c6b6c8a3d 100644
--- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java
+++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java
@@ -17,68 +17,67 @@ public class IterableNodeHashTableIterator implements Iterator {
    @ObfuscatedSignature(
       signature = "Lgw;"
    )
-   Node __f;
+   Node field442;
    @ObfuscatedName("q")
-   int __q;
+   int field443;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lgw;"
    )
-   Node __w;
+   Node field444;
 
    @ObfuscatedSignature(
       signature = "(Llh;)V"
    )
    IterableNodeHashTableIterator(IterableNodeHashTable var1) {
-      this.__w = null;
+      this.field444 = null;
       this.hashTable = var1;
-      this.__u_483();
+      this.method157();
    }
 
    @ObfuscatedName("u")
-   void __u_483() {
-      this.__f = this.hashTable.buckets[0].previous;
-      this.__q = 1;
-      this.__w = null;
+   void method157() {
+      this.field442 = this.hashTable.buckets[0].previous;
+      this.field443 = 1;
+      this.field444 = null;
    }
 
    @Export("next")
    @ObfuscatedName("next")
    public Object next() {
       Node var1;
-      if(this.hashTable.buckets[this.__q - 1] != this.__f) {
-         var1 = this.__f;
-         this.__f = var1.previous;
-         this.__w = var1;
+      if (this.hashTable.buckets[this.field443 - 1] != this.field442) {
+         var1 = this.field442;
+         this.field442 = var1.previous;
+         this.field444 = var1;
          return var1;
       } else {
-         do {
-            if(this.__q >= this.hashTable.size) {
-               return null;
+         while (this.field443 < this.hashTable.size) {
+            var1 = this.hashTable.buckets[this.field443++].previous;
+            if (var1 != this.hashTable.buckets[this.field443 - 1]) {
+               this.field442 = var1.previous;
+               this.field444 = var1;
+               return var1;
             }
+         }
 
-            var1 = this.hashTable.buckets[this.__q++].previous;
-         } while(var1 == this.hashTable.buckets[this.__q - 1]);
-
-         this.__f = var1.previous;
-         this.__w = var1;
-         return var1;
+         return null;
       }
    }
 
    @Export("hasNext")
    @ObfuscatedName("hasNext")
    public boolean hasNext() {
-      if(this.hashTable.buckets[this.__q - 1] != this.__f) {
+      if (this.hashTable.buckets[this.field443 - 1] != this.field442) {
          return true;
       } else {
-         while(this.__q < this.hashTable.size) {
-            if(this.hashTable.buckets[this.__q++].previous != this.hashTable.buckets[this.__q - 1]) {
-               this.__f = this.hashTable.buckets[this.__q - 1].previous;
+         while (this.field443 < this.hashTable.size) {
+            if (this.hashTable.buckets[this.field443++].previous != this.hashTable.buckets[this.field443 - 1]) {
+               this.field442 = this.hashTable.buckets[this.field443 - 1].previous;
                return true;
             }
 
-            this.__f = this.hashTable.buckets[this.__q - 1];
+            this.field442 = this.hashTable.buckets[this.field443 - 1];
          }
 
          return false;
@@ -86,12 +85,12 @@ public class IterableNodeHashTableIterator implements Iterator {
    }
 
    @ObfuscatedName("remove")
-   public void __remove_486() {
-      if(this.__w == null) {
+   public void method158() {
+      if (this.field444 == null) {
          throw new IllegalStateException();
       } else {
-         this.__w.remove();
-         this.__w = null;
+         this.field444.remove();
+         this.field444 = null;
       }
    }
 }
diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java
index 7bd6aa523f..d788fc95c4 100644
--- a/runescape-client/src/main/java/KeyHandler.java
+++ b/runescape-client/src/main/java/KeyHandler.java
@@ -16,7 +16,7 @@ public final class KeyHandler implements KeyListener, FocusListener {
    @ObfuscatedGetter(
       intValue = -817957995
    )
-   static int __an_ra;
+   static int field445;
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lan;"
@@ -45,43 +45,43 @@ public final class KeyHandler implements KeyListener, FocusListener {
    @Export("KeyHandler_pressedKeys")
    public static boolean[] KeyHandler_pressedKeys;
    @ObfuscatedName("cq")
-   static int[] __an_cq;
+   static int[] field446;
    @ObfuscatedName("ch")
    @ObfuscatedGetter(
       intValue = 1112094745
    )
-   static int __an_ch;
+   static int field447;
    @ObfuscatedName("cw")
    @ObfuscatedGetter(
       intValue = -1208053825
    )
-   static int __an_cw;
+   static int field448;
    @ObfuscatedName("cg")
-   static char[] __an_cg;
+   static char[] field449;
    @ObfuscatedName("cf")
-   static int[] __an_cf;
+   static int[] field450;
    @ObfuscatedName("cp")
-   public static int[] __an_cp;
+   public static int[] field451;
    @ObfuscatedName("cl")
    @ObfuscatedGetter(
       intValue = -674534717
    )
-   public static int __an_cl;
+   public static int field452;
    @ObfuscatedName("ct")
    @ObfuscatedGetter(
       intValue = -93280591
    )
-   static int __an_ct;
+   static int field453;
    @ObfuscatedName("cz")
    @ObfuscatedGetter(
       intValue = 2066759739
    )
-   static int __an_cz;
+   static int field454;
    @ObfuscatedName("cc")
    @ObfuscatedGetter(
       intValue = -1942898885
    )
-   static int __an_cc;
+   static int field455;
    @ObfuscatedName("ci")
    @ObfuscatedGetter(
       intValue = -474146073
@@ -98,57 +98,40 @@ public final class KeyHandler implements KeyListener, FocusListener {
    @Export("crossSprites")
    static Sprite[] crossSprites;
 
-   static {
-      KeyHandler_instance = new KeyHandler();
-      KeyHandler_pressedKeys = new boolean[112];
-      __an_cq = new int[128];
-      __an_ch = 0;
-      __an_cw = 0;
-      __an_cg = new char[128];
-      __an_cf = new int[128];
-      __an_cp = new int[128];
-      __an_cl = 0;
-      __an_ct = 0;
-      __an_cz = 0;
-      __an_cc = 0;
-      KeyHandler_idleCycles = 0;
-      KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
-   }
-
    @Export("keyPressed")
    @ObfuscatedName("keyPressed")
    public final synchronized void keyPressed(KeyEvent var1) {
-      if(KeyHandler_instance != null) {
+      if (KeyHandler_instance != null) {
          int var2 = var1.getKeyCode();
-         if(var2 >= 0 && var2 < KeyHandler_keyCodes.length) {
+         if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) {
             var2 = KeyHandler_keyCodes[var2];
-            if((var2 & 128) != 0) {
+            if ((var2 & 128) != 0) {
                var2 = -1;
             }
          } else {
             var2 = -1;
          }
 
-         if(__an_cw >= 0 && var2 >= 0) {
-            __an_cq[__an_cw] = var2;
-            __an_cw = __an_cw + 1 & 127;
-            if(__an_ch == __an_cw) {
-               __an_cw = -1;
+         if (field448 >= 0 && var2 >= 0) {
+            field446[field448] = var2;
+            field448 = field448 + 1 & 127;
+            if (field447 == field448) {
+               field448 = -1;
             }
          }
 
          int var3;
-         if(var2 >= 0) {
-            var3 = __an_cz + 1 & 127;
-            if(var3 != __an_ct) {
-               __an_cf[__an_cz] = var2;
-               __an_cg[__an_cz] = 0;
-               __an_cz = var3;
+         if (var2 >= 0) {
+            var3 = field454 + 1 & 127;
+            if (var3 != field453) {
+               field450[field454] = var2;
+               field449[field454] = 0;
+               field454 = var3;
             }
          }
 
          var3 = var1.getModifiers();
-         if((var3 & 10) != 0 || var2 == 85 || var2 == 10) {
+         if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) {
             var1.consume();
          }
       }
@@ -163,8 +146,8 @@ public final class KeyHandler implements KeyListener, FocusListener {
    @Export("focusLost")
    @ObfuscatedName("focusLost")
    public final synchronized void focusLost(FocusEvent var1) {
-      if(KeyHandler_instance != null) {
-         __an_cw = -1;
+      if (KeyHandler_instance != null) {
+         field448 = -1;
       }
 
    }
@@ -172,19 +155,19 @@ public final class KeyHandler implements KeyListener, FocusListener {
    @Export("keyReleased")
    @ObfuscatedName("keyReleased")
    public final synchronized void keyReleased(KeyEvent var1) {
-      if(KeyHandler_instance != null) {
+      if (KeyHandler_instance != null) {
          int var2 = var1.getKeyCode();
-         if(var2 >= 0 && var2 < KeyHandler_keyCodes.length) {
+         if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) {
             var2 = KeyHandler_keyCodes[var2] & -129;
          } else {
             var2 = -1;
          }
 
-         if(__an_cw >= 0 && var2 >= 0) {
-            __an_cq[__an_cw] = ~var2;
-            __an_cw = __an_cw + 1 & 127;
-            if(__an_ch == __an_cw) {
-               __an_cw = -1;
+         if (field448 >= 0 && var2 >= 0) {
+            field446[field448] = ~var2;
+            field448 = field448 + 1 & 127;
+            if (field447 == field448) {
+               field448 = -1;
             }
          }
       }
@@ -195,22 +178,22 @@ public final class KeyHandler implements KeyListener, FocusListener {
    @Export("keyTyped")
    @ObfuscatedName("keyTyped")
    public final void keyTyped(KeyEvent var1) {
-      if(KeyHandler_instance != null) {
+      if (KeyHandler_instance != null) {
          char var2 = var1.getKeyChar();
-         if(var2 != 0 && var2 != '\uffff') {
+         if (var2 != 0 && var2 != '\uffff') {
             boolean var3;
-            if(var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) {
+            if (var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) {
                var3 = true;
             } else {
-               label63: {
-                  if(var2 != 0) {
-                     char[] var7 = class304.cp1252AsciiExtension;
+               label56: {
+                  if (var2 != 0) {
+                     char[] var4 = class304.cp1252AsciiExtension;
 
-                     for(int var5 = 0; var5 < var7.length; ++var5) {
-                        char var6 = var7[var5];
-                        if(var2 == var6) {
+                     for (int var5 = 0; var5 < var4.length; ++var5) {
+                        char var6 = var4[var5];
+                        if (var2 == var6) {
                            var3 = true;
-                           break label63;
+                           break label56;
                         }
                      }
                   }
@@ -219,12 +202,12 @@ public final class KeyHandler implements KeyListener, FocusListener {
                }
             }
 
-            if(var3) {
-               int var4 = __an_cz + 1 & 127;
-               if(var4 != __an_ct) {
-                  __an_cf[__an_cz] = -1;
-                  __an_cg[__an_cz] = var2;
-                  __an_cz = var4;
+            if (var3) {
+               int var7 = field454 + 1 & 127;
+               if (var7 != field453) {
+                  field450[field454] = -1;
+                  field449[field454] = var2;
+                  field454 = var7;
                }
             }
          }
@@ -241,11 +224,28 @@ public final class KeyHandler implements KeyListener, FocusListener {
    static String method839() {
       String var0 = "";
 
-      Message var2;
-      for(Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') {
-         var2 = (Message)var1.next();
+      Message var1;
+      for (Iterator var2 = Messages.Messages_hashTable.iterator(); var2.hasNext(); var0 = var0 + var1.sender + ':' + var1.text + '\n') {
+         var1 = (Message)var2.next();
       }
 
       return var0;
    }
+
+   static {
+      KeyHandler_instance = new KeyHandler();
+      KeyHandler_pressedKeys = new boolean[112];
+      field446 = new int[128];
+      field447 = 0;
+      field448 = 0;
+      field449 = new char[128];
+      field450 = new int[128];
+      field451 = new int[128];
+      field452 = 0;
+      field453 = 0;
+      field454 = 0;
+      field455 = 0;
+      KeyHandler_idleCycles = 0;
+      KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+   }
 }
diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java
index bb2b7caf1e..920c77abf6 100644
--- a/runescape-client/src/main/java/KitDefinition.java
+++ b/runescape-client/src/main/java/KitDefinition.java
@@ -17,12 +17,12 @@ public class KitDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __im_f;
+   public static AbstractIndexCache field456;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 235389995
    )
-   public static int __im_q;
+   public static int field457;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -33,9 +33,9 @@ public class KitDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = 1619779051
    )
-   public int __o;
+   public int field458;
    @ObfuscatedName("u")
-   int[] __u;
+   int[] field459;
    @ObfuscatedName("g")
    @Export("recolorFrom")
    short[] recolorFrom;
@@ -52,16 +52,12 @@ public class KitDefinition extends DualNode {
    @Export("archives")
    int[] archives;
    @ObfuscatedName("k")
-   public boolean __k;
-
-   static {
-      KitDefinition_cached = new EvictingDualNodeHashTable(64);
-   }
+   public boolean field460;
 
    KitDefinition() {
-      this.__o = -1;
+      this.field458 = -1;
       this.archives = new int[]{-1, -1, -1, -1, -1};
-      this.__k = false;
+      this.field460 = false;
    }
 
    @ObfuscatedName("f")
@@ -71,9 +67,9 @@ public class KitDefinition extends DualNode {
    )
    @Export("read")
    void read(Buffer var1) {
-      while(true) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
@@ -88,40 +84,40 @@ public class KitDefinition extends DualNode {
    )
    @Export("readNext")
    void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         this.__o = var1.readUnsignedByte();
+      if (var2 == 1) {
+         this.field458 = var1.readUnsignedByte();
       } else {
          int var3;
          int var4;
-         if(var2 == 2) {
+         if (var2 == 2) {
             var3 = var1.readUnsignedByte();
-            this.__u = new int[var3];
+            this.field459 = new int[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.__u[var4] = var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.field459[var4] = var1.method43();
             }
-         } else if(var2 == 3) {
-            this.__k = true;
-         } else if(var2 == 40) {
+         } else if (var2 == 3) {
+            this.field460 = true;
+         } else if (var2 == 40) {
             var3 = var1.readUnsignedByte();
             this.recolorFrom = new short[var3];
             this.recolorTo = new short[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.recolorFrom[var4] = (short)var1.__ag_302();
-               this.recolorTo[var4] = (short)var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.recolorFrom[var4] = (short)var1.method43();
+               this.recolorTo[var4] = (short)var1.method43();
             }
-         } else if(var2 == 41) {
+         } else if (var2 == 41) {
             var3 = var1.readUnsignedByte();
             this.retextureFrom = new short[var3];
             this.retextureTo = new short[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.retextureFrom[var4] = (short)var1.__ag_302();
-               this.retextureTo[var4] = (short)var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.retextureFrom[var4] = (short)var1.method43();
+               this.retextureTo[var4] = (short)var1.method43();
             }
-         } else if(var2 >= 60 && var2 < 70) {
-            this.archives[var2 - 60] = var1.__ag_302();
+         } else if (var2 >= 60 && var2 < 70) {
+            this.archives[var2 - 60] = var1.method43();
          }
       }
 
@@ -132,14 +128,14 @@ public class KitDefinition extends DualNode {
       signature = "(I)Z",
       garbageValue = "-1250940659"
    )
-   public boolean __w_413() {
-      if(this.__u == null) {
+   public boolean method159() {
+      if (this.field459 == null) {
          return true;
       } else {
          boolean var1 = true;
 
-         for(int var2 = 0; var2 < this.__u.length; ++var2) {
-            if(!__im_f.tryLoadRecord(this.__u[var2], 0)) {
+         for (int var2 = 0; var2 < this.field459.length; ++var2) {
+            if (!field456.tryLoadRecord(this.field459[var2], 0)) {
                var1 = false;
             }
          }
@@ -153,32 +149,32 @@ public class KitDefinition extends DualNode {
       signature = "(B)Ldw;",
       garbageValue = "0"
    )
-   public ModelData __o_414() {
-      if(this.__u == null) {
+   public ModelData method160() {
+      if (this.field459 == null) {
          return null;
       } else {
-         ModelData[] var1 = new ModelData[this.__u.length];
+         ModelData[] var1 = new ModelData[this.field459.length];
 
-         for(int var2 = 0; var2 < this.__u.length; ++var2) {
-            var1[var2] = ModelData.method2788(__im_f, this.__u[var2], 0);
+         for (int var2 = 0; var2 < this.field459.length; ++var2) {
+            var1[var2] = ModelData.method2788(field456, this.field459[var2], 0);
          }
 
          ModelData var4;
-         if(var1.length == 1) {
+         if (var1.length == 1) {
             var4 = var1[0];
          } else {
             var4 = new ModelData(var1, var1.length);
          }
 
          int var3;
-         if(this.recolorFrom != null) {
-            for(var3 = 0; var3 < this.recolorFrom.length; ++var3) {
+         if (this.recolorFrom != null) {
+            for (var3 = 0; var3 < this.recolorFrom.length; ++var3) {
                var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]);
             }
          }
 
-         if(this.retextureFrom != null) {
-            for(var3 = 0; var3 < this.retextureFrom.length; ++var3) {
+         if (this.retextureFrom != null) {
+            for (var3 = 0; var3 < this.retextureFrom.length; ++var3) {
                var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]);
             }
          }
@@ -192,11 +188,11 @@ public class KitDefinition extends DualNode {
       signature = "(I)Z",
       garbageValue = "742548471"
    )
-   public boolean __u_415() {
+   public boolean method161() {
       boolean var1 = true;
 
-      for(int var2 = 0; var2 < 5; ++var2) {
-         if(this.archives[var2] != -1 && !__im_f.tryLoadRecord(this.archives[var2], 0)) {
+      for (int var2 = 0; var2 < 5; ++var2) {
+         if (this.archives[var2] != -1 && !field456.tryLoadRecord(this.archives[var2], 0)) {
             var1 = false;
          }
       }
@@ -209,26 +205,26 @@ public class KitDefinition extends DualNode {
       signature = "(B)Ldw;",
       garbageValue = "-56"
    )
-   public ModelData __g_416() {
+   public ModelData method162() {
       ModelData[] var1 = new ModelData[5];
       int var2 = 0;
 
-      for(int var3 = 0; var3 < 5; ++var3) {
-         if(this.archives[var3] != -1) {
-            var1[var2++] = ModelData.method2788(__im_f, this.archives[var3], 0);
+      for (int var3 = 0; var3 < 5; ++var3) {
+         if (this.archives[var3] != -1) {
+            var1[var2++] = ModelData.method2788(field456, this.archives[var3], 0);
          }
       }
 
       ModelData var5 = new ModelData(var1, var2);
       int var4;
-      if(this.recolorFrom != null) {
-         for(var4 = 0; var4 < this.recolorFrom.length; ++var4) {
+      if (this.recolorFrom != null) {
+         for (var4 = 0; var4 < this.recolorFrom.length; ++var4) {
             var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]);
          }
       }
 
-      if(this.retextureFrom != null) {
-         for(var4 = 0; var4 < this.retextureFrom.length; ++var4) {
+      if (this.retextureFrom != null) {
+         for (var4 = 0; var4 < this.retextureFrom.length; ++var4) {
             var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]);
          }
       }
@@ -244,19 +240,23 @@ public class KitDefinition extends DualNode {
    public static String method4866(Buffer var0) {
       String var1;
       try {
-         int var2 = var0.__ae_307();
-         if(var2 > 32767) {
+         int var2 = var0.method48();
+         if (var2 > 32767) {
             var2 = 32767;
          }
 
          byte[] var3 = new byte[var2];
-         var0.index += class303.huffman.__f_294(var0.array, var0.index, var3, 0, var2);
+         var0.index += class303.huffman.method128(var0.array, var0.index, var3, 0, var2);
          String var4 = WidgetGroupParent.decodeStringCp1252(var3, 0, var2);
          var1 = var4;
-      } catch (Exception var6) {
+      } catch (Exception var5) {
          var1 = "Cabbage";
       }
 
       return var1;
    }
+
+   static {
+      KitDefinition_cached = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java
index b8722c44a4..54598f5db2 100644
--- a/runescape-client/src/main/java/Link.java
+++ b/runescape-client/src/main/java/Link.java
@@ -10,21 +10,22 @@ public class Link {
    @ObfuscatedSignature(
       signature = "Lgh;"
    )
-   public Link __m;
+   public Link field461;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lgh;"
    )
-   public Link __f;
+   public Link field462;
 
    @ObfuscatedName("m")
    @Export("remove")
    public void remove() {
-      if(this.__f != null) {
-         this.__f.__m = this.__m;
-         this.__m.__f = this.__f;
-         this.__m = null;
-         this.__f = null;
+      if (this.field462 != null) {
+         this.field462.field461 = this.field461;
+         this.field461.field462 = this.field462;
+         this.field461 = null;
+         this.field462 = null;
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java
index c74ef769cc..d83b58e84d 100644
--- a/runescape-client/src/main/java/LinkDeque.java
+++ b/runescape-client/src/main/java/LinkDeque.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
@@ -10,45 +9,45 @@ public class LinkDeque {
    @ObfuscatedSignature(
       signature = "Lgh;"
    )
-   Link __m;
+   Link field463;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lgh;"
    )
-   Link __f;
+   Link field464;
 
    public LinkDeque() {
-      this.__m = new Link();
-      this.__m.__m = this.__m;
-      this.__m.__f = this.__m;
+      this.field463 = new Link();
+      this.field463.field461 = this.field463;
+      this.field463.field462 = this.field463;
    }
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Lgh;)V"
    )
-   public void __m_437(Link var1) {
-      if(var1.__f != null) {
+   public void method163(Link var1) {
+      if (var1.field462 != null) {
          var1.remove();
       }
 
-      var1.__f = this.__m.__f;
-      var1.__m = this.__m;
-      var1.__f.__m = var1;
-      var1.__m.__f = var1;
+      var1.field462 = this.field463.field462;
+      var1.field461 = this.field463;
+      var1.field462.field461 = var1;
+      var1.field461.field462 = var1;
    }
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "()Lgh;"
    )
-   public Link __f_438() {
-      Link var1 = this.__m.__m;
-      if(var1 == this.__m) {
-         this.__f = null;
+   public Link method164() {
+      Link var1 = this.field463.field461;
+      if (var1 == this.field463) {
+         this.field464 = null;
          return null;
       } else {
-         this.__f = var1.__m;
+         this.field464 = var1.field461;
          return var1;
       }
    }
@@ -57,13 +56,13 @@ public class LinkDeque {
    @ObfuscatedSignature(
       signature = "()Lgh;"
    )
-   public Link __q_439() {
-      Link var1 = this.__f;
-      if(var1 == this.__m) {
-         this.__f = null;
+   public Link method165() {
+      Link var1 = this.field464;
+      if (var1 == this.field463) {
+         this.field464 = null;
          return null;
       } else {
-         this.__f = var1.__m;
+         this.field464 = var1.field461;
          return var1;
       }
    }
diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java
index 82123fb5af..646b5a23a1 100644
--- a/runescape-client/src/main/java/Login.java
+++ b/runescape-client/src/main/java/Login.java
@@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Login")
 public class Login {
    @ObfuscatedName("f")
-   static boolean __cu_f;
+   static boolean field465;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 1606541885
@@ -59,12 +59,12 @@ public class Login {
    @ObfuscatedGetter(
       intValue = 1077910071
    )
-   static int __cu_aj;
+   static int field466;
    @ObfuscatedName("ac")
    @ObfuscatedGetter(
       intValue = 1677133239
    )
-   static int __cu_ac;
+   static int field467;
    @ObfuscatedName("aw")
    @ObfuscatedGetter(
       intValue = 1861681835
@@ -90,14 +90,14 @@ public class Login {
    @Export("Login_password")
    static String Login_password;
    @ObfuscatedName("aa")
-   static boolean __cu_aa;
+   static boolean field468;
    @ObfuscatedName("ax")
-   static boolean __cu_ax;
+   static boolean field469;
    @ObfuscatedName("ai")
    @Export("otp")
    static String otp;
    @ObfuscatedName("ba")
-   static boolean __cu_ba;
+   static boolean field470;
    @ObfuscatedName("bb")
    @ObfuscatedGetter(
       intValue = 1769484271
@@ -129,12 +129,12 @@ public class Login {
    @ObfuscatedGetter(
       longValue = 803647694904294325L
    )
-   static long __cu_bi;
+   static long field471;
    @ObfuscatedName("bz")
    @ObfuscatedGetter(
       longValue = -3234258972092460093L
    )
-   static long __cu_bz;
+   static long field472;
    @ObfuscatedName("do")
    @ObfuscatedSignature(
       signature = "Lit;"
@@ -142,34 +142,6 @@ public class Login {
    @Export("indexCache11")
    static IndexCache indexCache11;
 
-   static {
-      xPadding = 0;
-      loginBoxX = xPadding + 202;
-      Login_loadingPercent = 10;
-      Login_loadingText = "";
-      __cu_aj = -1;
-      __cu_ac = 1;
-      loginIndex = 0;
-      Login_response0 = "";
-      Login_response1 = "";
-      Login_response2 = "";
-      Login_response3 = "";
-      Login_username = "";
-      Login_password = "";
-      __cu_aa = false;
-      __cu_ax = false;
-      __cu_ba = true;
-      currentLoginField = 0;
-      worldSelectOpen = false;
-      hoveredWorldIndex = -1;
-      worldSelectPage = 0;
-      worldSelectPagesCount = 0;
-      new DecimalFormat("##0.00");
-      new class161();
-      __cu_bi = -1L;
-      __cu_bz = -1L;
-   }
-
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Lir;II)Lhl;",
@@ -177,7 +149,7 @@ public class Login {
    )
    static MusicPatch method2045(AbstractIndexCache var0, int var1) {
       byte[] var2 = var0.takeRecordFlat(var1);
-      return var2 == null?null:new MusicPatch(var2);
+      return var2 == null ? null : new MusicPatch(var2);
    }
 
    @ObfuscatedName("m")
@@ -186,24 +158,24 @@ public class Login {
       garbageValue = "-246495141"
    )
    static void method2056() {
-      class248.__iu_e = new int[2000];
+      class248.field1141 = new int[2000];
       int var0 = 0;
       int var1 = 240;
 
-      int var3;
-      for(byte var2 = 12; var0 < 16; var1 -= var2) {
-         var3 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F));
-         class248.__iu_e[var0] = var3;
+      int var2;
+      for (byte var3 = 12; var0 < 16; var1 -= var3) {
+         var2 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F));
+         class248.field1141[var0] = var2;
          ++var0;
       }
 
       var1 = 48;
 
-      for(int var5 = var1 / 6; var0 < class248.__iu_e.length; var1 -= var5) {
-         var3 = var0 * 2;
+      for (int var5 = var1 / 6; var0 < class248.field1141.length; var1 -= var5) {
+         var2 = var0 * 2;
 
-         for(int var4 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class248.__iu_e.length; ++var0) {
-            class248.__iu_e[var0] = var4;
+         for (int var4 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var2 && var0 < class248.field1141.length; ++var0) {
+            class248.field1141[var0] = var4;
          }
       }
 
@@ -215,13 +187,13 @@ public class Login {
       garbageValue = "45"
    )
    public static void method2076(AbstractIndexCache var0, int var1, int var2, int var3, boolean var4) {
-      class214.__hf_o = 1;
-      class214.__hf_u = var0;
+      class214.field1129 = 1;
+      class214.field1130 = var0;
       class30.musicTrackArchiveId = var1;
       GrandExchangeOffer.musicTrackFileId = var2;
-      WorldMapLabel.__aj_e = var3;
+      WorldMapLabel.field1039 = var3;
       RectangleMode.musicTrackBoolean = var4;
-      FaceNormal.__el_x = 10000;
+      FaceNormal.field344 = 10000;
    }
 
    @ObfuscatedName("gm")
@@ -230,11 +202,39 @@ public class Login {
       garbageValue = "-1"
    )
    static final int method2061() {
-      if(ReflectionCheck.clientPreferences.roofsHidden) {
+      if (ReflectionCheck.clientPreferences.roofsHidden) {
          return SoundSystem.plane;
       } else {
          int var0 = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane);
-         return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][class11.cameraZ >> 7] & 4) != 0?SoundSystem.plane:3;
+         return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][class11.cameraZ >> 7] & 4) != 0 ? SoundSystem.plane : 3;
       }
    }
+
+   static {
+      xPadding = 0;
+      loginBoxX = xPadding + 202;
+      Login_loadingPercent = 10;
+      Login_loadingText = "";
+      field466 = -1;
+      field467 = 1;
+      loginIndex = 0;
+      Login_response0 = "";
+      Login_response1 = "";
+      Login_response2 = "";
+      Login_response3 = "";
+      Login_username = "";
+      Login_password = "";
+      field468 = false;
+      field469 = false;
+      field470 = true;
+      currentLoginField = 0;
+      worldSelectOpen = false;
+      hoveredWorldIndex = -1;
+      worldSelectPage = 0;
+      worldSelectPagesCount = 0;
+      new DecimalFormat("##0.00");
+      new class161();
+      field471 = -1L;
+      field472 = -1L;
+   }
 }
diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java
index d3f674d1d9..95d3ad97ad 100644
--- a/runescape-client/src/main/java/LoginPacket.java
+++ b/runescape-client/src/main/java/LoginPacket.java
@@ -13,32 +13,32 @@ public class LoginPacket implements ClientPacketMarker {
    @ObfuscatedSignature(
       signature = "Lgl;"
    )
-   public static final LoginPacket __gl_m;
+   public static final LoginPacket field473;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lgl;"
    )
-   static final LoginPacket __gl_f;
+   static final LoginPacket field474;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lgl;"
    )
-   public static final LoginPacket __gl_q;
+   public static final LoginPacket field475;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lgl;"
    )
-   public static final LoginPacket __gl_w;
+   public static final LoginPacket field476;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Lgl;"
    )
-   static final LoginPacket __gl_o;
+   static final LoginPacket field477;
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "[Lgl;"
    )
-   static final LoginPacket[] __gl_g;
+   static final LoginPacket[] field478;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 1743806243
@@ -46,21 +46,6 @@ public class LoginPacket implements ClientPacketMarker {
    @Export("id")
    public final int id;
 
-   static {
-      __gl_m = new LoginPacket(14, 0);
-      __gl_f = new LoginPacket(15, 4);
-      __gl_q = new LoginPacket(16, -2);
-      __gl_w = new LoginPacket(18, -2);
-      __gl_o = new LoginPacket(27, 0);
-      __gl_g = new LoginPacket[32];
-      LoginPacket[] var0 = WorldMapIcon2.method300();
-
-      for(int var1 = 0; var1 < var0.length; ++var1) {
-         __gl_g[var0[var1].id] = var0[var1];
-      }
-
-   }
-
    @ObfuscatedSignature(
       signature = "(II)V",
       garbageValue = "0"
@@ -76,39 +61,52 @@ public class LoginPacket implements ClientPacketMarker {
    )
    @Export("getPreferencesFile")
    public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) {
-      File var3 = new File(class168.__fs_o, "preferences" + var0 + ".dat");
-      if(var3.exists()) {
+      File var3 = new File(class168.field1115, "preferences" + var0 + ".dat");
+      if (var3.exists()) {
          try {
-            AccessFile var10 = new AccessFile(var3, "rw", 10000L);
-            return var10;
-         } catch (IOException var9) {
-            ;
+            AccessFile var11 = new AccessFile(var3, "rw", 10000L);
+            return var11;
+         } catch (IOException var10) {
          }
       }
 
       String var4 = "";
-      if(PacketBuffer.__hx_z == 33) {
+      if (PacketBuffer.field667 == 33) {
          var4 = "_rc";
-      } else if(PacketBuffer.__hx_z == 34) {
+      } else if (PacketBuffer.field667 == 34) {
          var4 = "_wip";
       }
 
       File var5 = new File(WorldMapSection1.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat");
       AccessFile var6;
-      if(!var2 && var5.exists()) {
+      if (!var2 && var5.exists()) {
          try {
             var6 = new AccessFile(var5, "rw", 10000L);
             return var6;
-         } catch (IOException var8) {
-            ;
+         } catch (IOException var9) {
          }
       }
 
       try {
          var6 = new AccessFile(var3, "rw", 10000L);
          return var6;
-      } catch (IOException var7) {
+      } catch (IOException var8) {
          throw new RuntimeException();
       }
    }
+
+   static {
+      field473 = new LoginPacket(14, 0);
+      field474 = new LoginPacket(15, 4);
+      field475 = new LoginPacket(16, -2);
+      field476 = new LoginPacket(18, -2);
+      field477 = new LoginPacket(27, 0);
+      field478 = new LoginPacket[32];
+      LoginPacket[] var0 = WorldMapIcon2.method300();
+
+      for (int var1 = 0; var1 < var0.length; ++var1) {
+         field478[var0[var1].id] = var0[var1];
+      }
+
+   }
 }
diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java
index ddceffb8d9..6d73e2b166 100644
--- a/runescape-client/src/main/java/LoginScreenAnimation.java
+++ b/runescape-client/src/main/java/LoginScreenAnimation.java
@@ -9,8 +9,7 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("bp")
-public class LoginScreenAnimation
-{
+public class LoginScreenAnimation {
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "[Llq;"
@@ -90,65 +89,65 @@ public class LoginScreenAnimation
       this.field1006 = new int[256];
 
       int var1;
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1006[var1] = var1 * 0x40000;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1006[var1] = var1 * 262144;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1006[var1 + 64] = var1 * 0x400 + 0xff0000;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1006[var1 + 64] = var1 * 1024 + 16711680;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1006[var1 + 128] = var1 * 0x4 + 0xffff00;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1006[var1 + 128] = var1 * 4 + 16776960;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1006[var1 + 192] = 0xffffff;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1006[var1 + 192] = 16777215;
       }
 
       this.field1007 = new int[256];
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1007[var1] = var1 * 0x400;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1007[var1] = var1 * 1024;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1007[var1 + 64] = var1 * 0x4 + 0xff00;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1007[var1 + 64] = var1 * 4 + 65280;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1007[var1 + 128] = var1 * 0x40000 + 0xffff;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1007[var1 + 128] = var1 * 262144 + 65535;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1007[var1 + 192] = 0xffffff;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1007[var1 + 192] = 16777215;
       }
 
       this.field1014 = new int[256];
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1014[var1] = var1 * 0x4;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1014[var1] = var1 * 4;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1014[var1 + 64] = var1 * 0x40000 + 0xff;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1014[var1 + 64] = var1 * 262144 + 255;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1014[var1 + 128] = var1 * 0x400 + 0xff00ff;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1014[var1 + 128] = var1 * 1024 + 16711935;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1014[var1 + 192] = 0xffffff;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1014[var1 + 192] = 16777215;
       }
 
       this.field1013 = new int[256];
       this.field1010 = 0;
-      this.field1004 = new int['耀'];
-      this.field1018 = new int['耀'];
+      this.field1004 = new int[32768];
+      this.field1018 = new int[32768];
       this.method1779((IndexedSprite)null);
-      this.field1011 = new int['耀'];
-      this.field1012 = new int['耀'];
+      this.field1011 = new int[32768];
+      this.field1012 = new int[32768];
    }
 
    @ObfuscatedName("f")
@@ -174,26 +173,26 @@ public class LoginScreenAnimation
       signature = "(III)V",
       garbageValue = "-1684910110"
    )
-   void method1782(int x, int cycle) {
-      if(this.field1011 == null) {
+   void method1782(int var1, int var2) {
+      if (this.field1011 == null) {
          this.method1772();
       }
 
-      if(this.field1017 == 0) {
-         this.field1017 = cycle;
+      if (this.field1017 == 0) {
+         this.field1017 = var2;
       }
 
-      int var3 = cycle - this.field1017;
-      if(var3 >= 256) {
+      int var3 = var2 - this.field1017;
+      if (var3 >= 256) {
          var3 = 0;
       }
 
-      this.field1017 = cycle;
-      if(var3 > 0) {
+      this.field1017 = var2;
+      if (var3 > 0) {
          this.method1791(var3);
       }
 
-      this.method1787(x);
+      this.method1787(var1);
    }
 
    @ObfuscatedName("w")
@@ -204,7 +203,7 @@ public class LoginScreenAnimation
    final void method1791(int var1) {
       this.field1010 += var1 * 128;
       int var2;
-      if(this.field1010 > this.field1004.length) {
+      if (this.field1010 > this.field1004.length) {
          this.field1010 -= this.field1004.length;
          var2 = (int)(Math.random() * 12.0D);
          this.method1779(this.sprites[var2]);
@@ -214,74 +213,74 @@ public class LoginScreenAnimation
       int var3 = var1 * 128;
       int var4 = (256 - var1) * 128;
 
-      int var6;
-      for(int var5 = 0; var5 < var4; ++var5) {
-         var6 = this.field1011[var3 + var2] - this.field1004[var2 + this.field1010 & this.field1004.length - 1] * var1 / 6;
-         if(var6 < 0) {
-            var6 = 0;
+      int var5;
+      for (int var6 = 0; var6 < var4; ++var6) {
+         var5 = this.field1011[var3 + var2] - this.field1004[var2 + this.field1010 & this.field1004.length - 1] * var1 / 6;
+         if (var5 < 0) {
+            var5 = 0;
          }
 
-         this.field1011[var2++] = var6;
+         this.field1011[var2++] = var5;
       }
 
       byte var15 = 10;
-      var6 = 128 - var15;
+      var5 = 128 - var15;
 
       int var7;
-      int var10;
-      for(var7 = 256 - var1; var7 < 256; ++var7) {
-         int var8 = var7 * 128;
+      int var8;
+      for (var7 = 256 - var1; var7 < 256; ++var7) {
+         int var9 = var7 * 128;
 
-         for(int var9 = 0; var9 < 128; ++var9) {
-            var10 = (int)(Math.random() * 100.0D);
-            if(var10 < 50 && var9 > var15 && var9 < var6) {
-               this.field1011[var9 + var8] = 255;
+         for (int var10 = 0; var10 < 128; ++var10) {
+            var8 = (int)(Math.random() * 100.0D);
+            if (var8 < 50 && var10 > var15 && var10 < var5) {
+               this.field1011[var10 + var9] = 255;
             } else {
-               this.field1011[var9 + var8] = 0;
+               this.field1011[var10 + var9] = 0;
             }
          }
       }
 
-      if(this.field1009 > 0) {
+      if (this.field1009 > 0) {
          this.field1009 -= var1 * 4;
       }
 
-      if(this.field1005 > 0) {
+      if (this.field1005 > 0) {
          this.field1005 -= var1 * 4;
       }
 
-      if(this.field1009 == 0 && this.field1005 == 0) {
+      if (this.field1009 == 0 && this.field1005 == 0) {
          var7 = (int)(Math.random() * (double)(2000 / var1));
-         if(var7 == 0) {
+         if (var7 == 0) {
             this.field1009 = 1024;
          }
 
-         if(var7 == 1) {
+         if (var7 == 1) {
             this.field1005 = 1024;
          }
       }
 
-      for(var7 = 0; var7 < 256 - var1; ++var7) {
+      for (var7 = 0; var7 < 256 - var1; ++var7) {
          this.field1015[var7] = this.field1015[var7 + var1];
       }
 
-      for(var7 = 256 - var1; var7 < 256; ++var7) {
+      for (var7 = 256 - var1; var7 < 256; ++var7) {
          this.field1015[var7] = (int)(Math.sin((double)this.field1008 / 14.0D) * 16.0D + Math.sin((double)this.field1008 / 15.0D) * 14.0D + Math.sin((double)this.field1008 / 16.0D) * 12.0D);
          ++this.field1008;
       }
 
       this.field1016 += var1;
       var7 = ((Client.cycle & 1) + var1) / 2;
-      if(var7 > 0) {
+      if (var7 > 0) {
          short var16 = 128;
          byte var17 = 2;
-         var10 = 128 - var17 - var17;
+         var8 = 128 - var17 - var17;
 
          int var11;
          int var12;
          int var13;
-         for(var11 = 0; var11 < this.field1016 * 100; ++var11) {
-            var12 = (int)(Math.random() * (double)var10) + var17;
+         for (var11 = 0; var11 < this.field1016 * 100; ++var11) {
+            var12 = (int)(Math.random() * (double)var8) + var17;
             var13 = (int)(Math.random() * (double)var16) + var16;
             this.field1011[var12 + (var13 << 7)] = 192;
          }
@@ -289,39 +288,39 @@ public class LoginScreenAnimation
          this.field1016 = 0;
 
          int var14;
-         for(var11 = 0; var11 < 256; ++var11) {
+         for (var11 = 0; var11 < 256; ++var11) {
             var12 = 0;
             var13 = var11 * 128;
 
-            for(var14 = -var7; var14 < 128; ++var14) {
-               if(var7 + var14 < 128) {
+            for (var14 = -var7; var14 < 128; ++var14) {
+               if (var7 + var14 < 128) {
                   var12 += this.field1011[var7 + var14 + var13];
                }
 
-               if(var14 - (var7 + 1) >= 0) {
+               if (var14 - (var7 + 1) >= 0) {
                   var12 -= this.field1011[var14 + var13 - (var7 + 1)];
                }
 
-               if(var14 >= 0) {
+               if (var14 >= 0) {
                   this.field1012[var14 + var13] = var12 / (var7 * 2 + 1);
                }
             }
          }
 
-         for(var11 = 0; var11 < 128; ++var11) {
+         for (var11 = 0; var11 < 128; ++var11) {
             var12 = 0;
 
-            for(var13 = -var7; var13 < 256; ++var13) {
+            for (var13 = -var7; var13 < 256; ++var13) {
                var14 = var13 * 128;
-               if(var13 + var7 < 256) {
+               if (var13 + var7 < 256) {
                   var12 += this.field1012[var14 + var11 + var7 * 128];
                }
 
-               if(var13 - (var7 + 1) >= 0) {
+               if (var13 - (var7 + 1) >= 0) {
                   var12 -= this.field1012[var11 + var14 - (var7 + 1) * 128];
                }
 
-               if(var13 >= 0) {
+               if (var13 >= 0) {
                   this.field1011[var11 + var14] = var12 / (var7 * 2 + 1);
                }
             }
@@ -337,7 +336,7 @@ public class LoginScreenAnimation
    )
    final int method1765(int var1, int var2, int var3) {
       int var4 = 256 - var3;
-      return (var4 * (var1 & 0xff00) + var3 * (var2 & 0xff00) & 0xff0000) + (var4 * (var1 & 0xff00ff) + var3 * (var2 & 0xff00ff) & 0xff00ff00) >> 8;
+      return (var4 * (var1 & 65280) + var3 * (var2 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8;
    }
 
    @ObfuscatedName("u")
@@ -347,12 +346,12 @@ public class LoginScreenAnimation
    )
    final void method1787(int var1) {
       int var2 = this.field1013.length;
-      if(this.field1009 > 0) {
+      if (this.field1009 > 0) {
          this.method1766(this.field1009, this.field1007);
-      } else if(this.field1005 > 0) {
+      } else if (this.field1005 > 0) {
          this.method1766(this.field1005, this.field1014);
       } else {
-         for(int var3 = 0; var3 < var2; ++var3) {
+         for (int var3 = 0; var3 < var2; ++var3) {
             this.field1013[var3] = this.field1006[var3];
          }
       }
@@ -368,10 +367,10 @@ public class LoginScreenAnimation
    final void method1766(int var1, int[] var2) {
       int var3 = this.field1013.length;
 
-      for(int var4 = 0; var4 < var3; ++var4) {
-         if(var1 > 768) {
+      for (int var4 = 0; var4 < var3; ++var4) {
+         if (var1 > 768) {
             this.field1013[var4] = this.method1765(this.field1006[var4], var2[var4], 1024 - var1);
-         } else if(var1 > 256) {
+         } else if (var1 > 256) {
             this.field1013[var4] = var2[var4];
          } else {
             this.field1013[var4] = this.method1765(var2[var4], this.field1006[var4], 256 - var1);
@@ -388,32 +387,32 @@ public class LoginScreenAnimation
    final void method1767(int var1) {
       int var2 = 0;
 
-      for(int var3 = 1; var3 < 255; ++var3) {
+      for (int var3 = 1; var3 < 255; ++var3) {
          int var4 = (256 - var3) * this.field1015[var3] / 256;
          int var5 = var4 + var1;
          int var6 = 0;
          int var7 = 128;
-         if(var5 < 0) {
+         if (var5 < 0) {
             var6 = -var5;
             var5 = 0;
          }
 
-         if(var5 + 128 >= class197.rasterProvider.width) {
+         if (var5 + 128 >= class197.rasterProvider.width) {
             var7 = class197.rasterProvider.width - var5;
          }
 
          int var8 = var5 + (var3 + 8) * class197.rasterProvider.width;
          var2 += var6;
 
-         for(int var9 = var6; var9 < var7; ++var9) {
+         for (int var9 = var6; var9 < var7; ++var9) {
             int var10 = this.field1011[var2++];
             int var11 = var8 % Rasterizer2D.Rasterizer2D_width;
-            if(var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) {
+            if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) {
                int var12 = var10;
                int var13 = 256 - var10;
                var10 = this.field1013[var10];
                int var14 = class197.rasterProvider.pixels[var8];
-               class197.rasterProvider.pixels[var8++] = 0xff000000 | ((var10 & 0xff00ff) * var12 + (var14 & 0xff00ff) * var13 & 0xff00ff00) + (var12 * (var10 & 0xff00) + var13 * (var14 & 0xff00) & 0xff0000) >> 8;
+               class197.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8;
             } else {
                ++var8;
             }
@@ -431,40 +430,40 @@ public class LoginScreenAnimation
    )
    final void method1779(IndexedSprite var1) {
       int var2;
-      for(var2 = 0; var2 < this.field1004.length; ++var2) {
+      for (var2 = 0; var2 < this.field1004.length; ++var2) {
          this.field1004[var2] = 0;
       }
 
       int var3;
-      for(var2 = 0; var2 < 5000; ++var2) {
+      for (var2 = 0; var2 < 5000; ++var2) {
          var3 = (int)(Math.random() * 128.0D * 256.0D);
          this.field1004[var3] = (int)(Math.random() * 256.0D);
       }
 
       int var4;
       int var5;
-      for(var2 = 0; var2 < 20; ++var2) {
-         for(var3 = 1; var3 < 255; ++var3) {
-            for(var4 = 1; var4 < 127; ++var4) {
+      for (var2 = 0; var2 < 20; ++var2) {
+         for (var3 = 1; var3 < 255; ++var3) {
+            for (var4 = 1; var4 < 127; ++var4) {
                var5 = var4 + (var3 << 7);
                this.field1018[var5] = (this.field1004[var5 + 1] + this.field1004[var5 + 128] + this.field1004[var5 - 128] + this.field1004[var5 - 1]) / 4;
             }
          }
 
-         int[] var8 = this.field1004;
+         int[] var6 = this.field1004;
          this.field1004 = this.field1018;
-         this.field1018 = var8;
+         this.field1018 = var6;
       }
 
-      if(var1 != null) {
+      if (var1 != null) {
          var2 = 0;
 
-         for(var3 = 0; var3 < var1.subHeight; ++var3) {
-            for(var4 = 0; var4 < var1.subWidth; ++var4) {
-               if(var1.pixels[var2++] != 0) {
+         for (var3 = 0; var3 < var1.subHeight; ++var3) {
+            for (var4 = 0; var4 < var1.subWidth; ++var4) {
+               if (var1.pixels[var2++] != 0) {
                   var5 = var4 + var1.xOffset + 16;
-                  int var6 = var3 + var1.yOffset + 16;
-                  int var7 = var5 + (var6 << 7);
+                  int var8 = var3 + var1.yOffset + 16;
+                  int var7 = var5 + (var8 << 7);
                   this.field1004[var7] = 0;
                }
             }
@@ -486,7 +485,7 @@ public class LoginScreenAnimation
       var4.writeByte(10);
 
       int var7;
-      for(var7 = 0; var7 < 4; ++var7) {
+      for (var7 = 0; var7 < 4; ++var7) {
          var4.writeInt(var3.nextInt());
       }
 
@@ -495,14 +494,14 @@ public class LoginScreenAnimation
       var4.writeLong(var0);
       var4.writeLong(0L);
 
-      for(var7 = 0; var7 < 4; ++var7) {
+      for (var7 = 0; var7 < 4; ++var7) {
          var4.writeInt(var3.nextInt());
       }
 
-      var4.encryptRsa(class80.__ce_o, class80.__ce_u);
+      var4.encryptRsa(class80.field1163, class80.field1164);
       var5.writeByte(10);
 
-      for(var7 = 0; var7 < 3; ++var7) {
+      for (var7 = 0; var7 < 3; ++var7) {
          var5.writeInt(var3.nextInt());
       }
 
@@ -510,9 +509,9 @@ public class LoginScreenAnimation
       var5.writeLongMedium(var3.nextLong());
       Varps.method4400(var5);
       var5.writeLong(var3.nextLong());
-      var5.encryptRsa(class80.__ce_o, class80.__ce_u);
+      var5.encryptRsa(class80.field1163, class80.field1164);
       var7 = WorldMapRegion.method550(var2);
-      if(var7 % 8 != 0) {
+      if (var7 % 8 != 0) {
          var7 += 8 - var7 % 8;
       }
 
@@ -523,72 +522,72 @@ public class LoginScreenAnimation
       Buffer var9 = new Buffer(var4.index + var5.index + var8.index + 5);
       var9.writeByte(2);
       var9.writeByte(var4.index);
-      var9.__s_297(var4.array, 0, var4.index);
+      var9.method38(var4.array, 0, var4.index);
       var9.writeByte(var5.index);
-      var9.__s_297(var5.array, 0, var5.index);
+      var9.method38(var5.array, 0, var5.index);
       var9.writeShort(var8.index);
-      var9.__s_297(var8.array, 0, var8.index);
-      byte[] var11 = var9.array;
-      int var13 = var11.length;
-      StringBuilder var14 = new StringBuilder();
+      var9.method38(var8.array, 0, var8.index);
+      byte[] var10 = var9.array;
+      int var11 = var10.length;
+      StringBuilder var12 = new StringBuilder();
 
-      int var17;
-      for(int var15 = 0; var15 < var13 + 0; var15 += 3) {
-         int var16 = var11[var15] & 255;
-         var14.append(class307.__kc_m[var16 >>> 2]);
-         if(var15 < var13 - 1) {
-            var17 = var11[var15 + 1] & 255;
-            var14.append(class307.__kc_m[(var16 & 3) << 4 | var17 >>> 4]);
-            if(var15 < var13 - 2) {
-               int var18 = var11[var15 + 2] & 255;
-               var14.append(class307.__kc_m[(var17 & 15) << 2 | var18 >>> 6]).append(class307.__kc_m[var18 & 63]);
+      int var13;
+      for (int var14 = 0; var14 < var11 + 0; var14 += 3) {
+         int var15 = var10[var14] & 255;
+         var12.append(class307.field1151[var15 >>> 2]);
+         if (var14 < var11 - 1) {
+            var13 = var10[var14 + 1] & 255;
+            var12.append(class307.field1151[(var15 & 3) << 4 | var13 >>> 4]);
+            if (var14 < var11 - 2) {
+               int var16 = var10[var14 + 2] & 255;
+               var12.append(class307.field1151[(var13 & 15) << 2 | var16 >>> 6]).append(class307.field1151[var16 & 63]);
             } else {
-               var14.append(class307.__kc_m[(var17 & 15) << 2]).append("=");
+               var12.append(class307.field1151[(var13 & 15) << 2]).append("=");
             }
          } else {
-            var14.append(class307.__kc_m[(var16 & 3) << 4]).append("==");
+            var12.append(class307.field1151[(var15 & 3) << 4]).append("==");
          }
       }
 
-      String var12 = var14.toString();
-      var12 = var12;
+      String var21 = var12.toString();
+      var21 = var21;
 
       try {
-         URL var19 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws");
-         URLConnection var24 = var19.openConnection();
-         var24.setDoInput(true);
-         var24.setDoOutput(true);
-         var24.setConnectTimeout(5000);
-         OutputStreamWriter var20 = new OutputStreamWriter(var24.getOutputStream());
-         var20.write("data2=" + class306.method5781(var12) + "&dest=" + class306.method5781("passwordchoice.ws"));
-         var20.flush();
-         InputStream var21 = var24.getInputStream();
+         URL var22 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws");
+         URLConnection var23 = var22.openConnection();
+         var23.setDoInput(true);
+         var23.setDoOutput(true);
+         var23.setConnectTimeout(5000);
+         OutputStreamWriter var17 = new OutputStreamWriter(var23.getOutputStream());
+         var17.write("data2=" + class306.method5781(var21) + "&dest=" + class306.method5781("passwordchoice.ws"));
+         var17.flush();
+         InputStream var18 = var23.getInputStream();
          var9 = new Buffer(new byte[1000]);
 
          do {
-            var17 = var21.read(var9.array, var9.index, 1000 - var9.index);
-            if(var17 == -1) {
-               var20.close();
-               var21.close();
-               String var22 = new String(var9.array);
-               if(var22.startsWith("OFFLINE")) {
+            var13 = var18.read(var9.array, var9.index, 1000 - var9.index);
+            if (var13 == -1) {
+               var17.close();
+               var18.close();
+               String var19 = new String(var9.array);
+               if (var19.startsWith("OFFLINE")) {
                   return 4;
-               } else if(var22.startsWith("WRONG")) {
+               } else if (var19.startsWith("WRONG")) {
                   return 7;
-               } else if(var22.startsWith("RELOAD")) {
+               } else if (var19.startsWith("RELOAD")) {
                   return 3;
-               } else if(var22.startsWith("Not permitted for social network accounts.")) {
+               } else if (var19.startsWith("Not permitted for social network accounts.")) {
                   return 6;
                } else {
                   var9.xteaDecryptAll(var6);
 
-                  while(var9.index > 0 && var9.array[var9.index - 1] == 0) {
+                  while (var9.index > 0 && var9.array[var9.index - 1] == 0) {
                      --var9.index;
                   }
 
-                  var22 = new String(var9.array, 0, var9.index);
-                  if(class83.method2026(var22)) {
-                     WorldMapCacheName.method635(var22, true, false);
+                  var19 = new String(var9.array, 0, var9.index);
+                  if (class83.method2026(var19)) {
+                     WorldMapCacheName.method635(var19, true, false);
                      return 2;
                   } else {
                      return 5;
@@ -596,12 +595,12 @@ public class LoginScreenAnimation
                }
             }
 
-            var9.index += var17;
+            var9.index += var13;
          } while(var9.index < 1000);
 
          return 5;
-      } catch (Throwable var23) {
-         var23.printStackTrace();
+      } catch (Throwable var20) {
+         var20.printStackTrace();
          return 5;
       }
    }
@@ -614,12 +613,12 @@ public class LoginScreenAnimation
    @Export("getHitSplatDefinition")
    public static HitSplatDefinition getHitSplatDefinition(int var0) {
       HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = HitSplatDefinition.__jm_m.takeRecord(32, var0);
+         byte[] var2 = HitSplatDefinition.field382.takeRecord(32, var0);
          var1 = new HitSplatDefinition();
-         if(var2 != null) {
+         if (var2 != null) {
             var1.read(new Buffer(var2));
          }
 
diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java
index 91705d5b3d..c00ed82f4c 100644
--- a/runescape-client/src/main/java/LoginType.java
+++ b/runescape-client/src/main/java/LoginType.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
@@ -11,82 +10,82 @@ public class LoginType {
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   public static final LoginType __lx_m;
+   public static final LoginType field479;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   static final LoginType __lx_f;
+   static final LoginType field480;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   static final LoginType __lx_q;
+   static final LoginType field481;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   static final LoginType __lx_w;
+   static final LoginType field482;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   static final LoginType __lx_o;
+   static final LoginType field483;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   static final LoginType __lx_u;
+   static final LoginType field484;
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   static final LoginType __lx_g;
+   static final LoginType field485;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   static final LoginType __lx_l;
+   static final LoginType field486;
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   public static final LoginType __lx_e;
+   public static final LoginType field487;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = -1916729379
    )
-   public final int __x;
+   public final int field488;
    @ObfuscatedName("d")
-   final String __d;
-
-   static {
-      __lx_m = new LoginType(8, 0, "", "");
-      __lx_f = new LoginType(3, 1, "", "");
-      __lx_q = new LoginType(2, 2, "", "");
-      __lx_w = new LoginType(6, 3, "", "");
-      __lx_o = new LoginType(4, 4, "", "");
-      __lx_u = new LoginType(7, 5, "", "");
-      __lx_g = new LoginType(1, 6, "", "");
-      __lx_l = new LoginType(5, 7, "", "");
-      __lx_e = new LoginType(0, -1, "", "", true, new LoginType[]{__lx_m, __lx_f, __lx_q, __lx_o, __lx_w});
-   }
+   final String field489;
 
    LoginType(int var1, int var2, String var3, String var4) {
-      this.__x = var1;
-      this.__d = var4;
+      this.field488 = var1;
+      this.field489 = var4;
    }
 
    @ObfuscatedSignature(
       signature = "(IILjava/lang/String;Ljava/lang/String;Z[Llx;)V"
    )
    LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) {
-      this.__x = var1;
-      this.__d = var4;
+      this.field488 = var1;
+      this.field489 = var4;
    }
 
    @ObfuscatedName("toString")
-   public String __toString_546() {
-      return this.__d;
+   public String method166() {
+      return this.field489;
+   }
+
+   static {
+      field479 = new LoginType(8, 0, "", "");
+      field480 = new LoginType(3, 1, "", "");
+      field481 = new LoginType(2, 2, "", "");
+      field482 = new LoginType(6, 3, "", "");
+      field483 = new LoginType(4, 4, "", "");
+      field484 = new LoginType(7, 5, "", "");
+      field485 = new LoginType(1, 6, "", "");
+      field486 = new LoginType(5, 7, "", "");
+      field487 = new LoginType(0, -1, "", "", true, new LoginType[]{field479, field480, field481, field483, field482});
    }
 }
diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java
index 1e3b209c99..677531848f 100644
--- a/runescape-client/src/main/java/MenuAction.java
+++ b/runescape-client/src/main/java/MenuAction.java
@@ -51,7 +51,7 @@ public class MenuAction {
       int var3 = var0.getArchiveId(var1);
       int var4 = var0.getRecordId(var3, var2);
       IndexedSprite var5;
-      if(!SpriteMask.loadSprite(var0, var3, var4)) {
+      if (!SpriteMask.loadSprite(var0, var3, var4)) {
          var5 = null;
       } else {
          var5 = ServerPacket.createIndexedSprite();
@@ -70,27 +70,27 @@ public class MenuAction {
       int var2 = var0.group;
       int var3 = (int)var0.key;
       var0.remove();
-      if(var1) {
+      if (var1) {
          AbstractByteArrayCopier.unloadWidgetGroup(var2);
       }
 
-      for(IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) {
-         if((long)var2 == (var4.key >> 48 & 65535L)) {
+      for (IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) {
+         if ((long)var2 == (var4.key >> 48 & 65535L)) {
             var4.remove();
          }
       }
 
-      Widget var14 = Huffman.getWidget(var3);
-      if(var14 != null) {
-         class22.method295(var14);
+      Widget var12 = Huffman.getWidget(var3);
+      if (var12 != null) {
+         class22.method295(var12);
       }
 
       int var5;
       int var6;
-      for(var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
-         if(WorldMapManager.isWidgetMenuOpcode(Client.menuOpcodes[var5])) {
-            if(var5 < Client.menuOptionsCount - 1) {
-               for(var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) {
+      for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
+         if (WorldMapManager.isWidgetMenuOpcode(Client.menuOpcodes[var5])) {
+            if (var5 < Client.menuOptionsCount - 1) {
+               for (var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) {
                   Client.menuActions[var6] = Client.menuActions[var6 + 1];
                   Client.menuTargetNames[var6] = Client.menuTargetNames[var6 + 1];
                   Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1];
@@ -111,48 +111,48 @@ public class MenuAction {
       int var7 = class2.fontBold12.stringWidth("Choose Option");
 
       int var8;
-      for(var8 = 0; var8 < Client.menuOptionsCount; ++var8) {
+      for (var8 = 0; var8 < Client.menuOptionsCount; ++var8) {
          Font var9 = class2.fontBold12;
          String var10;
-         if(var8 < 0) {
+         if (var8 < 0) {
             var10 = "";
-         } else if(Client.menuTargetNames[var8].length() > 0) {
+         } else if (Client.menuTargetNames[var8].length() > 0) {
             var10 = Client.menuActions[var8] + " " + Client.menuTargetNames[var8];
          } else {
             var10 = Client.menuActions[var8];
          }
 
          int var11 = var9.stringWidth(var10);
-         if(var11 > var7) {
+         if (var11 > var7) {
             var7 = var11;
          }
       }
 
       var7 += 8;
       var8 = Client.menuOptionsCount * 15 + 22;
-      int var12 = var5 - var7 / 2;
-      if(var7 + var12 > SoundCache.canvasWidth) {
-         var12 = SoundCache.canvasWidth - var7;
+      int var13 = var5 - var7 / 2;
+      if (var7 + var13 > SoundCache.canvasWidth) {
+         var13 = SoundCache.canvasWidth - var7;
       }
 
-      if(var12 < 0) {
-         var12 = 0;
-      }
-
-      int var13 = var6;
-      if(var6 + var8 > Huffman.canvasHeight) {
-         var13 = Huffman.canvasHeight - var8;
-      }
-
-      if(var13 < 0) {
+      if (var13 < 0) {
          var13 = 0;
       }
 
-      class25.menuX = var12;
-      GameShell.menuY = var13;
+      int var14 = var6;
+      if (var6 + var8 > Huffman.canvasHeight) {
+         var14 = Huffman.canvasHeight - var8;
+      }
+
+      if (var14 < 0) {
+         var14 = 0;
+      }
+
+      class25.menuX = var13;
+      GameShell.menuY = var14;
       class214.menuWidth = var7;
       AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22;
-      if(Client.rootWidgetGroup != -1) {
+      if (Client.rootWidgetGroup != -1) {
          GrandExchangeEvents.method74(Client.rootWidgetGroup, 1);
       }
 
diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java
index 570ff3192f..30ac47dfcb 100644
--- a/runescape-client/src/main/java/Message.java
+++ b/runescape-client/src/main/java/Message.java
@@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Message")
 public class Message extends DualNode {
    @ObfuscatedName("i")
-   static int[] __bm_i;
+   static int[] field490;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 1597147817
@@ -97,7 +97,7 @@ public class Message extends DualNode {
    )
    @Export("isFromFriend")
    final boolean isFromFriend() {
-      if(this.isFromFriend0 == TriBool.TriBool_unknown) {
+      if (this.isFromFriend0 == TriBool.TriBool_unknown) {
          this.fillIsFromFriend();
       }
 
@@ -111,7 +111,7 @@ public class Message extends DualNode {
    )
    @Export("fillIsFromFriend")
    void fillIsFromFriend() {
-      this.isFromFriend0 = WorldMapArea.friendSystem.friendsList.contains(this.senderUsername)?TriBool.TriBool_true:TriBool.TriBool_false;
+      this.isFromFriend0 = WorldMapArea.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false;
    }
 
    @ObfuscatedName("o")
@@ -131,7 +131,7 @@ public class Message extends DualNode {
    )
    @Export("isFromIgnored")
    final boolean isFromIgnored() {
-      if(this.isFromIgnored0 == TriBool.TriBool_unknown) {
+      if (this.isFromIgnored0 == TriBool.TriBool_unknown) {
          this.fillIsFromIgnored();
       }
 
@@ -145,7 +145,7 @@ public class Message extends DualNode {
    )
    @Export("fillIsFromIgnored")
    void fillIsFromIgnored() {
-      this.isFromIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(this.senderUsername)?TriBool.TriBool_true:TriBool.TriBool_false;
+      this.isFromIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false;
    }
 
    @ObfuscatedName("l")
@@ -155,8 +155,8 @@ public class Message extends DualNode {
    )
    @Export("fillSenderUsername")
    final void fillSenderUsername() {
-      if(this.sender != null) {
-         this.senderUsername = new Username(NpcDefinition.method5161(this.sender), KeyHandler.loginType);
+      if (this.sender != null) {
+         this.senderUsername = new Username(NPCDefinition.method5161(this.sender), KeyHandler.loginType);
       } else {
          this.senderUsername = null;
       }
@@ -169,7 +169,7 @@ public class Message extends DualNode {
       garbageValue = "-1905151806"
    )
    public static String method1229(CharSequence var0, LoginType var1) {
-      if(var0 == null) {
+      if (var0 == null) {
          return null;
       } else {
          int var2 = 0;
@@ -177,94 +177,96 @@ public class Message extends DualNode {
          int var3;
          boolean var4;
          char var5;
-         for(var3 = var0.length(); var2 < var3; ++var2) {
+         for (var3 = var0.length(); var2 < var3; ++var2) {
             var5 = var0.charAt(var2);
             var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-';
-            if(!var4) {
+            if (!var4) {
                break;
             }
          }
 
-         while(var3 > var2) {
+         while (var3 > var2) {
             var5 = var0.charAt(var3 - 1);
             var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-';
-            if(!var4) {
+            if (!var4) {
                break;
             }
 
             --var3;
          }
 
-         int var14 = var3 - var2;
-         if(var14 >= 1) {
-            byte var6;
-            if(var1 == null) {
-               var6 = 12;
+         int var6 = var3 - var2;
+         if (var6 >= 1) {
+            byte var7;
+            if (var1 == null) {
+               var7 = 12;
             } else {
-               switch(var1.__x) {
+               switch(var1.field488) {
                case 7:
-                  var6 = 20;
+                  var7 = 20;
                   break;
                default:
-                  var6 = 12;
+                  var7 = 12;
                }
             }
 
-            if(var14 <= var6) {
-               StringBuilder var12 = new StringBuilder(var14);
+            if (var6 <= var7) {
+               StringBuilder var8 = new StringBuilder(var6);
 
-               for(int var15 = var2; var15 < var3; ++var15) {
-                  char var7 = var0.charAt(var15);
-                  boolean var8;
-                  if(Character.isISOControl(var7)) {
-                     var8 = false;
-                  } else if(VarcInt.isAlphaNumeric(var7)) {
-                     var8 = true;
+               for (int var9 = var2; var9 < var3; ++var9) {
+                  char var10 = var0.charAt(var9);
+                  boolean var11;
+                  if (Character.isISOControl(var10)) {
+                     var11 = false;
+                  } else if (VarcInt.isAlphaNumeric(var10)) {
+                     var11 = true;
                   } else {
-                     char[] var13 = class305.__kb_q;
-                     int var10 = 0;
+                     label149: {
+                        char[] var12 = class305.field1149;
 
-                     label118:
-                     while(true) {
-                        char var11;
-                        if(var10 >= var13.length) {
-                           var13 = class305.__kb_w;
+                        int var13;
+                        char var14;
+                        for (var13 = 0; var13 < var12.length; ++var13) {
+                           var14 = var12[var13];
+                           if (var10 == var14) {
+                              var11 = true;
+                              break label149;
+                           }
+                        }
 
-                           for(var10 = 0; var10 < var13.length; ++var10) {
-                              var11 = var13[var10];
-                              if(var7 == var11) {
-                                 var8 = true;
-                                 break label118;
-                              }
+                        var12 = class305.field1150;
+                        var13 = 0;
+
+                        while (true) {
+                           if (var13 >= var12.length) {
+                              var11 = false;
+                              break;
                            }
 
-                           var8 = false;
-                           break;
-                        }
+                           var14 = var12[var13];
+                           if (var10 == var14) {
+                              var11 = true;
+                              break;
+                           }
 
-                        var11 = var13[var10];
-                        if(var7 == var11) {
-                           var8 = true;
-                           break;
+                           ++var13;
                         }
-
-                        ++var10;
                      }
                   }
 
-                  if(var8) {
-                     char var9;
-                     switch(var7) {
+                  if (var11) {
+                     char var15;
+                     switch(var10) {
                      case ' ':
                      case '-':
                      case '_':
                      case ' ':
-                        var9 = '_';
+                        var15 = '_';
                         break;
                      case '#':
                      case '[':
                      case ']':
-                        var9 = var7;
+                        var15 = var10;
                         break;
                      case 'À':
                      case 'Á':
@@ -276,11 +278,11 @@ public class Message extends DualNode {
                      case 'â':
                      case 'ã':
                      case 'ä':
-                        var9 = 'a';
+                        var15 = 'a';
                         break;
                      case 'Ç':
                      case 'ç':
-                        var9 = 'c';
+                        var15 = 'c';
                         break;
                      case 'È':
                      case 'É':
@@ -290,7 +292,7 @@ public class Message extends DualNode {
                      case 'é':
                      case 'ê':
                      case 'ë':
-                        var9 = 'e';
+                        var15 = 'e';
                         break;
                      case 'Í':
                      case 'Î':
@@ -298,11 +300,11 @@ public class Message extends DualNode {
                      case 'í':
                      case 'î':
                      case 'ï':
-                        var9 = 'i';
+                        var15 = 'i';
                         break;
                      case 'Ñ':
                      case 'ñ':
-                        var9 = 'n';
+                        var15 = 'n';
                         break;
                      case 'Ò':
                      case 'Ó':
@@ -314,7 +316,7 @@ public class Message extends DualNode {
                      case 'ô':
                      case 'õ':
                      case 'ö':
-                        var9 = 'o';
+                        var15 = 'o';
                         break;
                      case 'Ù':
                      case 'Ú':
@@ -324,30 +326,30 @@ public class Message extends DualNode {
                      case 'ú':
                      case 'û':
                      case 'ü':
-                        var9 = 'u';
+                        var15 = 'u';
                         break;
                      case 'ß':
-                        var9 = 'b';
+                        var15 = 'b';
                         break;
                      case 'ÿ':
                      case 'Ÿ':
-                        var9 = 'y';
+                        var15 = 'y';
                         break;
                      default:
-                        var9 = Character.toLowerCase(var7);
+                        var15 = Character.toLowerCase(var10);
                      }
 
-                     if(var9 != 0) {
-                        var12.append(var9);
+                     if (var15 != 0) {
+                        var8.append(var15);
                      }
                   }
                }
 
-               if(var12.length() == 0) {
+               if (var8.length() == 0) {
                   return null;
                }
 
-               return var12.toString();
+               return var8.toString();
             }
          }
 
@@ -361,7 +363,7 @@ public class Message extends DualNode {
       garbageValue = "-1262174034"
    )
    static Message method1226(int var0, int var1) {
-      ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(Integer.valueOf(var0));
+      ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0);
       return var2.getMessage(var1);
    }
 
@@ -371,28 +373,28 @@ public class Message extends DualNode {
       garbageValue = "-2007966264"
    )
    static final void method1228() {
-      if(SoundSystem.plane != Client.__client_ph) {
-         Client.__client_ph = SoundSystem.plane;
+      if (SoundSystem.plane != Client.field125) {
+         Client.field125 = SoundSystem.plane;
          int var0 = SoundSystem.plane;
          int[] var1 = WidgetGroupParent.sceneMinimapSprite.pixels;
          int var2 = var1.length;
 
          int var3;
-         for(var3 = 0; var3 < var2; ++var3) {
+         for (var3 = 0; var3 < var2; ++var3) {
             var1[var3] = 0;
          }
 
          int var4;
          int var5;
-         for(var3 = 1; var3 < 103; ++var3) {
+         for (var3 = 1; var3 < 103; ++var3) {
             var4 = (103 - var3) * 2048 + 24628;
 
-            for(var5 = 1; var5 < 103; ++var5) {
-               if((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) {
+            for (var5 = 1; var5 < 103; ++var5) {
+               if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) {
                   class65.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3);
                }
 
-               if(var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) {
+               if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) {
                   class65.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3);
                }
 
@@ -405,13 +407,13 @@ public class Message extends DualNode {
          WidgetGroupParent.sceneMinimapSprite.setRaster();
 
          int var6;
-         for(var5 = 1; var5 < 103; ++var5) {
-            for(var6 = 1; var6 < 103; ++var6) {
-               if((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) {
+         for (var5 = 1; var5 < 103; ++var5) {
+            for (var6 = 1; var6 < 103; ++var6) {
+               if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) {
                   MouseRecorder.drawObject(var0, var6, var5, var3, var4);
                }
 
-               if(var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) {
+               if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) {
                   MouseRecorder.drawObject(var0 + 1, var6, var5, var3, var4);
                }
             }
@@ -419,13 +421,13 @@ public class Message extends DualNode {
 
          Client.mapIconCount = 0;
 
-         for(var5 = 0; var5 < 104; ++var5) {
-            for(var6 = 0; var6 < 104; ++var6) {
+         for (var5 = 0; var5 < 104; ++var5) {
+            for (var6 = 0; var6 < 104; ++var6) {
                long var7 = class65.scene.getFloorDecorationTag(SoundSystem.plane, var5, var6);
-               if(var7 != 0L) {
+               if (var7 != 0L) {
                   int var9 = HitSplatDefinition.method4972(var7);
                   int var10 = class50.getObjectDefinition(var9).mapIconId;
-                  if(var10 >= 0) {
+                  if (var10 >= 0) {
                      Client.mapIcons[Client.mapIconCount] = ViewportMouse.getWorldMapElement(var10).getSprite(false);
                      Client.mapIconXs[Client.mapIconCount] = var5;
                      Client.mapIconYs[Client.mapIconCount] = var6;
@@ -446,25 +448,25 @@ public class Message extends DualNode {
       garbageValue = "1047910257"
    )
    static String method1227(String var0, boolean var1) {
-      String var2 = var1?"https://":"http://";
-      if(Client.gameBuild == 1) {
+      String var2 = var1 ? "https://" : "http://";
+      if (Client.gameBuild == 1) {
          var0 = var0 + "-wtrc";
-      } else if(Client.gameBuild == 2) {
+      } else if (Client.gameBuild == 2) {
          var0 = var0 + "-wtqa";
-      } else if(Client.gameBuild == 3) {
+      } else if (Client.gameBuild == 3) {
          var0 = var0 + "-wtwip";
-      } else if(Client.gameBuild == 5) {
+      } else if (Client.gameBuild == 5) {
          var0 = var0 + "-wti";
-      } else if(Client.gameBuild == 4) {
+      } else if (Client.gameBuild == 4) {
          var0 = "local";
       }
 
       String var3 = "";
-      if(class21.__b_by != null) {
-         var3 = "/p=" + class21.__b_by;
+      if (class21.field1123 != null) {
+         var3 = "/p=" + class21.field1123;
       }
 
       String var4 = "runescape.com";
-      return var2 + var0 + "." + var4 + "/l=" + Client.language + "/a=" + AbstractIndexCache.__ir_bu + var3 + "/";
+      return var2 + var0 + "." + var4 + "/l=" + Client.language + "/a=" + AbstractIndexCache.field2 + var3 + "/";
    }
 }
diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java
index 4c06de37c8..81e912029f 100644
--- a/runescape-client/src/main/java/Messages.java
+++ b/runescape-client/src/main/java/Messages.java
@@ -37,27 +37,27 @@ public class Messages {
    @Export("soundSystem")
    static SoundSystem soundSystem;
 
-   static {
-      Messages_channels = new HashMap();
-      Messages_hashTable = new IterableNodeHashTable(1024);
-      Messages_queue = new IterableDualNodeQueue();
-      Messages_count = 0;
-   }
-
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "(I)V",
       garbageValue = "103402661"
    )
    static void method2200() {
-      if(Login.Login_username == null || Login.Login_username.length() <= 0) {
-         if(ReflectionCheck.clientPreferences.rememberedUsername != null) {
+      if (Login.Login_username == null || Login.Login_username.length() <= 0) {
+         if (ReflectionCheck.clientPreferences.rememberedUsername != null) {
             Login.Login_username = ReflectionCheck.clientPreferences.rememberedUsername;
             Client.Login_isUsernameRemembered = true;
          } else {
             Client.Login_isUsernameRemembered = false;
          }
-
       }
+
+   }
+
+   static {
+      Messages_channels = new HashMap();
+      Messages_hashTable = new IterableNodeHashTable(1024);
+      Messages_queue = new IterableDualNodeQueue();
+      Messages_count = 0;
    }
 }
diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java
index 7425856d16..f0a41c3311 100644
--- a/runescape-client/src/main/java/MidiFileReader.java
+++ b/runescape-client/src/main/java/MidiFileReader.java
@@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("MidiFileReader")
 public class MidiFileReader {
    @ObfuscatedName("x")
-   static final byte[] __hs_x;
+   static final byte[] field491;
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lgr;"
@@ -27,15 +27,11 @@ public class MidiFileReader {
    @Export("trackLengths")
    int[] trackLengths;
    @ObfuscatedName("u")
-   int[] __u;
+   int[] field492;
    @ObfuscatedName("g")
-   int __g;
+   int field493;
    @ObfuscatedName("e")
-   long __e;
-
-   static {
-      __hs_x = new byte[]{(byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)0, (byte)1, (byte)2, (byte)1, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0};
-   }
+   long field494;
 
    MidiFileReader(byte[] var1) {
       this.buffer = new Buffer((byte[])null);
@@ -51,31 +47,34 @@ public class MidiFileReader {
    void parse(byte[] var1) {
       this.buffer.array = var1;
       this.buffer.index = 10;
-      int var2 = this.buffer.__ag_302();
-      this.division = this.buffer.__ag_302();
-      this.__g = 500000;
+      int var2 = this.buffer.method43();
+      this.division = this.buffer.method43();
+      this.field493 = 500000;
       this.trackStarts = new int[var2];
 
+      Buffer var10000;
       int var3;
-      int var5;
-      for(var3 = 0; var3 < var2; this.buffer.index += var5) {
-         int var4 = this.buffer.readInt();
-         var5 = this.buffer.readInt();
-         if(var4 == 1297379947) {
+      int var4;
+      for (var3 = 0; var3 < var2; var10000.index += var4) {
+         int var5 = this.buffer.readInt();
+         var4 = this.buffer.readInt();
+         if (var5 == 1297379947) {
             this.trackStarts[var3] = this.buffer.index;
             ++var3;
          }
+
+         var10000 = this.buffer;
       }
 
-      this.__e = 0L;
+      this.field494 = 0L;
       this.trackPositions = new int[var2];
 
-      for(var3 = 0; var3 < var2; ++var3) {
+      for (var3 = 0; var3 < var2; ++var3) {
          this.trackPositions[var3] = this.trackStarts[var3];
       }
 
       this.trackLengths = new int[var2];
-      this.__u = new int[var2];
+      this.field492 = new int[var2];
    }
 
    @ObfuscatedName("f")
@@ -85,7 +84,7 @@ public class MidiFileReader {
       this.trackStarts = null;
       this.trackPositions = null;
       this.trackLengths = null;
-      this.__u = null;
+      this.field492 = null;
    }
 
    @ObfuscatedName("q")
@@ -121,8 +120,9 @@ public class MidiFileReader {
    @ObfuscatedName("l")
    @Export("readTrackLength")
    void readTrackLength(int var1) {
-      int var2 = this.buffer.__as_311();
-      this.trackLengths[var1] += var2;
+      int var2 = this.buffer.method52();
+      int[] var10000 = this.trackLengths;
+      var10000[var1] += var2;
    }
 
    @ObfuscatedName("e")
@@ -136,72 +136,77 @@ public class MidiFileReader {
    @Export("readMessage0")
    int readMessage0(int var1) {
       byte var2 = this.buffer.array[this.buffer.index];
-      int var5;
-      if(var2 < 0) {
-         var5 = var2 & 255;
-         this.__u[var1] = var5;
+      int var3;
+      if (var2 < 0) {
+         var3 = var2 & 255;
+         this.field492[var1] = var3;
          ++this.buffer.index;
       } else {
-         var5 = this.__u[var1];
+         var3 = this.field492[var1];
       }
 
-      if(var5 != 240 && var5 != 247) {
-         return this.__d_371(var1, var5);
+      if (var3 != 240 && var3 != 247) {
+         return this.method167(var1, var3);
       } else {
-         int var3 = this.buffer.__as_311();
-         if(var5 == 247 && var3 > 0) {
-            int var4 = this.buffer.array[this.buffer.index] & 255;
-            if(var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) {
+         int var4 = this.buffer.method52();
+         if (var3 == 247 && var4 > 0) {
+            int var5 = this.buffer.array[this.buffer.index] & 255;
+            if (var5 >= 241 && var5 <= 243 || var5 == 246 || var5 == 248 || var5 >= 250 && var5 <= 252 || var5 == 254) {
                ++this.buffer.index;
-               this.__u[var1] = var4;
-               return this.__d_371(var1, var4);
+               this.field492[var1] = var5;
+               return this.method167(var1, var5);
             }
          }
 
-         this.buffer.index += var3;
+         Buffer var10000 = this.buffer;
+         var10000.index += var4;
          return 0;
       }
    }
 
    @ObfuscatedName("d")
-   int __d_371(int var1, int var2) {
-      int var4;
-      if(var2 == 255) {
+   int method167(int var1, int var2) {
+      int var3;
+      if (var2 == 255) {
          int var7 = this.buffer.readUnsignedByte();
-         var4 = this.buffer.__as_311();
-         if(var7 == 47) {
-            this.buffer.index += var4;
+         var3 = this.buffer.method52();
+         Buffer var10000;
+         if (var7 == 47) {
+            var10000 = this.buffer;
+            var10000.index += var3;
             return 1;
-         } else if(var7 == 81) {
+         } else if (var7 == 81) {
             int var5 = this.buffer.readMedium();
-            var4 -= 3;
+            var3 -= 3;
             int var6 = this.trackLengths[var1];
-            this.__e += (long)var6 * (long)(this.__g - var5);
-            this.__g = var5;
-            this.buffer.index += var4;
+            this.field494 += (long)var6 * (long)(this.field493 - var5);
+            this.field493 = var5;
+            var10000 = this.buffer;
+            var10000.index += var3;
             return 2;
          } else {
-            this.buffer.index += var4;
+            var10000 = this.buffer;
+            var10000.index += var3;
             return 3;
          }
       } else {
-         byte var3 = __hs_x[var2 - 128];
-         var4 = var2;
-         if(var3 >= 1) {
-            var4 = var2 | this.buffer.readUnsignedByte() << 8;
+         byte var4 = field491[var2 - 128];
+         var3 = var2;
+         if (var4 >= 1) {
+            var3 = var2 | this.buffer.readUnsignedByte() << 8;
          }
 
-         if(var3 >= 2) {
-            var4 |= this.buffer.readUnsignedByte() << 16;
+         if (var4 >= 2) {
+            var3 |= this.buffer.readUnsignedByte() << 16;
          }
 
-         return var4;
+         return var3;
       }
    }
 
    @ObfuscatedName("a")
-   long __a_372(int var1) {
-      return this.__e + (long)var1 * (long)this.__g;
+   long method168(int var1) {
+      return this.field494 + (long)var1 * (long)this.field493;
    }
 
    @ObfuscatedName("z")
@@ -211,8 +216,8 @@ public class MidiFileReader {
       int var2 = -1;
       int var3 = Integer.MAX_VALUE;
 
-      for(int var4 = 0; var4 < var1; ++var4) {
-         if(this.trackPositions[var4] >= 0 && this.trackLengths[var4] < var3) {
+      for (int var4 = 0; var4 < var1; ++var4) {
+         if (this.trackPositions[var4] >= 0 && this.trackLengths[var4] < var3) {
             var2 = var4;
             var3 = this.trackLengths[var4];
          }
@@ -226,8 +231,8 @@ public class MidiFileReader {
    boolean isDone() {
       int var1 = this.trackPositions.length;
 
-      for(int var2 = 0; var2 < var1; ++var2) {
-         if(this.trackPositions[var2] >= 0) {
+      for (int var2 = 0; var2 < var1; ++var2) {
+         if (this.trackPositions[var2] >= 0) {
             return false;
          }
       }
@@ -238,16 +243,20 @@ public class MidiFileReader {
    @ObfuscatedName("s")
    @Export("reset")
    void reset(long var1) {
-      this.__e = var1;
+      this.field494 = var1;
       int var3 = this.trackPositions.length;
 
-      for(int var4 = 0; var4 < var3; ++var4) {
+      for (int var4 = 0; var4 < var3; ++var4) {
          this.trackLengths[var4] = 0;
-         this.__u[var4] = 0;
+         this.field492[var4] = 0;
          this.buffer.index = this.trackStarts[var4];
          this.readTrackLength(var4);
          this.trackPositions[var4] = this.buffer.index;
       }
 
    }
+
+   static {
+      field491 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+   }
 }
diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java
index 800b277560..eec4788edf 100644
--- a/runescape-client/src/main/java/MidiPcmStream.java
+++ b/runescape-client/src/main/java/MidiPcmStream.java
@@ -17,52 +17,52 @@ public class MidiPcmStream extends PcmStream {
    @ObfuscatedGetter(
       intValue = 335918727
    )
-   int __f;
+   int field495;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 2095480747
    )
-   int __q;
+   int field496;
    @ObfuscatedName("o")
-   int[] __o;
+   int[] field497;
    @ObfuscatedName("u")
-   int[] __u;
+   int[] field498;
    @ObfuscatedName("g")
-   int[] __g;
+   int[] field499;
    @ObfuscatedName("l")
-   int[] __l;
+   int[] field500;
    @ObfuscatedName("e")
-   int[] __e;
+   int[] field501;
    @ObfuscatedName("x")
-   int[] __x;
+   int[] field502;
    @ObfuscatedName("d")
-   int[] __d;
+   int[] field503;
    @ObfuscatedName("k")
-   int[] __k;
+   int[] field504;
    @ObfuscatedName("n")
-   int[] __n;
+   int[] field505;
    @ObfuscatedName("y")
-   int[] __y;
+   int[] field506;
    @ObfuscatedName("h")
-   int[] __h;
+   int[] field507;
    @ObfuscatedName("b")
-   int[] __b;
+   int[] field508;
    @ObfuscatedName("c")
-   int[] __c;
+   int[] field509;
    @ObfuscatedName("r")
-   int[] __r;
+   int[] field510;
    @ObfuscatedName("p")
-   int[] __p;
+   int[] field511;
    @ObfuscatedName("v")
    @ObfuscatedSignature(
       signature = "[[Lha;"
    )
-   MusicPatchNode[][] __v;
+   MusicPatchNode[][] field512;
    @ObfuscatedName("ag")
    @ObfuscatedSignature(
       signature = "[[Lha;"
    )
-   MusicPatchNode[][] __ag;
+   MusicPatchNode[][] field513;
    @ObfuscatedName("aq")
    @ObfuscatedSignature(
       signature = "Lhs;"
@@ -70,7 +70,7 @@ public class MidiPcmStream extends PcmStream {
    @Export("midiFile")
    MidiFileReader midiFile;
    @ObfuscatedName("aj")
-   boolean __aj;
+   boolean field514;
    @ObfuscatedName("av")
    @ObfuscatedGetter(
       intValue = 1450922835
@@ -87,12 +87,12 @@ public class MidiPcmStream extends PcmStream {
    @ObfuscatedGetter(
       longValue = -7547625335559871937L
    )
-   long __ac;
+   long field515;
    @ObfuscatedName("ay")
    @ObfuscatedGetter(
       longValue = 3736036110499628937L
    )
-   long __ay;
+   long field516;
    @ObfuscatedName("ah")
    @ObfuscatedSignature(
       signature = "Lhq;"
@@ -101,29 +101,29 @@ public class MidiPcmStream extends PcmStream {
    MusicPatchPcmStream patchStream;
 
    public MidiPcmStream() {
-      this.__f = 256;
-      this.__q = 1000000;
-      this.__o = new int[16];
-      this.__u = new int[16];
-      this.__g = new int[16];
-      this.__l = new int[16];
-      this.__e = new int[16];
-      this.__x = new int[16];
-      this.__d = new int[16];
-      this.__k = new int[16];
-      this.__n = new int[16];
-      this.__y = new int[16];
-      this.__h = new int[16];
-      this.__b = new int[16];
-      this.__c = new int[16];
-      this.__r = new int[16];
-      this.__p = new int[16];
-      this.__v = new MusicPatchNode[16][128];
-      this.__ag = new MusicPatchNode[16][128];
+      this.field495 = 256;
+      this.field496 = 1000000;
+      this.field497 = new int[16];
+      this.field498 = new int[16];
+      this.field499 = new int[16];
+      this.field500 = new int[16];
+      this.field501 = new int[16];
+      this.field502 = new int[16];
+      this.field503 = new int[16];
+      this.field504 = new int[16];
+      this.field505 = new int[16];
+      this.field506 = new int[16];
+      this.field507 = new int[16];
+      this.field508 = new int[16];
+      this.field509 = new int[16];
+      this.field510 = new int[16];
+      this.field511 = new int[16];
+      this.field512 = new MusicPatchNode[16][128];
+      this.field513 = new MusicPatchNode[16][128];
       this.midiFile = new MidiFileReader();
       this.patchStream = new MusicPatchPcmStream(this);
       this.musicPatches = new NodeHashTable(128);
-      this.__at_354();
+      this.method186();
    }
 
    @ObfuscatedName("m")
@@ -131,8 +131,8 @@ public class MidiPcmStream extends PcmStream {
       signature = "(IB)V",
       garbageValue = "92"
    )
-   public synchronized void __m_340(int var1) {
-      this.__f = var1;
+   public synchronized void method169(int var1) {
+      this.field495 = var1;
    }
 
    @ObfuscatedName("f")
@@ -140,8 +140,8 @@ public class MidiPcmStream extends PcmStream {
       signature = "(I)I",
       garbageValue = "2067929289"
    )
-   public int __f_341() {
-      return this.__f;
+   public int method170() {
+      return this.field495;
    }
 
    @ObfuscatedName("q")
@@ -151,19 +151,19 @@ public class MidiPcmStream extends PcmStream {
    )
    @Export("loadMusicTrack")
    public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractIndexCache var2, SoundCache var3, int var4) {
-      var1.__f_381();
+      var1.method226();
       boolean var5 = true;
       int[] var6 = null;
-      if(var4 > 0) {
+      if (var4 > 0) {
          var6 = new int[]{var4};
       }
 
-      for(ByteArrayNode var7 = (ByteArrayNode)var1.table.first(); var7 != null; var7 = (ByteArrayNode)var1.table.next()) {
+      for (ByteArrayNode var7 = (ByteArrayNode)var1.table.first(); var7 != null; var7 = (ByteArrayNode)var1.table.next()) {
          int var8 = (int)var7.key;
          MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8);
-         if(var9 == null) {
+         if (var9 == null) {
             var9 = Login.method2045(var2, var8);
-            if(var9 == null) {
+            if (var9 == null) {
                var5 = false;
                continue;
             }
@@ -171,12 +171,12 @@ public class MidiPcmStream extends PcmStream {
             this.musicPatches.put(var9, (long)var8);
          }
 
-         if(!var9.__f_373(var3, var7.byteArray, var6)) {
+         if (!var9.method218(var3, var7.byteArray, var6)) {
             var5 = false;
          }
       }
 
-      if(var5) {
+      if (var5) {
          var1.clear();
       }
 
@@ -190,7 +190,7 @@ public class MidiPcmStream extends PcmStream {
    )
    @Export("clearAll")
    public synchronized void clearAll() {
-      for(MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) {
+      for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) {
          var1.clear();
       }
 
@@ -203,7 +203,7 @@ public class MidiPcmStream extends PcmStream {
    )
    @Export("removeAll")
    public synchronized void removeAll() {
-      for(MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) {
+      for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) {
          var1.remove();
       }
 
@@ -228,32 +228,32 @@ public class MidiPcmStream extends PcmStream {
    }
 
    @ObfuscatedName("l")
-   protected synchronized int __l_171() {
+   protected synchronized int vmethod262() {
       return 0;
    }
 
    @ObfuscatedName("e")
-   protected synchronized void __e_172(int[] var1, int var2, int var3) {
-      if(this.midiFile.isReady()) {
-         int var4 = this.midiFile.division * this.__q / class309.PcmPlayer_sampleRate;
+   protected synchronized void vmethod263(int[] var1, int var2, int var3) {
+      if (this.midiFile.isReady()) {
+         int var4 = this.midiFile.division * this.field496 / class309.PcmPlayer_sampleRate;
 
          do {
-            long var5 = (long)var4 * (long)var3 + this.__ac;
-            if(this.__ay - var5 >= 0L) {
-               this.__ac = var5;
+            long var5 = (long)var4 * (long)var3 + this.field515;
+            if (this.field516 - var5 >= 0L) {
+               this.field515 = var5;
                break;
             }
 
-            int var7 = (int)(((long)var4 + (this.__ay - this.__ac) - 1L) / (long)var4);
-            this.__ac += (long)var4 * (long)var7;
-            this.patchStream.__e_172(var1, var2, var7);
+            int var7 = (int)(((long)var4 + (this.field516 - this.field515) - 1L) / (long)var4);
+            this.field515 += (long)var4 * (long)var7;
+            this.patchStream.vmethod263(var1, var2, var7);
             var2 += var7;
             var3 -= var7;
-            this.__ai_367();
+            this.method194();
          } while(this.midiFile.isReady());
       }
 
-      this.patchStream.__e_172(var1, var2, var3);
+      this.patchStream.vmethod263(var1, var2, var3);
    }
 
    @ObfuscatedName("x")
@@ -265,11 +265,11 @@ public class MidiPcmStream extends PcmStream {
    public synchronized void setMusicTrack(MusicTrack var1, boolean var2) {
       this.clear();
       this.midiFile.parse(var1.midi);
-      this.__aj = var2;
-      this.__ac = 0L;
+      this.field514 = var2;
+      this.field515 = 0L;
       int var3 = this.midiFile.trackCount();
 
-      for(int var4 = 0; var4 < var3; ++var4) {
+      for (int var4 = 0; var4 < var3; ++var4) {
          this.midiFile.gotoTrack(var4);
          this.midiFile.readTrackLength(var4);
          this.midiFile.markTrackPosition(var4);
@@ -277,30 +277,30 @@ public class MidiPcmStream extends PcmStream {
 
       this.track = this.midiFile.getPrioritizedTrack();
       this.trackLength = this.midiFile.trackLengths[this.track];
-      this.__ay = this.midiFile.__a_372(this.trackLength);
+      this.field516 = this.midiFile.method168(this.trackLength);
    }
 
    @ObfuscatedName("d")
-   protected synchronized void __d_173(int var1) {
-      if(this.midiFile.isReady()) {
-         int var2 = this.midiFile.division * this.__q / class309.PcmPlayer_sampleRate;
+   protected synchronized void vmethod264(int var1) {
+      if (this.midiFile.isReady()) {
+         int var2 = this.midiFile.division * this.field496 / class309.PcmPlayer_sampleRate;
 
          do {
-            long var3 = this.__ac + (long)var2 * (long)var1;
-            if(this.__ay - var3 >= 0L) {
-               this.__ac = var3;
+            long var3 = this.field515 + (long)var2 * (long)var1;
+            if (this.field516 - var3 >= 0L) {
+               this.field515 = var3;
                break;
             }
 
-            int var5 = (int)(((long)var2 + (this.__ay - this.__ac) - 1L) / (long)var2);
-            this.__ac += (long)var5 * (long)var2;
-            this.patchStream.__d_173(var5);
+            int var5 = (int)(((long)var2 + (this.field516 - this.field515) - 1L) / (long)var2);
+            this.field515 += (long)var5 * (long)var2;
+            this.patchStream.vmethod264(var5);
             var1 -= var5;
-            this.__ai_367();
+            this.method194();
          } while(this.midiFile.isReady());
       }
 
-      this.patchStream.__d_173(var1);
+      this.patchStream.vmethod264(var1);
    }
 
    @ObfuscatedName("a")
@@ -311,7 +311,7 @@ public class MidiPcmStream extends PcmStream {
    @Export("clear")
    public synchronized void clear() {
       this.midiFile.clear();
-      this.__at_354();
+      this.method186();
    }
 
    @ObfuscatedName("z")
@@ -329,8 +329,8 @@ public class MidiPcmStream extends PcmStream {
       signature = "(III)V",
       garbageValue = "789206119"
    )
-   public synchronized void __j_342(int var1, int var2) {
-      this.__s_343(var1, var2);
+   public synchronized void method174(int var1, int var2) {
+      this.method175(var1, var2);
    }
 
    @ObfuscatedName("s")
@@ -338,10 +338,10 @@ public class MidiPcmStream extends PcmStream {
       signature = "(III)V",
       garbageValue = "-1475022240"
    )
-   void __s_343(int var1, int var2) {
-      this.__l[var1] = var2;
-      this.__x[var1] = var2 & -128;
-      this.__t_344(var1, var2);
+   void method175(int var1, int var2) {
+      this.field500[var1] = var2;
+      this.field502[var1] = var2 & -128;
+      this.method176(var1, var2);
    }
 
    @ObfuscatedName("t")
@@ -349,12 +349,12 @@ public class MidiPcmStream extends PcmStream {
       signature = "(III)V",
       garbageValue = "-213159072"
    )
-   void __t_344(int var1, int var2) {
-      if(var2 != this.__e[var1]) {
-         this.__e[var1] = var2;
+   void method176(int var1, int var2) {
+      if (var2 != this.field501[var1]) {
+         this.field501[var1] = var2;
 
-         for(int var3 = 0; var3 < 128; ++var3) {
-            this.__ag[var1][var3] = null;
+         for (int var3 = 0; var3 < 128; ++var3) {
+            this.field513[var1][var3] = null;
          }
       }
 
@@ -365,67 +365,68 @@ public class MidiPcmStream extends PcmStream {
       signature = "(IIIB)V",
       garbageValue = "15"
    )
-   void __y_345(int var1, int var2, int var3) {
-      this.__b_347(var1, var2, 64);
-      if((this.__y[var1] & 2) != 0) {
-         for(MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) {
-            if(var4.__m == var1 && var4.__a < 0) {
-               this.__v[var1][var4.__u] = null;
-               this.__v[var1][var2] = var4;
-               int var5 = (var4.__d * var4.__x >> 12) + var4.__e;
-               var4.__e += var2 - var4.__u << 8;
-               var4.__x = var5 - var4.__e;
-               var4.__d = 4096;
-               var4.__u = var2;
+   void method177(int var1, int var2, int var3) {
+      this.method179(var1, var2, 64);
+      if ((this.field506[var1] & 2) != 0) {
+         for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) {
+            if (var4.field574 == var1 && var4.field586 < 0) {
+               this.field512[var1][var4.field577] = null;
+               this.field512[var1][var2] = var4;
+               int var5 = (var4.field582 * var4.field581 >> 12) + var4.field580;
+               var4.field580 += var2 - var4.field577 << 8;
+               var4.field581 = var5 - var4.field580;
+               var4.field582 = 4096;
+               var4.field577 = var2;
                return;
             }
          }
       }
 
-      MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.__e[var1]);
-      if(var9 != null) {
-         RawSound var8 = var9.rawSounds[var2];
-         if(var8 != null) {
+      MusicPatch var8 = (MusicPatch)this.musicPatches.get((long)this.field501[var1]);
+      if (var8 != null) {
+         RawSound var9 = var8.rawSounds[var2];
+         if (var9 != null) {
             MusicPatchNode var6 = new MusicPatchNode();
-            var6.__m = var1;
-            var6.patch = var9;
-            var6.rawSound = var8;
-            var6.__w = var9.__u[var2];
-            var6.__o = var9.__g[var2];
-            var6.__u = var2;
-            var6.__g = var3 * var3 * var9.__w[var2] * var9.__m + 1024 >> 11;
-            var6.__l = var9.__o[var2] & 255;
-            var6.__e = (var2 << 8) - (var9.__q[var2] & 32767);
-            var6.__k = 0;
-            var6.__n = 0;
-            var6.__i = 0;
-            var6.__a = -1;
-            var6.__z = 0;
-            if(this.__c[var1] == 0) {
-               var6.stream = RawPcmStream.method2524(var8, this.__aa_359(var6), this.__ax_360(var6), this.__af_361(var6));
+            var6.field574 = var1;
+            var6.patch = var8;
+            var6.rawSound = var9;
+            var6.field575 = var8.field571[var2];
+            var6.field576 = var8.field572[var2];
+            var6.field577 = var2;
+            var6.field578 = var3 * var3 * var8.field569[var2] * var8.field567 + 1024 >> 11;
+            var6.field579 = var8.field570[var2] & 255;
+            var6.field580 = (var2 << 8) - (var8.field568[var2] & 32767);
+            var6.field583 = 0;
+            var6.field584 = 0;
+            var6.field585 = 0;
+            var6.field586 = -1;
+            var6.field587 = 0;
+            if (this.field509[var1] == 0) {
+               var6.stream = RawPcmStream.method2524(var9, this.method191(var6), this.method192(var6), this.method193(var6));
             } else {
-               var6.stream = RawPcmStream.method2524(var8, this.__aa_359(var6), 0, this.__af_361(var6));
-               this.__h_346(var6, var9.__q[var2] < 0);
+               var6.stream = RawPcmStream.method2524(var9, this.method191(var6), 0, this.method193(var6));
+               this.method178(var6, var8.field568[var2] < 0);
             }
 
-            if(var9.__q[var2] < 0) {
+            if (var8.field568[var2] < 0) {
                var6.stream.setNumLoops(-1);
             }
 
-            if(var6.__o >= 0) {
-               MusicPatchNode var7 = this.__ag[var1][var6.__o];
-               if(var7 != null && var7.__a < 0) {
-                  this.__v[var1][var7.__u] = null;
-                  var7.__a = 0;
+            if (var6.field576 >= 0) {
+               MusicPatchNode var7 = this.field513[var1][var6.field576];
+               if (var7 != null && var7.field586 < 0) {
+                  this.field512[var1][var7.field577] = null;
+                  var7.field586 = 0;
                }
 
-               this.__ag[var1][var6.__o] = var6;
+               this.field513[var1][var6.field576] = var6;
             }
 
             this.patchStream.queue.addFirst(var6);
-            this.__v[var1][var2] = var6;
+            this.field512[var1][var2] = var6;
          }
       }
+
    }
 
    @ObfuscatedName("h")
@@ -433,22 +434,22 @@ public class MidiPcmStream extends PcmStream {
       signature = "(Lha;ZI)V",
       garbageValue = "-1455849160"
    )
-   void __h_346(MusicPatchNode var1, boolean var2) {
+   void method178(MusicPatchNode var1, boolean var2) {
       int var3 = var1.rawSound.samples.length;
       int var4;
-      if(var2 && var1.rawSound.__o) {
+      if (var2 && var1.rawSound.field756) {
          int var5 = var3 + var3 - var1.rawSound.start;
-         var4 = (int)((long)var5 * (long)this.__c[var1.__m] >> 6);
+         var4 = (int)((long)var5 * (long)this.field509[var1.field574] >> 6);
          var3 <<= 8;
-         if(var4 >= var3) {
+         if (var4 >= var3) {
             var4 = var3 + var3 - 1 - var4;
-            var1.stream.__h_188();
+            var1.stream.method271();
          }
       } else {
-         var4 = (int)((long)this.__c[var1.__m] * (long)var3 >> 6);
+         var4 = (int)((long)this.field509[var1.field574] * (long)var3 >> 6);
       }
 
-      var1.stream.__y_187(var4);
+      var1.stream.method270(var4);
    }
 
    @ObfuscatedName("b")
@@ -456,22 +457,22 @@ public class MidiPcmStream extends PcmStream {
       signature = "(IIII)V",
       garbageValue = "-1244653525"
    )
-   void __b_347(int var1, int var2, int var3) {
-      MusicPatchNode var4 = this.__v[var1][var2];
-      if(var4 != null) {
-         this.__v[var1][var2] = null;
-         if((this.__y[var1] & 2) != 0) {
-            for(MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) {
-               if(var5.__m == var4.__m && var5.__a < 0 && var5 != var4) {
-                  var4.__a = 0;
+   void method179(int var1, int var2, int var3) {
+      MusicPatchNode var4 = this.field512[var1][var2];
+      if (var4 != null) {
+         this.field512[var1][var2] = null;
+         if ((this.field506[var1] & 2) != 0) {
+            for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) {
+               if (var5.field574 == var4.field574 && var5.field586 < 0 && var5 != var4) {
+                  var4.field586 = 0;
                   break;
                }
             }
          } else {
-            var4.__a = 0;
+            var4.field586 = 0;
          }
-
       }
+
    }
 
    @ObfuscatedName("c")
@@ -479,7 +480,7 @@ public class MidiPcmStream extends PcmStream {
       signature = "(IIII)V",
       garbageValue = "1055105177"
    )
-   void __c_348(int var1, int var2, int var3) {
+   void method180(int var1, int var2, int var3) {
    }
 
    @ObfuscatedName("p")
@@ -487,7 +488,7 @@ public class MidiPcmStream extends PcmStream {
       signature = "(IIB)V",
       garbageValue = "-43"
    )
-   void __p_349(int var1, int var2) {
+   void method181(int var1, int var2) {
    }
 
    @ObfuscatedName("v")
@@ -495,8 +496,8 @@ public class MidiPcmStream extends PcmStream {
       signature = "(IIB)V",
       garbageValue = "-1"
    )
-   void __v_350(int var1, int var2) {
-      this.__d[var1] = var2;
+   void method182(int var1, int var2) {
+      this.field503[var1] = var2;
    }
 
    @ObfuscatedName("ah")
@@ -504,20 +505,20 @@ public class MidiPcmStream extends PcmStream {
       signature = "(II)V",
       garbageValue = "137929054"
    )
-   void __ah_351(int var1) {
-      for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
-         if(var1 < 0 || var2.__m == var1) {
-            if(var2.stream != null) {
-               var2.stream.__v_192(class309.PcmPlayer_sampleRate / 100);
-               if(var2.stream.__at_196()) {
+   void method183(int var1) {
+      for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
+         if (var1 < 0 || var2.field574 == var1) {
+            if (var2.stream != null) {
+               var2.stream.method275(class309.PcmPlayer_sampleRate / 100);
+               if (var2.stream.method279()) {
                   this.patchStream.mixer.addSubStream(var2.stream);
                }
 
-               var2.__m_370();
+               var2.method219();
             }
 
-            if(var2.__a < 0) {
-               this.__v[var2.__m][var2.__u] = null;
+            if (var2.field586 < 0) {
+               this.field512[var2.field574][var2.field577] = null;
             }
 
             var2.remove();
@@ -531,27 +532,27 @@ public class MidiPcmStream extends PcmStream {
       signature = "(II)V",
       garbageValue = "-59494316"
    )
-   void __ab_352(int var1) {
-      if(var1 >= 0) {
-         this.__o[var1] = 12800;
-         this.__u[var1] = 8192;
-         this.__g[var1] = 16383;
-         this.__d[var1] = 8192;
-         this.__k[var1] = 0;
-         this.__n[var1] = 8192;
-         this.__ad_355(var1);
-         this.__ap_356(var1);
-         this.__y[var1] = 0;
-         this.__h[var1] = 32767;
-         this.__b[var1] = 256;
-         this.__c[var1] = 0;
-         this.__ao_358(var1, 8192);
+   void method184(int var1) {
+      if (var1 >= 0) {
+         this.field497[var1] = 12800;
+         this.field498[var1] = 8192;
+         this.field499[var1] = 16383;
+         this.field503[var1] = 8192;
+         this.field504[var1] = 0;
+         this.field505[var1] = 8192;
+         this.method187(var1);
+         this.method188(var1);
+         this.field506[var1] = 0;
+         this.field507[var1] = 32767;
+         this.field508[var1] = 256;
+         this.field509[var1] = 0;
+         this.method190(var1, 8192);
       } else {
-         for(var1 = 0; var1 < 16; ++var1) {
-            this.__ab_352(var1);
+         for (var1 = 0; var1 < 16; ++var1) {
+            this.method184(var1);
          }
-
       }
+
    }
 
    @ObfuscatedName("ae")
@@ -559,11 +560,11 @@ public class MidiPcmStream extends PcmStream {
       signature = "(II)V",
       garbageValue = "1458917637"
    )
-   void __ae_353(int var1) {
-      for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
-         if((var1 < 0 || var2.__m == var1) && var2.__a < 0) {
-            this.__v[var2.__m][var2.__u] = null;
-            var2.__a = 0;
+   void method185(int var1) {
+      for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
+         if ((var1 < 0 || var2.field574 == var1) && var2.field586 < 0) {
+            this.field512[var2.field574][var2.field577] = null;
+            var2.field586 = 0;
          }
       }
 
@@ -574,17 +575,17 @@ public class MidiPcmStream extends PcmStream {
       signature = "(I)V",
       garbageValue = "808372536"
    )
-   void __at_354() {
-      this.__ah_351(-1);
-      this.__ab_352(-1);
+   void method186() {
+      this.method183(-1);
+      this.method184(-1);
 
       int var1;
-      for(var1 = 0; var1 < 16; ++var1) {
-         this.__e[var1] = this.__l[var1];
+      for (var1 = 0; var1 < 16; ++var1) {
+         this.field501[var1] = this.field500[var1];
       }
 
-      for(var1 = 0; var1 < 16; ++var1) {
-         this.__x[var1] = this.__l[var1] & -128;
+      for (var1 = 0; var1 < 16; ++var1) {
+         this.field502[var1] = this.field500[var1] & -128;
       }
 
    }
@@ -594,11 +595,11 @@ public class MidiPcmStream extends PcmStream {
       signature = "(II)V",
       garbageValue = "-1934460661"
    )
-   void __ad_355(int var1) {
-      if((this.__y[var1] & 2) != 0) {
-         for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
-            if(var2.__m == var1 && this.__v[var1][var2.__u] == null && var2.__a < 0) {
-               var2.__a = 0;
+   void method187(int var1) {
+      if ((this.field506[var1] & 2) != 0) {
+         for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
+            if (var2.field574 == var1 && this.field512[var1][var2.field577] == null && var2.field586 < 0) {
+               var2.field586 = 0;
             }
          }
       }
@@ -610,11 +611,11 @@ public class MidiPcmStream extends PcmStream {
       signature = "(II)V",
       garbageValue = "-1305073262"
    )
-   void __ap_356(int var1) {
-      if((this.__y[var1] & 4) != 0) {
-         for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
-            if(var2.__m == var1) {
-               var2.__b = 0;
+   void method188(int var1) {
+      if ((this.field506[var1] & 4) != 0) {
+         for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
+            if (var2.field574 == var1) {
+               var2.field591 = 0;
             }
          }
       }
@@ -626,186 +627,192 @@ public class MidiPcmStream extends PcmStream {
       signature = "(II)V",
       garbageValue = "1168111396"
    )
-   void __au_357(int var1) {
+   void method189(int var1) {
       int var2 = var1 & 240;
       int var3;
       int var4;
       int var5;
-      if(var2 == 128) {
+      if (var2 == 128) {
          var3 = var1 & 15;
          var4 = var1 >> 8 & 127;
          var5 = var1 >> 16 & 127;
-         this.__b_347(var3, var4, var5);
-      } else if(var2 == 144) {
+         this.method179(var3, var4, var5);
+      } else if (var2 == 144) {
          var3 = var1 & 15;
          var4 = var1 >> 8 & 127;
          var5 = var1 >> 16 & 127;
-         if(var5 > 0) {
-            this.__y_345(var3, var4, var5);
+         if (var5 > 0) {
+            this.method177(var3, var4, var5);
          } else {
-            this.__b_347(var3, var4, 64);
+            this.method179(var3, var4, 64);
          }
-
-      } else if(var2 == 160) {
+      } else if (var2 == 160) {
          var3 = var1 & 15;
          var4 = var1 >> 8 & 127;
          var5 = var1 >> 16 & 127;
-         this.__c_348(var3, var4, var5);
-      } else if(var2 == 176) {
+         this.method180(var3, var4, var5);
+      } else if (var2 == 176) {
          var3 = var1 & 15;
          var4 = var1 >> 8 & 127;
          var5 = var1 >> 16 & 127;
-         if(var4 == 0) {
-            this.__x[var3] = (var5 << 14) + (this.__x[var3] & -2080769);
+         if (var4 == 0) {
+            this.field502[var3] = (var5 << 14) + (this.field502[var3] & -2080769);
          }
 
-         if(var4 == 32) {
-            this.__x[var3] = (var5 << 7) + (this.__x[var3] & -16257);
+         if (var4 == 32) {
+            this.field502[var3] = (var5 << 7) + (this.field502[var3] & -16257);
          }
 
-         if(var4 == 1) {
-            this.__k[var3] = (var5 << 7) + (this.__k[var3] & -16257);
+         if (var4 == 1) {
+            this.field504[var3] = (var5 << 7) + (this.field504[var3] & -16257);
          }
 
-         if(var4 == 33) {
-            this.__k[var3] = var5 + (this.__k[var3] & -128);
+         if (var4 == 33) {
+            this.field504[var3] = var5 + (this.field504[var3] & -128);
          }
 
-         if(var4 == 5) {
-            this.__n[var3] = (var5 << 7) + (this.__n[var3] & -16257);
+         if (var4 == 5) {
+            this.field505[var3] = (var5 << 7) + (this.field505[var3] & -16257);
          }
 
-         if(var4 == 37) {
-            this.__n[var3] = var5 + (this.__n[var3] & -128);
+         if (var4 == 37) {
+            this.field505[var3] = var5 + (this.field505[var3] & -128);
          }
 
-         if(var4 == 7) {
-            this.__o[var3] = (var5 << 7) + (this.__o[var3] & -16257);
+         if (var4 == 7) {
+            this.field497[var3] = (var5 << 7) + (this.field497[var3] & -16257);
          }
 
-         if(var4 == 39) {
-            this.__o[var3] = var5 + (this.__o[var3] & -128);
+         if (var4 == 39) {
+            this.field497[var3] = var5 + (this.field497[var3] & -128);
          }
 
-         if(var4 == 10) {
-            this.__u[var3] = (var5 << 7) + (this.__u[var3] & -16257);
+         if (var4 == 10) {
+            this.field498[var3] = (var5 << 7) + (this.field498[var3] & -16257);
          }
 
-         if(var4 == 42) {
-            this.__u[var3] = var5 + (this.__u[var3] & -128);
+         if (var4 == 42) {
+            this.field498[var3] = var5 + (this.field498[var3] & -128);
          }
 
-         if(var4 == 11) {
-            this.__g[var3] = (var5 << 7) + (this.__g[var3] & -16257);
+         if (var4 == 11) {
+            this.field499[var3] = (var5 << 7) + (this.field499[var3] & -16257);
          }
 
-         if(var4 == 43) {
-            this.__g[var3] = var5 + (this.__g[var3] & -128);
+         if (var4 == 43) {
+            this.field499[var3] = var5 + (this.field499[var3] & -128);
          }
 
-         if(var4 == 64) {
-            if(var5 >= 64) {
-               this.__y[var3] |= 1;
+         int[] var10000;
+         if (var4 == 64) {
+            if (var5 >= 64) {
+               var10000 = this.field506;
+               var10000[var3] |= 1;
             } else {
-               this.__y[var3] &= -2;
+               var10000 = this.field506;
+               var10000[var3] &= -2;
             }
          }
 
-         if(var4 == 65) {
-            if(var5 >= 64) {
-               this.__y[var3] |= 2;
+         if (var4 == 65) {
+            if (var5 >= 64) {
+               var10000 = this.field506;
+               var10000[var3] |= 2;
             } else {
-               this.__ad_355(var3);
-               this.__y[var3] &= -3;
+               this.method187(var3);
+               var10000 = this.field506;
+               var10000[var3] &= -3;
             }
          }
 
-         if(var4 == 99) {
-            this.__h[var3] = (var5 << 7) + (this.__h[var3] & 127);
+         if (var4 == 99) {
+            this.field507[var3] = (var5 << 7) + (this.field507[var3] & 127);
          }
 
-         if(var4 == 98) {
-            this.__h[var3] = (this.__h[var3] & 16256) + var5;
+         if (var4 == 98) {
+            this.field507[var3] = (this.field507[var3] & 16256) + var5;
          }
 
-         if(var4 == 101) {
-            this.__h[var3] = (var5 << 7) + (this.__h[var3] & 127) + 16384;
+         if (var4 == 101) {
+            this.field507[var3] = (var5 << 7) + (this.field507[var3] & 127) + 16384;
          }
 
-         if(var4 == 100) {
-            this.__h[var3] = (this.__h[var3] & 16256) + var5 + 16384;
+         if (var4 == 100) {
+            this.field507[var3] = (this.field507[var3] & 16256) + var5 + 16384;
          }
 
-         if(var4 == 120) {
-            this.__ah_351(var3);
+         if (var4 == 120) {
+            this.method183(var3);
          }
 
-         if(var4 == 121) {
-            this.__ab_352(var3);
+         if (var4 == 121) {
+            this.method184(var3);
          }
 
-         if(var4 == 123) {
-            this.__ae_353(var3);
+         if (var4 == 123) {
+            this.method185(var3);
          }
 
          int var6;
-         if(var4 == 6) {
-            var6 = this.__h[var3];
-            if(var6 == 16384) {
-               this.__b[var3] = (var5 << 7) + (this.__b[var3] & -16257);
+         if (var4 == 6) {
+            var6 = this.field507[var3];
+            if (var6 == 16384) {
+               this.field508[var3] = (var5 << 7) + (this.field508[var3] & -16257);
             }
          }
 
-         if(var4 == 38) {
-            var6 = this.__h[var3];
-            if(var6 == 16384) {
-               this.__b[var3] = var5 + (this.__b[var3] & -128);
+         if (var4 == 38) {
+            var6 = this.field507[var3];
+            if (var6 == 16384) {
+               this.field508[var3] = var5 + (this.field508[var3] & -128);
             }
          }
 
-         if(var4 == 16) {
-            this.__c[var3] = (var5 << 7) + (this.__c[var3] & -16257);
+         if (var4 == 16) {
+            this.field509[var3] = (var5 << 7) + (this.field509[var3] & -16257);
          }
 
-         if(var4 == 48) {
-            this.__c[var3] = var5 + (this.__c[var3] & -128);
+         if (var4 == 48) {
+            this.field509[var3] = var5 + (this.field509[var3] & -128);
          }
 
-         if(var4 == 81) {
-            if(var5 >= 64) {
-               this.__y[var3] |= 4;
+         if (var4 == 81) {
+            if (var5 >= 64) {
+               var10000 = this.field506;
+               var10000[var3] |= 4;
             } else {
-               this.__ap_356(var3);
-               this.__y[var3] &= -5;
+               this.method188(var3);
+               var10000 = this.field506;
+               var10000[var3] &= -5;
             }
          }
 
-         if(var4 == 17) {
-            this.__ao_358(var3, (var5 << 7) + (this.__r[var3] & -16257));
+         if (var4 == 17) {
+            this.method190(var3, (var5 << 7) + (this.field510[var3] & -16257));
          }
 
-         if(var4 == 49) {
-            this.__ao_358(var3, var5 + (this.__r[var3] & -128));
+         if (var4 == 49) {
+            this.method190(var3, var5 + (this.field510[var3] & -128));
          }
-
-      } else if(var2 == 192) {
+      } else if (var2 == 192) {
          var3 = var1 & 15;
          var4 = var1 >> 8 & 127;
-         this.__t_344(var3, var4 + this.__x[var3]);
-      } else if(var2 == 208) {
+         this.method176(var3, var4 + this.field502[var3]);
+      } else if (var2 == 208) {
          var3 = var1 & 15;
          var4 = var1 >> 8 & 127;
-         this.__p_349(var3, var4);
-      } else if(var2 == 224) {
+         this.method181(var3, var4);
+      } else if (var2 == 224) {
          var3 = var1 & 15;
          var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256);
-         this.__v_350(var3, var4);
+         this.method182(var3, var4);
       } else {
          var2 = var1 & 255;
-         if(var2 == 255) {
-            this.__at_354();
+         if (var2 == 255) {
+            this.method186();
          }
       }
+
    }
 
    @ObfuscatedName("ao")
@@ -813,9 +820,9 @@ public class MidiPcmStream extends PcmStream {
       signature = "(III)V",
       garbageValue = "1380282032"
    )
-   void __ao_358(int var1, int var2) {
-      this.__r[var1] = var2;
-      this.__p[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D);
+   void method190(int var1, int var2) {
+      this.field510[var1] = var2;
+      this.field511[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D);
    }
 
    @ObfuscatedName("aa")
@@ -823,25 +830,25 @@ public class MidiPcmStream extends PcmStream {
       signature = "(Lha;I)I",
       garbageValue = "-1821299983"
    )
-   int __aa_359(MusicPatchNode var1) {
-      int var2 = (var1.__d * var1.__x >> 12) + var1.__e;
-      var2 += (this.__d[var1.__m] - 8192) * this.__b[var1.__m] >> 12;
-      MusicPatchNode2 var3 = var1.__w;
+   int method191(MusicPatchNode var1) {
+      int var2 = (var1.field582 * var1.field581 >> 12) + var1.field580;
+      var2 += (this.field503[var1.field574] - 8192) * this.field508[var1.field574] >> 12;
+      MusicPatchNode2 var3 = var1.field575;
       int var4;
-      if(var3.__l > 0 && (var3.__g > 0 || this.__k[var1.__m] > 0)) {
-         var4 = var3.__g << 2;
-         int var5 = var3.__e << 1;
-         if(var1.__j < var5) {
-            var4 = var4 * var1.__j / var5;
+      if (var3.field600 > 0 && (var3.field599 > 0 || this.field504[var1.field574] > 0)) {
+         var4 = var3.field599 << 2;
+         int var5 = var3.field601 << 1;
+         if (var1.field588 < var5) {
+            var4 = var4 * var1.field588 / var5;
          }
 
-         var4 += this.__k[var1.__m] >> 7;
-         double var6 = Math.sin((double)(var1.__s & 511) * 0.01227184630308513D);
+         var4 += this.field504[var1.field574] >> 7;
+         double var6 = Math.sin((double)(var1.field589 & 511) * 0.01227184630308513D);
          var2 += (int)(var6 * (double)var4);
       }
 
       var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)class309.PcmPlayer_sampleRate + 0.5D);
-      return var4 < 1?1:var4;
+      return var4 < 1 ? 1 : var4;
    }
 
    @ObfuscatedName("ax")
@@ -849,39 +856,39 @@ public class MidiPcmStream extends PcmStream {
       signature = "(Lha;I)I",
       garbageValue = "24812899"
    )
-   int __ax_360(MusicPatchNode var1) {
-      MusicPatchNode2 var2 = var1.__w;
-      int var3 = this.__o[var1.__m] * this.__g[var1.__m] + 4096 >> 13;
+   int method192(MusicPatchNode var1) {
+      MusicPatchNode2 var2 = var1.field575;
+      int var3 = this.field497[var1.field574] * this.field499[var1.field574] + 4096 >> 13;
       var3 = var3 * var3 + 16384 >> 15;
-      var3 = var3 * var1.__g + 16384 >> 15;
-      var3 = var3 * this.__f + 128 >> 8;
-      if(var2.__q > 0) {
-         var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.__q * (double)var1.__k * 1.953125E-5D) + 0.5D);
+      var3 = var3 * var1.field578 + 16384 >> 15;
+      var3 = var3 * this.field495 + 128 >> 8;
+      if (var2.field595 > 0) {
+         var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field595 * (double)var1.field583 * 1.953125E-5D) + 0.5D);
       }
 
       int var4;
       int var5;
       int var6;
       int var7;
-      if(var2.__m != null) {
-         var4 = var1.__n;
-         var5 = var2.__m[var1.__i + 1];
-         if(var1.__i < var2.__m.length - 2) {
-            var6 = (var2.__m[var1.__i] & 255) << 8;
-            var7 = (var2.__m[var1.__i + 2] & 255) << 8;
-            var5 += (var2.__m[var1.__i + 3] - var5) * (var4 - var6) / (var7 - var6);
+      if (var2.field593 != null) {
+         var4 = var1.field584;
+         var5 = var2.field593[var1.field585 + 1];
+         if (var1.field585 < var2.field593.length - 2) {
+            var6 = (var2.field593[var1.field585] & 255) << 8;
+            var7 = (var2.field593[var1.field585 + 2] & 255) << 8;
+            var5 += (var2.field593[var1.field585 + 3] - var5) * (var4 - var6) / (var7 - var6);
          }
 
          var3 = var5 * var3 + 32 >> 6;
       }
 
-      if(var1.__a > 0 && var2.__f != null) {
-         var4 = var1.__a;
-         var5 = var2.__f[var1.__z + 1];
-         if(var1.__z < var2.__f.length - 2) {
-            var6 = (var2.__f[var1.__z] & 255) << 8;
-            var7 = (var2.__f[var1.__z + 2] & 255) << 8;
-            var5 += (var4 - var6) * (var2.__f[var1.__z + 3] - var5) / (var7 - var6);
+      if (var1.field586 > 0 && var2.field594 != null) {
+         var4 = var1.field586;
+         var5 = var2.field594[var1.field587 + 1];
+         if (var1.field587 < var2.field594.length - 2) {
+            var6 = (var2.field594[var1.field587] & 255) << 8;
+            var7 = (var2.field594[var1.field587 + 2] & 255) << 8;
+            var5 += (var4 - var6) * (var2.field594[var1.field587 + 3] - var5) / (var7 - var6);
          }
 
          var3 = var3 * var5 + 32 >> 6;
@@ -895,9 +902,9 @@ public class MidiPcmStream extends PcmStream {
       signature = "(Lha;I)I",
       garbageValue = "360643400"
    )
-   int __af_361(MusicPatchNode var1) {
-      int var2 = this.__u[var1.__m];
-      return var2 < 8192?var2 * var1.__l + 32 >> 6:16384 - ((128 - var1.__l) * (16384 - var2) + 32 >> 6);
+   int method193(MusicPatchNode var1) {
+      int var2 = this.field498[var1.field574];
+      return var2 < 8192 ? var2 * var1.field579 + 32 >> 6 : 16384 - ((128 - var1.field579) * (16384 - var2) + 32 >> 6);
    }
 
    @ObfuscatedName("ai")
@@ -905,21 +912,21 @@ public class MidiPcmStream extends PcmStream {
       signature = "(B)V",
       garbageValue = "30"
    )
-   void __ai_367() {
+   void method194() {
       int var1 = this.track;
       int var2 = this.trackLength;
 
       long var3;
-      for(var3 = this.__ay; var2 == this.trackLength; var3 = this.midiFile.__a_372(var2)) {
-         while(var2 == this.midiFile.trackLengths[var1]) {
+      for (var3 = this.field516; var2 == this.trackLength; var3 = this.midiFile.method168(var2)) {
+         while (var2 == this.midiFile.trackLengths[var1]) {
             this.midiFile.gotoTrack(var1);
             int var5 = this.midiFile.readMessage(var1);
-            if(var5 == 1) {
+            if (var5 == 1) {
                this.midiFile.setTrackDone();
                this.midiFile.markTrackPosition(var1);
-               if(this.midiFile.isDone()) {
-                  if(!this.__aj || var2 == 0) {
-                     this.__at_354();
+               if (this.midiFile.isDone()) {
+                  if (!this.field514 || var2 == 0) {
+                     this.method186();
                      this.midiFile.clear();
                      return;
                   }
@@ -929,8 +936,8 @@ public class MidiPcmStream extends PcmStream {
                break;
             }
 
-            if((var5 & 128) != 0) {
-               this.__au_357(var5);
+            if ((var5 & 128) != 0) {
+               this.method189(var5);
             }
 
             this.midiFile.readTrackLength(var1);
@@ -943,7 +950,7 @@ public class MidiPcmStream extends PcmStream {
 
       this.track = var1;
       this.trackLength = var2;
-      this.__ay = var3;
+      this.field516 = var3;
    }
 
    @ObfuscatedName("ba")
@@ -951,12 +958,12 @@ public class MidiPcmStream extends PcmStream {
       signature = "(Lha;I)Z",
       garbageValue = "1820762013"
    )
-   boolean __ba_368(MusicPatchNode var1) {
-      if(var1.stream == null) {
-         if(var1.__a >= 0) {
+   boolean method195(MusicPatchNode var1) {
+      if (var1.stream == null) {
+         if (var1.field586 >= 0) {
             var1.remove();
-            if(var1.__o > 0 && var1 == this.__ag[var1.__m][var1.__o]) {
-               this.__ag[var1.__m][var1.__o] = null;
+            if (var1.field576 > 0 && var1 == this.field513[var1.field574][var1.field576]) {
+               this.field513[var1.field574][var1.field576] = null;
             }
          }
 
@@ -971,95 +978,95 @@ public class MidiPcmStream extends PcmStream {
       signature = "(Lha;[IIII)Z",
       garbageValue = "-1605961549"
    )
-   boolean __bb_369(MusicPatchNode var1, int[] var2, int var3, int var4) {
-      var1.__y = class309.PcmPlayer_sampleRate / 100;
-      if(var1.__a < 0 || var1.stream != null && !var1.stream.__ae_195()) {
-         int var5 = var1.__d;
-         if(var5 > 0) {
-            var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.__n[var1.__m] * 4.921259842519685E-4D) + 0.5D);
-            if(var5 < 0) {
+   boolean method196(MusicPatchNode var1, int[] var2, int var3, int var4) {
+      var1.field590 = class309.PcmPlayer_sampleRate / 100;
+      if (var1.field586 < 0 || var1.stream != null && !var1.stream.method278()) {
+         int var5 = var1.field582;
+         if (var5 > 0) {
+            var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field505[var1.field574] * 4.921259842519685E-4D) + 0.5D);
+            if (var5 < 0) {
                var5 = 0;
             }
 
-            var1.__d = var5;
+            var1.field582 = var5;
          }
 
-         var1.stream.__ah_193(this.__aa_359(var1));
-         MusicPatchNode2 var6 = var1.__w;
+         var1.stream.method276(this.method191(var1));
+         MusicPatchNode2 var6 = var1.field575;
          boolean var7 = false;
-         ++var1.__j;
-         var1.__s += var6.__l;
-         double var8 = 5.086263020833333E-6D * (double)((var1.__u - 60 << 8) + (var1.__x * var1.__d >> 12));
-         if(var6.__q > 0) {
-            if(var6.__u > 0) {
-               var1.__k += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.__u) + 0.5D);
+         ++var1.field588;
+         var1.field589 += var6.field600;
+         double var8 = 5.086263020833333E-6D * (double)((var1.field577 - 60 << 8) + (var1.field581 * var1.field582 >> 12));
+         if (var6.field595 > 0) {
+            if (var6.field598 > 0) {
+               var1.field583 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field598) + 0.5D);
             } else {
-               var1.__k += 128;
+               var1.field583 += 128;
             }
          }
 
-         if(var6.__m != null) {
-            if(var6.__w > 0) {
-               var1.__n += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.__w) + 0.5D);
+         if (var6.field593 != null) {
+            if (var6.field596 > 0) {
+               var1.field584 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field596) + 0.5D);
             } else {
-               var1.__n += 128;
+               var1.field584 += 128;
             }
 
-            while(var1.__i < var6.__m.length - 2 && var1.__n > (var6.__m[var1.__i + 2] & 255) << 8) {
-               var1.__i += 2;
+            while (var1.field585 < var6.field593.length - 2 && var1.field584 > (var6.field593[var1.field585 + 2] & 255) << 8) {
+               var1.field585 += 2;
             }
 
-            if(var6.__m.length - 2 == var1.__i && var6.__m[var1.__i + 1] == 0) {
+            if (var6.field593.length - 2 == var1.field585 && var6.field593[var1.field585 + 1] == 0) {
                var7 = true;
             }
          }
 
-         if(var1.__a >= 0 && var6.__f != null && (this.__y[var1.__m] & 1) == 0 && (var1.__o < 0 || var1 != this.__ag[var1.__m][var1.__o])) {
-            if(var6.__o > 0) {
-               var1.__a += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.__o) + 0.5D);
+         if (var1.field586 >= 0 && var6.field594 != null && (this.field506[var1.field574] & 1) == 0 && (var1.field576 < 0 || var1 != this.field513[var1.field574][var1.field576])) {
+            if (var6.field597 > 0) {
+               var1.field586 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field597) + 0.5D);
             } else {
-               var1.__a += 128;
+               var1.field586 += 128;
             }
 
-            while(var1.__z < var6.__f.length - 2 && var1.__a > (var6.__f[var1.__z + 2] & 255) << 8) {
-               var1.__z += 2;
+            while (var1.field587 < var6.field594.length - 2 && var1.field586 > (var6.field594[var1.field587 + 2] & 255) << 8) {
+               var1.field587 += 2;
             }
 
-            if(var6.__f.length - 2 == var1.__z) {
+            if (var6.field594.length - 2 == var1.field587) {
                var7 = true;
             }
          }
 
-         if(var7) {
-            var1.stream.__v_192(var1.__y);
-            if(var2 != null) {
-               var1.stream.__e_172(var2, var3, var4);
+         if (var7) {
+            var1.stream.method275(var1.field590);
+            if (var2 != null) {
+               var1.stream.vmethod263(var2, var3, var4);
             } else {
-               var1.stream.__d_173(var4);
+               var1.stream.vmethod264(var4);
             }
 
-            if(var1.stream.__at_196()) {
+            if (var1.stream.method279()) {
                this.patchStream.mixer.addSubStream(var1.stream);
             }
 
-            var1.__m_370();
-            if(var1.__a >= 0) {
+            var1.method219();
+            if (var1.field586 >= 0) {
                var1.remove();
-               if(var1.__o > 0 && var1 == this.__ag[var1.__m][var1.__o]) {
-                  this.__ag[var1.__m][var1.__o] = null;
+               if (var1.field576 > 0 && var1 == this.field513[var1.field574][var1.field576]) {
+                  this.field513[var1.field574][var1.field576] = null;
                }
             }
 
             return true;
          } else {
-            var1.stream.__p_191(var1.__y, this.__ax_360(var1), this.__af_361(var1));
+            var1.stream.method274(var1.field590, this.method192(var1), this.method193(var1));
             return false;
          }
       } else {
-         var1.__m_370();
+         var1.method219();
          var1.remove();
-         if(var1.__o > 0 && var1 == this.__ag[var1.__m][var1.__o]) {
-            this.__ag[var1.__m][var1.__o] = null;
+         if (var1.field576 > 0 && var1 == this.field513[var1.field574][var1.field576]) {
+            this.field513[var1.field574][var1.field576] = null;
          }
 
          return true;
@@ -1074,11 +1081,11 @@ public class MidiPcmStream extends PcmStream {
    @Export("PcmStream_disable")
    static final void PcmStream_disable(PcmStream var0) {
       var0.active = false;
-      if(var0.sound != null) {
+      if (var0.sound != null) {
          var0.sound.position = 0;
       }
 
-      for(PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) {
+      for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) {
          PcmStream_disable(var1);
       }
 
diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java
index 14f7d02a67..0693a0531c 100644
--- a/runescape-client/src/main/java/MilliClock.java
+++ b/runescape-client/src/main/java/MilliClock.java
@@ -14,42 +14,42 @@ public class MilliClock extends Clock {
    @Export("decimator")
    static Decimator decimator;
    @ObfuscatedName("m")
-   long[] __m;
+   long[] field517;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 1940981129
    )
-   int __f;
+   int field518;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 1217137493
    )
-   int __q;
+   int field519;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       longValue = -8372744267470318611L
    )
-   long __w;
+   long field520;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = 250272357
    )
-   int __o;
+   int field521;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 576555527
    )
-   int __u;
+   int field522;
 
    public MilliClock() {
-      this.__m = new long[10];
-      this.__f = 256;
-      this.__q = 1;
-      this.__o = 0;
-      this.__w = class203.currentTimeMs();
+      this.field517 = new long[10];
+      this.field518 = 256;
+      this.field519 = 1;
+      this.field521 = 0;
+      this.field520 = class203.currentTimeMs();
 
-      for(int var1 = 0; var1 < 10; ++var1) {
-         this.__m[var1] = this.__w;
+      for (int var1 = 0; var1 < 10; ++var1) {
+         this.field517[var1] = this.field520;
       }
 
    }
@@ -61,8 +61,8 @@ public class MilliClock extends Clock {
    )
    @Export("mark")
    public void mark() {
-      for(int var1 = 0; var1 < 10; ++var1) {
-         this.__m[var1] = 0L;
+      for (int var1 = 0; var1 < 10; ++var1) {
+         this.field517[var1] = 0L;
       }
 
    }
@@ -74,53 +74,54 @@ public class MilliClock extends Clock {
    )
    @Export("wait")
    public int wait(int var1, int var2) {
-      int var3 = this.__f;
-      int var4 = this.__q;
-      this.__f = 300;
-      this.__q = 1;
-      this.__w = class203.currentTimeMs();
-      if(0L == this.__m[this.__u]) {
-         this.__f = var3;
-         this.__q = var4;
-      } else if(this.__w > this.__m[this.__u]) {
-         this.__f = (int)((long)(var1 * 2560) / (this.__w - this.__m[this.__u]));
+      int var3 = this.field518;
+      int var4 = this.field519;
+      this.field518 = 300;
+      this.field519 = 1;
+      this.field520 = class203.currentTimeMs();
+      if (0L == this.field517[this.field522]) {
+         this.field518 = var3;
+         this.field519 = var4;
+      } else if (this.field520 > this.field517[this.field522]) {
+         this.field518 = (int)((long)(var1 * 2560) / (this.field520 - this.field517[this.field522]));
       }
 
-      if(this.__f < 25) {
-         this.__f = 25;
+      if (this.field518 < 25) {
+         this.field518 = 25;
       }
 
-      if(this.__f > 256) {
-         this.__f = 256;
-         this.__q = (int)((long)var1 - (this.__w - this.__m[this.__u]) / 10L);
+      if (this.field518 > 256) {
+         this.field518 = 256;
+         this.field519 = (int)((long)var1 - (this.field520 - this.field517[this.field522]) / 10L);
       }
 
-      if(this.__q > var1) {
-         this.__q = var1;
+      if (this.field519 > var1) {
+         this.field519 = var1;
       }
 
-      this.__m[this.__u] = this.__w;
-      this.__u = (this.__u + 1) % 10;
+      this.field517[this.field522] = this.field520;
+      this.field522 = (this.field522 + 1) % 10;
       int var5;
-      if(this.__q > 1) {
-         for(var5 = 0; var5 < 10; ++var5) {
-            if(this.__m[var5] != 0L) {
-               this.__m[var5] += (long)this.__q;
+      if (this.field519 > 1) {
+         for (var5 = 0; var5 < 10; ++var5) {
+            if (this.field517[var5] != 0L) {
+               long[] var10000 = this.field517;
+               var10000[var5] += (long)this.field519;
             }
          }
       }
 
-      if(this.__q < var2) {
-         this.__q = var2;
+      if (this.field519 < var2) {
+         this.field519 = var2;
       }
 
-      class203.method4010((long)this.__q);
+      class203.method4010((long)this.field519);
 
-      for(var5 = 0; this.__o < 256; this.__o += this.__f) {
+      for (var5 = 0; this.field521 < 256; this.field521 += this.field518) {
          ++var5;
       }
 
-      this.__o &= 255;
+      this.field521 &= 255;
       return var5;
    }
 
@@ -130,7 +131,7 @@ public class MilliClock extends Clock {
       garbageValue = "-1374398116"
    )
    static void method3400(World[] var0, int var1, int var2, int[] var3, int[] var4) {
-      if(var1 < var2) {
+      if (var1 < var2) {
          int var5 = var1 - 1;
          int var6 = var2 + 1;
          int var7 = (var2 + var1) / 2;
@@ -138,7 +139,7 @@ public class MilliClock extends Clock {
          var0[var7] = var0[var1];
          var0[var1] = var8;
 
-         while(var5 < var6) {
+         while (var5 < var6) {
             boolean var9 = true;
 
             int var10;
@@ -147,36 +148,36 @@ public class MilliClock extends Clock {
             do {
                --var6;
 
-               for(var10 = 0; var10 < 4; ++var10) {
-                  if(var3[var10] == 2) {
+               for (var10 = 0; var10 < 4; ++var10) {
+                  if (var3[var10] == 2) {
                      var11 = var0[var6].index;
                      var12 = var8.index;
-                  } else if(var3[var10] == 1) {
+                  } else if (var3[var10] == 1) {
                      var11 = var0[var6].population;
                      var12 = var8.population;
-                     if(var11 == -1 && var4[var10] == 1) {
+                     if (var11 == -1 && var4[var10] == 1) {
                         var11 = 2001;
                      }
 
-                     if(var12 == -1 && var4[var10] == 1) {
+                     if (var12 == -1 && var4[var10] == 1) {
                         var12 = 2001;
                      }
-                  } else if(var3[var10] == 3) {
-                     var11 = var0[var6].isMembersOnly()?1:0;
-                     var12 = var8.isMembersOnly()?1:0;
+                  } else if (var3[var10] == 3) {
+                     var11 = var0[var6].isMembersOnly() ? 1 : 0;
+                     var12 = var8.isMembersOnly() ? 1 : 0;
                   } else {
                      var11 = var0[var6].id;
                      var12 = var8.id;
                   }
 
-                  if(var12 != var11) {
-                     if((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) {
+                  if (var12 != var11) {
+                     if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) {
                         var9 = false;
                      }
                      break;
                   }
 
-                  if(var10 == 3) {
+                  if (var10 == 3) {
                      var9 = false;
                   }
                }
@@ -187,42 +188,42 @@ public class MilliClock extends Clock {
             do {
                ++var5;
 
-               for(var10 = 0; var10 < 4; ++var10) {
-                  if(var3[var10] == 2) {
+               for (var10 = 0; var10 < 4; ++var10) {
+                  if (var3[var10] == 2) {
                      var11 = var0[var5].index;
                      var12 = var8.index;
-                  } else if(var3[var10] == 1) {
+                  } else if (var3[var10] == 1) {
                      var11 = var0[var5].population;
                      var12 = var8.population;
-                     if(var11 == -1 && var4[var10] == 1) {
+                     if (var11 == -1 && var4[var10] == 1) {
                         var11 = 2001;
                      }
 
-                     if(var12 == -1 && var4[var10] == 1) {
+                     if (var12 == -1 && var4[var10] == 1) {
                         var12 = 2001;
                      }
-                  } else if(var3[var10] == 3) {
-                     var11 = var0[var5].isMembersOnly()?1:0;
-                     var12 = var8.isMembersOnly()?1:0;
+                  } else if (var3[var10] == 3) {
+                     var11 = var0[var5].isMembersOnly() ? 1 : 0;
+                     var12 = var8.isMembersOnly() ? 1 : 0;
                   } else {
                      var11 = var0[var5].id;
                      var12 = var8.id;
                   }
 
-                  if(var11 != var12) {
-                     if((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) {
+                  if (var11 != var12) {
+                     if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) {
                         var9 = false;
                      }
                      break;
                   }
 
-                  if(var10 == 3) {
+                  if (var10 == 3) {
                      var9 = false;
                   }
                }
             } while(var9);
 
-            if(var5 < var6) {
+            if (var5 < var6) {
                World var13 = var0[var5];
                var0[var5] = var0[var6];
                var0[var6] = var13;
diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java
index bd90fa306f..1d8fefe2ee 100644
--- a/runescape-client/src/main/java/Model.java
+++ b/runescape-client/src/main/java/Model.java
@@ -25,9 +25,9 @@ public class Model extends Entity {
    @Export("Model_sharedSpotAnimationModelFaceAlphas")
    static byte[] Model_sharedSpotAnimationModelFaceAlphas;
    @ObfuscatedName("at")
-   static boolean[] __du_at;
+   static boolean[] field523;
    @ObfuscatedName("ad")
-   static boolean[] __du_ad;
+   static boolean[] field524;
    @ObfuscatedName("ap")
    @Export("modelViewportXs")
    static int[] modelViewportXs;
@@ -35,33 +35,33 @@ public class Model extends Entity {
    @Export("modelViewportYs")
    static int[] modelViewportYs;
    @ObfuscatedName("am")
-   static int[] __du_am;
+   static int[] field525;
    @ObfuscatedName("an")
-   static int[] __du_an;
+   static int[] field526;
    @ObfuscatedName("az")
-   static int[] __du_az;
+   static int[] field527;
    @ObfuscatedName("au")
-   static int[] __du_au;
+   static int[] field528;
    @ObfuscatedName("aa")
-   static int[] __du_aa;
+   static int[] field529;
    @ObfuscatedName("ax")
-   static int[][] __du_ax;
+   static int[][] field530;
    @ObfuscatedName("af")
-   static int[] __du_af;
+   static int[] field531;
    @ObfuscatedName("ai")
-   static int[][] __du_ai;
+   static int[][] field532;
    @ObfuscatedName("ba")
-   static int[] __du_ba;
+   static int[] field533;
    @ObfuscatedName("bb")
-   static int[] __du_bb;
+   static int[] field534;
    @ObfuscatedName("bs")
-   static int[] __du_bs;
+   static int[] field535;
    @ObfuscatedName("bq")
-   static int[] __du_bq;
+   static int[] field536;
    @ObfuscatedName("bn")
-   static int[] __du_bn;
+   static int[] field537;
    @ObfuscatedName("bk")
-   static int[] __du_bk;
+   static int[] field538;
    @ObfuscatedName("bd")
    @Export("Model_transformTempX")
    static int Model_transformTempX;
@@ -72,7 +72,7 @@ public class Model extends Entity {
    @Export("Model_transformTempZ")
    static int Model_transformTempZ;
    @ObfuscatedName("bx")
-   static boolean __du_bx;
+   static boolean field539;
    @ObfuscatedName("bm")
    @Export("Model_sine")
    static int[] Model_sine;
@@ -80,9 +80,9 @@ public class Model extends Entity {
    @Export("Model_cosine")
    static int[] Model_cosine;
    @ObfuscatedName("br")
-   static int[] __du_br;
+   static int[] field540;
    @ObfuscatedName("bj")
-   static int[] __du_bj;
+   static int[] field541;
    @ObfuscatedName("o")
    @Export("verticesCount")
    int verticesCount;
@@ -123,20 +123,20 @@ public class Model extends Entity {
    @Export("faceAlphas")
    byte[] faceAlphas;
    @ObfuscatedName("s")
-   byte[] __s;
+   byte[] field542;
    @ObfuscatedName("t")
    @Export("faceTextures")
    short[] faceTextures;
    @ObfuscatedName("y")
-   byte __y;
+   byte field543;
    @ObfuscatedName("h")
-   int __h;
+   int field544;
    @ObfuscatedName("b")
-   int[] __b;
+   int[] field545;
    @ObfuscatedName("c")
-   int[] __c;
+   int[] field546;
    @ObfuscatedName("r")
-   int[] __r;
+   int[] field547;
    @ObfuscatedName("p")
    @Export("vertexLabels")
    int[][] vertexLabels;
@@ -180,41 +180,11 @@ public class Model extends Entity {
    @Export("zMidOffset")
    int zMidOffset;
 
-   static {
-      Model_sharedSequenceModel = new Model();
-      Model_sharedSequenceModelFaceAlphas = new byte[1];
-      Model_sharedSpotAnimationModel = new Model();
-      Model_sharedSpotAnimationModelFaceAlphas = new byte[1];
-      __du_at = new boolean[4700];
-      __du_ad = new boolean[4700];
-      modelViewportXs = new int[4700];
-      modelViewportYs = new int[4700];
-      __du_am = new int[4700];
-      __du_an = new int[4700];
-      __du_az = new int[4700];
-      __du_au = new int[4700];
-      __du_aa = new int[1600];
-      __du_ax = new int[1600][512];
-      __du_af = new int[12];
-      __du_ai = new int[12][2000];
-      __du_ba = new int[2000];
-      __du_bb = new int[2000];
-      __du_bs = new int[12];
-      __du_bq = new int[10];
-      __du_bn = new int[10];
-      __du_bk = new int[10];
-      __du_bx = true;
-      Model_sine = Rasterizer3D.Rasterizer3D_sine;
-      Model_cosine = Rasterizer3D.Rasterizer3D_cosine;
-      __du_br = Rasterizer3D.Rasterizer3D_colorPalette;
-      __du_bj = Rasterizer3D.__et_p;
-   }
-
    Model() {
       this.verticesCount = 0;
       this.indicesCount = 0;
-      this.__y = 0;
-      this.__h = 0;
+      this.field543 = 0;
+      this.field544 = 0;
       this.isSingleTile = false;
       this.xMidOffset = -1;
       this.yMidOffset = -1;
@@ -227,8 +197,8 @@ public class Model extends Entity {
    public Model(Model[] var1, int var2) {
       this.verticesCount = 0;
       this.indicesCount = 0;
-      this.__y = 0;
-      this.__h = 0;
+      this.field543 = 0;
+      this.field544 = 0;
       this.isSingleTile = false;
       this.xMidOffset = -1;
       this.yMidOffset = -1;
@@ -239,32 +209,32 @@ public class Model extends Entity {
       boolean var6 = false;
       this.verticesCount = 0;
       this.indicesCount = 0;
-      this.__h = 0;
-      this.__y = -1;
+      this.field544 = 0;
+      this.field543 = -1;
 
       int var7;
       Model var8;
-      for(var7 = 0; var7 < var2; ++var7) {
+      for (var7 = 0; var7 < var2; ++var7) {
          var8 = var1[var7];
-         if(var8 != null) {
+         if (var8 != null) {
             this.verticesCount += var8.verticesCount;
             this.indicesCount += var8.indicesCount;
-            this.__h += var8.__h;
-            if(var8.faceRenderPriorities != null) {
+            this.field544 += var8.field544;
+            if (var8.faceRenderPriorities != null) {
                var3 = true;
             } else {
-               if(this.__y == -1) {
-                  this.__y = var8.__y;
+               if (this.field543 == -1) {
+                  this.field543 = var8.field543;
                }
 
-               if(this.__y != var8.__y) {
+               if (this.field543 != var8.field543) {
                   var3 = true;
                }
             }
 
             var4 |= var8.faceAlphas != null;
             var5 |= var8.faceTextures != null;
-            var6 |= var8.__s != null;
+            var6 |= var8.field542 != null;
          }
       }
 
@@ -277,82 +247,82 @@ public class Model extends Entity {
       this.faceColors1 = new int[this.indicesCount];
       this.faceColors2 = new int[this.indicesCount];
       this.faceColors3 = new int[this.indicesCount];
-      if(var3) {
+      if (var3) {
          this.faceRenderPriorities = new byte[this.indicesCount];
       }
 
-      if(var4) {
+      if (var4) {
          this.faceAlphas = new byte[this.indicesCount];
       }
 
-      if(var5) {
+      if (var5) {
          this.faceTextures = new short[this.indicesCount];
       }
 
-      if(var6) {
-         this.__s = new byte[this.indicesCount];
+      if (var6) {
+         this.field542 = new byte[this.indicesCount];
       }
 
-      if(this.__h > 0) {
-         this.__b = new int[this.__h];
-         this.__c = new int[this.__h];
-         this.__r = new int[this.__h];
+      if (this.field544 > 0) {
+         this.field545 = new int[this.field544];
+         this.field546 = new int[this.field544];
+         this.field547 = new int[this.field544];
       }
 
       this.verticesCount = 0;
       this.indicesCount = 0;
-      this.__h = 0;
+      this.field544 = 0;
 
-      for(var7 = 0; var7 < var2; ++var7) {
+      for (var7 = 0; var7 < var2; ++var7) {
          var8 = var1[var7];
-         if(var8 != null) {
+         if (var8 != null) {
             int var9;
-            for(var9 = 0; var9 < var8.indicesCount; ++var9) {
+            for (var9 = 0; var9 < var8.indicesCount; ++var9) {
                this.indices1[this.indicesCount] = this.verticesCount + var8.indices1[var9];
                this.indices2[this.indicesCount] = this.verticesCount + var8.indices2[var9];
                this.indices3[this.indicesCount] = this.verticesCount + var8.indices3[var9];
                this.faceColors1[this.indicesCount] = var8.faceColors1[var9];
                this.faceColors2[this.indicesCount] = var8.faceColors2[var9];
                this.faceColors3[this.indicesCount] = var8.faceColors3[var9];
-               if(var3) {
-                  if(var8.faceRenderPriorities != null) {
+               if (var3) {
+                  if (var8.faceRenderPriorities != null) {
                      this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9];
                   } else {
-                     this.faceRenderPriorities[this.indicesCount] = var8.__y;
+                     this.faceRenderPriorities[this.indicesCount] = var8.field543;
                   }
                }
 
-               if(var4 && var8.faceAlphas != null) {
+               if (var4 && var8.faceAlphas != null) {
                   this.faceAlphas[this.indicesCount] = var8.faceAlphas[var9];
                }
 
-               if(var5) {
-                  if(var8.faceTextures != null) {
+               if (var5) {
+                  if (var8.faceTextures != null) {
                      this.faceTextures[this.indicesCount] = var8.faceTextures[var9];
                   } else {
                      this.faceTextures[this.indicesCount] = -1;
                   }
                }
 
-               if(var6) {
-                  if(var8.__s != null && var8.__s[var9] != -1) {
-                     this.__s[this.indicesCount] = (byte)(this.__h + var8.__s[var9]);
+               if (var6) {
+                  if (var8.field542 != null && var8.field542[var9] != -1) {
+                     this.field542[this.indicesCount] = (byte)(this.field544 + var8.field542[var9]);
                   } else {
-                     this.__s[this.indicesCount] = -1;
+                     this.field542[this.indicesCount] = -1;
                   }
                }
 
                ++this.indicesCount;
             }
 
-            for(var9 = 0; var9 < var8.__h; ++var9) {
-               this.__b[this.__h] = this.verticesCount + var8.__b[var9];
-               this.__c[this.__h] = this.verticesCount + var8.__c[var9];
-               this.__r[this.__h] = this.verticesCount + var8.__r[var9];
-               ++this.__h;
+            for (var9 = 0; var9 < var8.field544; ++var9) {
+               this.field545[this.field544] = this.verticesCount + var8.field545[var9];
+               this.field546[this.field544] = this.verticesCount + var8.field546[var9];
+               this.field547[this.field544] = this.verticesCount + var8.field547[var9];
+               ++this.field544;
             }
 
-            for(var9 = 0; var9 < var8.verticesCount; ++var9) {
+            for (var9 = 0; var9 < var8.verticesCount; ++var9) {
                this.verticesX[this.verticesCount] = var8.verticesX[var9];
                this.verticesY[this.verticesCount] = var8.verticesY[var9];
                this.verticesZ[this.verticesCount] = var8.verticesZ[var9];
@@ -374,20 +344,20 @@ public class Model extends Entity {
       int var8 = var2 + this.xzRadius;
       int var9 = var4 - this.xzRadius;
       int var10 = var4 + this.xzRadius;
-      if(var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) {
+      if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) {
          var7 >>= 7;
          var8 = var8 + 127 >> 7;
          var9 >>= 7;
          var10 = var10 + 127 >> 7;
-         if(var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) {
+         if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) {
             return this;
          } else {
             Model var11;
-            if(var5) {
+            if (var5) {
                var11 = new Model();
                var11.verticesCount = this.verticesCount;
                var11.indicesCount = this.indicesCount;
-               var11.__h = this.__h;
+               var11.field544 = this.field544;
                var11.verticesX = this.verticesX;
                var11.verticesZ = this.verticesZ;
                var11.indices1 = this.indices1;
@@ -398,12 +368,12 @@ public class Model extends Entity {
                var11.faceColors3 = this.faceColors3;
                var11.faceRenderPriorities = this.faceRenderPriorities;
                var11.faceAlphas = this.faceAlphas;
-               var11.__s = this.__s;
+               var11.field542 = this.field542;
                var11.faceTextures = this.faceTextures;
-               var11.__y = this.__y;
-               var11.__b = this.__b;
-               var11.__c = this.__c;
-               var11.__r = this.__r;
+               var11.field543 = this.field543;
+               var11.field545 = this.field545;
+               var11.field546 = this.field546;
+               var11.field547 = this.field547;
                var11.vertexLabels = this.vertexLabels;
                var11.faceLabelsAlpha = this.faceLabelsAlpha;
                var11.isSingleTile = this.isSingleTile;
@@ -422,8 +392,8 @@ public class Model extends Entity {
             int var19;
             int var20;
             int var21;
-            if(var6 == 0) {
-               for(var12 = 0; var12 < var11.verticesCount; ++var12) {
+            if (var6 == 0) {
+               for (var12 = 0; var12 < var11.verticesCount; ++var12) {
                   var13 = var2 + this.verticesX[var12];
                   var14 = var4 + this.verticesZ[var12];
                   var15 = var13 & 127;
@@ -436,9 +406,9 @@ public class Model extends Entity {
                   var11.verticesY[var12] = var21 + this.verticesY[var12] - var3;
                }
             } else {
-               for(var12 = 0; var12 < var11.verticesCount; ++var12) {
+               for (var12 = 0; var12 < var11.verticesCount; ++var12) {
                   var13 = (-this.verticesY[var12] << 16) / super.height;
-                  if(var13 < var6) {
+                  if (var13 < var6) {
                      var14 = var2 + this.verticesX[var12];
                      var15 = var4 + this.verticesZ[var12];
                      var16 = var14 & 127;
@@ -467,7 +437,7 @@ public class Model extends Entity {
    )
    @Export("toSharedSequenceModel")
    public Model toSharedSequenceModel(boolean var1) {
-      if(!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) {
+      if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) {
          Model_sharedSequenceModelFaceAlphas = new byte[this.indicesCount + 100];
       }
 
@@ -480,7 +450,7 @@ public class Model extends Entity {
    )
    @Export("toSharedSpotAnimationModel")
    public Model toSharedSpotAnimationModel(boolean var1) {
-      if(!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) {
+      if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) {
          Model_sharedSpotAnimationModelFaceAlphas = new byte[this.indicesCount + 100];
       }
 
@@ -495,30 +465,30 @@ public class Model extends Entity {
    Model buildSharedModel(boolean var1, Model var2, byte[] var3) {
       var2.verticesCount = this.verticesCount;
       var2.indicesCount = this.indicesCount;
-      var2.__h = this.__h;
-      if(var2.verticesX == null || var2.verticesX.length < this.verticesCount) {
+      var2.field544 = this.field544;
+      if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) {
          var2.verticesX = new int[this.verticesCount + 100];
          var2.verticesY = new int[this.verticesCount + 100];
          var2.verticesZ = new int[this.verticesCount + 100];
       }
 
       int var4;
-      for(var4 = 0; var4 < this.verticesCount; ++var4) {
+      for (var4 = 0; var4 < this.verticesCount; ++var4) {
          var2.verticesX[var4] = this.verticesX[var4];
          var2.verticesY[var4] = this.verticesY[var4];
          var2.verticesZ[var4] = this.verticesZ[var4];
       }
 
-      if(var1) {
+      if (var1) {
          var2.faceAlphas = this.faceAlphas;
       } else {
          var2.faceAlphas = var3;
-         if(this.faceAlphas == null) {
-            for(var4 = 0; var4 < this.indicesCount; ++var4) {
+         if (this.faceAlphas == null) {
+            for (var4 = 0; var4 < this.indicesCount; ++var4) {
                var2.faceAlphas[var4] = 0;
             }
          } else {
-            for(var4 = 0; var4 < this.indicesCount; ++var4) {
+            for (var4 = 0; var4 < this.indicesCount; ++var4) {
                var2.faceAlphas[var4] = this.faceAlphas[var4];
             }
          }
@@ -531,12 +501,12 @@ public class Model extends Entity {
       var2.faceColors2 = this.faceColors2;
       var2.faceColors3 = this.faceColors3;
       var2.faceRenderPriorities = this.faceRenderPriorities;
-      var2.__s = this.__s;
+      var2.field542 = this.field542;
       var2.faceTextures = this.faceTextures;
-      var2.__y = this.__y;
-      var2.__b = this.__b;
-      var2.__c = this.__c;
-      var2.__r = this.__r;
+      var2.field543 = this.field543;
+      var2.field545 = this.field545;
+      var2.field546 = this.field546;
+      var2.field547 = this.field547;
       var2.vertexLabels = this.vertexLabels;
       var2.faceLabelsAlpha = this.faceLabelsAlpha;
       var2.isSingleTile = this.isSingleTile;
@@ -547,7 +517,7 @@ public class Model extends Entity {
    @ObfuscatedName("o")
    @Export("calculateBoundingBox")
    void calculateBoundingBox(int var1) {
-      if(this.xMidOffset == -1) {
+      if (this.xMidOffset == -1) {
          int var2 = 0;
          int var3 = 0;
          int var4 = 0;
@@ -557,31 +527,31 @@ public class Model extends Entity {
          int var8 = Model_cosine[var1];
          int var9 = Model_sine[var1];
 
-         for(int var10 = 0; var10 < this.verticesCount; ++var10) {
+         for (int var10 = 0; var10 < this.verticesCount; ++var10) {
             int var11 = Rasterizer3D.method3039(this.verticesX[var10], this.verticesZ[var10], var8, var9);
             int var12 = this.verticesY[var10];
             int var13 = Rasterizer3D.method3004(this.verticesX[var10], this.verticesZ[var10], var8, var9);
-            if(var11 < var2) {
+            if (var11 < var2) {
                var2 = var11;
             }
 
-            if(var11 > var5) {
+            if (var11 > var5) {
                var5 = var11;
             }
 
-            if(var12 < var3) {
+            if (var12 < var3) {
                var3 = var12;
             }
 
-            if(var12 > var6) {
+            if (var12 > var6) {
                var6 = var12;
             }
 
-            if(var13 < var4) {
+            if (var13 < var4) {
                var4 = var13;
             }
 
-            if(var13 > var7) {
+            if (var13 > var7) {
                var7 = var13;
             }
          }
@@ -592,45 +562,45 @@ public class Model extends Entity {
          this.xMidOffset = (var5 - var2 + 1) / 2;
          this.yMidOffset = (var6 - var3 + 1) / 2;
          this.zMidOffset = (var7 - var4 + 1) / 2;
-         if(this.xMidOffset < 32) {
+         if (this.xMidOffset < 32) {
             this.xMidOffset = 32;
          }
 
-         if(this.zMidOffset < 32) {
+         if (this.zMidOffset < 32) {
             this.zMidOffset = 32;
          }
 
-         if(this.isSingleTile) {
+         if (this.isSingleTile) {
             this.xMidOffset += 8;
             this.zMidOffset += 8;
          }
-
       }
+
    }
 
    @ObfuscatedName("u")
    @Export("calculateBoundsCylinder")
    public void calculateBoundsCylinder() {
-      if(this.boundsType != 1) {
+      if (this.boundsType != 1) {
          this.boundsType = 1;
          super.height = 0;
          this.bottomY = 0;
          this.xzRadius = 0;
 
-         for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+         for (int var1 = 0; var1 < this.verticesCount; ++var1) {
             int var2 = this.verticesX[var1];
             int var3 = this.verticesY[var1];
             int var4 = this.verticesZ[var1];
-            if(-var3 > super.height) {
+            if (-var3 > super.height) {
                super.height = -var3;
             }
 
-            if(var3 > this.bottomY) {
+            if (var3 > this.bottomY) {
                this.bottomY = var3;
             }
 
             int var5 = var2 * var2 + var4 * var4;
-            if(var5 > this.xzRadius) {
+            if (var5 > this.xzRadius) {
                this.xzRadius = var5;
             }
          }
@@ -639,20 +609,21 @@ public class Model extends Entity {
          this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D);
          this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D);
       }
+
    }
 
    @ObfuscatedName("g")
-   void __g_232() {
-      if(this.boundsType != 2) {
+   void method197() {
+      if (this.boundsType != 2) {
          this.boundsType = 2;
          this.xzRadius = 0;
 
-         for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+         for (int var1 = 0; var1 < this.verticesCount; ++var1) {
             int var2 = this.verticesX[var1];
             int var3 = this.verticesY[var1];
             int var4 = this.verticesZ[var1];
             int var5 = var2 * var2 + var4 * var4 + var3 * var3;
-            if(var5 > this.xzRadius) {
+            if (var5 > this.xzRadius) {
                this.xzRadius = var5;
             }
          }
@@ -661,10 +632,11 @@ public class Model extends Entity {
          this.radius = this.xzRadius;
          this.diameter = this.xzRadius + this.xzRadius;
       }
+
    }
 
    @ObfuscatedName("l")
-   public int __l_233() {
+   public int method198() {
       this.calculateBoundsCylinder();
       return this.xzRadius;
    }
@@ -682,22 +654,21 @@ public class Model extends Entity {
    )
    @Export("animate")
    public void animate(Frames var1, int var2) {
-      if(this.vertexLabels != null) {
-         if(var2 != -1) {
-            Animation var3 = var1.frames[var2];
-            Skeleton var4 = var3.skeleton;
-            Model_transformTempX = 0;
-            Model_transformTempY = 0;
-            Model_transformTempZ = 0;
+      if (this.vertexLabels != null && var2 != -1) {
+         Animation var3 = var1.frames[var2];
+         Skeleton var4 = var3.skeleton;
+         Model_transformTempX = 0;
+         Model_transformTempY = 0;
+         Model_transformTempZ = 0;
 
-            for(int var5 = 0; var5 < var3.transformCount; ++var5) {
-               int var6 = var3.transformSkeletonLabels[var5];
-               this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]);
-            }
-
-            this.resetBounds();
+         for (int var5 = 0; var5 < var3.transformCount; ++var5) {
+            int var6 = var3.transformSkeletonLabels[var5];
+            this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]);
          }
+
+         this.resetBounds();
       }
+
    }
 
    @ObfuscatedName("a")
@@ -706,8 +677,8 @@ public class Model extends Entity {
    )
    @Export("animate2")
    public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) {
-      if(var2 != -1) {
-         if(var5 != null && var4 != -1) {
+      if (var2 != -1) {
+         if (var5 != null && var4 != -1) {
             Animation var6 = var1.frames[var2];
             Animation var7 = var3.frames[var4];
             Skeleton var8 = var6.skeleton;
@@ -715,18 +686,17 @@ public class Model extends Entity {
             Model_transformTempY = 0;
             Model_transformTempZ = 0;
             byte var9 = 0;
-            int var13 = var9 + 1;
-            int var10 = var5[var9];
+            int var10 = var9 + 1;
+            int var11 = var5[var9];
 
-            int var11;
             int var12;
-            for(var11 = 0; var11 < var6.transformCount; ++var11) {
-               for(var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) {
-                  ;
+            int var13;
+            for (var12 = 0; var12 < var6.transformCount; ++var12) {
+               for (var13 = var6.transformSkeletonLabels[var12]; var13 > var11; var11 = var5[var10++]) {
                }
 
-               if(var12 != var10 || var8.transformTypes[var12] == 0) {
-                  this.transform(var8.transformTypes[var12], var8.labels[var12], var6.transformXs[var11], var6.transformYs[var11], var6.transformZs[var11]);
+               if (var13 != var11 || var8.transformTypes[var13] == 0) {
+                  this.transform(var8.transformTypes[var13], var8.labels[var13], var6.transformXs[var12], var6.transformYs[var12], var6.transformZs[var12]);
                }
             }
 
@@ -734,16 +704,15 @@ public class Model extends Entity {
             Model_transformTempY = 0;
             Model_transformTempZ = 0;
             var9 = 0;
-            var13 = var9 + 1;
-            var10 = var5[var9];
+            var10 = var9 + 1;
+            var11 = var5[var9];
 
-            for(var11 = 0; var11 < var7.transformCount; ++var11) {
-               for(var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) {
-                  ;
+            for (var12 = 0; var12 < var7.transformCount; ++var12) {
+               for (var13 = var7.transformSkeletonLabels[var12]; var13 > var11; var11 = var5[var10++]) {
                }
 
-               if(var12 == var10 || var8.transformTypes[var12] == 0) {
-                  this.transform(var8.transformTypes[var12], var8.labels[var12], var7.transformXs[var11], var7.transformYs[var11], var7.transformZs[var11]);
+               if (var13 == var11 || var8.transformTypes[var13] == 0) {
+                  this.transform(var8.transformTypes[var13], var8.labels[var13], var7.transformXs[var12], var7.transformYs[var12], var7.transformZs[var12]);
                }
             }
 
@@ -752,6 +721,7 @@ public class Model extends Entity {
             this.animate(var1, var2);
          }
       }
+
    }
 
    @ObfuscatedName("z")
@@ -760,30 +730,30 @@ public class Model extends Entity {
       int var6 = var2.length;
       int var7;
       int var8;
-      int var11;
-      int var12;
-      if(var1 == 0) {
+      int var9;
+      int var10;
+      if (var1 == 0) {
          var7 = 0;
          Model_transformTempX = 0;
          Model_transformTempY = 0;
          Model_transformTempZ = 0;
 
-         for(var8 = 0; var8 < var6; ++var8) {
-            int var9 = var2[var8];
-            if(var9 < this.vertexLabels.length) {
-               int[] var10 = this.vertexLabels[var9];
+         for (var8 = 0; var8 < var6; ++var8) {
+            int var11 = var2[var8];
+            if (var11 < this.vertexLabels.length) {
+               int[] var12 = this.vertexLabels[var11];
 
-               for(var11 = 0; var11 < var10.length; ++var11) {
-                  var12 = var10[var11];
-                  Model_transformTempX += this.verticesX[var12];
-                  Model_transformTempY += this.verticesY[var12];
-                  Model_transformTempZ += this.verticesZ[var12];
+               for (var9 = 0; var9 < var12.length; ++var9) {
+                  var10 = var12[var9];
+                  Model_transformTempX += this.verticesX[var10];
+                  Model_transformTempY += this.verticesY[var10];
+                  Model_transformTempZ += this.verticesZ[var10];
                   ++var7;
                }
             }
          }
 
-         if(var7 > 0) {
+         if (var7 > 0) {
             Model_transformTempX = var3 + Model_transformTempX / var7;
             Model_transformTempY = var4 + Model_transformTempY / var7;
             Model_transformTempZ = var5 + Model_transformTempZ / var7;
@@ -792,124 +762,134 @@ public class Model extends Entity {
             Model_transformTempY = var4;
             Model_transformTempZ = var5;
          }
-
       } else {
+         int[] var10000;
          int[] var18;
          int var19;
-         if(var1 == 1) {
-            for(var7 = 0; var7 < var6; ++var7) {
+         if (var1 == 1) {
+            for (var7 = 0; var7 < var6; ++var7) {
                var8 = var2[var7];
-               if(var8 < this.vertexLabels.length) {
+               if (var8 < this.vertexLabels.length) {
                   var18 = this.vertexLabels[var8];
 
-                  for(var19 = 0; var19 < var18.length; ++var19) {
-                     var11 = var18[var19];
-                     this.verticesX[var11] += var3;
-                     this.verticesY[var11] += var4;
-                     this.verticesZ[var11] += var5;
+                  for (var19 = 0; var19 < var18.length; ++var19) {
+                     var9 = var18[var19];
+                     var10000 = this.verticesX;
+                     var10000[var9] += var3;
+                     var10000 = this.verticesY;
+                     var10000[var9] += var4;
+                     var10000 = this.verticesZ;
+                     var10000[var9] += var5;
                   }
                }
             }
-
-         } else if(var1 == 2) {
-            for(var7 = 0; var7 < var6; ++var7) {
+         } else if (var1 == 2) {
+            for (var7 = 0; var7 < var6; ++var7) {
                var8 = var2[var7];
-               if(var8 < this.vertexLabels.length) {
+               if (var8 < this.vertexLabels.length) {
                   var18 = this.vertexLabels[var8];
 
-                  for(var19 = 0; var19 < var18.length; ++var19) {
-                     var11 = var18[var19];
-                     this.verticesX[var11] -= Model_transformTempX;
-                     this.verticesY[var11] -= Model_transformTempY;
-                     this.verticesZ[var11] -= Model_transformTempZ;
-                     var12 = (var3 & 255) * 8;
+                  for (var19 = 0; var19 < var18.length; ++var19) {
+                     var9 = var18[var19];
+                     var10000 = this.verticesX;
+                     var10000[var9] -= Model_transformTempX;
+                     var10000 = this.verticesY;
+                     var10000[var9] -= Model_transformTempY;
+                     var10000 = this.verticesZ;
+                     var10000[var9] -= Model_transformTempZ;
+                     var10 = (var3 & 255) * 8;
                      int var13 = (var4 & 255) * 8;
                      int var14 = (var5 & 255) * 8;
                      int var15;
                      int var16;
                      int var17;
-                     if(var14 != 0) {
+                     if (var14 != 0) {
                         var15 = Model_sine[var14];
                         var16 = Model_cosine[var14];
-                        var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16;
-                        this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16;
-                        this.verticesX[var11] = var17;
+                        var17 = var15 * this.verticesY[var9] + var16 * this.verticesX[var9] >> 16;
+                        this.verticesY[var9] = var16 * this.verticesY[var9] - var15 * this.verticesX[var9] >> 16;
+                        this.verticesX[var9] = var17;
                      }
 
-                     if(var12 != 0) {
-                        var15 = Model_sine[var12];
-                        var16 = Model_cosine[var12];
-                        var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16;
-                        this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16;
-                        this.verticesY[var11] = var17;
+                     if (var10 != 0) {
+                        var15 = Model_sine[var10];
+                        var16 = Model_cosine[var10];
+                        var17 = var16 * this.verticesY[var9] - var15 * this.verticesZ[var9] >> 16;
+                        this.verticesZ[var9] = var15 * this.verticesY[var9] + var16 * this.verticesZ[var9] >> 16;
+                        this.verticesY[var9] = var17;
                      }
 
-                     if(var13 != 0) {
+                     if (var13 != 0) {
                         var15 = Model_sine[var13];
                         var16 = Model_cosine[var13];
-                        var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16;
-                        this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16;
-                        this.verticesX[var11] = var17;
+                        var17 = var15 * this.verticesZ[var9] + var16 * this.verticesX[var9] >> 16;
+                        this.verticesZ[var9] = var16 * this.verticesZ[var9] - var15 * this.verticesX[var9] >> 16;
+                        this.verticesX[var9] = var17;
                      }
 
-                     this.verticesX[var11] += Model_transformTempX;
-                     this.verticesY[var11] += Model_transformTempY;
-                     this.verticesZ[var11] += Model_transformTempZ;
+                     var10000 = this.verticesX;
+                     var10000[var9] += Model_transformTempX;
+                     var10000 = this.verticesY;
+                     var10000[var9] += Model_transformTempY;
+                     var10000 = this.verticesZ;
+                     var10000[var9] += Model_transformTempZ;
                   }
                }
             }
-
-         } else if(var1 == 3) {
-            for(var7 = 0; var7 < var6; ++var7) {
+         } else if (var1 == 3) {
+            for (var7 = 0; var7 < var6; ++var7) {
                var8 = var2[var7];
-               if(var8 < this.vertexLabels.length) {
+               if (var8 < this.vertexLabels.length) {
                   var18 = this.vertexLabels[var8];
 
-                  for(var19 = 0; var19 < var18.length; ++var19) {
-                     var11 = var18[var19];
-                     this.verticesX[var11] -= Model_transformTempX;
-                     this.verticesY[var11] -= Model_transformTempY;
-                     this.verticesZ[var11] -= Model_transformTempZ;
-                     this.verticesX[var11] = var3 * this.verticesX[var11] / 128;
-                     this.verticesY[var11] = var4 * this.verticesY[var11] / 128;
-                     this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128;
-                     this.verticesX[var11] += Model_transformTempX;
-                     this.verticesY[var11] += Model_transformTempY;
-                     this.verticesZ[var11] += Model_transformTempZ;
+                  for (var19 = 0; var19 < var18.length; ++var19) {
+                     var9 = var18[var19];
+                     var10000 = this.verticesX;
+                     var10000[var9] -= Model_transformTempX;
+                     var10000 = this.verticesY;
+                     var10000[var9] -= Model_transformTempY;
+                     var10000 = this.verticesZ;
+                     var10000[var9] -= Model_transformTempZ;
+                     this.verticesX[var9] = var3 * this.verticesX[var9] / 128;
+                     this.verticesY[var9] = var4 * this.verticesY[var9] / 128;
+                     this.verticesZ[var9] = var5 * this.verticesZ[var9] / 128;
+                     var10000 = this.verticesX;
+                     var10000[var9] += Model_transformTempX;
+                     var10000 = this.verticesY;
+                     var10000[var9] += Model_transformTempY;
+                     var10000 = this.verticesZ;
+                     var10000[var9] += Model_transformTempZ;
                   }
                }
             }
+         } else if (var1 == 5 && this.faceLabelsAlpha != null && this.faceAlphas != null) {
+            for (var7 = 0; var7 < var6; ++var7) {
+               var8 = var2[var7];
+               if (var8 < this.faceLabelsAlpha.length) {
+                  var18 = this.faceLabelsAlpha[var8];
 
-         } else if(var1 == 5) {
-            if(this.faceLabelsAlpha != null && this.faceAlphas != null) {
-               for(var7 = 0; var7 < var6; ++var7) {
-                  var8 = var2[var7];
-                  if(var8 < this.faceLabelsAlpha.length) {
-                     var18 = this.faceLabelsAlpha[var8];
-
-                     for(var19 = 0; var19 < var18.length; ++var19) {
-                        var11 = var18[var19];
-                        var12 = (this.faceAlphas[var11] & 255) + var3 * 8;
-                        if(var12 < 0) {
-                           var12 = 0;
-                        } else if(var12 > 255) {
-                           var12 = 255;
-                        }
-
-                        this.faceAlphas[var11] = (byte)var12;
+                  for (var19 = 0; var19 < var18.length; ++var19) {
+                     var9 = var18[var19];
+                     var10 = (this.faceAlphas[var9] & 255) + var3 * 8;
+                     if (var10 < 0) {
+                        var10 = 0;
+                     } else if (var10 > 255) {
+                        var10 = 255;
                      }
+
+                     this.faceAlphas[var9] = (byte)var10;
                   }
                }
             }
-
          }
       }
+
    }
 
    @ObfuscatedName("j")
    @Export("rotateY90Ccw")
    public void rotateY90Ccw() {
-      for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+      for (int var1 = 0; var1 < this.verticesCount; ++var1) {
          int var2 = this.verticesX[var1];
          this.verticesX[var1] = this.verticesZ[var1];
          this.verticesZ[var1] = -var2;
@@ -921,7 +901,7 @@ public class Model extends Entity {
    @ObfuscatedName("s")
    @Export("rotateY180")
    public void rotateY180() {
-      for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+      for (int var1 = 0; var1 < this.verticesCount; ++var1) {
          this.verticesX[var1] = -this.verticesX[var1];
          this.verticesZ[var1] = -this.verticesZ[var1];
       }
@@ -932,7 +912,7 @@ public class Model extends Entity {
    @ObfuscatedName("t")
    @Export("rotateY270Ccw")
    public void rotateY270Ccw() {
-      for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+      for (int var1 = 0; var1 < this.verticesCount; ++var1) {
          int var2 = this.verticesZ[var1];
          this.verticesZ[var1] = this.verticesX[var1];
          this.verticesX[var1] = -var2;
@@ -947,7 +927,7 @@ public class Model extends Entity {
       int var2 = Model_sine[var1];
       int var3 = Model_cosine[var1];
 
-      for(int var4 = 0; var4 < this.verticesCount; ++var4) {
+      for (int var4 = 0; var4 < this.verticesCount; ++var4) {
          int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16;
          this.verticesZ[var4] = var2 * this.verticesY[var4] + var3 * this.verticesZ[var4] >> 16;
          this.verticesY[var4] = var5;
@@ -959,10 +939,13 @@ public class Model extends Entity {
    @ObfuscatedName("h")
    @Export("offsetBy")
    public void offsetBy(int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < this.verticesCount; ++var4) {
-         this.verticesX[var4] += var1;
-         this.verticesY[var4] += var2;
-         this.verticesZ[var4] += var3;
+      for (int var4 = 0; var4 < this.verticesCount; ++var4) {
+         int[] var10000 = this.verticesX;
+         var10000[var4] += var1;
+         var10000 = this.verticesY;
+         var10000[var4] += var2;
+         var10000 = this.verticesZ;
+         var10000[var4] += var3;
       }
 
       this.resetBounds();
@@ -971,7 +954,7 @@ public class Model extends Entity {
    @ObfuscatedName("b")
    @Export("scale")
    public void scale(int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < this.verticesCount; ++var4) {
+      for (int var4 = 0; var4 < this.verticesCount; ++var4) {
          this.verticesX[var4] = this.verticesX[var4] * var1 / 128;
          this.verticesY[var4] = var2 * this.verticesY[var4] / 128;
          this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128;
@@ -981,10 +964,10 @@ public class Model extends Entity {
    }
 
    @ObfuscatedName("c")
-   public final void __c_234(int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-      __du_aa[0] = -1;
-      if(this.boundsType != 2 && this.boundsType != 1) {
-         this.__g_232();
+   public final void method199(int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
+      field529[0] = -1;
+      if (this.boundsType != 2 && this.boundsType != 1) {
+         this.method197();
       }
 
       int var8 = Rasterizer3D.Rasterizer3D_clipMidX;
@@ -999,24 +982,24 @@ public class Model extends Entity {
       int var17 = Model_cosine[var4];
       int var18 = var16 * var6 + var17 * var7 >> 16;
 
-      for(int var19 = 0; var19 < this.verticesCount; ++var19) {
+      for (int var19 = 0; var19 < this.verticesCount; ++var19) {
          int var20 = this.verticesX[var19];
          int var21 = this.verticesY[var19];
          int var22 = this.verticesZ[var19];
          int var23;
-         if(var3 != 0) {
+         if (var3 != 0) {
             var23 = var21 * var14 + var20 * var15 >> 16;
             var21 = var21 * var15 - var20 * var14 >> 16;
             var20 = var23;
          }
 
-         if(var1 != 0) {
+         if (var1 != 0) {
             var23 = var21 * var11 - var22 * var10 >> 16;
             var22 = var21 * var10 + var22 * var11 >> 16;
             var21 = var23;
          }
 
-         if(var2 != 0) {
+         if (var2 != 0) {
             var23 = var22 * var12 + var20 * var13 >> 16;
             var22 = var22 * var13 - var20 * var12 >> 16;
             var20 = var23;
@@ -1027,29 +1010,28 @@ public class Model extends Entity {
          var22 += var7;
          var23 = var21 * var17 - var22 * var16 >> 16;
          var22 = var21 * var16 + var22 * var17 >> 16;
-         __du_am[var19] = var22 - var18;
+         field525[var19] = var22 - var18;
          modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8;
          modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9;
-         if(this.__h > 0) {
-            __du_an[var19] = var20;
-            __du_az[var19] = var23;
-            __du_au[var19] = var22;
+         if (this.field544 > 0) {
+            field526[var19] = var20;
+            field527[var19] = var23;
+            field528[var19] = var22;
          }
       }
 
       try {
          this.draw0(false, false, false, 0L);
-      } catch (Exception var25) {
-         ;
+      } catch (Exception var24) {
       }
 
    }
 
    @ObfuscatedName("p")
-   public final void __p_235(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-      __du_aa[0] = -1;
-      if(this.boundsType != 2 && this.boundsType != 1) {
-         this.__g_232();
+   public final void method200(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+      field529[0] = -1;
+      if (this.boundsType != 2 && this.boundsType != 1) {
+         this.method197();
       }
 
       int var9 = Rasterizer3D.Rasterizer3D_clipMidX;
@@ -1064,24 +1046,24 @@ public class Model extends Entity {
       int var18 = Model_cosine[var4];
       int var19 = var17 * var6 + var18 * var7 >> 16;
 
-      for(int var20 = 0; var20 < this.verticesCount; ++var20) {
+      for (int var20 = 0; var20 < this.verticesCount; ++var20) {
          int var21 = this.verticesX[var20];
          int var22 = this.verticesY[var20];
          int var23 = this.verticesZ[var20];
          int var24;
-         if(var3 != 0) {
+         if (var3 != 0) {
             var24 = var22 * var15 + var21 * var16 >> 16;
             var22 = var22 * var16 - var21 * var15 >> 16;
             var21 = var24;
          }
 
-         if(var1 != 0) {
+         if (var1 != 0) {
             var24 = var22 * var12 - var23 * var11 >> 16;
             var23 = var22 * var11 + var23 * var12 >> 16;
             var22 = var24;
          }
 
-         if(var2 != 0) {
+         if (var2 != 0) {
             var24 = var23 * var13 + var21 * var14 >> 16;
             var23 = var23 * var14 - var21 * var13 >> 16;
             var21 = var24;
@@ -1092,20 +1074,19 @@ public class Model extends Entity {
          var23 += var7;
          var24 = var22 * var18 - var23 * var17 >> 16;
          var23 = var22 * var17 + var23 * var18 >> 16;
-         __du_am[var20] = var23 - var19;
+         field525[var20] = var23 - var19;
          modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8;
          modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8;
-         if(this.__h > 0) {
-            __du_an[var20] = var21;
-            __du_az[var20] = var24;
-            __du_au[var20] = var23;
+         if (this.field544 > 0) {
+            field526[var20] = var21;
+            field527[var20] = var24;
+            field528[var20] = var23;
          }
       }
 
       try {
          this.draw0(false, false, false, 0L);
-      } catch (Exception var26) {
-         ;
+      } catch (Exception var25) {
       }
 
    }
@@ -1113,283 +1094,283 @@ public class Model extends Entity {
    @ObfuscatedName("v")
    @Export("draw0")
    final void draw0(boolean var1, boolean var2, boolean var3, long var4) {
-      if(this.diameter < 1600) {
+      if (this.diameter < 1600) {
          int var6;
-         for(var6 = 0; var6 < this.diameter; ++var6) {
-            __du_aa[var6] = 0;
+         for (var6 = 0; var6 < this.diameter; ++var6) {
+            field529[var6] = 0;
          }
 
-         var6 = var3?20:5;
+         var6 = var3 ? 20 : 5;
 
          int var7;
          int var8;
+         int var9;
          int var10;
          int var11;
          int var12;
          int var13;
+         int var14;
          int var15;
          int var16;
-         int var18;
-         int var27;
-         for(var7 = 0; var7 < this.indicesCount; ++var7) {
-            if(this.faceColors3[var7] != -2) {
+         for (var7 = 0; var7 < this.indicesCount; ++var7) {
+            if (this.faceColors3[var7] != -2) {
                var8 = this.indices1[var7];
-               var27 = this.indices2[var7];
-               var10 = this.indices3[var7];
-               var11 = modelViewportXs[var8];
-               var12 = modelViewportXs[var27];
-               var13 = modelViewportXs[var10];
-               int var14;
-               if(!var1 || var11 != -5000 && var12 != -5000 && var13 != -5000) {
-                  if(var2 && NpcDefinition.method5164(modelViewportYs[var8], modelViewportYs[var27], modelViewportYs[var10], var11, var12, var13, var6)) {
+               var16 = this.indices2[var7];
+               var9 = this.indices3[var7];
+               var10 = modelViewportXs[var8];
+               var11 = modelViewportXs[var16];
+               var12 = modelViewportXs[var9];
+               int var17;
+               if (!var1 || var10 != -5000 && var11 != -5000 && var12 != -5000) {
+                  if (var2 && NPCDefinition.method5164(modelViewportYs[var8], modelViewportYs[var16], modelViewportYs[var9], var10, var11, var12, var6)) {
                      Projectile.method2081(var4);
                      var2 = false;
                   }
 
-                  if((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var27]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var27]) > 0) {
-                     __du_ad[var7] = false;
-                     if(var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) {
-                        __du_at[var7] = false;
+                  if ((var10 - var11) * (modelViewportYs[var9] - modelViewportYs[var16]) - (var12 - var11) * (modelViewportYs[var8] - modelViewportYs[var16]) > 0) {
+                     field524[var7] = false;
+                     if (var10 >= 0 && var11 >= 0 && var12 >= 0 && var10 <= Rasterizer3D.Rasterizer3D_clipWidth && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth) {
+                        field523[var7] = false;
                      } else {
-                        __du_at[var7] = true;
+                        field523[var7] = true;
                      }
 
-                     var14 = (__du_am[var8] + __du_am[var27] + __du_am[var10]) / 3 + this.radius;
-                     __du_ax[var14][__du_aa[var14]++] = var7;
+                     var17 = (field525[var8] + field525[var16] + field525[var9]) / 3 + this.radius;
+                     field530[var17][field529[var17]++] = var7;
                   }
                } else {
-                  var14 = __du_an[var8];
-                  var15 = __du_an[var27];
-                  var16 = __du_an[var10];
-                  int var17 = __du_az[var8];
-                  var18 = __du_az[var27];
-                  int var19 = __du_az[var10];
-                  int var20 = __du_au[var8];
-                  int var21 = __du_au[var27];
-                  int var22 = __du_au[var10];
-                  var14 -= var15;
-                  var16 -= var15;
-                  var17 -= var18;
-                  var19 -= var18;
+                  var17 = field526[var8];
+                  var13 = field526[var16];
+                  var14 = field526[var9];
+                  int var18 = field527[var8];
+                  var15 = field527[var16];
+                  int var19 = field527[var9];
+                  int var20 = field528[var8];
+                  int var21 = field528[var16];
+                  int var22 = field528[var9];
+                  var17 -= var13;
+                  var14 -= var13;
+                  var18 -= var15;
+                  var19 -= var15;
                   var20 -= var21;
                   var22 -= var21;
-                  int var23 = var17 * var22 - var20 * var19;
-                  int var24 = var20 * var16 - var14 * var22;
-                  int var25 = var14 * var19 - var17 * var16;
-                  if(var15 * var23 + var18 * var24 + var21 * var25 > 0) {
-                     __du_ad[var7] = true;
-                     int var26 = (__du_am[var8] + __du_am[var27] + __du_am[var10]) / 3 + this.radius;
-                     __du_ax[var26][__du_aa[var26]++] = var7;
+                  int var23 = var18 * var22 - var20 * var19;
+                  int var24 = var20 * var14 - var17 * var22;
+                  int var25 = var17 * var19 - var18 * var14;
+                  if (var13 * var23 + var15 * var24 + var21 * var25 > 0) {
+                     field524[var7] = true;
+                     int var26 = (field525[var8] + field525[var16] + field525[var9]) / 3 + this.radius;
+                     field530[var26][field529[var26]++] = var7;
                   }
                }
             }
          }
 
-         int[] var9;
-         if(this.faceRenderPriorities == null) {
-            for(var7 = this.diameter - 1; var7 >= 0; --var7) {
-               var8 = __du_aa[var7];
-               if(var8 > 0) {
-                  var9 = __du_ax[var7];
+         int[] var27;
+         if (this.faceRenderPriorities == null) {
+            for (var7 = this.diameter - 1; var7 >= 0; --var7) {
+               var8 = field529[var7];
+               if (var8 > 0) {
+                  var27 = field530[var7];
 
-                  for(var10 = 0; var10 < var8; ++var10) {
-                     this.__ag_236(var9[var10]);
+                  for (var9 = 0; var9 < var8; ++var9) {
+                     this.method201(var27[var9]);
                   }
                }
             }
-
          } else {
-            for(var7 = 0; var7 < 12; ++var7) {
-               __du_af[var7] = 0;
-               __du_bs[var7] = 0;
+            for (var7 = 0; var7 < 12; ++var7) {
+               field531[var7] = 0;
+               field535[var7] = 0;
             }
 
-            for(var7 = this.diameter - 1; var7 >= 0; --var7) {
-               var8 = __du_aa[var7];
-               if(var8 > 0) {
-                  var9 = __du_ax[var7];
+            for (var7 = this.diameter - 1; var7 >= 0; --var7) {
+               var8 = field529[var7];
+               if (var8 > 0) {
+                  var27 = field530[var7];
 
-                  for(var10 = 0; var10 < var8; ++var10) {
-                     var11 = var9[var10];
-                     byte var31 = this.faceRenderPriorities[var11];
-                     var13 = __du_af[var31]++;
-                     __du_ai[var31][var13] = var11;
-                     if(var31 < 10) {
-                        __du_bs[var31] += var7;
-                     } else if(var31 == 10) {
-                        __du_ba[var13] = var7;
+                  for (var9 = 0; var9 < var8; ++var9) {
+                     var10 = var27[var9];
+                     byte var28 = this.faceRenderPriorities[var10];
+                     var12 = field531[var28]++;
+                     field532[var28][var12] = var10;
+                     if (var28 < 10) {
+                        int[] var10000 = field535;
+                        var10000[var28] += var7;
+                     } else if (var28 == 10) {
+                        field533[var12] = var7;
                      } else {
-                        __du_bb[var13] = var7;
+                        field534[var12] = var7;
                      }
                   }
                }
             }
 
             var7 = 0;
-            if(__du_af[1] > 0 || __du_af[2] > 0) {
-               var7 = (__du_bs[1] + __du_bs[2]) / (__du_af[1] + __du_af[2]);
+            if (field531[1] > 0 || field531[2] > 0) {
+               var7 = (field535[1] + field535[2]) / (field531[1] + field531[2]);
             }
 
             var8 = 0;
-            if(__du_af[3] > 0 || __du_af[4] > 0) {
-               var8 = (__du_bs[3] + __du_bs[4]) / (__du_af[3] + __du_af[4]);
+            if (field531[3] > 0 || field531[4] > 0) {
+               var8 = (field535[3] + field535[4]) / (field531[3] + field531[4]);
             }
 
-            var27 = 0;
-            if(__du_af[6] > 0 || __du_af[8] > 0) {
-               var27 = (__du_bs[8] + __du_bs[6]) / (__du_af[8] + __du_af[6]);
+            var16 = 0;
+            if (field531[6] > 0 || field531[8] > 0) {
+               var16 = (field535[8] + field535[6]) / (field531[8] + field531[6]);
             }
 
-            var11 = 0;
-            var12 = __du_af[10];
-            int[] var28 = __du_ai[10];
-            int[] var29 = __du_ba;
-            if(var11 == var12) {
-               var11 = 0;
-               var12 = __du_af[11];
-               var28 = __du_ai[11];
-               var29 = __du_bb;
+            var10 = 0;
+            var11 = field531[10];
+            int[] var29 = field532[10];
+            int[] var30 = field533;
+            if (var10 == var11) {
+               var10 = 0;
+               var11 = field531[11];
+               var29 = field532[11];
+               var30 = field534;
             }
 
-            if(var11 < var12) {
-               var10 = var29[var11];
+            if (var10 < var11) {
+               var9 = var30[var10];
             } else {
-               var10 = -1000;
+               var9 = -1000;
             }
 
-            for(var15 = 0; var15 < 10; ++var15) {
-               while(var15 == 0 && var10 > var7) {
-                  this.__ag_236(var28[var11++]);
-                  if(var11 == var12 && var28 != __du_ai[11]) {
-                     var11 = 0;
-                     var12 = __du_af[11];
-                     var28 = __du_ai[11];
-                     var29 = __du_bb;
+            for (var13 = 0; var13 < 10; ++var13) {
+               while (var13 == 0 && var9 > var7) {
+                  this.method201(var29[var10++]);
+                  if (var10 == var11 && var29 != field532[11]) {
+                     var10 = 0;
+                     var11 = field531[11];
+                     var29 = field532[11];
+                     var30 = field534;
                   }
 
-                  if(var11 < var12) {
-                     var10 = var29[var11];
+                  if (var10 < var11) {
+                     var9 = var30[var10];
                   } else {
-                     var10 = -1000;
+                     var9 = -1000;
                   }
                }
 
-               while(var15 == 3 && var10 > var8) {
-                  this.__ag_236(var28[var11++]);
-                  if(var11 == var12 && var28 != __du_ai[11]) {
-                     var11 = 0;
-                     var12 = __du_af[11];
-                     var28 = __du_ai[11];
-                     var29 = __du_bb;
+               while (var13 == 3 && var9 > var8) {
+                  this.method201(var29[var10++]);
+                  if (var10 == var11 && var29 != field532[11]) {
+                     var10 = 0;
+                     var11 = field531[11];
+                     var29 = field532[11];
+                     var30 = field534;
                   }
 
-                  if(var11 < var12) {
-                     var10 = var29[var11];
+                  if (var10 < var11) {
+                     var9 = var30[var10];
                   } else {
-                     var10 = -1000;
+                     var9 = -1000;
                   }
                }
 
-               while(var15 == 5 && var10 > var27) {
-                  this.__ag_236(var28[var11++]);
-                  if(var11 == var12 && var28 != __du_ai[11]) {
-                     var11 = 0;
-                     var12 = __du_af[11];
-                     var28 = __du_ai[11];
-                     var29 = __du_bb;
+               while (var13 == 5 && var9 > var16) {
+                  this.method201(var29[var10++]);
+                  if (var10 == var11 && var29 != field532[11]) {
+                     var10 = 0;
+                     var11 = field531[11];
+                     var29 = field532[11];
+                     var30 = field534;
                   }
 
-                  if(var11 < var12) {
-                     var10 = var29[var11];
+                  if (var10 < var11) {
+                     var9 = var30[var10];
                   } else {
-                     var10 = -1000;
+                     var9 = -1000;
                   }
                }
 
-               var16 = __du_af[var15];
-               int[] var30 = __du_ai[var15];
+               var14 = field531[var13];
+               int[] var31 = field532[var13];
 
-               for(var18 = 0; var18 < var16; ++var18) {
-                  this.__ag_236(var30[var18]);
+               for (var15 = 0; var15 < var14; ++var15) {
+                  this.method201(var31[var15]);
                }
             }
 
-            while(var10 != -1000) {
-               this.__ag_236(var28[var11++]);
-               if(var11 == var12 && var28 != __du_ai[11]) {
-                  var11 = 0;
-                  var28 = __du_ai[11];
-                  var12 = __du_af[11];
-                  var29 = __du_bb;
+            while (var9 != -1000) {
+               this.method201(var29[var10++]);
+               if (var10 == var11 && var29 != field532[11]) {
+                  var10 = 0;
+                  var29 = field532[11];
+                  var11 = field531[11];
+                  var30 = field534;
                }
 
-               if(var11 < var12) {
-                  var10 = var29[var11];
+               if (var10 < var11) {
+                  var9 = var30[var10];
                } else {
-                  var10 = -1000;
+                  var9 = -1000;
                }
             }
-
          }
       }
+
    }
 
    @ObfuscatedName("ag")
-   final void __ag_236(int var1) {
-      if(__du_ad[var1]) {
-         this.__aq_237(var1);
+   final void method201(int var1) {
+      if (field524[var1]) {
+         this.method202(var1);
       } else {
          int var2 = this.indices1[var1];
          int var3 = this.indices2[var1];
          int var4 = this.indices3[var1];
-         Rasterizer3D.__et_m = __du_at[var1];
-         if(this.faceAlphas == null) {
+         Rasterizer3D.field739 = field523[var1];
+         if (this.faceAlphas == null) {
             Rasterizer3D.Rasterizer3D_alpha = 0;
          } else {
             Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255;
          }
 
-         if(this.faceTextures != null && this.faceTextures[var1] != -1) {
+         if (this.faceTextures != null && this.faceTextures[var1] != -1) {
             int var5;
             int var6;
             int var7;
-            if(this.__s != null && this.__s[var1] != -1) {
-               int var8 = this.__s[var1] & 255;
-               var5 = this.__b[var8];
-               var6 = this.__c[var8];
-               var7 = this.__r[var8];
+            if (this.field542 != null && this.field542[var1] != -1) {
+               int var8 = this.field542[var1] & 255;
+               var5 = this.field545[var8];
+               var6 = this.field546[var8];
+               var7 = this.field547[var8];
             } else {
                var5 = var2;
                var6 = var3;
                var7 = var4;
             }
 
-            if(this.faceColors3[var1] == -1) {
-               Rasterizer3D.method2986(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], __du_an[var5], __du_an[var6], __du_an[var7], __du_az[var5], __du_az[var6], __du_az[var7], __du_au[var5], __du_au[var6], __du_au[var7], this.faceTextures[var1]);
+            if (this.faceColors3[var1] == -1) {
+               Rasterizer3D.method2986(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field526[var5], field526[var6], field526[var7], field527[var5], field527[var6], field527[var7], field528[var5], field528[var6], field528[var7], this.faceTextures[var1]);
             } else {
-               Rasterizer3D.method2986(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], __du_an[var5], __du_an[var6], __du_an[var7], __du_az[var5], __du_az[var6], __du_az[var7], __du_au[var5], __du_au[var6], __du_au[var7], this.faceTextures[var1]);
+               Rasterizer3D.method2986(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field526[var5], field526[var6], field526[var7], field527[var5], field527[var6], field527[var7], field528[var5], field528[var6], field528[var7], this.faceTextures[var1]);
             }
-         } else if(this.faceColors3[var1] == -1) {
-            Rasterizer3D.method3020(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], __du_br[this.faceColors1[var1]]);
+         } else if (this.faceColors3[var1] == -1) {
+            Rasterizer3D.method3020(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field540[this.faceColors1[var1]]);
          } else {
             Rasterizer3D.method3037(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]);
          }
-
       }
+
    }
 
    @ObfuscatedName("aq")
-   final void __aq_237(int var1) {
+   final void method202(int var1) {
       int var2 = Rasterizer3D.Rasterizer3D_clipMidX;
       int var3 = Rasterizer3D.Rasterizer3D_clipMidY;
       int var4 = 0;
       int var5 = this.indices1[var1];
       int var6 = this.indices2[var1];
       int var7 = this.indices3[var1];
-      int var8 = __du_au[var5];
-      int var9 = __du_au[var6];
-      int var10 = __du_au[var7];
-      if(this.faceAlphas == null) {
+      int var8 = field528[var5];
+      int var9 = field528[var6];
+      int var10 = field528[var7];
+      if (this.faceAlphas == null) {
          Rasterizer3D.Rasterizer3D_alpha = 0;
       } else {
          Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255;
@@ -1399,126 +1380,126 @@ public class Model extends Entity {
       int var12;
       int var13;
       int var14;
-      if(var8 >= 50) {
-         __du_bq[var4] = modelViewportXs[var5];
-         __du_bn[var4] = modelViewportYs[var5];
-         __du_bk[var4++] = this.faceColors1[var1];
+      if (var8 >= 50) {
+         field536[var4] = modelViewportXs[var5];
+         field537[var4] = modelViewportYs[var5];
+         field538[var4++] = this.faceColors1[var1];
       } else {
-         var11 = __du_an[var5];
-         var12 = __du_az[var5];
+         var11 = field526[var5];
+         var12 = field527[var5];
          var13 = this.faceColors1[var1];
-         if(var10 >= 50) {
-            var14 = __du_bj[var10 - var8] * (50 - var8);
-            __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var7] - var11) * var14 >> 16)) / 50;
-            __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var7] - var12) * var14 >> 16)) / 50;
-            __du_bk[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16);
+         if (var10 >= 50) {
+            var14 = field541[var10 - var8] * (50 - var8);
+            field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var7] - var11) * var14 >> 16)) / 50;
+            field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var7] - var12) * var14 >> 16)) / 50;
+            field538[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16);
          }
 
-         if(var9 >= 50) {
-            var14 = __du_bj[var9 - var8] * (50 - var8);
-            __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var6] - var11) * var14 >> 16)) / 50;
-            __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var6] - var12) * var14 >> 16)) / 50;
-            __du_bk[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16);
+         if (var9 >= 50) {
+            var14 = field541[var9 - var8] * (50 - var8);
+            field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var6] - var11) * var14 >> 16)) / 50;
+            field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var6] - var12) * var14 >> 16)) / 50;
+            field538[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16);
          }
       }
 
-      if(var9 >= 50) {
-         __du_bq[var4] = modelViewportXs[var6];
-         __du_bn[var4] = modelViewportYs[var6];
-         __du_bk[var4++] = this.faceColors2[var1];
+      if (var9 >= 50) {
+         field536[var4] = modelViewportXs[var6];
+         field537[var4] = modelViewportYs[var6];
+         field538[var4++] = this.faceColors2[var1];
       } else {
-         var11 = __du_an[var6];
-         var12 = __du_az[var6];
+         var11 = field526[var6];
+         var12 = field527[var6];
          var13 = this.faceColors2[var1];
-         if(var8 >= 50) {
-            var14 = __du_bj[var8 - var9] * (50 - var9);
-            __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var5] - var11) * var14 >> 16)) / 50;
-            __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var5] - var12) * var14 >> 16)) / 50;
-            __du_bk[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16);
+         if (var8 >= 50) {
+            var14 = field541[var8 - var9] * (50 - var9);
+            field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var5] - var11) * var14 >> 16)) / 50;
+            field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var5] - var12) * var14 >> 16)) / 50;
+            field538[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16);
          }
 
-         if(var10 >= 50) {
-            var14 = __du_bj[var10 - var9] * (50 - var9);
-            __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var7] - var11) * var14 >> 16)) / 50;
-            __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var7] - var12) * var14 >> 16)) / 50;
-            __du_bk[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16);
+         if (var10 >= 50) {
+            var14 = field541[var10 - var9] * (50 - var9);
+            field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var7] - var11) * var14 >> 16)) / 50;
+            field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var7] - var12) * var14 >> 16)) / 50;
+            field538[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16);
          }
       }
 
-      if(var10 >= 50) {
-         __du_bq[var4] = modelViewportXs[var7];
-         __du_bn[var4] = modelViewportYs[var7];
-         __du_bk[var4++] = this.faceColors3[var1];
+      if (var10 >= 50) {
+         field536[var4] = modelViewportXs[var7];
+         field537[var4] = modelViewportYs[var7];
+         field538[var4++] = this.faceColors3[var1];
       } else {
-         var11 = __du_an[var7];
-         var12 = __du_az[var7];
+         var11 = field526[var7];
+         var12 = field527[var7];
          var13 = this.faceColors3[var1];
-         if(var9 >= 50) {
-            var14 = __du_bj[var9 - var10] * (50 - var10);
-            __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var6] - var11) * var14 >> 16)) / 50;
-            __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var6] - var12) * var14 >> 16)) / 50;
-            __du_bk[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16);
+         if (var9 >= 50) {
+            var14 = field541[var9 - var10] * (50 - var10);
+            field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var6] - var11) * var14 >> 16)) / 50;
+            field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var6] - var12) * var14 >> 16)) / 50;
+            field538[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16);
          }
 
-         if(var8 >= 50) {
-            var14 = __du_bj[var8 - var10] * (50 - var10);
-            __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var5] - var11) * var14 >> 16)) / 50;
-            __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var5] - var12) * var14 >> 16)) / 50;
-            __du_bk[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16);
+         if (var8 >= 50) {
+            var14 = field541[var8 - var10] * (50 - var10);
+            field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var5] - var11) * var14 >> 16)) / 50;
+            field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var5] - var12) * var14 >> 16)) / 50;
+            field538[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16);
          }
       }
 
-      var11 = __du_bq[0];
-      var12 = __du_bq[1];
-      var13 = __du_bq[2];
-      var14 = __du_bn[0];
-      int var15 = __du_bn[1];
-      int var16 = __du_bn[2];
-      Rasterizer3D.__et_m = false;
+      var11 = field536[0];
+      var12 = field536[1];
+      var13 = field536[2];
+      var14 = field537[0];
+      int var15 = field537[1];
+      int var16 = field537[2];
+      Rasterizer3D.field739 = false;
       int var17;
       int var18;
       int var19;
       int var20;
-      if(var4 == 3) {
-         if(var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) {
-            Rasterizer3D.__et_m = true;
+      if (var4 == 3) {
+         if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) {
+            Rasterizer3D.field739 = true;
          }
 
-         if(this.faceTextures != null && this.faceTextures[var1] != -1) {
-            if(this.__s != null && this.__s[var1] != -1) {
-               var20 = this.__s[var1] & 255;
-               var17 = this.__b[var20];
-               var18 = this.__c[var20];
-               var19 = this.__r[var20];
+         if (this.faceTextures != null && this.faceTextures[var1] != -1) {
+            if (this.field542 != null && this.field542[var1] != -1) {
+               var20 = this.field542[var1] & 255;
+               var17 = this.field545[var20];
+               var18 = this.field546[var20];
+               var19 = this.field547[var20];
             } else {
                var17 = var5;
                var18 = var6;
                var19 = var7;
             }
 
-            if(this.faceColors3[var1] == -1) {
-               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], this.faceTextures[var1]);
+            if (this.faceColors3[var1] == -1) {
+               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], this.faceTextures[var1]);
             } else {
-               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, __du_bk[0], __du_bk[1], __du_bk[2], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], this.faceTextures[var1]);
+               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, field538[0], field538[1], field538[2], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], this.faceTextures[var1]);
             }
-         } else if(this.faceColors3[var1] == -1) {
-            Rasterizer3D.method3020(var14, var15, var16, var11, var12, var13, __du_br[this.faceColors1[var1]]);
+         } else if (this.faceColors3[var1] == -1) {
+            Rasterizer3D.method3020(var14, var15, var16, var11, var12, var13, field540[this.faceColors1[var1]]);
          } else {
-            Rasterizer3D.method3037(var14, var15, var16, var11, var12, var13, __du_bk[0], __du_bk[1], __du_bk[2]);
+            Rasterizer3D.method3037(var14, var15, var16, var11, var12, var13, field538[0], field538[1], field538[2]);
          }
       }
 
-      if(var4 == 4) {
-         if(var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || __du_bq[3] < 0 || __du_bq[3] > Rasterizer3D.Rasterizer3D_clipWidth) {
-            Rasterizer3D.__et_m = true;
+      if (var4 == 4) {
+         if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field536[3] < 0 || field536[3] > Rasterizer3D.Rasterizer3D_clipWidth) {
+            Rasterizer3D.field739 = true;
          }
 
-         if(this.faceTextures != null && this.faceTextures[var1] != -1) {
-            if(this.__s != null && this.__s[var1] != -1) {
-               var20 = this.__s[var1] & 255;
-               var17 = this.__b[var20];
-               var18 = this.__c[var20];
-               var19 = this.__r[var20];
+         if (this.faceTextures != null && this.faceTextures[var1] != -1) {
+            if (this.field542 != null && this.field542[var1] != -1) {
+               var20 = this.field542[var1] & 255;
+               var17 = this.field545[var20];
+               var18 = this.field546[var20];
+               var19 = this.field547[var20];
             } else {
                var17 = var5;
                var18 = var6;
@@ -1526,20 +1507,20 @@ public class Model extends Entity {
             }
 
             short var21 = this.faceTextures[var1];
-            if(this.faceColors3[var1] == -1) {
-               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], var21);
-               Rasterizer3D.method2986(var14, var16, __du_bn[3], var11, var13, __du_bq[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], var21);
+            if (this.faceColors3[var1] == -1) {
+               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], var21);
+               Rasterizer3D.method2986(var14, var16, field537[3], var11, var13, field536[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], var21);
             } else {
-               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, __du_bk[0], __du_bk[1], __du_bk[2], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], var21);
-               Rasterizer3D.method2986(var14, var16, __du_bn[3], var11, var13, __du_bq[3], __du_bk[0], __du_bk[2], __du_bk[3], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], var21);
+               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, field538[0], field538[1], field538[2], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], var21);
+               Rasterizer3D.method2986(var14, var16, field537[3], var11, var13, field536[3], field538[0], field538[2], field538[3], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], var21);
             }
-         } else if(this.faceColors3[var1] == -1) {
-            var17 = __du_br[this.faceColors1[var1]];
+         } else if (this.faceColors3[var1] == -1) {
+            var17 = field540[this.faceColors1[var1]];
             Rasterizer3D.method3020(var14, var15, var16, var11, var12, var13, var17);
-            Rasterizer3D.method3020(var14, var16, __du_bn[3], var11, var13, __du_bq[3], var17);
+            Rasterizer3D.method3020(var14, var16, field537[3], var11, var13, field536[3], var17);
          } else {
-            Rasterizer3D.method3037(var14, var15, var16, var11, var12, var13, __du_bk[0], __du_bk[1], __du_bk[2]);
-            Rasterizer3D.method3037(var14, var16, __du_bn[3], var11, var13, __du_bq[3], __du_bk[0], __du_bk[2], __du_bk[3]);
+            Rasterizer3D.method3037(var14, var15, var16, var11, var12, var13, field538[0], field538[1], field538[2]);
+            Rasterizer3D.method3037(var14, var16, field537[3], var11, var13, field536[3], field538[0], field538[2], field538[3]);
          }
       }
 
@@ -1548,8 +1529,8 @@ public class Model extends Entity {
    @ObfuscatedName("cy")
    @Export("renderDraw")
    void renderDraw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
-      __du_aa[0] = -1;
-      if(this.boundsType != 1) {
+      field529[0] = -1;
+      if (this.boundsType != 1) {
          this.calculateBoundsCylinder();
       }
 
@@ -1558,137 +1539,166 @@ public class Model extends Entity {
       int var12 = var2 * var7 + var3 * var11 >> 16;
       int var13 = var3 * this.xzRadius >> 16;
       int var14 = var12 + var13;
-      if(var14 > 50 && var12 < 3500) {
+      if (var14 > 50 && var12 < 3500) {
          int var15 = var8 * var4 + var5 * var6 >> 16;
          int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom;
-         if(var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) {
+         if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) {
             int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom;
-            if(var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) {
+            if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) {
                int var18 = var3 * var7 - var11 * var2 >> 16;
                int var19 = var2 * this.xzRadius >> 16;
                int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom;
-               if(var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) {
+               if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) {
                   int var21 = (var3 * super.height >> 16) + var19;
                   int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom;
-                  if(var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) {
+                  if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) {
                      int var23 = var13 + (var2 * super.height >> 16);
                      boolean var24 = false;
                      boolean var25 = false;
-                     if(var12 - var23 <= 50) {
+                     if (var12 - var23 <= 50) {
                         var25 = true;
                      }
 
-                     boolean var26 = var25 || this.__h > 0;
+                     boolean var26 = var25 || this.field544 > 0;
                      int var27 = ViewportMouse.ViewportMouse_x;
-                     int var29 = ViewportMouse.ViewportMouse_y;
-                     boolean var31 = ViewportMouse.ViewportMouse_isInViewport;
-                     boolean var34 = 0L != var9;
-                     boolean var35;
-                     if(var34) {
-                        var35 = (int)(var9 >>> 16 & 1L) == 1;
-                        var34 = !var35;
+                     int var28 = ViewportMouse.ViewportMouse_y;
+                     boolean var29 = ViewportMouse.ViewportMouse_isInViewport;
+                     boolean var30 = 0L != var9;
+                     boolean var31;
+                     if (var30) {
+                        var31 = (int)(var9 >>> 16 & 1L) == 1;
+                        var30 = !var31;
                      }
 
-                     var35 = false;
-                     int var37;
-                     int var38;
-                     int var39;
-                     if(var34 && var31) {
-                        boolean var36 = false;
-                        if(__du_bx) {
-                           var36 = Decimator.method2491(this, var6, var7, var8);
+                     var31 = false;
+                     int var32;
+                     int var33;
+                     int var34;
+                     if (var30 && var29) {
+                        boolean var35 = false;
+                        if (field539) {
+                           var35 = Decimator.method2491(this, var6, var7, var8);
                         } else {
-                           var37 = var12 - var13;
-                           if(var37 <= 50) {
-                              var37 = 50;
+                           var32 = var12 - var13;
+                           if (var32 <= 50) {
+                              var32 = 50;
                            }
 
-                           if(var15 > 0) {
+                           if (var15 > 0) {
                               var16 /= var14;
-                              var17 /= var37;
+                              var17 /= var32;
                            } else {
                               var17 /= var14;
-                              var16 /= var37;
+                              var16 /= var32;
                            }
 
-                           if(var18 > 0) {
+                           if (var18 > 0) {
                               var22 /= var14;
-                              var20 /= var37;
+                              var20 /= var32;
                            } else {
                               var20 /= var14;
-                              var22 /= var37;
+                              var22 /= var32;
                            }
 
-                           var38 = var27 - Rasterizer3D.Rasterizer3D_clipMidX;
-                           var39 = var29 - Rasterizer3D.Rasterizer3D_clipMidY;
-                           if(var38 > var16 && var38 < var17 && var39 > var22 && var39 < var20) {
-                              var36 = true;
-                           }
-                        }
-
-                        if(var36) {
-                           if(this.isSingleTile) {
-                              Projectile.method2081(var9);
-                           } else {
+                           var33 = var27 - Rasterizer3D.Rasterizer3D_clipMidX;
+                           var34 = var28 - Rasterizer3D.Rasterizer3D_clipMidY;
+                           if (var33 > var16 && var33 < var17 && var34 > var22 && var34 < var20) {
                               var35 = true;
                            }
                         }
+
+                        if (var35) {
+                           if (this.isSingleTile) {
+                              Projectile.method2081(var9);
+                           } else {
+                              var31 = true;
+                           }
+                        }
                      }
 
-                     int var47 = Rasterizer3D.Rasterizer3D_clipMidX;
-                     var37 = Rasterizer3D.Rasterizer3D_clipMidY;
-                     var38 = 0;
-                     var39 = 0;
-                     if(var1 != 0) {
-                        var38 = Model_sine[var1];
-                        var39 = Model_cosine[var1];
+                     int var42 = Rasterizer3D.Rasterizer3D_clipMidX;
+                     var32 = Rasterizer3D.Rasterizer3D_clipMidY;
+                     var33 = 0;
+                     var34 = 0;
+                     if (var1 != 0) {
+                        var33 = Model_sine[var1];
+                        var34 = Model_cosine[var1];
                      }
 
-                     for(int var40 = 0; var40 < this.verticesCount; ++var40) {
-                        int var41 = this.verticesX[var40];
-                        int var42 = this.verticesY[var40];
-                        int var43 = this.verticesZ[var40];
-                        int var44;
-                        if(var1 != 0) {
-                           var44 = var43 * var38 + var41 * var39 >> 16;
-                           var43 = var43 * var39 - var41 * var38 >> 16;
-                           var41 = var44;
+                     for (int var36 = 0; var36 < this.verticesCount; ++var36) {
+                        int var37 = this.verticesX[var36];
+                        int var38 = this.verticesY[var36];
+                        int var39 = this.verticesZ[var36];
+                        int var40;
+                        if (var1 != 0) {
+                           var40 = var39 * var33 + var37 * var34 >> 16;
+                           var39 = var39 * var34 - var37 * var33 >> 16;
+                           var37 = var40;
                         }
 
-                        var41 += var6;
-                        var42 += var7;
-                        var43 += var8;
-                        var44 = var43 * var4 + var5 * var41 >> 16;
-                        var43 = var5 * var43 - var41 * var4 >> 16;
-                        var41 = var44;
-                        var44 = var3 * var42 - var43 * var2 >> 16;
-                        var43 = var42 * var2 + var3 * var43 >> 16;
-                        __du_am[var40] = var43 - var12;
-                        if(var43 >= 50) {
-                           modelViewportXs[var40] = var41 * Rasterizer3D.Rasterizer3D_zoom / var43 + var47;
-                           modelViewportYs[var40] = var44 * Rasterizer3D.Rasterizer3D_zoom / var43 + var37;
+                        var37 += var6;
+                        var38 += var7;
+                        var39 += var8;
+                        var40 = var39 * var4 + var5 * var37 >> 16;
+                        var39 = var5 * var39 - var37 * var4 >> 16;
+                        var37 = var40;
+                        var40 = var3 * var38 - var39 * var2 >> 16;
+                        var39 = var38 * var2 + var3 * var39 >> 16;
+                        field525[var36] = var39 - var12;
+                        if (var39 >= 50) {
+                           modelViewportXs[var36] = var37 * Rasterizer3D.Rasterizer3D_zoom / var39 + var42;
+                           modelViewportYs[var36] = var40 * Rasterizer3D.Rasterizer3D_zoom / var39 + var32;
                         } else {
-                           modelViewportXs[var40] = -5000;
+                           modelViewportXs[var36] = -5000;
                            var24 = true;
                         }
 
-                        if(var26) {
-                           __du_an[var40] = var41;
-                           __du_az[var40] = var44;
-                           __du_au[var40] = var43;
+                        if (var26) {
+                           field526[var36] = var37;
+                           field527[var36] = var40;
+                           field528[var36] = var39;
                         }
                      }
 
                      try {
-                        this.draw0(var24, var35, this.isSingleTile, var9);
-                     } catch (Exception var46) {
-                        ;
+                        this.draw0(var24, var31, this.isSingleTile, var9);
+                     } catch (Exception var41) {
                      }
-
                   }
                }
             }
          }
       }
+
+   }
+
+   static {
+      Model_sharedSequenceModel = new Model();
+      Model_sharedSequenceModelFaceAlphas = new byte[1];
+      Model_sharedSpotAnimationModel = new Model();
+      Model_sharedSpotAnimationModelFaceAlphas = new byte[1];
+      field523 = new boolean[4700];
+      field524 = new boolean[4700];
+      modelViewportXs = new int[4700];
+      modelViewportYs = new int[4700];
+      field525 = new int[4700];
+      field526 = new int[4700];
+      field527 = new int[4700];
+      field528 = new int[4700];
+      field529 = new int[1600];
+      field530 = new int[1600][512];
+      field531 = new int[12];
+      field532 = new int[12][2000];
+      field533 = new int[2000];
+      field534 = new int[2000];
+      field535 = new int[12];
+      field536 = new int[10];
+      field537 = new int[10];
+      field538 = new int[10];
+      field539 = true;
+      Model_sine = Rasterizer3D.Rasterizer3D_sine;
+      Model_cosine = Rasterizer3D.Rasterizer3D_cosine;
+      field540 = Rasterizer3D.Rasterizer3D_colorPalette;
+      field541 = Rasterizer3D.field743;
    }
 }
diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java
index a0ce7dd443..fdcb9827d3 100644
--- a/runescape-client/src/main/java/ModelData.java
+++ b/runescape-client/src/main/java/ModelData.java
@@ -7,11 +7,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("ModelData")
 public class ModelData extends Entity {
    @ObfuscatedName("aw")
-   static int[] __dw_aw;
+   static int[] field548;
    @ObfuscatedName("al")
-   static int[] __dw_al;
+   static int[] field549;
    @ObfuscatedName("ab")
-   static int __dw_ab;
+   static int field550;
    @ObfuscatedName("ae")
    @Export("ModelData_sine")
    static int[] ModelData_sine;
@@ -43,9 +43,9 @@ public class ModelData extends Entity {
    @Export("indices3")
    int[] indices3;
    @ObfuscatedName("e")
-   byte[] __e;
+   byte[] field551;
    @ObfuscatedName("x")
-   byte[] __x;
+   byte[] field552;
    @ObfuscatedName("d")
    @Export("faceAlphas")
    byte[] faceAlphas;
@@ -59,9 +59,9 @@ public class ModelData extends Entity {
    @Export("faceTextures")
    short[] faceTextures;
    @ObfuscatedName("a")
-   byte __a;
+   byte field553;
    @ObfuscatedName("z")
-   int __z;
+   int field554;
    @ObfuscatedName("j")
    @Export("textureRenderTypes")
    byte[] textureRenderTypes;
@@ -75,9 +75,9 @@ public class ModelData extends Entity {
    @Export("texTriangleZ")
    short[] texTriangleZ;
    @ObfuscatedName("h")
-   int[] __h;
+   int[] field555;
    @ObfuscatedName("b")
-   int[] __b;
+   int[] field556;
    @ObfuscatedName("c")
    @Export("vertexLabels")
    int[][] vertexLabels;
@@ -94,42 +94,34 @@ public class ModelData extends Entity {
    @ObfuscatedSignature(
       signature = "[Ldq;"
    )
-   VertexNormal[] __v;
+   VertexNormal[] field557;
    @ObfuscatedName("ag")
    @ObfuscatedSignature(
       signature = "[Ldq;"
    )
-   VertexNormal[] __ag;
+   VertexNormal[] field558;
    @ObfuscatedName("aq")
-   public short __aq;
+   public short field559;
    @ObfuscatedName("aj")
-   public short __aj;
+   public short field560;
    @ObfuscatedName("av")
    @Export("isBoundsCalculated")
    boolean isBoundsCalculated;
    @ObfuscatedName("ar")
-   int __ar;
+   int field561;
    @ObfuscatedName("ac")
-   int __ac;
+   int field562;
    @ObfuscatedName("ay")
-   int __ay;
+   int field563;
    @ObfuscatedName("ah")
-   int __ah;
+   int field564;
    @ObfuscatedName("ak")
-   int __ak;
-
-   static {
-      __dw_aw = new int[10000];
-      __dw_al = new int[10000];
-      __dw_ab = 0;
-      ModelData_sine = Rasterizer3D.Rasterizer3D_sine;
-      ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine;
-   }
+   int field565;
 
    ModelData() {
       this.verticesCount = 0;
       this.faceCount = 0;
-      this.__a = 0;
+      this.field553 = 0;
       this.isBoundsCalculated = false;
    }
 
@@ -139,7 +131,7 @@ public class ModelData extends Entity {
    public ModelData(ModelData[] var1, int var2) {
       this.verticesCount = 0;
       this.faceCount = 0;
-      this.__a = 0;
+      this.field553 = 0;
       this.isBoundsCalculated = false;
       boolean var3 = false;
       boolean var4 = false;
@@ -149,32 +141,32 @@ public class ModelData extends Entity {
       boolean var8 = false;
       this.verticesCount = 0;
       this.faceCount = 0;
-      this.__z = 0;
-      this.__a = -1;
+      this.field554 = 0;
+      this.field553 = -1;
 
       int var9;
       ModelData var10;
-      for(var9 = 0; var9 < var2; ++var9) {
+      for (var9 = 0; var9 < var2; ++var9) {
          var10 = var1[var9];
-         if(var10 != null) {
+         if (var10 != null) {
             this.verticesCount += var10.verticesCount;
             this.faceCount += var10.faceCount;
-            this.__z += var10.__z;
-            if(var10.__x != null) {
+            this.field554 += var10.field554;
+            if (var10.field552 != null) {
                var4 = true;
             } else {
-               if(this.__a == -1) {
-                  this.__a = var10.__a;
+               if (this.field553 == -1) {
+                  this.field553 = var10.field553;
                }
 
-               if(this.__a != var10.__a) {
+               if (this.field553 != var10.field553) {
                   var4 = true;
                }
             }
 
-            var3 |= var10.__e != null;
+            var3 |= var10.field551 != null;
             var5 |= var10.faceAlphas != null;
-            var6 |= var10.__b != null;
+            var6 |= var10.field556 != null;
             var7 |= var10.faceTextures != null;
             var8 |= var10.textureCoords != null;
          }
@@ -183,103 +175,103 @@ public class ModelData extends Entity {
       this.verticesX = new int[this.verticesCount];
       this.verticesY = new int[this.verticesCount];
       this.verticesZ = new int[this.verticesCount];
-      this.__h = new int[this.verticesCount];
+      this.field555 = new int[this.verticesCount];
       this.indices1 = new int[this.faceCount];
       this.indices2 = new int[this.faceCount];
       this.indices3 = new int[this.faceCount];
-      if(var3) {
-         this.__e = new byte[this.faceCount];
+      if (var3) {
+         this.field551 = new byte[this.faceCount];
       }
 
-      if(var4) {
-         this.__x = new byte[this.faceCount];
+      if (var4) {
+         this.field552 = new byte[this.faceCount];
       }
 
-      if(var5) {
+      if (var5) {
          this.faceAlphas = new byte[this.faceCount];
       }
 
-      if(var6) {
-         this.__b = new int[this.faceCount];
+      if (var6) {
+         this.field556 = new int[this.faceCount];
       }
 
-      if(var7) {
+      if (var7) {
          this.faceTextures = new short[this.faceCount];
       }
 
-      if(var8) {
+      if (var8) {
          this.textureCoords = new byte[this.faceCount];
       }
 
       this.faceColors = new short[this.faceCount];
-      if(this.__z > 0) {
-         this.textureRenderTypes = new byte[this.__z];
-         this.texTriangleX = new short[this.__z];
-         this.texTriangleY = new short[this.__z];
-         this.texTriangleZ = new short[this.__z];
+      if (this.field554 > 0) {
+         this.textureRenderTypes = new byte[this.field554];
+         this.texTriangleX = new short[this.field554];
+         this.texTriangleY = new short[this.field554];
+         this.texTriangleZ = new short[this.field554];
       }
 
       this.verticesCount = 0;
       this.faceCount = 0;
-      this.__z = 0;
+      this.field554 = 0;
 
-      for(var9 = 0; var9 < var2; ++var9) {
+      for (var9 = 0; var9 < var2; ++var9) {
          var10 = var1[var9];
-         if(var10 != null) {
+         if (var10 != null) {
             int var11;
-            for(var11 = 0; var11 < var10.faceCount; ++var11) {
-               if(var3 && var10.__e != null) {
-                  this.__e[this.faceCount] = var10.__e[var11];
+            for (var11 = 0; var11 < var10.faceCount; ++var11) {
+               if (var3 && var10.field551 != null) {
+                  this.field551[this.faceCount] = var10.field551[var11];
                }
 
-               if(var4) {
-                  if(var10.__x != null) {
-                     this.__x[this.faceCount] = var10.__x[var11];
+               if (var4) {
+                  if (var10.field552 != null) {
+                     this.field552[this.faceCount] = var10.field552[var11];
                   } else {
-                     this.__x[this.faceCount] = var10.__a;
+                     this.field552[this.faceCount] = var10.field553;
                   }
                }
 
-               if(var5 && var10.faceAlphas != null) {
+               if (var5 && var10.faceAlphas != null) {
                   this.faceAlphas[this.faceCount] = var10.faceAlphas[var11];
                }
 
-               if(var6 && var10.__b != null) {
-                  this.__b[this.faceCount] = var10.__b[var11];
+               if (var6 && var10.field556 != null) {
+                  this.field556[this.faceCount] = var10.field556[var11];
                }
 
-               if(var7) {
-                  if(var10.faceTextures != null) {
+               if (var7) {
+                  if (var10.faceTextures != null) {
                      this.faceTextures[this.faceCount] = var10.faceTextures[var11];
                   } else {
                      this.faceTextures[this.faceCount] = -1;
                   }
                }
 
-               if(var8) {
-                  if(var10.textureCoords != null && var10.textureCoords[var11] != -1) {
-                     this.textureCoords[this.faceCount] = (byte)(this.__z + var10.textureCoords[var11]);
+               if (var8) {
+                  if (var10.textureCoords != null && var10.textureCoords[var11] != -1) {
+                     this.textureCoords[this.faceCount] = (byte)(this.field554 + var10.textureCoords[var11]);
                   } else {
                      this.textureCoords[this.faceCount] = -1;
                   }
                }
 
                this.faceColors[this.faceCount] = var10.faceColors[var11];
-               this.indices1[this.faceCount] = this.__w_217(var10, var10.indices1[var11]);
-               this.indices2[this.faceCount] = this.__w_217(var10, var10.indices2[var11]);
-               this.indices3[this.faceCount] = this.__w_217(var10, var10.indices3[var11]);
+               this.indices1[this.faceCount] = this.method205(var10, var10.indices1[var11]);
+               this.indices2[this.faceCount] = this.method205(var10, var10.indices2[var11]);
+               this.indices3[this.faceCount] = this.method205(var10, var10.indices3[var11]);
                ++this.faceCount;
             }
 
-            for(var11 = 0; var11 < var10.__z; ++var11) {
-               byte var12 = this.textureRenderTypes[this.__z] = var10.textureRenderTypes[var11];
-               if(var12 == 0) {
-                  this.texTriangleX[this.__z] = (short)this.__w_217(var10, var10.texTriangleX[var11]);
-                  this.texTriangleY[this.__z] = (short)this.__w_217(var10, var10.texTriangleY[var11]);
-                  this.texTriangleZ[this.__z] = (short)this.__w_217(var10, var10.texTriangleZ[var11]);
+            for (var11 = 0; var11 < var10.field554; ++var11) {
+               byte var12 = this.textureRenderTypes[this.field554] = var10.textureRenderTypes[var11];
+               if (var12 == 0) {
+                  this.texTriangleX[this.field554] = (short)this.method205(var10, var10.texTriangleX[var11]);
+                  this.texTriangleY[this.field554] = (short)this.method205(var10, var10.texTriangleY[var11]);
+                  this.texTriangleZ[this.field554] = (short)this.method205(var10, var10.texTriangleZ[var11]);
                }
 
-               ++this.__z;
+               ++this.field554;
             }
          }
       }
@@ -289,12 +281,12 @@ public class ModelData extends Entity {
    ModelData(byte[] var1) {
       this.verticesCount = 0;
       this.faceCount = 0;
-      this.__a = 0;
+      this.field553 = 0;
       this.isBoundsCalculated = false;
-      if(var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) {
-         this.__f_215(var1);
+      if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) {
+         this.method203(var1);
       } else {
-         this.__q_216(var1);
+         this.method204(var1);
       }
 
    }
@@ -306,13 +298,13 @@ public class ModelData extends Entity {
    public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) {
       this.verticesCount = 0;
       this.faceCount = 0;
-      this.__a = 0;
+      this.field553 = 0;
       this.isBoundsCalculated = false;
       this.verticesCount = var1.verticesCount;
       this.faceCount = var1.faceCount;
-      this.__z = var1.__z;
+      this.field554 = var1.field554;
       int var6;
-      if(var2) {
+      if (var2) {
          this.verticesX = var1.verticesX;
          this.verticesY = var1.verticesY;
          this.verticesZ = var1.verticesZ;
@@ -321,27 +313,27 @@ public class ModelData extends Entity {
          this.verticesY = new int[this.verticesCount];
          this.verticesZ = new int[this.verticesCount];
 
-         for(var6 = 0; var6 < this.verticesCount; ++var6) {
+         for (var6 = 0; var6 < this.verticesCount; ++var6) {
             this.verticesX[var6] = var1.verticesX[var6];
             this.verticesY[var6] = var1.verticesY[var6];
             this.verticesZ[var6] = var1.verticesZ[var6];
          }
       }
 
-      if(var3) {
+      if (var3) {
          this.faceColors = var1.faceColors;
       } else {
          this.faceColors = new short[this.faceCount];
 
-         for(var6 = 0; var6 < this.faceCount; ++var6) {
+         for (var6 = 0; var6 < this.faceCount; ++var6) {
             this.faceColors[var6] = var1.faceColors[var6];
          }
       }
 
-      if(!var4 && var1.faceTextures != null) {
+      if (!var4 && var1.faceTextures != null) {
          this.faceTextures = new short[this.faceCount];
 
-         for(var6 = 0; var6 < this.faceCount; ++var6) {
+         for (var6 = 0; var6 < this.faceCount; ++var6) {
             this.faceTextures[var6] = var1.faceTextures[var6];
          }
       } else {
@@ -352,27 +344,27 @@ public class ModelData extends Entity {
       this.indices1 = var1.indices1;
       this.indices2 = var1.indices2;
       this.indices3 = var1.indices3;
-      this.__e = var1.__e;
-      this.__x = var1.__x;
+      this.field551 = var1.field551;
+      this.field552 = var1.field552;
       this.textureCoords = var1.textureCoords;
-      this.__a = var1.__a;
+      this.field553 = var1.field553;
       this.textureRenderTypes = var1.textureRenderTypes;
       this.texTriangleX = var1.texTriangleX;
       this.texTriangleY = var1.texTriangleY;
       this.texTriangleZ = var1.texTriangleZ;
-      this.__h = var1.__h;
-      this.__b = var1.__b;
+      this.field555 = var1.field555;
+      this.field556 = var1.field556;
       this.vertexLabels = var1.vertexLabels;
       this.faceLabelsAlpha = var1.faceLabelsAlpha;
-      this.__v = var1.__v;
+      this.field557 = var1.field557;
       this.faceNormals = var1.faceNormals;
-      this.__ag = var1.__ag;
-      this.__aq = var1.__aq;
-      this.__aj = var1.__aj;
+      this.field558 = var1.field558;
+      this.field559 = var1.field559;
+      this.field560 = var1.field560;
    }
 
    @ObfuscatedName("f")
-   void __f_215(byte[] var1) {
+   void method203(byte[] var1) {
       Buffer var2 = new Buffer(var1);
       Buffer var3 = new Buffer(var1);
       Buffer var4 = new Buffer(var1);
@@ -381,8 +373,8 @@ public class ModelData extends Entity {
       Buffer var7 = new Buffer(var1);
       Buffer var8 = new Buffer(var1);
       var2.index = var1.length - 23;
-      int var9 = var2.__ag_302();
-      int var10 = var2.__ag_302();
+      int var9 = var2.method43();
+      int var10 = var2.method43();
       int var11 = var2.readUnsignedByte();
       int var12 = var2.readUnsignedByte();
       int var13 = var2.readUnsignedByte();
@@ -390,295 +382,295 @@ public class ModelData extends Entity {
       int var15 = var2.readUnsignedByte();
       int var16 = var2.readUnsignedByte();
       int var17 = var2.readUnsignedByte();
-      int var18 = var2.__ag_302();
-      int var19 = var2.__ag_302();
-      int var20 = var2.__ag_302();
-      int var21 = var2.__ag_302();
-      int var22 = var2.__ag_302();
+      int var18 = var2.method43();
+      int var19 = var2.method43();
+      int var20 = var2.method43();
+      int var21 = var2.method43();
+      int var22 = var2.method43();
       int var23 = 0;
       int var24 = 0;
       int var25 = 0;
       int var26;
-      if(var11 > 0) {
+      if (var11 > 0) {
          this.textureRenderTypes = new byte[var11];
          var2.index = 0;
 
-         for(var26 = 0; var26 < var11; ++var26) {
+         for (var26 = 0; var26 < var11; ++var26) {
             byte var27 = this.textureRenderTypes[var26] = var2.readByte();
-            if(var27 == 0) {
+            if (var27 == 0) {
                ++var23;
             }
 
-            if(var27 >= 1 && var27 <= 3) {
+            if (var27 >= 1 && var27 <= 3) {
                ++var24;
             }
 
-            if(var27 == 2) {
+            if (var27 == 2) {
                ++var25;
             }
          }
       }
 
       var26 = var11 + var9;
-      int var28 = var26;
-      if(var12 == 1) {
+      int var56 = var26;
+      if (var12 == 1) {
          var26 += var10;
       }
 
-      int var29 = var26;
+      int var28 = var26;
       var26 += var10;
+      int var29 = var26;
+      if (var13 == 255) {
+         var26 += var10;
+      }
+
       int var30 = var26;
-      if(var13 == 255) {
+      if (var15 == 1) {
          var26 += var10;
       }
 
       int var31 = var26;
-      if(var15 == 1) {
-         var26 += var10;
-      }
-
-      int var32 = var26;
-      if(var17 == 1) {
+      if (var17 == 1) {
          var26 += var9;
       }
 
-      int var33 = var26;
-      if(var14 == 1) {
+      int var32 = var26;
+      if (var14 == 1) {
          var26 += var10;
       }
 
-      int var34 = var26;
+      int var33 = var26;
       var26 += var21;
-      int var35 = var26;
-      if(var16 == 1) {
+      int var34 = var26;
+      if (var16 == 1) {
          var26 += var10 * 2;
       }
 
-      int var36 = var26;
+      int var35 = var26;
       var26 += var22;
-      int var37 = var26;
+      int var36 = var26;
       var26 += var10 * 2;
-      int var38 = var26;
+      int var37 = var26;
       var26 += var18;
-      int var39 = var26;
+      int var38 = var26;
       var26 += var19;
-      int var40 = var26;
+      int var39 = var26;
       var26 += var20;
-      int var41 = var26;
+      int var40 = var26;
       var26 += var23 * 6;
+      int var41 = var26;
+      var26 += var24 * 6;
       int var42 = var26;
       var26 += var24 * 6;
       int var43 = var26;
-      var26 += var24 * 6;
-      int var44 = var26;
       var26 += var24 * 2;
-      int var45 = var26;
+      int var44 = var26;
       var26 += var24;
-      int var46 = var26;
+      int var45 = var26;
       var26 += var24 * 2 + var25 * 2;
       this.verticesCount = var9;
       this.faceCount = var10;
-      this.__z = var11;
+      this.field554 = var11;
       this.verticesX = new int[var9];
       this.verticesY = new int[var9];
       this.verticesZ = new int[var9];
       this.indices1 = new int[var10];
       this.indices2 = new int[var10];
       this.indices3 = new int[var10];
-      if(var17 == 1) {
-         this.__h = new int[var9];
+      if (var17 == 1) {
+         this.field555 = new int[var9];
       }
 
-      if(var12 == 1) {
-         this.__e = new byte[var10];
+      if (var12 == 1) {
+         this.field551 = new byte[var10];
       }
 
-      if(var13 == 255) {
-         this.__x = new byte[var10];
+      if (var13 == 255) {
+         this.field552 = new byte[var10];
       } else {
-         this.__a = (byte)var13;
+         this.field553 = (byte)var13;
       }
 
-      if(var14 == 1) {
+      if (var14 == 1) {
          this.faceAlphas = new byte[var10];
       }
 
-      if(var15 == 1) {
-         this.__b = new int[var10];
+      if (var15 == 1) {
+         this.field556 = new int[var10];
       }
 
-      if(var16 == 1) {
+      if (var16 == 1) {
          this.faceTextures = new short[var10];
       }
 
-      if(var16 == 1 && var11 > 0) {
+      if (var16 == 1 && var11 > 0) {
          this.textureCoords = new byte[var10];
       }
 
       this.faceColors = new short[var10];
-      if(var11 > 0) {
+      if (var11 > 0) {
          this.texTriangleX = new short[var11];
          this.texTriangleY = new short[var11];
          this.texTriangleZ = new short[var11];
       }
 
       var2.index = var11;
-      var3.index = var38;
-      var4.index = var39;
-      var5.index = var40;
-      var6.index = var32;
+      var3.index = var37;
+      var4.index = var38;
+      var5.index = var39;
+      var6.index = var31;
+      int var46 = 0;
+      int var47 = 0;
       int var48 = 0;
-      int var49 = 0;
-      int var50 = 0;
 
+      int var49;
+      int var50;
       int var51;
       int var52;
       int var53;
-      int var54;
-      int var55;
-      for(var51 = 0; var51 < var9; ++var51) {
-         var52 = var2.readUnsignedByte();
+      for (var49 = 0; var49 < var9; ++var49) {
+         var50 = var2.readUnsignedByte();
+         var51 = 0;
+         if ((var50 & 1) != 0) {
+            var51 = var3.method47();
+         }
+
+         var52 = 0;
+         if ((var50 & 2) != 0) {
+            var52 = var4.method47();
+         }
+
          var53 = 0;
-         if((var52 & 1) != 0) {
-            var53 = var3.__ab_306();
+         if ((var50 & 4) != 0) {
+            var53 = var5.method47();
          }
 
-         var54 = 0;
-         if((var52 & 2) != 0) {
-            var54 = var4.__ab_306();
-         }
-
-         var55 = 0;
-         if((var52 & 4) != 0) {
-            var55 = var5.__ab_306();
-         }
-
-         this.verticesX[var51] = var48 + var53;
-         this.verticesY[var51] = var49 + var54;
-         this.verticesZ[var51] = var50 + var55;
-         var48 = this.verticesX[var51];
-         var49 = this.verticesY[var51];
-         var50 = this.verticesZ[var51];
-         if(var17 == 1) {
-            this.__h[var51] = var6.readUnsignedByte();
+         this.verticesX[var49] = var46 + var51;
+         this.verticesY[var49] = var47 + var52;
+         this.verticesZ[var49] = var48 + var53;
+         var46 = this.verticesX[var49];
+         var47 = this.verticesY[var49];
+         var48 = this.verticesZ[var49];
+         if (var17 == 1) {
+            this.field555[var49] = var6.readUnsignedByte();
          }
       }
 
-      var2.index = var37;
+      var2.index = var36;
+      var3.index = var56;
+      var4.index = var29;
+      var5.index = var32;
+      var6.index = var30;
+      var7.index = var34;
+      var8.index = var35;
+
+      for (var49 = 0; var49 < var10; ++var49) {
+         this.faceColors[var49] = (short)var2.method43();
+         if (var12 == 1) {
+            this.field551[var49] = var3.readByte();
+         }
+
+         if (var13 == 255) {
+            this.field552[var49] = var4.readByte();
+         }
+
+         if (var14 == 1) {
+            this.faceAlphas[var49] = var5.readByte();
+         }
+
+         if (var15 == 1) {
+            this.field556[var49] = var6.readUnsignedByte();
+         }
+
+         if (var16 == 1) {
+            this.faceTextures[var49] = (short)(var7.method43() - 1);
+         }
+
+         if (this.textureCoords != null && this.faceTextures[var49] != -1) {
+            this.textureCoords[var49] = (byte)(var8.readUnsignedByte() - 1);
+         }
+      }
+
+      var2.index = var33;
       var3.index = var28;
-      var4.index = var30;
-      var5.index = var33;
-      var6.index = var31;
-      var7.index = var35;
-      var8.index = var36;
-
-      for(var51 = 0; var51 < var10; ++var51) {
-         this.faceColors[var51] = (short)var2.__ag_302();
-         if(var12 == 1) {
-            this.__e[var51] = var3.readByte();
-         }
-
-         if(var13 == 255) {
-            this.__x[var51] = var4.readByte();
-         }
-
-         if(var14 == 1) {
-            this.faceAlphas[var51] = var5.readByte();
-         }
-
-         if(var15 == 1) {
-            this.__b[var51] = var6.readUnsignedByte();
-         }
-
-         if(var16 == 1) {
-            this.faceTextures[var51] = (short)(var7.__ag_302() - 1);
-         }
-
-         if(this.textureCoords != null && this.faceTextures[var51] != -1) {
-            this.textureCoords[var51] = (byte)(var8.readUnsignedByte() - 1);
-         }
-      }
-
-      var2.index = var34;
-      var3.index = var29;
+      var49 = 0;
+      var50 = 0;
       var51 = 0;
       var52 = 0;
-      var53 = 0;
-      var54 = 0;
 
-      int var56;
-      for(var55 = 0; var55 < var10; ++var55) {
-         var56 = var3.readUnsignedByte();
-         if(var56 == 1) {
-            var51 = var2.__ab_306() + var54;
-            var52 = var2.__ab_306() + var51;
-            var53 = var2.__ab_306() + var52;
-            var54 = var53;
-            this.indices1[var55] = var51;
-            this.indices2[var55] = var52;
-            this.indices3[var55] = var53;
+      int var54;
+      for (var53 = 0; var53 < var10; ++var53) {
+         var54 = var3.readUnsignedByte();
+         if (var54 == 1) {
+            var49 = var2.method47() + var52;
+            var50 = var2.method47() + var49;
+            var51 = var2.method47() + var50;
+            var52 = var51;
+            this.indices1[var53] = var49;
+            this.indices2[var53] = var50;
+            this.indices3[var53] = var51;
          }
 
-         if(var56 == 2) {
-            var52 = var53;
-            var53 = var2.__ab_306() + var54;
-            var54 = var53;
-            this.indices1[var55] = var51;
-            this.indices2[var55] = var52;
-            this.indices3[var55] = var53;
+         if (var54 == 2) {
+            var50 = var51;
+            var51 = var2.method47() + var52;
+            var52 = var51;
+            this.indices1[var53] = var49;
+            this.indices2[var53] = var50;
+            this.indices3[var53] = var51;
          }
 
-         if(var56 == 3) {
-            var51 = var53;
-            var53 = var2.__ab_306() + var54;
-            var54 = var53;
-            this.indices1[var55] = var51;
-            this.indices2[var55] = var52;
-            this.indices3[var55] = var53;
+         if (var54 == 3) {
+            var49 = var51;
+            var51 = var2.method47() + var52;
+            var52 = var51;
+            this.indices1[var53] = var49;
+            this.indices2[var53] = var50;
+            this.indices3[var53] = var51;
          }
 
-         if(var56 == 4) {
-            int var57 = var51;
-            var51 = var52;
-            var52 = var57;
-            var53 = var2.__ab_306() + var54;
-            var54 = var53;
-            this.indices1[var55] = var51;
-            this.indices2[var55] = var57;
-            this.indices3[var55] = var53;
+         if (var54 == 4) {
+            int var55 = var49;
+            var49 = var50;
+            var50 = var55;
+            var51 = var2.method47() + var52;
+            var52 = var51;
+            this.indices1[var53] = var49;
+            this.indices2[var53] = var55;
+            this.indices3[var53] = var51;
          }
       }
 
-      var2.index = var41;
-      var3.index = var42;
-      var4.index = var43;
-      var5.index = var44;
-      var6.index = var45;
-      var7.index = var46;
+      var2.index = var40;
+      var3.index = var41;
+      var4.index = var42;
+      var5.index = var43;
+      var6.index = var44;
+      var7.index = var45;
 
-      for(var55 = 0; var55 < var11; ++var55) {
-         var56 = this.textureRenderTypes[var55] & 255;
-         if(var56 == 0) {
-            this.texTriangleX[var55] = (short)var2.__ag_302();
-            this.texTriangleY[var55] = (short)var2.__ag_302();
-            this.texTriangleZ[var55] = (short)var2.__ag_302();
+      for (var53 = 0; var53 < var11; ++var53) {
+         var54 = this.textureRenderTypes[var53] & 255;
+         if (var54 == 0) {
+            this.texTriangleX[var53] = (short)var2.method43();
+            this.texTriangleY[var53] = (short)var2.method43();
+            this.texTriangleZ[var53] = (short)var2.method43();
          }
       }
 
       var2.index = var26;
-      var55 = var2.readUnsignedByte();
-      if(var55 != 0) {
+      var53 = var2.readUnsignedByte();
+      if (var53 != 0) {
          new ModelData0();
-         var2.__ag_302();
-         var2.__ag_302();
-         var2.__ag_302();
+         var2.method43();
+         var2.method43();
+         var2.method43();
          var2.readInt();
       }
 
    }
 
    @ObfuscatedName("q")
-   void __q_216(byte[] var1) {
+   void method204(byte[] var1) {
       boolean var2 = false;
       boolean var3 = false;
       Buffer var4 = new Buffer(var1);
@@ -687,103 +679,103 @@ public class ModelData extends Entity {
       Buffer var7 = new Buffer(var1);
       Buffer var8 = new Buffer(var1);
       var4.index = var1.length - 18;
-      int var9 = var4.__ag_302();
-      int var10 = var4.__ag_302();
+      int var9 = var4.method43();
+      int var10 = var4.method43();
       int var11 = var4.readUnsignedByte();
       int var12 = var4.readUnsignedByte();
       int var13 = var4.readUnsignedByte();
       int var14 = var4.readUnsignedByte();
       int var15 = var4.readUnsignedByte();
       int var16 = var4.readUnsignedByte();
-      int var17 = var4.__ag_302();
-      int var18 = var4.__ag_302();
-      int var19 = var4.__ag_302();
-      int var20 = var4.__ag_302();
+      int var17 = var4.method43();
+      int var18 = var4.method43();
+      int var19 = var4.method43();
+      int var20 = var4.method43();
       byte var21 = 0;
-      int var45 = var21 + var9;
-      int var23 = var45;
-      var45 += var10;
-      int var24 = var45;
-      if(var13 == 255) {
-         var45 += var10;
+      int var22 = var21 + var9;
+      int var23 = var22;
+      var22 += var10;
+      int var24 = var22;
+      if (var13 == 255) {
+         var22 += var10;
       }
 
-      int var25 = var45;
-      if(var15 == 1) {
-         var45 += var10;
+      int var25 = var22;
+      if (var15 == 1) {
+         var22 += var10;
       }
 
-      int var26 = var45;
-      if(var12 == 1) {
-         var45 += var10;
+      int var26 = var22;
+      if (var12 == 1) {
+         var22 += var10;
       }
 
-      int var27 = var45;
-      if(var16 == 1) {
-         var45 += var9;
+      int var27 = var22;
+      if (var16 == 1) {
+         var22 += var9;
       }
 
-      int var28 = var45;
-      if(var14 == 1) {
-         var45 += var10;
+      int var28 = var22;
+      if (var14 == 1) {
+         var22 += var10;
       }
 
-      int var29 = var45;
-      var45 += var20;
-      int var30 = var45;
-      var45 += var10 * 2;
-      int var31 = var45;
-      var45 += var11 * 6;
-      int var32 = var45;
-      var45 += var17;
-      int var33 = var45;
-      var45 += var18;
-      int var10000 = var45 + var19;
+      int var29 = var22;
+      var22 += var20;
+      int var30 = var22;
+      var22 += var10 * 2;
+      int var31 = var22;
+      var22 += var11 * 6;
+      int var32 = var22;
+      var22 += var17;
+      int var33 = var22;
+      var22 += var18;
+      int var10000 = var22 + var19;
       this.verticesCount = var9;
       this.faceCount = var10;
-      this.__z = var11;
+      this.field554 = var11;
       this.verticesX = new int[var9];
       this.verticesY = new int[var9];
       this.verticesZ = new int[var9];
       this.indices1 = new int[var10];
       this.indices2 = new int[var10];
       this.indices3 = new int[var10];
-      if(var11 > 0) {
+      if (var11 > 0) {
          this.textureRenderTypes = new byte[var11];
          this.texTriangleX = new short[var11];
          this.texTriangleY = new short[var11];
          this.texTriangleZ = new short[var11];
       }
 
-      if(var16 == 1) {
-         this.__h = new int[var9];
+      if (var16 == 1) {
+         this.field555 = new int[var9];
       }
 
-      if(var12 == 1) {
-         this.__e = new byte[var10];
+      if (var12 == 1) {
+         this.field551 = new byte[var10];
          this.textureCoords = new byte[var10];
          this.faceTextures = new short[var10];
       }
 
-      if(var13 == 255) {
-         this.__x = new byte[var10];
+      if (var13 == 255) {
+         this.field552 = new byte[var10];
       } else {
-         this.__a = (byte)var13;
+         this.field553 = (byte)var13;
       }
 
-      if(var14 == 1) {
+      if (var14 == 1) {
          this.faceAlphas = new byte[var10];
       }
 
-      if(var15 == 1) {
-         this.__b = new int[var10];
+      if (var15 == 1) {
+         this.field556 = new int[var10];
       }
 
       this.faceColors = new short[var10];
       var4.index = var21;
       var5.index = var32;
       var6.index = var33;
-      var7.index = var45;
+      var7.index = var22;
       var8.index = var27;
       int var35 = 0;
       int var36 = 0;
@@ -794,21 +786,21 @@ public class ModelData extends Entity {
       int var40;
       int var41;
       int var42;
-      for(var38 = 0; var38 < var9; ++var38) {
+      for (var38 = 0; var38 < var9; ++var38) {
          var39 = var4.readUnsignedByte();
          var40 = 0;
-         if((var39 & 1) != 0) {
-            var40 = var5.__ab_306();
+         if ((var39 & 1) != 0) {
+            var40 = var5.method47();
          }
 
          var41 = 0;
-         if((var39 & 2) != 0) {
-            var41 = var6.__ab_306();
+         if ((var39 & 2) != 0) {
+            var41 = var6.method47();
          }
 
          var42 = 0;
-         if((var39 & 4) != 0) {
-            var42 = var7.__ab_306();
+         if ((var39 & 4) != 0) {
+            var42 = var7.method47();
          }
 
          this.verticesX[var38] = var35 + var40;
@@ -817,8 +809,8 @@ public class ModelData extends Entity {
          var35 = this.verticesX[var38];
          var36 = this.verticesY[var38];
          var37 = this.verticesZ[var38];
-         if(var16 == 1) {
-            this.__h[var38] = var8.readUnsignedByte();
+         if (var16 == 1) {
+            this.field555[var38] = var8.readUnsignedByte();
          }
       }
 
@@ -828,22 +820,22 @@ public class ModelData extends Entity {
       var7.index = var28;
       var8.index = var25;
 
-      for(var38 = 0; var38 < var10; ++var38) {
-         this.faceColors[var38] = (short)var4.__ag_302();
-         if(var12 == 1) {
+      for (var38 = 0; var38 < var10; ++var38) {
+         this.faceColors[var38] = (short)var4.method43();
+         if (var12 == 1) {
             var39 = var5.readUnsignedByte();
-            if((var39 & 1) == 1) {
-               this.__e[var38] = 1;
+            if ((var39 & 1) == 1) {
+               this.field551[var38] = 1;
                var2 = true;
             } else {
-               this.__e[var38] = 0;
+               this.field551[var38] = 0;
             }
 
-            if((var39 & 2) == 2) {
+            if ((var39 & 2) == 2) {
                this.textureCoords[var38] = (byte)(var39 >> 2);
                this.faceTextures[var38] = this.faceColors[var38];
                this.faceColors[var38] = 127;
-               if(this.faceTextures[var38] != -1) {
+               if (this.faceTextures[var38] != -1) {
                   var3 = true;
                }
             } else {
@@ -852,16 +844,16 @@ public class ModelData extends Entity {
             }
          }
 
-         if(var13 == 255) {
-            this.__x[var38] = var6.readByte();
+         if (var13 == 255) {
+            this.field552[var38] = var6.readByte();
          }
 
-         if(var14 == 1) {
+         if (var14 == 1) {
             this.faceAlphas[var38] = var7.readByte();
          }
 
-         if(var15 == 1) {
-            this.__b[var38] = var8.readUnsignedByte();
+         if (var15 == 1) {
+            this.field556[var38] = var8.readUnsignedByte();
          }
       }
 
@@ -874,41 +866,41 @@ public class ModelData extends Entity {
 
       int var43;
       int var44;
-      for(var42 = 0; var42 < var10; ++var42) {
+      for (var42 = 0; var42 < var10; ++var42) {
          var43 = var5.readUnsignedByte();
-         if(var43 == 1) {
-            var38 = var4.__ab_306() + var41;
-            var39 = var4.__ab_306() + var38;
-            var40 = var4.__ab_306() + var39;
+         if (var43 == 1) {
+            var38 = var4.method47() + var41;
+            var39 = var4.method47() + var38;
+            var40 = var4.method47() + var39;
             var41 = var40;
             this.indices1[var42] = var38;
             this.indices2[var42] = var39;
             this.indices3[var42] = var40;
          }
 
-         if(var43 == 2) {
+         if (var43 == 2) {
             var39 = var40;
-            var40 = var4.__ab_306() + var41;
+            var40 = var4.method47() + var41;
             var41 = var40;
             this.indices1[var42] = var38;
             this.indices2[var42] = var39;
             this.indices3[var42] = var40;
          }
 
-         if(var43 == 3) {
+         if (var43 == 3) {
             var38 = var40;
-            var40 = var4.__ab_306() + var41;
+            var40 = var4.method47() + var41;
             var41 = var40;
             this.indices1[var42] = var38;
             this.indices2[var42] = var39;
             this.indices3[var42] = var40;
          }
 
-         if(var43 == 4) {
+         if (var43 == 4) {
             var44 = var38;
             var38 = var39;
             var39 = var44;
-            var40 = var4.__ab_306() + var41;
+            var40 = var4.method47() + var41;
             var41 = var40;
             this.indices1[var42] = var38;
             this.indices2[var42] = var44;
@@ -918,38 +910,38 @@ public class ModelData extends Entity {
 
       var4.index = var31;
 
-      for(var42 = 0; var42 < var11; ++var42) {
+      for (var42 = 0; var42 < var11; ++var42) {
          this.textureRenderTypes[var42] = 0;
-         this.texTriangleX[var42] = (short)var4.__ag_302();
-         this.texTriangleY[var42] = (short)var4.__ag_302();
-         this.texTriangleZ[var42] = (short)var4.__ag_302();
+         this.texTriangleX[var42] = (short)var4.method43();
+         this.texTriangleY[var42] = (short)var4.method43();
+         this.texTriangleZ[var42] = (short)var4.method43();
       }
 
-      if(this.textureCoords != null) {
-         boolean var46 = false;
+      if (this.textureCoords != null) {
+         boolean var45 = false;
 
-         for(var43 = 0; var43 < var10; ++var43) {
+         for (var43 = 0; var43 < var10; ++var43) {
             var44 = this.textureCoords[var43] & 255;
-            if(var44 != 255) {
-               if(this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) {
+            if (var44 != 255) {
+               if (this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) {
                   this.textureCoords[var43] = -1;
                } else {
-                  var46 = true;
+                  var45 = true;
                }
             }
          }
 
-         if(!var46) {
+         if (!var45) {
             this.textureCoords = null;
          }
       }
 
-      if(!var3) {
+      if (!var3) {
          this.faceTextures = null;
       }
 
-      if(!var2) {
-         this.__e = null;
+      if (!var2) {
+         this.field551 = null;
       }
 
    }
@@ -958,25 +950,25 @@ public class ModelData extends Entity {
    @ObfuscatedSignature(
       signature = "(Ldw;I)I"
    )
-   final int __w_217(ModelData var1, int var2) {
+   final int method205(ModelData var1, int var2) {
       int var3 = -1;
       int var4 = var1.verticesX[var2];
       int var5 = var1.verticesY[var2];
       int var6 = var1.verticesZ[var2];
 
-      for(int var7 = 0; var7 < this.verticesCount; ++var7) {
-         if(var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) {
+      for (int var7 = 0; var7 < this.verticesCount; ++var7) {
+         if (var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) {
             var3 = var7;
             break;
          }
       }
 
-      if(var3 == -1) {
+      if (var3 == -1) {
          this.verticesX[this.verticesCount] = var4;
          this.verticesY[this.verticesCount] = var5;
          this.verticesZ[this.verticesCount] = var6;
-         if(var1.__h != null) {
-            this.__h[this.verticesCount] = var1.__h[var2];
+         if (var1.field555 != null) {
+            this.field555[this.verticesCount] = var1.field555[var2];
          }
 
          var3 = this.verticesCount++;
@@ -989,43 +981,43 @@ public class ModelData extends Entity {
    @ObfuscatedSignature(
       signature = "()Ldw;"
    )
-   public ModelData __o_218() {
+   public ModelData method206() {
       ModelData var1 = new ModelData();
-      if(this.__e != null) {
-         var1.__e = new byte[this.faceCount];
+      if (this.field551 != null) {
+         var1.field551 = new byte[this.faceCount];
 
-         for(int var2 = 0; var2 < this.faceCount; ++var2) {
-            var1.__e[var2] = this.__e[var2];
+         for (int var2 = 0; var2 < this.faceCount; ++var2) {
+            var1.field551[var2] = this.field551[var2];
          }
       }
 
       var1.verticesCount = this.verticesCount;
       var1.faceCount = this.faceCount;
-      var1.__z = this.__z;
+      var1.field554 = this.field554;
       var1.verticesX = this.verticesX;
       var1.verticesY = this.verticesY;
       var1.verticesZ = this.verticesZ;
       var1.indices1 = this.indices1;
       var1.indices2 = this.indices2;
       var1.indices3 = this.indices3;
-      var1.__x = this.__x;
+      var1.field552 = this.field552;
       var1.faceAlphas = this.faceAlphas;
       var1.textureCoords = this.textureCoords;
       var1.faceColors = this.faceColors;
       var1.faceTextures = this.faceTextures;
-      var1.__a = this.__a;
+      var1.field553 = this.field553;
       var1.textureRenderTypes = this.textureRenderTypes;
       var1.texTriangleX = this.texTriangleX;
       var1.texTriangleY = this.texTriangleY;
       var1.texTriangleZ = this.texTriangleZ;
-      var1.__h = this.__h;
-      var1.__b = this.__b;
+      var1.field555 = this.field555;
+      var1.field556 = this.field556;
       var1.vertexLabels = this.vertexLabels;
       var1.faceLabelsAlpha = this.faceLabelsAlpha;
-      var1.__v = this.__v;
+      var1.field557 = this.field557;
       var1.faceNormals = this.faceNormals;
-      var1.__aq = this.__aq;
-      var1.__aj = this.__aj;
+      var1.field559 = this.field559;
+      var1.field560 = this.field560;
       return var1;
    }
 
@@ -1033,46 +1025,46 @@ public class ModelData extends Entity {
    @ObfuscatedSignature(
       signature = "([[IIIIZI)Ldw;"
    )
-   public ModelData __u_219(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
-      this.__c_229();
-      int var7 = var2 + this.__ac;
-      int var8 = var2 + this.__ay;
-      int var9 = var4 + this.__ak;
-      int var10 = var4 + this.__ah;
-      if(var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) {
+   public ModelData method207(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
+      this.method217();
+      int var7 = var2 + this.field562;
+      int var8 = var2 + this.field563;
+      int var9 = var4 + this.field565;
+      int var10 = var4 + this.field564;
+      if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) {
          var7 >>= 7;
          var8 = var8 + 127 >> 7;
          var9 >>= 7;
          var10 = var10 + 127 >> 7;
-         if(var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) {
+         if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) {
             return this;
          } else {
             ModelData var11 = new ModelData();
             var11.verticesCount = this.verticesCount;
             var11.faceCount = this.faceCount;
-            var11.__z = this.__z;
+            var11.field554 = this.field554;
             var11.verticesX = this.verticesX;
             var11.verticesZ = this.verticesZ;
             var11.indices1 = this.indices1;
             var11.indices2 = this.indices2;
             var11.indices3 = this.indices3;
-            var11.__e = this.__e;
-            var11.__x = this.__x;
+            var11.field551 = this.field551;
+            var11.field552 = this.field552;
             var11.faceAlphas = this.faceAlphas;
             var11.textureCoords = this.textureCoords;
             var11.faceColors = this.faceColors;
             var11.faceTextures = this.faceTextures;
-            var11.__a = this.__a;
+            var11.field553 = this.field553;
             var11.textureRenderTypes = this.textureRenderTypes;
             var11.texTriangleX = this.texTriangleX;
             var11.texTriangleY = this.texTriangleY;
             var11.texTriangleZ = this.texTriangleZ;
-            var11.__h = this.__h;
-            var11.__b = this.__b;
+            var11.field555 = this.field555;
+            var11.field556 = this.field556;
             var11.vertexLabels = this.vertexLabels;
             var11.faceLabelsAlpha = this.faceLabelsAlpha;
-            var11.__aq = this.__aq;
-            var11.__aj = this.__aj;
+            var11.field559 = this.field559;
+            var11.field560 = this.field560;
             var11.verticesY = new int[var11.verticesCount];
             int var12;
             int var13;
@@ -1084,8 +1076,8 @@ public class ModelData extends Entity {
             int var19;
             int var20;
             int var21;
-            if(var6 == 0) {
-               for(var12 = 0; var12 < var11.verticesCount; ++var12) {
+            if (var6 == 0) {
+               for (var12 = 0; var12 < var11.verticesCount; ++var12) {
                   var13 = var2 + this.verticesX[var12];
                   var14 = var4 + this.verticesZ[var12];
                   var15 = var13 & 127;
@@ -1098,9 +1090,9 @@ public class ModelData extends Entity {
                   var11.verticesY[var12] = var21 + this.verticesY[var12] - var3;
                }
             } else {
-               for(var12 = 0; var12 < var11.verticesCount; ++var12) {
+               for (var12 = 0; var12 < var11.verticesCount; ++var12) {
                   var13 = (-this.verticesY[var12] << 16) / super.height;
-                  if(var13 < var6) {
+                  if (var13 < var6) {
                      var14 = var2 + this.verticesX[var12];
                      var15 = var4 + this.verticesZ[var12];
                      var16 = var14 & 127;
@@ -1124,68 +1116,69 @@ public class ModelData extends Entity {
    }
 
    @ObfuscatedName("g")
-   void __g_220() {
+   void method208() {
       int[] var1;
       int var2;
+      int var10002;
       int var3;
       int var4;
-      if(this.__h != null) {
+      if (this.field555 != null) {
          var1 = new int[256];
          var2 = 0;
 
-         for(var3 = 0; var3 < this.verticesCount; ++var3) {
-            var4 = this.__h[var3];
-            ++var1[var4];
-            if(var4 > var2) {
+         for (var3 = 0; var3 < this.verticesCount; ++var3) {
+            var4 = this.field555[var3];
+            var10002 = var1[var4]++;
+            if (var4 > var2) {
                var2 = var4;
             }
          }
 
          this.vertexLabels = new int[var2 + 1][];
 
-         for(var3 = 0; var3 <= var2; ++var3) {
+         for (var3 = 0; var3 <= var2; ++var3) {
             this.vertexLabels[var3] = new int[var1[var3]];
             var1[var3] = 0;
          }
 
-         for(var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) {
-            var4 = this.__h[var3];
+         for (var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) {
+            var4 = this.field555[var3];
          }
 
-         this.__h = null;
+         this.field555 = null;
       }
 
-      if(this.__b != null) {
+      if (this.field556 != null) {
          var1 = new int[256];
          var2 = 0;
 
-         for(var3 = 0; var3 < this.faceCount; ++var3) {
-            var4 = this.__b[var3];
-            ++var1[var4];
-            if(var4 > var2) {
+         for (var3 = 0; var3 < this.faceCount; ++var3) {
+            var4 = this.field556[var3];
+            var10002 = var1[var4]++;
+            if (var4 > var2) {
                var2 = var4;
             }
          }
 
          this.faceLabelsAlpha = new int[var2 + 1][];
 
-         for(var3 = 0; var3 <= var2; ++var3) {
+         for (var3 = 0; var3 <= var2; ++var3) {
             this.faceLabelsAlpha[var3] = new int[var1[var3]];
             var1[var3] = 0;
          }
 
-         for(var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) {
-            var4 = this.__b[var3];
+         for (var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) {
+            var4 = this.field556[var3];
          }
 
-         this.__b = null;
+         this.field556 = null;
       }
 
    }
 
    @ObfuscatedName("l")
-   public void __l_221() {
-      for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+   public void method209() {
+      for (int var1 = 0; var1 < this.verticesCount; ++var1) {
          int var2 = this.verticesX[var1];
          this.verticesX[var1] = this.verticesZ[var1];
          this.verticesZ[var1] = -var2;
@@ -1195,8 +1188,8 @@ public class ModelData extends Entity {
    }
 
    @ObfuscatedName("x")
-   public void __x_222() {
-      for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+   public void method210() {
+      for (int var1 = 0; var1 < this.verticesCount; ++var1) {
          this.verticesX[var1] = -this.verticesX[var1];
          this.verticesZ[var1] = -this.verticesZ[var1];
       }
@@ -1205,8 +1198,8 @@ public class ModelData extends Entity {
    }
 
    @ObfuscatedName("d")
-   public void __d_223() {
-      for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+   public void method211() {
+      for (int var1 = 0; var1 < this.verticesCount; ++var1) {
          int var2 = this.verticesZ[var1];
          this.verticesZ[var1] = this.verticesX[var1];
          this.verticesX[var1] = -var2;
@@ -1216,11 +1209,11 @@ public class ModelData extends Entity {
    }
 
    @ObfuscatedName("a")
-   public void __a_224(int var1) {
+   public void method212(int var1) {
       int var2 = ModelData_sine[var1];
       int var3 = ModelData_cosine[var1];
 
-      for(int var4 = 0; var4 < this.verticesCount; ++var4) {
+      for (int var4 = 0; var4 < this.verticesCount; ++var4) {
          int var5 = var2 * this.verticesZ[var4] + var3 * this.verticesX[var4] >> 16;
          this.verticesZ[var4] = var3 * this.verticesZ[var4] - var2 * this.verticesX[var4] >> 16;
          this.verticesX[var4] = var5;
@@ -1230,11 +1223,14 @@ public class ModelData extends Entity {
    }
 
    @ObfuscatedName("z")
-   public void __z_225(int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < this.verticesCount; ++var4) {
-         this.verticesX[var4] += var1;
-         this.verticesY[var4] += var2;
-         this.verticesZ[var4] += var3;
+   public void method213(int var1, int var2, int var3) {
+      for (int var4 = 0; var4 < this.verticesCount; ++var4) {
+         int[] var10000 = this.verticesX;
+         var10000[var4] += var1;
+         var10000 = this.verticesY;
+         var10000[var4] += var2;
+         var10000 = this.verticesZ;
+         var10000[var4] += var3;
       }
 
       this.invalidate();
@@ -1243,8 +1239,8 @@ public class ModelData extends Entity {
    @ObfuscatedName("j")
    @Export("recolor")
    public void recolor(short var1, short var2) {
-      for(int var3 = 0; var3 < this.faceCount; ++var3) {
-         if(this.faceColors[var3] == var1) {
+      for (int var3 = 0; var3 < this.faceCount; ++var3) {
+         if (this.faceColors[var3] == var1) {
             this.faceColors[var3] = var2;
          }
       }
@@ -1254,24 +1250,24 @@ public class ModelData extends Entity {
    @ObfuscatedName("s")
    @Export("retexture")
    public void retexture(short var1, short var2) {
-      if(this.faceTextures != null) {
-         for(int var3 = 0; var3 < this.faceCount; ++var3) {
-            if(this.faceTextures[var3] == var1) {
+      if (this.faceTextures != null) {
+         for (int var3 = 0; var3 < this.faceCount; ++var3) {
+            if (this.faceTextures[var3] == var1) {
                this.faceTextures[var3] = var2;
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("t")
-   public void __t_226() {
+   public void method214() {
       int var1;
-      for(var1 = 0; var1 < this.verticesCount; ++var1) {
+      for (var1 = 0; var1 < this.verticesCount; ++var1) {
          this.verticesZ[var1] = -this.verticesZ[var1];
       }
 
-      for(var1 = 0; var1 < this.faceCount; ++var1) {
+      for (var1 = 0; var1 < this.faceCount; ++var1) {
          int var2 = this.indices1[var1];
          this.indices1[var1] = this.indices3[var1];
          this.indices3[var1] = var2;
@@ -1281,8 +1277,8 @@ public class ModelData extends Entity {
    }
 
    @ObfuscatedName("y")
-   public void __y_227(int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < this.verticesCount; ++var4) {
+   public void method215(int var1, int var2, int var3) {
+      for (int var4 = 0; var4 < this.verticesCount; ++var4) {
          this.verticesX[var4] = this.verticesX[var4] * var1 / 128;
          this.verticesY[var4] = var2 * this.verticesY[var4] / 128;
          this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128;
@@ -1292,16 +1288,16 @@ public class ModelData extends Entity {
    }
 
    @ObfuscatedName("h")
-   public void __h_228() {
-      if(this.__v == null) {
-         this.__v = new VertexNormal[this.verticesCount];
+   public void method216() {
+      if (this.field557 == null) {
+         this.field557 = new VertexNormal[this.verticesCount];
 
          int var1;
-         for(var1 = 0; var1 < this.verticesCount; ++var1) {
-            this.__v[var1] = new VertexNormal();
+         for (var1 = 0; var1 < this.verticesCount; ++var1) {
+            this.field557[var1] = new VertexNormal();
          }
 
-         for(var1 = 0; var1 < this.faceCount; ++var1) {
+         for (var1 = 0; var1 < this.faceCount; ++var1) {
             int var2 = this.indices1[var1];
             int var3 = this.indices2[var1];
             int var4 = this.indices3[var1];
@@ -1315,13 +1311,13 @@ public class ModelData extends Entity {
             int var12 = var7 * var8 - var10 * var5;
 
             int var13;
-            for(var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) {
+            for (var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) {
                var11 >>= 1;
                var12 >>= 1;
             }
 
             int var14 = (int)Math.sqrt((double)(var11 * var11 + var12 * var12 + var13 * var13));
-            if(var14 <= 0) {
+            if (var14 <= 0) {
                var14 = 1;
             }
 
@@ -1329,93 +1325,94 @@ public class ModelData extends Entity {
             var12 = var12 * 256 / var14;
             var13 = var13 * 256 / var14;
             byte var15;
-            if(this.__e == null) {
+            if (this.field551 == null) {
                var15 = 0;
             } else {
-               var15 = this.__e[var1];
+               var15 = this.field551[var1];
             }
 
-            if(var15 == 0) {
-               VertexNormal var16 = this.__v[var2];
-               var16.__m += var11;
-               var16.__f += var12;
-               var16.__q += var13;
-               ++var16.__w;
-               var16 = this.__v[var3];
-               var16.__m += var11;
-               var16.__f += var12;
-               var16.__q += var13;
-               ++var16.__w;
-               var16 = this.__v[var4];
-               var16.__m += var11;
-               var16.__f += var12;
-               var16.__q += var13;
-               ++var16.__w;
-            } else if(var15 == 1) {
-               if(this.faceNormals == null) {
+            if (var15 == 0) {
+               VertexNormal var16 = this.field557[var2];
+               var16.field947 += var11;
+               var16.field948 += var12;
+               var16.field949 += var13;
+               ++var16.field950;
+               var16 = this.field557[var3];
+               var16.field947 += var11;
+               var16.field948 += var12;
+               var16.field949 += var13;
+               ++var16.field950;
+               var16 = this.field557[var4];
+               var16.field947 += var11;
+               var16.field948 += var12;
+               var16.field949 += var13;
+               ++var16.field950;
+            } else if (var15 == 1) {
+               if (this.faceNormals == null) {
                   this.faceNormals = new FaceNormal[this.faceCount];
                }
 
                FaceNormal var17 = this.faceNormals[var1] = new FaceNormal();
-               var17.__m = var11;
-               var17.__f = var12;
-               var17.__q = var13;
+               var17.field346 = var11;
+               var17.field347 = var12;
+               var17.field348 = var13;
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("b")
    @Export("invalidate")
    void invalidate() {
-      this.__v = null;
-      this.__ag = null;
+      this.field557 = null;
+      this.field558 = null;
       this.faceNormals = null;
       this.isBoundsCalculated = false;
    }
 
    @ObfuscatedName("c")
-   void __c_229() {
-      if(!this.isBoundsCalculated) {
+   void method217() {
+      if (!this.isBoundsCalculated) {
          super.height = 0;
-         this.__ar = 0;
-         this.__ac = 999999;
-         this.__ay = -999999;
-         this.__ah = -99999;
-         this.__ak = 99999;
+         this.field561 = 0;
+         this.field562 = 999999;
+         this.field563 = -999999;
+         this.field564 = -99999;
+         this.field565 = 99999;
 
-         for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+         for (int var1 = 0; var1 < this.verticesCount; ++var1) {
             int var2 = this.verticesX[var1];
             int var3 = this.verticesY[var1];
             int var4 = this.verticesZ[var1];
-            if(var2 < this.__ac) {
-               this.__ac = var2;
+            if (var2 < this.field562) {
+               this.field562 = var2;
             }
 
-            if(var2 > this.__ay) {
-               this.__ay = var2;
+            if (var2 > this.field563) {
+               this.field563 = var2;
             }
 
-            if(var4 < this.__ak) {
-               this.__ak = var4;
+            if (var4 < this.field565) {
+               this.field565 = var4;
             }
 
-            if(var4 > this.__ah) {
-               this.__ah = var4;
+            if (var4 > this.field564) {
+               this.field564 = var4;
             }
 
-            if(-var3 > super.height) {
+            if (-var3 > super.height) {
                super.height = -var3;
             }
 
-            if(var3 > this.__ar) {
-               this.__ar = var3;
+            if (var3 > this.field561) {
+               this.field561 = var3;
             }
          }
 
          this.isBoundsCalculated = true;
       }
+
    }
 
    @ObfuscatedName("v")
@@ -1424,170 +1421,170 @@ public class ModelData extends Entity {
    )
    @Export("toModel")
    public final Model toModel(int var1, int var2, int var3, int var4, int var5) {
-      this.__h_228();
+      this.method216();
       int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3 + var4 * var4));
       int var7 = var6 * var2 >> 8;
       Model var8 = new Model();
       var8.faceColors1 = new int[this.faceCount];
       var8.faceColors2 = new int[this.faceCount];
       var8.faceColors3 = new int[this.faceCount];
-      if(this.__z > 0 && this.textureCoords != null) {
-         int[] var9 = new int[this.__z];
+      if (this.field554 > 0 && this.textureCoords != null) {
+         int[] var9 = new int[this.field554];
 
          int var10;
-         for(var10 = 0; var10 < this.faceCount; ++var10) {
-            if(this.textureCoords[var10] != -1) {
+         for (var10 = 0; var10 < this.faceCount; ++var10) {
+            if (this.textureCoords[var10] != -1) {
                ++var9[this.textureCoords[var10] & 255];
             }
          }
 
-         var8.__h = 0;
+         var8.field544 = 0;
 
-         for(var10 = 0; var10 < this.__z; ++var10) {
-            if(var9[var10] > 0 && this.textureRenderTypes[var10] == 0) {
-               ++var8.__h;
+         for (var10 = 0; var10 < this.field554; ++var10) {
+            if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) {
+               ++var8.field544;
             }
          }
 
-         var8.__b = new int[var8.__h];
-         var8.__c = new int[var8.__h];
-         var8.__r = new int[var8.__h];
+         var8.field545 = new int[var8.field544];
+         var8.field546 = new int[var8.field544];
+         var8.field547 = new int[var8.field544];
          var10 = 0;
 
          int var11;
-         for(var11 = 0; var11 < this.__z; ++var11) {
-            if(var9[var11] > 0 && this.textureRenderTypes[var11] == 0) {
-               var8.__b[var10] = this.texTriangleX[var11] & '\uffff';
-               var8.__c[var10] = this.texTriangleY[var11] & '\uffff';
-               var8.__r[var10] = this.texTriangleZ[var11] & '\uffff';
+         for (var11 = 0; var11 < this.field554; ++var11) {
+            if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) {
+               var8.field545[var10] = this.texTriangleX[var11] & '\uffff';
+               var8.field546[var10] = this.texTriangleY[var11] & '\uffff';
+               var8.field547[var10] = this.texTriangleZ[var11] & '\uffff';
                var9[var11] = var10++;
             } else {
                var9[var11] = -1;
             }
          }
 
-         var8.__s = new byte[this.faceCount];
+         var8.field542 = new byte[this.faceCount];
 
-         for(var11 = 0; var11 < this.faceCount; ++var11) {
-            if(this.textureCoords[var11] != -1) {
-               var8.__s[var11] = (byte)var9[this.textureCoords[var11] & 255];
+         for (var11 = 0; var11 < this.faceCount; ++var11) {
+            if (this.textureCoords[var11] != -1) {
+               var8.field542[var11] = (byte)var9[this.textureCoords[var11] & 255];
             } else {
-               var8.__s[var11] = -1;
+               var8.field542[var11] = -1;
             }
          }
       }
 
-      for(int var16 = 0; var16 < this.faceCount; ++var16) {
-         byte var17;
-         if(this.__e == null) {
-            var17 = 0;
-         } else {
-            var17 = this.__e[var16];
-         }
-
+      for (int var17 = 0; var17 < this.faceCount; ++var17) {
          byte var18;
-         if(this.faceAlphas == null) {
+         if (this.field551 == null) {
             var18 = 0;
          } else {
-            var18 = this.faceAlphas[var16];
+            var18 = this.field551[var17];
+         }
+
+         byte var19;
+         if (this.faceAlphas == null) {
+            var19 = 0;
+         } else {
+            var19 = this.faceAlphas[var17];
          }
 
          short var12;
-         if(this.faceTextures == null) {
+         if (this.faceTextures == null) {
             var12 = -1;
          } else {
-            var12 = this.faceTextures[var16];
+            var12 = this.faceTextures[var17];
          }
 
-         if(var18 == -2) {
-            var17 = 3;
+         if (var19 == -2) {
+            var18 = 3;
          }
 
-         if(var18 == -1) {
-            var17 = 2;
+         if (var19 == -1) {
+            var18 = 2;
          }
 
          VertexNormal var13;
          int var14;
-         FaceNormal var19;
-         if(var12 == -1) {
-            if(var17 != 0) {
-               if(var17 == 1) {
-                  var19 = this.faceNormals[var16];
-                  var14 = (var4 * var19.__f + var5 * var19.__q + var3 * var19.__m) / (var7 / 2 + var7) + var1;
-                  var8.faceColors1[var16] = method2802(this.faceColors[var16] & '\uffff', var14);
-                  var8.faceColors3[var16] = -1;
-               } else if(var17 == 3) {
-                  var8.faceColors1[var16] = 128;
-                  var8.faceColors3[var16] = -1;
+         FaceNormal var15;
+         if (var12 == -1) {
+            if (var18 != 0) {
+               if (var18 == 1) {
+                  var15 = this.faceNormals[var17];
+                  var14 = (var4 * var15.field347 + var5 * var15.field348 + var3 * var15.field346) / (var7 / 2 + var7) + var1;
+                  var8.faceColors1[var17] = method2802(this.faceColors[var17] & '\uffff', var14);
+                  var8.faceColors3[var17] = -1;
+               } else if (var18 == 3) {
+                  var8.faceColors1[var17] = 128;
+                  var8.faceColors3[var17] = -1;
                } else {
-                  var8.faceColors3[var16] = -2;
+                  var8.faceColors3[var17] = -2;
                }
             } else {
-               int var15 = this.faceColors[var16] & '\uffff';
-               if(this.__ag != null && this.__ag[this.indices1[var16]] != null) {
-                  var13 = this.__ag[this.indices1[var16]];
+               int var16 = this.faceColors[var17] & '\uffff';
+               if (this.field558 != null && this.field558[this.indices1[var17]] != null) {
+                  var13 = this.field558[this.indices1[var17]];
                } else {
-                  var13 = this.__v[this.indices1[var16]];
+                  var13 = this.field557[this.indices1[var17]];
                }
 
-               var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
-               var8.faceColors1[var16] = method2802(var15, var14);
-               if(this.__ag != null && this.__ag[this.indices2[var16]] != null) {
-                  var13 = this.__ag[this.indices2[var16]];
+               var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1;
+               var8.faceColors1[var17] = method2802(var16, var14);
+               if (this.field558 != null && this.field558[this.indices2[var17]] != null) {
+                  var13 = this.field558[this.indices2[var17]];
                } else {
-                  var13 = this.__v[this.indices2[var16]];
+                  var13 = this.field557[this.indices2[var17]];
                }
 
-               var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
-               var8.faceColors2[var16] = method2802(var15, var14);
-               if(this.__ag != null && this.__ag[this.indices3[var16]] != null) {
-                  var13 = this.__ag[this.indices3[var16]];
+               var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1;
+               var8.faceColors2[var17] = method2802(var16, var14);
+               if (this.field558 != null && this.field558[this.indices3[var17]] != null) {
+                  var13 = this.field558[this.indices3[var17]];
                } else {
-                  var13 = this.__v[this.indices3[var16]];
+                  var13 = this.field557[this.indices3[var17]];
                }
 
-               var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
-               var8.faceColors3[var16] = method2802(var15, var14);
+               var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1;
+               var8.faceColors3[var17] = method2802(var16, var14);
             }
-         } else if(var17 != 0) {
-            if(var17 == 1) {
-               var19 = this.faceNormals[var16];
-               var14 = (var4 * var19.__f + var5 * var19.__q + var3 * var19.__m) / (var7 / 2 + var7) + var1;
-               var8.faceColors1[var16] = method2803(var14);
-               var8.faceColors3[var16] = -1;
+         } else if (var18 != 0) {
+            if (var18 == 1) {
+               var15 = this.faceNormals[var17];
+               var14 = (var4 * var15.field347 + var5 * var15.field348 + var3 * var15.field346) / (var7 / 2 + var7) + var1;
+               var8.faceColors1[var17] = method2803(var14);
+               var8.faceColors3[var17] = -1;
             } else {
-               var8.faceColors3[var16] = -2;
+               var8.faceColors3[var17] = -2;
             }
          } else {
-            if(this.__ag != null && this.__ag[this.indices1[var16]] != null) {
-               var13 = this.__ag[this.indices1[var16]];
+            if (this.field558 != null && this.field558[this.indices1[var17]] != null) {
+               var13 = this.field558[this.indices1[var17]];
             } else {
-               var13 = this.__v[this.indices1[var16]];
+               var13 = this.field557[this.indices1[var17]];
             }
 
-            var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
-            var8.faceColors1[var16] = method2803(var14);
-            if(this.__ag != null && this.__ag[this.indices2[var16]] != null) {
-               var13 = this.__ag[this.indices2[var16]];
+            var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1;
+            var8.faceColors1[var17] = method2803(var14);
+            if (this.field558 != null && this.field558[this.indices2[var17]] != null) {
+               var13 = this.field558[this.indices2[var17]];
             } else {
-               var13 = this.__v[this.indices2[var16]];
+               var13 = this.field557[this.indices2[var17]];
             }
 
-            var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
-            var8.faceColors2[var16] = method2803(var14);
-            if(this.__ag != null && this.__ag[this.indices3[var16]] != null) {
-               var13 = this.__ag[this.indices3[var16]];
+            var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1;
+            var8.faceColors2[var17] = method2803(var14);
+            if (this.field558 != null && this.field558[this.indices3[var17]] != null) {
+               var13 = this.field558[this.indices3[var17]];
             } else {
-               var13 = this.__v[this.indices3[var16]];
+               var13 = this.field557[this.indices3[var17]];
             }
 
-            var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
-            var8.faceColors3[var16] = method2803(var14);
+            var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1;
+            var8.faceColors3[var17] = method2803(var14);
          }
       }
 
-      this.__g_220();
+      this.method208();
       var8.verticesCount = this.verticesCount;
       var8.verticesX = this.verticesX;
       var8.verticesY = this.verticesY;
@@ -1596,9 +1593,9 @@ public class ModelData extends Entity {
       var8.indices1 = this.indices1;
       var8.indices2 = this.indices2;
       var8.indices3 = this.indices3;
-      var8.faceRenderPriorities = this.__x;
+      var8.faceRenderPriorities = this.field552;
       var8.faceAlphas = this.faceAlphas;
-      var8.__y = this.__a;
+      var8.field543 = this.field553;
       var8.vertexLabels = this.vertexLabels;
       var8.faceLabelsAlpha = this.faceLabelsAlpha;
       var8.faceTextures = this.faceTextures;
@@ -1611,7 +1608,7 @@ public class ModelData extends Entity {
    )
    public static ModelData method2788(AbstractIndexCache var0, int var1, int var2) {
       byte[] var3 = var0.takeRecord(var1, var2);
-      return var3 == null?null:new ModelData(var3);
+      return var3 == null ? null : new ModelData(var3);
    }
 
    @ObfuscatedName("p")
@@ -1619,57 +1616,57 @@ public class ModelData extends Entity {
       signature = "(Ldw;Ldw;IIIZ)V"
    )
    static void method2800(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) {
-      var0.__c_229();
-      var0.__h_228();
-      var1.__c_229();
-      var1.__h_228();
-      ++__dw_ab;
+      var0.method217();
+      var0.method216();
+      var1.method217();
+      var1.method216();
+      ++field550;
       int var6 = 0;
       int[] var7 = var1.verticesX;
       int var8 = var1.verticesCount;
 
       int var9;
-      for(var9 = 0; var9 < var0.verticesCount; ++var9) {
-         VertexNormal var10 = var0.__v[var9];
-         if(var10.__w != 0) {
+      for (var9 = 0; var9 < var0.verticesCount; ++var9) {
+         VertexNormal var10 = var0.field557[var9];
+         if (var10.field950 != 0) {
             int var11 = var0.verticesY[var9] - var3;
-            if(var11 <= var1.__ar) {
+            if (var11 <= var1.field561) {
                int var12 = var0.verticesX[var9] - var2;
-               if(var12 >= var1.__ac && var12 <= var1.__ay) {
+               if (var12 >= var1.field562 && var12 <= var1.field563) {
                   int var13 = var0.verticesZ[var9] - var4;
-                  if(var13 >= var1.__ak && var13 <= var1.__ah) {
-                     for(int var14 = 0; var14 < var8; ++var14) {
-                        VertexNormal var15 = var1.__v[var14];
-                        if(var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.__w != 0) {
-                           if(var0.__ag == null) {
-                              var0.__ag = new VertexNormal[var0.verticesCount];
+                  if (var13 >= var1.field565 && var13 <= var1.field564) {
+                     for (int var14 = 0; var14 < var8; ++var14) {
+                        VertexNormal var15 = var1.field557[var14];
+                        if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.field950 != 0) {
+                           if (var0.field558 == null) {
+                              var0.field558 = new VertexNormal[var0.verticesCount];
                            }
 
-                           if(var1.__ag == null) {
-                              var1.__ag = new VertexNormal[var8];
+                           if (var1.field558 == null) {
+                              var1.field558 = new VertexNormal[var8];
                            }
 
-                           VertexNormal var16 = var0.__ag[var9];
-                           if(var16 == null) {
-                              var16 = var0.__ag[var9] = new VertexNormal(var10);
+                           VertexNormal var16 = var0.field558[var9];
+                           if (var16 == null) {
+                              var16 = var0.field558[var9] = new VertexNormal(var10);
                            }
 
-                           VertexNormal var17 = var1.__ag[var14];
-                           if(var17 == null) {
-                              var17 = var1.__ag[var14] = new VertexNormal(var15);
+                           VertexNormal var17 = var1.field558[var14];
+                           if (var17 == null) {
+                              var17 = var1.field558[var14] = new VertexNormal(var15);
                            }
 
-                           var16.__m += var15.__m;
-                           var16.__f += var15.__f;
-                           var16.__q += var15.__q;
-                           var16.__w += var15.__w;
-                           var17.__m += var10.__m;
-                           var17.__f += var10.__f;
-                           var17.__q += var10.__q;
-                           var17.__w += var10.__w;
+                           var16.field947 += var15.field947;
+                           var16.field948 += var15.field948;
+                           var16.field949 += var15.field949;
+                           var16.field950 += var15.field950;
+                           var17.field947 += var10.field947;
+                           var17.field948 += var10.field948;
+                           var17.field949 += var10.field949;
+                           var17.field950 += var10.field950;
                            ++var6;
-                           __dw_aw[var9] = __dw_ab;
-                           __dw_al[var14] = __dw_ab;
+                           field548[var9] = field550;
+                           field549[var14] = field550;
                         }
                      }
                   }
@@ -1678,36 +1675,36 @@ public class ModelData extends Entity {
          }
       }
 
-      if(var6 >= 3 && var5) {
-         for(var9 = 0; var9 < var0.faceCount; ++var9) {
-            if(__dw_aw[var0.indices1[var9]] == __dw_ab && __dw_aw[var0.indices2[var9]] == __dw_ab && __dw_aw[var0.indices3[var9]] == __dw_ab) {
-               if(var0.__e == null) {
-                  var0.__e = new byte[var0.faceCount];
+      if (var6 >= 3 && var5) {
+         for (var9 = 0; var9 < var0.faceCount; ++var9) {
+            if (field548[var0.indices1[var9]] == field550 && field548[var0.indices2[var9]] == field550 && field548[var0.indices3[var9]] == field550) {
+               if (var0.field551 == null) {
+                  var0.field551 = new byte[var0.faceCount];
                }
 
-               var0.__e[var9] = 2;
+               var0.field551[var9] = 2;
             }
          }
 
-         for(var9 = 0; var9 < var1.faceCount; ++var9) {
-            if(__dw_ab == __dw_al[var1.indices1[var9]] && __dw_ab == __dw_al[var1.indices2[var9]] && __dw_ab == __dw_al[var1.indices3[var9]]) {
-               if(var1.__e == null) {
-                  var1.__e = new byte[var1.faceCount];
+         for (var9 = 0; var9 < var1.faceCount; ++var9) {
+            if (field550 == field549[var1.indices1[var9]] && field550 == field549[var1.indices2[var9]] && field550 == field549[var1.indices3[var9]]) {
+               if (var1.field551 == null) {
+                  var1.field551 = new byte[var1.faceCount];
                }
 
-               var1.__e[var9] = 2;
+               var1.field551[var9] = 2;
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("ag")
    static final int method2802(int var0, int var1) {
       var1 = (var0 & 127) * var1 >> 7;
-      if(var1 < 2) {
+      if (var1 < 2) {
          var1 = 2;
-      } else if(var1 > 126) {
+      } else if (var1 > 126) {
          var1 = 126;
       }
 
@@ -1716,12 +1713,20 @@ public class ModelData extends Entity {
 
    @ObfuscatedName("aq")
    static final int method2803(int var0) {
-      if(var0 < 2) {
+      if (var0 < 2) {
          var0 = 2;
-      } else if(var0 > 126) {
+      } else if (var0 > 126) {
          var0 = 126;
       }
 
       return var0;
    }
+
+   static {
+      field548 = new int[10000];
+      field549 = new int[10000];
+      field550 = 0;
+      ModelData_sine = Rasterizer3D.Rasterizer3D_sine;
+      ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine;
+   }
 }
diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java
index e43304e3e5..d7f7c7f983 100644
--- a/runescape-client/src/main/java/MouseHandler.java
+++ b/runescape-client/src/main/java/MouseHandler.java
@@ -130,27 +130,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
    @Export("oculusOrbFocalPointX")
    static int oculusOrbFocalPointX;
 
-   static {
-      MouseHandler_instance = new MouseHandler();
-      MouseHandler_idleCycles = 0;
-      MouseHandler_currentButton0 = 0;
-      MouseHandler_x0 = -1;
-      MouseHandler_y0 = -1;
-      MouseHandler_millis0 = -1L;
-      MouseHandler_currentButton = 0;
-      MouseHandler_x = 0;
-      MouseHandler_y = 0;
-      MouseHandler_millis = 0L;
-      MouseHandler_lastButton0 = 0;
-      MouseHandler_lastPressedX0 = 0;
-      MouseHandler_lastPressedY0 = 0;
-      MouseHandler_lastPressedTimeMillis0 = 0L;
-      MouseHandler_lastButton = 0;
-      MouseHandler_lastPressedX = 0;
-      MouseHandler_lastPressedY = 0;
-      MouseHandler_lastPressedTimeMillis = 0L;
-   }
-
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "(Ljava/awt/event/MouseEvent;I)I",
@@ -159,13 +138,13 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
    @Export("getButton")
    final int getButton(MouseEvent var1) {
       int var2 = var1.getButton();
-      return !var1.isAltDown() && var2 != 2?(!var1.isMetaDown() && var2 != 3?1:2):4;
+      return !var1.isAltDown() && var2 != 2 ? (!var1.isMetaDown() && var2 != 3 ? 1 : 2) : 4;
    }
 
    @Export("mouseMoved")
    @ObfuscatedName("mouseMoved")
    public final synchronized void mouseMoved(MouseEvent var1) {
-      if(MouseHandler_instance != null) {
+      if (MouseHandler_instance != null) {
          MouseHandler_idleCycles = 0;
          MouseHandler_x0 = var1.getX();
          MouseHandler_y0 = var1.getY();
@@ -177,18 +156,18 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
    @Export("mousePressed")
    @ObfuscatedName("mousePressed")
    public final synchronized void mousePressed(MouseEvent var1) {
-      if(MouseHandler_instance != null) {
+      if (MouseHandler_instance != null) {
          MouseHandler_idleCycles = 0;
          MouseHandler_lastPressedX0 = var1.getX();
          MouseHandler_lastPressedY0 = var1.getY();
          MouseHandler_lastPressedTimeMillis0 = class203.currentTimeMs();
          MouseHandler_lastButton0 = this.getButton(var1);
-         if(MouseHandler_lastButton0 != 0) {
+         if (MouseHandler_lastButton0 != 0) {
             MouseHandler_currentButton0 = MouseHandler_lastButton0;
          }
       }
 
-      if(var1.isPopupTrigger()) {
+      if (var1.isPopupTrigger()) {
          var1.consume();
       }
 
@@ -197,12 +176,12 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
    @Export("mouseReleased")
    @ObfuscatedName("mouseReleased")
    public final synchronized void mouseReleased(MouseEvent var1) {
-      if(MouseHandler_instance != null) {
+      if (MouseHandler_instance != null) {
          MouseHandler_idleCycles = 0;
          MouseHandler_currentButton0 = 0;
       }
 
-      if(var1.isPopupTrigger()) {
+      if (var1.isPopupTrigger()) {
          var1.consume();
       }
 
@@ -211,7 +190,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
    @Export("mouseClicked")
    @ObfuscatedName("mouseClicked")
    public final void mouseClicked(MouseEvent var1) {
-      if(var1.isPopupTrigger()) {
+      if (var1.isPopupTrigger()) {
          var1.consume();
       }
 
@@ -220,7 +199,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
    @Export("mouseExited")
    @ObfuscatedName("mouseExited")
    public final synchronized void mouseExited(MouseEvent var1) {
-      if(MouseHandler_instance != null) {
+      if (MouseHandler_instance != null) {
          MouseHandler_idleCycles = 0;
          MouseHandler_x0 = -1;
          MouseHandler_y0 = -1;
@@ -243,7 +222,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
    @Export("focusLost")
    @ObfuscatedName("focusLost")
    public final synchronized void focusLost(FocusEvent var1) {
-      if(MouseHandler_instance != null) {
+      if (MouseHandler_instance != null) {
          MouseHandler_currentButton0 = 0;
       }
 
@@ -283,11 +262,32 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
       Login.Login_response2 = "Enter your username/email & password.";
       Login.Login_response3 = "";
       Login.loginIndex = 2;
-      if(var0) {
+      if (var0) {
          Login.Login_password = "";
       }
 
       Messages.method2200();
       class196.method3740();
    }
+
+   static {
+      MouseHandler_instance = new MouseHandler();
+      MouseHandler_idleCycles = 0;
+      MouseHandler_currentButton0 = 0;
+      MouseHandler_x0 = -1;
+      MouseHandler_y0 = -1;
+      MouseHandler_millis0 = -1L;
+      MouseHandler_currentButton = 0;
+      MouseHandler_x = 0;
+      MouseHandler_y = 0;
+      MouseHandler_millis = 0L;
+      MouseHandler_lastButton0 = 0;
+      MouseHandler_lastPressedX0 = 0;
+      MouseHandler_lastPressedY0 = 0;
+      MouseHandler_lastPressedTimeMillis0 = 0L;
+      MouseHandler_lastButton = 0;
+      MouseHandler_lastPressedX = 0;
+      MouseHandler_lastPressedY = 0;
+      MouseHandler_lastPressedTimeMillis = 0L;
+   }
 }
diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java
index 22f81c03b4..01c8725cbb 100644
--- a/runescape-client/src/main/java/MouseRecorder.java
+++ b/runescape-client/src/main/java/MouseRecorder.java
@@ -17,7 +17,7 @@ public class MouseRecorder implements Runnable {
    @ObfuscatedGetter(
       intValue = 1075569245
    )
-   static int __bu_hy;
+   static int field566;
    @ObfuscatedName("m")
    @Export("isRunning")
    boolean isRunning;
@@ -52,10 +52,10 @@ public class MouseRecorder implements Runnable {
    @Export("run")
    @ObfuscatedName("run")
    public void run() {
-      for(; this.isRunning; class203.method4010(50L)) {
+      for (; this.isRunning; class203.method4010(50L)) {
          Object var1 = this.lock;
          synchronized(this.lock) {
-            if(this.index < 500) {
+            if (this.index < 500) {
                this.xs[this.index] = MouseHandler.MouseHandler_x;
                this.ys[this.index] = MouseHandler.MouseHandler_y;
                this.millis[this.index] = MouseHandler.MouseHandler_millis;
@@ -73,154 +73,157 @@ public class MouseRecorder implements Runnable {
    )
    @Export("drawObject")
    static final void drawObject(int var0, int var1, int var2, int var3, int var4) {
-      long var5 = class65.scene.__ar_244(var0, var1, var2);
+      long var5 = class65.scene.method290(var0, var1, var2);
       int var7;
       int var8;
       int var9;
       int var10;
-      int var14;
-      int var26;
-      if(var5 != 0L) {
+      int var11;
+      int var12;
+      int var17;
+      if (var5 != 0L) {
          var7 = class65.scene.getObjectFlags(var0, var1, var2, var5);
          var8 = var7 >> 6 & 3;
          var9 = var7 & 31;
          var10 = var3;
-         boolean var12 = var5 != 0L;
-         if(var12) {
-            boolean var13 = (int)(var5 >>> 16 & 1L) == 1;
-            var12 = !var13;
+         boolean var13 = var5 != 0L;
+         if (var13) {
+            boolean var14 = (int)(var5 >>> 16 & 1L) == 1;
+            var13 = !var14;
          }
 
-         if(var12) {
+         if (var13) {
             var10 = var4;
          }
 
-         int[] var19 = WidgetGroupParent.sceneMinimapSprite.pixels;
-         var26 = var1 * 4 + (103 - var2) * 2048 + 24624;
-         var14 = HitSplatDefinition.method4972(var5);
-         ObjectDefinition var15 = class50.getObjectDefinition(var14);
-         if(var15.mapSceneId != -1) {
+         int[] var20 = WidgetGroupParent.sceneMinimapSprite.pixels;
+         var12 = var1 * 4 + (103 - var2) * 2048 + 24624;
+         var11 = HitSplatDefinition.method4972(var5);
+         ObjectDefinition var15 = class50.getObjectDefinition(var11);
+         if (var15.mapSceneId != -1) {
             IndexedSprite var16 = class192.mapSceneSprites[var15.mapSceneId];
-            if(var16 != null) {
-               int var17 = (var15.sizeX * 4 - var16.subWidth) / 2;
+            if (var16 != null) {
+               var17 = (var15.sizeX * 4 - var16.subWidth) / 2;
                int var18 = (var15.sizeY * 4 - var16.subHeight) / 2;
                var16.drawAt(var1 * 4 + var17 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48);
             }
          } else {
-            if(var9 == 0 || var9 == 2) {
-               if(var8 == 0) {
-                  var19[var26] = var10;
-                  var19[var26 + 512] = var10;
-                  var19[var26 + 1024] = var10;
-                  var19[var26 + 1536] = var10;
-               } else if(var8 == 1) {
-                  var19[var26] = var10;
-                  var19[var26 + 1] = var10;
-                  var19[var26 + 2] = var10;
-                  var19[var26 + 3] = var10;
-               } else if(var8 == 2) {
-                  var19[var26 + 3] = var10;
-                  var19[var26 + 512 + 3] = var10;
-                  var19[var26 + 1024 + 3] = var10;
-                  var19[var26 + 1536 + 3] = var10;
-               } else if(var8 == 3) {
-                  var19[var26 + 1536] = var10;
-                  var19[var26 + 1536 + 1] = var10;
-                  var19[var26 + 1536 + 2] = var10;
-                  var19[var26 + 1536 + 3] = var10;
+            if (var9 == 0 || var9 == 2) {
+               if (var8 == 0) {
+                  var20[var12] = var10;
+                  var20[var12 + 512] = var10;
+                  var20[var12 + 1024] = var10;
+                  var20[var12 + 1536] = var10;
+               } else if (var8 == 1) {
+                  var20[var12] = var10;
+                  var20[var12 + 1] = var10;
+                  var20[var12 + 2] = var10;
+                  var20[var12 + 3] = var10;
+               } else if (var8 == 2) {
+                  var20[var12 + 3] = var10;
+                  var20[var12 + 512 + 3] = var10;
+                  var20[var12 + 1024 + 3] = var10;
+                  var20[var12 + 1536 + 3] = var10;
+               } else if (var8 == 3) {
+                  var20[var12 + 1536] = var10;
+                  var20[var12 + 1536 + 1] = var10;
+                  var20[var12 + 1536 + 2] = var10;
+                  var20[var12 + 1536 + 3] = var10;
                }
             }
 
-            if(var9 == 3) {
-               if(var8 == 0) {
-                  var19[var26] = var10;
-               } else if(var8 == 1) {
-                  var19[var26 + 3] = var10;
-               } else if(var8 == 2) {
-                  var19[var26 + 1536 + 3] = var10;
-               } else if(var8 == 3) {
-                  var19[var26 + 1536] = var10;
+            if (var9 == 3) {
+               if (var8 == 0) {
+                  var20[var12] = var10;
+               } else if (var8 == 1) {
+                  var20[var12 + 3] = var10;
+               } else if (var8 == 2) {
+                  var20[var12 + 1536 + 3] = var10;
+               } else if (var8 == 3) {
+                  var20[var12 + 1536] = var10;
                }
             }
 
-            if(var9 == 2) {
-               if(var8 == 3) {
-                  var19[var26] = var10;
-                  var19[var26 + 512] = var10;
-                  var19[var26 + 1024] = var10;
-                  var19[var26 + 1536] = var10;
-               } else if(var8 == 0) {
-                  var19[var26] = var10;
-                  var19[var26 + 1] = var10;
-                  var19[var26 + 2] = var10;
-                  var19[var26 + 3] = var10;
-               } else if(var8 == 1) {
-                  var19[var26 + 3] = var10;
-                  var19[var26 + 512 + 3] = var10;
-                  var19[var26 + 1024 + 3] = var10;
-                  var19[var26 + 1536 + 3] = var10;
-               } else if(var8 == 2) {
-                  var19[var26 + 1536] = var10;
-                  var19[var26 + 1536 + 1] = var10;
-                  var19[var26 + 1536 + 2] = var10;
-                  var19[var26 + 1536 + 3] = var10;
+            if (var9 == 2) {
+               if (var8 == 3) {
+                  var20[var12] = var10;
+                  var20[var12 + 512] = var10;
+                  var20[var12 + 1024] = var10;
+                  var20[var12 + 1536] = var10;
+               } else if (var8 == 0) {
+                  var20[var12] = var10;
+                  var20[var12 + 1] = var10;
+                  var20[var12 + 2] = var10;
+                  var20[var12 + 3] = var10;
+               } else if (var8 == 1) {
+                  var20[var12 + 3] = var10;
+                  var20[var12 + 512 + 3] = var10;
+                  var20[var12 + 1024 + 3] = var10;
+                  var20[var12 + 1536 + 3] = var10;
+               } else if (var8 == 2) {
+                  var20[var12 + 1536] = var10;
+                  var20[var12 + 1536 + 1] = var10;
+                  var20[var12 + 1536 + 2] = var10;
+                  var20[var12 + 1536 + 3] = var10;
                }
             }
          }
       }
 
-      var5 = class65.scene.__ay_246(var0, var1, var2);
-      if(0L != var5) {
+      var5 = class65.scene.method292(var0, var1, var2);
+      ObjectDefinition var19;
+      IndexedSprite var21;
+      if (0L != var5) {
          var7 = class65.scene.getObjectFlags(var0, var1, var2, var5);
          var8 = var7 >> 6 & 3;
          var9 = var7 & 31;
          var10 = HitSplatDefinition.method4972(var5);
-         ObjectDefinition var20 = class50.getObjectDefinition(var10);
-         if(var20.mapSceneId != -1) {
-            IndexedSprite var28 = class192.mapSceneSprites[var20.mapSceneId];
-            if(var28 != null) {
-               var26 = (var20.sizeX * 4 - var28.subWidth) / 2;
-               var14 = (var20.sizeY * 4 - var28.subHeight) / 2;
-               var28.drawAt(var26 + var1 * 4 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48);
+         var19 = class50.getObjectDefinition(var10);
+         if (var19.mapSceneId != -1) {
+            var21 = class192.mapSceneSprites[var19.mapSceneId];
+            if (var21 != null) {
+               var12 = (var19.sizeX * 4 - var21.subWidth) / 2;
+               var11 = (var19.sizeY * 4 - var21.subHeight) / 2;
+               var21.drawAt(var12 + var1 * 4 + 48, (104 - var2 - var19.sizeY) * 4 + var11 + 48);
             }
-         } else if(var9 == 9) {
-            int var25 = 15658734;
-            boolean var27 = 0L != var5;
-            if(var27) {
-               boolean var23 = (int)(var5 >>> 16 & 1L) == 1;
-               var27 = !var23;
+         } else if (var9 == 9) {
+            int var22 = 15658734;
+            boolean var23 = 0L != var5;
+            if (var23) {
+               boolean var24 = (int)(var5 >>> 16 & 1L) == 1;
+               var23 = !var24;
             }
 
-            if(var27) {
-               var25 = 15597568;
+            if (var23) {
+               var22 = 15597568;
             }
 
-            int[] var24 = WidgetGroupParent.sceneMinimapSprite.pixels;
-            int var29 = var1 * 4 + (103 - var2) * 2048 + 24624;
-            if(var8 != 0 && var8 != 2) {
-               var24[var29] = var25;
-               var24[var29 + 1 + 512] = var25;
-               var24[var29 + 1024 + 2] = var25;
-               var24[var29 + 1536 + 3] = var25;
+            int[] var26 = WidgetGroupParent.sceneMinimapSprite.pixels;
+            var17 = var1 * 4 + (103 - var2) * 2048 + 24624;
+            if (var8 != 0 && var8 != 2) {
+               var26[var17] = var22;
+               var26[var17 + 1 + 512] = var22;
+               var26[var17 + 1024 + 2] = var22;
+               var26[var17 + 1536 + 3] = var22;
             } else {
-               var24[var29 + 1536] = var25;
-               var24[var29 + 1 + 1024] = var25;
-               var24[var29 + 512 + 2] = var25;
-               var24[var29 + 3] = var25;
+               var26[var17 + 1536] = var22;
+               var26[var17 + 1 + 1024] = var22;
+               var26[var17 + 512 + 2] = var22;
+               var26[var17 + 3] = var22;
             }
          }
       }
 
       var5 = class65.scene.getFloorDecorationTag(var0, var1, var2);
-      if(var5 != 0L) {
+      if (var5 != 0L) {
          var7 = HitSplatDefinition.method4972(var5);
-         ObjectDefinition var21 = class50.getObjectDefinition(var7);
-         if(var21.mapSceneId != -1) {
-            IndexedSprite var22 = class192.mapSceneSprites[var21.mapSceneId];
-            if(var22 != null) {
-               var10 = (var21.sizeX * 4 - var22.subWidth) / 2;
-               int var11 = (var21.sizeY * 4 - var22.subHeight) / 2;
-               var22.drawAt(var10 + var1 * 4 + 48, var11 + (104 - var2 - var21.sizeY) * 4 + 48);
+         var19 = class50.getObjectDefinition(var7);
+         if (var19.mapSceneId != -1) {
+            var21 = class192.mapSceneSprites[var19.mapSceneId];
+            if (var21 != null) {
+               var10 = (var19.sizeX * 4 - var21.subWidth) / 2;
+               int var25 = (var19.sizeY * 4 - var21.subHeight) / 2;
+               var21.drawAt(var10 + var1 * 4 + 48, var25 + (104 - var2 - var19.sizeY) * 4 + 48);
             }
          }
       }
@@ -233,24 +236,24 @@ public class MouseRecorder implements Runnable {
       garbageValue = "17"
    )
    static String method1194(String var0, Widget var1) {
-      if(var0.indexOf("%") != -1) {
-         for(int var2 = 1; var2 <= 5; ++var2) {
-            while(true) {
+      if (var0.indexOf("%") != -1) {
+         for (int var2 = 1; var2 <= 5; ++var2) {
+            while (true) {
                int var3 = var0.indexOf("%" + var2);
-               if(var3 == -1) {
+               if (var3 == -1) {
                   break;
                }
 
                String var4 = var0.substring(0, var3);
-               int var6 = class16.method187(var1, var2 - 1);
-               String var5;
-               if(var6 < 999999999) {
-                  var5 = Integer.toString(var6);
+               int var5 = class16.method187(var1, var2 - 1);
+               String var6;
+               if (var5 < 999999999) {
+                  var6 = Integer.toString(var5);
                } else {
-                  var5 = "*";
+                  var6 = "*";
                }
 
-               var0 = var4 + var5 + var0.substring(var3 + 2);
+               var0 = var4 + var6 + var0.substring(var3 + 2);
             }
          }
       }
@@ -266,117 +269,126 @@ public class MouseRecorder implements Runnable {
    static final void method1189(Widget var0, int var1, int var2, int var3) {
       class13.playPcmPlayers();
       SpriteMask var4 = var0.getSpriteMask(false);
-      if(var4 != null) {
+      if (var4 != null) {
          Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height);
-         if(Client.minimapState != 2 && Client.minimapState != 5) {
+         if (Client.minimapState != 2 && Client.minimapState != 5) {
             int var5 = Client.minimapOrientation & 2047;
             int var6 = Canvas.localPlayer.x / 32 + 48;
             int var7 = 464 - Canvas.localPlayer.y / 32;
-            WidgetGroupParent.sceneMinimapSprite.__ay_513(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths);
+            WidgetGroupParent.sceneMinimapSprite.method315(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths);
 
             int var8;
             int var9;
             int var10;
-            for(var8 = 0; var8 < Client.mapIconCount; ++var8) {
+            for (var8 = 0; var8 < Client.mapIconCount; ++var8) {
                var9 = Client.mapIconXs[var8] * 4 + 2 - Canvas.localPlayer.x / 32;
                var10 = Client.mapIconYs[var8] * 4 + 2 - Canvas.localPlayer.y / 32;
                NetFileRequest.method4554(var1, var2, var9, var10, Client.mapIcons[var8], var4);
             }
 
-            int var11;
-            int var12;
-            for(var8 = 0; var8 < 104; ++var8) {
-               for(var9 = 0; var9 < 104; ++var9) {
-                  NodeDeque var15 = Client.groundItems[SoundSystem.plane][var8][var9];
-                  if(var15 != null) {
+            var8 = 0;
+
+            while (true) {
+               int var11;
+               int var12;
+               if (var8 >= 104) {
+                  for (var8 = 0; var8 < Client.npcCount; ++var8) {
+                     NPC var17 = Client.npcs[Client.npcIndices[var8]];
+                     if (var17 != null && var17.isVisible()) {
+                        NPCDefinition var14 = var17.definition;
+                        if (var14 != null && var14.transforms != null) {
+                           var14 = var14.transform();
+                        }
+
+                        if (var14 != null && var14.drawMapDot && var14.isInteractable) {
+                           var11 = var17.x / 32 - Canvas.localPlayer.x / 32;
+                           var12 = var17.y / 32 - Canvas.localPlayer.y / 32;
+                           NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[1], var4);
+                        }
+                     }
+                  }
+
+                  var8 = Players.Players_count;
+                  int[] var18 = Players.Players_indices;
+
+                  Player var19;
+                  for (var10 = 0; var10 < var8; ++var10) {
+                     var19 = Client.players[var18[var10]];
+                     if (var19 != null && var19.isVisible() && !var19.isHidden && var19 != Canvas.localPlayer) {
+                        var12 = var19.x / 32 - Canvas.localPlayer.x / 32;
+                        int var15 = var19.y / 32 - Canvas.localPlayer.y / 32;
+                        boolean var16 = false;
+                        if (Canvas.localPlayer.team != 0 && var19.team != 0 && var19.team == Canvas.localPlayer.team) {
+                           var16 = true;
+                        }
+
+                        if (var19.isFriend()) {
+                           NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[3], var4);
+                        } else if (var16) {
+                           NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[4], var4);
+                        } else if (var19.isClanMember()) {
+                           NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[5], var4);
+                        } else {
+                           NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[2], var4);
+                        }
+                     }
+                  }
+
+                  if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) {
+                     if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) {
+                        NPC var20 = Client.npcs[Client.hintArrowNpcIndex];
+                        if (var20 != null) {
+                           var11 = var20.x / 32 - Canvas.localPlayer.x / 32;
+                           var12 = var20.y / 32 - Canvas.localPlayer.y / 32;
+                           UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
+                        }
+                     }
+
+                     if (Client.hintArrowType == 2) {
+                        var10 = Client.hintArrowX * 4 - class50.baseX * 4 + 2 - Canvas.localPlayer.x / 32;
+                        var11 = Client.hintArrowY * 4 - GraphicsObject.baseY * 4 + 2 - Canvas.localPlayer.y / 32;
+                        UserComparator5.worldToMinimap(var1, var2, var10, var11, class16.mapMarkerSprites[1], var4);
+                     }
+
+                     if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) {
+                        var19 = Client.players[Client.hintArrowPlayerIndex];
+                        if (var19 != null) {
+                           var11 = var19.x / 32 - Canvas.localPlayer.x / 32;
+                           var12 = var19.y / 32 - Canvas.localPlayer.y / 32;
+                           UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
+                        }
+                     }
+                  }
+
+                  if (Client.destinationX != 0) {
+                     var10 = Client.destinationX * 4 + 2 - Canvas.localPlayer.x / 32;
+                     var11 = Client.destinationY * 4 + 2 - Canvas.localPlayer.y / 32;
+                     NetFileRequest.method4554(var1, var2, var10, var11, class16.mapMarkerSprites[0], var4);
+                  }
+
+                  if (!Canvas.localPlayer.isHidden) {
+                     Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
+                  }
+                  break;
+               }
+
+               for (var9 = 0; var9 < 104; ++var9) {
+                  NodeDeque var13 = Client.groundItems[SoundSystem.plane][var8][var9];
+                  if (var13 != null) {
                      var11 = var8 * 4 + 2 - Canvas.localPlayer.x / 32;
                      var12 = var9 * 4 + 2 - Canvas.localPlayer.y / 32;
                      NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[0], var4);
                   }
                }
-            }
 
-            for(var8 = 0; var8 < Client.npcCount; ++var8) {
-               Npc var16 = Client.npcs[Client.npcIndices[var8]];
-               if(var16 != null && var16.isVisible()) {
-                  NpcDefinition var18 = var16.definition;
-                  if(var18 != null && var18.transforms != null) {
-                     var18 = var18.transform();
-                  }
-
-                  if(var18 != null && var18.drawMapDot && var18.isInteractable) {
-                     var11 = var16.x / 32 - Canvas.localPlayer.x / 32;
-                     var12 = var16.y / 32 - Canvas.localPlayer.y / 32;
-                     NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[1], var4);
-                  }
-               }
-            }
-
-            var8 = Players.Players_count;
-            int[] var19 = Players.Players_indices;
-
-            for(var10 = 0; var10 < var8; ++var10) {
-               Player var17 = Client.players[var19[var10]];
-               if(var17 != null && var17.isVisible() && !var17.isHidden && var17 != Canvas.localPlayer) {
-                  var12 = var17.x / 32 - Canvas.localPlayer.x / 32;
-                  int var13 = var17.y / 32 - Canvas.localPlayer.y / 32;
-                  boolean var14 = false;
-                  if(Canvas.localPlayer.team != 0 && var17.team != 0 && var17.team == Canvas.localPlayer.team) {
-                     var14 = true;
-                  }
-
-                  if(var17.isFriend()) {
-                     NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[3], var4);
-                  } else if(var14) {
-                     NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[4], var4);
-                  } else if(var17.isClanMember()) {
-                     NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[5], var4);
-                  } else {
-                     NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[2], var4);
-                  }
-               }
-            }
-
-            if(Client.hintArrowType != 0 && Client.cycle % 20 < 10) {
-               if(Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) {
-                  Npc var20 = Client.npcs[Client.hintArrowNpcIndex];
-                  if(var20 != null) {
-                     var11 = var20.x / 32 - Canvas.localPlayer.x / 32;
-                     var12 = var20.y / 32 - Canvas.localPlayer.y / 32;
-                     UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
-                  }
-               }
-
-               if(Client.hintArrowType == 2) {
-                  var10 = Client.hintArrowX * 4 - class50.baseX * 4 + 2 - Canvas.localPlayer.x / 32;
-                  var11 = Client.hintArrowY * 4 - GraphicsObject.baseY * 4 + 2 - Canvas.localPlayer.y / 32;
-                  UserComparator5.worldToMinimap(var1, var2, var10, var11, class16.mapMarkerSprites[1], var4);
-               }
-
-               if(Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) {
-                  Player var21 = Client.players[Client.hintArrowPlayerIndex];
-                  if(var21 != null) {
-                     var11 = var21.x / 32 - Canvas.localPlayer.x / 32;
-                     var12 = var21.y / 32 - Canvas.localPlayer.y / 32;
-                     UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
-                  }
-               }
-            }
-
-            if(Client.destinationX != 0) {
-               var10 = Client.destinationX * 4 + 2 - Canvas.localPlayer.x / 32;
-               var11 = Client.destinationY * 4 + 2 - Canvas.localPlayer.y / 32;
-               NetFileRequest.method4554(var1, var2, var10, var11, class16.mapMarkerSprites[0], var4);
-            }
-
-            if(!Canvas.localPlayer.isHidden) {
-               Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
+               ++var8;
             }
          } else {
             Rasterizer2D.method5948(var1, var2, 0, var4.xStarts, var4.xWidths);
          }
 
-         Client.__client_ot[var3] = true;
+         Client.field102[var3] = true;
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java
index a51914bfd3..4ebabaf7ee 100644
--- a/runescape-client/src/main/java/MusicPatch.java
+++ b/runescape-client/src/main/java/MusicPatch.java
@@ -11,7 +11,7 @@ public class MusicPatch extends Node {
    @ObfuscatedGetter(
       intValue = 574200865
    )
-   int __m;
+   int field567;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "[Lcx;"
@@ -19,40 +19,39 @@ public class MusicPatch extends Node {
    @Export("rawSounds")
    RawSound[] rawSounds;
    @ObfuscatedName("q")
-   short[] __q;
+   short[] field568;
    @ObfuscatedName("w")
-   byte[] __w;
+   byte[] field569;
    @ObfuscatedName("o")
-   byte[] __o;
+   byte[] field570;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "[Lhd;"
    )
-   MusicPatchNode2[] __u;
+   MusicPatchNode2[] field571;
    @ObfuscatedName("g")
-   byte[] __g;
+   byte[] field572;
    @ObfuscatedName("l")
-   int[] __l;
+   int[] field573;
 
    MusicPatch(byte[] var1) {
       this.rawSounds = new RawSound[128];
-      this.__q = new short[128];
-      this.__w = new byte[128];
-      this.__o = new byte[128];
-      this.__u = new MusicPatchNode2[128];
-      this.__g = new byte[128];
-      this.__l = new int[128];
+      this.field568 = new short[128];
+      this.field569 = new byte[128];
+      this.field570 = new byte[128];
+      this.field571 = new MusicPatchNode2[128];
+      this.field572 = new byte[128];
+      this.field573 = new int[128];
       Buffer var2 = new Buffer(var1);
 
       int var3;
-      for(var3 = 0; var2.array[var3 + var2.index] != 0; ++var3) {
-         ;
+      for (var3 = 0; var2.array[var3 + var2.index] != 0; ++var3) {
       }
 
       byte[] var4 = new byte[var3];
 
       int var5;
-      for(var5 = 0; var5 < var3; ++var5) {
+      for (var5 = 0; var5 < var3; ++var5) {
          var4[var5] = var2.readByte();
       }
 
@@ -62,14 +61,13 @@ public class MusicPatch extends Node {
       var2.index += var3;
 
       int var6;
-      for(var6 = 0; var2.array[var6 + var2.index] != 0; ++var6) {
-         ;
+      for (var6 = 0; var2.array[var6 + var2.index] != 0; ++var6) {
       }
 
       byte[] var7 = new byte[var6];
 
       int var8;
-      for(var8 = 0; var8 < var6; ++var8) {
+      for (var8 = 0; var8 < var6; ++var8) {
          var7[var8] = var2.readByte();
       }
 
@@ -79,407 +77,405 @@ public class MusicPatch extends Node {
       var2.index += var6;
 
       int var9;
-      for(var9 = 0; var2.array[var9 + var2.index] != 0; ++var9) {
-         ;
+      for (var9 = 0; var2.array[var9 + var2.index] != 0; ++var9) {
       }
 
       byte[] var10 = new byte[var9];
 
-      for(int var11 = 0; var11 < var9; ++var11) {
+      for (int var11 = 0; var11 < var9; ++var11) {
          var10[var11] = var2.readByte();
       }
 
       ++var2.index;
       ++var9;
-      byte[] var38 = new byte[var9];
+      byte[] var42 = new byte[var9];
       int var12;
-      int var14;
-      if(var9 > 1) {
-         var38[1] = 1;
-         int var13 = 1;
+      int var13;
+      if (var9 > 1) {
+         var42[1] = 1;
+         int var14 = 1;
          var12 = 2;
 
-         for(var14 = 2; var14 < var9; ++var14) {
+         for (var13 = 2; var13 < var9; ++var13) {
             int var15 = var2.readUnsignedByte();
-            if(var15 == 0) {
-               var13 = var12++;
+            if (var15 == 0) {
+               var14 = var12++;
             } else {
-               if(var15 <= var13) {
+               if (var15 <= var14) {
                   --var15;
                }
 
-               var13 = var15;
+               var14 = var15;
             }
 
-            var38[var14] = (byte)var13;
+            var42[var13] = (byte)var14;
          }
       } else {
          var12 = var9;
       }
 
-      MusicPatchNode2[] var39 = new MusicPatchNode2[var12];
+      MusicPatchNode2[] var43 = new MusicPatchNode2[var12];
 
-      MusicPatchNode2 var40;
-      for(var14 = 0; var14 < var39.length; ++var14) {
-         var40 = var39[var14] = new MusicPatchNode2();
+      MusicPatchNode2 var44;
+      for (var13 = 0; var13 < var43.length; ++var13) {
+         var44 = var43[var13] = new MusicPatchNode2();
          int var16 = var2.readUnsignedByte();
-         if(var16 > 0) {
-            var40.__m = new byte[var16 * 2];
+         if (var16 > 0) {
+            var44.field593 = new byte[var16 * 2];
          }
 
          var16 = var2.readUnsignedByte();
-         if(var16 > 0) {
-            var40.__f = new byte[var16 * 2 + 2];
-            var40.__f[1] = 64;
+         if (var16 > 0) {
+            var44.field594 = new byte[var16 * 2 + 2];
+            var44.field594[1] = 64;
          }
       }
 
-      var14 = var2.readUnsignedByte();
-      byte[] var47 = var14 > 0?new byte[var14 * 2]:null;
-      var14 = var2.readUnsignedByte();
-      byte[] var41 = var14 > 0?new byte[var14 * 2]:null;
+      var13 = var2.readUnsignedByte();
+      byte[] var45 = var13 > 0 ? new byte[var13 * 2] : null;
+      var13 = var2.readUnsignedByte();
+      byte[] var17 = var13 > 0 ? new byte[var13 * 2] : null;
 
-      int var17;
-      for(var17 = 0; var2.array[var17 + var2.index] != 0; ++var17) {
-         ;
+      int var18;
+      for (var18 = 0; var2.array[var18 + var2.index] != 0; ++var18) {
       }
 
-      byte[] var18 = new byte[var17];
+      byte[] var19 = new byte[var18];
 
-      int var19;
-      for(var19 = 0; var19 < var17; ++var19) {
-         var18[var19] = var2.readByte();
+      int var20;
+      for (var20 = 0; var20 < var18; ++var20) {
+         var19[var20] = var2.readByte();
       }
 
       ++var2.index;
-      ++var17;
-      var19 = 0;
+      ++var18;
+      var20 = 0;
 
-      int var20;
-      for(var20 = 0; var20 < 128; ++var20) {
-         var19 += var2.readUnsignedByte();
-         this.__q[var20] = (short)var19;
-      }
-
-      var19 = 0;
-
-      for(var20 = 0; var20 < 128; ++var20) {
-         var19 += var2.readUnsignedByte();
-         this.__q[var20] = (short)(this.__q[var20] + (var19 << 8));
+      int var21;
+      for (var21 = 0; var21 < 128; ++var21) {
+         var20 += var2.readUnsignedByte();
+         this.field568[var21] = (short)var20;
       }
 
       var20 = 0;
-      int var21 = 0;
-      int var22 = 0;
 
-      int var23;
-      for(var23 = 0; var23 < 128; ++var23) {
-         if(var20 == 0) {
-            if(var21 < var18.length) {
-               var20 = var18[var21++];
-            } else {
-               var20 = -1;
-            }
-
-            var22 = var2.__as_311();
-         }
-
-         this.__q[var23] = (short)(this.__q[var23] + ((var22 - 1 & 2) << 14));
-         this.__l[var23] = var22;
-         --var20;
+      for (var21 = 0; var21 < 128; ++var21) {
+         var20 += var2.readUnsignedByte();
+         this.field568[var21] = (short)(this.field568[var21] + (var20 << 8));
       }
 
-      var20 = 0;
       var21 = 0;
-      var23 = 0;
+      int var22 = 0;
+      int var23 = 0;
 
       int var24;
-      for(var24 = 0; var24 < 128; ++var24) {
-         if(this.__l[var24] != 0) {
-            if(var20 == 0) {
-               if(var21 < var4.length) {
-                  var20 = var4[var21++];
-               } else {
-                  var20 = -1;
-               }
-
-               var23 = var2.array[var5++] - 1;
+      for (var24 = 0; var24 < 128; ++var24) {
+         if (var21 == 0) {
+            if (var22 < var19.length) {
+               var21 = var19[var22++];
+            } else {
+               var21 = -1;
             }
 
-            this.__g[var24] = (byte)var23;
-            --var20;
+            var23 = var2.method52();
          }
+
+         this.field568[var24] = (short)(this.field568[var24] + ((var23 - 1 & 2) << 14));
+         this.field573[var24] = var23;
+         --var21;
       }
 
-      var20 = 0;
       var21 = 0;
+      var22 = 0;
       var24 = 0;
 
-      for(int var25 = 0; var25 < 128; ++var25) {
-         if(this.__l[var25] != 0) {
-            if(var20 == 0) {
-               if(var21 < var7.length) {
-                  var20 = var7[var21++];
+      int var25;
+      for (var25 = 0; var25 < 128; ++var25) {
+         if (this.field573[var25] != 0) {
+            if (var21 == 0) {
+               if (var22 < var4.length) {
+                  var21 = var4[var22++];
                } else {
-                  var20 = -1;
+                  var21 = -1;
                }
 
-               var24 = var2.array[var8++] + 16 << 2;
+               var24 = var2.array[var5++] - 1;
             }
 
-            this.__o[var25] = (byte)var24;
-            --var20;
+            this.field572[var25] = (byte)var24;
+            --var21;
          }
       }
 
-      var20 = 0;
       var21 = 0;
-      MusicPatchNode2 var42 = null;
+      var22 = 0;
+      var25 = 0;
 
-      int var26;
-      for(var26 = 0; var26 < 128; ++var26) {
-         if(this.__l[var26] != 0) {
-            if(var20 == 0) {
-               var42 = var39[var38[var21]];
-               if(var21 < var10.length) {
-                  var20 = var10[var21++];
+      for (int var26 = 0; var26 < 128; ++var26) {
+         if (this.field573[var26] != 0) {
+            if (var21 == 0) {
+               if (var22 < var7.length) {
+                  var21 = var7[var22++];
                } else {
-                  var20 = -1;
+                  var21 = -1;
                }
+
+               var25 = var2.array[var8++] + 16 << 2;
             }
 
-            this.__u[var26] = var42;
-            --var20;
+            this.field570[var26] = (byte)var25;
+            --var21;
          }
       }
 
-      var20 = 0;
       var21 = 0;
-      var26 = 0;
+      var22 = 0;
+      MusicPatchNode2 var46 = null;
 
       int var27;
-      for(var27 = 0; var27 < 128; ++var27) {
-         if(var20 == 0) {
-            if(var21 < var18.length) {
-               var20 = var18[var21++];
+      for (var27 = 0; var27 < 128; ++var27) {
+         if (this.field573[var27] != 0) {
+            if (var21 == 0) {
+               var46 = var43[var42[var22]];
+               if (var22 < var10.length) {
+                  var21 = var10[var22++];
+               } else {
+                  var21 = -1;
+               }
+            }
+
+            this.field571[var27] = var46;
+            --var21;
+         }
+      }
+
+      var21 = 0;
+      var22 = 0;
+      var27 = 0;
+
+      int var28;
+      for (var28 = 0; var28 < 128; ++var28) {
+         if (var21 == 0) {
+            if (var22 < var19.length) {
+               var21 = var19[var22++];
             } else {
-               var20 = -1;
+               var21 = -1;
             }
 
-            if(this.__l[var27] > 0) {
-               var26 = var2.readUnsignedByte() + 1;
+            if (this.field573[var28] > 0) {
+               var27 = var2.readUnsignedByte() + 1;
             }
          }
 
-         this.__w[var27] = (byte)var26;
-         --var20;
+         this.field569[var28] = (byte)var27;
+         --var21;
       }
 
-      this.__m = var2.readUnsignedByte() + 1;
+      this.field567 = var2.readUnsignedByte() + 1;
 
-      MusicPatchNode2 var28;
-      int var29;
-      for(var27 = 0; var27 < var12; ++var27) {
-         var28 = var39[var27];
-         if(var28.__m != null) {
-            for(var29 = 1; var29 < var28.__m.length; var29 += 2) {
-               var28.__m[var29] = var2.readByte();
+      MusicPatchNode2 var29;
+      int var30;
+      for (var28 = 0; var28 < var12; ++var28) {
+         var29 = var43[var28];
+         if (var29.field593 != null) {
+            for (var30 = 1; var30 < var29.field593.length; var30 += 2) {
+               var29.field593[var30] = var2.readByte();
             }
          }
 
-         if(var28.__f != null) {
-            for(var29 = 3; var29 < var28.__f.length - 2; var29 += 2) {
-               var28.__f[var29] = var2.readByte();
+         if (var29.field594 != null) {
+            for (var30 = 3; var30 < var29.field594.length - 2; var30 += 2) {
+               var29.field594[var30] = var2.readByte();
             }
          }
       }
 
-      if(var47 != null) {
-         for(var27 = 1; var27 < var47.length; var27 += 2) {
-            var47[var27] = var2.readByte();
+      if (var45 != null) {
+         for (var28 = 1; var28 < var45.length; var28 += 2) {
+            var45[var28] = var2.readByte();
          }
       }
 
-      if(var41 != null) {
-         for(var27 = 1; var27 < var41.length; var27 += 2) {
-            var41[var27] = var2.readByte();
+      if (var17 != null) {
+         for (var28 = 1; var28 < var17.length; var28 += 2) {
+            var17[var28] = var2.readByte();
          }
       }
 
-      for(var27 = 0; var27 < var12; ++var27) {
-         var28 = var39[var27];
-         if(var28.__f != null) {
-            var19 = 0;
+      for (var28 = 0; var28 < var12; ++var28) {
+         var29 = var43[var28];
+         if (var29.field594 != null) {
+            var20 = 0;
 
-            for(var29 = 2; var29 < var28.__f.length; var29 += 2) {
-               var19 = 1 + var19 + var2.readUnsignedByte();
-               var28.__f[var29] = (byte)var19;
+            for (var30 = 2; var30 < var29.field594.length; var30 += 2) {
+               var20 = 1 + var20 + var2.readUnsignedByte();
+               var29.field594[var30] = (byte)var20;
             }
          }
       }
 
-      for(var27 = 0; var27 < var12; ++var27) {
-         var28 = var39[var27];
-         if(var28.__m != null) {
-            var19 = 0;
+      for (var28 = 0; var28 < var12; ++var28) {
+         var29 = var43[var28];
+         if (var29.field593 != null) {
+            var20 = 0;
 
-            for(var29 = 2; var29 < var28.__m.length; var29 += 2) {
-               var19 = 1 + var19 + var2.readUnsignedByte();
-               var28.__m[var29] = (byte)var19;
+            for (var30 = 2; var30 < var29.field593.length; var30 += 2) {
+               var20 = 1 + var20 + var2.readUnsignedByte();
+               var29.field593[var30] = (byte)var20;
             }
          }
       }
 
-      byte var30;
+      byte var31;
       int var32;
       int var33;
       int var34;
       int var35;
       int var36;
-      int var44;
-      byte var46;
-      if(var47 != null) {
-         var19 = var2.readUnsignedByte();
-         var47[0] = (byte)var19;
+      int var37;
+      byte var38;
+      if (var45 != null) {
+         var20 = var2.readUnsignedByte();
+         var45[0] = (byte)var20;
 
-         for(var27 = 2; var27 < var47.length; var27 += 2) {
-            var19 = 1 + var19 + var2.readUnsignedByte();
-            var47[var27] = (byte)var19;
+         for (var28 = 2; var28 < var45.length; var28 += 2) {
+            var20 = 1 + var20 + var2.readUnsignedByte();
+            var45[var28] = (byte)var20;
          }
 
-         var46 = var47[0];
-         byte var43 = var47[1];
+         var38 = var45[0];
+         byte var39 = var45[1];
 
-         for(var29 = 0; var29 < var46; ++var29) {
-            this.__w[var29] = (byte)(var43 * this.__w[var29] + 32 >> 6);
+         for (var30 = 0; var30 < var38; ++var30) {
+            this.field569[var30] = (byte)(var39 * this.field569[var30] + 32 >> 6);
          }
 
-         for(var29 = 2; var29 < var47.length; var29 += 2) {
-            var30 = var47[var29];
-            byte var31 = var47[var29 + 1];
-            var32 = var43 * (var30 - var46) + (var30 - var46) / 2;
+         for (var30 = 2; var30 < var45.length; var30 += 2) {
+            var31 = var45[var30];
+            byte var40 = var45[var30 + 1];
+            var32 = var39 * (var31 - var38) + (var31 - var38) / 2;
 
-            for(var33 = var46; var33 < var30; ++var33) {
-               var35 = var30 - var46;
+            for (var33 = var38; var33 < var31; ++var33) {
+               var35 = var31 - var38;
                var36 = var32 >>> 31;
                var34 = (var32 + var36) / var35 - var36;
-               this.__w[var33] = (byte)(var34 * this.__w[var33] + 32 >> 6);
-               var32 += var31 - var43;
+               this.field569[var33] = (byte)(var34 * this.field569[var33] + 32 >> 6);
+               var32 += var40 - var39;
             }
 
-            var46 = var30;
-            var43 = var31;
+            var38 = var31;
+            var39 = var40;
          }
 
-         for(var44 = var46; var44 < 128; ++var44) {
-            this.__w[var44] = (byte)(var43 * this.__w[var44] + 32 >> 6);
+         for (var37 = var38; var37 < 128; ++var37) {
+            this.field569[var37] = (byte)(var39 * this.field569[var37] + 32 >> 6);
          }
 
-         var40 = null;
+         var44 = null;
       }
 
-      if(var41 != null) {
-         var19 = var2.readUnsignedByte();
-         var41[0] = (byte)var19;
+      if (var17 != null) {
+         var20 = var2.readUnsignedByte();
+         var17[0] = (byte)var20;
 
-         for(var27 = 2; var27 < var41.length; var27 += 2) {
-            var19 = 1 + var19 + var2.readUnsignedByte();
-            var41[var27] = (byte)var19;
+         for (var28 = 2; var28 < var17.length; var28 += 2) {
+            var20 = 1 + var20 + var2.readUnsignedByte();
+            var17[var28] = (byte)var20;
          }
 
-         var46 = var41[0];
-         int var49 = var41[1] << 1;
+         var38 = var17[0];
+         int var47 = var17[1] << 1;
 
-         for(var29 = 0; var29 < var46; ++var29) {
-            var44 = var49 + (this.__o[var29] & 255);
-            if(var44 < 0) {
-               var44 = 0;
+         for (var30 = 0; var30 < var38; ++var30) {
+            var37 = var47 + (this.field570[var30] & 255);
+            if (var37 < 0) {
+               var37 = 0;
             }
 
-            if(var44 > 128) {
-               var44 = 128;
+            if (var37 > 128) {
+               var37 = 128;
             }
 
-            this.__o[var29] = (byte)var44;
+            this.field570[var30] = (byte)var37;
          }
 
-         int var45;
-         for(var29 = 2; var29 < var41.length; var29 += 2) {
-            var30 = var41[var29];
-            var45 = var41[var29 + 1] << 1;
-            var32 = var49 * (var30 - var46) + (var30 - var46) / 2;
+         int var48;
+         for (var30 = 2; var30 < var17.length; var30 += 2) {
+            var31 = var17[var30];
+            var48 = var17[var30 + 1] << 1;
+            var32 = var47 * (var31 - var38) + (var31 - var38) / 2;
 
-            for(var33 = var46; var33 < var30; ++var33) {
-               var35 = var30 - var46;
+            for (var33 = var38; var33 < var31; ++var33) {
+               var35 = var31 - var38;
                var36 = var32 >>> 31;
                var34 = (var32 + var36) / var35 - var36;
-               int var37 = var34 + (this.__o[var33] & 255);
-               if(var37 < 0) {
-                  var37 = 0;
+               int var41 = var34 + (this.field570[var33] & 255);
+               if (var41 < 0) {
+                  var41 = 0;
                }
 
-               if(var37 > 128) {
-                  var37 = 128;
+               if (var41 > 128) {
+                  var41 = 128;
                }
 
-               this.__o[var33] = (byte)var37;
-               var32 += var45 - var49;
+               this.field570[var33] = (byte)var41;
+               var32 += var48 - var47;
             }
 
-            var46 = var30;
-            var49 = var45;
+            var38 = var31;
+            var47 = var48;
          }
 
-         for(var44 = var46; var44 < 128; ++var44) {
-            var45 = var49 + (this.__o[var44] & 255);
-            if(var45 < 0) {
-               var45 = 0;
+         for (var37 = var38; var37 < 128; ++var37) {
+            var48 = var47 + (this.field570[var37] & 255);
+            if (var48 < 0) {
+               var48 = 0;
             }
 
-            if(var45 > 128) {
-               var45 = 128;
+            if (var48 > 128) {
+               var48 = 128;
             }
 
-            this.__o[var44] = (byte)var45;
+            this.field570[var37] = (byte)var48;
          }
 
-         Object var48 = null;
+         Object var49 = null;
       }
 
-      for(var27 = 0; var27 < var12; ++var27) {
-         var39[var27].__q = var2.readUnsignedByte();
+      for (var28 = 0; var28 < var12; ++var28) {
+         var43[var28].field595 = var2.readUnsignedByte();
       }
 
-      for(var27 = 0; var27 < var12; ++var27) {
-         var28 = var39[var27];
-         if(var28.__m != null) {
-            var28.__w = var2.readUnsignedByte();
+      for (var28 = 0; var28 < var12; ++var28) {
+         var29 = var43[var28];
+         if (var29.field593 != null) {
+            var29.field596 = var2.readUnsignedByte();
          }
 
-         if(var28.__f != null) {
-            var28.__o = var2.readUnsignedByte();
+         if (var29.field594 != null) {
+            var29.field597 = var2.readUnsignedByte();
          }
 
-         if(var28.__q > 0) {
-            var28.__u = var2.readUnsignedByte();
+         if (var29.field595 > 0) {
+            var29.field598 = var2.readUnsignedByte();
          }
       }
 
-      for(var27 = 0; var27 < var12; ++var27) {
-         var39[var27].__l = var2.readUnsignedByte();
+      for (var28 = 0; var28 < var12; ++var28) {
+         var43[var28].field600 = var2.readUnsignedByte();
       }
 
-      for(var27 = 0; var27 < var12; ++var27) {
-         var28 = var39[var27];
-         if(var28.__l > 0) {
-            var28.__g = var2.readUnsignedByte();
+      for (var28 = 0; var28 < var12; ++var28) {
+         var29 = var43[var28];
+         if (var29.field600 > 0) {
+            var29.field599 = var2.readUnsignedByte();
          }
       }
 
-      for(var27 = 0; var27 < var12; ++var27) {
-         var28 = var39[var27];
-         if(var28.__g > 0) {
-            var28.__e = var2.readUnsignedByte();
+      for (var28 = 0; var28 < var12; ++var28) {
+         var29 = var43[var28];
+         if (var29.field599 > 0) {
+            var29.field601 = var2.readUnsignedByte();
          }
       }
 
@@ -490,31 +486,31 @@ public class MusicPatch extends Node {
       signature = "(Ldt;[B[II)Z",
       garbageValue = "1828768318"
    )
-   boolean __f_373(SoundCache var1, byte[] var2, int[] var3) {
+   boolean method218(SoundCache var1, byte[] var2, int[] var3) {
       boolean var4 = true;
       int var5 = 0;
       RawSound var6 = null;
 
-      for(int var7 = 0; var7 < 128; ++var7) {
-         if(var2 == null || var2[var7] != 0) {
-            int var8 = this.__l[var7];
-            if(var8 != 0) {
-               if(var8 != var5) {
+      for (int var7 = 0; var7 < 128; ++var7) {
+         if (var2 == null || var2[var7] != 0) {
+            int var8 = this.field573[var7];
+            if (var8 != 0) {
+               if (var8 != var5) {
                   var5 = var8--;
-                  if((var8 & 1) == 0) {
+                  if ((var8 & 1) == 0) {
                      var6 = var1.getSoundEffect(var8 >> 2, var3);
                   } else {
                      var6 = var1.getMusicSample(var8 >> 2, var3);
                   }
 
-                  if(var6 == null) {
+                  if (var6 == null) {
                      var4 = false;
                   }
                }
 
-               if(var6 != null) {
+               if (var6 != null) {
                   this.rawSounds[var7] = var6;
-                  this.__l[var7] = 0;
+                  this.field573[var7] = 0;
                }
             }
          }
@@ -530,6 +526,6 @@ public class MusicPatch extends Node {
    )
    @Export("clear")
    void clear() {
-      this.__l = null;
+      this.field573 = null;
    }
 }
diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java
index 66f778d7ee..4615410c85 100644
--- a/runescape-client/src/main/java/MusicPatchNode.java
+++ b/runescape-client/src/main/java/MusicPatchNode.java
@@ -17,7 +17,7 @@ public class MusicPatchNode extends Node {
    @ObfuscatedGetter(
       intValue = 801157533
    )
-   int __m;
+   int field574;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lhl;"
@@ -34,77 +34,77 @@ public class MusicPatchNode extends Node {
    @ObfuscatedSignature(
       signature = "Lhd;"
    )
-   MusicPatchNode2 __w;
+   MusicPatchNode2 field575;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = -2058553171
    )
-   int __o;
+   int field576;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 62958303
    )
-   int __u;
+   int field577;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = -836502917
    )
-   int __g;
+   int field578;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -308599455
    )
-   int __l;
+   int field579;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -471899285
    )
-   int __e;
+   int field580;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = -1520706641
    )
-   int __x;
+   int field581;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = -852988281
    )
-   int __d;
+   int field582;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = -439388365
    )
-   int __k;
+   int field583;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
       intValue = 476852577
    )
-   int __n;
+   int field584;
    @ObfuscatedName("i")
    @ObfuscatedGetter(
       intValue = -2136855685
    )
-   int __i;
+   int field585;
    @ObfuscatedName("a")
    @ObfuscatedGetter(
       intValue = -2083252379
    )
-   int __a;
+   int field586;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = 1605236771
    )
-   int __z;
+   int field587;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = 173672931
    )
-   int __j;
+   int field588;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = 219840779
    )
-   int __s;
+   int field589;
    @ObfuscatedName("t")
    @ObfuscatedSignature(
       signature = "Lds;"
@@ -115,22 +115,22 @@ public class MusicPatchNode extends Node {
    @ObfuscatedGetter(
       intValue = -666877449
    )
-   int __y;
+   int field590;
    @ObfuscatedName("b")
    @ObfuscatedGetter(
       intValue = 1359854411
    )
-   int __b;
+   int field591;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(B)V",
       garbageValue = "39"
    )
-   void __m_370() {
+   void method219() {
       this.patch = null;
       this.rawSound = null;
-      this.__w = null;
+      this.field575 = null;
       this.stream = null;
    }
 }
diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java
index 71625b12cc..c6d425a0a6 100644
--- a/runescape-client/src/main/java/MusicPatchNode2.java
+++ b/runescape-client/src/main/java/MusicPatchNode2.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
@@ -10,44 +9,44 @@ public class MusicPatchNode2 {
    @ObfuscatedGetter(
       longValue = -6780258776884306463L
    )
-   static long __hd_fc;
+   static long field592;
    @ObfuscatedName("m")
-   byte[] __m;
+   byte[] field593;
    @ObfuscatedName("f")
-   byte[] __f;
+   byte[] field594;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 140046797
    )
-   int __q;
+   int field595;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = -249046051
    )
-   int __w;
+   int field596;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = -1455145595
    )
-   int __o;
+   int field597;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 1577527995
    )
-   int __u;
+   int field598;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = 391670135
    )
-   int __g;
+   int field599;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = 320761691
    )
-   int __l;
+   int field600;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = 1984131473
    )
-   int __e;
+   int field601;
 }
diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java
index 664d11868d..2109c5b68a 100644
--- a/runescape-client/src/main/java/MusicPatchPcmStream.java
+++ b/runescape-client/src/main/java/MusicPatchPcmStream.java
@@ -11,7 +11,7 @@ public class MusicPatchPcmStream extends PcmStream {
    @ObfuscatedGetter(
       intValue = -1367955455
    )
-   static int __hq_qg;
+   static int field602;
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lhm;"
@@ -45,49 +45,49 @@ public class MusicPatchPcmStream extends PcmStream {
       signature = "(Lha;[IIIII)V",
       garbageValue = "1988628167"
    )
-   void __m_379(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) {
-      if((this.superStream.__y[var1.__m] & 4) != 0 && var1.__a < 0) {
-         int var6 = this.superStream.__p[var1.__m] / class309.PcmPlayer_sampleRate;
+   void method220(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) {
+      if ((this.superStream.field506[var1.field574] & 4) != 0 && var1.field586 < 0) {
+         int var6 = this.superStream.field511[var1.field574] / class309.PcmPlayer_sampleRate;
 
-         while(true) {
-            int var7 = (var6 + 1048575 - var1.__b) / var6;
-            if(var7 > var4) {
-               var1.__b += var4 * var6;
+         while (true) {
+            int var7 = (var6 + 1048575 - var1.field591) / var6;
+            if (var7 > var4) {
+               var1.field591 += var4 * var6;
                break;
             }
 
-            var1.stream.__e_172(var2, var3, var7);
+            var1.stream.vmethod263(var2, var3, var7);
             var3 += var7;
             var4 -= var7;
-            var1.__b += var7 * var6 - 1048576;
+            var1.field591 += var7 * var6 - 1048576;
             int var8 = class309.PcmPlayer_sampleRate / 100;
             int var9 = 262144 / var6;
-            if(var9 < var8) {
+            if (var9 < var8) {
                var8 = var9;
             }
 
             RawPcmStream var10 = var1.stream;
-            if(this.superStream.__c[var1.__m] == 0) {
-               var1.stream = RawPcmStream.method2524(var1.rawSound, var10.__ab_194(), var10.__s_185(), var10.__t_186());
+            if (this.superStream.field509[var1.field574] == 0) {
+               var1.stream = RawPcmStream.method2524(var1.rawSound, var10.method277(), var10.method268(), var10.method269());
             } else {
-               var1.stream = RawPcmStream.method2524(var1.rawSound, var10.__ab_194(), 0, var10.__t_186());
-               this.superStream.__h_346(var1, var1.patch.__q[var1.__u] < 0);
-               var1.stream.__c_190(var8, var10.__s_185());
+               var1.stream = RawPcmStream.method2524(var1.rawSound, var10.method277(), 0, var10.method269());
+               this.superStream.method178(var1, var1.patch.field568[var1.field577] < 0);
+               var1.stream.method273(var8, var10.method268());
             }
 
-            if(var1.patch.__q[var1.__u] < 0) {
+            if (var1.patch.field568[var1.field577] < 0) {
                var1.stream.setNumLoops(-1);
             }
 
-            var10.__v_192(var8);
-            var10.__e_172(var2, var3, var5 - var3);
-            if(var10.__at_196()) {
+            var10.method275(var8);
+            var10.vmethod263(var2, var3, var5 - var3);
+            if (var10.method279()) {
                this.mixer.addSubStream(var10);
             }
          }
       }
 
-      var1.stream.__e_172(var2, var3, var4);
+      var1.stream.vmethod263(var2, var3, var4);
    }
 
    @ObfuscatedName("f")
@@ -95,28 +95,28 @@ public class MusicPatchPcmStream extends PcmStream {
       signature = "(Lha;II)V",
       garbageValue = "1882591412"
    )
-   void __f_380(MusicPatchNode var1, int var2) {
-      if((this.superStream.__y[var1.__m] & 4) != 0 && var1.__a < 0) {
-         int var3 = this.superStream.__p[var1.__m] / class309.PcmPlayer_sampleRate;
-         int var4 = (var3 + 1048575 - var1.__b) / var3;
-         var1.__b = var3 * var2 + var1.__b & 1048575;
-         if(var4 <= var2) {
-            if(this.superStream.__c[var1.__m] == 0) {
-               var1.stream = RawPcmStream.method2524(var1.rawSound, var1.stream.__ab_194(), var1.stream.__s_185(), var1.stream.__t_186());
+   void method221(MusicPatchNode var1, int var2) {
+      if ((this.superStream.field506[var1.field574] & 4) != 0 && var1.field586 < 0) {
+         int var3 = this.superStream.field511[var1.field574] / class309.PcmPlayer_sampleRate;
+         int var4 = (var3 + 1048575 - var1.field591) / var3;
+         var1.field591 = var3 * var2 + var1.field591 & 1048575;
+         if (var4 <= var2) {
+            if (this.superStream.field509[var1.field574] == 0) {
+               var1.stream = RawPcmStream.method2524(var1.rawSound, var1.stream.method277(), var1.stream.method268(), var1.stream.method269());
             } else {
-               var1.stream = RawPcmStream.method2524(var1.rawSound, var1.stream.__ab_194(), 0, var1.stream.__t_186());
-               this.superStream.__h_346(var1, var1.patch.__q[var1.__u] < 0);
+               var1.stream = RawPcmStream.method2524(var1.rawSound, var1.stream.method277(), 0, var1.stream.method269());
+               this.superStream.method178(var1, var1.patch.field568[var1.field577] < 0);
             }
 
-            if(var1.patch.__q[var1.__u] < 0) {
+            if (var1.patch.field568[var1.field577] < 0) {
                var1.stream.setNumLoops(-1);
             }
 
-            var2 = var1.__b / var3;
+            var2 = var1.field591 / var3;
          }
       }
 
-      var1.stream.__d_173(var2);
+      var1.stream.vmethod264(var2);
    }
 
    @ObfuscatedName("u")
@@ -126,7 +126,7 @@ public class MusicPatchPcmStream extends PcmStream {
    @Export("firstSubStream")
    protected PcmStream firstSubStream() {
       MusicPatchNode var1 = (MusicPatchNode)this.queue.last();
-      return (PcmStream)(var1 == null?null:(var1.stream != null?var1.stream:this.nextSubStream()));
+      return (PcmStream)(var1 == null ? null : (var1.stream != null ? var1.stream : this.nextSubStream()));
    }
 
    @ObfuscatedName("g")
@@ -138,7 +138,7 @@ public class MusicPatchPcmStream extends PcmStream {
       MusicPatchNode var1;
       do {
          var1 = (MusicPatchNode)this.queue.previous();
-         if(var1 == null) {
+         if (var1 == null) {
             return null;
          }
       } while(var1.stream == null);
@@ -147,53 +147,53 @@ public class MusicPatchPcmStream extends PcmStream {
    }
 
    @ObfuscatedName("l")
-   protected int __l_171() {
+   protected int vmethod262() {
       return 0;
    }
 
    @ObfuscatedName("e")
-   protected void __e_172(int[] var1, int var2, int var3) {
-      this.mixer.__e_172(var1, var2, var3);
+   protected void vmethod263(int[] var1, int var2, int var3) {
+      this.mixer.vmethod263(var1, var2, var3);
 
-      for(MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) {
-         if(!this.superStream.__ba_368(var6)) {
-            int var4 = var2;
-            int var5 = var3;
+      for (MusicPatchNode var4 = (MusicPatchNode)this.queue.last(); var4 != null; var4 = (MusicPatchNode)this.queue.previous()) {
+         if (!this.superStream.method195(var4)) {
+            int var5 = var2;
+            int var6 = var3;
 
             do {
-               if(var5 <= var6.__y) {
-                  this.__m_379(var6, var1, var4, var5, var5 + var4);
-                  var6.__y -= var5;
+               if (var6 <= var4.field590) {
+                  this.method220(var4, var1, var5, var6, var6 + var5);
+                  var4.field590 -= var6;
                   break;
                }
 
-               this.__m_379(var6, var1, var4, var6.__y, var5 + var4);
-               var4 += var6.__y;
-               var5 -= var6.__y;
-            } while(!this.superStream.__bb_369(var6, var1, var4, var5));
+               this.method220(var4, var1, var5, var4.field590, var6 + var5);
+               var5 += var4.field590;
+               var6 -= var4.field590;
+            } while(!this.superStream.method196(var4, var1, var5, var6));
          }
       }
 
    }
 
    @ObfuscatedName("d")
-   protected void __d_173(int var1) {
-      this.mixer.__d_173(var1);
+   protected void vmethod264(int var1) {
+      this.mixer.vmethod264(var1);
 
-      for(MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) {
-         if(!this.superStream.__ba_368(var3)) {
-            int var2 = var1;
+      for (MusicPatchNode var2 = (MusicPatchNode)this.queue.last(); var2 != null; var2 = (MusicPatchNode)this.queue.previous()) {
+         if (!this.superStream.method195(var2)) {
+            int var3 = var1;
 
             do {
-               if(var2 <= var3.__y) {
-                  this.__f_380(var3, var2);
-                  var3.__y -= var2;
+               if (var3 <= var2.field590) {
+                  this.method221(var2, var3);
+                  var2.field590 -= var3;
                   break;
                }
 
-               this.__f_380(var3, var3.__y);
-               var2 -= var3.__y;
-            } while(!this.superStream.__bb_369(var3, (int[])null, 0, var2));
+               this.method221(var2, var2.field590);
+               var3 -= var2.field590;
+            } while(!this.superStream.method196(var2, (int[])null, 0, var3));
          }
       }
 
diff --git a/runescape-client/src/main/java/MusicSample.java b/runescape-client/src/main/java/MusicSample.java
index 7c5cb71a6a..99bd23e94c 100644
--- a/runescape-client/src/main/java/MusicSample.java
+++ b/runescape-client/src/main/java/MusicSample.java
@@ -7,15 +7,15 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("MusicSample")
 public class MusicSample extends Node {
    @ObfuscatedName("g")
-   static byte[] __cd_g;
+   static byte[] field603;
    @ObfuscatedName("l")
-   static int __cd_l;
+   static int field604;
    @ObfuscatedName("e")
-   static int __cd_e;
+   static int field605;
    @ObfuscatedName("x")
-   static int __cd_x;
+   static int field606;
    @ObfuscatedName("d")
-   static int __cd_d;
+   static int field607;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "[Lcc;"
@@ -37,31 +37,31 @@ public class MusicSample extends Node {
    )
    static class114[] field1326;
    @ObfuscatedName("z")
-   static boolean[] __cd_z;
+   static boolean[] field608;
    @ObfuscatedName("j")
-   static int[] __cd_j;
+   static int[] field609;
    @ObfuscatedName("s")
-   static boolean __cd_s;
+   static boolean field610;
    @ObfuscatedName("c")
-   static float[] __cd_c;
+   static float[] field611;
    @ObfuscatedName("r")
-   static float[] __cd_r;
+   static float[] field612;
    @ObfuscatedName("p")
-   static float[] __cd_p;
+   static float[] field613;
    @ObfuscatedName("v")
-   static float[] __cd_v;
+   static float[] field614;
    @ObfuscatedName("ag")
-   static float[] __cd_ag;
+   static float[] field615;
    @ObfuscatedName("aq")
-   static float[] __cd_aq;
+   static float[] field616;
    @ObfuscatedName("aj")
-   static float[] __cd_aj;
+   static float[] field617;
    @ObfuscatedName("av")
-   static int[] __cd_av;
+   static int[] field618;
    @ObfuscatedName("ar")
-   static int[] __cd_ar;
+   static int[] field619;
    @ObfuscatedName("m")
-   byte[][] __m;
+   byte[][] field620;
    @ObfuscatedName("f")
    @Export("sampleRate")
    int sampleRate;
@@ -75,26 +75,22 @@ public class MusicSample extends Node {
    @Export("end")
    int end;
    @ObfuscatedName("u")
-   boolean __u;
+   boolean field621;
    @ObfuscatedName("t")
-   float[] __t;
+   float[] field622;
    @ObfuscatedName("y")
-   int __y;
+   int field623;
    @ObfuscatedName("h")
-   int __h;
+   int field624;
    @ObfuscatedName("b")
-   boolean __b;
+   boolean field625;
    @ObfuscatedName("ac")
    @Export("samples")
    byte[] samples;
    @ObfuscatedName("ay")
-   int __ay;
+   int field626;
    @ObfuscatedName("ah")
-   int __ah;
-
-   static {
-      __cd_s = false;
-   }
+   int field627;
 
    MusicSample(byte[] var1) {
       this.read(var1);
@@ -108,15 +104,15 @@ public class MusicSample extends Node {
       this.sampleCount = var2.readInt();
       this.start = var2.readInt();
       this.end = var2.readInt();
-      if(this.end < 0) {
+      if (this.end < 0) {
          this.end = ~this.end;
-         this.__u = true;
+         this.field621 = true;
       }
 
       int var3 = var2.readInt();
-      this.__m = new byte[var3][];
+      this.field620 = new byte[var3][];
 
-      for(int var4 = 0; var4 < var3; ++var4) {
+      for (int var4 = 0; var4 < var3; ++var4) {
          int var5 = 0;
 
          int var6;
@@ -126,22 +122,22 @@ public class MusicSample extends Node {
          } while(var6 >= 255);
 
          byte[] var7 = new byte[var5];
-         var2.__al_305(var7, 0, var5);
-         this.__m[var4] = var7;
+         var2.method46(var7, 0, var5);
+         this.field620[var4] = var7;
       }
 
    }
 
    @ObfuscatedName("g")
-   float[] __g_175(int var1) {
-      method2337(this.__m[var1], 0);
+   float[] method225(int var1) {
+      method2337(this.field620[var1], 0);
       method2338();
-      int var2 = method2352(WorldMapCacheName.method634(__cd_j.length - 1));
-      boolean var3 = __cd_z[var2];
-      int var4 = var3?__cd_d:__cd_x;
+      int var2 = method2352(WorldMapCacheName.method634(field609.length - 1));
+      boolean var3 = field608[var2];
+      int var4 = var3 ? field607 : field606;
       boolean var5 = false;
       boolean var6 = false;
-      if(var3) {
+      if (var3) {
          var5 = method2338() != 0;
          var6 = method2338() != 0;
       }
@@ -150,10 +146,10 @@ public class MusicSample extends Node {
       int var8;
       int var9;
       int var10;
-      if(var3 && !var5) {
-         var8 = (var4 >> 2) - (__cd_x >> 2);
-         var9 = (__cd_x >> 2) + (var4 >> 2);
-         var10 = __cd_x >> 1;
+      if (var3 && !var5) {
+         var8 = (var4 >> 2) - (field606 >> 2);
+         var9 = (field606 >> 2) + (var4 >> 2);
+         var10 = field606 >> 1;
       } else {
          var8 = 0;
          var9 = var7;
@@ -163,224 +159,227 @@ public class MusicSample extends Node {
       int var11;
       int var12;
       int var13;
-      if(var3 && !var6) {
-         var11 = var4 - (var4 >> 2) - (__cd_x >> 2);
-         var12 = (__cd_x >> 2) + (var4 - (var4 >> 2));
-         var13 = __cd_x >> 1;
+      if (var3 && !var6) {
+         var11 = var4 - (var4 >> 2) - (field606 >> 2);
+         var12 = (field606 >> 2) + (var4 - (var4 >> 2));
+         var13 = field606 >> 1;
       } else {
          var11 = var7;
          var12 = var4;
          var13 = var4 >> 1;
       }
 
-      class114 var14 = field1326[__cd_j[var2]];
-      int var16 = var14.field1454;
-      int var17 = var14.field1452[var16];
-      boolean var15 = !field1324[var17].method2367();
-      boolean var45 = var15;
+      class114 var14 = field1326[field609[var2]];
+      int var15 = var14.field1454;
+      int var16 = var14.field1452[var15];
+      boolean var17 = !field1324[var16].method2367();
+      boolean var18 = var17;
 
-      for(var17 = 0; var17 < var14.field1453; ++var17) {
-         class109 var18 = field1344[var14.field1455[var17]];
-         float[] var19 = __cd_c;
-         var18.method2473(var19, var4 >> 1, var45);
+      for (var16 = 0; var16 < var14.field1453; ++var16) {
+         class109 var19 = field1344[var14.field1455[var16]];
+         float[] var20 = field611;
+         var19.method2473(var20, var4 >> 1, var18);
       }
 
-      int var40;
-      if(!var15) {
-         var17 = var14.field1454;
-         var40 = var14.field1452[var17];
-         field1324[var40].method2375(__cd_c, var4 >> 1);
+      int var48;
+      if (!var17) {
+         var16 = var14.field1454;
+         var48 = var14.field1452[var16];
+         field1324[var48].method2375(field611, var4 >> 1);
       }
 
-      int var42;
-      if(var15) {
-         for(var17 = var4 >> 1; var17 < var4; ++var17) {
-            __cd_c[var17] = 0.0F;
+      float[] var21;
+      int var22;
+      int var49;
+      if (var17) {
+         for (var16 = var4 >> 1; var16 < var4; ++var16) {
+            field611[var16] = 0.0F;
          }
       } else {
-         var17 = var4 >> 1;
-         var40 = var4 >> 2;
-         var42 = var4 >> 3;
-         float[] var43 = __cd_c;
+         var16 = var4 >> 1;
+         var48 = var4 >> 2;
+         var49 = var4 >> 3;
+         var21 = field611;
 
-         int var21;
-         for(var21 = 0; var21 < var17; ++var21) {
-            var43[var21] *= 0.5F;
+         for (var22 = 0; var22 < var16; ++var22) {
+            var21[var22] *= 0.5F;
          }
 
-         for(var21 = var17; var21 < var4; ++var21) {
-            var43[var21] = -var43[var4 - var21 - 1];
+         for (var22 = var16; var22 < var4; ++var22) {
+            var21[var22] = -var21[var4 - var22 - 1];
          }
 
-         float[] var44 = var3?__cd_ag:__cd_r;
-         float[] var22 = var3?__cd_aq:__cd_p;
-         float[] var23 = var3?__cd_aj:__cd_v;
-         int[] var24 = var3?__cd_ar:__cd_av;
+         float[] var23 = var3 ? field615 : field612;
+         float[] var24 = var3 ? field616 : field613;
+         float[] var25 = var3 ? field617 : field614;
+         int[] var26 = var3 ? field619 : field618;
 
-         int var25;
-         float var26;
-         float var27;
+         int var27;
          float var28;
          float var29;
-         for(var25 = 0; var25 < var40; ++var25) {
-            var26 = var43[var25 * 4] - var43[var4 - var25 * 4 - 1];
-            var27 = var43[var25 * 4 + 2] - var43[var4 - var25 * 4 - 3];
-            var28 = var44[var25 * 2];
-            var29 = var44[var25 * 2 + 1];
-            var43[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29;
-            var43[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28;
-         }
-
          float var30;
          float var31;
-         for(var25 = 0; var25 < var42; ++var25) {
-            var26 = var43[var17 + var25 * 4 + 3];
-            var27 = var43[var17 + var25 * 4 + 1];
-            var28 = var43[var25 * 4 + 3];
-            var29 = var43[var25 * 4 + 1];
-            var43[var17 + var25 * 4 + 3] = var26 + var28;
-            var43[var17 + var25 * 4 + 1] = var27 + var29;
-            var30 = var44[var17 - 4 - var25 * 4];
-            var31 = var44[var17 - 3 - var25 * 4];
-            var43[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31;
-            var43[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31;
+         for (var27 = 0; var27 < var48; ++var27) {
+            var28 = var21[var27 * 4] - var21[var4 - var27 * 4 - 1];
+            var29 = var21[var27 * 4 + 2] - var21[var4 - var27 * 4 - 3];
+            var30 = var23[var27 * 2];
+            var31 = var23[var27 * 2 + 1];
+            var21[var4 - var27 * 4 - 1] = var28 * var30 - var29 * var31;
+            var21[var4 - var27 * 4 - 3] = var28 * var31 + var29 * var30;
          }
 
-         var25 = WorldMapCacheName.method634(var4 - 1);
+         float var32;
+         float var33;
+         for (var27 = 0; var27 < var49; ++var27) {
+            var28 = var21[var16 + var27 * 4 + 3];
+            var29 = var21[var16 + var27 * 4 + 1];
+            var30 = var21[var27 * 4 + 3];
+            var31 = var21[var27 * 4 + 1];
+            var21[var16 + var27 * 4 + 3] = var28 + var30;
+            var21[var16 + var27 * 4 + 1] = var29 + var31;
+            var32 = var23[var16 - 4 - var27 * 4];
+            var33 = var23[var16 - 3 - var27 * 4];
+            var21[var27 * 4 + 3] = (var28 - var30) * var32 - (var29 - var31) * var33;
+            var21[var27 * 4 + 1] = (var29 - var31) * var32 + (var28 - var30) * var33;
+         }
 
-         int var47;
-         int var48;
-         int var49;
-         int var50;
-         for(var47 = 0; var47 < var25 - 3; ++var47) {
-            var48 = var4 >> var47 + 2;
-            var49 = 8 << var47;
+         var27 = WorldMapCacheName.method634(var4 - 1);
 
-            for(var50 = 0; var50 < 2 << var47; ++var50) {
-               int var51 = var4 - var48 * var50 * 2;
-               int var52 = var4 - var48 * (var50 * 2 + 1);
+         int var34;
+         int var35;
+         int var36;
+         int var37;
+         for (var34 = 0; var34 < var27 - 3; ++var34) {
+            var35 = var4 >> var34 + 2;
+            var36 = 8 << var34;
 
-               for(int var32 = 0; var32 < var4 >> var47 + 4; ++var32) {
-                  int var33 = var32 * 4;
-                  float var34 = var43[var51 - 1 - var33];
-                  float var35 = var43[var51 - 3 - var33];
-                  float var36 = var43[var52 - 1 - var33];
-                  float var37 = var43[var52 - 3 - var33];
-                  var43[var51 - 1 - var33] = var34 + var36;
-                  var43[var51 - 3 - var33] = var35 + var37;
-                  float var38 = var44[var32 * var49];
-                  float var39 = var44[var32 * var49 + 1];
-                  var43[var52 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39;
-                  var43[var52 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39;
+            for (var37 = 0; var37 < 2 << var34; ++var37) {
+               int var38 = var4 - var35 * var37 * 2;
+               int var39 = var4 - var35 * (var37 * 2 + 1);
+
+               for (int var40 = 0; var40 < var4 >> var34 + 4; ++var40) {
+                  int var41 = var40 * 4;
+                  float var42 = var21[var38 - 1 - var41];
+                  float var43 = var21[var38 - 3 - var41];
+                  float var44 = var21[var39 - 1 - var41];
+                  float var45 = var21[var39 - 3 - var41];
+                  var21[var38 - 1 - var41] = var42 + var44;
+                  var21[var38 - 3 - var41] = var43 + var45;
+                  float var46 = var23[var40 * var36];
+                  float var47 = var23[var40 * var36 + 1];
+                  var21[var39 - 1 - var41] = (var42 - var44) * var46 - (var43 - var45) * var47;
+                  var21[var39 - 3 - var41] = (var43 - var45) * var46 + (var42 - var44) * var47;
                }
             }
          }
 
-         for(var47 = 1; var47 < var42 - 1; ++var47) {
-            var48 = var24[var47];
-            if(var47 < var48) {
-               var49 = var47 * 8;
-               var50 = var48 * 8;
-               var30 = var43[var49 + 1];
-               var43[var49 + 1] = var43[var50 + 1];
-               var43[var50 + 1] = var30;
-               var30 = var43[var49 + 3];
-               var43[var49 + 3] = var43[var50 + 3];
-               var43[var50 + 3] = var30;
-               var30 = var43[var49 + 5];
-               var43[var49 + 5] = var43[var50 + 5];
-               var43[var50 + 5] = var30;
-               var30 = var43[var49 + 7];
-               var43[var49 + 7] = var43[var50 + 7];
-               var43[var50 + 7] = var30;
+         for (var34 = 1; var34 < var49 - 1; ++var34) {
+            var35 = var26[var34];
+            if (var34 < var35) {
+               var36 = var34 * 8;
+               var37 = var35 * 8;
+               var32 = var21[var36 + 1];
+               var21[var36 + 1] = var21[var37 + 1];
+               var21[var37 + 1] = var32;
+               var32 = var21[var36 + 3];
+               var21[var36 + 3] = var21[var37 + 3];
+               var21[var37 + 3] = var32;
+               var32 = var21[var36 + 5];
+               var21[var36 + 5] = var21[var37 + 5];
+               var21[var37 + 5] = var32;
+               var32 = var21[var36 + 7];
+               var21[var36 + 7] = var21[var37 + 7];
+               var21[var37 + 7] = var32;
             }
          }
 
-         for(var47 = 0; var47 < var17; ++var47) {
-            var43[var47] = var43[var47 * 2 + 1];
+         for (var34 = 0; var34 < var16; ++var34) {
+            var21[var34] = var21[var34 * 2 + 1];
          }
 
-         for(var47 = 0; var47 < var42; ++var47) {
-            var43[var4 - 1 - var47 * 2] = var43[var47 * 4];
-            var43[var4 - 2 - var47 * 2] = var43[var47 * 4 + 1];
-            var43[var4 - var40 - 1 - var47 * 2] = var43[var47 * 4 + 2];
-            var43[var4 - var40 - 2 - var47 * 2] = var43[var47 * 4 + 3];
+         for (var34 = 0; var34 < var49; ++var34) {
+            var21[var4 - 1 - var34 * 2] = var21[var34 * 4];
+            var21[var4 - 2 - var34 * 2] = var21[var34 * 4 + 1];
+            var21[var4 - var48 - 1 - var34 * 2] = var21[var34 * 4 + 2];
+            var21[var4 - var48 - 2 - var34 * 2] = var21[var34 * 4 + 3];
          }
 
-         for(var47 = 0; var47 < var42; ++var47) {
-            var27 = var23[var47 * 2];
-            var28 = var23[var47 * 2 + 1];
-            var29 = var43[var17 + var47 * 2];
-            var30 = var43[var17 + var47 * 2 + 1];
-            var31 = var43[var4 - 2 - var47 * 2];
-            float var53 = var43[var4 - 1 - var47 * 2];
-            float var54 = var28 * (var29 - var31) + var27 * (var30 + var53);
-            var43[var17 + var47 * 2] = (var29 + var31 + var54) * 0.5F;
-            var43[var4 - 2 - var47 * 2] = (var29 + var31 - var54) * 0.5F;
-            var54 = var28 * (var30 + var53) - var27 * (var29 - var31);
-            var43[var17 + var47 * 2 + 1] = (var30 - var53 + var54) * 0.5F;
-            var43[var4 - 1 - var47 * 2] = (-var30 + var53 + var54) * 0.5F;
+         for (var34 = 0; var34 < var49; ++var34) {
+            var29 = var25[var34 * 2];
+            var30 = var25[var34 * 2 + 1];
+            var31 = var21[var16 + var34 * 2];
+            var32 = var21[var16 + var34 * 2 + 1];
+            var33 = var21[var4 - 2 - var34 * 2];
+            float var51 = var21[var4 - 1 - var34 * 2];
+            float var52 = var30 * (var31 - var33) + var29 * (var32 + var51);
+            var21[var16 + var34 * 2] = (var31 + var33 + var52) * 0.5F;
+            var21[var4 - 2 - var34 * 2] = (var31 + var33 - var52) * 0.5F;
+            var52 = var30 * (var32 + var51) - var29 * (var31 - var33);
+            var21[var16 + var34 * 2 + 1] = (var32 - var51 + var52) * 0.5F;
+            var21[var4 - 1 - var34 * 2] = (-var32 + var51 + var52) * 0.5F;
          }
 
-         for(var47 = 0; var47 < var40; ++var47) {
-            var43[var47] = var43[var17 + var47 * 2] * var22[var47 * 2] + var43[var17 + var47 * 2 + 1] * var22[var47 * 2 + 1];
-            var43[var17 - 1 - var47] = var43[var17 + var47 * 2] * var22[var47 * 2 + 1] - var43[var17 + var47 * 2 + 1] * var22[var47 * 2];
+         for (var34 = 0; var34 < var48; ++var34) {
+            var21[var34] = var21[var16 + var34 * 2] * var24[var34 * 2] + var21[var16 + var34 * 2 + 1] * var24[var34 * 2 + 1];
+            var21[var16 - 1 - var34] = var21[var16 + var34 * 2] * var24[var34 * 2 + 1] - var21[var16 + var34 * 2 + 1] * var24[var34 * 2];
          }
 
-         for(var47 = 0; var47 < var40; ++var47) {
-            var43[var47 + (var4 - var40)] = -var43[var47];
+         for (var34 = 0; var34 < var48; ++var34) {
+            var21[var34 + (var4 - var48)] = -var21[var34];
          }
 
-         for(var47 = 0; var47 < var40; ++var47) {
-            var43[var47] = var43[var40 + var47];
+         for (var34 = 0; var34 < var48; ++var34) {
+            var21[var34] = var21[var48 + var34];
          }
 
-         for(var47 = 0; var47 < var40; ++var47) {
-            var43[var40 + var47] = -var43[var40 - var47 - 1];
+         for (var34 = 0; var34 < var48; ++var34) {
+            var21[var48 + var34] = -var21[var48 - var34 - 1];
          }
 
-         for(var47 = 0; var47 < var40; ++var47) {
-            var43[var17 + var47] = var43[var4 - var47 - 1];
+         for (var34 = 0; var34 < var48; ++var34) {
+            var21[var16 + var34] = var21[var4 - var34 - 1];
          }
 
-         for(var47 = var8; var47 < var9; ++var47) {
-            var27 = (float)Math.sin(((double)(var47 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D);
-            __cd_c[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27);
+         float[] var10000;
+         for (var34 = var8; var34 < var9; ++var34) {
+            var29 = (float)Math.sin(((double)(var34 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D);
+            var10000 = field611;
+            var10000[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29);
          }
 
-         for(var47 = var11; var47 < var12; ++var47) {
-            var27 = (float)Math.sin(((double)(var47 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D);
-            __cd_c[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27);
+         for (var34 = var11; var34 < var12; ++var34) {
+            var29 = (float)Math.sin(((double)(var34 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D);
+            var10000 = field611;
+            var10000[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29);
          }
       }
 
-      float[] var41 = null;
-      if(this.__y > 0) {
-         var40 = var4 + this.__y >> 2;
-         var41 = new float[var40];
-         int var20;
-         if(!this.__b) {
-            for(var42 = 0; var42 < this.__h; ++var42) {
-               var20 = var42 + (this.__y >> 1);
-               var41[var42] += this.__t[var20];
+      var21 = null;
+      if (this.field623 > 0) {
+         var48 = var4 + this.field623 >> 2;
+         var21 = new float[var48];
+         if (!this.field625) {
+            for (var49 = 0; var49 < this.field624; ++var49) {
+               var22 = var49 + (this.field623 >> 1);
+               var21[var49] += this.field622[var22];
             }
          }
 
-         if(!var15) {
-            for(var42 = var8; var42 < var4 >> 1; ++var42) {
-               var20 = var41.length - (var4 >> 1) + var42;
-               var41[var20] += __cd_c[var42];
+         if (!var17) {
+            for (var49 = var8; var49 < var4 >> 1; ++var49) {
+               var22 = var21.length - (var4 >> 1) + var49;
+               var21[var22] += field611[var49];
             }
          }
       }
 
-      float[] var46 = this.__t;
-      this.__t = __cd_c;
-      __cd_c = var46;
-      this.__y = var4;
-      this.__h = var12 - (var4 >> 1);
-      this.__b = var15;
-      return var41;
+      float[] var50 = this.field622;
+      this.field622 = field611;
+      field611 = var50;
+      this.field623 = var4;
+      this.field624 = var12 - (var4 >> 1);
+      this.field625 = var17;
+      return var21;
    }
 
    @ObfuscatedName("x")
@@ -389,51 +388,51 @@ public class MusicSample extends Node {
    )
    @Export("toRawSound")
    RawSound toRawSound(int[] var1) {
-      if(var1 != null && var1[0] <= 0) {
+      if (var1 != null && var1[0] <= 0) {
          return null;
       } else {
-         if(this.samples == null) {
-            this.__y = 0;
-            this.__t = new float[__cd_d];
+         if (this.samples == null) {
+            this.field623 = 0;
+            this.field622 = new float[field607];
             this.samples = new byte[this.sampleCount];
-            this.__ay = 0;
-            this.__ah = 0;
+            this.field626 = 0;
+            this.field627 = 0;
          }
 
-         for(; this.__ah < this.__m.length; ++this.__ah) {
-            if(var1 != null && var1[0] <= 0) {
+         for (; this.field627 < this.field620.length; ++this.field627) {
+            if (var1 != null && var1[0] <= 0) {
                return null;
             }
 
-            float[] var2 = this.__g_175(this.__ah);
-            if(var2 != null) {
-               int var3 = this.__ay;
+            float[] var2 = this.method225(this.field627);
+            if (var2 != null) {
+               int var3 = this.field626;
                int var4 = var2.length;
-               if(var4 > this.sampleCount - var3) {
+               if (var4 > this.sampleCount - var3) {
                   var4 = this.sampleCount - var3;
                }
 
-               for(int var5 = 0; var5 < var4; ++var5) {
+               for (int var5 = 0; var5 < var4; ++var5) {
                   int var6 = (int)(128.0F + var2[var5] * 128.0F);
-                  if((var6 & -256) != 0) {
+                  if ((var6 & -256) != 0) {
                      var6 = ~var6 >> 31;
                   }
 
                   this.samples[var3++] = (byte)(var6 - 128);
                }
 
-               if(var1 != null) {
-                  var1[0] -= var3 - this.__ay;
+               if (var1 != null) {
+                  var1[0] -= var3 - this.field626;
                }
 
-               this.__ay = var3;
+               this.field626 = var3;
             }
          }
 
-         this.__t = null;
+         this.field622 = null;
          byte[] var7 = this.samples;
          this.samples = null;
-         return new RawSound(this.sampleRate, var7, this.start, this.end, this.__u);
+         return new RawSound(this.sampleRate, var7, this.start, this.end, this.field621);
       }
    }
 
@@ -442,7 +441,7 @@ public class MusicSample extends Node {
       int var1 = var0 & 2097151;
       int var2 = var0 & Integer.MIN_VALUE;
       int var3 = (var0 & 2145386496) >> 21;
-      if(var2 != 0) {
+      if (var2 != 0) {
          var1 = -var1;
       }
 
@@ -451,17 +450,17 @@ public class MusicSample extends Node {
 
    @ObfuscatedName("f")
    static void method2337(byte[] var0, int var1) {
-      __cd_g = var0;
-      __cd_l = var1;
-      __cd_e = 0;
+      field603 = var0;
+      field604 = var1;
+      field605 = 0;
    }
 
    @ObfuscatedName("q")
    static int method2338() {
-      int var0 = __cd_g[__cd_l] >> __cd_e & 1;
-      ++__cd_e;
-      __cd_l += __cd_e >> 3;
-      __cd_e &= 7;
+      int var0 = field603[field604] >> field605 & 1;
+      ++field605;
+      field604 += field605 >> 3;
+      field605 &= 7;
       return var0;
    }
 
@@ -471,19 +470,19 @@ public class MusicSample extends Node {
 
       int var2;
       int var3;
-      for(var2 = 0; var0 >= 8 - __cd_e; var0 -= var3) {
-         var3 = 8 - __cd_e;
+      for (var2 = 0; var0 >= 8 - field605; var0 -= var3) {
+         var3 = 8 - field605;
          int var4 = (1 << var3) - 1;
-         var1 += (__cd_g[__cd_l] >> __cd_e & var4) << var2;
-         __cd_e = 0;
-         ++__cd_l;
+         var1 += (field603[field604] >> field605 & var4) << var2;
+         field605 = 0;
+         ++field604;
          var2 += var3;
       }
 
-      if(var0 > 0) {
+      if (var0 > 0) {
          var3 = (1 << var0) - 1;
-         var1 += (__cd_g[__cd_l] >> __cd_e & var3) << var2;
-         __cd_e += var0;
+         var1 += (field603[field604] >> field605 & var3) << var2;
+         field605 += var0;
       }
 
       return var1;
@@ -492,104 +491,104 @@ public class MusicSample extends Node {
    @ObfuscatedName("u")
    static void method2341(byte[] var0) {
       method2337(var0, 0);
-      __cd_x = 1 << method2352(4);
-      __cd_d = 1 << method2352(4);
-      __cd_c = new float[__cd_d];
+      field606 = 1 << method2352(4);
+      field607 = 1 << method2352(4);
+      field611 = new float[field607];
 
       int var1;
       int var2;
       int var3;
       int var4;
       int var5;
-      for(var1 = 0; var1 < 2; ++var1) {
-         var2 = var1 != 0?__cd_d:__cd_x;
+      for (var1 = 0; var1 < 2; ++var1) {
+         var2 = var1 != 0 ? field607 : field606;
          var3 = var2 >> 1;
          var4 = var2 >> 2;
          var5 = var2 >> 3;
          float[] var6 = new float[var3];
 
-         for(int var7 = 0; var7 < var4; ++var7) {
+         for (int var7 = 0; var7 < var4; ++var7) {
             var6[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2);
             var6[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2));
          }
 
-         float[] var12 = new float[var3];
+         float[] var13 = new float[var3];
 
-         for(int var8 = 0; var8 < var4; ++var8) {
-            var12[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2));
-            var12[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2));
+         for (int var8 = 0; var8 < var4; ++var8) {
+            var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2));
+            var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2));
          }
 
-         float[] var13 = new float[var4];
+         float[] var14 = new float[var4];
 
-         for(int var9 = 0; var9 < var5; ++var9) {
-            var13[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2);
-            var13[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2));
+         for (int var9 = 0; var9 < var5; ++var9) {
+            var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2);
+            var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2));
          }
 
-         int[] var14 = new int[var5];
+         int[] var15 = new int[var5];
          int var10 = WorldMapCacheName.method634(var5 - 1);
 
-         for(int var11 = 0; var11 < var5; ++var11) {
-            var14[var11] = GrandExchangeEvent.method87(var11, var10);
+         for (int var11 = 0; var11 < var5; ++var11) {
+            var15[var11] = GrandExchangeEvent.method87(var11, var10);
          }
 
-         if(var1 != 0) {
-            __cd_ag = var6;
-            __cd_aq = var12;
-            __cd_aj = var13;
-            __cd_ar = var14;
+         if (var1 != 0) {
+            field615 = var6;
+            field616 = var13;
+            field617 = var14;
+            field619 = var15;
          } else {
-            __cd_r = var6;
-            __cd_p = var12;
-            __cd_v = var13;
-            __cd_av = var14;
+            field612 = var6;
+            field613 = var13;
+            field614 = var14;
+            field618 = var15;
          }
       }
 
       var1 = method2352(8) + 1;
       field1323 = new class98[var1];
 
-      for(var2 = 0; var2 < var1; ++var2) {
+      for (var2 = 0; var2 < var1; ++var2) {
          field1323[var2] = new class98();
       }
 
       var2 = method2352(6) + 1;
 
-      for(var3 = 0; var3 < var2; ++var3) {
+      for (var3 = 0; var3 < var2; ++var3) {
          method2352(16);
       }
 
       var2 = method2352(6) + 1;
       field1324 = new class102[var2];
 
-      for(var3 = 0; var3 < var2; ++var3) {
+      for (var3 = 0; var3 < var2; ++var3) {
          field1324[var3] = new class102();
       }
 
       var3 = method2352(6) + 1;
       field1344 = new class109[var3];
 
-      for(var4 = 0; var4 < var3; ++var4) {
+      for (var4 = 0; var4 < var3; ++var4) {
          field1344[var4] = new class109();
       }
 
       var4 = method2352(6) + 1;
       field1326 = new class114[var4];
 
-      for(var5 = 0; var5 < var4; ++var5) {
+      for (var5 = 0; var5 < var4; ++var5) {
          field1326[var5] = new class114();
       }
 
       var5 = method2352(6) + 1;
-      __cd_z = new boolean[var5];
-      __cd_j = new int[var5];
+      field608 = new boolean[var5];
+      field609 = new int[var5];
 
-      for(int var15 = 0; var15 < var5; ++var15) {
-         __cd_z[var15] = method2338() != 0;
+      for (int var12 = 0; var12 < var5; ++var12) {
+         field608[var12] = method2338() != 0;
          method2352(16);
          method2352(16);
-         __cd_j[var15] = method2352(8);
+         field609[var12] = method2352(8);
       }
 
    }
@@ -599,14 +598,14 @@ public class MusicSample extends Node {
       signature = "(Lir;)Z"
    )
    static boolean method2343(AbstractIndexCache var0) {
-      if(!__cd_s) {
+      if (!field610) {
          byte[] var1 = var0.takeRecord(0, 0);
-         if(var1 == null) {
+         if (var1 == null) {
             return false;
          }
 
          method2341(var1);
-         __cd_s = true;
+         field610 = true;
       }
 
       return true;
@@ -618,12 +617,16 @@ public class MusicSample extends Node {
    )
    @Export("readMusicSample")
    static MusicSample readMusicSample(AbstractIndexCache var0, int var1, int var2) {
-      if(!method2343(var0)) {
+      if (!method2343(var0)) {
          var0.tryLoadRecord(var1, var2);
          return null;
       } else {
          byte[] var3 = var0.takeRecord(var1, var2);
-         return var3 == null?null:new MusicSample(var3);
+         return var3 == null ? null : new MusicSample(var3);
       }
    }
+
+   static {
+      field610 = false;
+   }
 }
diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java
index bd207d4761..57a5653b29 100644
--- a/runescape-client/src/main/java/MusicTrack.java
+++ b/runescape-client/src/main/java/MusicTrack.java
@@ -22,7 +22,7 @@ public class MusicTrack extends Node {
    MusicTrack(Buffer var1) {
       var1.index = var1.array.length - 3;
       int var2 = var1.readUnsignedByte();
-      int var3 = var1.__ag_302();
+      int var3 = var1.method43();
       int var4 = var2 * 10 + 14;
       var1.index = 0;
       int var5 = 0;
@@ -37,36 +37,36 @@ public class MusicTrack extends Node {
       int var13;
       int var14;
       int var15;
-      for(var13 = 0; var13 < var2; ++var13) {
+      for (var13 = 0; var13 < var2; ++var13) {
          var14 = -1;
 
-         while(true) {
+         while (true) {
             var15 = var1.readUnsignedByte();
-            if(var15 != var14) {
+            if (var15 != var14) {
                ++var4;
             }
 
             var14 = var15 & 15;
-            if(var15 == 7) {
+            if (var15 == 7) {
                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();
                }
 
@@ -81,8 +81,8 @@ public class MusicTrack extends Node {
       var13 = var1.index;
       var14 = var2 + var5 + var6 + var7 + var8 + var9 + var10 + var11 + var12;
 
-      for(var15 = 0; var15 < var14; ++var15) {
-         var1.__as_311();
+      for (var15 = 0; var15 < var14; ++var15) {
+         var1.method52();
       }
 
       var4 += var1.index - var13;
@@ -102,30 +102,30 @@ public class MusicTrack extends Node {
       int var28 = 0;
 
       int var29;
-      for(var29 = 0; var29 < var6; ++var29) {
+      for (var29 = 0; var29 < var6; ++var29) {
          var28 = var28 + var1.readUnsignedByte() & 127;
-         if(var28 != 0 && var28 != 32) {
-            if(var28 == 1) {
+         if (var28 != 0 && var28 != 32) {
+            if (var28 == 1) {
                ++var16;
-            } else if(var28 == 33) {
+            } else if (var28 == 33) {
                ++var17;
-            } else if(var28 == 7) {
+            } else if (var28 == 7) {
                ++var18;
-            } else if(var28 == 39) {
+            } else if (var28 == 39) {
                ++var19;
-            } else if(var28 == 10) {
+            } else if (var28 == 10) {
                ++var20;
-            } else if(var28 == 42) {
+            } else if (var28 == 42) {
                ++var21;
-            } else if(var28 == 99) {
+            } else if (var28 == 99) {
                ++var22;
-            } else if(var28 == 98) {
+            } else if (var28 == 98) {
                ++var23;
-            } else if(var28 == 101) {
+            } else if (var28 == 101) {
                ++var24;
-            } else if(var28 == 100) {
+            } else if (var28 == 100) {
                ++var25;
-            } else if(var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) {
+            } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) {
                ++var27;
             } else {
                ++var26;
@@ -182,7 +182,7 @@ public class MusicTrack extends Node {
       Buffer var51 = new Buffer(this.midi);
       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;
@@ -196,33 +196,33 @@ public class MusicTrack extends Node {
       int[] var59 = new int[128];
       var28 = 0;
 
-      label231:
-      for(int var60 = 0; var60 < var2; ++var60) {
+      label222:
+      for (int var60 = 0; var60 < var2; ++var60) {
          var51.writeInt(1297379947);
          var51.index += 4;
          int var61 = var51.index;
          int var62 = -1;
 
-         while(true) {
-            while(true) {
-               int var63 = var1.__as_311();
-               var51.__c_301(var63);
+         while (true) {
+            while (true) {
+               int var63 = var1.method52();
+               var51.method42(var63);
                int var64 = var1.array[var29++] & 255;
                boolean var65 = var64 != var62;
                var62 = var64 & 15;
-               if(var64 == 7) {
-                  if(var65) {
+               if (var64 == 7) {
+                  if (var65) {
                      var51.writeByte(255);
                   }
 
                   var51.writeByte(47);
                   var51.writeByte(0);
-                  var51.__t_298(var51.index - var61);
-                  continue label231;
+                  var51.method39(var51.index - var61);
+                  continue label222;
                }
 
-               if(var64 == 23) {
-                  if(var65) {
+               if (var64 == 23) {
+                  if (var65) {
                      var51.writeByte(255);
                   }
 
@@ -233,8 +233,8 @@ public class MusicTrack extends Node {
                   var51.writeByte(var1.array[var50++]);
                } else {
                   var52 ^= var64 >> 4;
-                  if(var62 == 0) {
-                     if(var65) {
+                  if (var62 == 0) {
+                     if (var65) {
                         var51.writeByte(var52 + 144);
                      }
 
@@ -242,8 +242,8 @@ public class MusicTrack extends Node {
                      var54 += var1.array[var38++];
                      var51.writeByte(var53 & 127);
                      var51.writeByte(var54 & 127);
-                  } else if(var62 == 1) {
-                     if(var65) {
+                  } else if (var62 == 1) {
+                     if (var65) {
                         var51.writeByte(var52 + 128);
                      }
 
@@ -251,36 +251,36 @@ public class MusicTrack extends Node {
                      var55 += var1.array[var40++];
                      var51.writeByte(var53 & 127);
                      var51.writeByte(var55 & 127);
-                  } else if(var62 == 2) {
-                     if(var65) {
+                  } else if (var62 == 2) {
+                     if (var65) {
                         var51.writeByte(var52 + 176);
                      }
 
                      var28 = var28 + var1.array[var15++] & 127;
                      var51.writeByte(var28);
                      byte var66;
-                     if(var28 != 0 && var28 != 32) {
-                        if(var28 == 1) {
+                     if (var28 != 0 && var28 != 32) {
+                        if (var28 == 1) {
                            var66 = var1.array[var34++];
-                        } else if(var28 == 33) {
+                        } else if (var28 == 33) {
                            var66 = var1.array[var41++];
-                        } else if(var28 == 7) {
+                        } else if (var28 == 7) {
                            var66 = var1.array[var35++];
-                        } else if(var28 == 39) {
+                        } else if (var28 == 39) {
                            var66 = var1.array[var42++];
-                        } else if(var28 == 10) {
+                        } else if (var28 == 10) {
                            var66 = var1.array[var36++];
-                        } else if(var28 == 42) {
+                        } else if (var28 == 42) {
                            var66 = var1.array[var43++];
-                        } else if(var28 == 99) {
+                        } else if (var28 == 99) {
                            var66 = var1.array[var46++];
-                        } else if(var28 == 98) {
+                        } else if (var28 == 98) {
                            var66 = var1.array[var47++];
-                        } else if(var28 == 101) {
+                        } else if (var28 == 101) {
                            var66 = var1.array[var48++];
-                        } else if(var28 == 100) {
+                        } else if (var28 == 100) {
                            var66 = var1.array[var49++];
-                        } else if(var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) {
+                        } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) {
                            var66 = var1.array[var39++];
                         } else {
                            var66 = var1.array[var30++];
@@ -292,8 +292,8 @@ public class MusicTrack extends Node {
                      int var67 = var66 + var59[var28];
                      var59[var28] = var67;
                      var51.writeByte(var67 & 127);
-                  } else if(var62 == 3) {
-                     if(var65) {
+                  } else if (var62 == 3) {
+                     if (var65) {
                         var51.writeByte(var52 + 224);
                      }
 
@@ -301,15 +301,15 @@ public class MusicTrack extends Node {
                      var56 += var1.array[var33++] << 7;
                      var51.writeByte(var56 & 127);
                      var51.writeByte(var56 >> 7 & 127);
-                  } else if(var62 == 4) {
-                     if(var65) {
+                  } else if (var62 == 4) {
+                     if (var65) {
                         var51.writeByte(var52 + 208);
                      }
 
                      var57 += var1.array[var32++];
                      var51.writeByte(var57 & 127);
-                  } else if(var62 == 5) {
-                     if(var65) {
+                  } else if (var62 == 5) {
+                     if (var65) {
                         var51.writeByte(var52 + 160);
                      }
 
@@ -318,11 +318,11 @@ public class MusicTrack extends Node {
                      var51.writeByte(var53 & 127);
                      var51.writeByte(var58 & 127);
                   } else {
-                     if(var62 != 6) {
+                     if (var62 != 6) {
                         throw new RuntimeException();
                      }
 
-                     if(var65) {
+                     if (var65) {
                         var51.writeByte(var52 + 192);
                      }
 
@@ -336,84 +336,84 @@ public class MusicTrack extends Node {
    }
 
    @ObfuscatedName("f")
-   void __f_381() {
-      if(this.table == null) {
+   void method226() {
+      if (this.table == null) {
          this.table = new NodeHashTable(16);
          int[] var1 = new int[16];
          int[] var2 = new int[16];
          var2[9] = 128;
          var1[9] = 128;
-         MidiFileReader var4 = new MidiFileReader(this.midi);
-         int var5 = var4.trackCount();
+         MidiFileReader var3 = new MidiFileReader(this.midi);
+         int var4 = var3.trackCount();
 
-         int var6;
-         for(var6 = 0; var6 < var5; ++var6) {
-            var4.gotoTrack(var6);
-            var4.readTrackLength(var6);
-            var4.markTrackPosition(var6);
+         int var5;
+         for (var5 = 0; var5 < var4; ++var5) {
+            var3.gotoTrack(var5);
+            var3.readTrackLength(var5);
+            var3.markTrackPosition(var5);
          }
 
-         label53:
+         label56:
          do {
-            while(true) {
-               var6 = var4.getPrioritizedTrack();
-               int var7 = var4.trackLengths[var6];
+            while (true) {
+               var5 = var3.getPrioritizedTrack();
+               int var6 = var3.trackLengths[var5];
 
-               while(var7 == var4.trackLengths[var6]) {
-                  var4.gotoTrack(var6);
-                  int var8 = var4.readMessage(var6);
-                  if(var8 == 1) {
-                     var4.setTrackDone();
-                     var4.markTrackPosition(var6);
-                     continue label53;
+               while (var6 == var3.trackLengths[var5]) {
+                  var3.gotoTrack(var5);
+                  int var7 = var3.readMessage(var5);
+                  if (var7 == 1) {
+                     var3.setTrackDone();
+                     var3.markTrackPosition(var5);
+                     continue label56;
                   }
 
-                  int var9 = var8 & 240;
+                  int var8 = var7 & 240;
+                  int var9;
                   int var10;
                   int var11;
-                  int var12;
-                  if(var9 == 176) {
-                     var10 = var8 & 15;
-                     var11 = var8 >> 8 & 127;
-                     var12 = var8 >> 16 & 127;
-                     if(var11 == 0) {
-                        var1[var10] = (var12 << 14) + (var1[var10] & -2080769);
+                  if (var8 == 176) {
+                     var9 = var7 & 15;
+                     var10 = var7 >> 8 & 127;
+                     var11 = var7 >> 16 & 127;
+                     if (var10 == 0) {
+                        var1[var9] = (var11 << 14) + (var1[var9] & -2080769);
                      }
 
-                     if(var11 == 32) {
-                        var1[var10] = (var1[var10] & -16257) + (var12 << 7);
+                     if (var10 == 32) {
+                        var1[var9] = (var1[var9] & -16257) + (var11 << 7);
                      }
                   }
 
-                  if(var9 == 192) {
-                     var10 = var8 & 15;
-                     var11 = var8 >> 8 & 127;
-                     var2[var10] = var11 + var1[var10];
+                  if (var8 == 192) {
+                     var9 = var7 & 15;
+                     var10 = var7 >> 8 & 127;
+                     var2[var9] = var10 + var1[var9];
                   }
 
-                  if(var9 == 144) {
-                     var10 = var8 & 15;
-                     var11 = var8 >> 8 & 127;
-                     var12 = var8 >> 16 & 127;
-                     if(var12 > 0) {
-                        int var13 = var2[var10];
-                        ByteArrayNode var14 = (ByteArrayNode)this.table.get((long)var13);
-                        if(var14 == null) {
-                           var14 = new ByteArrayNode(new byte[128]);
-                           this.table.put(var14, (long)var13);
+                  if (var8 == 144) {
+                     var9 = var7 & 15;
+                     var10 = var7 >> 8 & 127;
+                     var11 = var7 >> 16 & 127;
+                     if (var11 > 0) {
+                        int var12 = var2[var9];
+                        ByteArrayNode var13 = (ByteArrayNode)this.table.get((long)var12);
+                        if (var13 == null) {
+                           var13 = new ByteArrayNode(new byte[128]);
+                           this.table.put(var13, (long)var12);
                         }
 
-                        var14.byteArray[var11] = 1;
+                        var13.byteArray[var10] = 1;
                      }
                   }
 
-                  var4.readTrackLength(var6);
-                  var4.markTrackPosition(var6);
+                  var3.readTrackLength(var5);
+                  var3.markTrackPosition(var5);
                }
             }
-         } while(!var4.isDone());
-
+         } while(!var3.isDone());
       }
+
    }
 
    @ObfuscatedName("q")
@@ -429,6 +429,6 @@ public class MusicTrack extends Node {
    @Export("readTrack")
    public static MusicTrack readTrack(AbstractIndexCache var0, int var1, int var2) {
       byte[] var3 = var0.takeRecord(var1, var2);
-      return var3 == null?null:new MusicTrack(new Buffer(var3));
+      return var3 == null ? null : new MusicTrack(new Buffer(var3));
    }
 }
diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java
index 22fb3b32eb..d7c216de4e 100644
--- a/runescape-client/src/main/java/NanoClock.java
+++ b/runescape-client/src/main/java/NanoClock.java
@@ -37,7 +37,7 @@ public class NanoClock extends Clock {
    public int wait(int var1, int var2) {
       long var3 = 1000000L * (long)var2;
       long var5 = this.lastTimeNano - System.nanoTime();
-      if(var5 < var3) {
+      if (var5 < var3) {
          var5 = var3;
       }
 
@@ -45,11 +45,11 @@ public class NanoClock extends Clock {
       long var7 = System.nanoTime();
 
       int var9;
-      for(var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) {
+      for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) {
          ++var9;
       }
 
-      if(this.lastTimeNano < var7) {
+      if (this.lastTimeNano < var7) {
          this.lastTimeNano = var7;
       }
 
diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java
index 660896990b..a4c6dfc5c5 100644
--- a/runescape-client/src/main/java/NetCache.java
+++ b/runescape-client/src/main/java/NetCache.java
@@ -18,12 +18,12 @@ public class NetCache {
    @ObfuscatedGetter(
       intValue = 948359621
    )
-   public static int __iq_f;
+   public static int field628;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       longValue = -4580427166942649525L
    )
-   public static long __iq_q;
+   public static long field629;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lld;"
@@ -88,7 +88,7 @@ public class NetCache {
    @ObfuscatedGetter(
       intValue = 840549915
    )
-   public static int __iq_j;
+   public static int field630;
    @ObfuscatedName("t")
    @Export("NetCache_crc")
    public static CRC32 NetCache_crc;
@@ -99,7 +99,7 @@ public class NetCache {
    @Export("NetCache_indexCaches")
    public static IndexCache[] NetCache_indexCaches;
    @ObfuscatedName("b")
-   public static byte __iq_b;
+   public static byte field631;
    @ObfuscatedName("c")
    @ObfuscatedGetter(
       intValue = -1404585009
@@ -113,8 +113,17 @@ public class NetCache {
    @Export("NetCache_ioExceptions")
    public static int NetCache_ioExceptions;
 
+   @ObfuscatedName("w")
+   @ObfuscatedSignature(
+      signature = "(IB)Lbm;",
+      garbageValue = "31"
+   )
+   static Message method4708(int var0) {
+      return (Message)Messages.Messages_hashTable.get((long)var0);
+   }
+
    static {
-      __iq_f = 0;
+      field628 = 0;
       NetCache_pendingPriorityWrites = new NodeHashTable(4096);
       NetCache_pendingPriorityWritesCount = 0;
       NetCache_pendingPriorityResponses = new NodeHashTable(32);
@@ -125,20 +134,11 @@ public class NetCache {
       NetCache_pendingResponses = new NodeHashTable(4096);
       NetCache_pendingResponsesCount = 0;
       NetCache_responseHeaderBuffer = new Buffer(8);
-      __iq_j = 0;
+      field630 = 0;
       NetCache_crc = new CRC32();
       NetCache_indexCaches = new IndexCache[256];
-      __iq_b = 0;
+      field631 = 0;
       NetCache_crcMismatches = 0;
       NetCache_ioExceptions = 0;
    }
-
-   @ObfuscatedName("w")
-   @ObfuscatedSignature(
-      signature = "(IB)Lbm;",
-      garbageValue = "31"
-   )
-   static Message method4708(int var0) {
-      return (Message)Messages.Messages_hashTable.get((long)var0);
-   }
 }
diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java
index 7420f200e2..03b741230c 100644
--- a/runescape-client/src/main/java/NetFileRequest.java
+++ b/runescape-client/src/main/java/NetFileRequest.java
@@ -29,44 +29,44 @@ public class NetFileRequest extends DualNode {
       garbageValue = "1807602893"
    )
    static final void method4555(Widget[] var0, int var1) {
-      for(int var2 = 0; var2 < var0.length; ++var2) {
+      for (int var2 = 0; var2 < var0.length; ++var2) {
          Widget var3 = var0[var2];
-         if(var3 != null && var3.parentId == var1 && (!var3.isIf3 || !PacketBufferNode.method3673(var3))) {
-            if(var3.type == 0) {
-               if(!var3.isIf3 && PacketBufferNode.method3673(var3) && var3 != Clock.mousedOverWidgetIf1) {
+         if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !PacketBufferNode.method3673(var3))) {
+            if (var3.type == 0) {
+               if (!var3.isIf3 && PacketBufferNode.method3673(var3) && var3 != Clock.mousedOverWidgetIf1) {
                   continue;
                }
 
                method4555(var0, var3.id);
-               if(var3.children != null) {
+               if (var3.children != null) {
                   method4555(var3.children, var3.id);
                }
 
-               WidgetGroupParent var7 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id);
-               if(var7 != null) {
-                  ClientPreferences.method1809(var7.group);
+               WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id);
+               if (var4 != null) {
+                  ClientPreferences.method1809(var4.group);
                }
             }
 
-            if(var3.type == 6) {
-               int var5;
-               if(var3.sequenceId != -1 || var3.sequenceId2 != -1) {
-                  boolean var4 = class238.runCs1(var3);
-                  if(var4) {
-                     var5 = var3.sequenceId2;
+            if (var3.type == 6) {
+               int var7;
+               if (var3.sequenceId != -1 || var3.sequenceId2 != -1) {
+                  boolean var5 = class238.runCs1(var3);
+                  if (var5) {
+                     var7 = var3.sequenceId2;
                   } else {
-                     var5 = var3.sequenceId;
+                     var7 = var3.sequenceId;
                   }
 
-                  if(var5 != -1) {
-                     SequenceDefinition var6 = WorldMapAreaData.getSequenceDefinition(var5);
+                  if (var7 != -1) {
+                     SequenceDefinition var6 = WorldMapAreaData.getSequenceDefinition(var7);
 
-                     for(var3.modelFrameCycle += Client.__client_gy; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class22.method295(var3)) {
+                     for (var3.modelFrameCycle += Client.field183; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class22.method295(var3)) {
                         var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame];
                         ++var3.modelFrame;
-                        if(var3.modelFrame >= var6.frameIds.length) {
+                        if (var3.modelFrame >= var6.frameIds.length) {
                            var3.modelFrame -= var6.frameCount;
-                           if(var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) {
+                           if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) {
                               var3.modelFrame = 0;
                            }
                         }
@@ -74,13 +74,13 @@ public class NetFileRequest extends DualNode {
                   }
                }
 
-               if(var3.__bh != 0 && !var3.isIf3) {
-                  int var8 = var3.__bh >> 16;
-                  var5 = var3.__bh << 16 >> 16;
-                  var8 *= Client.__client_gy;
-                  var5 *= Client.__client_gy;
+               if (var3.field963 != 0 && !var3.isIf3) {
+                  int var8 = var3.field963 >> 16;
+                  var7 = var3.field963 << 16 >> 16;
+                  var8 *= Client.field183;
+                  var7 *= Client.field183;
                   var3.modelAngleX = var8 + var3.modelAngleX & 2047;
-                  var3.modelAngleY = var5 + var3.modelAngleY & 2047;
+                  var3.modelAngleY = var7 + var3.modelAngleY & 2047;
                   class22.method295(var3);
                }
             }
@@ -95,21 +95,21 @@ public class NetFileRequest extends DualNode {
       garbageValue = "-37"
    )
    static final void method4554(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
-      if(var4 != null) {
+      if (var4 != null) {
          int var6 = Client.minimapOrientation & 2047;
          int var7 = var3 * var3 + var2 * var2;
-         if(var7 <= 6400) {
+         if (var7 <= 6400) {
             int var8 = Rasterizer3D.Rasterizer3D_sine[var6];
             int var9 = Rasterizer3D.Rasterizer3D_cosine[var6];
             int var10 = var3 * var8 + var9 * var2 >> 16;
             int var11 = var3 * var9 - var8 * var2 >> 16;
-            if(var7 > 2500) {
-               var4.__ac_512(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths);
+            if (var7 > 2500) {
+               var4.method314(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths);
             } else {
                var4.drawAt2(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2);
             }
-
          }
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java
index f01da8362d..ae8947b0d5 100644
--- a/runescape-client/src/main/java/NetSocket.java
+++ b/runescape-client/src/main/java/NetSocket.java
@@ -49,12 +49,12 @@ public final class NetSocket extends AbstractSocket implements Runnable {
    @ObfuscatedGetter(
       intValue = -738185459
    )
-   int __l;
+   int field632;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = 2057244853
    )
-   int __e;
+   int field633;
    @ObfuscatedName("x")
    @Export("exceptionWriting")
    boolean exceptionWriting;
@@ -62,25 +62,25 @@ public final class NetSocket extends AbstractSocket implements Runnable {
    @ObfuscatedGetter(
       intValue = -1644762957
    )
-   final int __d;
+   final int field634;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = -782964015
    )
-   final int __k;
+   final int field635;
 
    @ObfuscatedSignature(
       signature = "(Ljava/net/Socket;Lfz;I)V"
    )
    public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException {
       this.isClosed = false;
-      this.__l = 0;
-      this.__e = 0;
+      this.field632 = 0;
+      this.field633 = 0;
       this.exceptionWriting = false;
       this.taskHandler = var2;
       this.socket = var1;
-      this.__d = var3;
-      this.__k = var3 - 100;
+      this.field634 = var3;
+      this.field635 = var3 - 100;
       this.socket.setSoTimeout(30000);
       this.socket.setTcpNoDelay(true);
       this.socket.setReceiveBufferSize(65536);
@@ -96,7 +96,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
    )
    @Export("isAvailable")
    public boolean isAvailable(int var1) throws IOException {
-      return this.isClosed?false:this.inputStream.available() >= var1;
+      return this.isClosed ? false : this.inputStream.available() >= var1;
    }
 
    @ObfuscatedName("q")
@@ -106,7 +106,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
    )
    @Export("available")
    public int available() throws IOException {
-      return this.isClosed?0:this.inputStream.available();
+      return this.isClosed ? 0 : this.inputStream.available();
    }
 
    @ObfuscatedName("w")
@@ -116,7 +116,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
    )
    @Export("readUnsignedByte")
    public int readUnsignedByte() throws IOException {
-      return this.isClosed?0:this.inputStream.read();
+      return this.isClosed ? 0 : this.inputStream.read();
    }
 
    @ObfuscatedName("o")
@@ -126,14 +126,14 @@ public final class NetSocket extends AbstractSocket implements Runnable {
    )
    @Export("read")
    public int read(byte[] var1, int var2, int var3) throws IOException {
-      if(this.isClosed) {
+      if (this.isClosed) {
          return 0;
       } else {
          int var4;
          int var5;
-         for(var4 = var3; var3 > 0; var3 -= var5) {
+         for (var4 = var3; var3 > 0; var3 -= var5) {
             var5 = this.inputStream.read(var1, var2, var3);
-            if(var5 <= 0) {
+            if (var5 <= 0) {
                throw new EOFException();
             }
 
@@ -161,28 +161,28 @@ public final class NetSocket extends AbstractSocket implements Runnable {
    )
    @Export("close")
    public void close() {
-      if(!this.isClosed) {
+      if (!this.isClosed) {
          synchronized(this) {
             this.isClosed = true;
             this.notifyAll();
          }
 
-         if(this.task != null) {
-            while(this.task.status == 0) {
+         if (this.task != null) {
+            while (this.task.status == 0) {
                class203.method4010(1L);
             }
 
-            if(this.task.status == 1) {
+            if (this.task.status == 1) {
                try {
                   ((Thread)this.task.result).join();
                } catch (InterruptedException var3) {
-                  ;
                }
             }
          }
 
          this.task = null;
       }
+
    }
 
    @ObfuscatedName("ay")
@@ -192,106 +192,105 @@ public final class NetSocket extends AbstractSocket implements Runnable {
    )
    @Export("write0")
    void write0(byte[] var1, int var2, int var3) throws IOException {
-      if(!this.isClosed) {
-         if(this.exceptionWriting) {
+      if (!this.isClosed) {
+         if (this.exceptionWriting) {
             this.exceptionWriting = false;
             throw new IOException();
-         } else {
-            if(this.array == null) {
-               this.array = new byte[this.__d];
+         }
+
+         if (this.array == null) {
+            this.array = new byte[this.field634];
+         }
+
+         synchronized(this) {
+            for (int var5 = 0; var5 < var3; ++var5) {
+               this.array[this.field633] = var1[var5 + var2];
+               this.field633 = (this.field633 + 1) % this.field634;
+               if ((this.field635 + this.field632) % this.field634 == this.field633) {
+                  throw new IOException();
+               }
             }
 
-            synchronized(this) {
-               for(int var5 = 0; var5 < var3; ++var5) {
-                  this.array[this.__e] = var1[var5 + var2];
-                  this.__e = (this.__e + 1) % this.__d;
-                  if((this.__k + this.__l) % this.__d == this.__e) {
-                     throw new IOException();
-                  }
-               }
-
-               if(this.task == null) {
-                  this.task = this.taskHandler.newThreadTask(this, 3);
-               }
-
-               this.notifyAll();
+            if (this.task == null) {
+               this.task = this.taskHandler.newThreadTask(this, 3);
             }
+
+            this.notifyAll();
          }
       }
+
    }
 
    @Export("run")
    @ObfuscatedName("run")
    public void run() {
       try {
-         while(true) {
+         while (true) {
             label84: {
                int var1;
                int var2;
                synchronized(this) {
-                  if(this.__e == this.__l) {
-                     if(this.isClosed) {
+                  if (this.field633 == this.field632) {
+                     if (this.isClosed) {
                         break label84;
                      }
 
                      try {
                         this.wait();
-                     } catch (InterruptedException var10) {
-                        ;
+                     } catch (InterruptedException var9) {
                      }
                   }
 
-                  var2 = this.__l;
-                  if(this.__e >= this.__l) {
-                     var1 = this.__e - this.__l;
+                  var2 = this.field632;
+                  if (this.field633 >= this.field632) {
+                     var1 = this.field633 - this.field632;
                   } else {
-                     var1 = this.__d - this.__l;
+                     var1 = this.field634 - this.field632;
                   }
                }
 
-               if(var1 <= 0) {
+               if (var1 <= 0) {
                   continue;
                }
 
                try {
                   this.outputStream.write(this.array, var2, var1);
-               } catch (IOException var9) {
+               } catch (IOException var8) {
                   this.exceptionWriting = true;
                }
 
-               this.__l = (var1 + this.__l) % this.__d;
+               this.field632 = (var1 + this.field632) % this.field634;
 
                try {
-                  if(this.__e == this.__l) {
+                  if (this.field633 == this.field632) {
                      this.outputStream.flush();
                   }
-               } catch (IOException var8) {
+               } catch (IOException var7) {
                   this.exceptionWriting = true;
                }
                continue;
             }
 
             try {
-               if(this.inputStream != null) {
+               if (this.inputStream != null) {
                   this.inputStream.close();
                }
 
-               if(this.outputStream != null) {
+               if (this.outputStream != null) {
                   this.outputStream.close();
                }
 
-               if(this.socket != null) {
+               if (this.socket != null) {
                   this.socket.close();
                }
-            } catch (IOException var7) {
-               ;
+            } catch (IOException var6) {
             }
 
             this.array = null;
             break;
          }
-      } catch (Exception var12) {
-         NpcDefinition.sendStackTrace((String)null, var12);
+      } catch (Exception var11) {
+         NPCDefinition.sendStackTrace((String)null, var11);
       }
 
    }
@@ -308,227 +307,227 @@ public final class NetSocket extends AbstractSocket implements Runnable {
       garbageValue = "-98"
    )
    @Export("calculateRoute")
-   public static int calculateRoute(int srcX, int srcY, int srcSize, RouteStrategy strategy, CollisionMap collisionMap, boolean var5, int[] bufferX, int[] bufferY) {
-      int graphBaseX;
-      for(int var8 = 0; var8 < 128; ++var8) {
-         for(graphBaseX = 0; graphBaseX < 128; ++graphBaseX) {
-            class178.directions[var8][graphBaseX] = 0;
-            class178.distances[var8][graphBaseX] = 99999999;
+   public static int calculateRoute(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) {
+      int var8;
+      int var9;
+      for (var9 = 0; var9 < 128; ++var9) {
+         for (var8 = 0; var8 < 128; ++var8) {
+            class178.directions[var9][var8] = 0;
+            class178.distances[var9][var8] = 99999999;
          }
       }
 
-      int graphBaseY;
-      int endX;
-      byte var13;
-      int lowestDistance;
+      int var10;
+      byte var11;
+      int var12;
+      int var13;
+      int var14;
       int var15;
-      int approxDestY;
-      int approxDestSizeY;
-      int checkX;
-      int checkY;
-      boolean found;
-      int endY;
-      int lowestCost;
-      int approxDestX;
-      if(srcSize == 1) {
-         graphBaseY = srcX;
-         endX = srcY;
-         byte var12 = 64;
-         var13 = 64;
-         lowestDistance = srcX - var12;
-         var15 = srcY - var13;
-         class178.directions[var12][var13] = 99;
-         class178.distances[var12][var13] = 0;
-         byte var16 = 0;
-         approxDestY = 0;
-         class178.bufferX[var16] = srcX;
-         approxDestX = var16 + 1;
-         class178.bufferY[var16] = srcY;
-         int[][] var18 = collisionMap.flags;
+      int var16;
+      int var17;
+      boolean var18;
+      int var19;
+      int var20;
+      int var21;
+      byte var22;
+      if (var2 == 1) {
+         var9 = var0;
+         var10 = var1;
+         var22 = 64;
+         var11 = 64;
+         var12 = var0 - var22;
+         var13 = var1 - var11;
+         class178.directions[var22][var11] = 99;
+         class178.distances[var22][var11] = 0;
+         byte var23 = 0;
+         var14 = 0;
+         class178.bufferX[var23] = var0;
+         var21 = var23 + 1;
+         class178.bufferY[var23] = var1;
+         int[][] var24 = var4.flags;
 
-         boolean var29;
-         while(true) {
-            if(approxDestX == approxDestY) {
-               WidgetGroupParent.__bx_o = graphBaseY;
-               UrlRequester.__eo_u = endX;
-               var29 = false;
-               break;
+         boolean var25;
+         label226: {
+            while (var21 != var14) {
+               var9 = class178.bufferX[var14];
+               var10 = class178.bufferY[var14];
+               var14 = var14 + 1 & 4095;
+               var19 = var9 - var12;
+               var20 = var10 - var13;
+               var15 = var9 - var4.xInset;
+               var16 = var10 - var4.yInset;
+               if (var3.vmethod3644(1, var9, var10, var4)) {
+                  WidgetGroupParent.field986 = var9;
+                  UrlRequester.field929 = var10;
+                  var25 = true;
+                  break label226;
+               }
+
+               var17 = class178.distances[var19][var20] + 1;
+               if (var19 > 0 && class178.directions[var19 - 1][var20] == 0 && (var24[var15 - 1][var16] & 19136776) == 0) {
+                  class178.bufferX[var21] = var9 - 1;
+                  class178.bufferY[var21] = var10;
+                  var21 = var21 + 1 & 4095;
+                  class178.directions[var19 - 1][var20] = 2;
+                  class178.distances[var19 - 1][var20] = var17;
+               }
+
+               if (var19 < 127 && class178.directions[var19 + 1][var20] == 0 && (var24[var15 + 1][var16] & 19136896) == 0) {
+                  class178.bufferX[var21] = var9 + 1;
+                  class178.bufferY[var21] = var10;
+                  var21 = var21 + 1 & 4095;
+                  class178.directions[var19 + 1][var20] = 8;
+                  class178.distances[var19 + 1][var20] = var17;
+               }
+
+               if (var20 > 0 && class178.directions[var19][var20 - 1] == 0 && (var24[var15][var16 - 1] & 19136770) == 0) {
+                  class178.bufferX[var21] = var9;
+                  class178.bufferY[var21] = var10 - 1;
+                  var21 = var21 + 1 & 4095;
+                  class178.directions[var19][var20 - 1] = 1;
+                  class178.distances[var19][var20 - 1] = var17;
+               }
+
+               if (var20 < 127 && class178.directions[var19][var20 + 1] == 0 && (var24[var15][var16 + 1] & 19136800) == 0) {
+                  class178.bufferX[var21] = var9;
+                  class178.bufferY[var21] = var10 + 1;
+                  var21 = var21 + 1 & 4095;
+                  class178.directions[var19][var20 + 1] = 4;
+                  class178.distances[var19][var20 + 1] = var17;
+               }
+
+               if (var19 > 0 && var20 > 0 && class178.directions[var19 - 1][var20 - 1] == 0 && (var24[var15 - 1][var16 - 1] & 19136782) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) {
+                  class178.bufferX[var21] = var9 - 1;
+                  class178.bufferY[var21] = var10 - 1;
+                  var21 = var21 + 1 & 4095;
+                  class178.directions[var19 - 1][var20 - 1] = 3;
+                  class178.distances[var19 - 1][var20 - 1] = var17;
+               }
+
+               if (var19 < 127 && var20 > 0 && class178.directions[var19 + 1][var20 - 1] == 0 && (var24[var15 + 1][var16 - 1] & 19136899) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) {
+                  class178.bufferX[var21] = var9 + 1;
+                  class178.bufferY[var21] = var10 - 1;
+                  var21 = var21 + 1 & 4095;
+                  class178.directions[var19 + 1][var20 - 1] = 9;
+                  class178.distances[var19 + 1][var20 - 1] = var17;
+               }
+
+               if (var19 > 0 && var20 < 127 && class178.directions[var19 - 1][var20 + 1] == 0 && (var24[var15 - 1][var16 + 1] & 19136824) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) {
+                  class178.bufferX[var21] = var9 - 1;
+                  class178.bufferY[var21] = var10 + 1;
+                  var21 = var21 + 1 & 4095;
+                  class178.directions[var19 - 1][var20 + 1] = 6;
+                  class178.distances[var19 - 1][var20 + 1] = var17;
+               }
+
+               if (var19 < 127 && var20 < 127 && class178.directions[var19 + 1][var20 + 1] == 0 && (var24[var15 + 1][var16 + 1] & 19136992) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) {
+                  class178.bufferX[var21] = var9 + 1;
+                  class178.bufferY[var21] = var10 + 1;
+                  var21 = var21 + 1 & 4095;
+                  class178.directions[var19 + 1][var20 + 1] = 12;
+                  class178.distances[var19 + 1][var20 + 1] = var17;
+               }
             }
 
-            graphBaseY = class178.bufferX[approxDestY];
-            endX = class178.bufferY[approxDestY];
-            approxDestY = approxDestY + 1 & 4095;
-            endY = graphBaseY - lowestDistance;
-            lowestCost = endX - var15;
-            approxDestSizeY = graphBaseY - collisionMap.xInset;
-            checkX = endX - collisionMap.yInset;
-            if(strategy.vmethod3644(1, graphBaseY, endX, collisionMap)) {
-               WidgetGroupParent.__bx_o = graphBaseY;
-               UrlRequester.__eo_u = endX;
-               var29 = true;
-               break;
-            }
-
-            checkY = class178.distances[endY][lowestCost] + 1;
-            if(endY > 0 && class178.directions[endY - 1][lowestCost] == 0 && (var18[approxDestSizeY - 1][checkX] & 19136776) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY - 1;
-               class178.bufferY[approxDestX] = endX;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY - 1][lowestCost] = 2;
-               class178.distances[endY - 1][lowestCost] = checkY;
-            }
-
-            if(endY < 127 && class178.directions[endY + 1][lowestCost] == 0 && (var18[approxDestSizeY + 1][checkX] & 19136896) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY + 1;
-               class178.bufferY[approxDestX] = endX;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY + 1][lowestCost] = 8;
-               class178.distances[endY + 1][lowestCost] = checkY;
-            }
-
-            if(lowestCost > 0 && class178.directions[endY][lowestCost - 1] == 0 && (var18[approxDestSizeY][checkX - 1] & 19136770) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY;
-               class178.bufferY[approxDestX] = endX - 1;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY][lowestCost - 1] = 1;
-               class178.distances[endY][lowestCost - 1] = checkY;
-            }
-
-            if(lowestCost < 127 && class178.directions[endY][lowestCost + 1] == 0 && (var18[approxDestSizeY][checkX + 1] & 19136800) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY;
-               class178.bufferY[approxDestX] = endX + 1;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY][lowestCost + 1] = 4;
-               class178.distances[endY][lowestCost + 1] = checkY;
-            }
-
-            if(endY > 0 && lowestCost > 0 && class178.directions[endY - 1][lowestCost - 1] == 0 && (var18[approxDestSizeY - 1][checkX - 1] & 19136782) == 0 && (var18[approxDestSizeY - 1][checkX] & 19136776) == 0 && (var18[approxDestSizeY][checkX - 1] & 19136770) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY - 1;
-               class178.bufferY[approxDestX] = endX - 1;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY - 1][lowestCost - 1] = 3;
-               class178.distances[endY - 1][lowestCost - 1] = checkY;
-            }
-
-            if(endY < 127 && lowestCost > 0 && class178.directions[endY + 1][lowestCost - 1] == 0 && (var18[approxDestSizeY + 1][checkX - 1] & 19136899) == 0 && (var18[approxDestSizeY + 1][checkX] & 19136896) == 0 && (var18[approxDestSizeY][checkX - 1] & 19136770) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY + 1;
-               class178.bufferY[approxDestX] = endX - 1;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY + 1][lowestCost - 1] = 9;
-               class178.distances[endY + 1][lowestCost - 1] = checkY;
-            }
-
-            if(endY > 0 && lowestCost < 127 && class178.directions[endY - 1][lowestCost + 1] == 0 && (var18[approxDestSizeY - 1][checkX + 1] & 19136824) == 0 && (var18[approxDestSizeY - 1][checkX] & 19136776) == 0 && (var18[approxDestSizeY][checkX + 1] & 19136800) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY - 1;
-               class178.bufferY[approxDestX] = endX + 1;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY - 1][lowestCost + 1] = 6;
-               class178.distances[endY - 1][lowestCost + 1] = checkY;
-            }
-
-            if(endY < 127 && lowestCost < 127 && class178.directions[endY + 1][lowestCost + 1] == 0 && (var18[approxDestSizeY + 1][checkX + 1] & 19136992) == 0 && (var18[approxDestSizeY + 1][checkX] & 19136896) == 0 && (var18[approxDestSizeY][checkX + 1] & 19136800) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY + 1;
-               class178.bufferY[approxDestX] = endX + 1;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY + 1][lowestCost + 1] = 12;
-               class178.distances[endY + 1][lowestCost + 1] = checkY;
-            }
+            WidgetGroupParent.field986 = var9;
+            UrlRequester.field929 = var10;
+            var25 = false;
          }
 
-         found = var29; // Vars are weird above here cause that's an inlined method
-      } else if(srcSize == 2) {
-         found = WorldMapSection2.method593(srcX, srcY, strategy, collisionMap);
+         var18 = var25;
+      } else if (var2 == 2) {
+         var18 = WorldMapSection2.method593(var0, var1, var3, var4);
       } else {
-         found = IndexStore.method3585(srcX, srcY, srcSize, strategy, collisionMap);
+         var18 = IndexStore.method3585(var0, var1, var2, var3, var4);
       }
 
-      graphBaseX = srcX - 64;
-      graphBaseY = srcY - 64;
-      endX = WidgetGroupParent.__bx_o;
-      endY = UrlRequester.__eo_u;
-      if(!found) {
-         lowestCost = Integer.MAX_VALUE;
-         lowestDistance = Integer.MAX_VALUE;
-         byte alternativeRouteRange = 10;
-         approxDestX = strategy.approxDestinationX;
-         approxDestY = strategy.approxDestinationY;
-         int approxDestSizeX = strategy.approxDestinationSizeX;
-         approxDestSizeY = strategy.approxDestinationSizeY;
+      var8 = var0 - 64;
+      var9 = var1 - 64;
+      var10 = WidgetGroupParent.field986;
+      var19 = UrlRequester.field929;
+      if (!var18) {
+         var20 = Integer.MAX_VALUE;
+         var12 = Integer.MAX_VALUE;
+         var22 = 10;
+         var21 = var3.approxDestinationX;
+         var14 = var3.approxDestinationY;
+         int var29 = var3.approxDestinationSizeX;
+         var15 = var3.approxDestinationSizeY;
 
-         for(checkX = approxDestX - alternativeRouteRange; checkX <= alternativeRouteRange + approxDestX; ++checkX) {
-            for(checkY = approxDestY - alternativeRouteRange; checkY <= approxDestY + alternativeRouteRange; ++checkY) {
-               int graphX = checkX - graphBaseX;
-               int graphY = checkY - graphBaseY;
-               if(graphX >= 0 && graphY >= 0 && graphX < 128 && graphY < 128 && class178.distances[graphX][graphY] < 100) {
-                  int deltaX = 0;
-                  if(checkX < approxDestX) {
-                     deltaX = approxDestX - checkX;
-                  } else if(checkX > approxDestSizeX + approxDestX - 1) {
-                     deltaX = checkX - (approxDestSizeX + approxDestX - 1);
+         for (var16 = var21 - var22; var16 <= var22 + var21; ++var16) {
+            for (var17 = var14 - var22; var17 <= var14 + var22; ++var17) {
+               int var30 = var16 - var8;
+               int var31 = var17 - var9;
+               if (var30 >= 0 && var31 >= 0 && var30 < 128 && var31 < 128 && class178.distances[var30][var31] < 100) {
+                  int var26 = 0;
+                  if (var16 < var21) {
+                     var26 = var21 - var16;
+                  } else if (var16 > var29 + var21 - 1) {
+                     var26 = var16 - (var29 + var21 - 1);
                   }
 
-                  int deltaY = 0;
-                  if(checkY < approxDestY) {
-                     deltaY = approxDestY - checkY;
-                  } else if(checkY > approxDestSizeY + approxDestY - 1) {
-                     deltaY = checkY - (approxDestSizeY + approxDestY - 1);
+                  int var27 = 0;
+                  if (var17 < var14) {
+                     var27 = var14 - var17;
+                  } else if (var17 > var15 + var14 - 1) {
+                     var27 = var17 - (var15 + var14 - 1);
                   }
 
-                  int cost = deltaY * deltaY + deltaX * deltaX;
-                  if(cost < lowestCost || cost == lowestCost && class178.distances[graphX][graphY] < lowestDistance) {
-                     lowestCost = cost;
-                     lowestDistance = class178.distances[graphX][graphY];
-                     endX = checkX;
-                     endY = checkY;
+                  int var28 = var27 * var27 + var26 * var26;
+                  if (var28 < var20 || var28 == var20 && class178.distances[var30][var31] < var12) {
+                     var20 = var28;
+                     var12 = class178.distances[var30][var31];
+                     var10 = var16;
+                     var19 = var17;
                   }
                }
             }
          }
 
-         if(lowestCost == Integer.MAX_VALUE) {
+         if (var20 == Integer.MAX_VALUE) {
             return -1;
          }
       }
 
-      if(srcX == endX && endY == srcY) {
+      if (var0 == var10 && var19 == var1) {
          return 0;
-      } else { // Inlined again after this I think
-         var13 = 0;
-         class178.bufferX[var13] = endX;
-         lowestCost = var13 + 1;
-         class178.bufferY[var13] = endY;
+      } else {
+         var11 = 0;
+         class178.bufferX[var11] = var10;
+         var20 = var11 + 1;
+         class178.bufferY[var11] = var19;
 
-         for(lowestDistance = var15 = class178.directions[endX - graphBaseX][endY - graphBaseY]; srcX != endX || endY != srcY; lowestDistance = class178.directions[endX - graphBaseX][endY - graphBaseY]) {
-            if(lowestDistance != var15) {
-               var15 = lowestDistance;
-               class178.bufferX[lowestCost] = endX;
-               class178.bufferY[lowestCost++] = endY;
+         for (var12 = var13 = class178.directions[var10 - var8][var19 - var9]; var0 != var10 || var19 != var1; var12 = class178.directions[var10 - var8][var19 - var9]) {
+            if (var12 != var13) {
+               var13 = var12;
+               class178.bufferX[var20] = var10;
+               class178.bufferY[var20++] = var19;
             }
 
-            if((lowestDistance & 2) != 0) {
-               ++endX;
-            } else if((lowestDistance & 8) != 0) {
-               --endX;
+            if ((var12 & 2) != 0) {
+               ++var10;
+            } else if ((var12 & 8) != 0) {
+               --var10;
             }
 
-            if((lowestDistance & 1) != 0) {
-               ++endY;
-            } else if((lowestDistance & 4) != 0) {
-               --endY;
+            if ((var12 & 1) != 0) {
+               ++var19;
+            } else if ((var12 & 4) != 0) {
+               --var19;
             }
          }
 
-         approxDestX = 0;
+         var21 = 0;
 
-         while(lowestCost-- > 0) {
-            bufferX[approxDestX] = class178.bufferX[lowestCost];
-            bufferY[approxDestX++] = class178.bufferY[lowestCost];
-            if(approxDestX >= bufferX.length) {
+         while (var20-- > 0) {
+            var6[var21] = class178.bufferX[var20];
+            var7[var21++] = class178.bufferY[var20];
+            if (var21 >= var6.length) {
                break;
             }
          }
 
-         return approxDestX;
+         return var21;
       }
    }
 
@@ -538,9 +537,9 @@ public final class NetSocket extends AbstractSocket implements Runnable {
       garbageValue = "-590103687"
    )
    public static boolean method3537(AbstractIndexCache var0, AbstractIndexCache var1, AbstractIndexCache var2, MidiPcmStream var3) {
-      class1.__f_m = var0;
-      class214.__hf_f = var1;
-      class214.__hf_q = var2;
+      class1.field1105 = var0;
+      class214.field1127 = var1;
+      class214.field1128 = var2;
       class214.midiPcmStream = var3;
       return true;
    }
diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java
index 56baec5554..938753e5bc 100644
--- a/runescape-client/src/main/java/Node.java
+++ b/runescape-client/src/main/java/Node.java
@@ -25,12 +25,13 @@ public class Node {
    @ObfuscatedName("es")
    @Export("remove")
    public void remove() {
-      if(this.next != null) {
+      if (this.next != null) {
          this.next.previous = this.previous;
          this.previous.next = this.next;
          this.previous = null;
          this.next = null;
       }
+
    }
 
    @ObfuscatedName("eg")
diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java
index f2b7a54fbb..f6d54a2622 100644
--- a/runescape-client/src/main/java/NodeDeque.java
+++ b/runescape-client/src/main/java/NodeDeque.java
@@ -28,9 +28,9 @@ public class NodeDeque {
    @ObfuscatedName("m")
    @Export("clear")
    public void clear() {
-      while(true) {
+      while (true) {
          Node var1 = this.sentinel.previous;
-         if(var1 == this.sentinel) {
+         if (var1 == this.sentinel) {
             this.current = null;
             return;
          }
@@ -45,7 +45,7 @@ public class NodeDeque {
    )
    @Export("addFirst")
    public void addFirst(Node var1) {
-      if(var1.next != null) {
+      if (var1.next != null) {
          var1.remove();
       }
 
@@ -61,7 +61,7 @@ public class NodeDeque {
    )
    @Export("addLast")
    public void addLast(Node var1) {
-      if(var1.next != null) {
+      if (var1.next != null) {
          var1.remove();
       }
 
@@ -78,7 +78,7 @@ public class NodeDeque {
    @Export("removeLast")
    public Node removeLast() {
       Node var1 = this.sentinel.previous;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          return null;
       } else {
          var1.remove();
@@ -93,7 +93,7 @@ public class NodeDeque {
    @Export("removeFirst")
    public Node removeFirst() {
       Node var1 = this.sentinel.next;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          return null;
       } else {
          var1.remove();
@@ -108,7 +108,7 @@ public class NodeDeque {
    @Export("last")
    public Node last() {
       Node var1 = this.sentinel.previous;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          this.current = null;
          return null;
       } else {
@@ -124,7 +124,7 @@ public class NodeDeque {
    @Export("first")
    public Node first() {
       Node var1 = this.sentinel.next;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          this.current = null;
          return null;
       } else {
@@ -140,7 +140,7 @@ public class NodeDeque {
    @Export("previous")
    public Node previous() {
       Node var1 = this.current;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          this.current = null;
          return null;
       } else {
@@ -156,7 +156,7 @@ public class NodeDeque {
    @Export("next")
    public Node next() {
       Node var1 = this.current;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          this.current = null;
          return null;
       } else {
@@ -170,7 +170,7 @@ public class NodeDeque {
       signature = "(Lgw;Lgw;)V"
    )
    public static void method5270(Node var0, Node var1) {
-      if(var0.next != null) {
+      if (var0.next != null) {
          var0.remove();
       }
 
diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java
index 2e4fcbf1bb..ae81442438 100644
--- a/runescape-client/src/main/java/NodeHashTable.java
+++ b/runescape-client/src/main/java/NodeHashTable.java
@@ -36,7 +36,7 @@ public final class NodeHashTable {
       this.size = var1;
       this.buckets = new Node[var1];
 
-      for(int var2 = 0; var2 < var1; ++var2) {
+      for (int var2 = 0; var2 < var1; ++var2) {
          Node var3 = this.buckets[var2] = new Node();
          var3.previous = var3;
          var3.next = var3;
@@ -52,8 +52,8 @@ public final class NodeHashTable {
    public Node get(long var1) {
       Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))];
 
-      for(this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) {
-         if(this.currentGet.key == var1) {
+      for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) {
+         if (this.currentGet.key == var1) {
             Node var4 = this.currentGet;
             this.currentGet = this.currentGet.previous;
             return var4;
@@ -70,7 +70,7 @@ public final class NodeHashTable {
    )
    @Export("put")
    public void put(Node var1, long var2) {
-      if(var1.next != null) {
+      if (var1.next != null) {
          var1.remove();
       }
 
@@ -85,12 +85,12 @@ public final class NodeHashTable {
    @ObfuscatedName("q")
    @Export("clear")
    public void clear() {
-      for(int var1 = 0; var1 < this.size; ++var1) {
+      for (int var1 = 0; var1 < this.size; ++var1) {
          Node var2 = this.buckets[var1];
 
-         while(true) {
+         while (true) {
             Node var3 = var2.previous;
-            if(var3 == var2) {
+            if (var3 == var2) {
                break;
             }
 
@@ -119,21 +119,20 @@ public final class NodeHashTable {
    @Export("next")
    public Node next() {
       Node var1;
-      if(this.index > 0 && this.buckets[this.index - 1] != this.current) {
+      if (this.index > 0 && this.buckets[this.index - 1] != this.current) {
          var1 = this.current;
          this.current = var1.previous;
          return var1;
       } else {
-         do {
-            if(this.index >= this.size) {
-               return null;
-            }
-
+         while (this.index < this.size) {
             var1 = this.buckets[this.index++].previous;
-         } while(var1 == this.buckets[this.index - 1]);
+            if (var1 != this.buckets[this.index - 1]) {
+               this.current = var1.previous;
+               return var1;
+            }
+         }
 
-         this.current = var1.previous;
-         return var1;
+         return null;
       }
    }
 }
diff --git a/runescape-client/src/main/java/Npc.java b/runescape-client/src/main/java/Npc.java
index eb11180d3b..81857313b4 100644
--- a/runescape-client/src/main/java/Npc.java
+++ b/runescape-client/src/main/java/Npc.java
@@ -5,67 +5,67 @@ import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("cv")
 @Implements("NPC")
-public final class Npc extends Actor {
+public final class NPC extends Actor {
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Ljz;"
    )
    @Export("definition")
-   NpcDefinition definition;
+   NPCDefinition definition;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(IBI)V",
       garbageValue = "306250019"
    )
-   final void __m_162(int var1, byte var2) {
+   final void method227(int var1, byte var2) {
       int var3 = super.pathX[0];
       int var4 = super.pathY[0];
-      if(var1 == 0) {
+      if (var1 == 0) {
          --var3;
          ++var4;
       }
 
-      if(var1 == 1) {
+      if (var1 == 1) {
          ++var4;
       }
 
-      if(var1 == 2) {
+      if (var1 == 2) {
          ++var3;
          ++var4;
       }
 
-      if(var1 == 3) {
+      if (var1 == 3) {
          --var3;
       }
 
-      if(var1 == 4) {
+      if (var1 == 4) {
          ++var3;
       }
 
-      if(var1 == 5) {
+      if (var1 == 5) {
          --var3;
          --var4;
       }
 
-      if(var1 == 6) {
+      if (var1 == 6) {
          --var4;
       }
 
-      if(var1 == 7) {
+      if (var1 == 7) {
          ++var3;
          --var4;
       }
 
-      if(super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).__s == 1) {
+      if (super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).field782 == 1) {
          super.sequence = -1;
       }
 
-      if(super.pathLength < 9) {
+      if (super.pathLength < 9) {
          ++super.pathLength;
       }
 
-      for(int var5 = super.pathLength; var5 > 0; --var5) {
+      for (int var5 = super.pathLength; var5 > 0; --var5) {
          super.pathX[var5] = super.pathX[var5 - 1];
          super.pathY[var5] = super.pathY[var5 - 1];
          super.pathTraversed[var5] = super.pathTraversed[var5 - 1];
@@ -81,20 +81,20 @@ public final class Npc extends Actor {
       signature = "(IIZI)V",
       garbageValue = "-1647134110"
    )
-   final void __f_163(int var1, int var2, boolean var3) {
-      if(super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).__s == 1) {
+   final void method228(int var1, int var2, boolean var3) {
+      if (super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).field782 == 1) {
          super.sequence = -1;
       }
 
-      if(!var3) {
+      if (!var3) {
          int var4 = var1 - super.pathX[0];
          int var5 = var2 - super.pathY[0];
-         if(var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) {
-            if(super.pathLength < 9) {
+         if (var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) {
+            if (super.pathLength < 9) {
                ++super.pathLength;
             }
 
-            for(int var6 = super.pathLength; var6 > 0; --var6) {
+            for (int var6 = super.pathLength; var6 > 0; --var6) {
                super.pathX[var6] = super.pathX[var6 - 1];
                super.pathY[var6] = super.pathY[var6 - 1];
                super.pathTraversed[var6] = super.pathTraversed[var6 - 1];
@@ -108,8 +108,8 @@ public final class Npc extends Actor {
       }
 
       super.pathLength = 0;
-      super.__ch = 0;
-      super.__cq = 0;
+      super.field25 = 0;
+      super.field24 = 0;
       super.pathX[0] = var1;
       super.pathY[0] = var2;
       super.x = super.size * 64 + super.pathX[0] * 128;
@@ -123,27 +123,27 @@ public final class Npc extends Actor {
    )
    @Export("getModel")
    protected final Model getModel() {
-      if(this.definition == null) {
+      if (this.definition == null) {
          return null;
       } else {
-         SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0?WorldMapAreaData.getSequenceDefinition(super.sequence):null;
-         SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.idleSequence || var1 == null)?WorldMapAreaData.getSequenceDefinition(super.movementSequence):null;
+         SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapAreaData.getSequenceDefinition(super.sequence) : null;
+         SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null ? null : WorldMapAreaData.getSequenceDefinition(super.movementSequence);
          Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
-         if(var3 == null) {
+         if (var3 == null) {
             return null;
          } else {
             var3.calculateBoundsCylinder();
             super.defaultHeight = var3.height;
-            if(super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
+            if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
                Model var4 = class50.getSpotAnimationDefinition(super.spotAnimation).getModel(super.spotAnimationFrame);
-               if(var4 != null) {
+               if (var4 != null) {
                   var4.offsetBy(0, -super.heightOffset, 0);
                   Model[] var5 = new Model[]{var3, var4};
                   var3 = new Model(var5, 2);
                }
             }
 
-            if(this.definition.size == 1) {
+            if (this.definition.size == 1) {
                var3.isSingleTile = true;
             }
 
@@ -178,16 +178,16 @@ public final class Npc extends Actor {
          IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3);
       }
 
-      Object var9 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
+      Object var5 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
       synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) {
-         if(IndexStoreActionHandler.__iv_q == 0) {
+         if (IndexStoreActionHandler.field412 == 0) {
             Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler());
             Frames.IndexStoreActionHandler_thread.setDaemon(true);
             Frames.IndexStoreActionHandler_thread.start();
             Frames.IndexStoreActionHandler_thread.setPriority(5);
          }
 
-         IndexStoreActionHandler.__iv_q = 600;
+         IndexStoreActionHandler.field412 = 600;
       }
    }
 }
diff --git a/runescape-client/src/main/java/NpcDefinition.java b/runescape-client/src/main/java/NpcDefinition.java
index 8161c2cc1e..f62133beee 100644
--- a/runescape-client/src/main/java/NpcDefinition.java
+++ b/runescape-client/src/main/java/NpcDefinition.java
@@ -11,7 +11,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("jz")
 @Implements("NPCDefinition")
-public class NpcDefinition extends DualNode {
+public class NPCDefinition extends DualNode {
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lir;"
@@ -55,7 +55,7 @@ public class NpcDefinition extends DualNode {
    @Export("archives")
    int[] archives;
    @ObfuscatedName("e")
-   int[] __e;
+   int[] field636;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = 275200787
@@ -141,12 +141,12 @@ public class NpcDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = -1235927151
    )
-   int __ag;
+   int field637;
    @ObfuscatedName("aq")
    @ObfuscatedGetter(
       intValue = 1962875903
    )
-   int __aq;
+   int field638;
    @ObfuscatedName("aj")
    @ObfuscatedGetter(
       intValue = 235824283
@@ -157,7 +157,7 @@ public class NpcDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = -506638747
    )
-   public int __av;
+   public int field639;
    @ObfuscatedName("ar")
    @Export("transforms")
    public int[] transforms;
@@ -189,12 +189,7 @@ public class NpcDefinition extends DualNode {
    @Export("params")
    IterableNodeHashTable params;
 
-   static {
-      NpcDefinition_cached = new EvictingDualNodeHashTable(64);
-      NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50);
-   }
-
-   NpcDefinition() {
+   NPCDefinition() {
       this.name = "null";
       this.size = 1;
       this.idleSequence = -1;
@@ -210,10 +205,10 @@ public class NpcDefinition extends DualNode {
       this.widthScale = 128;
       this.heightScale = 128;
       this.isVisible = false;
-      this.__ag = 0;
-      this.__aq = 0;
+      this.field637 = 0;
+      this.field638 = 0;
       this.headIconPrayer = -1;
-      this.__av = 32;
+      this.field639 = 32;
       this.transformVarbit = -1;
       this.transformVarp = -1;
       this.isInteractable = true;
@@ -237,9 +232,9 @@ public class NpcDefinition extends DualNode {
    )
    @Export("read")
    void read(Buffer var1) {
-      while(true) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
@@ -256,103 +251,103 @@ public class NpcDefinition extends DualNode {
    void readNext(Buffer var1, int var2) {
       int var3;
       int var4;
-      if(var2 == 1) {
+      if (var2 == 1) {
          var3 = var1.readUnsignedByte();
          this.archives = new int[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.archives[var4] = var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.archives[var4] = var1.method43();
          }
-      } else if(var2 == 2) {
+      } else if (var2 == 2) {
          this.name = var1.readStringCp1252NullTerminated();
-      } else if(var2 == 12) {
+      } else if (var2 == 12) {
          this.size = var1.readUnsignedByte();
-      } else if(var2 == 13) {
-         this.idleSequence = var1.__ag_302();
-      } else if(var2 == 14) {
-         this.walkSequence = var1.__ag_302();
-      } else if(var2 == 15) {
-         this.turnLeftSequence = var1.__ag_302();
-      } else if(var2 == 16) {
-         this.turnRightSequence = var1.__ag_302();
-      } else if(var2 == 17) {
-         this.walkSequence = var1.__ag_302();
-         this.walkTurnSequence = var1.__ag_302();
-         this.walkTurnLeftSequence = var1.__ag_302();
-         this.walkTurnRightSequence = var1.__ag_302();
-      } else if(var2 >= 30 && var2 < 35) {
+      } else if (var2 == 13) {
+         this.idleSequence = var1.method43();
+      } else if (var2 == 14) {
+         this.walkSequence = var1.method43();
+      } else if (var2 == 15) {
+         this.turnLeftSequence = var1.method43();
+      } else if (var2 == 16) {
+         this.turnRightSequence = var1.method43();
+      } else if (var2 == 17) {
+         this.walkSequence = var1.method43();
+         this.walkTurnSequence = var1.method43();
+         this.walkTurnLeftSequence = var1.method43();
+         this.walkTurnRightSequence = var1.method43();
+      } else if (var2 >= 30 && var2 < 35) {
          this.actions[var2 - 30] = var1.readStringCp1252NullTerminated();
-         if(this.actions[var2 - 30].equalsIgnoreCase("Hidden")) {
+         if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) {
             this.actions[var2 - 30] = null;
          }
-      } else if(var2 == 40) {
+      } else if (var2 == 40) {
          var3 = var1.readUnsignedByte();
          this.recolorFrom = new short[var3];
          this.recolorTo = new short[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.recolorFrom[var4] = (short)var1.__ag_302();
-            this.recolorTo[var4] = (short)var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.recolorFrom[var4] = (short)var1.method43();
+            this.recolorTo[var4] = (short)var1.method43();
          }
-      } else if(var2 == 41) {
+      } else if (var2 == 41) {
          var3 = var1.readUnsignedByte();
          this.retextureFrom = new short[var3];
          this.retextureTo = new short[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.retextureFrom[var4] = (short)var1.__ag_302();
-            this.retextureTo[var4] = (short)var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.retextureFrom[var4] = (short)var1.method43();
+            this.retextureTo[var4] = (short)var1.method43();
          }
-      } else if(var2 == 60) {
+      } else if (var2 == 60) {
          var3 = var1.readUnsignedByte();
-         this.__e = new int[var3];
+         this.field636 = new int[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.__e[var4] = var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.field636[var4] = var1.method43();
          }
-      } else if(var2 == 93) {
+      } else if (var2 == 93) {
          this.drawMapDot = false;
-      } else if(var2 == 95) {
-         this.combatLevel = var1.__ag_302();
-      } else if(var2 == 97) {
-         this.widthScale = var1.__ag_302();
-      } else if(var2 == 98) {
-         this.heightScale = var1.__ag_302();
-      } else if(var2 == 99) {
+      } else if (var2 == 95) {
+         this.combatLevel = var1.method43();
+      } else if (var2 == 97) {
+         this.widthScale = var1.method43();
+      } else if (var2 == 98) {
+         this.heightScale = var1.method43();
+      } else if (var2 == 99) {
          this.isVisible = true;
-      } else if(var2 == 100) {
-         this.__ag = var1.readByte();
-      } else if(var2 == 101) {
-         this.__aq = var1.readByte();
-      } else if(var2 == 102) {
-         this.headIconPrayer = var1.__ag_302();
-      } else if(var2 == 103) {
-         this.__av = var1.__ag_302();
-      } else if(var2 != 106 && var2 != 118) {
-         if(var2 == 107) {
+      } else if (var2 == 100) {
+         this.field637 = var1.readByte();
+      } else if (var2 == 101) {
+         this.field638 = var1.readByte();
+      } else if (var2 == 102) {
+         this.headIconPrayer = var1.method43();
+      } else if (var2 == 103) {
+         this.field639 = var1.method43();
+      } else if (var2 != 106 && var2 != 118) {
+         if (var2 == 107) {
             this.isInteractable = false;
-         } else if(var2 == 109) {
+         } else if (var2 == 109) {
             this.isClickable = false;
-         } else if(var2 == 111) {
+         } else if (var2 == 111) {
             this.isFollower = true;
-         } else if(var2 == 249) {
+         } else if (var2 == 249) {
             this.params = AbstractIndexCache.readStringIntParameters(var1, this.params);
          }
       } else {
-         this.transformVarbit = var1.__ag_302();
-         if(this.transformVarbit == 65535) {
+         this.transformVarbit = var1.method43();
+         if (this.transformVarbit == 65535) {
             this.transformVarbit = -1;
          }
 
-         this.transformVarp = var1.__ag_302();
-         if(this.transformVarp == 65535) {
+         this.transformVarp = var1.method43();
+         if (this.transformVarp == 65535) {
             this.transformVarp = -1;
          }
 
          var3 = -1;
-         if(var2 == 118) {
-            var3 = var1.__ag_302();
-            if(var3 == 65535) {
+         if (var2 == 118) {
+            var3 = var1.method43();
+            if (var3 == 65535) {
                var3 = -1;
             }
          }
@@ -360,9 +355,9 @@ public class NpcDefinition extends DualNode {
          var4 = var1.readUnsignedByte();
          this.transforms = new int[var4 + 2];
 
-         for(int var5 = 0; var5 <= var4; ++var5) {
-            this.transforms[var5] = var1.__ag_302();
-            if(this.transforms[var5] == 65535) {
+         for (int var5 = 0; var5 <= var4; ++var5) {
+            this.transforms[var5] = var1.method43();
+            if (this.transforms[var5] == 65535) {
                this.transforms[var5] = -1;
             }
          }
@@ -379,66 +374,66 @@ public class NpcDefinition extends DualNode {
    )
    @Export("getModel")
    public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
-      if(this.transforms != null) {
-         NpcDefinition var12 = this.transform();
-         return var12 == null?null:var12.getModel(var1, var2, var3, var4);
+      if (this.transforms != null) {
+         NPCDefinition var11 = this.transform();
+         return var11 == null ? null : var11.getModel(var1, var2, var3, var4);
       } else {
          Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id);
-         if(var5 == null) {
+         if (var5 == null) {
             boolean var6 = false;
 
-            for(int var7 = 0; var7 < this.archives.length; ++var7) {
-               if(!NpcDefinition_modelIndexCache.tryLoadRecord(this.archives[var7], 0)) {
+            for (int var7 = 0; var7 < this.archives.length; ++var7) {
+               if (!NpcDefinition_modelIndexCache.tryLoadRecord(this.archives[var7], 0)) {
                   var6 = true;
                }
             }
 
-            if(var6) {
+            if (var6) {
                return null;
             }
 
-            ModelData[] var8 = new ModelData[this.archives.length];
+            ModelData[] var12 = new ModelData[this.archives.length];
 
-            int var9;
-            for(var9 = 0; var9 < this.archives.length; ++var9) {
-               var8[var9] = ModelData.method2788(NpcDefinition_modelIndexCache, this.archives[var9], 0);
+            int var8;
+            for (var8 = 0; var8 < this.archives.length; ++var8) {
+               var12[var8] = ModelData.method2788(NpcDefinition_modelIndexCache, this.archives[var8], 0);
             }
 
-            ModelData var11;
-            if(var8.length == 1) {
-               var11 = var8[0];
+            ModelData var9;
+            if (var12.length == 1) {
+               var9 = var12[0];
             } else {
-               var11 = new ModelData(var8, var8.length);
+               var9 = new ModelData(var12, var12.length);
             }
 
-            if(this.recolorFrom != null) {
-               for(var9 = 0; var9 < this.recolorFrom.length; ++var9) {
-                  var11.recolor(this.recolorFrom[var9], this.recolorTo[var9]);
+            if (this.recolorFrom != null) {
+               for (var8 = 0; var8 < this.recolorFrom.length; ++var8) {
+                  var9.recolor(this.recolorFrom[var8], this.recolorTo[var8]);
                }
             }
 
-            if(this.retextureFrom != null) {
-               for(var9 = 0; var9 < this.retextureFrom.length; ++var9) {
-                  var11.retexture(this.retextureFrom[var9], this.retextureTo[var9]);
+            if (this.retextureFrom != null) {
+               for (var8 = 0; var8 < this.retextureFrom.length; ++var8) {
+                  var9.retexture(this.retextureFrom[var8], this.retextureTo[var8]);
                }
             }
 
-            var5 = var11.toModel(this.__ag + 64, this.__aq * 5 + 850, -30, -50, -30);
+            var5 = var9.toModel(this.field637 + 64, this.field638 * 5 + 850, -30, -50, -30);
             NpcDefinition_cachedModels.put(var5, (long)this.id);
          }
 
          Model var10;
-         if(var1 != null && var3 != null) {
+         if (var1 != null && var3 != null) {
             var10 = var1.animateSequence2(var5, var2, var3, var4);
-         } else if(var1 != null) {
+         } else if (var1 != null) {
             var10 = var1.animateSequence(var5, var2);
-         } else if(var3 != null) {
+         } else if (var3 != null) {
             var10 = var3.animateSequence(var5, var4);
          } else {
             var10 = var5.toSharedSequenceModel(true);
          }
 
-         if(this.widthScale != 128 || this.heightScale != 128) {
+         if (this.widthScale != 128 || this.heightScale != 128) {
             var10.scale(this.widthScale, this.heightScale, this.widthScale);
          }
 
@@ -453,45 +448,45 @@ public class NpcDefinition extends DualNode {
    )
    @Export("getModelData")
    public final ModelData getModelData() {
-      if(this.transforms != null) {
-         NpcDefinition var1 = this.transform();
-         return var1 == null?null:var1.getModelData();
-      } else if(this.__e == null) {
+      if (this.transforms != null) {
+         NPCDefinition var5 = this.transform();
+         return var5 == null ? null : var5.getModelData();
+      } else if (this.field636 == null) {
          return null;
       } else {
-         boolean var5 = false;
+         boolean var1 = false;
 
-         for(int var2 = 0; var2 < this.__e.length; ++var2) {
-            if(!NpcDefinition_modelIndexCache.tryLoadRecord(this.__e[var2], 0)) {
-               var5 = true;
+         for (int var2 = 0; var2 < this.field636.length; ++var2) {
+            if (!NpcDefinition_modelIndexCache.tryLoadRecord(this.field636[var2], 0)) {
+               var1 = true;
             }
          }
 
-         if(var5) {
+         if (var1) {
             return null;
          } else {
-            ModelData[] var6 = new ModelData[this.__e.length];
+            ModelData[] var6 = new ModelData[this.field636.length];
 
-            for(int var3 = 0; var3 < this.__e.length; ++var3) {
-               var6[var3] = ModelData.method2788(NpcDefinition_modelIndexCache, this.__e[var3], 0);
+            for (int var3 = 0; var3 < this.field636.length; ++var3) {
+               var6[var3] = ModelData.method2788(NpcDefinition_modelIndexCache, this.field636[var3], 0);
             }
 
             ModelData var7;
-            if(var6.length == 1) {
+            if (var6.length == 1) {
                var7 = var6[0];
             } else {
                var7 = new ModelData(var6, var6.length);
             }
 
             int var4;
-            if(this.recolorFrom != null) {
-               for(var4 = 0; var4 < this.recolorFrom.length; ++var4) {
+            if (this.recolorFrom != null) {
+               for (var4 = 0; var4 < this.recolorFrom.length; ++var4) {
                   var7.recolor(this.recolorFrom[var4], this.recolorTo[var4]);
                }
             }
 
-            if(this.retextureFrom != null) {
-               for(var4 = 0; var4 < this.retextureFrom.length; ++var4) {
+            if (this.retextureFrom != null) {
+               for (var4 = 0; var4 < this.retextureFrom.length; ++var4) {
                   var7.retexture(this.retextureFrom[var4], this.retextureTo[var4]);
                }
             }
@@ -507,22 +502,22 @@ public class NpcDefinition extends DualNode {
       garbageValue = "-113"
    )
    @Export("transform")
-   public final NpcDefinition transform() {
+   public final NPCDefinition transform() {
       int var1 = -1;
-      if(this.transformVarbit != -1) {
+      if (this.transformVarbit != -1) {
          var1 = WorldMapSection2.getVarbit(this.transformVarbit);
-      } else if(this.transformVarp != -1) {
+      } else if (this.transformVarp != -1) {
          var1 = Varps.Varps_main[this.transformVarp];
       }
 
       int var2;
-      if(var1 >= 0 && var1 < this.transforms.length - 1) {
+      if (var1 >= 0 && var1 < this.transforms.length - 1) {
          var2 = this.transforms[var1];
       } else {
          var2 = this.transforms[this.transforms.length - 1];
       }
 
-      return var2 != -1?ObjectDefinition.getNpcDefinition(var2):null;
+      return var2 != -1 ? ObjectDefinition.getNpcDefinition(var2) : null;
    }
 
    @ObfuscatedName("e")
@@ -530,18 +525,18 @@ public class NpcDefinition extends DualNode {
       signature = "(I)Z",
       garbageValue = "853540088"
    )
-   public boolean __e_435() {
-      if(this.transforms == null) {
+   public boolean method229() {
+      if (this.transforms == null) {
          return true;
       } else {
          int var1 = -1;
-         if(this.transformVarbit != -1) {
+         if (this.transformVarbit != -1) {
             var1 = WorldMapSection2.getVarbit(this.transformVarbit);
-         } else if(this.transformVarp != -1) {
+         } else if (this.transformVarp != -1) {
             var1 = Varps.Varps_main[this.transformVarp];
          }
 
-         return var1 >= 0 && var1 < this.transforms.length?this.transforms[var1] != -1:this.transforms[this.transforms.length - 1] != -1;
+         return var1 >= 0 && var1 < this.transforms.length ? this.transforms[var1] != -1 : this.transforms[this.transforms.length - 1] != -1;
       }
    }
 
@@ -552,20 +547,20 @@ public class NpcDefinition extends DualNode {
    )
    @Export("getIntParam")
    public int getIntParam(int var1, int var2) {
-      IterableNodeHashTable var4 = this.params;
-      int var3;
-      if(var4 == null) {
-         var3 = var2;
+      IterableNodeHashTable var3 = this.params;
+      int var4;
+      if (var3 == null) {
+         var4 = var2;
       } else {
-         IntegerNode var5 = (IntegerNode)var4.get((long)var1);
-         if(var5 == null) {
-            var3 = var2;
+         IntegerNode var5 = (IntegerNode)var3.get((long)var1);
+         if (var5 == null) {
+            var4 = var2;
          } else {
-            var3 = var5.integer;
+            var4 = var5.integer;
          }
       }
 
-      return var3;
+      return var4;
    }
 
    @ObfuscatedName("d")
@@ -585,17 +580,17 @@ public class NpcDefinition extends DualNode {
    )
    @Export("sendStackTrace")
    public static void sendStackTrace(String var0, Throwable var1) {
-      if(var1 != null) {
+      if (var1 != null) {
          var1.printStackTrace();
       } else {
          try {
             String var2 = "";
-            if(var1 != null) {
+            if (var1 != null) {
                var2 = Canvas.method860(var1);
             }
 
-            if(var0 != null) {
-               if(var1 != null) {
+            if (var0 != null) {
+               if (var1 != null) {
                   var2 = var2 + " | ";
                }
 
@@ -607,19 +602,18 @@ public class NpcDefinition extends DualNode {
             var2 = var2.replace('@', '_');
             var2 = var2.replace('&', '_');
             var2 = var2.replace('#', '_');
-            if(RunException.applet == null) {
+            if (RunException.applet == null) {
                return;
             }
 
-            URL var3 = new URL(RunException.applet.getCodeBase(), "clienterror.ws?c=" + RunException.revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.__fx_w + "&e=" + var2);
+            URL var3 = new URL(RunException.applet.getCodeBase(), "clienterror.ws?c=" + RunException.revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.field761 + "&e=" + var2);
             DataInputStream var4 = new DataInputStream(var3.openStream());
             var4.read();
             var4.close();
          } catch (Exception var5) {
-            ;
          }
-
       }
+
    }
 
    @ObfuscatedName("e")
@@ -629,15 +623,15 @@ public class NpcDefinition extends DualNode {
    )
    static final boolean method5164(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
       int var7 = ViewportMouse.ViewportMouse_y + var6;
-      if(var7 < var0 && var7 < var1 && var7 < var2) {
+      if (var7 < var0 && var7 < var1 && var7 < var2) {
          return false;
       } else {
          var7 = ViewportMouse.ViewportMouse_y - var6;
-         if(var7 > var0 && var7 > var1 && var7 > var2) {
+         if (var7 > var0 && var7 > var1 && var7 > var2) {
             return false;
          } else {
             var7 = ViewportMouse.ViewportMouse_x + var6;
-            if(var7 < var3 && var7 < var4 && var7 < var5) {
+            if (var7 < var3 && var7 < var4 && var7 < var5) {
                return false;
             } else {
                var7 = ViewportMouse.ViewportMouse_x - var6;
@@ -654,52 +648,52 @@ public class NpcDefinition extends DualNode {
    )
    static void method5162() {
       Login.Login_username = Login.Login_username.trim();
-      if(Login.Login_username.length() == 0) {
+      if (Login.Login_username.length() == 0) {
          class54.method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
       } else {
-         long var1;
+         long var0;
          try {
-            URL var3 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws");
-            URLConnection var4 = var3.openConnection();
-            var4.setRequestProperty("connection", "close");
-            var4.setDoInput(true);
-            var4.setDoOutput(true);
-            var4.setConnectTimeout(5000);
-            OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream());
-            var5.write("data1=req");
-            var5.flush();
-            InputStream var6 = var4.getInputStream();
-            Buffer var7 = new Buffer(new byte[1000]);
+            URL var2 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws");
+            URLConnection var3 = var2.openConnection();
+            var3.setRequestProperty("connection", "close");
+            var3.setDoInput(true);
+            var3.setDoOutput(true);
+            var3.setConnectTimeout(5000);
+            OutputStreamWriter var4 = new OutputStreamWriter(var3.getOutputStream());
+            var4.write("data1=req");
+            var4.flush();
+            InputStream var5 = var3.getInputStream();
+            Buffer var6 = new Buffer(new byte[1000]);
 
-            while(true) {
-               int var8 = var6.read(var7.array, var7.index, 1000 - var7.index);
-               if(var8 == -1) {
-                  var7.index = 0;
-                  long var10 = var7.readLong();
-                  var1 = var10;
+            while (true) {
+               int var7 = var5.read(var6.array, var6.index, 1000 - var6.index);
+               if (var7 == -1) {
+                  var6.index = 0;
+                  long var8 = var6.readLong();
+                  var0 = var8;
                   break;
                }
 
-               var7.index += var8;
-               if(var7.index >= 1000) {
-                  var1 = 0L;
+               var6.index += var7;
+               if (var6.index >= 1000) {
+                  var0 = 0L;
                   break;
                }
             }
-         } catch (Exception var14) {
-            var1 = 0L;
+         } catch (Exception var10) {
+            var0 = 0L;
          }
 
-         int var0;
-         if(var1 == 0L) {
-            var0 = 5;
+         int var11;
+         if (var0 == 0L) {
+            var11 = 5;
          } else {
-            var0 = LoginScreenAnimation.method1778(var1, Login.Login_username);
+            var11 = LoginScreenAnimation.method1778(var0, Login.Login_username);
          }
 
-         switch(var0) {
+         switch(var11) {
          case 2:
-            class54.method1089(Strings.__id_jr, Strings.__id_jv, Strings.__id_ju);
+            class54.method1089(Strings.field882, Strings.field883, Strings.field884);
             Login.loginIndex = 6;
             break;
          case 3:
@@ -717,8 +711,8 @@ public class NpcDefinition extends DualNode {
          case 7:
             class54.method1089("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username.");
          }
-
       }
+
    }
 
    @ObfuscatedName("kw")
@@ -729,9 +723,9 @@ public class NpcDefinition extends DualNode {
    static String method5161(String var0) {
       PlayerType[] var1 = class48.method865();
 
-      for(int var2 = 0; var2 < var1.length; ++var2) {
+      for (int var2 = 0; var2 < var1.length; ++var2) {
          PlayerType var3 = var1[var2];
-         if(var3.modIcon != -1 && var0.startsWith(ItemContainer.method1170(var3.modIcon))) {
+         if (var3.modIcon != -1 && var0.startsWith(ItemContainer.method1170(var3.modIcon))) {
             var0 = var0.substring(6 + Integer.toString(var3.modIcon).length());
             break;
          }
@@ -739,4 +733,9 @@ public class NpcDefinition extends DualNode {
 
       return var0;
    }
+
+   static {
+      NpcDefinition_cached = new EvictingDualNodeHashTable(64);
+      NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50);
+   }
 }
diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java
index 0599790b68..546c84679e 100644
--- a/runescape-client/src/main/java/ObjectDefinition.java
+++ b/runescape-client/src/main/java/ObjectDefinition.java
@@ -20,7 +20,7 @@ public class ObjectDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   static AbstractIndexCache __jr_q;
+   static AbstractIndexCache field640;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -31,12 +31,12 @@ public class ObjectDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   public static EvictingDualNodeHashTable __jr_o;
+   public static EvictingDualNodeHashTable field641;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   static EvictingDualNodeHashTable __jr_u;
+   static EvictingDualNodeHashTable field642;
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -47,7 +47,7 @@ public class ObjectDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "[Ldw;"
    )
-   static ModelData[] __jr_l;
+   static ModelData[] field643;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -2034835389
@@ -55,9 +55,9 @@ public class ObjectDefinition extends DualNode {
    @Export("id")
    public int id;
    @ObfuscatedName("x")
-   int[] __x;
+   int[] field644;
    @ObfuscatedName("d")
-   int[] __d;
+   int[] field645;
    @ObfuscatedName("k")
    @Export("name")
    public String name;
@@ -245,7 +245,7 @@ public class ObjectDefinition extends DualNode {
    @Export("int6")
    public int int6;
    @ObfuscatedName("ax")
-   public int[] __ax;
+   public int[] field646;
    @ObfuscatedName("af")
    @ObfuscatedSignature(
       signature = "Llh;"
@@ -253,15 +253,6 @@ public class ObjectDefinition extends DualNode {
    @Export("params")
    IterableNodeHashTable params;
 
-   static {
-      ObjectDefinition_isLowDetail = false;
-      ObjectDefinition_cached = new EvictingDualNodeHashTable(4096);
-      __jr_o = new EvictingDualNodeHashTable(500);
-      __jr_u = new EvictingDualNodeHashTable(30);
-      ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30);
-      __jr_l = new ModelData[4];
-   }
-
    ObjectDefinition() {
       this.name = "null";
       this.sizeX = 1;
@@ -305,21 +296,21 @@ public class ObjectDefinition extends DualNode {
    )
    @Export("init")
    void init() {
-      if(this.int1 == -1) {
+      if (this.int1 == -1) {
          this.int1 = 0;
-         if(this.__x != null && (this.__d == null || this.__d[0] == 10)) {
+         if (this.field644 != null && (this.field645 == null || this.field645[0] == 10)) {
             this.int1 = 1;
          }
 
-         for(int var1 = 0; var1 < 5; ++var1) {
-            if(this.actions[var1] != null) {
+         for (int var1 = 0; var1 < 5; ++var1) {
+            if (this.actions[var1] != null) {
                this.int1 = 1;
             }
          }
       }
 
-      if(this.int3 == -1) {
-         this.int3 = this.interactType != 0?1:0;
+      if (this.int3 == -1) {
+         this.int3 = this.interactType != 0 ? 1 : 0;
       }
 
    }
@@ -331,9 +322,9 @@ public class ObjectDefinition extends DualNode {
    )
    @Export("read")
    void read(Buffer var1) {
-      while(true) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
@@ -350,152 +341,152 @@ public class ObjectDefinition extends DualNode {
    void readNext(Buffer var1, int var2) {
       int var3;
       int var4;
-      if(var2 == 1) {
+      if (var2 == 1) {
          var3 = var1.readUnsignedByte();
-         if(var3 > 0) {
-            if(this.__x != null && !ObjectDefinition_isLowDetail) {
+         if (var3 > 0) {
+            if (this.field644 != null && !ObjectDefinition_isLowDetail) {
                var1.index += var3 * 3;
             } else {
-               this.__d = new int[var3];
-               this.__x = new int[var3];
+               this.field645 = new int[var3];
+               this.field644 = new int[var3];
 
-               for(var4 = 0; var4 < var3; ++var4) {
-                  this.__x[var4] = var1.__ag_302();
-                  this.__d[var4] = var1.readUnsignedByte();
+               for (var4 = 0; var4 < var3; ++var4) {
+                  this.field644[var4] = var1.method43();
+                  this.field645[var4] = var1.readUnsignedByte();
                }
             }
          }
-      } else if(var2 == 2) {
+      } else if (var2 == 2) {
          this.name = var1.readStringCp1252NullTerminated();
-      } else if(var2 == 5) {
+      } else if (var2 == 5) {
          var3 = var1.readUnsignedByte();
-         if(var3 > 0) {
-            if(this.__x != null && !ObjectDefinition_isLowDetail) {
+         if (var3 > 0) {
+            if (this.field644 != null && !ObjectDefinition_isLowDetail) {
                var1.index += var3 * 2;
             } else {
-               this.__d = null;
-               this.__x = new int[var3];
+               this.field645 = null;
+               this.field644 = new int[var3];
 
-               for(var4 = 0; var4 < var3; ++var4) {
-                  this.__x[var4] = var1.__ag_302();
+               for (var4 = 0; var4 < var3; ++var4) {
+                  this.field644[var4] = var1.method43();
                }
             }
          }
-      } else if(var2 == 14) {
+      } else if (var2 == 14) {
          this.sizeX = var1.readUnsignedByte();
-      } else if(var2 == 15) {
+      } else if (var2 == 15) {
          this.sizeY = var1.readUnsignedByte();
-      } else if(var2 == 17) {
+      } else if (var2 == 17) {
          this.interactType = 0;
          this.boolean1 = false;
-      } else if(var2 == 18) {
+      } else if (var2 == 18) {
          this.boolean1 = false;
-      } else if(var2 == 19) {
+      } else if (var2 == 19) {
          this.int1 = var1.readUnsignedByte();
-      } else if(var2 == 21) {
+      } else if (var2 == 21) {
          this.clipType = 0;
-      } else if(var2 == 22) {
+      } else if (var2 == 22) {
          this.nonFlatShading = true;
-      } else if(var2 == 23) {
+      } else if (var2 == 23) {
          this.modelClipped = true;
-      } else if(var2 == 24) {
-         this.animationId = var1.__ag_302();
-         if(this.animationId == 65535) {
+      } else if (var2 == 24) {
+         this.animationId = var1.method43();
+         if (this.animationId == 65535) {
             this.animationId = -1;
          }
-      } else if(var2 == 27) {
+      } else if (var2 == 27) {
          this.interactType = 1;
-      } else if(var2 == 28) {
+      } else if (var2 == 28) {
          this.int2 = var1.readUnsignedByte();
-      } else if(var2 == 29) {
+      } else if (var2 == 29) {
          this.ambient = var1.readByte();
-      } else if(var2 == 39) {
+      } else if (var2 == 39) {
          this.contrast = var1.readByte() * 25;
-      } else if(var2 >= 30 && var2 < 35) {
+      } else if (var2 >= 30 && var2 < 35) {
          this.actions[var2 - 30] = var1.readStringCp1252NullTerminated();
-         if(this.actions[var2 - 30].equalsIgnoreCase("Hidden")) {
+         if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) {
             this.actions[var2 - 30] = null;
          }
-      } else if(var2 == 40) {
+      } else if (var2 == 40) {
          var3 = var1.readUnsignedByte();
          this.recolorFrom = new short[var3];
          this.recolorTo = new short[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.recolorFrom[var4] = (short)var1.__ag_302();
-            this.recolorTo[var4] = (short)var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.recolorFrom[var4] = (short)var1.method43();
+            this.recolorTo[var4] = (short)var1.method43();
          }
-      } else if(var2 == 41) {
+      } else if (var2 == 41) {
          var3 = var1.readUnsignedByte();
          this.retextureFrom = new short[var3];
          this.retextureTo = new short[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.retextureFrom[var4] = (short)var1.__ag_302();
-            this.retextureTo[var4] = (short)var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.retextureFrom[var4] = (short)var1.method43();
+            this.retextureTo[var4] = (short)var1.method43();
          }
-      } else if(var2 == 62) {
+      } else if (var2 == 62) {
          this.isRotated = true;
-      } else if(var2 == 64) {
+      } else if (var2 == 64) {
          this.clipped = false;
-      } else if(var2 == 65) {
-         this.modelSizeX = var1.__ag_302();
-      } else if(var2 == 66) {
-         this.modelHeight = var1.__ag_302();
-      } else if(var2 == 67) {
-         this.modelSizeY = var1.__ag_302();
-      } else if(var2 == 68) {
-         this.mapSceneId = var1.__ag_302();
-      } else if(var2 == 69) {
+      } else if (var2 == 65) {
+         this.modelSizeX = var1.method43();
+      } else if (var2 == 66) {
+         this.modelHeight = var1.method43();
+      } else if (var2 == 67) {
+         this.modelSizeY = var1.method43();
+      } else if (var2 == 68) {
+         this.mapSceneId = var1.method43();
+      } else if (var2 == 69) {
          var1.readUnsignedByte();
-      } else if(var2 == 70) {
-         this.offsetX = var1.__aq_303();
-      } else if(var2 == 71) {
-         this.offsetHeight = var1.__aq_303();
-      } else if(var2 == 72) {
-         this.offsetY = var1.__aq_303();
-      } else if(var2 == 73) {
+      } else if (var2 == 70) {
+         this.offsetX = var1.method44();
+      } else if (var2 == 71) {
+         this.offsetHeight = var1.method44();
+      } else if (var2 == 72) {
+         this.offsetY = var1.method44();
+      } else if (var2 == 73) {
          this.boolean2 = true;
-      } else if(var2 == 74) {
+      } else if (var2 == 74) {
          this.isSolid = true;
-      } else if(var2 == 75) {
+      } else if (var2 == 75) {
          this.int3 = var1.readUnsignedByte();
-      } else if(var2 != 77 && var2 != 92) {
-         if(var2 == 78) {
-            this.ambientSoundId = var1.__ag_302();
+      } else if (var2 != 77 && var2 != 92) {
+         if (var2 == 78) {
+            this.ambientSoundId = var1.method43();
             this.int4 = var1.readUnsignedByte();
-         } else if(var2 == 79) {
-            this.int5 = var1.__ag_302();
-            this.int6 = var1.__ag_302();
+         } else if (var2 == 79) {
+            this.int5 = var1.method43();
+            this.int6 = var1.method43();
             this.int4 = var1.readUnsignedByte();
             var3 = var1.readUnsignedByte();
-            this.__ax = new int[var3];
+            this.field646 = new int[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.__ax[var4] = var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.field646[var4] = var1.method43();
             }
-         } else if(var2 == 81) {
+         } else if (var2 == 81) {
             this.clipType = var1.readUnsignedByte() * 256;
-         } else if(var2 == 82) {
-            this.mapIconId = var1.__ag_302();
-         } else if(var2 == 249) {
+         } else if (var2 == 82) {
+            this.mapIconId = var1.method43();
+         } else if (var2 == 249) {
             this.params = AbstractIndexCache.readStringIntParameters(var1, this.params);
          }
       } else {
-         this.transformVarbit = var1.__ag_302();
-         if(this.transformVarbit == 65535) {
+         this.transformVarbit = var1.method43();
+         if (this.transformVarbit == 65535) {
             this.transformVarbit = -1;
          }
 
-         this.transformConfigId = var1.__ag_302();
-         if(this.transformConfigId == 65535) {
+         this.transformConfigId = var1.method43();
+         if (this.transformConfigId == 65535) {
             this.transformConfigId = -1;
          }
 
          var3 = -1;
-         if(var2 == 92) {
-            var3 = var1.__ag_302();
-            if(var3 == 65535) {
+         if (var2 == 92) {
+            var3 = var1.method43();
+            if (var3 == 65535) {
                var3 = -1;
             }
          }
@@ -503,9 +494,9 @@ public class ObjectDefinition extends DualNode {
          var4 = var1.readUnsignedByte();
          this.transforms = new int[var4 + 2];
 
-         for(int var5 = 0; var5 <= var4; ++var5) {
-            this.transforms[var5] = var1.__ag_302();
-            if(this.transforms[var5] == 65535) {
+         for (int var5 = 0; var5 <= var4; ++var5) {
+            this.transforms[var5] = var1.method43();
+            if (this.transforms[var5] == 65535) {
                this.transforms[var5] = -1;
             }
          }
@@ -520,24 +511,24 @@ public class ObjectDefinition extends DualNode {
       signature = "(II)Z",
       garbageValue = "1880172029"
    )
-   public final boolean __u_421(int var1) {
-      if(this.__d != null) {
-         for(int var4 = 0; var4 < this.__d.length; ++var4) {
-            if(this.__d[var4] == var1) {
-               return __jr_q.tryLoadRecord(this.__x[var4] & 65535, 0);
+   public final boolean method230(int var1) {
+      if (this.field645 != null) {
+         for (int var4 = 0; var4 < this.field645.length; ++var4) {
+            if (this.field645[var4] == var1) {
+               return field640.tryLoadRecord(this.field644[var4] & 65535, 0);
             }
          }
 
          return true;
-      } else if(this.__x == null) {
+      } else if (this.field644 == null) {
          return true;
-      } else if(var1 != 10) {
+      } else if (var1 != 10) {
          return true;
       } else {
          boolean var2 = true;
 
-         for(int var3 = 0; var3 < this.__x.length; ++var3) {
-            var2 &= __jr_q.tryLoadRecord(this.__x[var3] & 65535, 0);
+         for (int var3 = 0; var3 < this.field644.length; ++var3) {
+            var2 &= field640.tryLoadRecord(this.field644[var3] & 65535, 0);
          }
 
          return var2;
@@ -549,14 +540,14 @@ public class ObjectDefinition extends DualNode {
       signature = "(I)Z",
       garbageValue = "-666846742"
    )
-   public final boolean __g_422() {
-      if(this.__x == null) {
+   public final boolean method231() {
+      if (this.field644 == null) {
          return true;
       } else {
          boolean var1 = true;
 
-         for(int var2 = 0; var2 < this.__x.length; ++var2) {
-            var1 &= __jr_q.tryLoadRecord(this.__x[var2] & 65535, 0);
+         for (int var2 = 0; var2 < this.field644.length; ++var2) {
+            var1 &= field640.tryLoadRecord(this.field644[var2] & 65535, 0);
          }
 
          return var1;
@@ -568,42 +559,42 @@ public class ObjectDefinition extends DualNode {
       signature = "(II[[IIIIS)Lex;",
       garbageValue = "-27831"
    )
-   public final Entity __l_423(int var1, int var2, int[][] var3, int var4, int var5, int var6) {
+   public final Entity method232(int var1, int var2, int[][] var3, int var4, int var5, int var6) {
       long var7;
-      if(this.__d == null) {
+      if (this.field645 == null) {
          var7 = (long)(var2 + (this.id << 10));
       } else {
          var7 = (long)(var2 + (var1 << 3) + (this.id << 10));
       }
 
-      Object var9 = (Entity)__jr_u.get(var7);
-      if(var9 == null) {
+      Object var9 = (Entity)field642.get(var7);
+      if (var9 == null) {
          ModelData var10 = this.getModelData(var1, var2);
-         if(var10 == null) {
+         if (var10 == null) {
             return null;
          }
 
-         if(!this.nonFlatShading) {
+         if (!this.nonFlatShading) {
             var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50);
          } else {
-            var10.__aq = (short)(this.ambient + 64);
-            var10.__aj = (short)(this.contrast + 768);
-            var10.__h_228();
+            var10.field559 = (short)(this.ambient + 64);
+            var10.field560 = (short)(this.contrast + 768);
+            var10.method216();
             var9 = var10;
          }
 
-         __jr_u.put((DualNode)var9, var7);
+         field642.put((DualNode)var9, var7);
       }
 
-      if(this.nonFlatShading) {
-         var9 = ((ModelData)var9).__o_218();
+      if (this.nonFlatShading) {
+         var9 = ((ModelData)var9).method206();
       }
 
-      if(this.clipType >= 0) {
-         if(var9 instanceof Model) {
+      if (this.clipType >= 0) {
+         if (var9 instanceof Model) {
             var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType);
-         } else if(var9 instanceof ModelData) {
-            var9 = ((ModelData)var9).__u_219(var3, var4, var5, var6, true, this.clipType);
+         } else if (var9 instanceof ModelData) {
+            var9 = ((ModelData)var9).method207(var3, var4, var5, var6, true, this.clipType);
          }
       }
 
@@ -618,16 +609,16 @@ public class ObjectDefinition extends DualNode {
    @Export("getModel")
    public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) {
       long var7;
-      if(this.__d == null) {
+      if (this.field645 == null) {
          var7 = (long)(var2 + (this.id << 10));
       } else {
          var7 = (long)(var2 + (var1 << 3) + (this.id << 10));
       }
 
       Model var9 = (Model)ObjectDefinition_cachedModels.get(var7);
-      if(var9 == null) {
+      if (var9 == null) {
          ModelData var10 = this.getModelData(var1, var2);
-         if(var10 == null) {
+         if (var10 == null) {
             return null;
          }
 
@@ -635,7 +626,7 @@ public class ObjectDefinition extends DualNode {
          ObjectDefinition_cachedModels.put(var9, var7);
       }
 
-      if(this.clipType >= 0) {
+      if (this.clipType >= 0) {
          var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType);
       }
 
@@ -650,16 +641,16 @@ public class ObjectDefinition extends DualNode {
    @Export("getModelDynamic")
    public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) {
       long var9;
-      if(this.__d == null) {
+      if (this.field645 == null) {
          var9 = (long)(var2 + (this.id << 10));
       } else {
          var9 = (long)(var2 + (var1 << 3) + (this.id << 10));
       }
 
       Model var11 = (Model)ObjectDefinition_cachedModels.get(var9);
-      if(var11 == null) {
+      if (var11 == null) {
          ModelData var12 = this.getModelData(var1, var2);
-         if(var12 == null) {
+         if (var12 == null) {
             return null;
          }
 
@@ -667,16 +658,16 @@ public class ObjectDefinition extends DualNode {
          ObjectDefinition_cachedModels.put(var11, var9);
       }
 
-      if(var7 == null && this.clipType == -1) {
+      if (var7 == null && this.clipType == -1) {
          return var11;
       } else {
-         if(var7 != null) {
+         if (var7 != null) {
             var11 = var7.animateObject(var11, var8, var2);
          } else {
             var11 = var11.toSharedSequenceModel(true);
          }
 
-         if(this.clipType >= 0) {
+         if (this.clipType >= 0) {
             var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType);
          }
 
@@ -694,135 +685,136 @@ public class ObjectDefinition extends DualNode {
       ModelData var3 = null;
       boolean var4;
       int var5;
+      int var6;
       int var7;
-      if(this.__d == null) {
-         if(var1 != 10) {
+      if (this.field645 == null) {
+         if (var1 != 10) {
             return null;
          }
 
-         if(this.__x == null) {
+         if (this.field644 == null) {
             return null;
          }
 
          var4 = this.isRotated;
-         if(var1 == 2 && var2 > 3) {
+         if (var1 == 2 && var2 > 3) {
             var4 = !var4;
          }
 
-         var5 = this.__x.length;
+         var5 = this.field644.length;
 
-         for(int var6 = 0; var6 < var5; ++var6) {
-            var7 = this.__x[var6];
-            if(var4) {
-               var7 += 65536;
+         for (var7 = 0; var7 < var5; ++var7) {
+            var6 = this.field644[var7];
+            if (var4) {
+               var6 += 65536;
             }
 
-            var3 = (ModelData)__jr_o.get((long)var7);
-            if(var3 == null) {
-               var3 = ModelData.method2788(__jr_q, var7 & 65535, 0);
-               if(var3 == null) {
+            var3 = (ModelData)field641.get((long)var6);
+            if (var3 == null) {
+               var3 = ModelData.method2788(field640, var6 & 65535, 0);
+               if (var3 == null) {
                   return null;
                }
 
-               if(var4) {
-                  var3.__t_226();
+               if (var4) {
+                  var3.method214();
                }
 
-               __jr_o.put(var3, (long)var7);
+               field641.put(var3, (long)var6);
             }
 
-            if(var5 > 1) {
-               __jr_l[var6] = var3;
+            if (var5 > 1) {
+               field643[var7] = var3;
             }
          }
 
-         if(var5 > 1) {
-            var3 = new ModelData(__jr_l, var5);
+         if (var5 > 1) {
+            var3 = new ModelData(field643, var5);
          }
       } else {
-         int var9 = -1;
+         var7 = -1;
 
-         for(var5 = 0; var5 < this.__d.length; ++var5) {
-            if(this.__d[var5] == var1) {
-               var9 = var5;
+         for (var5 = 0; var5 < this.field645.length; ++var5) {
+            if (this.field645[var5] == var1) {
+               var7 = var5;
                break;
             }
          }
 
-         if(var9 == -1) {
+         if (var7 == -1) {
             return null;
          }
 
-         var5 = this.__x[var9];
-         boolean var10 = this.isRotated ^ var2 > 3;
-         if(var10) {
+         var5 = this.field644[var7];
+         boolean var8 = this.isRotated ^ var2 > 3;
+         if (var8) {
             var5 += 65536;
          }
 
-         var3 = (ModelData)__jr_o.get((long)var5);
-         if(var3 == null) {
-            var3 = ModelData.method2788(__jr_q, var5 & 65535, 0);
-            if(var3 == null) {
+         var3 = (ModelData)field641.get((long)var5);
+         if (var3 == null) {
+            var3 = ModelData.method2788(field640, var5 & 65535, 0);
+            if (var3 == null) {
                return null;
             }
 
-            if(var10) {
-               var3.__t_226();
+            if (var8) {
+               var3.method214();
             }
 
-            __jr_o.put(var3, (long)var5);
+            field641.put(var3, (long)var5);
          }
       }
 
-      if(this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) {
+      if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) {
          var4 = false;
       } else {
          var4 = true;
       }
 
-      boolean var11;
-      if(this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) {
-         var11 = false;
+      boolean var10;
+      if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) {
+         var10 = false;
       } else {
-         var11 = true;
+         var10 = true;
       }
 
-      ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, null == this.retextureFrom, true);
-      if(var1 == 4 && var2 > 3) {
-         var8.__a_224(256);
-         var8.__z_225(45, 0, -45);
+      ModelData var9 = new ModelData(var3, var2 == 0 && !var4 && !var10, this.recolorFrom == null, null == this.retextureFrom, true);
+      if (var1 == 4 && var2 > 3) {
+         var9.method212(256);
+         var9.method213(45, 0, -45);
       }
 
       var2 &= 3;
-      if(var2 == 1) {
-         var8.__l_221();
-      } else if(var2 == 2) {
-         var8.__x_222();
-      } else if(var2 == 3) {
-         var8.__d_223();
+      if (var2 == 1) {
+         var9.method209();
+      } else if (var2 == 2) {
+         var9.method210();
+      } else if (var2 == 3) {
+         var9.method211();
       }
 
-      if(this.recolorFrom != null) {
-         for(var7 = 0; var7 < this.recolorFrom.length; ++var7) {
-            var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]);
+      if (this.recolorFrom != null) {
+         for (var6 = 0; var6 < this.recolorFrom.length; ++var6) {
+            var9.recolor(this.recolorFrom[var6], this.recolorTo[var6]);
          }
       }
 
-      if(this.retextureFrom != null) {
-         for(var7 = 0; var7 < this.retextureFrom.length; ++var7) {
-            var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]);
+      if (this.retextureFrom != null) {
+         for (var6 = 0; var6 < this.retextureFrom.length; ++var6) {
+            var9.retexture(this.retextureFrom[var6], this.retextureTo[var6]);
          }
       }
 
-      if(var4) {
-         var8.__y_227(this.modelSizeX, this.modelHeight, this.modelSizeY);
+      if (var4) {
+         var9.method215(this.modelSizeX, this.modelHeight, this.modelSizeY);
       }
 
-      if(var11) {
-         var8.__z_225(this.offsetX, this.offsetHeight, this.offsetY);
+      if (var10) {
+         var9.method213(this.offsetX, this.offsetHeight, this.offsetY);
       }
 
-      return var8;
+      return var9;
    }
 
    @ObfuscatedName("a")
@@ -833,20 +825,20 @@ public class ObjectDefinition extends DualNode {
    @Export("transform")
    public final ObjectDefinition transform() {
       int var1 = -1;
-      if(this.transformVarbit != -1) {
+      if (this.transformVarbit != -1) {
          var1 = WorldMapSection2.getVarbit(this.transformVarbit);
-      } else if(this.transformConfigId != -1) {
+      } else if (this.transformConfigId != -1) {
          var1 = Varps.Varps_main[this.transformConfigId];
       }
 
       int var2;
-      if(var1 >= 0 && var1 < this.transforms.length - 1) {
+      if (var1 >= 0 && var1 < this.transforms.length - 1) {
          var2 = this.transforms[var1];
       } else {
          var2 = this.transforms[this.transforms.length - 1];
       }
 
-      return var2 != -1?class50.getObjectDefinition(var2):null;
+      return var2 != -1 ? class50.getObjectDefinition(var2) : null;
    }
 
    @ObfuscatedName("z")
@@ -856,20 +848,20 @@ public class ObjectDefinition extends DualNode {
    )
    @Export("getIntParam")
    public int getIntParam(int var1, int var2) {
-      IterableNodeHashTable var4 = this.params;
-      int var3;
-      if(var4 == null) {
-         var3 = var2;
+      IterableNodeHashTable var3 = this.params;
+      int var4;
+      if (var3 == null) {
+         var4 = var2;
       } else {
-         IntegerNode var5 = (IntegerNode)var4.get((long)var1);
-         if(var5 == null) {
-            var3 = var2;
+         IntegerNode var5 = (IntegerNode)var3.get((long)var1);
+         if (var5 == null) {
+            var4 = var2;
          } else {
-            var3 = var5.integer;
+            var4 = var5.integer;
          }
       }
 
-      return var3;
+      return var4;
    }
 
    @ObfuscatedName("j")
@@ -887,14 +879,14 @@ public class ObjectDefinition extends DualNode {
       signature = "(I)Z",
       garbageValue = "8470625"
    )
-   public boolean __t_424() {
-      if(this.transforms == null) {
-         return this.ambientSoundId != -1 || this.__ax != null;
+   public boolean method233() {
+      if (this.transforms == null) {
+         return this.ambientSoundId != -1 || this.field646 != null;
       } else {
-         for(int var1 = 0; var1 < this.transforms.length; ++var1) {
-            if(this.transforms[var1] != -1) {
+         for (int var1 = 0; var1 < this.transforms.length; ++var1) {
+            if (this.transforms[var1] != -1) {
                ObjectDefinition var2 = class50.getObjectDefinition(this.transforms[var1]);
-               if(var2.ambientSoundId != -1 || var2.__ax != null) {
+               if (var2.ambientSoundId != -1 || var2.field646 != null) {
                   return true;
                }
             }
@@ -910,20 +902,20 @@ public class ObjectDefinition extends DualNode {
       garbageValue = "-1284680749"
    )
    @Export("getNpcDefinition")
-   public static NpcDefinition getNpcDefinition(int var0) {
-      NpcDefinition var1 = (NpcDefinition)NpcDefinition.NpcDefinition_cached.get((long)var0);
-      if(var1 != null) {
+   public static NPCDefinition getNpcDefinition(int var0) {
+      NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0);
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = NpcDefinition.NpcDefinition_indexCache.takeRecord(9, var0);
-         var1 = new NpcDefinition();
+         byte[] var2 = NPCDefinition.NpcDefinition_indexCache.takeRecord(9, var0);
+         var1 = new NPCDefinition();
          var1.id = var0;
-         if(var2 != null) {
+         if (var2 != null) {
             var1.read(new Buffer(var2));
          }
 
          var1.init();
-         NpcDefinition.NpcDefinition_cached.put(var1, (long)var0);
+         NPCDefinition.NpcDefinition_cached.put(var1, (long)var0);
          return var1;
       }
    }
@@ -936,4 +928,13 @@ public class ObjectDefinition extends DualNode {
    public static void method5041() {
       ItemDefinition.Sprite_cached.clear();
    }
+
+   static {
+      ObjectDefinition_isLowDetail = false;
+      ObjectDefinition_cached = new EvictingDualNodeHashTable(4096);
+      field641 = new EvictingDualNodeHashTable(500);
+      field642 = new EvictingDualNodeHashTable(30);
+      ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30);
+      field643 = new ModelData[4];
+   }
 }
diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java
index 773f32dc91..1fb50a8cb5 100644
--- a/runescape-client/src/main/java/ObjectSound.java
+++ b/runescape-client/src/main/java/ObjectSound.java
@@ -23,32 +23,32 @@ public final class ObjectSound extends Node {
    @ObfuscatedGetter(
       intValue = 647270745
    )
-   int __f;
+   int field647;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = -800464493
    )
-   int __q;
+   int field648;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = -85911525
    )
-   int __w;
+   int field649;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = -211591209
    )
-   int __o;
+   int field650;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 512258949
    )
-   int __u;
+   int field651;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = 1344558633
    )
-   int __g;
+   int field652;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -731474443
@@ -65,12 +65,12 @@ public final class ObjectSound extends Node {
    @ObfuscatedGetter(
       intValue = -1608400407
    )
-   int __x;
+   int field653;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = 1748890449
    )
-   int __d;
+   int field654;
    @ObfuscatedName("k")
    @Export("soundEffectIds")
    int[] soundEffectIds;
@@ -78,7 +78,7 @@ public final class ObjectSound extends Node {
    @ObfuscatedGetter(
       intValue = -1041508847
    )
-   int __n;
+   int field655;
    @ObfuscatedName("i")
    @ObfuscatedSignature(
       signature = "Lds;"
@@ -92,10 +92,6 @@ public final class ObjectSound extends Node {
    @Export("obj")
    ObjectDefinition obj;
 
-   static {
-      objectSounds = new NodeDeque();
-   }
-
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "(I)V",
@@ -105,24 +101,28 @@ public final class ObjectSound extends Node {
    void set() {
       int var1 = this.soundEffectId;
       ObjectDefinition var2 = this.obj.transform();
-      if(var2 != null) {
+      if (var2 != null) {
          this.soundEffectId = var2.ambientSoundId;
-         this.__g = var2.int4 * 128;
-         this.__x = var2.int5;
-         this.__d = var2.int6;
-         this.soundEffectIds = var2.__ax;
+         this.field652 = var2.int4 * 128;
+         this.field653 = var2.int5;
+         this.field654 = var2.int6;
+         this.soundEffectIds = var2.field646;
       } else {
          this.soundEffectId = -1;
-         this.__g = 0;
-         this.__x = 0;
-         this.__d = 0;
+         this.field652 = 0;
+         this.field653 = 0;
+         this.field654 = 0;
          this.soundEffectIds = null;
       }
 
-      if(var1 != this.soundEffectId && this.stream1 != null) {
+      if (var1 != this.soundEffectId && this.stream1 != null) {
          TaskHandler.pcmStreamMixer.removeSubStream(this.stream1);
          this.stream1 = null;
       }
 
    }
+
+   static {
+      objectSounds = new NodeDeque();
+   }
 }
diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java
index ba1f42329d..144bc43c11 100644
--- a/runescape-client/src/main/java/Occluder.java
+++ b/runescape-client/src/main/java/Occluder.java
@@ -77,37 +77,37 @@ public final class Occluder {
    @ObfuscatedGetter(
       intValue = 826041747
    )
-   int __k;
+   int field656;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
       intValue = -407777817
    )
-   int __n;
+   int field657;
    @ObfuscatedName("i")
    @ObfuscatedGetter(
       intValue = 1324959981
    )
-   int __i;
+   int field658;
    @ObfuscatedName("a")
    @ObfuscatedGetter(
       intValue = -1527021367
    )
-   int __a;
+   int field659;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = -570391007
    )
-   int __z;
+   int field660;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = -373839103
    )
-   int __j;
+   int field661;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = -1334433969
    )
-   int __s;
+   int field662;
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
@@ -116,12 +116,12 @@ public final class Occluder {
    )
    public static VarbitDefinition method3255(int var0) {
       VarbitDefinition var1 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
          byte[] var2 = VarbitDefinition.VarbitDefinition_indexCache.takeRecord(14, var0);
          var1 = new VarbitDefinition();
-         if(var2 != null) {
+         if (var2 != null) {
             var1.read(new Buffer(var2));
          }
 
@@ -140,26 +140,26 @@ public final class Occluder {
       Script var1 = new Script();
       Buffer var2 = new Buffer(var0);
       var2.index = var2.array.length - 2;
-      int var3 = var2.__ag_302();
+      int var3 = var2.method43();
       int var4 = var2.array.length - 2 - var3 - 12;
       var2.index = var4;
       int var5 = var2.readInt();
-      var1.localIntCount = var2.__ag_302();
-      var1.localStringCount = var2.__ag_302();
-      var1.intArgumentCount = var2.__ag_302();
-      var1.stringArgumentCount = var2.__ag_302();
+      var1.localIntCount = var2.method43();
+      var1.localStringCount = var2.method43();
+      var1.intArgumentCount = var2.method43();
+      var1.stringArgumentCount = var2.method43();
       int var6 = var2.readUnsignedByte();
       int var7;
       int var8;
-      if(var6 > 0) {
-         var1.switches = var1.__o_164(var6);
+      if (var6 > 0) {
+         var1.switches = var1.method302(var6);
 
-         for(var7 = 0; var7 < var6; ++var7) {
-            var8 = var2.__ag_302();
-            IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0?World.method1759(var8):1);
+         for (var7 = 0; var7 < var6; ++var7) {
+            var8 = var2.method43();
+            IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? World.method1759(var8) : 1);
             var1.switches[var7] = var9;
 
-            while(var8-- > 0) {
+            while (var8-- > 0) {
                int var10 = var2.readInt();
                int var11 = var2.readInt();
                var9.put(new IntegerNode(var11), (long)var10);
@@ -173,11 +173,11 @@ public final class Occluder {
       var1.intOperands = new int[var5];
       var1.stringOperands = new String[var5];
 
-      for(var7 = 0; var2.index < var4; var1.opcodes[var7++] = var8) {
-         var8 = var2.__ag_302();
-         if(var8 == 3) {
+      for (var7 = 0; var2.index < var4; var1.opcodes[var7++] = var8) {
+         var8 = var2.method43();
+         if (var8 == 3) {
             var1.stringOperands[var7] = var2.readStringCp1252NullTerminated();
-         } else if(var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) {
+         } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) {
             var1.intOperands[var7] = var2.readInt();
          } else {
             var1.intOperands[var7] = var2.readUnsignedByte();
diff --git a/runescape-client/src/main/java/OverlayDefinition.java b/runescape-client/src/main/java/OverlayDefinition.java
index 89a966d8dc..63a376eb61 100644
--- a/runescape-client/src/main/java/OverlayDefinition.java
+++ b/runescape-client/src/main/java/OverlayDefinition.java
@@ -11,12 +11,12 @@ public class OverlayDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __jf_m;
+   public static AbstractIndexCache field663;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   public static EvictingDualNodeHashTable __jf_f;
+   public static EvictingDualNodeHashTable field664;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = -111851793
@@ -30,7 +30,7 @@ public class OverlayDefinition extends DualNode {
    @Export("texture")
    public int texture;
    @ObfuscatedName("o")
-   public boolean __o;
+   public boolean field665;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 528865753
@@ -74,14 +74,10 @@ public class OverlayDefinition extends DualNode {
    @Export("lightness2")
    public int lightness2;
 
-   static {
-      __jf_f = new EvictingDualNodeHashTable(64);
-   }
-
    public OverlayDefinition() {
       this.rgb = 0;
       this.texture = -1;
-      this.__o = true;
+      this.field665 = true;
       this.rgb2 = -1;
    }
 
@@ -92,7 +88,7 @@ public class OverlayDefinition extends DualNode {
    )
    @Export("init")
    public void init() {
-      if(this.rgb2 != -1) {
+      if (this.rgb2 != -1) {
          this.setHsl(this.rgb2);
          this.hue2 = this.hue;
          this.saturation2 = this.saturation;
@@ -109,9 +105,9 @@ public class OverlayDefinition extends DualNode {
    )
    @Export("read")
    public void read(Buffer var1, int var2) {
-      while(true) {
+      while (true) {
          int var3 = var1.readUnsignedByte();
-         if(var3 == 0) {
+         if (var3 == 0) {
             return;
          }
 
@@ -126,16 +122,15 @@ public class OverlayDefinition extends DualNode {
    )
    @Export("readNext")
    void readNext(Buffer var1, int var2, int var3) {
-      if(var2 == 1) {
+      if (var2 == 1) {
          this.rgb = var1.readMedium();
-      } else if(var2 == 2) {
+      } else if (var2 == 2) {
          this.texture = var1.readUnsignedByte();
-      } else if(var2 == 5) {
-         this.__o = false;
-      } else if(var2 == 7) {
+      } else if (var2 == 5) {
+         this.field665 = false;
+      } else if (var2 == 7) {
          this.rgb2 = var1.readMedium();
-      } else if(var2 == 8) {
-         ;
+      } else if (var2 == 8) {
       }
 
    }
@@ -151,40 +146,40 @@ public class OverlayDefinition extends DualNode {
       double var4 = (double)(var1 >> 8 & 255) / 256.0D;
       double var6 = (double)(var1 & 255) / 256.0D;
       double var8 = var2;
-      if(var4 < var2) {
+      if (var4 < var2) {
          var8 = var4;
       }
 
-      if(var6 < var8) {
+      if (var6 < var8) {
          var8 = var6;
       }
 
       double var10 = var2;
-      if(var4 > var2) {
+      if (var4 > var2) {
          var10 = var4;
       }
 
-      if(var6 > var10) {
+      if (var6 > var10) {
          var10 = var6;
       }
 
       double var12 = 0.0D;
       double var14 = 0.0D;
       double var16 = (var10 + var8) / 2.0D;
-      if(var8 != var10) {
-         if(var16 < 0.5D) {
+      if (var8 != var10) {
+         if (var16 < 0.5D) {
             var14 = (var10 - var8) / (var8 + var10);
          }
 
-         if(var16 >= 0.5D) {
+         if (var16 >= 0.5D) {
             var14 = (var10 - var8) / (2.0D - var10 - var8);
          }
 
-         if(var10 == var2) {
+         if (var10 == var2) {
             var12 = (var4 - var6) / (var10 - var8);
-         } else if(var10 == var4) {
+         } else if (var10 == var4) {
             var12 = (var6 - var2) / (var10 - var8) + 2.0D;
-         } else if(var10 == var6) {
+         } else if (var10 == var6) {
             var12 = (var2 - var4) / (var10 - var8) + 4.0D;
          }
       }
@@ -193,15 +188,15 @@ public class OverlayDefinition extends DualNode {
       this.hue = (int)(var12 * 256.0D);
       this.saturation = (int)(256.0D * var14);
       this.lightness = (int)(var16 * 256.0D);
-      if(this.saturation < 0) {
+      if (this.saturation < 0) {
          this.saturation = 0;
-      } else if(this.saturation > 255) {
+      } else if (this.saturation > 255) {
          this.saturation = 255;
       }
 
-      if(this.lightness < 0) {
+      if (this.lightness < 0) {
          this.lightness = 0;
-      } else if(this.lightness > 255) {
+      } else if (this.lightness > 255) {
          this.lightness = 255;
       }
 
@@ -214,33 +209,37 @@ public class OverlayDefinition extends DualNode {
    )
    @Export("alignWidgetPosition")
    static void alignWidgetPosition(Widget var0, int var1, int var2) {
-      if(var0.xAlignment == 0) {
+      if (var0.xAlignment == 0) {
          var0.x = var0.rawX;
-      } else if(var0.xAlignment == 1) {
+      } else if (var0.xAlignment == 1) {
          var0.x = var0.rawX + (var1 - var0.width) / 2;
-      } else if(var0.xAlignment == 2) {
+      } else if (var0.xAlignment == 2) {
          var0.x = var1 - var0.width - var0.rawX;
-      } else if(var0.xAlignment == 3) {
+      } else if (var0.xAlignment == 3) {
          var0.x = var0.rawX * var1 >> 14;
-      } else if(var0.xAlignment == 4) {
+      } else if (var0.xAlignment == 4) {
          var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2;
       } else {
          var0.x = var1 - var0.width - (var0.rawX * var1 >> 14);
       }
 
-      if(var0.yAlignment == 0) {
+      if (var0.yAlignment == 0) {
          var0.y = var0.rawY;
-      } else if(var0.yAlignment == 1) {
+      } else if (var0.yAlignment == 1) {
          var0.y = (var2 - var0.height) / 2 + var0.rawY;
-      } else if(var0.yAlignment == 2) {
+      } else if (var0.yAlignment == 2) {
          var0.y = var2 - var0.height - var0.rawY;
-      } else if(var0.yAlignment == 3) {
+      } else if (var0.yAlignment == 3) {
          var0.y = var2 * var0.rawY >> 14;
-      } else if(var0.yAlignment == 4) {
+      } else if (var0.yAlignment == 4) {
          var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2;
       } else {
          var0.y = var2 - var0.height - (var2 * var0.rawY >> 14);
       }
 
    }
+
+   static {
+      field664 = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/OwnWorldComparator.java b/runescape-client/src/main/java/OwnWorldComparator.java
index 0c81a18929..4914d77bed 100644
--- a/runescape-client/src/main/java/OwnWorldComparator.java
+++ b/runescape-client/src/main/java/OwnWorldComparator.java
@@ -8,40 +8,40 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("OwnWorldComparator")
 public class OwnWorldComparator implements Comparator {
    @ObfuscatedName("m")
-   boolean __m;
+   boolean field666;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Ll;Ll;B)I",
       garbageValue = "21"
    )
-   int __m_132(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-      if(var2.world == var1.world) {
+   int method234(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+      if (var2.world == var1.world) {
          return 0;
       } else {
-         if(this.__m) {
-            if(Client.worldId == var1.world) {
+         if (this.field666) {
+            if (Client.worldId == var1.world) {
                return -1;
             }
 
-            if(var2.world == Client.worldId) {
+            if (var2.world == Client.worldId) {
                return 1;
             }
          }
 
-         return var1.world < var2.world?-1:1;
+         return var1.world < var2.world ? -1 : 1;
       }
    }
 
    @ObfuscatedName("equals")
-   public boolean __equals_134(Object var1) {
+   public boolean method235(Object var1) {
       return super.equals(var1);
    }
 
    @Export("compare")
    @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_132((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+      return this.method234((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
    }
 
    @ObfuscatedName("al")
@@ -51,31 +51,31 @@ public class OwnWorldComparator implements Comparator {
    )
    static int method1285(int var0, Script var1, boolean var2) {
       int var3;
-      if(var0 == 5504) {
+      if (var0 == 5504) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          int var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         if(!Client.isCameraLocked) {
+         if (!Client.isCameraLocked) {
             Client.cameraPitchTarget = var3;
             Client.minimapOrientation = var4;
          }
 
          return 1;
-      } else if(var0 == 5505) {
+      } else if (var0 == 5505) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraPitchTarget;
          return 1;
-      } else if(var0 == 5506) {
+      } else if (var0 == 5506) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.minimapOrientation;
          return 1;
-      } else if(var0 == 5530) {
+      } else if (var0 == 5530) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         if(var3 < 0) {
+         if (var3 < 0) {
             var3 = 0;
          }
 
          Client.cameraFollowHeight = var3;
          return 1;
-      } else if(var0 == 5531) {
+      } else if (var0 == 5531) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraFollowHeight;
          return 1;
       } else {
diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java
index 308a9d2a77..b4985caf88 100644
--- a/runescape-client/src/main/java/PacketBuffer.java
+++ b/runescape-client/src/main/java/PacketBuffer.java
@@ -14,7 +14,7 @@ public final class PacketBuffer extends Buffer {
    @ObfuscatedGetter(
       intValue = 701739159
    )
-   public static int __hx_z;
+   public static int field667;
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "Lhn;"
@@ -28,10 +28,6 @@ public final class PacketBuffer extends Buffer {
    @Export("bitIndex")
    int bitIndex;
 
-   static {
-      PacketBuffer_masks = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1};
-   }
-
    public PacketBuffer(int var1) {
       super(var1);
    }
@@ -63,7 +59,7 @@ public final class PacketBuffer extends Buffer {
    )
    @Export("writeByteIsaac")
    public void writeByteIsaac(int var1) {
-      super.array[++super.index - 1] = (byte)(var1 + this.isaacCipher0.__m_336());
+      super.array[++super.index - 1] = (byte)(var1 + this.isaacCipher0.method136());
    }
 
    @ObfuscatedName("ii")
@@ -73,7 +69,7 @@ public final class PacketBuffer extends Buffer {
    )
    @Export("readByteIsaac")
    public int readByteIsaac() {
-      return super.array[++super.index - 1] - this.isaacCipher0.__m_336() & 255;
+      return super.array[++super.index - 1] - this.isaacCipher0.method136() & 255;
    }
 
    @ObfuscatedName("ig")
@@ -81,8 +77,8 @@ public final class PacketBuffer extends Buffer {
       signature = "(B)Z",
       garbageValue = "101"
    )
-   public boolean __ig_334() {
-      int var1 = super.array[super.index] - this.isaacCipher0.__f_337() & 255;
+   public boolean method236() {
+      int var1 = super.array[super.index] - this.isaacCipher0.method137() & 255;
       return var1 >= 128;
    }
 
@@ -93,8 +89,8 @@ public final class PacketBuffer extends Buffer {
    )
    @Export("readSmartByteShortIsaac")
    public int readSmartByteShortIsaac() {
-      int var1 = super.array[++super.index - 1] - this.isaacCipher0.__m_336() & 255;
-      return var1 < 128?var1:(var1 - 128 << 8) + (super.array[++super.index - 1] - this.isaacCipher0.__m_336() & 255);
+      int var1 = super.array[++super.index - 1] - this.isaacCipher0.method136() & 255;
+      return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.index - 1] - this.isaacCipher0.method136() & 255);
    }
 
    @ObfuscatedName("jb")
@@ -102,9 +98,9 @@ public final class PacketBuffer extends Buffer {
       signature = "([BIII)V",
       garbageValue = "-1168019189"
    )
-   public void __jb_335(byte[] var1, int var2, int var3) {
-      for(int var4 = 0; var4 < var3; ++var4) {
-         var1[var4 + var2] = (byte)(super.array[++super.index - 1] - this.isaacCipher0.__m_336());
+   public void method237(byte[] var1, int var2, int var3) {
+      for (int var4 = 0; var4 < var3; ++var4) {
+         var1[var4 + var2] = (byte)(super.array[++super.index - 1] - this.isaacCipher0.method136());
       }
 
    }
@@ -130,12 +126,12 @@ public final class PacketBuffer extends Buffer {
       int var3 = 8 - (this.bitIndex & 7);
       int var4 = 0;
 
-      for(this.bitIndex += var1; var1 > var3; var3 = 8) {
+      for (this.bitIndex += var1; var1 > var3; var3 = 8) {
          var4 += (super.array[var2++] & PacketBuffer_masks[var3]) << var1 - var3;
          var1 -= var3;
       }
 
-      if(var3 == var1) {
+      if (var3 == var1) {
          var4 += super.array[var2] & PacketBuffer_masks[var3];
       } else {
          var4 += super.array[var2] >> var3 - var1 & PacketBuffer_masks[var1];
@@ -182,22 +178,21 @@ public final class PacketBuffer extends Buffer {
    static void requestNetFile(IndexCache var0, int var1, int var2, int var3, byte var4, boolean var5) {
       long var6 = (long)((var1 << 16) + var2);
       NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6);
-      if(var8 == null) {
+      if (var8 == null) {
          var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6);
-         if(var8 == null) {
+         if (var8 == null) {
             var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6);
-            if(var8 != null) {
-               if(var5) {
+            if (var8 != null) {
+               if (var5) {
                   var8.removeDual();
                   NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
                   --NetCache.NetCache_pendingWritesCount;
                   ++NetCache.NetCache_pendingPriorityWritesCount;
                }
-
             } else {
-               if(!var5) {
+               if (!var5) {
                   var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6);
-                  if(var8 != null) {
+                  if (var8 != null) {
                      return;
                   }
                }
@@ -206,7 +201,7 @@ public final class PacketBuffer extends Buffer {
                var8.indexCache = var0;
                var8.crc = var3;
                var8.padding = var4;
-               if(var5) {
+               if (var5) {
                   NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
                   ++NetCache.NetCache_pendingPriorityWritesCount;
                } else {
@@ -214,10 +209,10 @@ public final class PacketBuffer extends Buffer {
                   NetCache.NetCache_pendingWrites.put(var8, var6);
                   ++NetCache.NetCache_pendingWritesCount;
                }
-
             }
          }
       }
+
    }
 
    @ObfuscatedName("f")
@@ -228,4 +223,8 @@ public final class PacketBuffer extends Buffer {
    public static int method4081(int var0, int var1) {
       return (var0 + 40000 << 8) + var1;
    }
+
+   static {
+      PacketBuffer_masks = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1};
+   }
 }
diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java
index 4db93c1b8c..192a707d9b 100644
--- a/runescape-client/src/main/java/PacketBufferNode.java
+++ b/runescape-client/src/main/java/PacketBufferNode.java
@@ -17,17 +17,17 @@ public class PacketBufferNode extends Node {
    @ObfuscatedGetter(
       intValue = -1583654139
    )
-   public static int __gg_u;
+   public static int field668;
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public ClientPacket __m;
+   public ClientPacket field669;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 1433542775
    )
-   public int __f;
+   public int field670;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lhx;"
@@ -38,22 +38,18 @@ public class PacketBufferNode extends Node {
    @ObfuscatedGetter(
       intValue = -2051819203
    )
-   public int __w;
-
-   static {
-      packetBufferNodes = new PacketBufferNode[300];
-      __gg_u = 0;
-   }
+   public int field671;
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "(I)V",
       garbageValue = "-1987685511"
    )
-   public void __f_292() {
-      if(__gg_u < packetBufferNodes.length) {
-         packetBufferNodes[++__gg_u - 1] = this;
+   public void method238() {
+      if (field668 < packetBufferNodes.length) {
+         packetBufferNodes[++field668 - 1] = this;
       }
+
    }
 
    @ObfuscatedName("kq")
@@ -64,4 +60,9 @@ public class PacketBufferNode extends Node {
    static boolean method3673(Widget var0) {
       return var0.isHidden;
    }
+
+   static {
+      packetBufferNodes = new PacketBufferNode[300];
+      field668 = 0;
+   }
 }
diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java
index d01f2bce26..ea0c467d30 100644
--- a/runescape-client/src/main/java/PacketWriter.java
+++ b/runescape-client/src/main/java/PacketWriter.java
@@ -30,7 +30,7 @@ public class PacketWriter {
    @ObfuscatedGetter(
       intValue = -1028046199
    )
-   int __q;
+   int field672;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lgr;"
@@ -62,43 +62,43 @@ public class PacketWriter {
    @Export("serverPacket0Length")
    int serverPacket0Length;
    @ObfuscatedName("e")
-   boolean __e;
+   boolean field673;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = 120570975
    )
-   int __x;
+   int field674;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = 1672229609
    )
-   int __d;
+   int field675;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   ServerPacket __k;
+   ServerPacket field676;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   ServerPacket __n;
+   ServerPacket field677;
    @ObfuscatedName("i")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   ServerPacket __i;
+   ServerPacket field678;
 
    PacketWriter() {
       this.packetBufferNodes = new IterableNodeDeque();
-      this.__q = 0;
+      this.field672 = 0;
       this.buffer = new Buffer(5000);
       this.packetBuffer = new PacketBuffer(40000);
       this.serverPacket0 = null;
       this.serverPacket0Length = 0;
-      this.__e = true;
-      this.__x = 0;
-      this.__d = 0;
+      this.field673 = true;
+      this.field674 = 0;
+      this.field675 = 0;
    }
 
    @ObfuscatedName("m")
@@ -106,9 +106,9 @@ public class PacketWriter {
       signature = "(I)V",
       garbageValue = "1561094077"
    )
-   final void __m_165() {
+   final void method239() {
       this.packetBufferNodes.clear();
-      this.__q = 0;
+      this.field672 = 0;
    }
 
    @ObfuscatedName("f")
@@ -116,23 +116,23 @@ public class PacketWriter {
       signature = "(I)V",
       garbageValue = "-1839929685"
    )
-   final void __f_166() throws IOException {
-      if(this.socket0 != null && this.__q > 0) {
+   final void method240() throws IOException {
+      if (this.socket0 != null && this.field672 > 0) {
          this.buffer.index = 0;
 
-         while(true) {
+         while (true) {
             PacketBufferNode var1 = (PacketBufferNode)this.packetBufferNodes.last();
-            if(var1 == null || var1.__w > this.buffer.array.length - this.buffer.index) {
+            if (var1 == null || var1.field671 > this.buffer.array.length - this.buffer.index) {
                this.socket0.write(this.buffer.array, 0, this.buffer.index);
-               this.__d = 0;
+               this.field675 = 0;
                break;
             }
 
-            this.buffer.__s_297(var1.packetBuffer.array, 0, var1.__w);
-            this.__q -= var1.__w;
+            this.buffer.method38(var1.packetBuffer.array, 0, var1.field671);
+            this.field672 -= var1.field671;
             var1.remove();
-            var1.packetBuffer.__f_295();
-            var1.__f_292();
+            var1.packetBuffer.method36();
+            var1.method238();
          }
       }
 
@@ -143,11 +143,11 @@ public class PacketWriter {
       signature = "(Lgg;I)V",
       garbageValue = "599379248"
    )
-   public final void __q_167(PacketBufferNode var1) {
+   public final void method241(PacketBufferNode var1) {
       this.packetBufferNodes.addFirst(var1);
-      var1.__w = var1.packetBuffer.index;
+      var1.field671 = var1.packetBuffer.index;
       var1.packetBuffer.index = 0;
-      this.__q += var1.__w;
+      this.field672 += var1.field671;
    }
 
    @ObfuscatedName("w")
@@ -167,7 +167,7 @@ public class PacketWriter {
    )
    @Export("close")
    void close() {
-      if(this.socket0 != null) {
+      if (this.socket0 != null) {
          this.socket0.close();
          this.socket0 = null;
       }
diff --git a/runescape-client/src/main/java/ParamKeyDefinition.java b/runescape-client/src/main/java/ParamKeyDefinition.java
index c5b54db627..da1d214b1e 100644
--- a/runescape-client/src/main/java/ParamKeyDefinition.java
+++ b/runescape-client/src/main/java/ParamKeyDefinition.java
@@ -11,7 +11,7 @@ public class ParamKeyDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __jb_m;
+   public static AbstractIndexCache field679;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -34,10 +34,6 @@ public class ParamKeyDefinition extends DualNode {
    @Export("isMembersOnly")
    boolean isMembersOnly;
 
-   static {
-      ParamKeyDefinition_cached = new EvictingDualNodeHashTable(64);
-   }
-
    ParamKeyDefinition() {
       this.isMembersOnly = true;
    }
@@ -58,9 +54,9 @@ public class ParamKeyDefinition extends DualNode {
    )
    @Export("read")
    void read(Buffer var1) {
-      while(true) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
@@ -75,13 +71,13 @@ public class ParamKeyDefinition extends DualNode {
    )
    @Export("readNext")
    void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
+      if (var2 == 1) {
          this.type = class14.method171(var1.readByte());
-      } else if(var2 == 2) {
+      } else if (var2 == 2) {
          this.keyInt = var1.readInt();
-      } else if(var2 == 4) {
+      } else if (var2 == 4) {
          this.isMembersOnly = false;
-      } else if(var2 == 5) {
+      } else if (var2 == 5) {
          this.keyString = var1.readStringCp1252NullTerminated();
       }
 
@@ -103,8 +99,8 @@ public class ParamKeyDefinition extends DualNode {
       garbageValue = "-904254947"
    )
    static final void method4933(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-      if(var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) {
-         if(Client.isLowDetail && var0 != SoundSystem.plane) {
+      if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) {
+         if (Client.isLowDetail && var0 != SoundSystem.plane) {
             return;
          }
 
@@ -112,86 +108,86 @@ public class ParamKeyDefinition extends DualNode {
          boolean var9 = true;
          boolean var10 = false;
          boolean var11 = false;
-         if(var1 == 0) {
-            var7 = class65.scene.__ar_244(var0, var2, var3);
+         if (var1 == 0) {
+            var7 = class65.scene.method290(var0, var2, var3);
          }
 
-         if(var1 == 1) {
-            var7 = class65.scene.__ac_245(var0, var2, var3);
+         if (var1 == 1) {
+            var7 = class65.scene.method291(var0, var2, var3);
          }
 
-         if(var1 == 2) {
-            var7 = class65.scene.__ay_246(var0, var2, var3);
+         if (var1 == 2) {
+            var7 = class65.scene.method292(var0, var2, var3);
          }
 
-         if(var1 == 3) {
+         if (var1 == 3) {
             var7 = class65.scene.getFloorDecorationTag(var0, var2, var3);
          }
 
          int var12;
-         if(0L != var7) {
+         if (0L != var7) {
             var12 = class65.scene.getObjectFlags(var0, var2, var3, var7);
-            int var39 = HitSplatDefinition.method4972(var7);
-            int var40 = var12 & 31;
-            int var41 = var12 >> 6 & 3;
-            ObjectDefinition var13;
-            if(var1 == 0) {
+            int var13 = HitSplatDefinition.method4972(var7);
+            int var14 = var12 & 31;
+            int var15 = var12 >> 6 & 3;
+            ObjectDefinition var16;
+            if (var1 == 0) {
                class65.scene.removeBoundaryObject(var0, var2, var3);
-               var13 = class50.getObjectDefinition(var39);
-               if(var13.interactType != 0) {
-                  Client.collisionMaps[var0].__g_288(var2, var3, var40, var41, var13.boolean1);
+               var16 = class50.getObjectDefinition(var13);
+               if (var16.interactType != 0) {
+                  Client.collisionMaps[var0].method95(var2, var3, var14, var15, var16.boolean1);
                }
             }
 
-            if(var1 == 1) {
+            if (var1 == 1) {
                class65.scene.removeWallDecoration(var0, var2, var3);
             }
 
-            if(var1 == 2) {
-               class65.scene.__c_242(var0, var2, var3);
-               var13 = class50.getObjectDefinition(var39);
-               if(var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) {
+            if (var1 == 2) {
+               class65.scene.method288(var0, var2, var3);
+               var16 = class50.getObjectDefinition(var13);
+               if (var2 + var16.sizeX > 103 || var3 + var16.sizeX > 103 || var2 + var16.sizeY > 103 || var3 + var16.sizeY > 103) {
                   return;
                }
 
-               if(var13.interactType != 0) {
-                  Client.collisionMaps[var0].__l_289(var2, var3, var13.sizeX, var13.sizeY, var41, var13.boolean1);
+               if (var16.interactType != 0) {
+                  Client.collisionMaps[var0].method96(var2, var3, var16.sizeX, var16.sizeY, var15, var16.boolean1);
                }
             }
 
-            if(var1 == 3) {
+            if (var1 == 3) {
                class65.scene.removeFloorDecoration(var0, var2, var3);
-               var13 = class50.getObjectDefinition(var39);
-               if(var13.interactType == 1) {
-                  Client.collisionMaps[var0].__x_291(var2, var3);
+               var16 = class50.getObjectDefinition(var13);
+               if (var16.interactType == 1) {
+                  Client.collisionMaps[var0].method98(var2, var3);
                }
             }
          }
 
-         if(var4 >= 0) {
+         if (var4 >= 0) {
             var12 = var0;
-            if(var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) {
+            if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) {
                var12 = var0 + 1;
             }
 
-            Scene var42 = class65.scene;
-            CollisionMap var14 = Client.collisionMaps[var0];
-            ObjectDefinition var15 = class50.getObjectDefinition(var4);
-            int var16;
+            Scene var36 = class65.scene;
+            CollisionMap var37 = Client.collisionMaps[var0];
+            ObjectDefinition var38 = class50.getObjectDefinition(var4);
             int var17;
-            if(var5 != 1 && var5 != 3) {
-               var16 = var15.sizeX;
-               var17 = var15.sizeY;
+            int var39;
+            if (var5 != 1 && var5 != 3) {
+               var39 = var38.sizeX;
+               var17 = var38.sizeY;
             } else {
-               var16 = var15.sizeY;
-               var17 = var15.sizeX;
+               var39 = var38.sizeY;
+               var17 = var38.sizeX;
             }
 
             int var18;
             int var19;
-            if(var16 + var2 <= 104) {
-               var18 = (var16 >> 1) + var2;
-               var19 = var2 + (var16 + 1 >> 1);
+            if (var39 + var2 <= 104) {
+               var18 = (var39 >> 1) + var2;
+               var19 = var2 + (var39 + 1 >> 1);
             } else {
                var18 = var2;
                var19 = var2 + 1;
@@ -199,7 +195,7 @@ public class ParamKeyDefinition extends DualNode {
 
             int var20;
             int var21;
-            if(var3 + var17 <= 104) {
+            if (var3 + var17 <= 104) {
                var20 = var3 + (var17 >> 1);
                var21 = var3 + (var17 + 1 >> 1);
             } else {
@@ -209,186 +205,192 @@ public class ParamKeyDefinition extends DualNode {
 
             int[][] var22 = Tiles.Tiles_heights[var12];
             int var23 = var22[var18][var21] + var22[var19][var20] + var22[var18][var20] + var22[var19][var21] >> 2;
-            int var24 = (var2 << 7) + (var16 << 6);
+            int var24 = (var2 << 7) + (var39 << 6);
             int var25 = (var3 << 7) + (var17 << 6);
-            long var26 = FontName.method5637(var2, var3, 2, var15.int1 == 0, var4);
+            long var26 = FontName.method5637(var2, var3, 2, var38.int1 == 0, var4);
             int var28 = (var5 << 6) + var6;
-            if(var15.int3 == 1) {
+            if (var38.int3 == 1) {
                var28 += 256;
             }
 
             Object var29;
-            if(var6 == 22) {
-               if(var15.animationId == -1 && var15.transforms == null) {
-                  var29 = var15.getModel(22, var5, var22, var24, var23, var25);
+            if (var6 == 22) {
+               if (var38.animationId == -1 && var38.transforms == null) {
+                  var29 = var38.getModel(22, var5, var22, var24, var23, var25);
                } else {
-                  var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+                  var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
                }
 
-               var42.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28);
-               if(var15.interactType == 1) {
-                  var14.__o_286(var2, var3);
+               var36.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28);
+               if (var38.interactType == 1) {
+                  var37.method93(var2, var3);
                }
-            } else if(var6 != 10 && var6 != 11) {
-               if(var6 >= 12) {
-                  if(var15.animationId == -1 && var15.transforms == null) {
-                     var29 = var15.getModel(var6, var5, var22, var24, var23, var25);
+            } else if (var6 != 10 && var6 != 11) {
+               if (var6 >= 12) {
+                  if (var38.animationId == -1 && var38.transforms == null) {
+                     var29 = var38.getModel(var6, var5, var22, var24, var23, var25);
                   } else {
-                     var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+                     var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
                   }
 
-                  var42.__d_238(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
-                  if(var15.interactType != 0) {
-                     var14.__q_284(var2, var3, var16, var17, var15.boolean1);
+                  var36.method284(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
+                  if (var38.interactType != 0) {
+                     var37.method91(var2, var3, var39, var17, var38.boolean1);
                   }
-               } else if(var6 == 0) {
-                  if(var15.animationId == -1 && var15.transforms == null) {
-                     var29 = var15.getModel(0, var5, var22, var24, var23, var25);
+               } else if (var6 == 0) {
+                  if (var38.animationId == -1 && var38.transforms == null) {
+                     var29 = var38.getModel(0, var5, var22, var24, var23, var25);
                   } else {
-                     var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+                     var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
                   }
 
-                  var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_t[var5], 0, var26, var28);
-                  if(var15.interactType != 0) {
-                     var14.__f_283(var2, var3, var6, var5, var15.boolean1);
+                  var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field911[var5], 0, var26, var28);
+                  if (var38.interactType != 0) {
+                     var37.method90(var2, var3, var6, var5, var38.boolean1);
                   }
-               } else if(var6 == 1) {
-                  if(var15.animationId == -1 && var15.transforms == null) {
-                     var29 = var15.getModel(1, var5, var22, var24, var23, var25);
+               } else if (var6 == 1) {
+                  if (var38.animationId == -1 && var38.transforms == null) {
+                     var29 = var38.getModel(1, var5, var22, var24, var23, var25);
                   } else {
-                     var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+                     var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
                   }
 
-                  var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_y[var5], 0, var26, var28);
-                  if(var15.interactType != 0) {
-                     var14.__f_283(var2, var3, var6, var5, var15.boolean1);
+                  var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field912[var5], 0, var26, var28);
+                  if (var38.interactType != 0) {
+                     var37.method90(var2, var3, var6, var5, var38.boolean1);
                   }
                } else {
-                  int var35;
-                  if(var6 == 2) {
-                     var35 = var5 + 1 & 3;
-                     Object var30;
-                     Object var31;
-                     if(var15.animationId == -1 && var15.transforms == null) {
-                        var30 = var15.getModel(2, var5 + 4, var22, var24, var23, var25);
-                        var31 = var15.getModel(2, var35, var22, var24, var23, var25);
-                     } else {
-                        var30 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
-                        var31 = new DynamicObject(var4, 2, var35, var12, var2, var3, var15.animationId, true, (Entity)null);
-                     }
-
-                     var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var30, (Entity)var31, Tiles.__bq_t[var5], Tiles.__bq_t[var35], var26, var28);
-                     if(var15.interactType != 0) {
-                        var14.__f_283(var2, var3, var6, var5, var15.boolean1);
-                     }
-                  } else if(var6 == 3) {
-                     if(var15.animationId == -1 && var15.transforms == null) {
-                        var29 = var15.getModel(3, var5, var22, var24, var23, var25);
-                     } else {
-                        var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
-                     }
-
-                     var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_y[var5], 0, var26, var28);
-                     if(var15.interactType != 0) {
-                        var14.__f_283(var2, var3, var6, var5, var15.boolean1);
-                     }
-                  } else if(var6 == 9) {
-                     if(var15.animationId == -1 && var15.transforms == null) {
-                        var29 = var15.getModel(var6, var5, var22, var24, var23, var25);
-                     } else {
-                        var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
-                     }
-
-                     var42.__d_238(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
-                     if(var15.interactType != 0) {
-                        var14.__q_284(var2, var3, var16, var17, var15.boolean1);
-                     }
-                  } else if(var6 == 4) {
-                     if(var15.animationId == -1 && var15.transforms == null) {
-                        var29 = var15.getModel(4, var5, var22, var24, var23, var25);
-                     } else {
-                        var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
-                     }
-
-                     var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_t[var5], 0, 0, 0, var26, var28);
-                  } else {
+                  int var30;
+                  Object var31;
+                  if (var6 == 2) {
+                     var30 = var5 + 1 & 3;
                      Object var32;
-                     long var36;
-                     if(var6 == 5) {
-                        var35 = 16;
-                        var36 = var42.__ar_244(var0, var2, var3);
-                        if(var36 != 0L) {
-                           var35 = class50.getObjectDefinition(HitSplatDefinition.method4972(var36)).int2;
+                     if (var38.animationId == -1 && var38.transforms == null) {
+                        var31 = var38.getModel(2, var5 + 4, var22, var24, var23, var25);
+                        var32 = var38.getModel(2, var30, var22, var24, var23, var25);
+                     } else {
+                        var31 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
+                        var32 = new DynamicObject(var4, 2, var30, var12, var2, var3, var38.animationId, true, (Entity)null);
+                     }
+
+                     var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var31, (Entity)var32, Tiles.field911[var5], Tiles.field911[var30], var26, var28);
+                     if (var38.interactType != 0) {
+                        var37.method90(var2, var3, var6, var5, var38.boolean1);
+                     }
+                  } else if (var6 == 3) {
+                     if (var38.animationId == -1 && var38.transforms == null) {
+                        var29 = var38.getModel(3, var5, var22, var24, var23, var25);
+                     } else {
+                        var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
+                     }
+
+                     var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field912[var5], 0, var26, var28);
+                     if (var38.interactType != 0) {
+                        var37.method90(var2, var3, var6, var5, var38.boolean1);
+                     }
+                  } else if (var6 == 9) {
+                     if (var38.animationId == -1 && var38.transforms == null) {
+                        var29 = var38.getModel(var6, var5, var22, var24, var23, var25);
+                     } else {
+                        var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
+                     }
+
+                     var36.method284(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
+                     if (var38.interactType != 0) {
+                        var37.method91(var2, var3, var39, var17, var38.boolean1);
+                     }
+                  } else if (var6 == 4) {
+                     if (var38.animationId == -1 && var38.transforms == null) {
+                        var29 = var38.getModel(4, var5, var22, var24, var23, var25);
+                     } else {
+                        var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
+                     }
+
+                     var36.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field911[var5], 0, 0, 0, var26, var28);
+                  } else {
+                     long var40;
+                     if (var6 == 5) {
+                        var30 = 16;
+                        var40 = var36.method290(var0, var2, var3);
+                        if (var40 != 0L) {
+                           var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2;
                         }
 
-                        if(var15.animationId == -1 && var15.transforms == null) {
-                           var32 = var15.getModel(4, var5, var22, var24, var23, var25);
+                        if (var38.animationId == -1 && var38.transforms == null) {
+                           var31 = var38.getModel(4, var5, var22, var24, var23, var25);
                         } else {
-                           var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+                           var31 = new DynamicObject(var4, 4, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
                         }
 
-                        var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, Tiles.__bq_t[var5], 0, var35 * Tiles.__bq_h[var5], var35 * Tiles.__bq_b[var5], var26, var28);
-                     } else if(var6 == 6) {
-                        var35 = 8;
-                        var36 = var42.__ar_244(var0, var2, var3);
-                        if(var36 != 0L) {
-                           var35 = class50.getObjectDefinition(HitSplatDefinition.method4972(var36)).int2 / 2;
+                        var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)null, Tiles.field911[var5], 0, var30 * Tiles.field913[var5], var30 * Tiles.field914[var5], var26, var28);
+                     } else if (var6 == 6) {
+                        var30 = 8;
+                        var40 = var36.method290(var0, var2, var3);
+                        if (var40 != 0L) {
+                           var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2;
                         }
 
-                        if(var15.animationId == -1 && var15.transforms == null) {
-                           var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25);
+                        if (var38.animationId == -1 && var38.transforms == null) {
+                           var31 = var38.getModel(4, var5 + 4, var22, var24, var23, var25);
                         } else {
-                           var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
+                           var31 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
                         }
 
-                        var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, 256, var5, var35 * Tiles.__bq_c[var5], var35 * Tiles.__bq_r[var5], var26, var28);
-                     } else if(var6 == 7) {
-                        int var38 = var5 + 2 & 3;
-                        if(var15.animationId == -1 && var15.transforms == null) {
-                           var29 = var15.getModel(4, var38 + 4, var22, var24, var23, var25);
-                        } else {
-                           var29 = new DynamicObject(var4, 4, var38 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
-                        }
+                        var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)null, 256, var5, var30 * Tiles.field915[var5], var30 * Tiles.field916[var5], var26, var28);
+                     } else {
+                        int var34;
+                        if (var6 == 7) {
+                           var34 = var5 + 2 & 3;
+                           if (var38.animationId == -1 && var38.transforms == null) {
+                              var29 = var38.getModel(4, var34 + 4, var22, var24, var23, var25);
+                           } else {
+                              var29 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
+                           }
 
-                        var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var38, 0, 0, var26, var28);
-                     } else if(var6 == 8) {
-                        var35 = 8;
-                        var36 = var42.__ar_244(var0, var2, var3);
-                        if(var36 != 0L) {
-                           var35 = class50.getObjectDefinition(HitSplatDefinition.method4972(var36)).int2 / 2;
-                        }
+                           var36.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var34, 0, 0, var26, var28);
+                        } else if (var6 == 8) {
+                           var30 = 8;
+                           var40 = var36.method290(var0, var2, var3);
+                           if (var40 != 0L) {
+                              var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2;
+                           }
 
-                        int var34 = var5 + 2 & 3;
-                        Object var33;
-                        if(var15.animationId == -1 && var15.transforms == null) {
-                           var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25);
-                           var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25);
-                        } else {
-                           var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
-                           var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
-                        }
+                           var34 = var5 + 2 & 3;
+                           Object var35;
+                           if (var38.animationId == -1 && var38.transforms == null) {
+                              var31 = var38.getModel(4, var5 + 4, var22, var24, var23, var25);
+                              var35 = var38.getModel(4, var34 + 4, var22, var24, var23, var25);
+                           } else {
+                              var31 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
+                              var35 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
+                           }
 
-                        var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)var33, 256, var5, var35 * Tiles.__bq_c[var5], var35 * Tiles.__bq_r[var5], var26, var28);
+                           var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)var35, 256, var5, var30 * Tiles.field915[var5], var30 * Tiles.field916[var5], var26, var28);
+                        }
                      }
                   }
                }
             } else {
-               if(var15.animationId == -1 && var15.transforms == null) {
-                  var29 = var15.getModel(10, var5, var22, var24, var23, var25);
+               if (var38.animationId == -1 && var38.transforms == null) {
+                  var29 = var38.getModel(10, var5, var22, var24, var23, var25);
                } else {
-                  var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
+                  var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
                }
 
-               if(var29 != null) {
-                  var42.__d_238(var0, var2, var3, var23, var16, var17, (Entity)var29, var6 == 11?256:0, var26, var28);
+               if (var29 != null) {
+                  var36.method284(var0, var2, var3, var23, var39, var17, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28);
                }
 
-               if(var15.interactType != 0) {
-                  var14.__q_284(var2, var3, var16, var17, var15.boolean1);
+               if (var38.interactType != 0) {
+                  var37.method91(var2, var3, var39, var17, var38.boolean1);
                }
             }
          }
       }
 
    }
+
+   static {
+      ParamKeyDefinition_cached = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java
index 296ae184e5..3645cf21ef 100644
--- a/runescape-client/src/main/java/PcmPlayer.java
+++ b/runescape-client/src/main/java/PcmPlayer.java
@@ -23,7 +23,7 @@ public class PcmPlayer {
    @ObfuscatedGetter(
       intValue = 1125788887
    )
-   int __z;
+   int field680;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       longValue = -8124323644430480811L
@@ -46,7 +46,7 @@ public class PcmPlayer {
    @ObfuscatedGetter(
       intValue = 1907203055
    )
-   int __y;
+   int field681;
    @ObfuscatedName("h")
    @ObfuscatedGetter(
       longValue = -200656835998283411L
@@ -57,12 +57,12 @@ public class PcmPlayer {
    @ObfuscatedGetter(
       intValue = 48658021
    )
-   int __b;
+   int field682;
    @ObfuscatedName("c")
    @ObfuscatedGetter(
       intValue = 1624619697
    )
-   int __c;
+   int field683;
    @ObfuscatedName("r")
    @ObfuscatedGetter(
       intValue = -1586398263
@@ -73,37 +73,37 @@ public class PcmPlayer {
    @ObfuscatedGetter(
       longValue = -8188447292076890879L
    )
-   long __p;
+   long field684;
    @ObfuscatedName("v")
-   boolean __v;
+   boolean field685;
    @ObfuscatedName("ac")
    @ObfuscatedGetter(
       intValue = -645495803
    )
-   int __ac;
+   int field686;
    @ObfuscatedName("ay")
    @ObfuscatedSignature(
       signature = "[Ldc;"
    )
-   PcmStream[] __ay;
+   PcmStream[] field687;
    @ObfuscatedName("ah")
    @ObfuscatedSignature(
       signature = "[Ldc;"
    )
-   PcmStream[] __ah;
+   PcmStream[] field688;
 
    protected PcmPlayer() {
-      this.__z = 32;
+      this.field680 = 32;
       this.timeMs = class203.currentTimeMs();
       this.retryTimeMs = 0L;
-      this.__b = 0;
-      this.__c = 0;
+      this.field682 = 0;
+      this.field683 = 0;
       this.nextPosition = 0;
-      this.__p = 0L;
-      this.__v = true;
-      this.__ac = 0;
-      this.__ay = new PcmStream[8];
-      this.__ah = new PcmStream[8];
+      this.field684 = 0L;
+      this.field685 = true;
+      this.field686 = 0;
+      this.field687 = new PcmStream[8];
+      this.field688 = new PcmStream[8];
    }
 
    @ObfuscatedName("m")
@@ -174,90 +174,90 @@ public class PcmPlayer {
    )
    @Export("run")
    public final synchronized void run() {
-      if(this.samples != null) {
+      if (this.samples != null) {
          long var1 = class203.currentTimeMs();
 
          try {
-            if(0L != this.retryTimeMs) {
-               if(var1 < this.retryTimeMs) {
+            if (0L != this.retryTimeMs) {
+               if (var1 < this.retryTimeMs) {
                   return;
                }
 
                this.open(this.capacity);
                this.retryTimeMs = 0L;
-               this.__v = true;
+               this.field685 = true;
             }
 
             int var3 = this.position();
-            if(this.nextPosition - var3 > this.__b) {
-               this.__b = this.nextPosition - var3;
+            if (this.nextPosition - var3 > this.field682) {
+               this.field682 = this.nextPosition - var3;
             }
 
-            int var4 = this.__y + this.frequency;
-            if(var4 + 256 > 16384) {
+            int var4 = this.field681 + this.frequency;
+            if (var4 + 256 > 16384) {
                var4 = 16128;
             }
 
-            if(var4 + 256 > this.capacity) {
+            if (var4 + 256 > this.capacity) {
                this.capacity += 1024;
-               if(this.capacity > 16384) {
+               if (this.capacity > 16384) {
                   this.capacity = 16384;
                }
 
                this.close();
                this.open(this.capacity);
                var3 = 0;
-               this.__v = true;
-               if(var4 + 256 > this.capacity) {
+               this.field685 = true;
+               if (var4 + 256 > this.capacity) {
                   var4 = this.capacity - 256;
-                  this.__y = var4 - this.frequency;
+                  this.field681 = var4 - this.frequency;
                }
             }
 
-            while(var3 < var4) {
+            while (var3 < var4) {
                this.fill(this.samples, 256);
                this.write();
                var3 += 256;
             }
 
-            if(var1 > this.__p) {
-               if(!this.__v) {
-                  if(this.__b == 0 && this.__c == 0) {
+            if (var1 > this.field684) {
+               if (!this.field685) {
+                  if (this.field682 == 0 && this.field683 == 0) {
                      this.close();
                      this.retryTimeMs = 2000L + var1;
                      return;
                   }
 
-                  this.__y = Math.min(this.__c, this.__b);
-                  this.__c = this.__b;
+                  this.field681 = Math.min(this.field683, this.field682);
+                  this.field683 = this.field682;
                } else {
-                  this.__v = false;
+                  this.field685 = false;
                }
 
-               this.__b = 0;
-               this.__p = 2000L + var1;
+               this.field682 = 0;
+               this.field684 = 2000L + var1;
             }
 
             this.nextPosition = var3;
-         } catch (Exception var7) {
+         } catch (Exception var6) {
             this.close();
             this.retryTimeMs = var1 + 2000L;
          }
 
          try {
-            if(var1 > this.timeMs + 500000L) {
+            if (var1 > this.timeMs + 500000L) {
                var1 = this.timeMs;
             }
 
-            while(var1 > 5000L + this.timeMs) {
+            while (var1 > 5000L + this.timeMs) {
                this.skip(256);
                this.timeMs += (long)(256000 / class309.PcmPlayer_sampleRate);
             }
-         } catch (Exception var6) {
+         } catch (Exception var5) {
             this.timeMs = var1;
          }
-
       }
+
    }
 
    @ObfuscatedName("ac")
@@ -265,8 +265,8 @@ public class PcmPlayer {
       signature = "(I)V",
       garbageValue = "-922069005"
    )
-   public final void __ac_176() {
-      this.__v = true;
+   public final void method242() {
+      this.field685 = true;
    }
 
    @ObfuscatedName("ay")
@@ -276,7 +276,7 @@ public class PcmPlayer {
    )
    @Export("tryDiscard")
    public final synchronized void tryDiscard() {
-      this.__v = true;
+      this.field685 = true;
 
       try {
          this.discard();
@@ -294,20 +294,20 @@ public class PcmPlayer {
    )
    @Export("shutdown")
    public final synchronized void shutdown() {
-      if(Messages.soundSystem != null) {
+      if (Messages.soundSystem != null) {
          boolean var1 = true;
 
-         for(int var2 = 0; var2 < 2; ++var2) {
-            if(this == Messages.soundSystem.players[var2]) {
+         for (int var2 = 0; var2 < 2; ++var2) {
+            if (this == Messages.soundSystem.players[var2]) {
                Messages.soundSystem.players[var2] = null;
             }
 
-            if(Messages.soundSystem.players[var2] != null) {
+            if (Messages.soundSystem.players[var2] != null) {
                var1 = false;
             }
          }
 
-         if(var1) {
+         if (var1) {
             Friend.soundSystemExecutor.shutdownNow();
             Friend.soundSystemExecutor = null;
             Messages.soundSystem = null;
@@ -325,13 +325,13 @@ public class PcmPlayer {
    )
    @Export("skip")
    final void skip(int var1) {
-      this.__ac -= var1;
-      if(this.__ac < 0) {
-         this.__ac = 0;
+      this.field686 -= var1;
+      if (this.field686 < 0) {
+         this.field686 = 0;
       }
 
-      if(this.stream0 != null) {
-         this.stream0.__d_173(var1);
+      if (this.stream0 != null) {
+         this.stream0.vmethod264(var1);
       }
 
    }
@@ -340,80 +340,80 @@ public class PcmPlayer {
    @Export("fill")
    final void fill(int[] var1, int var2) {
       int var3 = var2;
-      if(isStereo) {
+      if (isStereo) {
          var3 = var2 << 1;
       }
 
       class212.clearIntArray(var1, 0, var3);
-      this.__ac -= var2;
-      if(this.stream0 != null && this.__ac <= 0) {
-         this.__ac += class309.PcmPlayer_sampleRate >> 4;
+      this.field686 -= var2;
+      if (this.stream0 != null && this.field686 <= 0) {
+         this.field686 += class309.PcmPlayer_sampleRate >> 4;
          MidiPcmStream.PcmStream_disable(this.stream0);
-         this.__ab_177(this.stream0, this.stream0.__az_179());
+         this.method243(this.stream0, this.stream0.vmethod282());
          int var4 = 0;
          int var5 = 255;
 
          int var6;
-         PcmStream var10;
-         label104:
-         for(var6 = 7; var5 != 0; --var6) {
-            int var7;
+         PcmStream var7;
+         label106:
+         for (var6 = 7; var5 != 0; --var6) {
             int var8;
-            if(var6 < 0) {
-               var7 = var6 & 3;
-               var8 = -(var6 >> 2);
+            int var9;
+            if (var6 < 0) {
+               var8 = var6 & 3;
+               var9 = -(var6 >> 2);
             } else {
-               var7 = var6;
-               var8 = 0;
+               var8 = var6;
+               var9 = 0;
             }
 
-            for(int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) {
-               if((var9 & 1) != 0) {
-                  var5 &= ~(1 << var7);
-                  var10 = null;
-                  PcmStream var11 = this.__ay[var7];
+            for (int var10 = var5 >>> var8 & 286331153; var10 != 0; var10 >>>= 4) {
+               if ((var10 & 1) != 0) {
+                  var5 &= ~(1 << var8);
+                  var7 = null;
+                  PcmStream var11 = this.field687[var8];
 
-                  label98:
-                  while(true) {
-                     while(true) {
-                        if(var11 == null) {
-                           break label98;
+                  label100:
+                  while (true) {
+                     while (true) {
+                        if (var11 == null) {
+                           break label100;
                         }
 
                         AbstractSound var12 = var11.sound;
-                        if(var12 != null && var12.position > var8) {
-                           var5 |= 1 << var7;
-                           var10 = var11;
+                        if (var12 != null && var12.position > var9) {
+                           var5 |= 1 << var8;
+                           var7 = var11;
                            var11 = var11.after;
                         } else {
                            var11.active = true;
-                           int var13 = var11.__l_171();
+                           int var13 = var11.vmethod262();
                            var4 += var13;
-                           if(var12 != null) {
+                           if (var12 != null) {
                               var12.position += var13;
                            }
 
-                           if(var4 >= this.__z) {
-                              break label104;
+                           if (var4 >= this.field680) {
+                              break label106;
                            }
 
                            PcmStream var14 = var11.firstSubStream();
-                           if(var14 != null) {
-                              for(int var15 = var11.__s; var14 != null; var14 = var11.nextSubStream()) {
-                                 this.__ab_177(var14, var15 * var14.__az_179() >> 8);
+                           if (var14 != null) {
+                              for (int var15 = var11.field689; var14 != null; var14 = var11.nextSubStream()) {
+                                 this.method243(var14, var15 * var14.vmethod282() >> 8);
                               }
                            }
 
                            PcmStream var18 = var11.after;
                            var11.after = null;
-                           if(var10 == null) {
-                              this.__ay[var7] = var18;
+                           if (var7 == null) {
+                              this.field687[var8] = var18;
                            } else {
-                              var10.after = var18;
+                              var7.after = var18;
                            }
 
-                           if(var18 == null) {
-                              this.__ah[var7] = var10;
+                           if (var18 == null) {
+                              this.field688[var8] = var7;
                            }
 
                            var11 = var18;
@@ -422,29 +422,29 @@ public class PcmPlayer {
                   }
                }
 
-               var7 += 4;
-               ++var8;
+               var8 += 4;
+               ++var9;
             }
          }
 
-         for(var6 = 0; var6 < 8; ++var6) {
-            PcmStream var16 = this.__ay[var6];
-            PcmStream[] var17 = this.__ay;
-            this.__ah[var6] = null;
+         for (var6 = 0; var6 < 8; ++var6) {
+            PcmStream var16 = this.field687[var6];
+            PcmStream[] var17 = this.field687;
+            this.field688[var6] = null;
 
-            for(var17[var6] = null; var16 != null; var16 = var10) {
-               var10 = var16.after;
+            for (var17[var6] = null; var16 != null; var16 = var7) {
+               var7 = var16.after;
                var16.after = null;
             }
          }
       }
 
-      if(this.__ac < 0) {
-         this.__ac = 0;
+      if (this.field686 < 0) {
+         this.field686 = 0;
       }
 
-      if(this.stream0 != null) {
-         this.stream0.__e_172(var1, 0, var2);
+      if (this.stream0 != null) {
+         this.stream0.vmethod263(var1, 0, var2);
       }
 
       this.timeMs = class203.currentTimeMs();
@@ -455,16 +455,16 @@ public class PcmPlayer {
       signature = "(Ldc;II)V",
       garbageValue = "-1884182540"
    )
-   final void __ab_177(PcmStream var1, int var2) {
+   final void method243(PcmStream var1, int var2) {
       int var3 = var2 >> 5;
-      PcmStream var4 = this.__ah[var3];
-      if(var4 == null) {
-         this.__ay[var3] = var1;
+      PcmStream var4 = this.field688[var3];
+      if (var4 == null) {
+         this.field687[var3] = var1;
       } else {
          var4.after = var1;
       }
 
-      this.__ah[var3] = var1;
-      var1.__s = var2;
+      this.field688[var3] = var1;
+      var1.field689 = var2;
    }
 }
diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java
index 0518a56eee..de4c6a3fc7 100644
--- a/runescape-client/src/main/java/PcmStream.java
+++ b/runescape-client/src/main/java/PcmStream.java
@@ -16,7 +16,7 @@ public abstract class PcmStream extends Node {
    @Export("after")
    PcmStream after;
    @ObfuscatedName("s")
-   int __s;
+   int field689;
    @ObfuscatedName("t")
    @ObfuscatedSignature(
       signature = "Ldd;"
@@ -43,26 +43,26 @@ public abstract class PcmStream extends Node {
    protected abstract PcmStream nextSubStream();
 
    @ObfuscatedName("l")
-   protected abstract int __l_171();
+   protected abstract int vmethod262();
 
    @ObfuscatedName("e")
-   protected abstract void __e_172(int[] var1, int var2, int var3);
+   protected abstract void vmethod263(int[] var1, int var2, int var3);
 
    @ObfuscatedName("d")
-   protected abstract void __d_173(int var1);
+   protected abstract void vmethod264(int var1);
 
    @ObfuscatedName("az")
-   int __az_179() {
+   int vmethod282() {
       return 255;
    }
 
    @ObfuscatedName("ef")
    @Export("update")
    final void update(int[] var1, int var2, int var3) {
-      if(this.active) {
-         this.__e_172(var1, var2, var3);
+      if (this.active) {
+         this.vmethod263(var1, var2, var3);
       } else {
-         this.__d_173(var3);
+         this.vmethod264(var3);
       }
 
    }
diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java
index 205d7ca61f..0942f7ecd7 100644
--- a/runescape-client/src/main/java/PcmStreamMixer.java
+++ b/runescape-client/src/main/java/PcmStreamMixer.java
@@ -16,17 +16,17 @@ public class PcmStreamMixer extends PcmStream {
    @ObfuscatedSignature(
       signature = "Lje;"
    )
-   NodeDeque __f;
+   NodeDeque field690;
    @ObfuscatedName("q")
-   int __q;
+   int field691;
    @ObfuscatedName("o")
-   int __o;
+   int field692;
 
    public PcmStreamMixer() {
       this.subStreams = new NodeDeque();
-      this.__f = new NodeDeque();
-      this.__q = 0;
-      this.__o = -1;
+      this.field690 = new NodeDeque();
+      this.field691 = 0;
+      this.field692 = -1;
    }
 
    @ObfuscatedName("m")
@@ -48,14 +48,14 @@ public class PcmStreamMixer extends PcmStream {
    }
 
    @ObfuscatedName("q")
-   void __q_168() {
-      if(this.__q > 0) {
-         for(PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.__f.last(); var1 != null; var1 = (PcmStreamMixerListener)this.__f.previous()) {
-            var1.__m -= this.__q;
+   void method248() {
+      if (this.field691 > 0) {
+         for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field690.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field690.previous()) {
+            var1.field693 -= this.field691;
          }
 
-         this.__o -= this.__q;
-         this.__q = 0;
+         this.field692 -= this.field691;
+         this.field691 = 0;
       }
 
    }
@@ -64,27 +64,27 @@ public class PcmStreamMixer extends PcmStream {
    @ObfuscatedSignature(
       signature = "(Lgw;Ldf;)V"
    )
-   void __w_169(Node var1, PcmStreamMixerListener var2) {
-      while(this.__f.sentinel != var1 && ((PcmStreamMixerListener)var1).__m <= var2.__m) {
+   void method249(Node var1, PcmStreamMixerListener var2) {
+      while (this.field690.sentinel != var1 && ((PcmStreamMixerListener)var1).field693 <= var2.field693) {
          var1 = var1.previous;
       }
 
       NodeDeque.method5270(var2, var1);
-      this.__o = ((PcmStreamMixerListener)this.__f.sentinel.previous).__m;
+      this.field692 = ((PcmStreamMixerListener)this.field690.sentinel.previous).field693;
    }
 
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "(Ldf;)V"
    )
-   void __o_170(PcmStreamMixerListener var1) {
+   void method250(PcmStreamMixerListener var1) {
       var1.remove();
       var1.remove2();
-      Node var2 = this.__f.sentinel.previous;
-      if(var2 == this.__f.sentinel) {
-         this.__o = -1;
+      Node var2 = this.field690.sentinel.previous;
+      if (var2 == this.field690.sentinel) {
+         this.field692 = -1;
       } else {
-         this.__o = ((PcmStreamMixerListener)var2).__m;
+         this.field692 = ((PcmStreamMixerListener)var2).field693;
       }
 
    }
@@ -108,39 +108,39 @@ public class PcmStreamMixer extends PcmStream {
    }
 
    @ObfuscatedName("l")
-   protected int __l_171() {
+   protected int vmethod262() {
       return 0;
    }
 
    @ObfuscatedName("e")
-   public final synchronized void __e_172(int[] var1, int var2, int var3) {
+   public final synchronized void vmethod263(int[] var1, int var2, int var3) {
       do {
-         if(this.__o < 0) {
+         if (this.field692 < 0) {
             this.updateSubStreams(var1, var2, var3);
             return;
          }
 
-         if(var3 + this.__q < this.__o) {
-            this.__q += var3;
+         if (var3 + this.field691 < this.field692) {
+            this.field691 += var3;
             this.updateSubStreams(var1, var2, var3);
             return;
          }
 
-         int var4 = this.__o - this.__q;
+         int var4 = this.field692 - this.field691;
          this.updateSubStreams(var1, var2, var4);
          var2 += var4;
          var3 -= var4;
-         this.__q += var4;
-         this.__q_168();
-         PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.__f.last();
+         this.field691 += var4;
+         this.method248();
+         PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field690.last();
          synchronized(var5) {
             int var7 = var5.update();
-            if(var7 < 0) {
-               var5.__m = 0;
-               this.__o_170(var5);
+            if (var7 < 0) {
+               var5.field693 = 0;
+               this.method250(var5);
             } else {
-               var5.__m = var7;
-               this.__w_169(var5.previous, var5);
+               var5.field693 = var7;
+               this.method249(var5.previous, var5);
             }
          }
       } while(var3 != 0);
@@ -150,40 +150,40 @@ public class PcmStreamMixer extends PcmStream {
    @ObfuscatedName("x")
    @Export("updateSubStreams")
    void updateSubStreams(int[] var1, int var2, int var3) {
-      for(PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) {
+      for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) {
          var4.update(var1, var2, var3);
       }
 
    }
 
    @ObfuscatedName("d")
-   public final synchronized void __d_173(int var1) {
+   public final synchronized void vmethod264(int var1) {
       do {
-         if(this.__o < 0) {
+         if (this.field692 < 0) {
             this.skipSubStreams(var1);
             return;
          }
 
-         if(this.__q + var1 < this.__o) {
-            this.__q += var1;
+         if (this.field691 + var1 < this.field692) {
+            this.field691 += var1;
             this.skipSubStreams(var1);
             return;
          }
 
-         int var2 = this.__o - this.__q;
+         int var2 = this.field692 - this.field691;
          this.skipSubStreams(var2);
          var1 -= var2;
-         this.__q += var2;
-         this.__q_168();
-         PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.__f.last();
+         this.field691 += var2;
+         this.method248();
+         PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field690.last();
          synchronized(var3) {
             int var5 = var3.update();
-            if(var5 < 0) {
-               var3.__m = 0;
-               this.__o_170(var3);
+            if (var5 < 0) {
+               var3.field693 = 0;
+               this.method250(var3);
             } else {
-               var3.__m = var5;
-               this.__w_169(var3.previous, var3);
+               var3.field693 = var5;
+               this.method249(var3.previous, var3);
             }
          }
       } while(var1 != 0);
@@ -193,8 +193,8 @@ public class PcmStreamMixer extends PcmStream {
    @ObfuscatedName("a")
    @Export("skipSubStreams")
    void skipSubStreams(int var1) {
-      for(PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) {
-         var2.__d_173(var1);
+      for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) {
+         var2.vmethod264(var1);
       }
 
    }
diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java
index 4e696ca7c1..a1db067cc7 100644
--- a/runescape-client/src/main/java/PcmStreamMixerListener.java
+++ b/runescape-client/src/main/java/PcmStreamMixerListener.java
@@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("PcmStreamMixerListener")
 public abstract class PcmStreamMixerListener extends Node {
    @ObfuscatedName("m")
-   int __m;
+   int field693;
 
    @ObfuscatedName("m")
    @Export("remove2")
diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java
index 6a8fa2e1dd..674c083ee3 100644
--- a/runescape-client/src/main/java/PlatformInfo.java
+++ b/runescape-client/src/main/java/PlatformInfo.java
@@ -11,125 +11,125 @@ public class PlatformInfo extends Node {
    @ObfuscatedGetter(
       intValue = 1318366785
    )
-   int __ay;
+   int field694;
    @ObfuscatedName("ah")
-   boolean __ah;
+   boolean field695;
    @ObfuscatedName("ak")
    @ObfuscatedGetter(
       intValue = 703904161
    )
-   int __ak;
+   int field696;
    @ObfuscatedName("aw")
    @ObfuscatedGetter(
       intValue = 467004305
    )
-   int __aw;
+   int field697;
    @ObfuscatedName("al")
    @ObfuscatedGetter(
       intValue = 2097018521
    )
-   int __al;
+   int field698;
    @ObfuscatedName("ab")
    @ObfuscatedGetter(
       intValue = -1667177301
    )
-   int __ab;
+   int field699;
    @ObfuscatedName("ae")
    @ObfuscatedGetter(
       intValue = 385109109
    )
-   int __ae;
+   int field700;
    @ObfuscatedName("at")
-   boolean __at;
+   boolean field701;
    @ObfuscatedName("ad")
    @ObfuscatedGetter(
       intValue = -1765017
    )
-   int __ad;
+   int field702;
    @ObfuscatedName("ap")
    @ObfuscatedGetter(
       intValue = -817941105
    )
-   int __ap;
+   int field703;
    @ObfuscatedName("am")
    @ObfuscatedGetter(
       intValue = 30207059
    )
-   int __am;
+   int field704;
    @ObfuscatedName("an")
    @ObfuscatedGetter(
       intValue = 890109053
    )
-   int __an;
+   int field705;
    @ObfuscatedName("az")
-   String __az;
+   String field706;
    @ObfuscatedName("au")
-   String __au;
+   String field707;
    @ObfuscatedName("ao")
-   String __ao;
+   String field708;
    @ObfuscatedName("aa")
-   String __aa;
+   String field709;
    @ObfuscatedName("ax")
    @ObfuscatedGetter(
       intValue = 871094255
    )
-   int __ax;
+   int field710;
    @ObfuscatedName("af")
    @ObfuscatedGetter(
       intValue = 1955966365
    )
-   int __af;
+   int field711;
    @ObfuscatedName("ai")
    @ObfuscatedGetter(
       intValue = 1196598207
    )
-   int __ai;
+   int field712;
    @ObfuscatedName("ba")
    @ObfuscatedGetter(
       intValue = -170839105
    )
-   int __ba;
+   int field713;
    @ObfuscatedName("bb")
-   String __bb;
+   String field714;
    @ObfuscatedName("bs")
-   String __bs;
+   String field715;
    @ObfuscatedName("bq")
-   int[] __bq;
+   int[] field716;
    @ObfuscatedName("bn")
    @ObfuscatedGetter(
       intValue = 1466207635
    )
-   int __bn;
+   int field717;
    @ObfuscatedName("bk")
-   String __bk;
+   String field718;
 
    PlatformInfo(int var1, boolean var2, int var3, int var4, int var5, int var6, int var7, boolean var8, int var9, int var10, int var11, int var12, String var13, String var14, String var15, String var16, int var17, int var18, int var19, int var20, String var21, String var22, int[] var23, int var24, String var25) {
-      this.__bq = new int[3];
-      this.__ay = var1;
-      this.__ah = var2;
-      this.__ak = var3;
-      this.__aw = var4;
-      this.__al = var5;
-      this.__ab = var6;
-      this.__ae = var7;
-      this.__at = var8;
-      this.__ad = var9;
-      this.__ap = var10;
-      this.__am = var11;
-      this.__an = var12;
-      this.__az = var13;
-      this.__au = var14;
-      this.__ao = var15;
-      this.__aa = var16;
-      this.__ax = var17;
-      this.__af = var18;
-      this.__ai = var19;
-      this.__ba = var20;
-      this.__bb = var21;
-      this.__bs = var22;
-      this.__bq = var23;
-      this.__bn = var24;
-      this.__bk = var25;
+      this.field716 = new int[3];
+      this.field694 = var1;
+      this.field695 = var2;
+      this.field696 = var3;
+      this.field697 = var4;
+      this.field698 = var5;
+      this.field699 = var6;
+      this.field700 = var7;
+      this.field701 = var8;
+      this.field702 = var9;
+      this.field703 = var10;
+      this.field704 = var11;
+      this.field705 = var12;
+      this.field706 = var13;
+      this.field707 = var14;
+      this.field708 = var15;
+      this.field709 = var16;
+      this.field710 = var17;
+      this.field711 = var18;
+      this.field712 = var19;
+      this.field713 = var20;
+      this.field714 = var21;
+      this.field715 = var22;
+      this.field716 = var23;
+      this.field717 = var24;
+      this.field718 = var25;
    }
 
    @ObfuscatedName("m")
@@ -140,35 +140,35 @@ public class PlatformInfo extends Node {
    @Export("write")
    public void write(Buffer var1) {
       var1.writeByte(7);
-      var1.writeByte(this.__ay);
-      var1.writeByte(this.__ah?1:0);
-      var1.writeByte(this.__ak);
-      var1.writeByte(this.__aw);
-      var1.writeByte(this.__al);
-      var1.writeByte(this.__ab);
-      var1.writeByte(this.__ae);
-      var1.writeByte(this.__at?1:0);
-      var1.writeShort(this.__ad);
-      var1.writeByte(this.__ap);
-      var1.writeMedium(this.__am);
-      var1.writeShort(this.__an);
-      var1.writeStringCp1252NullCircumfixed(this.__az);
-      var1.writeStringCp1252NullCircumfixed(this.__au);
-      var1.writeStringCp1252NullCircumfixed(this.__ao);
-      var1.writeStringCp1252NullCircumfixed(this.__aa);
-      var1.writeByte(this.__af);
-      var1.writeShort(this.__ax);
-      var1.writeStringCp1252NullCircumfixed(this.__bb);
-      var1.writeStringCp1252NullCircumfixed(this.__bs);
-      var1.writeByte(this.__ai);
-      var1.writeByte(this.__ba);
+      var1.writeByte(this.field694);
+      var1.writeByte(this.field695 ? 1 : 0);
+      var1.writeByte(this.field696);
+      var1.writeByte(this.field697);
+      var1.writeByte(this.field698);
+      var1.writeByte(this.field699);
+      var1.writeByte(this.field700);
+      var1.writeByte(this.field701 ? 1 : 0);
+      var1.writeShort(this.field702);
+      var1.writeByte(this.field703);
+      var1.writeMedium(this.field704);
+      var1.writeShort(this.field705);
+      var1.writeStringCp1252NullCircumfixed(this.field706);
+      var1.writeStringCp1252NullCircumfixed(this.field707);
+      var1.writeStringCp1252NullCircumfixed(this.field708);
+      var1.writeStringCp1252NullCircumfixed(this.field709);
+      var1.writeByte(this.field711);
+      var1.writeShort(this.field710);
+      var1.writeStringCp1252NullCircumfixed(this.field714);
+      var1.writeStringCp1252NullCircumfixed(this.field715);
+      var1.writeByte(this.field712);
+      var1.writeByte(this.field713);
 
-      for(int var2 = 0; var2 < this.__bq.length; ++var2) {
-         var1.writeInt(this.__bq[var2]);
+      for (int var2 = 0; var2 < this.field716.length; ++var2) {
+         var1.writeInt(this.field716[var2]);
       }
 
-      var1.writeInt(this.__bn);
-      var1.writeStringCp1252NullCircumfixed(this.__bk);
+      var1.writeInt(this.field717);
+      var1.writeStringCp1252NullCircumfixed(this.field718);
    }
 
    @ObfuscatedName("f")
@@ -179,13 +179,13 @@ public class PlatformInfo extends Node {
    @Export("size")
    public int size() {
       byte var1 = 38;
-      int var2 = var1 + Client.method1692(this.__az);
-      var2 += Client.method1692(this.__au);
-      var2 += Client.method1692(this.__ao);
-      var2 += Client.method1692(this.__aa);
-      var2 += Client.method1692(this.__bb);
-      var2 += Client.method1692(this.__bs);
-      var2 += Client.method1692(this.__bk);
+      int var2 = var1 + Client.method1692(this.field706);
+      var2 += Client.method1692(this.field707);
+      var2 += Client.method1692(this.field708);
+      var2 += Client.method1692(this.field709);
+      var2 += Client.method1692(this.field714);
+      var2 += Client.method1692(this.field715);
+      var2 += Client.method1692(this.field718);
       return var2;
    }
 }
diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java
index 54cb0e8f4d..4c3021db70 100644
--- a/runescape-client/src/main/java/Player.java
+++ b/runescape-client/src/main/java/Player.java
@@ -74,7 +74,7 @@ public final class Player extends Actor {
    @ObfuscatedGetter(
       intValue = 665272587
    )
-   int __k;
+   int field719;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
       intValue = -1624108131
@@ -85,7 +85,7 @@ public final class Player extends Actor {
    @ObfuscatedGetter(
       intValue = -1771431457
    )
-   int __i;
+   int field720;
    @ObfuscatedName("a")
    @ObfuscatedSignature(
       signature = "Ldu;"
@@ -96,22 +96,22 @@ public final class Player extends Actor {
    @ObfuscatedGetter(
       intValue = 1610462047
    )
-   int __z;
+   int field721;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = 224552403
    )
-   int __j;
+   int field722;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = 305969541
    )
-   int __s;
+   int field723;
    @ObfuscatedName("t")
    @ObfuscatedGetter(
       intValue = 892671055
    )
-   int __t;
+   int field724;
    @ObfuscatedName("y")
    @Export("isUnanimated")
    boolean isUnanimated;
@@ -149,7 +149,7 @@ public final class Player extends Actor {
    @Export("isInClanChat")
    TriBool isInClanChat;
    @ObfuscatedName("ag")
-   boolean __ag;
+   boolean field725;
    @ObfuscatedName("aq")
    @ObfuscatedGetter(
       intValue = -539678769
@@ -168,7 +168,7 @@ public final class Player extends Actor {
       this.headIconPrayer = -1;
       this.actions = new String[3];
 
-      for(int var1 = 0; var1 < 3; ++var1) {
+      for (int var1 = 0; var1 < 3; ++var1) {
          this.actions[var1] = "";
       }
 
@@ -181,7 +181,7 @@ public final class Player extends Actor {
       this.isHidden = false;
       this.isFriendTriBool = TriBool.TriBool_unknown;
       this.isInClanChat = TriBool.TriBool_unknown;
-      this.__ag = false;
+      this.field725 = false;
    }
 
    @ObfuscatedName("m")
@@ -199,23 +199,23 @@ public final class Player extends Actor {
       this.team = 0;
       int[] var4 = new int[12];
 
+      int var5;
       int var6;
-      int var7;
-      for(int var5 = 0; var5 < 12; ++var5) {
-         var6 = var1.readUnsignedByte();
-         if(var6 == 0) {
-            var4[var5] = 0;
+      for (int var7 = 0; var7 < 12; ++var7) {
+         var5 = var1.readUnsignedByte();
+         if (var5 == 0) {
+            var4[var7] = 0;
          } else {
-            var7 = var1.readUnsignedByte();
-            var4[var5] = var7 + (var6 << 8);
-            if(var5 == 0 && var4[0] == 65535) {
-               var3 = var1.__ag_302();
+            var6 = var1.readUnsignedByte();
+            var4[var7] = var6 + (var5 << 8);
+            if (var7 == 0 && var4[0] == 65535) {
+               var3 = var1.method43();
                break;
             }
 
-            if(var4[var5] >= 512) {
-               int var8 = Skills.getItemDefinition(var4[var5] - 512).int1;
-               if(var8 != 0) {
+            if (var4[var7] >= 512) {
+               int var8 = Skills.getItemDefinition(var4[var7] - 512).int1;
+               if (var8 != 0) {
                   this.team = var8;
                }
             }
@@ -224,70 +224,70 @@ public final class Player extends Actor {
 
       int[] var9 = new int[5];
 
-      for(var6 = 0; var6 < 5; ++var6) {
-         var7 = var1.readUnsignedByte();
-         if(var7 < 0 || var7 >= class229.__hz_l[var6].length) {
-            var7 = 0;
+      for (var5 = 0; var5 < 5; ++var5) {
+         var6 = var1.readUnsignedByte();
+         if (var6 < 0 || var6 >= class229.field1137[var5].length) {
+            var6 = 0;
          }
 
-         var9[var6] = var7;
+         var9[var5] = var6;
       }
 
-      super.idleSequence = var1.__ag_302();
-      if(super.idleSequence == 65535) {
+      super.idleSequence = var1.method43();
+      if (super.idleSequence == 65535) {
          super.idleSequence = -1;
       }
 
-      super.turnLeftSequence = var1.__ag_302();
-      if(super.turnLeftSequence == 65535) {
+      super.turnLeftSequence = var1.method43();
+      if (super.turnLeftSequence == 65535) {
          super.turnLeftSequence = -1;
       }
 
       super.turnRightSequence = super.turnLeftSequence;
-      super.walkSequence = var1.__ag_302();
-      if(super.walkSequence == 65535) {
+      super.walkSequence = var1.method43();
+      if (super.walkSequence == 65535) {
          super.walkSequence = -1;
       }
 
-      super.walkTurnSequence = var1.__ag_302();
-      if(super.walkTurnSequence == 65535) {
+      super.walkTurnSequence = var1.method43();
+      if (super.walkTurnSequence == 65535) {
          super.walkTurnSequence = -1;
       }
 
-      super.walkTurnLeftSequence = var1.__ag_302();
-      if(super.walkTurnLeftSequence == 65535) {
+      super.walkTurnLeftSequence = var1.method43();
+      if (super.walkTurnLeftSequence == 65535) {
          super.walkTurnLeftSequence = -1;
       }
 
-      super.walkTurnRightSequence = var1.__ag_302();
-      if(super.walkTurnRightSequence == 65535) {
+      super.walkTurnRightSequence = var1.method43();
+      if (super.walkTurnRightSequence == 65535) {
          super.walkTurnRightSequence = -1;
       }
 
-      super.runSequence = var1.__ag_302();
-      if(super.runSequence == 65535) {
+      super.runSequence = var1.method43();
+      if (super.runSequence == 65535) {
          super.runSequence = -1;
       }
 
       this.username = new Username(var1.readStringCp1252NullTerminated(), KeyHandler.loginType);
       this.clearIsFriend();
       this.clearIsInClanChat();
-      if(this == Canvas.localPlayer) {
+      if (this == Canvas.localPlayer) {
          RunException.localPlayerName = this.username.getName();
       }
 
       this.combatLevel = var1.readUnsignedByte();
-      this.skillLevel = var1.__ag_302();
+      this.skillLevel = var1.method43();
       this.isHidden = var1.readUnsignedByte() == 1;
-      if(Client.gameBuild == 0 && Client.rights >= 2) {
+      if (Client.gameBuild == 0 && Client.rights >= 2) {
          this.isHidden = false;
       }
 
-      if(this.appearance == null) {
+      if (this.appearance == null) {
          this.appearance = new PlayerAppearance();
       }
 
-      this.appearance.__m_385(var4, var9, var2 == 1, var3);
+      this.appearance.method256(var4, var9, var2 == 1, var3);
    }
 
    @ObfuscatedName("f")
@@ -297,7 +297,7 @@ public final class Player extends Actor {
    )
    @Export("isFriend")
    boolean isFriend() {
-      if(this.isFriendTriBool == TriBool.TriBool_unknown) {
+      if (this.isFriendTriBool == TriBool.TriBool_unknown) {
          this.checkIsFriend();
       }
 
@@ -321,7 +321,7 @@ public final class Player extends Actor {
    )
    @Export("checkIsFriend")
    void checkIsFriend() {
-      this.isFriendTriBool = WorldMapArea.friendSystem.isFriendAndHasWorld(this.username)?TriBool.TriBool_true:TriBool.TriBool_false;
+      this.isFriendTriBool = WorldMapArea.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
    }
 
    @ObfuscatedName("o")
@@ -331,7 +331,7 @@ public final class Player extends Actor {
    )
    @Export("isClanMember")
    boolean isClanMember() {
-      if(this.isInClanChat == TriBool.TriBool_unknown) {
+      if (this.isInClanChat == TriBool.TriBool_unknown) {
          this.updateIsInClanChat();
       }
 
@@ -355,7 +355,7 @@ public final class Player extends Actor {
    )
    @Export("updateIsInClanChat")
    void updateIsInClanChat() {
-      this.isInClanChat = PacketWriter.clanChat != null && PacketWriter.clanChat.contains(this.username)?TriBool.TriBool_true:TriBool.TriBool_false;
+      this.isInClanChat = PacketWriter.clanChat != null && PacketWriter.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
    }
 
    @ObfuscatedName("l")
@@ -365,7 +365,7 @@ public final class Player extends Actor {
    )
    @Export("transformedSize")
    int transformedSize() {
-      return this.appearance != null && this.appearance.npcTransformId != -1?ObjectDefinition.getNpcDefinition(this.appearance.npcTransformId).size:1;
+      return this.appearance != null && this.appearance.npcTransformId != -1 ? ObjectDefinition.getNpcDefinition(this.appearance.npcTransformId).size : 1;
    }
 
    @ObfuscatedName("e")
@@ -375,61 +375,61 @@ public final class Player extends Actor {
    )
    @Export("getModel")
    protected final Model getModel() {
-      if(this.appearance == null) {
+      if (this.appearance == null) {
          return null;
       } else {
-         SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0?WorldMapAreaData.getSequenceDefinition(super.sequence):null;
-         SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null?null:WorldMapAreaData.getSequenceDefinition(super.movementSequence);
+         SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapAreaData.getSequenceDefinition(super.sequence) : null;
+         SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.idleSequence != super.movementSequence || var1 == null) ? WorldMapAreaData.getSequenceDefinition(super.movementSequence) : null;
          Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
-         if(var3 == null) {
+         if (var3 == null) {
             return null;
          } else {
             var3.calculateBoundsCylinder();
             super.defaultHeight = var3.height;
             Model var4;
             Model[] var5;
-            if(!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
+            if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
                var4 = class50.getSpotAnimationDefinition(super.spotAnimation).getModel(super.spotAnimationFrame);
-               if(var4 != null) {
+               if (var4 != null) {
                   var4.offsetBy(0, -super.heightOffset, 0);
                   var5 = new Model[]{var3, var4};
                   var3 = new Model(var5, 2);
                }
             }
 
-            if(!this.isUnanimated && this.model0 != null) {
-               if(Client.cycle >= this.animationCycleEnd) {
+            if (!this.isUnanimated && this.model0 != null) {
+               if (Client.cycle >= this.animationCycleEnd) {
                   this.model0 = null;
                }
 
-               if(Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) {
+               if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) {
                   var4 = this.model0;
-                  var4.offsetBy(this.__k - super.x, this.tileHeight2 - this.tileHeight, this.__i - super.y);
-                  if(super.orientation == 512) {
+                  var4.offsetBy(this.field719 - super.x, this.tileHeight2 - this.tileHeight, this.field720 - super.y);
+                  if (super.orientation == 512) {
                      var4.rotateY90Ccw();
                      var4.rotateY90Ccw();
                      var4.rotateY90Ccw();
-                  } else if(super.orientation == 1024) {
+                  } else if (super.orientation == 1024) {
                      var4.rotateY90Ccw();
                      var4.rotateY90Ccw();
-                  } else if(super.orientation == 1536) {
+                  } else if (super.orientation == 1536) {
                      var4.rotateY90Ccw();
                   }
 
                   var5 = new Model[]{var3, var4};
                   var3 = new Model(var5, 2);
-                  if(super.orientation == 512) {
+                  if (super.orientation == 512) {
                      var4.rotateY90Ccw();
-                  } else if(super.orientation == 1024) {
+                  } else if (super.orientation == 1024) {
                      var4.rotateY90Ccw();
                      var4.rotateY90Ccw();
-                  } else if(super.orientation == 1536) {
+                  } else if (super.orientation == 1536) {
                      var4.rotateY90Ccw();
                      var4.rotateY90Ccw();
                      var4.rotateY90Ccw();
                   }
 
-                  var4.offsetBy(super.x - this.__k, this.tileHeight - this.tileHeight2, super.y - this.__i);
+                  var4.offsetBy(super.x - this.field719, this.tileHeight - this.tileHeight2, super.y - this.field720);
                }
             }
 
@@ -444,19 +444,19 @@ public final class Player extends Actor {
       signature = "(IIBI)V",
       garbageValue = "-2066158770"
    )
-   final void __x_130(int var1, int var2, byte var3) {
-      if(super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).__s == 1) {
+   final void method254(int var1, int var2, byte var3) {
+      if (super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).field782 == 1) {
          super.sequence = -1;
       }
 
-      super.__bc = -1;
-      if(var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) {
-         if(super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) {
-            if(var3 == 2) {
+      super.field12 = -1;
+      if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) {
+         if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) {
+            if (var3 == 2) {
                WorldMapIcon2.method316(this, var1, var2, (byte)2);
             }
 
-            this.__a_131(var1, var2, var3);
+            this.method255(var1, var2, var3);
          } else {
             this.resetPath(var1, var2);
          }
@@ -474,8 +474,8 @@ public final class Player extends Actor {
    @Export("resetPath")
    void resetPath(int var1, int var2) {
       super.pathLength = 0;
-      super.__ch = 0;
-      super.__cq = 0;
+      super.field25 = 0;
+      super.field24 = 0;
       super.pathX[0] = var1;
       super.pathY[0] = var2;
       int var3 = this.transformedSize();
@@ -488,12 +488,12 @@ public final class Player extends Actor {
       signature = "(IIBI)V",
       garbageValue = "-1280043751"
    )
-   final void __a_131(int var1, int var2, byte var3) {
-      if(super.pathLength < 9) {
+   final void method255(int var1, int var2, byte var3) {
+      if (super.pathLength < 9) {
          ++super.pathLength;
       }
 
-      for(int var4 = super.pathLength; var4 > 0; --var4) {
+      for (int var4 = super.pathLength; var4 > 0; --var4) {
          super.pathX[var4] = super.pathX[var4 - 1];
          super.pathY[var4] = super.pathY[var4 - 1];
          super.pathTraversed[var4] = super.pathTraversed[var4 - 1];
@@ -520,9 +520,9 @@ public final class Player extends Actor {
       garbageValue = "13"
    )
    static void method1281() {
-      if(Client.isSpellSelected) {
-         Widget var0 = class204.getWidgetChild(ServerBuild.__iy_lo, Client.__client_lc);
-         if(var0 != null && var0.onTargetLeave != null) {
+      if (Client.isSpellSelected) {
+         Widget var0 = class204.getWidgetChild(ServerBuild.field788, Client.field220);
+         if (var0 != null && var0.onTargetLeave != null) {
             ScriptEvent var1 = new ScriptEvent();
             var1.widget = var0;
             var1.args0 = var0.onTargetLeave;
@@ -532,5 +532,6 @@ public final class Player extends Actor {
          Client.isSpellSelected = false;
          class22.method295(var0);
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java
index 4a360ac4ce..bc18190bc9 100644
--- a/runescape-client/src/main/java/PlayerAppearance.java
+++ b/runescape-client/src/main/java/PlayerAppearance.java
@@ -8,9 +8,9 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("PlayerAppearance")
 public class PlayerAppearance {
    @ObfuscatedName("g")
-   public static short[] __hi_g;
+   public static short[] field726;
    @ObfuscatedName("d")
-   static final int[] __hi_d;
+   static final int[] field727;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -36,32 +36,27 @@ public class PlayerAppearance {
    @ObfuscatedGetter(
       longValue = -3506189412688081513L
    )
-   long __o;
+   long field728;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       longValue = 8217880921734028425L
    )
-   long __u;
-
-   static {
-      __hi_d = new int[]{8, 11, 4, 6, 9, 7, 10};
-      PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260);
-   }
+   long field729;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "([I[IZII)V",
       garbageValue = "727056871"
    )
-   public void __m_385(int[] var1, int[] var2, boolean var3, int var4) {
-      if(var1 == null) {
+   public void method256(int[] var1, int[] var2, boolean var3, int var4) {
+      if (var1 == null) {
          var1 = new int[12];
 
-         for(int var5 = 0; var5 < 7; ++var5) {
-            for(int var6 = 0; var6 < KitDefinition.__im_q; ++var6) {
+         for (int var5 = 0; var5 < 7; ++var5) {
+            for (int var6 = 0; var6 < KitDefinition.field457; ++var6) {
                KitDefinition var7 = WorldMapSection1.getKitDefinition(var6);
-               if(var7 != null && !var7.__k && var5 + (var3?7:0) == var7.__o) {
-                  var1[__hi_d[var5]] = var6 + 256;
+               if (var7 != null && !var7.field460 && var5 + (var3 ? 7 : 0) == var7.field458) {
+                  var1[field727[var5]] = var6 + 256;
                   break;
                }
             }
@@ -80,33 +75,38 @@ public class PlayerAppearance {
       signature = "(IZI)V",
       garbageValue = "-581016899"
    )
-   public void __f_386(int var1, boolean var2) {
-      if(var1 != 1 || !this.isFemale) {
-         int var3 = this.equipment[__hi_d[var1]];
-         if(var3 != 0) {
+   public void method257(int var1, boolean var2) {
+      if (var1 != 1 || !this.isFemale) {
+         int var3 = this.equipment[field727[var1]];
+         if (var3 != 0) {
             var3 -= 256;
 
             KitDefinition var4;
             do {
-               if(!var2) {
-                  --var3;
-                  if(var3 < 0) {
-                     var3 = KitDefinition.__im_q - 1;
-                  }
-               } else {
-                  ++var3;
-                  if(var3 >= KitDefinition.__im_q) {
-                     var3 = 0;
-                  }
-               }
+               do {
+                  do {
+                     if (!var2) {
+                        --var3;
+                        if (var3 < 0) {
+                           var3 = KitDefinition.field457 - 1;
+                        }
+                     } else {
+                        ++var3;
+                        if (var3 >= KitDefinition.field457) {
+                           var3 = 0;
+                        }
+                     }
 
-               var4 = WorldMapSection1.getKitDefinition(var3);
-            } while(var4 == null || var4.__k || var1 + (this.isFemale?7:0) != var4.__o);
+                     var4 = WorldMapSection1.getKitDefinition(var3);
+                  } while(var4 == null);
+               } while(var4.field460);
+            } while(var1 + (this.isFemale ? 7 : 0) != var4.field458);
 
-            this.equipment[__hi_d[var1]] = var3 + 256;
+            this.equipment[field727[var1]] = var3 + 256;
             this.setHash();
          }
       }
+
    }
 
    @ObfuscatedName("q")
@@ -114,19 +114,19 @@ public class PlayerAppearance {
       signature = "(IZI)V",
       garbageValue = "1416503110"
    )
-   public void __q_387(int var1, boolean var2) {
+   public void method258(int var1, boolean var2) {
       int var3 = this.bodyColors[var1];
-      if(!var2) {
+      if (!var2) {
          do {
             --var3;
-            if(var3 < 0) {
-               var3 = class229.__hz_l[var1].length - 1;
+            if (var3 < 0) {
+               var3 = class229.field1137[var1].length - 1;
             }
          } while(!PacketBuffer.method4062(var1, var3));
       } else {
          do {
             ++var3;
-            if(var3 >= class229.__hz_l[var1].length) {
+            if (var3 >= class229.field1137[var1].length) {
                var3 = 0;
             }
          } while(!PacketBuffer.method4062(var1, var3));
@@ -141,10 +141,11 @@ public class PlayerAppearance {
       signature = "(ZB)V",
       garbageValue = "-90"
    )
-   public void __w_388(boolean var1) {
-      if(this.isFemale != var1) {
-         this.__m_385((int[])null, this.bodyColors, var1, -1);
+   public void method259(boolean var1) {
+      if (this.isFemale != var1) {
+         this.method256((int[])null, this.bodyColors, var1, -1);
       }
+
    }
 
    @ObfuscatedName("o")
@@ -152,20 +153,20 @@ public class PlayerAppearance {
       signature = "(Lgr;I)V",
       garbageValue = "779254645"
    )
-   public void __o_389(Buffer var1) {
-      var1.writeByte(this.isFemale?1:0);
+   public void method260(Buffer var1) {
+      var1.writeByte(this.isFemale ? 1 : 0);
 
       int var2;
-      for(var2 = 0; var2 < 7; ++var2) {
-         int var3 = this.equipment[__hi_d[var2]];
-         if(var3 == 0) {
+      for (var2 = 0; var2 < 7; ++var2) {
+         int var3 = this.equipment[field727[var2]];
+         if (var3 == 0) {
             var1.writeByte(-1);
          } else {
             var1.writeByte(var3 - 256);
          }
       }
 
-      for(var2 = 0; var2 < 5; ++var2) {
+      for (var2 = 0; var2 < 5; ++var2) {
          var1.writeByte(this.bodyColors[var2]);
       }
 
@@ -178,39 +179,39 @@ public class PlayerAppearance {
    )
    @Export("setHash")
    void setHash() {
-      long var1 = this.__o;
+      long var1 = this.field728;
       int var3 = this.equipment[5];
       int var4 = this.equipment[9];
       this.equipment[5] = var4;
       this.equipment[9] = var3;
-      this.__o = 0L;
+      this.field728 = 0L;
 
       int var5;
-      for(var5 = 0; var5 < 12; ++var5) {
-         this.__o <<= 4;
-         if(this.equipment[var5] >= 256) {
-            this.__o += (long)(this.equipment[var5] - 256);
+      for (var5 = 0; var5 < 12; ++var5) {
+         this.field728 <<= 4;
+         if (this.equipment[var5] >= 256) {
+            this.field728 += (long)(this.equipment[var5] - 256);
          }
       }
 
-      if(this.equipment[0] >= 256) {
-         this.__o += (long)(this.equipment[0] - 256 >> 4);
+      if (this.equipment[0] >= 256) {
+         this.field728 += (long)(this.equipment[0] - 256 >> 4);
       }
 
-      if(this.equipment[1] >= 256) {
-         this.__o += (long)(this.equipment[1] - 256 >> 8);
+      if (this.equipment[1] >= 256) {
+         this.field728 += (long)(this.equipment[1] - 256 >> 8);
       }
 
-      for(var5 = 0; var5 < 5; ++var5) {
-         this.__o <<= 3;
-         this.__o += (long)this.bodyColors[var5];
+      for (var5 = 0; var5 < 5; ++var5) {
+         this.field728 <<= 3;
+         this.field728 += (long)this.bodyColors[var5];
       }
 
-      this.__o <<= 1;
-      this.__o += (long)(this.isFemale?1:0);
+      this.field728 <<= 1;
+      this.field728 += (long)(this.isFemale ? 1 : 0);
       this.equipment[5] = var3;
       this.equipment[9] = var4;
-      if(var1 != 0L && this.__o != var1) {
+      if (var1 != 0L && this.field728 != var1) {
          PlayerAppearance_cachedModels.remove(var1);
       }
 
@@ -223,109 +224,109 @@ public class PlayerAppearance {
    )
    @Export("getModel")
    public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
-      if(this.npcTransformId != -1) {
+      if (this.npcTransformId != -1) {
          return ObjectDefinition.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4);
       } else {
-         long var5 = this.__o;
+         long var5 = this.field728;
          int[] var7 = this.equipment;
-         if(var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) {
+         if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) {
             var7 = new int[12];
 
-            for(int var15 = 0; var15 < 12; ++var15) {
-               var7[var15] = this.equipment[var15];
+            for (int var8 = 0; var8 < 12; ++var8) {
+               var7[var8] = this.equipment[var8];
             }
 
-            if(var1.shield >= 0) {
+            if (var1.shield >= 0) {
                var5 += (long)(var1.shield - this.equipment[5] << 40);
                var7[5] = var1.shield;
             }
 
-            if(var1.weapon >= 0) {
+            if (var1.weapon >= 0) {
                var5 += (long)(var1.weapon - this.equipment[3] << 48);
                var7[3] = var1.weapon;
             }
          }
 
-         Model var8 = (Model)PlayerAppearance_cachedModels.get(var5);
-         if(var8 == null) {
+         Model var15 = (Model)PlayerAppearance_cachedModels.get(var5);
+         if (var15 == null) {
             boolean var9 = false;
 
-            int var11;
-            for(int var10 = 0; var10 < 12; ++var10) {
-               var11 = var7[var10];
-               if(var11 >= 256 && var11 < 512 && !WorldMapSection1.getKitDefinition(var11 - 256).__w_413()) {
+            int var10;
+            for (int var11 = 0; var11 < 12; ++var11) {
+               var10 = var7[var11];
+               if (var10 >= 256 && var10 < 512 && !WorldMapSection1.getKitDefinition(var10 - 256).method159()) {
                   var9 = true;
                }
 
-               if(var11 >= 512 && !Skills.getItemDefinition(var11 - 512).__z_431(this.isFemale)) {
+               if (var10 >= 512 && !Skills.getItemDefinition(var10 - 512).method145(this.isFemale)) {
                   var9 = true;
                }
             }
 
-            if(var9) {
-               if(this.__u != -1L) {
-                  var8 = (Model)PlayerAppearance_cachedModels.get(this.__u);
+            if (var9) {
+               if (this.field729 != -1L) {
+                  var15 = (Model)PlayerAppearance_cachedModels.get(this.field729);
                }
 
-               if(var8 == null) {
+               if (var15 == null) {
                   return null;
                }
             }
 
-            if(var8 == null) {
-               ModelData[] var16 = new ModelData[12];
-               var11 = 0;
+            if (var15 == null) {
+               ModelData[] var17 = new ModelData[12];
+               var10 = 0;
 
-               int var13;
-               for(int var12 = 0; var12 < 12; ++var12) {
-                  var13 = var7[var12];
+               int var12;
+               for (int var13 = 0; var13 < 12; ++var13) {
+                  var12 = var7[var13];
                   ModelData var14;
-                  if(var13 >= 256 && var13 < 512) {
-                     var14 = WorldMapSection1.getKitDefinition(var13 - 256).__o_414();
-                     if(var14 != null) {
-                        var16[var11++] = var14;
+                  if (var12 >= 256 && var12 < 512) {
+                     var14 = WorldMapSection1.getKitDefinition(var12 - 256).method160();
+                     if (var14 != null) {
+                        var17[var10++] = var14;
                      }
                   }
 
-                  if(var13 >= 512) {
-                     var14 = Skills.getItemDefinition(var13 - 512).__j_432(this.isFemale);
-                     if(var14 != null) {
-                        var16[var11++] = var14;
+                  if (var12 >= 512) {
+                     var14 = Skills.getItemDefinition(var12 - 512).method146(this.isFemale);
+                     if (var14 != null) {
+                        var17[var10++] = var14;
                      }
                   }
                }
 
-               ModelData var18 = new ModelData(var16, var11);
+               ModelData var18 = new ModelData(var17, var10);
 
-               for(var13 = 0; var13 < 5; ++var13) {
-                  if(this.bodyColors[var13] < class229.__hz_l[var13].length) {
-                     var18.recolor(__hi_g[var13], class229.__hz_l[var13][this.bodyColors[var13]]);
+               for (var12 = 0; var12 < 5; ++var12) {
+                  if (this.bodyColors[var12] < class229.field1137[var12].length) {
+                     var18.recolor(field726[var12], class229.field1137[var12][this.bodyColors[var12]]);
                   }
 
-                  if(this.bodyColors[var13] < IndexCacheLoader.__bd_x[var13].length) {
-                     var18.recolor(class227.__hj_e[var13], IndexCacheLoader.__bd_x[var13][this.bodyColors[var13]]);
+                  if (this.bodyColors[var12] < IndexCacheLoader.field406[var12].length) {
+                     var18.recolor(class227.field1136[var12], IndexCacheLoader.field406[var12][this.bodyColors[var12]]);
                   }
                }
 
-               var8 = var18.toModel(64, 850, -30, -50, -30);
-               PlayerAppearance_cachedModels.put(var8, var5);
-               this.__u = var5;
+               var15 = var18.toModel(64, 850, -30, -50, -30);
+               PlayerAppearance_cachedModels.put(var15, var5);
+               this.field729 = var5;
             }
          }
 
-         if(var1 == null && var3 == null) {
-            return var8;
+         if (var1 == null && var3 == null) {
+            return var15;
          } else {
-            Model var17;
-            if(var1 != null && var3 != null) {
-               var17 = var1.animateSequence2(var8, var2, var3, var4);
-            } else if(var1 != null) {
-               var17 = var1.animateSequence(var8, var2);
+            Model var16;
+            if (var1 != null && var3 != null) {
+               var16 = var1.animateSequence2(var15, var2, var3, var4);
+            } else if (var1 != null) {
+               var16 = var1.animateSequence(var15, var2);
             } else {
-               var17 = var3.animateSequence(var8, var4);
+               var16 = var3.animateSequence(var15, var4);
             }
 
-            return var17;
+            return var16;
          }
       }
    }
@@ -337,57 +338,57 @@ public class PlayerAppearance {
    )
    @Export("getModelData")
    ModelData getModelData() {
-      if(this.npcTransformId != -1) {
+      if (this.npcTransformId != -1) {
          return ObjectDefinition.getNpcDefinition(this.npcTransformId).getModelData();
       } else {
          boolean var1 = false;
 
-         int var3;
-         for(int var2 = 0; var2 < 12; ++var2) {
-            var3 = this.equipment[var2];
-            if(var3 >= 256 && var3 < 512 && !WorldMapSection1.getKitDefinition(var3 - 256).__u_415()) {
+         int var2;
+         for (int var3 = 0; var3 < 12; ++var3) {
+            var2 = this.equipment[var3];
+            if (var2 >= 256 && var2 < 512 && !WorldMapSection1.getKitDefinition(var2 - 256).method161()) {
                var1 = true;
             }
 
-            if(var3 >= 512 && !Skills.getItemDefinition(var3 - 512).__s_433(this.isFemale)) {
+            if (var2 >= 512 && !Skills.getItemDefinition(var2 - 512).method147(this.isFemale)) {
                var1 = true;
             }
          }
 
-         if(var1) {
+         if (var1) {
             return null;
          } else {
             ModelData[] var7 = new ModelData[12];
-            var3 = 0;
+            var2 = 0;
 
-            int var5;
-            for(int var4 = 0; var4 < 12; ++var4) {
-               var5 = this.equipment[var4];
+            int var4;
+            for (int var5 = 0; var5 < 12; ++var5) {
+               var4 = this.equipment[var5];
                ModelData var6;
-               if(var5 >= 256 && var5 < 512) {
-                  var6 = WorldMapSection1.getKitDefinition(var5 - 256).__g_416();
-                  if(var6 != null) {
-                     var7[var3++] = var6;
+               if (var4 >= 256 && var4 < 512) {
+                  var6 = WorldMapSection1.getKitDefinition(var4 - 256).method162();
+                  if (var6 != null) {
+                     var7[var2++] = var6;
                   }
                }
 
-               if(var5 >= 512) {
-                  var6 = Skills.getItemDefinition(var5 - 512).__t_434(this.isFemale);
-                  if(var6 != null) {
-                     var7[var3++] = var6;
+               if (var4 >= 512) {
+                  var6 = Skills.getItemDefinition(var4 - 512).method148(this.isFemale);
+                  if (var6 != null) {
+                     var7[var2++] = var6;
                   }
                }
             }
 
-            ModelData var8 = new ModelData(var7, var3);
+            ModelData var8 = new ModelData(var7, var2);
 
-            for(var5 = 0; var5 < 5; ++var5) {
-               if(this.bodyColors[var5] < class229.__hz_l[var5].length) {
-                  var8.recolor(__hi_g[var5], class229.__hz_l[var5][this.bodyColors[var5]]);
+            for (var4 = 0; var4 < 5; ++var4) {
+               if (this.bodyColors[var4] < class229.field1137[var4].length) {
+                  var8.recolor(field726[var4], class229.field1137[var4][this.bodyColors[var4]]);
                }
 
-               if(this.bodyColors[var5] < IndexCacheLoader.__bd_x[var5].length) {
-                  var8.recolor(class227.__hj_e[var5], IndexCacheLoader.__bd_x[var5][this.bodyColors[var5]]);
+               if (this.bodyColors[var4] < IndexCacheLoader.field406[var4].length) {
+                  var8.recolor(class227.field1136[var4], IndexCacheLoader.field406[var4][this.bodyColors[var4]]);
                }
             }
 
@@ -403,6 +404,11 @@ public class PlayerAppearance {
    )
    @Export("getChatHeadId")
    public int getChatHeadId() {
-      return this.npcTransformId == -1?(this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20):305419896 + ObjectDefinition.getNpcDefinition(this.npcTransformId).id;
+      return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + ObjectDefinition.getNpcDefinition(this.npcTransformId).id;
+   }
+
+   static {
+      field727 = new int[]{8, 11, 4, 6, 9, 7, 10};
+      PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260);
    }
 }
diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java
index 8d3c185b3e..e42ad431ce 100644
--- a/runescape-client/src/main/java/PlayerType.java
+++ b/runescape-client/src/main/java/PlayerType.java
@@ -44,8 +44,9 @@ public enum PlayerType implements Enumerated {
    )
    @Export("PlayerType_hardcoreIronman")
    PlayerType_hardcoreIronman(5, 10, false, false, true);
+
    @ObfuscatedName("ak")
-   static Image __ij_ak;
+   static Image field730;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = 1999564657
@@ -65,7 +66,7 @@ public enum PlayerType implements Enumerated {
    @Export("isUser")
    public final boolean isUser;
 
-   PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) {
+   private PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) {
       this.id = var3;
       this.modIcon = var4;
       this.isPrivileged = var6;
@@ -90,12 +91,12 @@ public enum PlayerType implements Enumerated {
    @Export("clearItemContainer")
    static void clearItemContainer(int var0) {
       ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-      if(var1 != null) {
-         for(int var2 = 0; var2 < var1.ids.length; ++var2) {
+      if (var1 != null) {
+         for (int var2 = 0; var2 < var1.ids.length; ++var2) {
             var1.ids[var2] = -1;
             var1.quantities[var2] = 0;
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java
index 5a6fc3c3c4..8ce53385e0 100644
--- a/runescape-client/src/main/java/Players.java
+++ b/runescape-client/src/main/java/Players.java
@@ -10,14 +10,14 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Players")
 public class Players {
    @ObfuscatedName("q")
-   static byte[] __cq_q;
+   static byte[] field731;
    @ObfuscatedName("w")
-   static byte[] __cq_w;
+   static byte[] field732;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "[Lgr;"
    )
-   static Buffer[] __cq_o;
+   static Buffer[] field733;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = -766468303
@@ -31,9 +31,9 @@ public class Players {
    @ObfuscatedGetter(
       intValue = 945250525
    )
-   static int __cq_l;
+   static int field734;
    @ObfuscatedName("e")
-   static int[] __cq_e;
+   static int[] field735;
    @ObfuscatedName("x")
    @Export("Players_regions")
    static int[] Players_regions;
@@ -47,14 +47,14 @@ public class Players {
    @ObfuscatedGetter(
       intValue = -22568397
    )
-   static int __cq_n;
+   static int field736;
    @ObfuscatedName("i")
-   static int[] __cq_i;
+   static int[] field737;
    @ObfuscatedName("a")
    @ObfuscatedSignature(
       signature = "Lgr;"
    )
-   static Buffer __cq_a;
+   static Buffer field738;
    @ObfuscatedName("y")
    @ObfuscatedSignature(
       signature = "Lgr;"
@@ -62,29 +62,13 @@ public class Players {
    @Export("NetCache_reference")
    public static Buffer NetCache_reference;
 
-   static {
-      __cq_q = new byte[2048];
-      __cq_w = new byte[2048];
-      __cq_o = new Buffer[2048];
-      Players_count = 0;
-      Players_indices = new int[2048];
-      __cq_l = 0;
-      __cq_e = new int[2048];
-      Players_regions = new int[2048];
-      Players_orientations = new int[2048];
-      Players_targetIndices = new int[2048];
-      __cq_n = 0;
-      __cq_i = new int[2048];
-      __cq_a = new Buffer(new byte[5000]);
-   }
-
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lfx;"
    )
    public static RunException method2120(Throwable var0, String var1) {
       RunException var2;
-      if(var0 instanceof RunException) {
+      if (var0 instanceof RunException) {
          var2 = (RunException)var0;
          var2.string = var2.string + ' ' + var1;
       } else {
@@ -101,30 +85,30 @@ public class Players {
    )
    @Export("newPcmPlayer")
    public static final PcmPlayer newPcmPlayer(TaskHandler var0, int var1, int var2) {
-      if(var1 >= 0 && var1 < 2) {
-         if(var2 < 256) {
+      if (var1 >= 0 && var1 < 2) {
+         if (var2 < 256) {
             var2 = 256;
          }
 
          try {
             PcmPlayer var3 = class65.pcmPlayerProvider.player();
-            var3.samples = new int[(PcmPlayer.isStereo?2:1) * 256];
+            var3.samples = new int[(PcmPlayer.isStereo ? 2 : 1) * 256];
             var3.frequency = var2;
             var3.init();
             var3.capacity = (var2 & -1024) + 1024;
-            if(var3.capacity > 16384) {
+            if (var3.capacity > 16384) {
                var3.capacity = 16384;
             }
 
             var3.open(var3.capacity);
-            if(Login.pcmPlayerCount > 0 && Messages.soundSystem == null) {
+            if (Login.pcmPlayerCount > 0 && Messages.soundSystem == null) {
                Messages.soundSystem = new SoundSystem();
                Friend.soundSystemExecutor = Executors.newScheduledThreadPool(1);
                Friend.soundSystemExecutor.scheduleAtFixedRate(Messages.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS);
             }
 
-            if(Messages.soundSystem != null) {
-               if(Messages.soundSystem.players[var1] != null) {
+            if (Messages.soundSystem != null) {
+               if (Messages.soundSystem.players[var1] != null) {
                   throw new IllegalArgumentException();
                }
 
@@ -146,9 +130,9 @@ public class Players {
       garbageValue = "46802049"
    )
    static final void method2112(int var0, int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < Client.rootWidgetCount; ++var4) {
-         if(Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) {
-            Client.__client_od[var4] = true;
+      for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) {
+         if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) {
+            Client.field100[var4] = true;
          }
       }
 
@@ -161,25 +145,39 @@ public class Players {
    )
    @Export("clickWidget")
    static final void clickWidget(Widget var0, int var1, int var2) {
-      if(Client.clickedWidget == null && !Client.isMenuOpen) {
-         if(var0 != null && class48.method869(var0) != null) {
-            Client.clickedWidget = var0;
-            Client.clickedWidgetParent = class48.method869(var0);
-            Client.widgetClickX = var1;
-            Client.widgetClickY = var2;
-            MouseRecorder.widgetDragDuration = 0;
-            Client.isDraggingWidget = false;
-            int var3 = Client.menuOptionsCount - 1;
-            if(var3 != -1) {
-               UnitPriceComparator.tempMenuAction = new MenuAction();
-               UnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3];
-               UnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3];
-               UnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3];
-               UnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3];
-               UnitPriceComparator.tempMenuAction.action = Client.menuActions[var3];
-            }
-
+      if (Client.clickedWidget == null && !Client.isMenuOpen && var0 != null && class48.method869(var0) != null) {
+         Client.clickedWidget = var0;
+         Client.clickedWidgetParent = class48.method869(var0);
+         Client.widgetClickX = var1;
+         Client.widgetClickY = var2;
+         MouseRecorder.widgetDragDuration = 0;
+         Client.isDraggingWidget = false;
+         int var3 = Client.menuOptionsCount - 1;
+         if (var3 != -1) {
+            UnitPriceComparator.tempMenuAction = new MenuAction();
+            UnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3];
+            UnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3];
+            UnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3];
+            UnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3];
+            UnitPriceComparator.tempMenuAction.action = Client.menuActions[var3];
          }
       }
+
+   }
+
+   static {
+      field731 = new byte[2048];
+      field732 = new byte[2048];
+      field733 = new Buffer[2048];
+      Players_count = 0;
+      Players_indices = new int[2048];
+      field734 = 0;
+      field735 = new int[2048];
+      Players_regions = new int[2048];
+      Players_orientations = new int[2048];
+      Players_targetIndices = new int[2048];
+      field736 = 0;
+      field737 = new int[2048];
+      field738 = new Buffer(new byte[5000]);
    }
 }
diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java
index e3e2945ea1..75b778240c 100644
--- a/runescape-client/src/main/java/Projectile.java
+++ b/runescape-client/src/main/java/Projectile.java
@@ -154,7 +154,7 @@ public final class Projectile extends Entity {
       this.endHeight = var11;
       this.isMoving = false;
       int var12 = class50.getSpotAnimationDefinition(this.id).sequence;
-      if(var12 != -1) {
+      if (var12 != -1) {
          this.sequenceDefinition = WorldMapAreaData.getSequenceDefinition(var12);
       } else {
          this.sequenceDefinition = null;
@@ -170,7 +170,7 @@ public final class Projectile extends Entity {
    @Export("setDestination")
    final void setDestination(int var1, int var2, int var3, int var4) {
       double var5;
-      if(!this.isMoving) {
+      if (!this.isMoving) {
          var5 = (double)(var1 - this.sourceX);
          double var7 = (double)(var2 - this.sourceY);
          double var9 = Math.sqrt(var5 * var5 + var7 * var7);
@@ -183,7 +183,7 @@ public final class Projectile extends Entity {
       this.speedX = ((double)var1 - this.x) / var5;
       this.speedY = ((double)var2 - this.y) / var5;
       this.speed = Math.sqrt(this.speedY * this.speedY + this.speedX * this.speedX);
-      if(!this.isMoving) {
+      if (!this.isMoving) {
          this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope);
       }
 
@@ -204,13 +204,13 @@ public final class Projectile extends Entity {
       this.speedZ += this.accelerationZ * (double)var1;
       this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047;
       this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047;
-      if(this.sequenceDefinition != null) {
+      if (this.sequenceDefinition != null) {
          this.frameCycle += var1;
 
-         while(true) {
+         while (true) {
             do {
                do {
-                  if(this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) {
+                  if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) {
                      return;
                   }
 
@@ -235,7 +235,7 @@ public final class Projectile extends Entity {
    protected final Model getModel() {
       SpotAnimationDefinition var1 = class50.getSpotAnimationDefinition(this.id);
       Model var2 = var1.getModel(this.frame);
-      if(var2 == null) {
+      if (var2 == null) {
          return null;
       } else {
          var2.rotateZ(this.pitch);
@@ -250,10 +250,10 @@ public final class Projectile extends Entity {
    )
    @Export("byteArrayToObject")
    public static Object byteArrayToObject(byte[] var0, boolean var1) {
-      if(var0 == null) {
+      if (var0 == null) {
          return null;
       } else {
-         if(var0.length > 136 && !AbstractByteArrayCopier.directBufferUnavailable) {
+         if (var0.length > 136 && !AbstractByteArrayCopier.directBufferUnavailable) {
             try {
                DirectByteArrayCopier var2 = new DirectByteArrayCopier();
                var2.set(var0);
diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java
index 477a8d02cc..fa866cd41a 100644
--- a/runescape-client/src/main/java/Rasterizer2D.java
+++ b/runescape-client/src/main/java/Rasterizer2D.java
@@ -28,13 +28,6 @@ public class Rasterizer2D extends DualNode {
    @Export("Rasterizer2D_xClipEnd")
    public static int Rasterizer2D_xClipEnd;
 
-   static {
-      Rasterizer2D_yClipStart = 0;
-      Rasterizer2D_yClipEnd = 0;
-      Rasterizer2D_xClipStart = 0;
-      Rasterizer2D_xClipEnd = 0;
-   }
-
    @ObfuscatedName("dp")
    @Export("Rasterizer2D_replace")
    public static void Rasterizer2D_replace(int[] var0, int var1, int var2) {
@@ -56,19 +49,19 @@ public class Rasterizer2D extends DualNode {
    @ObfuscatedName("di")
    @Export("Rasterizer2D_setClip")
    public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) {
-      if(var0 < 0) {
+      if (var0 < 0) {
          var0 = 0;
       }
 
-      if(var1 < 0) {
+      if (var1 < 0) {
          var1 = 0;
       }
 
-      if(var2 > Rasterizer2D_width) {
+      if (var2 > Rasterizer2D_width) {
          var2 = Rasterizer2D_width;
       }
 
-      if(var3 > Rasterizer2D_height) {
+      if (var3 > Rasterizer2D_height) {
          var3 = Rasterizer2D_height;
       }
 
@@ -81,19 +74,19 @@ public class Rasterizer2D extends DualNode {
    @ObfuscatedName("dc")
    @Export("Rasterizer2D_expandClip")
    public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) {
-      if(Rasterizer2D_xClipStart < var0) {
+      if (Rasterizer2D_xClipStart < var0) {
          Rasterizer2D_xClipStart = var0;
       }
 
-      if(Rasterizer2D_yClipStart < var1) {
+      if (Rasterizer2D_yClipStart < var1) {
          Rasterizer2D_yClipStart = var1;
       }
 
-      if(Rasterizer2D_xClipEnd > var2) {
+      if (Rasterizer2D_xClipEnd > var2) {
          Rasterizer2D_xClipEnd = var2;
       }
 
-      if(Rasterizer2D_yClipEnd > var3) {
+      if (Rasterizer2D_yClipEnd > var3) {
          Rasterizer2D_yClipEnd = var3;
       }
 
@@ -123,7 +116,7 @@ public class Rasterizer2D extends DualNode {
       int var0 = 0;
 
       int var1;
-      for(var1 = Rasterizer2D_width * Rasterizer2D_height - 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) {
+      for (var1 = Rasterizer2D_width * Rasterizer2D_height - 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) {
          Rasterizer2D_pixels[var0++] = 0;
          Rasterizer2D_pixels[var0++] = 0;
          Rasterizer2D_pixels[var0++] = 0;
@@ -133,8 +126,7 @@ public class Rasterizer2D extends DualNode {
          Rasterizer2D_pixels[var0++] = 0;
       }
 
-      for(var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) {
-         ;
+      for (var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) {
       }
 
    }
@@ -142,20 +134,20 @@ public class Rasterizer2D extends DualNode {
    @Export("drawCircle")
    @ObfuscatedName("dy")
    static void drawCircle(int var0, int var1, int var2, int var3) {
-      if(var2 == 0) {
+      if (var2 == 0) {
          Rasterizer2D_setPixel(var0, var1, var3);
       } else {
-         if(var2 < 0) {
+         if (var2 < 0) {
             var2 = -var2;
          }
 
          int var4 = var1 - var2;
-         if(var4 < Rasterizer2D_yClipStart) {
+         if (var4 < Rasterizer2D_yClipStart) {
             var4 = Rasterizer2D_yClipStart;
          }
 
          int var5 = var2 + var1 + 1;
-         if(var5 > Rasterizer2D_yClipEnd) {
+         if (var5 > Rasterizer2D_yClipEnd) {
             var5 = Rasterizer2D_yClipEnd;
          }
 
@@ -165,7 +157,7 @@ public class Rasterizer2D extends DualNode {
          int var9 = var1 - var4;
          int var10 = var9 * var9;
          int var11 = var10 - var9;
-         if(var1 > var5) {
+         if (var1 > var5) {
             var1 = var5;
          }
 
@@ -173,25 +165,25 @@ public class Rasterizer2D extends DualNode {
          int var13;
          int var14;
          int var15;
-         while(var6 < var1) {
-            while(var11 <= var7 || var10 <= var7) {
+         while (var6 < var1) {
+            while (var11 <= var7 || var10 <= var7) {
                var10 = var10 + var8 + var8;
                var11 += var8++ + var8;
             }
 
             var12 = var0 - var8 + 1;
-            if(var12 < Rasterizer2D_xClipStart) {
+            if (var12 < Rasterizer2D_xClipStart) {
                var12 = Rasterizer2D_xClipStart;
             }
 
             var13 = var0 + var8;
-            if(var13 > Rasterizer2D_xClipEnd) {
+            if (var13 > Rasterizer2D_xClipEnd) {
                var13 = Rasterizer2D_xClipEnd;
             }
 
             var14 = var12 + var6 * Rasterizer2D_width;
 
-            for(var15 = var12; var15 < var13; ++var15) {
+            for (var15 = var12; var15 < var13; ++var15) {
                Rasterizer2D_pixels[var14++] = var3;
             }
 
@@ -205,43 +197,43 @@ public class Rasterizer2D extends DualNode {
          var11 = var7 + var9 * var9;
          var10 = var11 - var2;
 
-         for(var11 -= var9; var6 < var5; var10 += var9++ + var9) {
-            while(var11 > var7 && var10 > var7) {
+         for (var11 -= var9; var6 < var5; var10 += var9++ + var9) {
+            while (var11 > var7 && var10 > var7) {
                var11 -= var8-- + var8;
                var10 -= var8 + var8;
             }
 
             var12 = var0 - var8;
-            if(var12 < Rasterizer2D_xClipStart) {
+            if (var12 < Rasterizer2D_xClipStart) {
                var12 = Rasterizer2D_xClipStart;
             }
 
             var13 = var0 + var8;
-            if(var13 > Rasterizer2D_xClipEnd - 1) {
+            if (var13 > Rasterizer2D_xClipEnd - 1) {
                var13 = Rasterizer2D_xClipEnd - 1;
             }
 
             var14 = var12 + var6 * Rasterizer2D_width;
 
-            for(var15 = var12; var15 <= var13; ++var15) {
+            for (var15 = var12; var15 <= var13; ++var15) {
                Rasterizer2D_pixels[var14++] = var3;
             }
 
             ++var6;
             var11 = var11 + var9 + var9;
          }
-
       }
+
    }
 
    @ObfuscatedName("dk")
    @Export("Rasterizer2D_drawCircleAlpha")
    public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) {
-      if(var4 != 0) {
-         if(var4 == 256) {
+      if (var4 != 0) {
+         if (var4 == 256) {
             drawCircle(var0, var1, var2, var3);
          } else {
-            if(var2 < 0) {
+            if (var2 < 0) {
                var2 = -var2;
             }
 
@@ -249,122 +241,122 @@ public class Rasterizer2D extends DualNode {
             int var6 = (var3 >> 16 & 255) * var4;
             int var7 = (var3 >> 8 & 255) * var4;
             int var8 = var4 * (var3 & 255);
-            int var12 = var1 - var2;
-            if(var12 < Rasterizer2D_yClipStart) {
-               var12 = Rasterizer2D_yClipStart;
+            int var9 = var1 - var2;
+            if (var9 < Rasterizer2D_yClipStart) {
+               var9 = Rasterizer2D_yClipStart;
             }
 
-            int var13 = var2 + var1 + 1;
-            if(var13 > Rasterizer2D_yClipEnd) {
-               var13 = Rasterizer2D_yClipEnd;
+            int var10 = var2 + var1 + 1;
+            if (var10 > Rasterizer2D_yClipEnd) {
+               var10 = Rasterizer2D_yClipEnd;
             }
 
-            int var14 = var12;
-            int var15 = var2 * var2;
-            int var16 = 0;
-            int var17 = var1 - var12;
-            int var18 = var17 * var17;
-            int var19 = var18 - var17;
-            if(var1 > var13) {
-               var1 = var13;
+            int var11 = var9;
+            int var12 = var2 * var2;
+            int var13 = 0;
+            int var14 = var1 - var9;
+            int var15 = var14 * var14;
+            int var16 = var15 - var14;
+            if (var1 > var10) {
+               var1 = var10;
             }
 
-            int var9;
-            int var10;
-            int var11;
+            int var17;
+            int var18;
+            int var19;
             int var20;
             int var21;
             int var22;
             int var23;
             int var24;
-            while(var14 < var1) {
-               while(var19 <= var15 || var18 <= var15) {
-                  var18 = var18 + var16 + var16;
-                  var19 += var16++ + var16;
+            while (var11 < var1) {
+               while (var16 <= var12 || var15 <= var12) {
+                  var15 = var15 + var13 + var13;
+                  var16 += var13++ + var13;
                }
 
-               var20 = var0 - var16 + 1;
-               if(var20 < Rasterizer2D_xClipStart) {
+               var20 = var0 - var13 + 1;
+               if (var20 < Rasterizer2D_xClipStart) {
                   var20 = Rasterizer2D_xClipStart;
                }
 
-               var21 = var0 + var16;
-               if(var21 > Rasterizer2D_xClipEnd) {
+               var21 = var0 + var13;
+               if (var21 > Rasterizer2D_xClipEnd) {
                   var21 = Rasterizer2D_xClipEnd;
                }
 
-               var22 = var20 + var14 * Rasterizer2D_width;
+               var22 = var20 + var11 * Rasterizer2D_width;
 
-               for(var23 = var20; var23 < var21; ++var23) {
-                  var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255);
-                  var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5;
-                  var11 = var5 * (Rasterizer2D_pixels[var22] & 255);
-                  var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8);
+               for (var23 = var20; var23 < var21; ++var23) {
+                  var17 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255);
+                  var18 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5;
+                  var19 = var5 * (Rasterizer2D_pixels[var22] & 255);
+                  var24 = (var8 + var19 >> 8) + (var6 + var17 >> 8 << 16) + (var7 + var18 >> 8 << 8);
                   Rasterizer2D_pixels[var22++] = var24;
                }
 
-               ++var14;
-               var18 -= var17-- + var17;
-               var19 -= var17 + var17;
+               ++var11;
+               var15 -= var14-- + var14;
+               var16 -= var14 + var14;
             }
 
-            var16 = var2;
-            var17 = -var17;
-            var19 = var15 + var17 * var17;
-            var18 = var19 - var2;
+            var13 = var2;
+            var14 = -var14;
+            var16 = var12 + var14 * var14;
+            var15 = var16 - var2;
 
-            for(var19 -= var17; var14 < var13; var18 += var17++ + var17) {
-               while(var19 > var15 && var18 > var15) {
-                  var19 -= var16-- + var16;
-                  var18 -= var16 + var16;
+            for (var16 -= var14; var11 < var10; var15 += var14++ + var14) {
+               while (var16 > var12 && var15 > var12) {
+                  var16 -= var13-- + var13;
+                  var15 -= var13 + var13;
                }
 
-               var20 = var0 - var16;
-               if(var20 < Rasterizer2D_xClipStart) {
+               var20 = var0 - var13;
+               if (var20 < Rasterizer2D_xClipStart) {
                   var20 = Rasterizer2D_xClipStart;
                }
 
-               var21 = var0 + var16;
-               if(var21 > Rasterizer2D_xClipEnd - 1) {
+               var21 = var0 + var13;
+               if (var21 > Rasterizer2D_xClipEnd - 1) {
                   var21 = Rasterizer2D_xClipEnd - 1;
                }
 
-               var22 = var20 + var14 * Rasterizer2D_width;
+               var22 = var20 + var11 * Rasterizer2D_width;
 
-               for(var23 = var20; var23 <= var21; ++var23) {
-                  var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255);
-                  var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5;
-                  var11 = var5 * (Rasterizer2D_pixels[var22] & 255);
-                  var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8);
+               for (var23 = var20; var23 <= var21; ++var23) {
+                  var17 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255);
+                  var18 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5;
+                  var19 = var5 * (Rasterizer2D_pixels[var22] & 255);
+                  var24 = (var8 + var19 >> 8) + (var6 + var17 >> 8 << 16) + (var7 + var18 >> 8 << 8);
                   Rasterizer2D_pixels[var22++] = var24;
                }
 
-               ++var14;
-               var19 = var19 + var17 + var17;
+               ++var11;
+               var16 = var16 + var14 + var14;
             }
-
          }
       }
+
    }
 
    @ObfuscatedName("dl")
    @Export("Rasterizer2D_fillRectangleAlpha")
    public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) {
-      if(var0 < Rasterizer2D_xClipStart) {
+      if (var0 < Rasterizer2D_xClipStart) {
          var2 -= Rasterizer2D_xClipStart - var0;
          var0 = Rasterizer2D_xClipStart;
       }
 
-      if(var1 < Rasterizer2D_yClipStart) {
+      if (var1 < Rasterizer2D_yClipStart) {
          var3 -= Rasterizer2D_yClipStart - var1;
          var1 = Rasterizer2D_yClipStart;
       }
 
-      if(var0 + var2 > Rasterizer2D_xClipEnd) {
+      if (var0 + var2 > Rasterizer2D_xClipEnd) {
          var2 = Rasterizer2D_xClipEnd - var0;
       }
 
-      if(var3 + var1 > Rasterizer2D_yClipEnd) {
+      if (var3 + var1 > Rasterizer2D_yClipEnd) {
          var3 = Rasterizer2D_yClipEnd - var1;
       }
 
@@ -373,8 +365,8 @@ public class Rasterizer2D extends DualNode {
       int var7 = Rasterizer2D_width - var2;
       int var8 = var0 + Rasterizer2D_width * var1;
 
-      for(int var9 = 0; var9 < var3; ++var9) {
-         for(int var10 = -var2; var10 < 0; ++var10) {
+      for (int var9 = 0; var9 < var3; ++var9) {
+         for (int var10 = -var2; var10 < 0; ++var10) {
             int var11 = Rasterizer2D_pixels[var8];
             var11 = ((var11 & 16711935) * var6 >> 8 & 16711935) + (var6 * (var11 & 65280) >> 8 & 65280);
             Rasterizer2D_pixels[var8++] = var11 + var4;
@@ -388,29 +380,29 @@ public class Rasterizer2D extends DualNode {
    @ObfuscatedName("dr")
    @Export("Rasterizer2D_fillRectangle")
    public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) {
-      if(var0 < Rasterizer2D_xClipStart) {
+      if (var0 < Rasterizer2D_xClipStart) {
          var2 -= Rasterizer2D_xClipStart - var0;
          var0 = Rasterizer2D_xClipStart;
       }
 
-      if(var1 < Rasterizer2D_yClipStart) {
+      if (var1 < Rasterizer2D_yClipStart) {
          var3 -= Rasterizer2D_yClipStart - var1;
          var1 = Rasterizer2D_yClipStart;
       }
 
-      if(var0 + var2 > Rasterizer2D_xClipEnd) {
+      if (var0 + var2 > Rasterizer2D_xClipEnd) {
          var2 = Rasterizer2D_xClipEnd - var0;
       }
 
-      if(var3 + var1 > Rasterizer2D_yClipEnd) {
+      if (var3 + var1 > Rasterizer2D_yClipEnd) {
          var3 = Rasterizer2D_yClipEnd - var1;
       }
 
       int var5 = Rasterizer2D_width - var2;
       int var6 = var0 + Rasterizer2D_width * var1;
 
-      for(int var7 = -var3; var7 < 0; ++var7) {
-         for(int var8 = -var2; var8 < 0; ++var8) {
+      for (int var7 = -var3; var7 < 0; ++var7) {
+         for (int var8 = -var2; var8 < 0; ++var8) {
             Rasterizer2D_pixels[var6++] = var4;
          }
 
@@ -422,80 +414,80 @@ public class Rasterizer2D extends DualNode {
    @Export("drawGradient")
    @ObfuscatedName("dw")
    public static void drawGradient(int var0, int var1, int var2, int var3, int var4, int var5) {
-      if(var2 > 0 && var3 > 0) {
+      if (var2 > 0 && var3 > 0) {
          int var6 = 0;
          int var7 = 65536 / var3;
-         if(var0 < Rasterizer2D_xClipStart) {
+         if (var0 < Rasterizer2D_xClipStart) {
             var2 -= Rasterizer2D_xClipStart - var0;
             var0 = Rasterizer2D_xClipStart;
          }
 
-         if(var1 < Rasterizer2D_yClipStart) {
+         if (var1 < Rasterizer2D_yClipStart) {
             var6 += (Rasterizer2D_yClipStart - var1) * var7;
             var3 -= Rasterizer2D_yClipStart - var1;
             var1 = Rasterizer2D_yClipStart;
          }
 
-         if(var0 + var2 > Rasterizer2D_xClipEnd) {
+         if (var0 + var2 > Rasterizer2D_xClipEnd) {
             var2 = Rasterizer2D_xClipEnd - var0;
          }
 
-         if(var3 + var1 > Rasterizer2D_yClipEnd) {
+         if (var3 + var1 > Rasterizer2D_yClipEnd) {
             var3 = Rasterizer2D_yClipEnd - var1;
          }
 
          int var8 = Rasterizer2D_width - var2;
          int var9 = var0 + Rasterizer2D_width * var1;
 
-         for(int var10 = -var3; var10 < 0; ++var10) {
+         for (int var10 = -var3; var10 < 0; ++var10) {
             int var11 = 65536 - var6 >> 8;
             int var12 = var6 >> 8;
             int var13 = (var12 * (var5 & 16711935) + var11 * (var4 & 16711935) & -16711936) + (var12 * (var5 & 65280) + var11 * (var4 & 65280) & 16711680) >>> 8;
 
-            for(int var14 = -var2; var14 < 0; ++var14) {
+            for (int var14 = -var2; var14 < 0; ++var14) {
                Rasterizer2D_pixels[var9++] = var13;
             }
 
             var9 += var8;
             var6 += var7;
          }
-
       }
+
    }
 
    @ObfuscatedName("dv")
    @Export("drawGradientAlpha")
    public static void drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-      if(var2 > 0 && var3 > 0) {
+      if (var2 > 0 && var3 > 0) {
          int var8 = 0;
          int var9 = 65536 / var3;
-         if(var0 < Rasterizer2D_xClipStart) {
+         if (var0 < Rasterizer2D_xClipStart) {
             var2 -= Rasterizer2D_xClipStart - var0;
             var0 = Rasterizer2D_xClipStart;
          }
 
-         if(var1 < Rasterizer2D_yClipStart) {
+         if (var1 < Rasterizer2D_yClipStart) {
             var8 += (Rasterizer2D_yClipStart - var1) * var9;
             var3 -= Rasterizer2D_yClipStart - var1;
             var1 = Rasterizer2D_yClipStart;
          }
 
-         if(var0 + var2 > Rasterizer2D_xClipEnd) {
+         if (var0 + var2 > Rasterizer2D_xClipEnd) {
             var2 = Rasterizer2D_xClipEnd - var0;
          }
 
-         if(var3 + var1 > Rasterizer2D_yClipEnd) {
+         if (var3 + var1 > Rasterizer2D_yClipEnd) {
             var3 = Rasterizer2D_yClipEnd - var1;
          }
 
          int var10 = Rasterizer2D_width - var2;
          int var11 = var0 + Rasterizer2D_width * var1;
 
-         for(int var12 = -var3; var12 < 0; ++var12) {
+         for (int var12 = -var3; var12 < 0; ++var12) {
             int var13 = 65536 - var8 >> 8;
             int var14 = var8 >> 8;
             int var15 = (var13 * var6 + var14 * var7 & 65280) >>> 8;
-            if(var15 == 0) {
+            if (var15 == 0) {
                var11 += Rasterizer2D_width;
                var8 += var9;
             } else {
@@ -503,9 +495,9 @@ public class Rasterizer2D extends DualNode {
                int var17 = 255 - var15;
                int var18 = ((var16 & 16711935) * var15 >> 8 & 16711935) + (var15 * (var16 & 65280) >> 8 & 65280);
 
-               for(int var19 = -var2; var19 < 0; ++var19) {
+               for (int var19 = -var2; var19 < 0; ++var19) {
                   int var20 = Rasterizer2D_pixels[var11];
-                  if(var20 == 0) {
+                  if (var20 == 0) {
                      Rasterizer2D_pixels[var11++] = var18;
                   } else {
                      var20 = ((var20 & 16711935) * var17 >> 8 & 16711935) + (var17 * (var20 & 65280) >> 8 & 65280);
@@ -517,8 +509,8 @@ public class Rasterizer2D extends DualNode {
                var8 += var9;
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("do")
@@ -528,78 +520,76 @@ public class Rasterizer2D extends DualNode {
    )
    @Export("raster2d7")
    public static void raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) {
-      if(var0 + var2 >= 0 && var3 + var1 >= 0) {
-         if(var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) {
-            int var8 = 0;
-            int var9 = 0;
-            if(var0 < 0) {
-               var8 -= var0;
-               var2 += var0;
+      if (var0 + var2 >= 0 && var3 + var1 >= 0 && var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) {
+         int var8 = 0;
+         int var9 = 0;
+         if (var0 < 0) {
+            var8 -= var0;
+            var2 += var0;
+         }
+
+         if (var1 < 0) {
+            var9 -= var1;
+            var3 += var1;
+         }
+
+         if (var0 + var2 > Rasterizer2D_width) {
+            var2 = Rasterizer2D_width - var0;
+         }
+
+         if (var3 + var1 > Rasterizer2D_height) {
+            var3 = Rasterizer2D_height - var1;
+         }
+
+         int var10 = var6.length / var7;
+         int var11 = Rasterizer2D_width - var2;
+         int var12 = var4 >>> 24;
+         int var13 = var5 >>> 24;
+         int var14;
+         int var15;
+         int var16;
+         int var17;
+         int var18;
+         if (var12 == 255 && var13 == 255) {
+            var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width;
+
+            for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) {
+               for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) {
+                  var17 = (var15 - var1) % var10;
+                  var18 = (var16 - var0) % var7;
+                  if (var6[var18 + var17 * var7] != 0) {
+                     Rasterizer2D_pixels[var14++] = var5;
+                  } else {
+                     Rasterizer2D_pixels[var14++] = var4;
+                  }
+               }
+
+               var14 += var11;
             }
+         } else {
+            var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width;
 
-            if(var1 < 0) {
-               var9 -= var1;
-               var3 += var1;
-            }
-
-            if(var0 + var2 > Rasterizer2D_width) {
-               var2 = Rasterizer2D_width - var0;
-            }
-
-            if(var3 + var1 > Rasterizer2D_height) {
-               var3 = Rasterizer2D_height - var1;
-            }
-
-            int var10 = var6.length / var7;
-            int var11 = Rasterizer2D_width - var2;
-            int var12 = var4 >>> 24;
-            int var13 = var5 >>> 24;
-            int var14;
-            int var15;
-            int var16;
-            int var17;
-            int var18;
-            if(var12 == 255 && var13 == 255) {
-               var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width;
-
-               for(var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) {
-                  for(var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) {
-                     var17 = (var15 - var1) % var10;
-                     var18 = (var16 - var0) % var7;
-                     if(var6[var18 + var17 * var7] != 0) {
-                        Rasterizer2D_pixels[var14++] = var5;
-                     } else {
-                        Rasterizer2D_pixels[var14++] = var4;
-                     }
+            for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) {
+               for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) {
+                  var17 = (var15 - var1) % var10;
+                  var18 = (var16 - var0) % var7;
+                  int var19 = var4;
+                  if (var6[var18 + var17 * var7] != 0) {
+                     var19 = var5;
                   }
 
-                  var14 += var11;
+                  int var20 = var19 >>> 24;
+                  int var21 = 255 - var20;
+                  int var22 = Rasterizer2D_pixels[var14];
+                  int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8;
+                  Rasterizer2D_pixels[var14++] = var23;
                }
-            } else {
-               var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width;
 
-               for(var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) {
-                  for(var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) {
-                     var17 = (var15 - var1) % var10;
-                     var18 = (var16 - var0) % var7;
-                     int var19 = var4;
-                     if(var6[var18 + var17 * var7] != 0) {
-                        var19 = var5;
-                     }
-
-                     int var20 = var19 >>> 24;
-                     int var21 = 255 - var20;
-                     int var22 = Rasterizer2D_pixels[var14];
-                     int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8;
-                     Rasterizer2D_pixels[var14++] = var23;
-                  }
-
-                  var14 += var11;
-               }
+               var14 += var11;
             }
-
          }
       }
+
    }
 
    @ObfuscatedName("dh")
@@ -616,7 +606,7 @@ public class Rasterizer2D extends DualNode {
    public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) {
       Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5);
       Rasterizer2D_drawHorizontalLineAlpha(var0, var3 + var1 - 1, var2, var4, var5);
-      if(var3 >= 3) {
+      if (var3 >= 3) {
          Rasterizer2D_drawVerticalLineAlpha(var0, var1 + 1, var3 - 2, var4, var5);
          Rasterizer2D_drawVerticalLineAlpha(var0 + var2 - 1, var1 + 1, var3 - 2, var4, var5);
       }
@@ -626,35 +616,35 @@ public class Rasterizer2D extends DualNode {
    @ObfuscatedName("dj")
    @Export("Rasterizer2D_drawHorizontalLine")
    public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) {
-      if(var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) {
-         if(var0 < Rasterizer2D_xClipStart) {
+      if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) {
+         if (var0 < Rasterizer2D_xClipStart) {
             var2 -= Rasterizer2D_xClipStart - var0;
             var0 = Rasterizer2D_xClipStart;
          }
 
-         if(var0 + var2 > Rasterizer2D_xClipEnd) {
+         if (var0 + var2 > Rasterizer2D_xClipEnd) {
             var2 = Rasterizer2D_xClipEnd - var0;
          }
 
          int var4 = var0 + Rasterizer2D_width * var1;
 
-         for(int var5 = 0; var5 < var2; ++var5) {
-            Rasterizer2D_pixels[var4 + var5] = var3; // XXX
+         for (int var5 = 0; var5 < var2; ++var5) {
+            Rasterizer2D_pixels[var4 + var5] = var3;
          }
-
       }
+
    }
 
    @ObfuscatedName("du")
    @Export("Rasterizer2D_drawHorizontalLineAlpha")
    static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) {
-      if(var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) {
-         if(var0 < Rasterizer2D_xClipStart) {
+      if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) {
+         if (var0 < Rasterizer2D_xClipStart) {
             var2 -= Rasterizer2D_xClipStart - var0;
             var0 = Rasterizer2D_xClipStart;
          }
 
-         if(var0 + var2 > Rasterizer2D_xClipEnd) {
+         if (var0 + var2 > Rasterizer2D_xClipEnd) {
             var2 = Rasterizer2D_xClipEnd - var0;
          }
 
@@ -662,51 +652,51 @@ public class Rasterizer2D extends DualNode {
          int var6 = (var3 >> 16 & 255) * var4;
          int var7 = (var3 >> 8 & 255) * var4;
          int var8 = var4 * (var3 & 255);
-         int var12 = var0 + Rasterizer2D_width * var1;
+         int var9 = var0 + Rasterizer2D_width * var1;
 
-         for(int var13 = 0; var13 < var2; ++var13) {
-            int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255);
-            int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5;
-            int var11 = var5 * (Rasterizer2D_pixels[var12] & 255);
-            int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8);
-            Rasterizer2D_pixels[var12++] = var14;
+         for (int var10 = 0; var10 < var2; ++var10) {
+            int var11 = var5 * (Rasterizer2D_pixels[var9] >> 16 & 255);
+            int var12 = (Rasterizer2D_pixels[var9] >> 8 & 255) * var5;
+            int var13 = var5 * (Rasterizer2D_pixels[var9] & 255);
+            int var14 = (var8 + var13 >> 8) + (var6 + var11 >> 8 << 16) + (var7 + var12 >> 8 << 8);
+            Rasterizer2D_pixels[var9++] = var14;
          }
-
       }
+
    }
 
    @ObfuscatedName("dm")
    @Export("Rasterizer2D_drawVerticalLine")
    public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) {
-      if(var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) {
-         if(var1 < Rasterizer2D_yClipStart) {
+      if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) {
+         if (var1 < Rasterizer2D_yClipStart) {
             var2 -= Rasterizer2D_yClipStart - var1;
             var1 = Rasterizer2D_yClipStart;
          }
 
-         if(var2 + var1 > Rasterizer2D_yClipEnd) {
+         if (var2 + var1 > Rasterizer2D_yClipEnd) {
             var2 = Rasterizer2D_yClipEnd - var1;
          }
 
          int var4 = var0 + Rasterizer2D_width * var1;
 
-         for(int var5 = 0; var5 < var2; ++var5) {
+         for (int var5 = 0; var5 < var2; ++var5) {
             Rasterizer2D_pixels[var4 + var5 * Rasterizer2D_width] = var3;
          }
-
       }
+
    }
 
    @ObfuscatedName("dq")
    @Export("Rasterizer2D_drawVerticalLineAlpha")
    static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) {
-      if(var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) {
-         if(var1 < Rasterizer2D_yClipStart) {
+      if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) {
+         if (var1 < Rasterizer2D_yClipStart) {
             var2 -= Rasterizer2D_yClipStart - var1;
             var1 = Rasterizer2D_yClipStart;
          }
 
-         if(var2 + var1 > Rasterizer2D_yClipEnd) {
+         if (var2 + var1 > Rasterizer2D_yClipEnd) {
             var2 = Rasterizer2D_yClipEnd - var1;
          }
 
@@ -714,18 +704,18 @@ public class Rasterizer2D extends DualNode {
          int var6 = (var3 >> 16 & 255) * var4;
          int var7 = (var3 >> 8 & 255) * var4;
          int var8 = var4 * (var3 & 255);
-         int var12 = var0 + Rasterizer2D_width * var1;
+         int var9 = var0 + Rasterizer2D_width * var1;
 
-         for(int var13 = 0; var13 < var2; ++var13) {
-            int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255);
-            int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5;
-            int var11 = var5 * (Rasterizer2D_pixels[var12] & 255);
-            int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8);
-            Rasterizer2D_pixels[var12] = var14;
-            var12 += Rasterizer2D_width;
+         for (int var10 = 0; var10 < var2; ++var10) {
+            int var11 = var5 * (Rasterizer2D_pixels[var9] >> 16 & 255);
+            int var12 = (Rasterizer2D_pixels[var9] >> 8 & 255) * var5;
+            int var13 = var5 * (Rasterizer2D_pixels[var9] & 255);
+            int var14 = (var8 + var13 >> 8) + (var6 + var11 >> 8 << 16) + (var7 + var12 >> 8 << 8);
+            Rasterizer2D_pixels[var9] = var14;
+            var9 += Rasterizer2D_width;
          }
-
       }
+
    }
 
    @ObfuscatedName("et")
@@ -733,22 +723,20 @@ public class Rasterizer2D extends DualNode {
    public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) {
       var2 -= var0;
       var3 -= var1;
-      if(var3 == 0) {
-         if(var2 >= 0) {
+      if (var3 == 0) {
+         if (var2 >= 0) {
             Rasterizer2D_drawHorizontalLine(var0, var1, var2 + 1, var4);
          } else {
             Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4);
          }
-
-      } else if(var2 == 0) {
-         if(var3 >= 0) {
+      } else if (var2 == 0) {
+         if (var3 >= 0) {
             Rasterizer2D_drawVerticalLine(var0, var1, var3 + 1, var4);
          } else {
             Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4);
          }
-
       } else {
-         if(var3 + var2 < 0) {
+         if (var3 + var2 < 0) {
             var0 += var2;
             var2 = -var2;
             var1 += var3;
@@ -757,24 +745,24 @@ public class Rasterizer2D extends DualNode {
 
          int var5;
          int var6;
-         if(var2 > var3) {
+         if (var2 > var3) {
             var1 <<= 16;
             var1 += 32768;
             var3 <<= 16;
             var5 = (int)Math.floor((double)var3 / (double)var2 + 0.5D);
             var2 += var0;
-            if(var0 < Rasterizer2D_xClipStart) {
+            if (var0 < Rasterizer2D_xClipStart) {
                var1 += var5 * (Rasterizer2D_xClipStart - var0);
                var0 = Rasterizer2D_xClipStart;
             }
 
-            if(var2 >= Rasterizer2D_xClipEnd) {
+            if (var2 >= Rasterizer2D_xClipEnd) {
                var2 = Rasterizer2D_xClipEnd - 1;
             }
 
-            while(var0 <= var2) {
+            while (var0 <= var2) {
                var6 = var1 >> 16;
-               if(var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) {
+               if (var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) {
                   Rasterizer2D_pixels[var0 + var6 * Rasterizer2D_width] = var4;
                }
 
@@ -787,18 +775,18 @@ public class Rasterizer2D extends DualNode {
             var2 <<= 16;
             var5 = (int)Math.floor((double)var2 / (double)var3 + 0.5D);
             var3 += var1;
-            if(var1 < Rasterizer2D_yClipStart) {
+            if (var1 < Rasterizer2D_yClipStart) {
                var0 += (Rasterizer2D_yClipStart - var1) * var5;
                var1 = Rasterizer2D_yClipStart;
             }
 
-            if(var3 >= Rasterizer2D_yClipEnd) {
+            if (var3 >= Rasterizer2D_yClipEnd) {
                var3 = Rasterizer2D_yClipEnd - 1;
             }
 
-            while(var1 <= var3) {
+            while (var1 <= var3) {
                var6 = var0 >> 16;
-               if(var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) {
+               if (var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) {
                   Rasterizer2D_pixels[var6 + Rasterizer2D_width * var1] = var4;
                }
 
@@ -806,26 +794,27 @@ public class Rasterizer2D extends DualNode {
                ++var1;
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("eb")
    @Export("Rasterizer2D_setPixel")
    static void Rasterizer2D_setPixel(int var0, int var1, int var2) {
-      if(var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) {
+      if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) {
          Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2;
       }
+
    }
 
    @ObfuscatedName("ek")
    public static void method5948(int var0, int var1, int var2, int[] var3, int[] var4) {
       int var5 = var0 + Rasterizer2D_width * var1;
 
-      for(var1 = 0; var1 < var3.length; ++var1) {
+      for (var1 = 0; var1 < var3.length; ++var1) {
          int var6 = var5 + var3[var1];
 
-         for(var0 = -var4[var1]; var0 < 0; ++var0) {
+         for (var0 = -var4[var1]; var0 < 0; ++var0) {
             Rasterizer2D_pixels[var6++] = var2;
          }
 
@@ -833,4 +822,11 @@ public class Rasterizer2D extends DualNode {
       }
 
    }
+
+   static {
+      Rasterizer2D_yClipStart = 0;
+      Rasterizer2D_yClipEnd = 0;
+      Rasterizer2D_xClipStart = 0;
+      Rasterizer2D_xClipEnd = 0;
+   }
 }
diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java
index b242467b4e..1723beeb42 100644
--- a/runescape-client/src/main/java/Rasterizer3D.java
+++ b/runescape-client/src/main/java/Rasterizer3D.java
@@ -7,14 +7,14 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Rasterizer3D")
 public class Rasterizer3D extends Rasterizer2D {
    @ObfuscatedName("m")
-   static boolean __et_m;
+   static boolean field739;
    @ObfuscatedName("f")
-   static boolean __et_f;
+   static boolean field740;
    @ObfuscatedName("q")
    @Export("Rasterizer3D_isLowDetailTexture")
    static boolean Rasterizer3D_isLowDetailTexture;
    @ObfuscatedName("w")
-   public static boolean __et_w;
+   public static boolean field741;
    @ObfuscatedName("o")
    @Export("Rasterizer3D_alpha")
    static int Rasterizer3D_alpha;
@@ -58,9 +58,9 @@ public class Rasterizer3D extends Rasterizer2D {
    @Export("Rasterizer3D_textureLoader")
    public static TextureLoader Rasterizer3D_textureLoader;
    @ObfuscatedName("r")
-   static int[] __et_r;
+   static int[] field742;
    @ObfuscatedName("p")
-   static int[] __et_p;
+   static int[] field743;
    @ObfuscatedName("v")
    @Export("Rasterizer3D_sine")
    public static int[] Rasterizer3D_sine;
@@ -68,36 +68,6 @@ public class Rasterizer3D extends Rasterizer2D {
    @Export("Rasterizer3D_cosine")
    public static int[] Rasterizer3D_cosine;
 
-   static {
-      __et_m = false;
-      __et_f = false;
-      Rasterizer3D_isLowDetailTexture = false;
-      __et_w = true;
-      Rasterizer3D_alpha = 0;
-      Rasterizer3D_zoom = 512;
-      Rasterizer3D_rowOffsets = new int[1024];
-      Rasterizer3D_colorPalette = new int[65536];
-      __et_r = new int[512];
-      __et_p = new int[2048];
-      Rasterizer3D_sine = new int[2048];
-      Rasterizer3D_cosine = new int[2048];
-
-      int var0;
-      for(var0 = 1; var0 < 512; ++var0) {
-         __et_r[var0] = 32768 / var0;
-      }
-
-      for(var0 = 1; var0 < 2048; ++var0) {
-         __et_p[var0] = 65536 / var0;
-      }
-
-      for(var0 = 0; var0 < 2048; ++var0) {
-         Rasterizer3D_sine[var0] = (int)(65536.0D * Math.sin((double)var0 * 0.0030679615D));
-         Rasterizer3D_cosine[var0] = (int)(65536.0D * Math.cos((double)var0 * 0.0030679615D));
-      }
-
-   }
-
    @ObfuscatedName("m")
    @Export("Rasterizer3D_method1")
    public static final void Rasterizer3D_method1() {
@@ -110,13 +80,13 @@ public class Rasterizer3D extends Rasterizer2D {
       Rasterizer3D_clipWidth = var2 - var0;
       Rasterizer3D_clipHeight = var3 - var1;
       Rasterizer3D_method3();
-      if(Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) {
+      if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) {
          Rasterizer3D_rowOffsets = new int[World.method1759(Rasterizer3D_clipHeight)];
       }
 
       int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1;
 
-      for(int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) {
+      for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) {
          Rasterizer3D_rowOffsets[var5] = var4;
          var4 += Rasterizer2D.Rasterizer2D_width;
       }
@@ -167,18 +137,18 @@ public class Rasterizer3D extends Rasterizer2D {
    static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) {
       int var4 = var2 * 128;
 
-      for(int var5 = var2; var5 < var3; ++var5) {
+      for (int var5 = var2; var5 < var3; ++var5) {
          double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D;
          double var8 = (double)(var5 & 7) / 8.0D + 0.0625D;
 
-         for(int var10 = 0; var10 < 128; ++var10) {
+         for (int var10 = 0; var10 < 128; ++var10) {
             double var11 = (double)var10 / 128.0D;
             double var13 = var11;
             double var15 = var11;
             double var17 = var11;
-            if(var8 != 0.0D) {
+            if (var8 != 0.0D) {
                double var19;
-               if(var11 < 0.5D) {
+               if (var11 < 0.5D) {
                   var19 = var11 * (1.0D + var8);
                } else {
                   var19 = var11 + var8 - var11 * var8;
@@ -186,52 +156,52 @@ public class Rasterizer3D extends Rasterizer2D {
 
                double var21 = 2.0D * var11 - var19;
                double var23 = var6 + 0.3333333333333333D;
-               if(var23 > 1.0D) {
+               if (var23 > 1.0D) {
                   --var23;
                }
 
-               double var27 = var6 - 0.3333333333333333D;
-               if(var27 < 0.0D) {
-                  ++var27;
+               double var25 = var6 - 0.3333333333333333D;
+               if (var25 < 0.0D) {
+                  ++var25;
                }
 
-               if(6.0D * var23 < 1.0D) {
+               if (6.0D * var23 < 1.0D) {
                   var13 = var21 + (var19 - var21) * 6.0D * var23;
-               } else if(2.0D * var23 < 1.0D) {
+               } else if (2.0D * var23 < 1.0D) {
                   var13 = var19;
-               } else if(3.0D * var23 < 2.0D) {
+               } else if (3.0D * var23 < 2.0D) {
                   var13 = var21 + (var19 - var21) * (0.6666666666666666D - var23) * 6.0D;
                } else {
                   var13 = var21;
                }
 
-               if(6.0D * var6 < 1.0D) {
+               if (6.0D * var6 < 1.0D) {
                   var15 = var21 + (var19 - var21) * 6.0D * var6;
-               } else if(2.0D * var6 < 1.0D) {
+               } else if (2.0D * var6 < 1.0D) {
                   var15 = var19;
-               } else if(3.0D * var6 < 2.0D) {
+               } else if (3.0D * var6 < 2.0D) {
                   var15 = var21 + (var19 - var21) * (0.6666666666666666D - var6) * 6.0D;
                } else {
                   var15 = var21;
                }
 
-               if(6.0D * var27 < 1.0D) {
-                  var17 = var21 + (var19 - var21) * 6.0D * var27;
-               } else if(2.0D * var27 < 1.0D) {
+               if (6.0D * var25 < 1.0D) {
+                  var17 = var21 + (var19 - var21) * 6.0D * var25;
+               } else if (2.0D * var25 < 1.0D) {
                   var17 = var19;
-               } else if(3.0D * var27 < 2.0D) {
-                  var17 = var21 + (var19 - var21) * (0.6666666666666666D - var27) * 6.0D;
+               } else if (3.0D * var25 < 2.0D) {
+                  var17 = var21 + (var19 - var21) * (0.6666666666666666D - var25) * 6.0D;
                } else {
                   var17 = var21;
                }
             }
 
-            int var29 = (int)(var13 * 256.0D);
+            int var28 = (int)(var13 * 256.0D);
             int var20 = (int)(var15 * 256.0D);
-            int var30 = (int)(var17 * 256.0D);
-            int var22 = var30 + (var20 << 8) + (var29 << 16);
+            int var27 = (int)(var17 * 256.0D);
+            int var22 = var27 + (var20 << 8) + (var28 << 16);
             var22 = Rasterizer3D_brighten(var22, var0);
-            if(var22 == 0) {
+            if (var22 == 0) {
                var22 = 1;
             }
 
@@ -258,7 +228,7 @@ public class Rasterizer3D extends Rasterizer2D {
 
    @ObfuscatedName("e")
    public static void method2985(int var0, int var1, int var2) {
-      __et_m = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth;
+      field739 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth;
    }
 
    @ObfuscatedName("x")
@@ -270,44 +240,44 @@ public class Rasterizer3D extends Rasterizer2D {
       int var13 = var7 - var6;
       int var14 = var8 - var6;
       int var15;
-      if(var2 != var1) {
+      if (var2 != var1) {
          var15 = (var5 - var4 << 14) / (var2 - var1);
       } else {
          var15 = 0;
       }
 
       int var16;
-      if(var0 != var1) {
+      if (var0 != var1) {
          var16 = (var9 << 14) / var10;
       } else {
          var16 = 0;
       }
 
       int var17;
-      if(var0 != var2) {
+      if (var0 != var2) {
          var17 = (var11 << 14) / var12;
       } else {
          var17 = 0;
       }
 
       int var18 = var9 * var12 - var11 * var10;
-      if(var18 != 0) {
+      if (var18 != 0) {
          int var19 = (var13 * var12 - var14 * var10 << 8) / var18;
          int var20 = (var14 * var9 - var13 * var11 << 8) / var18;
-         if(var0 <= var1 && var0 <= var2) {
-            if(var0 < Rasterizer3D_clipHeight) {
-               if(var1 > Rasterizer3D_clipHeight) {
+         if (var0 <= var1 && var0 <= var2) {
+            if (var0 < Rasterizer3D_clipHeight) {
+               if (var1 > Rasterizer3D_clipHeight) {
                   var1 = Rasterizer3D_clipHeight;
                }
 
-               if(var2 > Rasterizer3D_clipHeight) {
+               if (var2 > Rasterizer3D_clipHeight) {
                   var2 = Rasterizer3D_clipHeight;
                }
 
                var6 = var19 + ((var6 << 8) - var3 * var19);
-               if(var1 < var2) {
+               if (var1 < var2) {
                   var5 = var3 <<= 14;
-                  if(var0 < 0) {
+                  if (var0 < 0) {
                      var5 -= var0 * var17;
                      var3 -= var0 * var16;
                      var6 -= var0 * var20;
@@ -315,22 +285,22 @@ public class Rasterizer3D extends Rasterizer2D {
                   }
 
                   var4 <<= 14;
-                  if(var1 < 0) {
+                  if (var1 < 0) {
                      var4 -= var15 * var1;
                      var1 = 0;
                   }
 
-                  if(var0 != var1 && var17 < var16 || var0 == var1 && var17 > var15) {
+                  if (var0 != var1 && var17 < var16 || var0 == var1 && var17 > var15) {
                      var2 -= var1;
                      var1 -= var0;
                      var0 = Rasterizer3D_rowOffsets[var0];
 
-                     while(true) {
+                     while (true) {
                         --var1;
-                        if(var1 < 0) {
-                           while(true) {
+                        if (var1 < 0) {
+                           while (true) {
                               --var2;
-                              if(var2 < 0) {
+                              if (var2 < 0) {
                                  return;
                               }
 
@@ -348,123 +318,123 @@ public class Rasterizer3D extends Rasterizer2D {
                         var6 += var20;
                         var0 += Rasterizer2D.Rasterizer2D_width;
                      }
-                  } else {
-                     var2 -= var1;
-                     var1 -= var0;
-                     var0 = Rasterizer3D_rowOffsets[var0];
-
-                     while(true) {
-                        --var1;
-                        if(var1 < 0) {
-                           while(true) {
-                              --var2;
-                              if(var2 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19);
-                              var5 += var17;
-                              var4 += var15;
-                              var6 += var20;
-                              var0 += Rasterizer2D.Rasterizer2D_width;
-                           }
-                        }
-
-                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19);
-                        var5 += var17;
-                        var3 += var16;
-                        var6 += var20;
-                        var0 += Rasterizer2D.Rasterizer2D_width;
-                     }
-                  }
-               } else {
-                  var4 = var3 <<= 14;
-                  if(var0 < 0) {
-                     var4 -= var0 * var17;
-                     var3 -= var0 * var16;
-                     var6 -= var0 * var20;
-                     var0 = 0;
                   }
 
-                  var5 <<= 14;
-                  if(var2 < 0) {
-                     var5 -= var15 * var2;
-                     var2 = 0;
-                  }
+                  var2 -= var1;
+                  var1 -= var0;
+                  var0 = Rasterizer3D_rowOffsets[var0];
 
-                  if(var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) {
-                     var1 -= var2;
-                     var2 -= var0;
-                     var0 = Rasterizer3D_rowOffsets[var0];
-
-                     while(true) {
-                        --var2;
-                        if(var2 < 0) {
-                           while(true) {
-                              --var1;
-                              if(var1 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19);
-                              var5 += var15;
-                              var3 += var16;
-                              var6 += var20;
-                              var0 += Rasterizer2D.Rasterizer2D_width;
+                  while (true) {
+                     --var1;
+                     if (var1 < 0) {
+                        while (true) {
+                           --var2;
+                           if (var2 < 0) {
+                              return;
                            }
+
+                           Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19);
+                           var5 += var17;
+                           var4 += var15;
+                           var6 += var20;
+                           var0 += Rasterizer2D.Rasterizer2D_width;
                         }
-
-                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19);
-                        var4 += var17;
-                        var3 += var16;
-                        var6 += var20;
-                        var0 += Rasterizer2D.Rasterizer2D_width;
                      }
-                  } else {
-                     var1 -= var2;
-                     var2 -= var0;
-                     var0 = Rasterizer3D_rowOffsets[var0];
 
-                     while(true) {
-                        --var2;
-                        if(var2 < 0) {
-                           while(true) {
-                              --var1;
-                              if(var1 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19);
-                              var5 += var15;
-                              var3 += var16;
-                              var6 += var20;
-                              var0 += Rasterizer2D.Rasterizer2D_width;
-                           }
-                        }
-
-                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19);
-                        var4 += var17;
-                        var3 += var16;
-                        var6 += var20;
-                        var0 += Rasterizer2D.Rasterizer2D_width;
-                     }
+                     Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19);
+                     var5 += var17;
+                     var3 += var16;
+                     var6 += var20;
+                     var0 += Rasterizer2D.Rasterizer2D_width;
                   }
                }
+
+               var4 = var3 <<= 14;
+               if (var0 < 0) {
+                  var4 -= var0 * var17;
+                  var3 -= var0 * var16;
+                  var6 -= var0 * var20;
+                  var0 = 0;
+               }
+
+               var5 <<= 14;
+               if (var2 < 0) {
+                  var5 -= var15 * var2;
+                  var2 = 0;
+               }
+
+               if ((var0 == var2 || var17 >= var16) && (var0 != var2 || var15 <= var16)) {
+                  var1 -= var2;
+                  var2 -= var0;
+                  var0 = Rasterizer3D_rowOffsets[var0];
+
+                  while (true) {
+                     --var2;
+                     if (var2 < 0) {
+                        while (true) {
+                           --var1;
+                           if (var1 < 0) {
+                              return;
+                           }
+
+                           Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19);
+                           var5 += var15;
+                           var3 += var16;
+                           var6 += var20;
+                           var0 += Rasterizer2D.Rasterizer2D_width;
+                        }
+                     }
+
+                     Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19);
+                     var4 += var17;
+                     var3 += var16;
+                     var6 += var20;
+                     var0 += Rasterizer2D.Rasterizer2D_width;
+                  }
+               }
+
+               var1 -= var2;
+               var2 -= var0;
+               var0 = Rasterizer3D_rowOffsets[var0];
+
+               while (true) {
+                  --var2;
+                  if (var2 < 0) {
+                     while (true) {
+                        --var1;
+                        if (var1 < 0) {
+                           return;
+                        }
+
+                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19);
+                        var5 += var15;
+                        var3 += var16;
+                        var6 += var20;
+                        var0 += Rasterizer2D.Rasterizer2D_width;
+                     }
+                  }
+
+                  Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19);
+                  var4 += var17;
+                  var3 += var16;
+                  var6 += var20;
+                  var0 += Rasterizer2D.Rasterizer2D_width;
+               }
             }
-         } else if(var1 <= var2) {
-            if(var1 < Rasterizer3D_clipHeight) {
-               if(var2 > Rasterizer3D_clipHeight) {
+         } else if (var1 <= var2) {
+            if (var1 < Rasterizer3D_clipHeight) {
+               if (var2 > Rasterizer3D_clipHeight) {
                   var2 = Rasterizer3D_clipHeight;
                }
 
-               if(var0 > Rasterizer3D_clipHeight) {
+               if (var0 > Rasterizer3D_clipHeight) {
                   var0 = Rasterizer3D_clipHeight;
                }
 
                var7 = var19 + ((var7 << 8) - var19 * var4);
-               if(var2 < var0) {
+               if (var2 < var0) {
                   var3 = var4 <<= 14;
-                  if(var1 < 0) {
+                  if (var1 < 0) {
                      var3 -= var16 * var1;
                      var4 -= var15 * var1;
                      var7 -= var20 * var1;
@@ -472,22 +442,22 @@ public class Rasterizer3D extends Rasterizer2D {
                   }
 
                   var5 <<= 14;
-                  if(var2 < 0) {
+                  if (var2 < 0) {
                      var5 -= var17 * var2;
                      var2 = 0;
                   }
 
-                  if(var2 != var1 && var16 < var15 || var2 == var1 && var16 > var17) {
+                  if (var2 != var1 && var16 < var15 || var2 == var1 && var16 > var17) {
                      var0 -= var2;
                      var2 -= var1;
                      var1 = Rasterizer3D_rowOffsets[var1];
 
-                     while(true) {
+                     while (true) {
                         --var2;
-                        if(var2 < 0) {
-                           while(true) {
+                        if (var2 < 0) {
+                           while (true) {
                               --var0;
-                              if(var0 < 0) {
+                              if (var0 < 0) {
                                  return;
                               }
 
@@ -505,122 +475,122 @@ public class Rasterizer3D extends Rasterizer2D {
                         var7 += var20;
                         var1 += Rasterizer2D.Rasterizer2D_width;
                      }
-                  } else {
-                     var0 -= var2;
-                     var2 -= var1;
-                     var1 = Rasterizer3D_rowOffsets[var1];
+                  }
 
-                     while(true) {
-                        --var2;
-                        if(var2 < 0) {
-                           while(true) {
-                              --var0;
-                              if(var0 < 0) {
-                                 return;
-                              }
+                  var0 -= var2;
+                  var2 -= var1;
+                  var1 = Rasterizer3D_rowOffsets[var1];
 
-                              Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19);
-                              var3 += var16;
-                              var5 += var17;
-                              var7 += var20;
-                              var1 += Rasterizer2D.Rasterizer2D_width;
+                  while (true) {
+                     --var2;
+                     if (var2 < 0) {
+                        while (true) {
+                           --var0;
+                           if (var0 < 0) {
+                              return;
                            }
+
+                           Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19);
+                           var3 += var16;
+                           var5 += var17;
+                           var7 += var20;
+                           var1 += Rasterizer2D.Rasterizer2D_width;
+                        }
+                     }
+
+                     Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19);
+                     var3 += var16;
+                     var4 += var15;
+                     var7 += var20;
+                     var1 += Rasterizer2D.Rasterizer2D_width;
+                  }
+               }
+
+               var5 = var4 <<= 14;
+               if (var1 < 0) {
+                  var5 -= var16 * var1;
+                  var4 -= var15 * var1;
+                  var7 -= var20 * var1;
+                  var1 = 0;
+               }
+
+               var3 <<= 14;
+               if (var0 < 0) {
+                  var3 -= var0 * var17;
+                  var0 = 0;
+               }
+
+               if (var16 < var15) {
+                  var2 -= var0;
+                  var0 -= var1;
+                  var1 = Rasterizer3D_rowOffsets[var1];
+
+                  while (true) {
+                     --var0;
+                     if (var0 < 0) {
+                        while (true) {
+                           --var2;
+                           if (var2 < 0) {
+                              return;
+                           }
+
+                           Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19);
+                           var3 += var17;
+                           var4 += var15;
+                           var7 += var20;
+                           var1 += Rasterizer2D.Rasterizer2D_width;
+                        }
+                     }
+
+                     Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19);
+                     var5 += var16;
+                     var4 += var15;
+                     var7 += var20;
+                     var1 += Rasterizer2D.Rasterizer2D_width;
+                  }
+               }
+
+               var2 -= var0;
+               var0 -= var1;
+               var1 = Rasterizer3D_rowOffsets[var1];
+
+               while (true) {
+                  --var0;
+                  if (var0 < 0) {
+                     while (true) {
+                        --var2;
+                        if (var2 < 0) {
+                           return;
                         }
 
                         Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19);
-                        var3 += var16;
+                        var3 += var17;
                         var4 += var15;
                         var7 += var20;
                         var1 += Rasterizer2D.Rasterizer2D_width;
                      }
                   }
-               } else {
-                  var5 = var4 <<= 14;
-                  if(var1 < 0) {
-                     var5 -= var16 * var1;
-                     var4 -= var15 * var1;
-                     var7 -= var20 * var1;
-                     var1 = 0;
-                  }
 
-                  var3 <<= 14;
-                  if(var0 < 0) {
-                     var3 -= var0 * var17;
-                     var0 = 0;
-                  }
-
-                  if(var16 < var15) {
-                     var2 -= var0;
-                     var0 -= var1;
-                     var1 = Rasterizer3D_rowOffsets[var1];
-
-                     while(true) {
-                        --var0;
-                        if(var0 < 0) {
-                           while(true) {
-                              --var2;
-                              if(var2 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19);
-                              var3 += var17;
-                              var4 += var15;
-                              var7 += var20;
-                              var1 += Rasterizer2D.Rasterizer2D_width;
-                           }
-                        }
-
-                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19);
-                        var5 += var16;
-                        var4 += var15;
-                        var7 += var20;
-                        var1 += Rasterizer2D.Rasterizer2D_width;
-                     }
-                  } else {
-                     var2 -= var0;
-                     var0 -= var1;
-                     var1 = Rasterizer3D_rowOffsets[var1];
-
-                     while(true) {
-                        --var0;
-                        if(var0 < 0) {
-                           while(true) {
-                              --var2;
-                              if(var2 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19);
-                              var3 += var17;
-                              var4 += var15;
-                              var7 += var20;
-                              var1 += Rasterizer2D.Rasterizer2D_width;
-                           }
-                        }
-
-                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19);
-                        var5 += var16;
-                        var4 += var15;
-                        var7 += var20;
-                        var1 += Rasterizer2D.Rasterizer2D_width;
-                     }
-                  }
+                  Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19);
+                  var5 += var16;
+                  var4 += var15;
+                  var7 += var20;
+                  var1 += Rasterizer2D.Rasterizer2D_width;
                }
             }
-         } else if(var2 < Rasterizer3D_clipHeight) {
-            if(var0 > Rasterizer3D_clipHeight) {
+         } else if (var2 < Rasterizer3D_clipHeight) {
+            if (var0 > Rasterizer3D_clipHeight) {
                var0 = Rasterizer3D_clipHeight;
             }
 
-            if(var1 > Rasterizer3D_clipHeight) {
+            if (var1 > Rasterizer3D_clipHeight) {
                var1 = Rasterizer3D_clipHeight;
             }
 
             var8 = var19 + ((var8 << 8) - var5 * var19);
-            if(var0 < var1) {
+            if (var0 < var1) {
                var4 = var5 <<= 14;
-               if(var2 < 0) {
+               if (var2 < 0) {
                   var4 -= var15 * var2;
                   var5 -= var17 * var2;
                   var8 -= var20 * var2;
@@ -628,22 +598,22 @@ public class Rasterizer3D extends Rasterizer2D {
                }
 
                var3 <<= 14;
-               if(var0 < 0) {
+               if (var0 < 0) {
                   var3 -= var0 * var16;
                   var0 = 0;
                }
 
-               if(var15 < var17) {
+               if (var15 < var17) {
                   var1 -= var0;
                   var0 -= var2;
                   var2 = Rasterizer3D_rowOffsets[var2];
 
-                  while(true) {
+                  while (true) {
                      --var0;
-                     if(var0 < 0) {
-                        while(true) {
+                     if (var0 < 0) {
+                        while (true) {
                            --var1;
-                           if(var1 < 0) {
+                           if (var1 < 0) {
                               return;
                            }
 
@@ -661,136 +631,137 @@ public class Rasterizer3D extends Rasterizer2D {
                      var8 += var20;
                      var2 += Rasterizer2D.Rasterizer2D_width;
                   }
-               } else {
-                  var1 -= var0;
-                  var0 -= var2;
-                  var2 = Rasterizer3D_rowOffsets[var2];
+               }
 
-                  while(true) {
-                     --var0;
-                     if(var0 < 0) {
-                        while(true) {
-                           --var1;
-                           if(var1 < 0) {
-                              return;
-                           }
+               var1 -= var0;
+               var0 -= var2;
+               var2 = Rasterizer3D_rowOffsets[var2];
 
-                           Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19);
-                           var4 += var15;
-                           var3 += var16;
-                           var8 += var20;
-                           var2 += Rasterizer2D.Rasterizer2D_width;
+               while (true) {
+                  --var0;
+                  if (var0 < 0) {
+                     while (true) {
+                        --var1;
+                        if (var1 < 0) {
+                           return;
                         }
+
+                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19);
+                        var4 += var15;
+                        var3 += var16;
+                        var8 += var20;
+                        var2 += Rasterizer2D.Rasterizer2D_width;
+                     }
+                  }
+
+                  Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19);
+                  var4 += var15;
+                  var5 += var17;
+                  var8 += var20;
+                  var2 += Rasterizer2D.Rasterizer2D_width;
+               }
+            }
+
+            var3 = var5 <<= 14;
+            if (var2 < 0) {
+               var3 -= var15 * var2;
+               var5 -= var17 * var2;
+               var8 -= var20 * var2;
+               var2 = 0;
+            }
+
+            var4 <<= 14;
+            if (var1 < 0) {
+               var4 -= var16 * var1;
+               var1 = 0;
+            }
+
+            if (var15 < var17) {
+               var0 -= var1;
+               var1 -= var2;
+               var2 = Rasterizer3D_rowOffsets[var2];
+
+               while (true) {
+                  --var1;
+                  if (var1 < 0) {
+                     while (true) {
+                        --var0;
+                        if (var0 < 0) {
+                           return;
+                        }
+
+                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19);
+                        var4 += var16;
+                        var5 += var17;
+                        var8 += var20;
+                        var2 += Rasterizer2D.Rasterizer2D_width;
+                     }
+                  }
+
+                  Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19);
+                  var3 += var15;
+                  var5 += var17;
+                  var8 += var20;
+                  var2 += Rasterizer2D.Rasterizer2D_width;
+               }
+            }
+
+            var0 -= var1;
+            var1 -= var2;
+            var2 = Rasterizer3D_rowOffsets[var2];
+
+            while (true) {
+               --var1;
+               if (var1 < 0) {
+                  while (true) {
+                     --var0;
+                     if (var0 < 0) {
+                        return;
                      }
 
                      Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19);
-                     var4 += var15;
+                     var4 += var16;
                      var5 += var17;
                      var8 += var20;
                      var2 += Rasterizer2D.Rasterizer2D_width;
                   }
                }
-            } else {
-               var3 = var5 <<= 14;
-               if(var2 < 0) {
-                  var3 -= var15 * var2;
-                  var5 -= var17 * var2;
-                  var8 -= var20 * var2;
-                  var2 = 0;
-               }
 
-               var4 <<= 14;
-               if(var1 < 0) {
-                  var4 -= var16 * var1;
-                  var1 = 0;
-               }
-
-               if(var15 < var17) {
-                  var0 -= var1;
-                  var1 -= var2;
-                  var2 = Rasterizer3D_rowOffsets[var2];
-
-                  while(true) {
-                     --var1;
-                     if(var1 < 0) {
-                        while(true) {
-                           --var0;
-                           if(var0 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19);
-                           var4 += var16;
-                           var5 += var17;
-                           var8 += var20;
-                           var2 += Rasterizer2D.Rasterizer2D_width;
-                        }
-                     }
-
-                     Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19);
-                     var3 += var15;
-                     var5 += var17;
-                     var8 += var20;
-                     var2 += Rasterizer2D.Rasterizer2D_width;
-                  }
-               } else {
-                  var0 -= var1;
-                  var1 -= var2;
-                  var2 = Rasterizer3D_rowOffsets[var2];
-
-                  while(true) {
-                     --var1;
-                     if(var1 < 0) {
-                        while(true) {
-                           --var0;
-                           if(var0 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19);
-                           var4 += var16;
-                           var5 += var17;
-                           var8 += var20;
-                           var2 += Rasterizer2D.Rasterizer2D_width;
-                        }
-                     }
-
-                     Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19);
-                     var3 += var15;
-                     var5 += var17;
-                     var8 += var20;
-                     var2 += Rasterizer2D.Rasterizer2D_width;
-                  }
-               }
+               Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19);
+               var3 += var15;
+               var5 += var17;
+               var8 += var20;
+               var2 += Rasterizer2D.Rasterizer2D_width;
             }
          }
       }
+
    }
 
    @ObfuscatedName("d")
    @Export("Rasterizer3D_vertAlpha")
    static final void Rasterizer3D_vertAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-      if(__et_m) {
-         if(var5 > Rasterizer3D_clipWidth) {
+      if (field739) {
+         if (var5 > Rasterizer3D_clipWidth) {
             var5 = Rasterizer3D_clipWidth;
          }
 
-         if(var4 < 0) {
+         if (var4 < 0) {
             var4 = 0;
          }
       }
 
-      if(var4 < var5) {
+      if (var4 < var5) {
          var1 += var4;
          var6 += var4 * var7;
          int var8;
          int var9;
          int var10;
-         if(__et_w) {
+         if (field741) {
             var3 = var5 - var4 >> 2;
             var7 <<= 2;
-            if(Rasterizer3D_alpha == 0) {
-               if(var3 > 0) {
+            if (Rasterizer3D_alpha == 0) {
+               if (var3 > 0) {
                   do {
                      var2 = Rasterizer3D_colorPalette[var6 >> 8];
                      var6 += var7;
@@ -803,7 +774,7 @@ public class Rasterizer3D extends Rasterizer2D {
                }
 
                var3 = var5 - var4 & 3;
-               if(var3 > 0) {
+               if (var3 > 0) {
                   var2 = Rasterizer3D_colorPalette[var6 >> 8];
 
                   do {
@@ -814,7 +785,7 @@ public class Rasterizer3D extends Rasterizer2D {
             } else {
                var8 = Rasterizer3D_alpha;
                var9 = 256 - Rasterizer3D_alpha;
-               if(var3 > 0) {
+               if (var3 > 0) {
                   do {
                      var2 = Rasterizer3D_colorPalette[var6 >> 8];
                      var6 += var7;
@@ -832,7 +803,7 @@ public class Rasterizer3D extends Rasterizer2D {
                }
 
                var3 = var5 - var4 & 3;
-               if(var3 > 0) {
+               if (var3 > 0) {
                   var2 = Rasterizer3D_colorPalette[var6 >> 8];
                   var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935);
 
@@ -843,10 +814,9 @@ public class Rasterizer3D extends Rasterizer2D {
                   } while(var3 > 0);
                }
             }
-
          } else {
             var3 = var5 - var4;
-            if(Rasterizer3D_alpha == 0) {
+            if (Rasterizer3D_alpha == 0) {
                do {
                   var0[var1++] = Rasterizer3D_colorPalette[var6 >> 8];
                   var6 += var7;
@@ -865,63 +835,63 @@ public class Rasterizer3D extends Rasterizer2D {
                   --var3;
                } while(var3 > 0);
             }
-
          }
       }
+
    }
 
    @ObfuscatedName("a")
    public static final void method3020(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
       int var7 = 0;
-      if(var0 != var1) {
+      if (var0 != var1) {
          var7 = (var4 - var3 << 14) / (var1 - var0);
       }
 
       int var8 = 0;
-      if(var2 != var1) {
+      if (var2 != var1) {
          var8 = (var5 - var4 << 14) / (var2 - var1);
       }
 
       int var9 = 0;
-      if(var0 != var2) {
+      if (var0 != var2) {
          var9 = (var3 - var5 << 14) / (var0 - var2);
       }
 
-      if(var0 <= var1 && var0 <= var2) {
-         if(var0 < Rasterizer3D_clipHeight) {
-            if(var1 > Rasterizer3D_clipHeight) {
+      if (var0 <= var1 && var0 <= var2) {
+         if (var0 < Rasterizer3D_clipHeight) {
+            if (var1 > Rasterizer3D_clipHeight) {
                var1 = Rasterizer3D_clipHeight;
             }
 
-            if(var2 > Rasterizer3D_clipHeight) {
+            if (var2 > Rasterizer3D_clipHeight) {
                var2 = Rasterizer3D_clipHeight;
             }
 
-            if(var1 < var2) {
+            if (var1 < var2) {
                var5 = var3 <<= 14;
-               if(var0 < 0) {
+               if (var0 < 0) {
                   var5 -= var0 * var9;
                   var3 -= var0 * var7;
                   var0 = 0;
                }
 
                var4 <<= 14;
-               if(var1 < 0) {
+               if (var1 < 0) {
                   var4 -= var8 * var1;
                   var1 = 0;
                }
 
-               if((var0 == var1 || var9 >= var7) && (var0 != var1 || var9 <= var8)) {
+               if ((var0 == var1 || var9 >= var7) && (var0 != var1 || var9 <= var8)) {
                   var2 -= var1;
                   var1 -= var0;
                   var0 = Rasterizer3D_rowOffsets[var0];
 
-                  while(true) {
+                  while (true) {
                      --var1;
-                     if(var1 < 0) {
-                        while(true) {
+                     if (var1 < 0) {
+                        while (true) {
                            --var2;
-                           if(var2 < 0) {
+                           if (var2 < 0) {
                               return;
                            }
 
@@ -937,137 +907,137 @@ public class Rasterizer3D extends Rasterizer2D {
                      var3 += var7;
                      var0 += Rasterizer2D.Rasterizer2D_width;
                   }
-               } else {
-                  var2 -= var1;
-                  var1 -= var0;
-                  var0 = Rasterizer3D_rowOffsets[var0];
-
-                  while(true) {
-                     --var1;
-                     if(var1 < 0) {
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14);
-                           var5 += var9;
-                           var4 += var8;
-                           var0 += Rasterizer2D.Rasterizer2D_width;
-                        }
-                     }
-
-                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14);
-                     var5 += var9;
-                     var3 += var7;
-                     var0 += Rasterizer2D.Rasterizer2D_width;
-                  }
-               }
-            } else {
-               var4 = var3 <<= 14;
-               if(var0 < 0) {
-                  var4 -= var0 * var9;
-                  var3 -= var0 * var7;
-                  var0 = 0;
                }
 
-               var5 <<= 14;
-               if(var2 < 0) {
-                  var5 -= var8 * var2;
-                  var2 = 0;
-               }
+               var2 -= var1;
+               var1 -= var0;
+               var0 = Rasterizer3D_rowOffsets[var0];
 
-               if(var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) {
-                  var1 -= var2;
-                  var2 -= var0;
-                  var0 = Rasterizer3D_rowOffsets[var0];
-
-                  while(true) {
-                     --var2;
-                     if(var2 < 0) {
-                        while(true) {
-                           --var1;
-                           if(var1 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14);
-                           var5 += var8;
-                           var3 += var7;
-                           var0 += Rasterizer2D.Rasterizer2D_width;
+               while (true) {
+                  --var1;
+                  if (var1 < 0) {
+                     while (true) {
+                        --var2;
+                        if (var2 < 0) {
+                           return;
                         }
+
+                        Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14);
+                        var5 += var9;
+                        var4 += var8;
+                        var0 += Rasterizer2D.Rasterizer2D_width;
                      }
-
-                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14);
-                     var4 += var9;
-                     var3 += var7;
-                     var0 += Rasterizer2D.Rasterizer2D_width;
                   }
-               } else {
-                  var1 -= var2;
-                  var2 -= var0;
-                  var0 = Rasterizer3D_rowOffsets[var0];
 
-                  while(true) {
-                     --var2;
-                     if(var2 < 0) {
-                        while(true) {
-                           --var1;
-                           if(var1 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14);
-                           var5 += var8;
-                           var3 += var7;
-                           var0 += Rasterizer2D.Rasterizer2D_width;
-                        }
-                     }
-
-                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14);
-                     var4 += var9;
-                     var3 += var7;
-                     var0 += Rasterizer2D.Rasterizer2D_width;
-                  }
+                  Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14);
+                  var5 += var9;
+                  var3 += var7;
+                  var0 += Rasterizer2D.Rasterizer2D_width;
                }
             }
+
+            var4 = var3 <<= 14;
+            if (var0 < 0) {
+               var4 -= var0 * var9;
+               var3 -= var0 * var7;
+               var0 = 0;
+            }
+
+            var5 <<= 14;
+            if (var2 < 0) {
+               var5 -= var8 * var2;
+               var2 = 0;
+            }
+
+            if (var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) {
+               var1 -= var2;
+               var2 -= var0;
+               var0 = Rasterizer3D_rowOffsets[var0];
+
+               while (true) {
+                  --var2;
+                  if (var2 < 0) {
+                     while (true) {
+                        --var1;
+                        if (var1 < 0) {
+                           return;
+                        }
+
+                        Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14);
+                        var5 += var8;
+                        var3 += var7;
+                        var0 += Rasterizer2D.Rasterizer2D_width;
+                     }
+                  }
+
+                  Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14);
+                  var4 += var9;
+                  var3 += var7;
+                  var0 += Rasterizer2D.Rasterizer2D_width;
+               }
+            }
+
+            var1 -= var2;
+            var2 -= var0;
+            var0 = Rasterizer3D_rowOffsets[var0];
+
+            while (true) {
+               --var2;
+               if (var2 < 0) {
+                  while (true) {
+                     --var1;
+                     if (var1 < 0) {
+                        return;
+                     }
+
+                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14);
+                     var5 += var8;
+                     var3 += var7;
+                     var0 += Rasterizer2D.Rasterizer2D_width;
+                  }
+               }
+
+               Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14);
+               var4 += var9;
+               var3 += var7;
+               var0 += Rasterizer2D.Rasterizer2D_width;
+            }
          }
-      } else if(var1 <= var2) {
-         if(var1 < Rasterizer3D_clipHeight) {
-            if(var2 > Rasterizer3D_clipHeight) {
+      } else if (var1 <= var2) {
+         if (var1 < Rasterizer3D_clipHeight) {
+            if (var2 > Rasterizer3D_clipHeight) {
                var2 = Rasterizer3D_clipHeight;
             }
 
-            if(var0 > Rasterizer3D_clipHeight) {
+            if (var0 > Rasterizer3D_clipHeight) {
                var0 = Rasterizer3D_clipHeight;
             }
 
-            if(var2 < var0) {
+            if (var2 < var0) {
                var3 = var4 <<= 14;
-               if(var1 < 0) {
+               if (var1 < 0) {
                   var3 -= var7 * var1;
                   var4 -= var8 * var1;
                   var1 = 0;
                }
 
                var5 <<= 14;
-               if(var2 < 0) {
+               if (var2 < 0) {
                   var5 -= var9 * var2;
                   var2 = 0;
                }
 
-               if((var2 == var1 || var7 >= var8) && (var2 != var1 || var7 <= var9)) {
+               if ((var2 == var1 || var7 >= var8) && (var2 != var1 || var7 <= var9)) {
                   var0 -= var2;
                   var2 -= var1;
                   var1 = Rasterizer3D_rowOffsets[var1];
 
-                  while(true) {
+                  while (true) {
                      --var2;
-                     if(var2 < 0) {
-                        while(true) {
+                     if (var2 < 0) {
+                        while (true) {
                            --var0;
-                           if(var0 < 0) {
+                           if (var0 < 0) {
                               return;
                            }
 
@@ -1083,136 +1053,136 @@ public class Rasterizer3D extends Rasterizer2D {
                      var4 += var8;
                      var1 += Rasterizer2D.Rasterizer2D_width;
                   }
-               } else {
-                  var0 -= var2;
-                  var2 -= var1;
-                  var1 = Rasterizer3D_rowOffsets[var1];
-
-                  while(true) {
-                     --var2;
-                     if(var2 < 0) {
-                        while(true) {
-                           --var0;
-                           if(var0 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14);
-                           var3 += var7;
-                           var5 += var9;
-                           var1 += Rasterizer2D.Rasterizer2D_width;
-                        }
-                     }
-
-                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14);
-                     var3 += var7;
-                     var4 += var8;
-                     var1 += Rasterizer2D.Rasterizer2D_width;
-                  }
-               }
-            } else {
-               var5 = var4 <<= 14;
-               if(var1 < 0) {
-                  var5 -= var7 * var1;
-                  var4 -= var8 * var1;
-                  var1 = 0;
                }
 
-               var3 <<= 14;
-               if(var0 < 0) {
-                  var3 -= var0 * var9;
-                  var0 = 0;
-               }
+               var0 -= var2;
+               var2 -= var1;
+               var1 = Rasterizer3D_rowOffsets[var1];
 
-               if(var7 < var8) {
-                  var2 -= var0;
-                  var0 -= var1;
-                  var1 = Rasterizer3D_rowOffsets[var1];
-
-                  while(true) {
-                     --var0;
-                     if(var0 < 0) {
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14);
-                           var3 += var9;
-                           var4 += var8;
-                           var1 += Rasterizer2D.Rasterizer2D_width;
+               while (true) {
+                  --var2;
+                  if (var2 < 0) {
+                     while (true) {
+                        --var0;
+                        if (var0 < 0) {
+                           return;
                         }
+
+                        Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14);
+                        var3 += var7;
+                        var5 += var9;
+                        var1 += Rasterizer2D.Rasterizer2D_width;
                      }
-
-                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14);
-                     var5 += var7;
-                     var4 += var8;
-                     var1 += Rasterizer2D.Rasterizer2D_width;
                   }
-               } else {
-                  var2 -= var0;
-                  var0 -= var1;
-                  var1 = Rasterizer3D_rowOffsets[var1];
 
-                  while(true) {
-                     --var0;
-                     if(var0 < 0) {
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14);
-                           var3 += var9;
-                           var4 += var8;
-                           var1 += Rasterizer2D.Rasterizer2D_width;
-                        }
-                     }
-
-                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14);
-                     var5 += var7;
-                     var4 += var8;
-                     var1 += Rasterizer2D.Rasterizer2D_width;
-                  }
+                  Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14);
+                  var3 += var7;
+                  var4 += var8;
+                  var1 += Rasterizer2D.Rasterizer2D_width;
                }
             }
+
+            var5 = var4 <<= 14;
+            if (var1 < 0) {
+               var5 -= var7 * var1;
+               var4 -= var8 * var1;
+               var1 = 0;
+            }
+
+            var3 <<= 14;
+            if (var0 < 0) {
+               var3 -= var0 * var9;
+               var0 = 0;
+            }
+
+            if (var7 < var8) {
+               var2 -= var0;
+               var0 -= var1;
+               var1 = Rasterizer3D_rowOffsets[var1];
+
+               while (true) {
+                  --var0;
+                  if (var0 < 0) {
+                     while (true) {
+                        --var2;
+                        if (var2 < 0) {
+                           return;
+                        }
+
+                        Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14);
+                        var3 += var9;
+                        var4 += var8;
+                        var1 += Rasterizer2D.Rasterizer2D_width;
+                     }
+                  }
+
+                  Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14);
+                  var5 += var7;
+                  var4 += var8;
+                  var1 += Rasterizer2D.Rasterizer2D_width;
+               }
+            }
+
+            var2 -= var0;
+            var0 -= var1;
+            var1 = Rasterizer3D_rowOffsets[var1];
+
+            while (true) {
+               --var0;
+               if (var0 < 0) {
+                  while (true) {
+                     --var2;
+                     if (var2 < 0) {
+                        return;
+                     }
+
+                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14);
+                     var3 += var9;
+                     var4 += var8;
+                     var1 += Rasterizer2D.Rasterizer2D_width;
+                  }
+               }
+
+               Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14);
+               var5 += var7;
+               var4 += var8;
+               var1 += Rasterizer2D.Rasterizer2D_width;
+            }
          }
-      } else if(var2 < Rasterizer3D_clipHeight) {
-         if(var0 > Rasterizer3D_clipHeight) {
+      } else if (var2 < Rasterizer3D_clipHeight) {
+         if (var0 > Rasterizer3D_clipHeight) {
             var0 = Rasterizer3D_clipHeight;
          }
 
-         if(var1 > Rasterizer3D_clipHeight) {
+         if (var1 > Rasterizer3D_clipHeight) {
             var1 = Rasterizer3D_clipHeight;
          }
 
-         if(var0 < var1) {
+         if (var0 < var1) {
             var4 = var5 <<= 14;
-            if(var2 < 0) {
+            if (var2 < 0) {
                var4 -= var8 * var2;
                var5 -= var9 * var2;
                var2 = 0;
             }
 
             var3 <<= 14;
-            if(var0 < 0) {
+            if (var0 < 0) {
                var3 -= var0 * var7;
                var0 = 0;
             }
 
-            if(var8 < var9) {
+            if (var8 < var9) {
                var1 -= var0;
                var0 -= var2;
                var2 = Rasterizer3D_rowOffsets[var2];
 
-               while(true) {
+               while (true) {
                   --var0;
-                  if(var0 < 0) {
-                     while(true) {
+                  if (var0 < 0) {
+                     while (true) {
                         --var1;
-                        if(var1 < 0) {
+                        if (var1 < 0) {
                            return;
                         }
 
@@ -1228,130 +1198,131 @@ public class Rasterizer3D extends Rasterizer2D {
                   var5 += var9;
                   var2 += Rasterizer2D.Rasterizer2D_width;
                }
-            } else {
-               var1 -= var0;
-               var0 -= var2;
-               var2 = Rasterizer3D_rowOffsets[var2];
+            }
 
-               while(true) {
-                  --var0;
-                  if(var0 < 0) {
-                     while(true) {
-                        --var1;
-                        if(var1 < 0) {
-                           return;
-                        }
+            var1 -= var0;
+            var0 -= var2;
+            var2 = Rasterizer3D_rowOffsets[var2];
 
-                        Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14);
-                        var4 += var8;
-                        var3 += var7;
-                        var2 += Rasterizer2D.Rasterizer2D_width;
+            while (true) {
+               --var0;
+               if (var0 < 0) {
+                  while (true) {
+                     --var1;
+                     if (var1 < 0) {
+                        return;
                      }
+
+                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14);
+                     var4 += var8;
+                     var3 += var7;
+                     var2 += Rasterizer2D.Rasterizer2D_width;
+                  }
+               }
+
+               Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14);
+               var4 += var8;
+               var5 += var9;
+               var2 += Rasterizer2D.Rasterizer2D_width;
+            }
+         }
+
+         var3 = var5 <<= 14;
+         if (var2 < 0) {
+            var3 -= var8 * var2;
+            var5 -= var9 * var2;
+            var2 = 0;
+         }
+
+         var4 <<= 14;
+         if (var1 < 0) {
+            var4 -= var7 * var1;
+            var1 = 0;
+         }
+
+         if (var8 < var9) {
+            var0 -= var1;
+            var1 -= var2;
+            var2 = Rasterizer3D_rowOffsets[var2];
+
+            while (true) {
+               --var1;
+               if (var1 < 0) {
+                  while (true) {
+                     --var0;
+                     if (var0 < 0) {
+                        return;
+                     }
+
+                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14);
+                     var4 += var7;
+                     var5 += var9;
+                     var2 += Rasterizer2D.Rasterizer2D_width;
+                  }
+               }
+
+               Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14);
+               var3 += var8;
+               var5 += var9;
+               var2 += Rasterizer2D.Rasterizer2D_width;
+            }
+         }
+
+         var0 -= var1;
+         var1 -= var2;
+         var2 = Rasterizer3D_rowOffsets[var2];
+
+         while (true) {
+            --var1;
+            if (var1 < 0) {
+               while (true) {
+                  --var0;
+                  if (var0 < 0) {
+                     return;
                   }
 
                   Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14);
-                  var4 += var8;
+                  var4 += var7;
                   var5 += var9;
                   var2 += Rasterizer2D.Rasterizer2D_width;
                }
             }
-         } else {
-            var3 = var5 <<= 14;
-            if(var2 < 0) {
-               var3 -= var8 * var2;
-               var5 -= var9 * var2;
-               var2 = 0;
-            }
 
-            var4 <<= 14;
-            if(var1 < 0) {
-               var4 -= var7 * var1;
-               var1 = 0;
-            }
-
-            if(var8 < var9) {
-               var0 -= var1;
-               var1 -= var2;
-               var2 = Rasterizer3D_rowOffsets[var2];
-
-               while(true) {
-                  --var1;
-                  if(var1 < 0) {
-                     while(true) {
-                        --var0;
-                        if(var0 < 0) {
-                           return;
-                        }
-
-                        Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14);
-                        var4 += var7;
-                        var5 += var9;
-                        var2 += Rasterizer2D.Rasterizer2D_width;
-                     }
-                  }
-
-                  Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14);
-                  var3 += var8;
-                  var5 += var9;
-                  var2 += Rasterizer2D.Rasterizer2D_width;
-               }
-            } else {
-               var0 -= var1;
-               var1 -= var2;
-               var2 = Rasterizer3D_rowOffsets[var2];
-
-               while(true) {
-                  --var1;
-                  if(var1 < 0) {
-                     while(true) {
-                        --var0;
-                        if(var0 < 0) {
-                           return;
-                        }
-
-                        Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14);
-                        var4 += var7;
-                        var5 += var9;
-                        var2 += Rasterizer2D.Rasterizer2D_width;
-                     }
-                  }
-
-                  Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14);
-                  var3 += var8;
-                  var5 += var9;
-                  var2 += Rasterizer2D.Rasterizer2D_width;
-               }
-            }
+            Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14);
+            var3 += var8;
+            var5 += var9;
+            var2 += Rasterizer2D.Rasterizer2D_width;
          }
       }
+
    }
 
    @ObfuscatedName("z")
    @Export("Rasterizer3D_horizAlpha")
    static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) {
-      if(__et_m) {
-         if(var5 > Rasterizer3D_clipWidth) {
+      if (field739) {
+         if (var5 > Rasterizer3D_clipWidth) {
             var5 = Rasterizer3D_clipWidth;
          }
 
-         if(var4 < 0) {
+         if (var4 < 0) {
             var4 = 0;
          }
       }
 
-      if(var4 < var5) {
+      if (var4 < var5) {
          var1 += var4;
          var3 = var5 - var4 >> 2;
-         if(Rasterizer3D_alpha != 0) {
-            if(Rasterizer3D_alpha == 254) {
-               while(true) {
+         if (Rasterizer3D_alpha != 0) {
+            if (Rasterizer3D_alpha == 254) {
+               while (true) {
                   --var3;
-                  if(var3 < 0) {
+                  if (var3 < 0) {
                      var3 = var5 - var4 & 3;
 
-                     while(true) {
+                     while (true) {
                         --var3;
-                        if(var3 < 0) {
+                        if (var3 < 0) {
                            return;
                         }
 
@@ -1369,15 +1340,15 @@ public class Rasterizer3D extends Rasterizer2D {
                int var7 = 256 - Rasterizer3D_alpha;
                var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935);
 
-               while(true) {
+               while (true) {
                   --var3;
                   int var8;
-                  if(var3 < 0) {
+                  if (var3 < 0) {
                      var3 = var5 - var4 & 3;
 
-                     while(true) {
+                     while (true) {
                         --var3;
-                        if(var3 < 0) {
+                        if (var3 < 0) {
                            return;
                         }
 
@@ -1397,14 +1368,14 @@ public class Rasterizer3D extends Rasterizer2D {
                }
             }
          } else {
-            while(true) {
+            while (true) {
                --var3;
-               if(var3 < 0) {
+               if (var3 < 0) {
                   var3 = var5 - var4 & 3;
 
-                  while(true) {
+                  while (true) {
                      --var3;
-                     if(var3 < 0) {
+                     if (var3 < 0) {
                         return;
                      }
 
@@ -1425,12 +1396,12 @@ public class Rasterizer3D extends Rasterizer2D {
    static final void method2986(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) {
       int[] var19 = Rasterizer3D_textureLoader.load(var18);
       int var20;
-      if(var19 == null) {
-         var20 = Rasterizer3D_textureLoader.__w_213(var18);
+      if (var19 == null) {
+         var20 = Rasterizer3D_textureLoader.vmethod324(var18);
          method3037(var0, var1, var2, var3, var4, var5, method3040(var20, var6), method3040(var20, var7), method3040(var20, var8));
       } else {
          Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18);
-         __et_f = Rasterizer3D_textureLoader.__o_214(var18);
+         field740 = Rasterizer3D_textureLoader.vmethod325(var18);
          var20 = var4 - var3;
          int var21 = var1 - var0;
          int var22 = var5 - var3;
@@ -1438,22 +1409,22 @@ public class Rasterizer3D extends Rasterizer2D {
          int var24 = var7 - var6;
          int var25 = var8 - var6;
          int var26 = 0;
-         if(var0 != var1) {
+         if (var0 != var1) {
             var26 = (var4 - var3 << 14) / (var1 - var0);
          }
 
          int var27 = 0;
-         if(var2 != var1) {
+         if (var2 != var1) {
             var27 = (var5 - var4 << 14) / (var2 - var1);
          }
 
          int var28 = 0;
-         if(var0 != var2) {
+         if (var0 != var2) {
             var28 = (var3 - var5 << 14) / (var0 - var2);
          }
 
          int var29 = var20 * var23 - var22 * var21;
-         if(var29 != 0) {
+         if (var29 != 0) {
             int var30 = (var24 * var23 - var25 * var21 << 9) / var29;
             int var31 = (var25 * var20 - var24 * var22 << 9) / var29;
             var10 = var9 - var10;
@@ -1472,20 +1443,20 @@ public class Rasterizer3D extends Rasterizer2D {
             int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom);
             int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom);
             int var41;
-            if(var0 <= var1 && var0 <= var2) {
-               if(var0 < Rasterizer3D_clipHeight) {
-                  if(var1 > Rasterizer3D_clipHeight) {
+            if (var0 <= var1 && var0 <= var2) {
+               if (var0 < Rasterizer3D_clipHeight) {
+                  if (var1 > Rasterizer3D_clipHeight) {
                      var1 = Rasterizer3D_clipHeight;
                   }
 
-                  if(var2 > Rasterizer3D_clipHeight) {
+                  if (var2 > Rasterizer3D_clipHeight) {
                      var2 = Rasterizer3D_clipHeight;
                   }
 
                   var6 = var30 + ((var6 << 9) - var3 * var30);
-                  if(var1 < var2) {
+                  if (var1 < var2) {
                      var5 = var3 <<= 14;
-                     if(var0 < 0) {
+                     if (var0 < 0) {
                         var5 -= var0 * var28;
                         var3 -= var0 * var26;
                         var6 -= var0 * var31;
@@ -1493,7 +1464,7 @@ public class Rasterizer3D extends Rasterizer2D {
                      }
 
                      var4 <<= 14;
-                     if(var1 < 0) {
+                     if (var1 < 0) {
                         var4 -= var27 * var1;
                         var1 = 0;
                      }
@@ -1502,17 +1473,17 @@ public class Rasterizer3D extends Rasterizer2D {
                      var32 += var34 * var41;
                      var35 += var37 * var41;
                      var38 += var40 * var41;
-                     if(var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) {
+                     if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) {
                         var2 -= var1;
                         var1 -= var0;
                         var0 = Rasterizer3D_rowOffsets[var0];
 
-                        while(true) {
+                        while (true) {
                            --var1;
-                           if(var1 < 0) {
-                              while(true) {
+                           if (var1 < 0) {
+                              while (true) {
                                  --var2;
-                                 if(var2 < 0) {
+                                 if (var2 < 0) {
                                     return;
                                  }
 
@@ -1536,33 +1507,112 @@ public class Rasterizer3D extends Rasterizer2D {
                            var35 += var37;
                            var38 += var40;
                         }
-                     } else {
-                        var2 -= var1;
-                        var1 -= var0;
-                        var0 = Rasterizer3D_rowOffsets[var0];
+                     }
 
-                        while(true) {
-                           --var1;
-                           if(var1 < 0) {
-                              while(true) {
-                                 --var2;
-                                 if(var2 < 0) {
-                                    return;
-                                 }
+                     var2 -= var1;
+                     var1 -= var0;
+                     var0 = Rasterizer3D_rowOffsets[var0];
 
-                                 Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                                 var5 += var28;
-                                 var4 += var27;
-                                 var6 += var31;
-                                 var0 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
+                     while (true) {
+                        --var1;
+                        if (var1 < 0) {
+                           while (true) {
+                              --var2;
+                              if (var2 < 0) {
+                                 return;
                               }
+
+                              Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                              var5 += var28;
+                              var4 += var27;
+                              var6 += var31;
+                              var0 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                        var5 += var28;
+                        var3 += var26;
+                        var6 += var31;
+                        var0 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var4 = var3 <<= 14;
+                  if (var0 < 0) {
+                     var4 -= var0 * var28;
+                     var3 -= var0 * var26;
+                     var6 -= var0 * var31;
+                     var0 = 0;
+                  }
+
+                  var5 <<= 14;
+                  if (var2 < 0) {
+                     var5 -= var27 * var2;
+                     var2 = 0;
+                  }
+
+                  var41 = var0 - Rasterizer3D_clipMidY;
+                  var32 += var34 * var41;
+                  var35 += var37 * var41;
+                  var38 += var40 * var41;
+                  if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) {
+                     var1 -= var2;
+                     var2 -= var0;
+                     var0 = Rasterizer3D_rowOffsets[var0];
+
+                     while (true) {
+                        --var2;
+                        if (var2 < 0) {
+                           while (true) {
+                              --var1;
+                              if (var1 < 0) {
+                                 return;
+                              }
+
+                              Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                              var5 += var27;
+                              var3 += var26;
+                              var6 += var31;
+                              var0 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                        var4 += var28;
+                        var3 += var26;
+                        var6 += var31;
+                        var0 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var1 -= var2;
+                  var2 -= var0;
+                  var0 = Rasterizer3D_rowOffsets[var0];
+
+                  while (true) {
+                     --var2;
+                     if (var2 < 0) {
+                        while (true) {
+                           --var1;
+                           if (var1 < 0) {
+                              return;
                            }
 
                            Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                           var5 += var28;
+                           var5 += var27;
                            var3 += var26;
                            var6 += var31;
                            var0 += Rasterizer2D.Rasterizer2D_width;
@@ -1571,110 +1621,31 @@ public class Rasterizer3D extends Rasterizer2D {
                            var38 += var40;
                         }
                      }
-                  } else {
-                     var4 = var3 <<= 14;
-                     if(var0 < 0) {
-                        var4 -= var0 * var28;
-                        var3 -= var0 * var26;
-                        var6 -= var0 * var31;
-                        var0 = 0;
-                     }
 
-                     var5 <<= 14;
-                     if(var2 < 0) {
-                        var5 -= var27 * var2;
-                        var2 = 0;
-                     }
-
-                     var41 = var0 - Rasterizer3D_clipMidY;
-                     var32 += var34 * var41;
-                     var35 += var37 * var41;
-                     var38 += var40 * var41;
-                     if(var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) {
-                        var1 -= var2;
-                        var2 -= var0;
-                        var0 = Rasterizer3D_rowOffsets[var0];
-
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              while(true) {
-                                 --var1;
-                                 if(var1 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                                 var5 += var27;
-                                 var3 += var26;
-                                 var6 += var31;
-                                 var0 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                           var4 += var28;
-                           var3 += var26;
-                           var6 += var31;
-                           var0 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     } else {
-                        var1 -= var2;
-                        var2 -= var0;
-                        var0 = Rasterizer3D_rowOffsets[var0];
-
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              while(true) {
-                                 --var1;
-                                 if(var1 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                                 var5 += var27;
-                                 var3 += var26;
-                                 var6 += var31;
-                                 var0 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                           var4 += var28;
-                           var3 += var26;
-                           var6 += var31;
-                           var0 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     }
+                     Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                     var4 += var28;
+                     var3 += var26;
+                     var6 += var31;
+                     var0 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
                   }
                }
-            } else if(var1 <= var2) {
-               if(var1 < Rasterizer3D_clipHeight) {
-                  if(var2 > Rasterizer3D_clipHeight) {
+            } else if (var1 <= var2) {
+               if (var1 < Rasterizer3D_clipHeight) {
+                  if (var2 > Rasterizer3D_clipHeight) {
                      var2 = Rasterizer3D_clipHeight;
                   }
 
-                  if(var0 > Rasterizer3D_clipHeight) {
+                  if (var0 > Rasterizer3D_clipHeight) {
                      var0 = Rasterizer3D_clipHeight;
                   }
 
                   var7 = var30 + ((var7 << 9) - var30 * var4);
-                  if(var2 < var0) {
+                  if (var2 < var0) {
                      var3 = var4 <<= 14;
-                     if(var1 < 0) {
+                     if (var1 < 0) {
                         var3 -= var26 * var1;
                         var4 -= var27 * var1;
                         var7 -= var31 * var1;
@@ -1682,7 +1653,7 @@ public class Rasterizer3D extends Rasterizer2D {
                      }
 
                      var5 <<= 14;
-                     if(var2 < 0) {
+                     if (var2 < 0) {
                         var5 -= var28 * var2;
                         var2 = 0;
                      }
@@ -1691,17 +1662,17 @@ public class Rasterizer3D extends Rasterizer2D {
                      var32 += var34 * var41;
                      var35 += var37 * var41;
                      var38 += var40 * var41;
-                     if(var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) {
+                     if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) {
                         var0 -= var2;
                         var2 -= var1;
                         var1 = Rasterizer3D_rowOffsets[var1];
 
-                        while(true) {
+                        while (true) {
                            --var2;
-                           if(var2 < 0) {
-                              while(true) {
+                           if (var2 < 0) {
+                              while (true) {
                                  --var0;
-                                 if(var0 < 0) {
+                                 if (var0 < 0) {
                                     return;
                                  }
 
@@ -1725,33 +1696,112 @@ public class Rasterizer3D extends Rasterizer2D {
                            var35 += var37;
                            var38 += var40;
                         }
-                     } else {
-                        var0 -= var2;
-                        var2 -= var1;
-                        var1 = Rasterizer3D_rowOffsets[var1];
+                     }
 
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              while(true) {
-                                 --var0;
-                                 if(var0 < 0) {
-                                    return;
-                                 }
+                     var0 -= var2;
+                     var2 -= var1;
+                     var1 = Rasterizer3D_rowOffsets[var1];
 
-                                 Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                                 var3 += var26;
-                                 var5 += var28;
-                                 var7 += var31;
-                                 var1 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
+                     while (true) {
+                        --var2;
+                        if (var2 < 0) {
+                           while (true) {
+                              --var0;
+                              if (var0 < 0) {
+                                 return;
                               }
+
+                              Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                              var3 += var26;
+                              var5 += var28;
+                              var7 += var31;
+                              var1 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                        var3 += var26;
+                        var4 += var27;
+                        var7 += var31;
+                        var1 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var5 = var4 <<= 14;
+                  if (var1 < 0) {
+                     var5 -= var26 * var1;
+                     var4 -= var27 * var1;
+                     var7 -= var31 * var1;
+                     var1 = 0;
+                  }
+
+                  var3 <<= 14;
+                  if (var0 < 0) {
+                     var3 -= var0 * var28;
+                     var0 = 0;
+                  }
+
+                  var41 = var1 - Rasterizer3D_clipMidY;
+                  var32 += var34 * var41;
+                  var35 += var37 * var41;
+                  var38 += var40 * var41;
+                  if (var26 < var27) {
+                     var2 -= var0;
+                     var0 -= var1;
+                     var1 = Rasterizer3D_rowOffsets[var1];
+
+                     while (true) {
+                        --var0;
+                        if (var0 < 0) {
+                           while (true) {
+                              --var2;
+                              if (var2 < 0) {
+                                 return;
+                              }
+
+                              Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                              var3 += var28;
+                              var4 += var27;
+                              var7 += var31;
+                              var1 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                        var5 += var26;
+                        var4 += var27;
+                        var7 += var31;
+                        var1 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var2 -= var0;
+                  var0 -= var1;
+                  var1 = Rasterizer3D_rowOffsets[var1];
+
+                  while (true) {
+                     --var0;
+                     if (var0 < 0) {
+                        while (true) {
+                           --var2;
+                           if (var2 < 0) {
+                              return;
                            }
 
                            Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                           var3 += var26;
+                           var3 += var28;
                            var4 += var27;
                            var7 += var31;
                            var1 += Rasterizer2D.Rasterizer2D_width;
@@ -1760,109 +1810,30 @@ public class Rasterizer3D extends Rasterizer2D {
                            var38 += var40;
                         }
                      }
-                  } else {
-                     var5 = var4 <<= 14;
-                     if(var1 < 0) {
-                        var5 -= var26 * var1;
-                        var4 -= var27 * var1;
-                        var7 -= var31 * var1;
-                        var1 = 0;
-                     }
 
-                     var3 <<= 14;
-                     if(var0 < 0) {
-                        var3 -= var0 * var28;
-                        var0 = 0;
-                     }
-
-                     var41 = var1 - Rasterizer3D_clipMidY;
-                     var32 += var34 * var41;
-                     var35 += var37 * var41;
-                     var38 += var40 * var41;
-                     if(var26 < var27) {
-                        var2 -= var0;
-                        var0 -= var1;
-                        var1 = Rasterizer3D_rowOffsets[var1];
-
-                        while(true) {
-                           --var0;
-                           if(var0 < 0) {
-                              while(true) {
-                                 --var2;
-                                 if(var2 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                                 var3 += var28;
-                                 var4 += var27;
-                                 var7 += var31;
-                                 var1 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                           var5 += var26;
-                           var4 += var27;
-                           var7 += var31;
-                           var1 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     } else {
-                        var2 -= var0;
-                        var0 -= var1;
-                        var1 = Rasterizer3D_rowOffsets[var1];
-
-                        while(true) {
-                           --var0;
-                           if(var0 < 0) {
-                              while(true) {
-                                 --var2;
-                                 if(var2 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                                 var3 += var28;
-                                 var4 += var27;
-                                 var7 += var31;
-                                 var1 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                           var5 += var26;
-                           var4 += var27;
-                           var7 += var31;
-                           var1 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     }
+                     Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                     var5 += var26;
+                     var4 += var27;
+                     var7 += var31;
+                     var1 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
                   }
                }
-            } else if(var2 < Rasterizer3D_clipHeight) {
-               if(var0 > Rasterizer3D_clipHeight) {
+            } else if (var2 < Rasterizer3D_clipHeight) {
+               if (var0 > Rasterizer3D_clipHeight) {
                   var0 = Rasterizer3D_clipHeight;
                }
 
-               if(var1 > Rasterizer3D_clipHeight) {
+               if (var1 > Rasterizer3D_clipHeight) {
                   var1 = Rasterizer3D_clipHeight;
                }
 
                var8 = (var8 << 9) - var5 * var30 + var30;
-               if(var0 < var1) {
+               if (var0 < var1) {
                   var4 = var5 <<= 14;
-                  if(var2 < 0) {
+                  if (var2 < 0) {
                      var4 -= var27 * var2;
                      var5 -= var28 * var2;
                      var8 -= var31 * var2;
@@ -1870,7 +1841,7 @@ public class Rasterizer3D extends Rasterizer2D {
                   }
 
                   var3 <<= 14;
-                  if(var0 < 0) {
+                  if (var0 < 0) {
                      var3 -= var0 * var26;
                      var0 = 0;
                   }
@@ -1879,17 +1850,17 @@ public class Rasterizer3D extends Rasterizer2D {
                   var32 += var34 * var41;
                   var35 += var37 * var41;
                   var38 += var40 * var41;
-                  if(var27 < var28) {
+                  if (var27 < var28) {
                      var1 -= var0;
                      var0 -= var2;
                      var2 = Rasterizer3D_rowOffsets[var2];
 
-                     while(true) {
+                     while (true) {
                         --var0;
-                        if(var0 < 0) {
-                           while(true) {
+                        if (var0 < 0) {
+                           while (true) {
                               --var1;
-                              if(var1 < 0) {
+                              if (var1 < 0) {
                                  return;
                               }
 
@@ -1913,33 +1884,112 @@ public class Rasterizer3D extends Rasterizer2D {
                         var35 += var37;
                         var38 += var40;
                      }
-                  } else {
-                     var1 -= var0;
-                     var0 -= var2;
-                     var2 = Rasterizer3D_rowOffsets[var2];
+                  }
 
-                     while(true) {
-                        --var0;
-                        if(var0 < 0) {
-                           while(true) {
-                              --var1;
-                              if(var1 < 0) {
-                                 return;
-                              }
+                  var1 -= var0;
+                  var0 -= var2;
+                  var2 = Rasterizer3D_rowOffsets[var2];
 
-                              Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                              var4 += var27;
-                              var3 += var26;
-                              var8 += var31;
-                              var2 += Rasterizer2D.Rasterizer2D_width;
-                              var32 += var34;
-                              var35 += var37;
-                              var38 += var40;
+                  while (true) {
+                     --var0;
+                     if (var0 < 0) {
+                        while (true) {
+                           --var1;
+                           if (var1 < 0) {
+                              return;
                            }
+
+                           Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                           var4 += var27;
+                           var3 += var26;
+                           var8 += var31;
+                           var2 += Rasterizer2D.Rasterizer2D_width;
+                           var32 += var34;
+                           var35 += var37;
+                           var38 += var40;
+                        }
+                     }
+
+                     Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                     var4 += var27;
+                     var5 += var28;
+                     var8 += var31;
+                     var2 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
+                  }
+               }
+
+               var3 = var5 <<= 14;
+               if (var2 < 0) {
+                  var3 -= var27 * var2;
+                  var5 -= var28 * var2;
+                  var8 -= var31 * var2;
+                  var2 = 0;
+               }
+
+               var4 <<= 14;
+               if (var1 < 0) {
+                  var4 -= var26 * var1;
+                  var1 = 0;
+               }
+
+               var41 = var2 - Rasterizer3D_clipMidY;
+               var32 += var34 * var41;
+               var35 += var37 * var41;
+               var38 += var40 * var41;
+               if (var27 < var28) {
+                  var0 -= var1;
+                  var1 -= var2;
+                  var2 = Rasterizer3D_rowOffsets[var2];
+
+                  while (true) {
+                     --var1;
+                     if (var1 < 0) {
+                        while (true) {
+                           --var0;
+                           if (var0 < 0) {
+                              return;
+                           }
+
+                           Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                           var4 += var26;
+                           var5 += var28;
+                           var8 += var31;
+                           var2 += Rasterizer2D.Rasterizer2D_width;
+                           var32 += var34;
+                           var35 += var37;
+                           var38 += var40;
+                        }
+                     }
+
+                     Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                     var3 += var27;
+                     var5 += var28;
+                     var8 += var31;
+                     var2 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
+                  }
+               }
+
+               var0 -= var1;
+               var1 -= var2;
+               var2 = Rasterizer3D_rowOffsets[var2];
+
+               while (true) {
+                  --var1;
+                  if (var1 < 0) {
+                     while (true) {
+                        --var0;
+                        if (var0 < 0) {
+                           return;
                         }
 
                         Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                        var4 += var27;
+                        var4 += var26;
                         var5 += var28;
                         var8 += var31;
                         var2 += Rasterizer2D.Rasterizer2D_width;
@@ -1948,531 +1998,453 @@ public class Rasterizer3D extends Rasterizer2D {
                         var38 += var40;
                      }
                   }
-               } else {
-                  var3 = var5 <<= 14;
-                  if(var2 < 0) {
-                     var3 -= var27 * var2;
-                     var5 -= var28 * var2;
-                     var8 -= var31 * var2;
-                     var2 = 0;
-                  }
 
-                  var4 <<= 14;
-                  if(var1 < 0) {
-                     var4 -= var26 * var1;
-                     var1 = 0;
-                  }
-
-                  var41 = var2 - Rasterizer3D_clipMidY;
-                  var32 += var34 * var41;
-                  var35 += var37 * var41;
-                  var38 += var40 * var41;
-                  if(var27 < var28) {
-                     var0 -= var1;
-                     var1 -= var2;
-                     var2 = Rasterizer3D_rowOffsets[var2];
-
-                     while(true) {
-                        --var1;
-                        if(var1 < 0) {
-                           while(true) {
-                              --var0;
-                              if(var0 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                              var4 += var26;
-                              var5 += var28;
-                              var8 += var31;
-                              var2 += Rasterizer2D.Rasterizer2D_width;
-                              var32 += var34;
-                              var35 += var37;
-                              var38 += var40;
-                           }
-                        }
-
-                        Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                        var3 += var27;
-                        var5 += var28;
-                        var8 += var31;
-                        var2 += Rasterizer2D.Rasterizer2D_width;
-                        var32 += var34;
-                        var35 += var37;
-                        var38 += var40;
-                     }
-                  } else {
-                     var0 -= var1;
-                     var1 -= var2;
-                     var2 = Rasterizer3D_rowOffsets[var2];
-
-                     while(true) {
-                        --var1;
-                        if(var1 < 0) {
-                           while(true) {
-                              --var0;
-                              if(var0 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                              var4 += var26;
-                              var5 += var28;
-                              var8 += var31;
-                              var2 += Rasterizer2D.Rasterizer2D_width;
-                              var32 += var34;
-                              var35 += var37;
-                              var38 += var40;
-                           }
-                        }
-
-                        Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                        var3 += var27;
-                        var5 += var28;
-                        var8 += var31;
-                        var2 += Rasterizer2D.Rasterizer2D_width;
-                        var32 += var34;
-                        var35 += var37;
-                        var38 += var40;
-                     }
-                  }
+                  Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                  var3 += var27;
+                  var5 += var28;
+                  var8 += var31;
+                  var2 += Rasterizer2D.Rasterizer2D_width;
+                  var32 += var34;
+                  var35 += var37;
+                  var38 += var40;
                }
             }
          }
       }
+
    }
 
    @ObfuscatedName("s")
    @Export("Rasterizer3D_iDontKnow")
    static final void Rasterizer3D_iDontKnow(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) {
-      if(__et_m) {
-         if(var6 > Rasterizer3D_clipWidth) {
+      if (field739) {
+         if (var6 > Rasterizer3D_clipWidth) {
             var6 = Rasterizer3D_clipWidth;
          }
 
-         if(var5 < 0) {
+         if (var5 < 0) {
             var5 = 0;
          }
       }
 
-      if(var5 < var6) {
+      if (var5 < var6) {
          var4 += var5;
          var7 += var5 * var8;
-         int var17 = var6 - var5;
-         int var15;
+         int var15 = var6 - var5;
          int var16;
          int var10000;
-         int var18;
+         int var17;
          int var19;
          int var20;
          int var21;
          int var22;
          int var23;
-         if(Rasterizer3D_isLowDetailTexture) {
-            var23 = var5 - Rasterizer3D_clipMidX;
-            var9 += var23 * (var12 >> 3);
-            var10 += (var13 >> 3) * var23;
-            var11 += var23 * (var14 >> 3);
-            var22 = var11 >> 12;
-            if(var22 != 0) {
-               var18 = var9 / var22;
-               var19 = var10 / var22;
-               if(var18 < 0) {
-                  var18 = 0;
-               } else if(var18 > 4032) {
-                  var18 = 4032;
+         int var24;
+         if (Rasterizer3D_isLowDetailTexture) {
+            var24 = var5 - Rasterizer3D_clipMidX;
+            var9 += var24 * (var12 >> 3);
+            var10 += (var13 >> 3) * var24;
+            var11 += var24 * (var14 >> 3);
+            var23 = var11 >> 12;
+            if (var23 != 0) {
+               var19 = var9 / var23;
+               var20 = var10 / var23;
+               if (var19 < 0) {
+                  var19 = 0;
+               } else if (var19 > 4032) {
+                  var19 = 4032;
                }
             } else {
-               var18 = 0;
                var19 = 0;
+               var20 = 0;
             }
 
             var9 += var12;
             var10 += var13;
             var11 += var14;
-            var22 = var11 >> 12;
-            if(var22 != 0) {
-               var20 = var9 / var22;
-               var21 = var10 / var22;
-               if(var20 < 0) {
-                  var20 = 0;
-               } else if(var20 > 4032) {
-                  var20 = 4032;
+            var23 = var11 >> 12;
+            if (var23 != 0) {
+               var21 = var9 / var23;
+               var22 = var10 / var23;
+               if (var21 < 0) {
+                  var21 = 0;
+               } else if (var21 > 4032) {
+                  var21 = 4032;
                }
             } else {
-               var20 = 0;
                var21 = 0;
+               var22 = 0;
             }
 
-            var2 = (var18 << 20) + var19;
-            var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20);
-            var17 >>= 3;
+            var2 = (var19 << 20) + var20;
+            var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20);
+            var15 >>= 3;
             var8 <<= 3;
-            var15 = var7 >> 8;
-            if(__et_f) {
-               if(var17 > 0) {
+            var16 = var7 >> 8;
+            if (field740) {
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var10000 = var16 + var2;
-                     var18 = var20;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var10000 = var17 + var2;
                      var19 = var21;
+                     var20 = var22;
                      var9 += var12;
                      var10 += var13;
                      var11 += var14;
-                     var22 = var11 >> 12;
-                     if(var22 != 0) {
-                        var20 = var9 / var22;
-                        var21 = var10 / var22;
-                        if(var20 < 0) {
-                           var20 = 0;
-                        } else if(var20 > 4032) {
-                           var20 = 4032;
+                     var23 = var11 >> 12;
+                     if (var23 != 0) {
+                        var21 = var9 / var23;
+                        var22 = var10 / var23;
+                        if (var21 < 0) {
+                           var21 = 0;
+                        } else if (var21 > 4032) {
+                           var21 = 4032;
                         }
                      } else {
-                        var20 = 0;
                         var21 = 0;
+                        var22 = 0;
                      }
 
-                     var2 = (var18 << 20) + var19;
-                     var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20);
+                     var2 = (var19 << 20) + var20;
+                     var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20);
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
+                     --var15;
+                  } while(var15 > 0);
                }
             } else {
-               if(var17 > 0) {
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var10000 = var16 + var2;
-                     var18 = var20;
+                     var10000 = var17 + var2;
                      var19 = var21;
+                     var20 = var22;
                      var9 += var12;
                      var10 += var13;
                      var11 += var14;
-                     var22 = var11 >> 12;
-                     if(var22 != 0) {
-                        var20 = var9 / var22;
-                        var21 = var10 / var22;
-                        if(var20 < 0) {
-                           var20 = 0;
-                        } else if(var20 > 4032) {
-                           var20 = 4032;
+                     var23 = var11 >> 12;
+                     if (var23 != 0) {
+                        var21 = var9 / var23;
+                        var22 = var10 / var23;
+                        if (var21 < 0) {
+                           var21 = 0;
+                        } else if (var21 > 4032) {
+                           var21 = 4032;
                         }
                      } else {
-                        var20 = 0;
                         var21 = 0;
+                        var22 = 0;
                      }
 
-                     var2 = (var18 << 20) + var19;
-                     var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20);
+                     var2 = (var19 << 20) + var20;
+                     var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20);
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var2 += var17;
+                     --var15;
+                  } while(var15 > 0);
                }
             }
          } else {
-            var23 = var5 - Rasterizer3D_clipMidX;
-            var9 += var23 * (var12 >> 3);
-            var10 += (var13 >> 3) * var23;
-            var11 += var23 * (var14 >> 3);
-            var22 = var11 >> 14;
-            if(var22 != 0) {
-               var18 = var9 / var22;
-               var19 = var10 / var22;
-               if(var18 < 0) {
-                  var18 = 0;
-               } else if(var18 > 16256) {
-                  var18 = 16256;
+            var24 = var5 - Rasterizer3D_clipMidX;
+            var9 += var24 * (var12 >> 3);
+            var10 += (var13 >> 3) * var24;
+            var11 += var24 * (var14 >> 3);
+            var23 = var11 >> 14;
+            if (var23 != 0) {
+               var19 = var9 / var23;
+               var20 = var10 / var23;
+               if (var19 < 0) {
+                  var19 = 0;
+               } else if (var19 > 16256) {
+                  var19 = 16256;
                }
             } else {
-               var18 = 0;
                var19 = 0;
+               var20 = 0;
             }
 
             var9 += var12;
             var10 += var13;
             var11 += var14;
-            var22 = var11 >> 14;
-            if(var22 != 0) {
-               var20 = var9 / var22;
-               var21 = var10 / var22;
-               if(var20 < 0) {
-                  var20 = 0;
-               } else if(var20 > 16256) {
-                  var20 = 16256;
+            var23 = var11 >> 14;
+            if (var23 != 0) {
+               var21 = var9 / var23;
+               var22 = var10 / var23;
+               if (var21 < 0) {
+                  var21 = 0;
+               } else if (var21 > 16256) {
+                  var21 = 16256;
                }
             } else {
-               var20 = 0;
                var21 = 0;
+               var22 = 0;
             }
 
-            var2 = (var18 << 18) + var19;
-            var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18);
-            var17 >>= 3;
+            var2 = (var19 << 18) + var20;
+            var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18);
+            var15 >>= 3;
             var8 <<= 3;
-            var15 = var7 >> 8;
-            if(__et_f) {
-               if(var17 > 0) {
+            var16 = var7 >> 8;
+            if (field740) {
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var10000 = var16 + var2;
-                     var18 = var20;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var10000 = var17 + var2;
                      var19 = var21;
+                     var20 = var22;
                      var9 += var12;
                      var10 += var13;
                      var11 += var14;
-                     var22 = var11 >> 14;
-                     if(var22 != 0) {
-                        var20 = var9 / var22;
-                        var21 = var10 / var22;
-                        if(var20 < 0) {
-                           var20 = 0;
-                        } else if(var20 > 16256) {
-                           var20 = 16256;
+                     var23 = var11 >> 14;
+                     if (var23 != 0) {
+                        var21 = var9 / var23;
+                        var22 = var10 / var23;
+                        if (var21 < 0) {
+                           var21 = 0;
+                        } else if (var21 > 16256) {
+                           var21 = 16256;
                         }
                      } else {
-                        var20 = 0;
                         var21 = 0;
+                        var22 = 0;
                      }
 
-                     var2 = (var18 << 18) + var19;
-                     var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18);
+                     var2 = (var19 << 18) + var20;
+                     var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18);
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
+                     --var15;
+                  } while(var15 > 0);
                }
             } else {
-               if(var17 > 0) {
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var10000 = var16 + var2;
-                     var18 = var20;
+                     var10000 = var17 + var2;
                      var19 = var21;
+                     var20 = var22;
                      var9 += var12;
                      var10 += var13;
                      var11 += var14;
-                     var22 = var11 >> 14;
-                     if(var22 != 0) {
-                        var20 = var9 / var22;
-                        var21 = var10 / var22;
-                        if(var20 < 0) {
-                           var20 = 0;
-                        } else if(var20 > 16256) {
-                           var20 = 16256;
+                     var23 = var11 >> 14;
+                     if (var23 != 0) {
+                        var21 = var9 / var23;
+                        var22 = var10 / var23;
+                        if (var21 < 0) {
+                           var21 = 0;
+                        } else if (var21 > 16256) {
+                           var21 = 16256;
                         }
                      } else {
-                        var20 = 0;
                         var21 = 0;
+                        var22 = 0;
                      }
 
-                     var2 = (var18 << 18) + var19;
-                     var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18);
+                     var2 = (var19 << 18) + var20;
+                     var17 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18);
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var2 += var17;
+                     --var15;
+                  } while(var15 > 0);
                }
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("t")
    static final void method3012(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 = Rasterizer3D_textureLoader.load(var18);
       int var20;
-      if(var19 == null) {
-         var20 = Rasterizer3D_textureLoader.__w_213(var18);
+      if (var19 == null) {
+         var20 = Rasterizer3D_textureLoader.vmethod324(var18);
          method3037(var0, var1, var2, var3, var4, var5, method3040(var20, var6), method3040(var20, var7), method3040(var20, var8));
       } else {
          Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18);
-         __et_f = Rasterizer3D_textureLoader.__o_214(var18);
+         field740 = Rasterizer3D_textureLoader.vmethod325(var18);
          var20 = var4 - var3;
          int var21 = var1 - var0;
          int var22 = var5 - var3;
@@ -2480,22 +2452,22 @@ public class Rasterizer3D extends Rasterizer2D {
          int var24 = var7 - var6;
          int var25 = var8 - var6;
          int var26 = 0;
-         if(var0 != var1) {
+         if (var0 != var1) {
             var26 = (var4 - var3 << 14) / (var1 - var0);
          }
 
          int var27 = 0;
-         if(var2 != var1) {
+         if (var2 != var1) {
             var27 = (var5 - var4 << 14) / (var2 - var1);
          }
 
          int var28 = 0;
-         if(var0 != var2) {
+         if (var0 != var2) {
             var28 = (var3 - var5 << 14) / (var0 - var2);
          }
 
          int var29 = var20 * var23 - var22 * var21;
-         if(var29 != 0) {
+         if (var29 != 0) {
             int var30 = (var24 * var23 - var25 * var21 << 9) / var29;
             int var31 = (var25 * var20 - var24 * var22 << 9) / var29;
             var10 = var9 - var10;
@@ -2514,20 +2486,20 @@ public class Rasterizer3D extends Rasterizer2D {
             int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom);
             int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom);
             int var41;
-            if(var0 <= var1 && var0 <= var2) {
-               if(var0 < Rasterizer3D_clipHeight) {
-                  if(var1 > Rasterizer3D_clipHeight) {
+            if (var0 <= var1 && var0 <= var2) {
+               if (var0 < Rasterizer3D_clipHeight) {
+                  if (var1 > Rasterizer3D_clipHeight) {
                      var1 = Rasterizer3D_clipHeight;
                   }
 
-                  if(var2 > Rasterizer3D_clipHeight) {
+                  if (var2 > Rasterizer3D_clipHeight) {
                      var2 = Rasterizer3D_clipHeight;
                   }
 
                   var6 = var30 + ((var6 << 9) - var3 * var30);
-                  if(var1 < var2) {
+                  if (var1 < var2) {
                      var5 = var3 <<= 14;
-                     if(var0 < 0) {
+                     if (var0 < 0) {
                         var5 -= var0 * var28;
                         var3 -= var0 * var26;
                         var6 -= var0 * var31;
@@ -2535,7 +2507,7 @@ public class Rasterizer3D extends Rasterizer2D {
                      }
 
                      var4 <<= 14;
-                     if(var1 < 0) {
+                     if (var1 < 0) {
                         var4 -= var27 * var1;
                         var1 = 0;
                      }
@@ -2544,17 +2516,17 @@ public class Rasterizer3D extends Rasterizer2D {
                      var32 += var34 * var41;
                      var35 += var37 * var41;
                      var38 += var40 * var41;
-                     if(var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) {
+                     if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) {
                         var2 -= var1;
                         var1 -= var0;
                         var0 = Rasterizer3D_rowOffsets[var0];
 
-                        while(true) {
+                        while (true) {
                            --var1;
-                           if(var1 < 0) {
-                              while(true) {
+                           if (var1 < 0) {
+                              while (true) {
                                  --var2;
-                                 if(var2 < 0) {
+                                 if (var2 < 0) {
                                     return;
                                  }
 
@@ -2578,33 +2550,112 @@ public class Rasterizer3D extends Rasterizer2D {
                            var35 += var37;
                            var38 += var40;
                         }
-                     } else {
-                        var2 -= var1;
-                        var1 -= var0;
-                        var0 = Rasterizer3D_rowOffsets[var0];
+                     }
 
-                        while(true) {
-                           --var1;
-                           if(var1 < 0) {
-                              while(true) {
-                                 --var2;
-                                 if(var2 < 0) {
-                                    return;
-                                 }
+                     var2 -= var1;
+                     var1 -= var0;
+                     var0 = Rasterizer3D_rowOffsets[var0];
 
-                                 Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                                 var5 += var28;
-                                 var4 += var27;
-                                 var6 += var31;
-                                 var0 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
+                     while (true) {
+                        --var1;
+                        if (var1 < 0) {
+                           while (true) {
+                              --var2;
+                              if (var2 < 0) {
+                                 return;
                               }
+
+                              Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                              var5 += var28;
+                              var4 += var27;
+                              var6 += var31;
+                              var0 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                        var5 += var28;
+                        var3 += var26;
+                        var6 += var31;
+                        var0 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var4 = var3 <<= 14;
+                  if (var0 < 0) {
+                     var4 -= var0 * var28;
+                     var3 -= var0 * var26;
+                     var6 -= var0 * var31;
+                     var0 = 0;
+                  }
+
+                  var5 <<= 14;
+                  if (var2 < 0) {
+                     var5 -= var27 * var2;
+                     var2 = 0;
+                  }
+
+                  var41 = var0 - Rasterizer3D_clipMidY;
+                  var32 += var34 * var41;
+                  var35 += var37 * var41;
+                  var38 += var40 * var41;
+                  if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) {
+                     var1 -= var2;
+                     var2 -= var0;
+                     var0 = Rasterizer3D_rowOffsets[var0];
+
+                     while (true) {
+                        --var2;
+                        if (var2 < 0) {
+                           while (true) {
+                              --var1;
+                              if (var1 < 0) {
+                                 return;
+                              }
+
+                              Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                              var5 += var27;
+                              var3 += var26;
+                              var6 += var31;
+                              var0 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                        var4 += var28;
+                        var3 += var26;
+                        var6 += var31;
+                        var0 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var1 -= var2;
+                  var2 -= var0;
+                  var0 = Rasterizer3D_rowOffsets[var0];
+
+                  while (true) {
+                     --var2;
+                     if (var2 < 0) {
+                        while (true) {
+                           --var1;
+                           if (var1 < 0) {
+                              return;
                            }
 
                            Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                           var5 += var28;
+                           var5 += var27;
                            var3 += var26;
                            var6 += var31;
                            var0 += Rasterizer2D.Rasterizer2D_width;
@@ -2613,110 +2664,31 @@ public class Rasterizer3D extends Rasterizer2D {
                            var38 += var40;
                         }
                      }
-                  } else {
-                     var4 = var3 <<= 14;
-                     if(var0 < 0) {
-                        var4 -= var0 * var28;
-                        var3 -= var0 * var26;
-                        var6 -= var0 * var31;
-                        var0 = 0;
-                     }
 
-                     var5 <<= 14;
-                     if(var2 < 0) {
-                        var5 -= var27 * var2;
-                        var2 = 0;
-                     }
-
-                     var41 = var0 - Rasterizer3D_clipMidY;
-                     var32 += var34 * var41;
-                     var35 += var37 * var41;
-                     var38 += var40 * var41;
-                     if((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) {
-                        var1 -= var2;
-                        var2 -= var0;
-                        var0 = Rasterizer3D_rowOffsets[var0];
-
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              while(true) {
-                                 --var1;
-                                 if(var1 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                                 var5 += var27;
-                                 var3 += var26;
-                                 var6 += var31;
-                                 var0 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                           var4 += var28;
-                           var3 += var26;
-                           var6 += var31;
-                           var0 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     } else {
-                        var1 -= var2;
-                        var2 -= var0;
-                        var0 = Rasterizer3D_rowOffsets[var0];
-
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              while(true) {
-                                 --var1;
-                                 if(var1 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                                 var5 += var27;
-                                 var3 += var26;
-                                 var6 += var31;
-                                 var0 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                           var4 += var28;
-                           var3 += var26;
-                           var6 += var31;
-                           var0 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     }
+                     Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                     var4 += var28;
+                     var3 += var26;
+                     var6 += var31;
+                     var0 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
                   }
                }
-            } else if(var1 <= var2) {
-               if(var1 < Rasterizer3D_clipHeight) {
-                  if(var2 > Rasterizer3D_clipHeight) {
+            } else if (var1 <= var2) {
+               if (var1 < Rasterizer3D_clipHeight) {
+                  if (var2 > Rasterizer3D_clipHeight) {
                      var2 = Rasterizer3D_clipHeight;
                   }
 
-                  if(var0 > Rasterizer3D_clipHeight) {
+                  if (var0 > Rasterizer3D_clipHeight) {
                      var0 = Rasterizer3D_clipHeight;
                   }
 
                   var7 = var30 + ((var7 << 9) - var30 * var4);
-                  if(var2 < var0) {
+                  if (var2 < var0) {
                      var3 = var4 <<= 14;
-                     if(var1 < 0) {
+                     if (var1 < 0) {
                         var3 -= var26 * var1;
                         var4 -= var27 * var1;
                         var7 -= var31 * var1;
@@ -2724,7 +2696,7 @@ public class Rasterizer3D extends Rasterizer2D {
                      }
 
                      var5 <<= 14;
-                     if(var2 < 0) {
+                     if (var2 < 0) {
                         var5 -= var28 * var2;
                         var2 = 0;
                      }
@@ -2733,17 +2705,17 @@ public class Rasterizer3D extends Rasterizer2D {
                      var32 += var34 * var41;
                      var35 += var37 * var41;
                      var38 += var40 * var41;
-                     if(var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) {
+                     if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) {
                         var0 -= var2;
                         var2 -= var1;
                         var1 = Rasterizer3D_rowOffsets[var1];
 
-                        while(true) {
+                        while (true) {
                            --var2;
-                           if(var2 < 0) {
-                              while(true) {
+                           if (var2 < 0) {
+                              while (true) {
                                  --var0;
-                                 if(var0 < 0) {
+                                 if (var0 < 0) {
                                     return;
                                  }
 
@@ -2767,33 +2739,112 @@ public class Rasterizer3D extends Rasterizer2D {
                            var35 += var37;
                            var38 += var40;
                         }
-                     } else {
-                        var0 -= var2;
-                        var2 -= var1;
-                        var1 = Rasterizer3D_rowOffsets[var1];
+                     }
 
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              while(true) {
-                                 --var0;
-                                 if(var0 < 0) {
-                                    return;
-                                 }
+                     var0 -= var2;
+                     var2 -= var1;
+                     var1 = Rasterizer3D_rowOffsets[var1];
 
-                                 Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                                 var3 += var26;
-                                 var5 += var28;
-                                 var7 += var31;
-                                 var1 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
+                     while (true) {
+                        --var2;
+                        if (var2 < 0) {
+                           while (true) {
+                              --var0;
+                              if (var0 < 0) {
+                                 return;
                               }
+
+                              Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                              var3 += var26;
+                              var5 += var28;
+                              var7 += var31;
+                              var1 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                        var3 += var26;
+                        var4 += var27;
+                        var7 += var31;
+                        var1 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var5 = var4 <<= 14;
+                  if (var1 < 0) {
+                     var5 -= var26 * var1;
+                     var4 -= var27 * var1;
+                     var7 -= var31 * var1;
+                     var1 = 0;
+                  }
+
+                  var3 <<= 14;
+                  if (var0 < 0) {
+                     var3 -= var0 * var28;
+                     var0 = 0;
+                  }
+
+                  var41 = var1 - Rasterizer3D_clipMidY;
+                  var32 += var34 * var41;
+                  var35 += var37 * var41;
+                  var38 += var40 * var41;
+                  if (var26 < var27) {
+                     var2 -= var0;
+                     var0 -= var1;
+                     var1 = Rasterizer3D_rowOffsets[var1];
+
+                     while (true) {
+                        --var0;
+                        if (var0 < 0) {
+                           while (true) {
+                              --var2;
+                              if (var2 < 0) {
+                                 return;
+                              }
+
+                              Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                              var3 += var28;
+                              var4 += var27;
+                              var7 += var31;
+                              var1 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                        var5 += var26;
+                        var4 += var27;
+                        var7 += var31;
+                        var1 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var2 -= var0;
+                  var0 -= var1;
+                  var1 = Rasterizer3D_rowOffsets[var1];
+
+                  while (true) {
+                     --var0;
+                     if (var0 < 0) {
+                        while (true) {
+                           --var2;
+                           if (var2 < 0) {
+                              return;
                            }
 
                            Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                           var3 += var26;
+                           var3 += var28;
                            var4 += var27;
                            var7 += var31;
                            var1 += Rasterizer2D.Rasterizer2D_width;
@@ -2802,109 +2853,30 @@ public class Rasterizer3D extends Rasterizer2D {
                            var38 += var40;
                         }
                      }
-                  } else {
-                     var5 = var4 <<= 14;
-                     if(var1 < 0) {
-                        var5 -= var26 * var1;
-                        var4 -= var27 * var1;
-                        var7 -= var31 * var1;
-                        var1 = 0;
-                     }
 
-                     var3 <<= 14;
-                     if(var0 < 0) {
-                        var3 -= var0 * var28;
-                        var0 = 0;
-                     }
-
-                     var41 = var1 - Rasterizer3D_clipMidY;
-                     var32 += var34 * var41;
-                     var35 += var37 * var41;
-                     var38 += var40 * var41;
-                     if(var26 < var27) {
-                        var2 -= var0;
-                        var0 -= var1;
-                        var1 = Rasterizer3D_rowOffsets[var1];
-
-                        while(true) {
-                           --var0;
-                           if(var0 < 0) {
-                              while(true) {
-                                 --var2;
-                                 if(var2 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                                 var3 += var28;
-                                 var4 += var27;
-                                 var7 += var31;
-                                 var1 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                           var5 += var26;
-                           var4 += var27;
-                           var7 += var31;
-                           var1 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     } else {
-                        var2 -= var0;
-                        var0 -= var1;
-                        var1 = Rasterizer3D_rowOffsets[var1];
-
-                        while(true) {
-                           --var0;
-                           if(var0 < 0) {
-                              while(true) {
-                                 --var2;
-                                 if(var2 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                                 var3 += var28;
-                                 var4 += var27;
-                                 var7 += var31;
-                                 var1 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                           var5 += var26;
-                           var4 += var27;
-                           var7 += var31;
-                           var1 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     }
+                     Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                     var5 += var26;
+                     var4 += var27;
+                     var7 += var31;
+                     var1 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
                   }
                }
-            } else if(var2 < Rasterizer3D_clipHeight) {
-               if(var0 > Rasterizer3D_clipHeight) {
+            } else if (var2 < Rasterizer3D_clipHeight) {
+               if (var0 > Rasterizer3D_clipHeight) {
                   var0 = Rasterizer3D_clipHeight;
                }
 
-               if(var1 > Rasterizer3D_clipHeight) {
+               if (var1 > Rasterizer3D_clipHeight) {
                   var1 = Rasterizer3D_clipHeight;
                }
 
                var8 = (var8 << 9) - var5 * var30 + var30;
-               if(var0 < var1) {
+               if (var0 < var1) {
                   var4 = var5 <<= 14;
-                  if(var2 < 0) {
+                  if (var2 < 0) {
                      var4 -= var27 * var2;
                      var5 -= var28 * var2;
                      var8 -= var31 * var2;
@@ -2912,7 +2884,7 @@ public class Rasterizer3D extends Rasterizer2D {
                   }
 
                   var3 <<= 14;
-                  if(var0 < 0) {
+                  if (var0 < 0) {
                      var3 -= var0 * var26;
                      var0 = 0;
                   }
@@ -2921,17 +2893,17 @@ public class Rasterizer3D extends Rasterizer2D {
                   var32 += var34 * var41;
                   var35 += var37 * var41;
                   var38 += var40 * var41;
-                  if(var27 < var28) {
+                  if (var27 < var28) {
                      var1 -= var0;
                      var0 -= var2;
                      var2 = Rasterizer3D_rowOffsets[var2];
 
-                     while(true) {
+                     while (true) {
                         --var0;
-                        if(var0 < 0) {
-                           while(true) {
+                        if (var0 < 0) {
+                           while (true) {
                               --var1;
-                              if(var1 < 0) {
+                              if (var1 < 0) {
                                  return;
                               }
 
@@ -2955,33 +2927,112 @@ public class Rasterizer3D extends Rasterizer2D {
                         var35 += var37;
                         var38 += var40;
                      }
-                  } else {
-                     var1 -= var0;
-                     var0 -= var2;
-                     var2 = Rasterizer3D_rowOffsets[var2];
+                  }
 
-                     while(true) {
-                        --var0;
-                        if(var0 < 0) {
-                           while(true) {
-                              --var1;
-                              if(var1 < 0) {
-                                 return;
-                              }
+                  var1 -= var0;
+                  var0 -= var2;
+                  var2 = Rasterizer3D_rowOffsets[var2];
 
-                              Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                              var4 += var27;
-                              var3 += var26;
-                              var8 += var31;
-                              var2 += Rasterizer2D.Rasterizer2D_width;
-                              var32 += var34;
-                              var35 += var37;
-                              var38 += var40;
+                  while (true) {
+                     --var0;
+                     if (var0 < 0) {
+                        while (true) {
+                           --var1;
+                           if (var1 < 0) {
+                              return;
                            }
+
+                           Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                           var4 += var27;
+                           var3 += var26;
+                           var8 += var31;
+                           var2 += Rasterizer2D.Rasterizer2D_width;
+                           var32 += var34;
+                           var35 += var37;
+                           var38 += var40;
+                        }
+                     }
+
+                     Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                     var4 += var27;
+                     var5 += var28;
+                     var8 += var31;
+                     var2 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
+                  }
+               }
+
+               var3 = var5 <<= 14;
+               if (var2 < 0) {
+                  var3 -= var27 * var2;
+                  var5 -= var28 * var2;
+                  var8 -= var31 * var2;
+                  var2 = 0;
+               }
+
+               var4 <<= 14;
+               if (var1 < 0) {
+                  var4 -= var26 * var1;
+                  var1 = 0;
+               }
+
+               var41 = var2 - Rasterizer3D_clipMidY;
+               var32 += var34 * var41;
+               var35 += var37 * var41;
+               var38 += var40 * var41;
+               if (var27 < var28) {
+                  var0 -= var1;
+                  var1 -= var2;
+                  var2 = Rasterizer3D_rowOffsets[var2];
+
+                  while (true) {
+                     --var1;
+                     if (var1 < 0) {
+                        while (true) {
+                           --var0;
+                           if (var0 < 0) {
+                              return;
+                           }
+
+                           Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                           var4 += var26;
+                           var5 += var28;
+                           var8 += var31;
+                           var2 += Rasterizer2D.Rasterizer2D_width;
+                           var32 += var34;
+                           var35 += var37;
+                           var38 += var40;
+                        }
+                     }
+
+                     Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                     var3 += var27;
+                     var5 += var28;
+                     var8 += var31;
+                     var2 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
+                  }
+               }
+
+               var0 -= var1;
+               var1 -= var2;
+               var2 = Rasterizer3D_rowOffsets[var2];
+
+               while (true) {
+                  --var1;
+                  if (var1 < 0) {
+                     while (true) {
+                        --var0;
+                        if (var0 < 0) {
+                           return;
                         }
 
                         Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                        var4 += var27;
+                        var4 += var26;
                         var5 += var28;
                         var8 += var31;
                         var2 += Rasterizer2D.Rasterizer2D_width;
@@ -2990,132 +3041,54 @@ public class Rasterizer3D extends Rasterizer2D {
                         var38 += var40;
                      }
                   }
-               } else {
-                  var3 = var5 <<= 14;
-                  if(var2 < 0) {
-                     var3 -= var27 * var2;
-                     var5 -= var28 * var2;
-                     var8 -= var31 * var2;
-                     var2 = 0;
-                  }
 
-                  var4 <<= 14;
-                  if(var1 < 0) {
-                     var4 -= var26 * var1;
-                     var1 = 0;
-                  }
-
-                  var41 = var2 - Rasterizer3D_clipMidY;
-                  var32 += var34 * var41;
-                  var35 += var37 * var41;
-                  var38 += var40 * var41;
-                  if(var27 < var28) {
-                     var0 -= var1;
-                     var1 -= var2;
-                     var2 = Rasterizer3D_rowOffsets[var2];
-
-                     while(true) {
-                        --var1;
-                        if(var1 < 0) {
-                           while(true) {
-                              --var0;
-                              if(var0 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                              var4 += var26;
-                              var5 += var28;
-                              var8 += var31;
-                              var2 += Rasterizer2D.Rasterizer2D_width;
-                              var32 += var34;
-                              var35 += var37;
-                              var38 += var40;
-                           }
-                        }
-
-                        Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                        var3 += var27;
-                        var5 += var28;
-                        var8 += var31;
-                        var2 += Rasterizer2D.Rasterizer2D_width;
-                        var32 += var34;
-                        var35 += var37;
-                        var38 += var40;
-                     }
-                  } else {
-                     var0 -= var1;
-                     var1 -= var2;
-                     var2 = Rasterizer3D_rowOffsets[var2];
-
-                     while(true) {
-                        --var1;
-                        if(var1 < 0) {
-                           while(true) {
-                              --var0;
-                              if(var0 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                              var4 += var26;
-                              var5 += var28;
-                              var8 += var31;
-                              var2 += Rasterizer2D.Rasterizer2D_width;
-                              var32 += var34;
-                              var35 += var37;
-                              var38 += var40;
-                           }
-                        }
-
-                        Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                        var3 += var27;
-                        var5 += var28;
-                        var8 += var31;
-                        var2 += Rasterizer2D.Rasterizer2D_width;
-                        var32 += var34;
-                        var35 += var37;
-                        var38 += var40;
-                     }
-                  }
+                  Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                  var3 += var27;
+                  var5 += var28;
+                  var8 += var31;
+                  var2 += Rasterizer2D.Rasterizer2D_width;
+                  var32 += var34;
+                  var35 += var37;
+                  var38 += var40;
                }
             }
          }
       }
+
    }
 
    @ObfuscatedName("y")
    @Export("Rasterizer3D_textureAlpha")
    static final void Rasterizer3D_textureAlpha(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) {
-      if(__et_m) {
-         if(var6 > Rasterizer3D_clipWidth) {
+      if (field739) {
+         if (var6 > Rasterizer3D_clipWidth) {
             var6 = Rasterizer3D_clipWidth;
          }
 
-         if(var5 < 0) {
+         if (var5 < 0) {
             var5 = 0;
          }
       }
 
-      if(var5 < var6) {
+      if (var5 < var6) {
          var4 += var5;
          var7 += var5 * var8;
-         int var17 = var6 - var5;
-         int var15;
+         int var15 = var6 - var5;
          int var16;
+         int var17;
          int var18;
          int var19;
          int var20;
          int var21;
          int var22;
          int var23;
-         if(Rasterizer3D_isLowDetailTexture) {
+         if (Rasterizer3D_isLowDetailTexture) {
             var23 = var5 - Rasterizer3D_clipMidX;
             var9 += var23 * var12;
             var10 += var13 * var23;
             var11 += var23 * var14;
             var22 = var11 >> 12;
-            if(var22 != 0) {
+            if (var22 != 0) {
                var18 = var9 / var22;
                var19 = var10 / var22;
             } else {
@@ -3123,11 +3096,11 @@ public class Rasterizer3D extends Rasterizer2D {
                var19 = 0;
             }
 
-            var9 += var17 * var12;
-            var10 += var13 * var17;
-            var11 += var17 * var14;
+            var9 += var15 * var12;
+            var10 += var13 * var15;
+            var11 += var15 * var14;
             var22 = var11 >> 12;
-            if(var22 != 0) {
+            if (var22 != 0) {
                var20 = var9 / var22;
                var21 = var10 / var22;
             } else {
@@ -3136,120 +3109,120 @@ public class Rasterizer3D extends Rasterizer2D {
             }
 
             var2 = (var18 << 20) + var19;
-            var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20);
-            var17 >>= 3;
+            var17 = (var21 - var19) / var15 + ((var20 - var18) / var15 << 20);
+            var15 >>= 3;
             var8 <<= 3;
-            var15 = var7 >> 8;
-            if(__et_f) {
-               if(var17 > 0) {
+            var16 = var7 >> 8;
+            if (field740) {
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
+                     --var15;
+                  } while(var15 > 0);
                }
             } else {
-               if(var17 > 0) {
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
+                     var2 += var17;
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var2 += var17;
+                     --var15;
+                  } while(var15 > 0);
                }
             }
          } else {
@@ -3258,7 +3231,7 @@ public class Rasterizer3D extends Rasterizer2D {
             var10 += var13 * var23;
             var11 += var23 * var14;
             var22 = var11 >> 14;
-            if(var22 != 0) {
+            if (var22 != 0) {
                var18 = var9 / var22;
                var19 = var10 / var22;
             } else {
@@ -3266,11 +3239,11 @@ public class Rasterizer3D extends Rasterizer2D {
                var19 = 0;
             }
 
-            var9 += var17 * var12;
-            var10 += var13 * var17;
-            var11 += var17 * var14;
+            var9 += var15 * var12;
+            var10 += var13 * var15;
+            var11 += var15 * var14;
             var22 = var11 >> 14;
-            if(var22 != 0) {
+            if (var22 != 0) {
                var20 = var9 / var22;
                var21 = var10 / var22;
             } else {
@@ -3279,133 +3252,133 @@ public class Rasterizer3D extends Rasterizer2D {
             }
 
             var2 = (var18 << 18) + var19;
-            var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18);
-            var17 >>= 3;
+            var17 = (var21 - var19) / var15 + ((var20 - var18) / var15 << 18);
+            var15 >>= 3;
             var8 <<= 3;
-            var15 = var7 >> 8;
-            if(__et_f) {
-               if(var17 > 0) {
+            var16 = var7 >> 8;
+            if (field740) {
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
+                     --var15;
+                  } while(var15 > 0);
                }
             } else {
-               if(var17 > 0) {
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
+                     var2 += var17;
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var2 += var17;
+                     --var15;
+                  } while(var15 > 0);
                }
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("h")
    static final int method3040(int var0, int var1) {
       var1 = (var0 & 127) * var1 >> 7;
-      if(var1 < 2) {
+      if (var1 < 2) {
          var1 = 2;
-      } else if(var1 > 126) {
+      } else if (var1 > 126) {
          var1 = 126;
       }
 
@@ -3445,4 +3418,34 @@ public class Rasterizer3D extends Rasterizer2D {
    static final int rot2(int var0, int var1, int var2, int var3) {
       return var2 * var1 - var3 * var0 >> 16;
    }
+
+   static {
+      field739 = false;
+      field740 = false;
+      Rasterizer3D_isLowDetailTexture = false;
+      field741 = true;
+      Rasterizer3D_alpha = 0;
+      Rasterizer3D_zoom = 512;
+      Rasterizer3D_rowOffsets = new int[1024];
+      Rasterizer3D_colorPalette = new int[65536];
+      field742 = new int[512];
+      field743 = new int[2048];
+      Rasterizer3D_sine = new int[2048];
+      Rasterizer3D_cosine = new int[2048];
+
+      int var0;
+      for (var0 = 1; var0 < 512; ++var0) {
+         field742[var0] = 32768 / var0;
+      }
+
+      for (var0 = 1; var0 < 2048; ++var0) {
+         field743[var0] = 65536 / var0;
+      }
+
+      for (var0 = 0; var0 < 2048; ++var0) {
+         Rasterizer3D_sine[var0] = (int)(65536.0D * Math.sin((double)var0 * 0.0030679615D));
+         Rasterizer3D_cosine[var0] = (int)(65536.0D * Math.cos((double)var0 * 0.0030679615D));
+      }
+
+   }
 }
diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java
index 2bc138ada2..4137302304 100644
--- a/runescape-client/src/main/java/RawPcmStream.java
+++ b/runescape-client/src/main/java/RawPcmStream.java
@@ -7,19 +7,19 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("RawPcmStream")
 public class RawPcmStream extends PcmStream {
    @ObfuscatedName("m")
-   int __m;
+   int field744;
    @ObfuscatedName("f")
-   int __f;
+   int field745;
    @ObfuscatedName("q")
-   int __q;
+   int field746;
    @ObfuscatedName("o")
-   int __o;
+   int field747;
    @ObfuscatedName("u")
-   int __u;
+   int field748;
    @ObfuscatedName("g")
-   int __g;
+   int field749;
    @ObfuscatedName("l")
-   int __l;
+   int field750;
    @ObfuscatedName("e")
    @Export("numLoops")
    int numLoops;
@@ -30,15 +30,15 @@ public class RawPcmStream extends PcmStream {
    @Export("end")
    int end;
    @ObfuscatedName("k")
-   boolean __k;
+   boolean field751;
    @ObfuscatedName("n")
-   int __n;
+   int field752;
    @ObfuscatedName("i")
-   int __i;
+   int field753;
    @ObfuscatedName("a")
-   int __a;
+   int field754;
    @ObfuscatedName("z")
-   int __z;
+   int field755;
 
    @ObfuscatedSignature(
       signature = "(Lcx;III)V"
@@ -47,12 +47,12 @@ public class RawPcmStream extends PcmStream {
       super.sound = var1;
       this.start = var1.start;
       this.end = var1.end;
-      this.__k = var1.__o;
-      this.__f = var2;
-      this.__q = var3;
-      this.__o = var4;
-      this.__m = 0;
-      this.__o_180();
+      this.field751 = var1.field756;
+      this.field745 = var2;
+      this.field746 = var3;
+      this.field747 = var4;
+      this.field744 = 0;
+      this.method261();
    }
 
    @ObfuscatedSignature(
@@ -62,19 +62,19 @@ public class RawPcmStream extends PcmStream {
       super.sound = var1;
       this.start = var1.start;
       this.end = var1.end;
-      this.__k = var1.__o;
-      this.__f = var2;
-      this.__q = var3;
-      this.__o = 8192;
-      this.__m = 0;
-      this.__o_180();
+      this.field751 = var1.field756;
+      this.field745 = var2;
+      this.field746 = var3;
+      this.field747 = 8192;
+      this.field744 = 0;
+      this.method261();
    }
 
    @ObfuscatedName("o")
-   void __o_180() {
-      this.__u = this.__q;
-      this.__g = method2603(this.__q, this.__o);
-      this.__l = method2494(this.__q, this.__o);
+   void method261() {
+      this.field748 = this.field746;
+      this.field749 = method2603(this.field746, this.field747);
+      this.field750 = method2494(this.field746, this.field747);
    }
 
    @ObfuscatedName("u")
@@ -96,189 +96,191 @@ public class RawPcmStream extends PcmStream {
    }
 
    @ObfuscatedName("l")
-   protected int __l_171() {
-      return this.__q == 0 && this.__n == 0?0:1;
+   protected int vmethod262() {
+      return this.field746 == 0 && this.field752 == 0 ? 0 : 1;
    }
 
    @ObfuscatedName("e")
-   public synchronized void __e_172(int[] var1, int var2, int var3) {
-      if(this.__q == 0 && this.__n == 0) {
-         this.__d_173(var3);
+   public synchronized void vmethod263(int[] var1, int var2, int var3) {
+      if (this.field746 == 0 && this.field752 == 0) {
+         this.vmethod264(var3);
       } else {
          RawSound var4 = (RawSound)super.sound;
          int var5 = this.start << 8;
          int var6 = this.end << 8;
          int var7 = var4.samples.length << 8;
          int var8 = var6 - var5;
-         if(var8 <= 0) {
+         if (var8 <= 0) {
             this.numLoops = 0;
          }
 
          int var9 = var2;
          var3 += var2;
-         if(this.__m < 0) {
-            if(this.__f <= 0) {
-               this.__b_189();
+         if (this.field744 < 0) {
+            if (this.field745 <= 0) {
+               this.method272();
                this.remove();
                return;
             }
 
-            this.__m = 0;
+            this.field744 = 0;
          }
 
-         if(this.__m >= var7) {
-            if(this.__f >= 0) {
-               this.__b_189();
+         if (this.field744 >= var7) {
+            if (this.field745 >= 0) {
+               this.method272();
                this.remove();
                return;
             }
 
-            this.__m = var7 - 1;
+            this.field744 = var7 - 1;
          }
 
-         if(this.numLoops < 0) {
-            if(this.__k) {
-               if(this.__f < 0) {
-                  var9 = this.__ap_203(var1, var2, var5, var3, var4.samples[this.start]);
-                  if(this.__m >= var5) {
+         if (this.numLoops < 0) {
+            if (this.field751) {
+               if (this.field745 < 0) {
+                  var9 = this.method281(var1, var2, var5, var3, var4.samples[this.start]);
+                  if (this.field744 >= var5) {
                      return;
                   }
 
-                  this.__m = var5 + var5 - 1 - this.__m;
-                  this.__f = -this.__f;
+                  this.field744 = var5 + var5 - 1 - this.field744;
+                  this.field745 = -this.field745;
                }
 
-               while(true) {
-                  var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.end - 1]);
-                  if(this.__m < var6) {
+               while (true) {
+                  var9 = this.method280(var1, var9, var6, var3, var4.samples[this.end - 1]);
+                  if (this.field744 < var6) {
                      return;
                   }
 
-                  this.__m = var6 + var6 - 1 - this.__m;
-                  this.__f = -this.__f;
-                  var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.start]);
-                  if(this.__m >= var5) {
+                  this.field744 = var6 + var6 - 1 - this.field744;
+                  this.field745 = -this.field745;
+                  var9 = this.method281(var1, var9, var5, var3, var4.samples[this.start]);
+                  if (this.field744 >= var5) {
                      return;
                   }
 
-                  this.__m = var5 + var5 - 1 - this.__m;
-                  this.__f = -this.__f;
-               }
-            } else if(this.__f < 0) {
-               while(true) {
-                  var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.end - 1]);
-                  if(this.__m >= var5) {
-                     return;
-                  }
-
-                  this.__m = var6 - 1 - (var6 - 1 - this.__m) % var8;
-               }
-            } else {
-               while(true) {
-                  var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.start]);
-                  if(this.__m < var6) {
-                     return;
-                  }
-
-                  this.__m = var5 + (this.__m - var5) % var8;
+                  this.field744 = var5 + var5 - 1 - this.field744;
+                  this.field745 = -this.field745;
                }
             }
-         } else {
-            if(this.numLoops > 0) {
-               if(this.__k) {
-                  label140: {
-                     if(this.__f < 0) {
-                        var9 = this.__ap_203(var1, var2, var5, var3, var4.samples[this.start]);
-                        if(this.__m >= var5) {
-                           return;
-                        }
 
-                        this.__m = var5 + var5 - 1 - this.__m;
-                        this.__f = -this.__f;
-                        if(--this.numLoops == 0) {
-                           break label140;
-                        }
+            if (this.field745 < 0) {
+               while (true) {
+                  var9 = this.method281(var1, var9, var5, var3, var4.samples[this.end - 1]);
+                  if (this.field744 >= var5) {
+                     return;
+                  }
+
+                  this.field744 = var6 - 1 - (var6 - 1 - this.field744) % var8;
+               }
+            }
+
+            while (true) {
+               var9 = this.method280(var1, var9, var6, var3, var4.samples[this.start]);
+               if (this.field744 < var6) {
+                  return;
+               }
+
+               this.field744 = var5 + (this.field744 - var5) % var8;
+            }
+         }
+
+         if (this.numLoops > 0) {
+            if (this.field751) {
+               label118: {
+                  if (this.field745 < 0) {
+                     var9 = this.method281(var1, var2, var5, var3, var4.samples[this.start]);
+                     if (this.field744 >= var5) {
+                        return;
                      }
 
-                     do {
-                        var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.end - 1]);
-                        if(this.__m < var6) {
-                           return;
-                        }
+                     this.field744 = var5 + var5 - 1 - this.field744;
+                     this.field745 = -this.field745;
+                     if (--this.numLoops == 0) {
+                        break label118;
+                     }
+                  }
 
-                        this.__m = var6 + var6 - 1 - this.__m;
-                        this.__f = -this.__f;
-                        if(--this.numLoops == 0) {
-                           break;
-                        }
+                  do {
+                     var9 = this.method280(var1, var9, var6, var3, var4.samples[this.end - 1]);
+                     if (this.field744 < var6) {
+                        return;
+                     }
 
-                        var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.start]);
-                        if(this.__m >= var5) {
-                           return;
-                        }
+                     this.field744 = var6 + var6 - 1 - this.field744;
+                     this.field745 = -this.field745;
+                     if (--this.numLoops == 0) {
+                        break;
+                     }
 
-                        this.__m = var5 + var5 - 1 - this.__m;
-                        this.__f = -this.__f;
-                     } while(--this.numLoops != 0);
+                     var9 = this.method281(var1, var9, var5, var3, var4.samples[this.start]);
+                     if (this.field744 >= var5) {
+                        return;
+                     }
+
+                     this.field744 = var5 + var5 - 1 - this.field744;
+                     this.field745 = -this.field745;
+                  } while(--this.numLoops != 0);
+               }
+            } else {
+               int var10;
+               if (this.field745 < 0) {
+                  while (true) {
+                     var9 = this.method281(var1, var9, var5, var3, var4.samples[this.end - 1]);
+                     if (this.field744 >= var5) {
+                        return;
+                     }
+
+                     var10 = (var6 - 1 - this.field744) / var8;
+                     if (var10 >= this.numLoops) {
+                        this.field744 += var8 * this.numLoops;
+                        this.numLoops = 0;
+                        break;
+                     }
+
+                     this.field744 += var8 * var10;
+                     this.numLoops -= var10;
                   }
                } else {
-                  int var10;
-                  if(this.__f < 0) {
-                     while(true) {
-                        var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.end - 1]);
-                        if(this.__m >= var5) {
-                           return;
-                        }
-
-                        var10 = (var6 - 1 - this.__m) / var8;
-                        if(var10 >= this.numLoops) {
-                           this.__m += var8 * this.numLoops;
-                           this.numLoops = 0;
-                           break;
-                        }
-
-                        this.__m += var8 * var10;
-                        this.numLoops -= var10;
+                  while (true) {
+                     var9 = this.method280(var1, var9, var6, var3, var4.samples[this.start]);
+                     if (this.field744 < var6) {
+                        return;
                      }
-                  } else {
-                     while(true) {
-                        var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.start]);
-                        if(this.__m < var6) {
-                           return;
-                        }
 
-                        var10 = (this.__m - var5) / var8;
-                        if(var10 >= this.numLoops) {
-                           this.__m -= var8 * this.numLoops;
-                           this.numLoops = 0;
-                           break;
-                        }
-
-                        this.__m -= var8 * var10;
-                        this.numLoops -= var10;
+                     var10 = (this.field744 - var5) / var8;
+                     if (var10 >= this.numLoops) {
+                        this.field744 -= var8 * this.numLoops;
+                        this.numLoops = 0;
+                        break;
                      }
+
+                     this.field744 -= var8 * var10;
+                     this.numLoops -= var10;
                   }
                }
             }
+         }
 
-            if(this.__f < 0) {
-               this.__ap_203(var1, var9, 0, var3, 0);
-               if(this.__m < 0) {
-                  this.__m = -1;
-                  this.__b_189();
-                  this.remove();
-               }
-            } else {
-               this.__ad_202(var1, var9, var7, var3, 0);
-               if(this.__m >= var7) {
-                  this.__m = var7;
-                  this.__b_189();
-                  this.remove();
-               }
+         if (this.field745 < 0) {
+            this.method281(var1, var9, 0, var3, 0);
+            if (this.field744 < 0) {
+               this.field744 = -1;
+               this.method272();
+               this.remove();
+            }
+         } else {
+            this.method280(var1, var9, var7, var3, 0);
+            if (this.field744 >= var7) {
+               this.field744 = var7;
+               this.method272();
+               this.remove();
             }
-
          }
       }
+
    }
 
    @ObfuscatedName("x")
@@ -288,25 +290,25 @@ public class RawPcmStream extends PcmStream {
    }
 
    @ObfuscatedName("d")
-   public synchronized void __d_173(int var1) {
-      if(this.__n > 0) {
-         if(var1 >= this.__n) {
-            if(this.__q == Integer.MIN_VALUE) {
-               this.__q = 0;
-               this.__l = 0;
-               this.__g = 0;
-               this.__u = 0;
+   public synchronized void vmethod264(int var1) {
+      if (this.field752 > 0) {
+         if (var1 >= this.field752) {
+            if (this.field746 == Integer.MIN_VALUE) {
+               this.field746 = 0;
+               this.field750 = 0;
+               this.field749 = 0;
+               this.field748 = 0;
                this.remove();
-               var1 = this.__n;
+               var1 = this.field752;
             }
 
-            this.__n = 0;
-            this.__o_180();
+            this.field752 = 0;
+            this.method261();
          } else {
-            this.__u += this.__i * var1;
-            this.__g += this.__a * var1;
-            this.__l += this.__z * var1;
-            this.__n -= var1;
+            this.field748 += this.field753 * var1;
+            this.field749 += this.field754 * var1;
+            this.field750 += this.field755 * var1;
+            this.field752 -= var1;
          }
       }
 
@@ -315,193 +317,191 @@ public class RawPcmStream extends PcmStream {
       int var4 = this.end << 8;
       int var5 = var2.samples.length << 8;
       int var6 = var4 - var3;
-      if(var6 <= 0) {
+      if (var6 <= 0) {
          this.numLoops = 0;
       }
 
-      if(this.__m < 0) {
-         if(this.__f <= 0) {
-            this.__b_189();
+      if (this.field744 < 0) {
+         if (this.field745 <= 0) {
+            this.method272();
             this.remove();
             return;
          }
 
-         this.__m = 0;
+         this.field744 = 0;
       }
 
-      if(this.__m >= var5) {
-         if(this.__f >= 0) {
-            this.__b_189();
+      if (this.field744 >= var5) {
+         if (this.field745 >= 0) {
+            this.method272();
             this.remove();
             return;
          }
 
-         this.__m = var5 - 1;
+         this.field744 = var5 - 1;
       }
 
-      this.__m += this.__f * var1;
-      if(this.numLoops < 0) {
-         if(!this.__k) {
-            if(this.__f < 0) {
-               if(this.__m >= var3) {
+      this.field744 += this.field745 * var1;
+      if (this.numLoops < 0) {
+         if (!this.field751) {
+            if (this.field745 < 0) {
+               if (this.field744 >= var3) {
                   return;
                }
 
-               this.__m = var4 - 1 - (var4 - 1 - this.__m) % var6;
+               this.field744 = var4 - 1 - (var4 - 1 - this.field744) % var6;
             } else {
-               if(this.__m < var4) {
+               if (this.field744 < var4) {
                   return;
                }
 
-               this.__m = var3 + (this.__m - var3) % var6;
+               this.field744 = var3 + (this.field744 - var3) % var6;
             }
-
          } else {
-            if(this.__f < 0) {
-               if(this.__m >= var3) {
+            if (this.field745 < 0) {
+               if (this.field744 >= var3) {
                   return;
                }
 
-               this.__m = var3 + var3 - 1 - this.__m;
-               this.__f = -this.__f;
+               this.field744 = var3 + var3 - 1 - this.field744;
+               this.field745 = -this.field745;
             }
 
-            while(this.__m >= var4) {
-               this.__m = var4 + var4 - 1 - this.__m;
-               this.__f = -this.__f;
-               if(this.__m >= var3) {
+            while (this.field744 >= var4) {
+               this.field744 = var4 + var4 - 1 - this.field744;
+               this.field745 = -this.field745;
+               if (this.field744 >= var3) {
                   return;
                }
 
-               this.__m = var3 + var3 - 1 - this.__m;
-               this.__f = -this.__f;
+               this.field744 = var3 + var3 - 1 - this.field744;
+               this.field745 = -this.field745;
             }
-
          }
       } else {
-         if(this.numLoops > 0) {
-            if(this.__k) {
-               label123: {
-                  if(this.__f < 0) {
-                     if(this.__m >= var3) {
+         if (this.numLoops > 0) {
+            if (this.field751) {
+               label113: {
+                  if (this.field745 < 0) {
+                     if (this.field744 >= var3) {
                         return;
                      }
 
-                     this.__m = var3 + var3 - 1 - this.__m;
-                     this.__f = -this.__f;
-                     if(--this.numLoops == 0) {
-                        break label123;
+                     this.field744 = var3 + var3 - 1 - this.field744;
+                     this.field745 = -this.field745;
+                     if (--this.numLoops == 0) {
+                        break label113;
                      }
                   }
 
                   do {
-                     if(this.__m < var4) {
+                     if (this.field744 < var4) {
                         return;
                      }
 
-                     this.__m = var4 + var4 - 1 - this.__m;
-                     this.__f = -this.__f;
-                     if(--this.numLoops == 0) {
+                     this.field744 = var4 + var4 - 1 - this.field744;
+                     this.field745 = -this.field745;
+                     if (--this.numLoops == 0) {
                         break;
                      }
 
-                     if(this.__m >= var3) {
+                     if (this.field744 >= var3) {
                         return;
                      }
 
-                     this.__m = var3 + var3 - 1 - this.__m;
-                     this.__f = -this.__f;
+                     this.field744 = var3 + var3 - 1 - this.field744;
+                     this.field745 = -this.field745;
                   } while(--this.numLoops != 0);
                }
             } else {
                int var7;
-               if(this.__f < 0) {
-                  if(this.__m >= var3) {
+               if (this.field745 < 0) {
+                  if (this.field744 >= var3) {
                      return;
                   }
 
-                  var7 = (var4 - 1 - this.__m) / var6;
-                  if(var7 < this.numLoops) {
-                     this.__m += var6 * var7;
+                  var7 = (var4 - 1 - this.field744) / var6;
+                  if (var7 < this.numLoops) {
+                     this.field744 += var6 * var7;
                      this.numLoops -= var7;
                      return;
                   }
 
-                  this.__m += var6 * this.numLoops;
+                  this.field744 += var6 * this.numLoops;
                   this.numLoops = 0;
                } else {
-                  if(this.__m < var4) {
+                  if (this.field744 < var4) {
                      return;
                   }
 
-                  var7 = (this.__m - var3) / var6;
-                  if(var7 < this.numLoops) {
-                     this.__m -= var6 * var7;
+                  var7 = (this.field744 - var3) / var6;
+                  if (var7 < this.numLoops) {
+                     this.field744 -= var6 * var7;
                      this.numLoops -= var7;
                      return;
                   }
 
-                  this.__m -= var6 * this.numLoops;
+                  this.field744 -= var6 * this.numLoops;
                   this.numLoops = 0;
                }
             }
          }
 
-         if(this.__f < 0) {
-            if(this.__m < 0) {
-               this.__m = -1;
-               this.__b_189();
+         if (this.field745 < 0) {
+            if (this.field744 < 0) {
+               this.field744 = -1;
+               this.method272();
                this.remove();
             }
-         } else if(this.__m >= var5) {
-            this.__m = var5;
-            this.__b_189();
+         } else if (this.field744 >= var5) {
+            this.field744 = var5;
+            this.method272();
             this.remove();
          }
-
       }
+
    }
 
    @ObfuscatedName("a")
-   public synchronized void __a_182(int var1) {
-      this.__j_184(var1 << 6, this.__t_186());
+   public synchronized void method265(int var1) {
+      this.method267(var1 << 6, this.method269());
    }
 
    @ObfuscatedName("z")
-   synchronized void __z_183(int var1) {
-      this.__j_184(var1, this.__t_186());
+   synchronized void method266(int var1) {
+      this.method267(var1, this.method269());
    }
 
    @ObfuscatedName("j")
-   synchronized void __j_184(int var1, int var2) {
-      this.__q = var1;
-      this.__o = var2;
-      this.__n = 0;
-      this.__o_180();
+   synchronized void method267(int var1, int var2) {
+      this.field746 = var1;
+      this.field747 = var2;
+      this.field752 = 0;
+      this.method261();
    }
 
    @ObfuscatedName("s")
-   public synchronized int __s_185() {
-      return this.__q == Integer.MIN_VALUE?0:this.__q;
+   public synchronized int method268() {
+      return this.field746 == Integer.MIN_VALUE ? 0 : this.field746;
    }
 
    @ObfuscatedName("t")
-   public synchronized int __t_186() {
-      return this.__o < 0?-1:this.__o;
+   public synchronized int method269() {
+      return this.field747 < 0 ? -1 : this.field747;
    }
 
    @ObfuscatedName("y")
-   public synchronized void __y_187(int var1) {
+   public synchronized void method270(int var1) {
       int var2 = ((RawSound)super.sound).samples.length << 8;
-      if(var1 < -1) {
+      if (var1 < -1) {
          var1 = -1;
       }
 
-      if(var1 > var2) {
+      if (var1 > var2) {
          var1 = var2;
       }
 
-      this.__m = var1;
+      this.field744 = var1;
    }
 
    @ObfuscatedName("h")
@@ -509,319 +509,321 @@ public class RawPcmStream extends PcmStream {
       signature = "(Z)V",
       garbageValue = "1"
    )
-   public synchronized void __h_188() {
-      this.__f = (this.__f ^ this.__f >> 31) + (this.__f >>> 31);
-      this.__f = -this.__f;
+   public synchronized void method271() {
+      this.field745 = (this.field745 ^ this.field745 >> 31) + (this.field745 >>> 31);
+      this.field745 = -this.field745;
    }
 
    @ObfuscatedName("b")
-   void __b_189() {
-      if(this.__n != 0) {
-         if(this.__q == Integer.MIN_VALUE) {
-            this.__q = 0;
+   void method272() {
+      if (this.field752 != 0) {
+         if (this.field746 == Integer.MIN_VALUE) {
+            this.field746 = 0;
          }
 
-         this.__n = 0;
-         this.__o_180();
+         this.field752 = 0;
+         this.method261();
       }
 
    }
 
    @ObfuscatedName("c")
-   public synchronized void __c_190(int var1, int var2) {
-      this.__p_191(var1, var2, this.__t_186());
+   public synchronized void method273(int var1, int var2) {
+      this.method274(var1, var2, this.method269());
    }
 
    @ObfuscatedName("p")
-   public synchronized void __p_191(int var1, int var2, int var3) {
-      if(var1 == 0) {
-         this.__j_184(var2, var3);
+   public synchronized void method274(int var1, int var2, int var3) {
+      if (var1 == 0) {
+         this.method267(var2, var3);
       } else {
          int var4 = method2603(var2, var3);
          int var5 = method2494(var2, var3);
-         if(var4 == this.__g && var5 == this.__l) {
-            this.__n = 0;
+         if (var4 == this.field749 && var5 == this.field750) {
+            this.field752 = 0;
          } else {
-            int var6 = var2 - this.__u;
-            if(this.__u - var2 > var6) {
-               var6 = this.__u - var2;
+            int var6 = var2 - this.field748;
+            if (this.field748 - var2 > var6) {
+               var6 = this.field748 - var2;
             }
 
-            if(var4 - this.__g > var6) {
-               var6 = var4 - this.__g;
+            if (var4 - this.field749 > var6) {
+               var6 = var4 - this.field749;
             }
 
-            if(this.__g - var4 > var6) {
-               var6 = this.__g - var4;
+            if (this.field749 - var4 > var6) {
+               var6 = this.field749 - var4;
             }
 
-            if(var5 - this.__l > var6) {
-               var6 = var5 - this.__l;
+            if (var5 - this.field750 > var6) {
+               var6 = var5 - this.field750;
             }
 
-            if(this.__l - var5 > var6) {
-               var6 = this.__l - var5;
+            if (this.field750 - var5 > var6) {
+               var6 = this.field750 - var5;
             }
 
-            if(var1 > var6) {
+            if (var1 > var6) {
                var1 = var6;
             }
 
-            this.__n = var1;
-            this.__q = var2;
-            this.__o = var3;
-            this.__i = (var2 - this.__u) / var1;
-            this.__a = (var4 - this.__g) / var1;
-            this.__z = (var5 - this.__l) / var1;
+            this.field752 = var1;
+            this.field746 = var2;
+            this.field747 = var3;
+            this.field753 = (var2 - this.field748) / var1;
+            this.field754 = (var4 - this.field749) / var1;
+            this.field755 = (var5 - this.field750) / var1;
          }
       }
+
    }
 
    @ObfuscatedName("v")
-   public synchronized void __v_192(int var1) {
-      if(var1 == 0) {
-         this.__z_183(0);
+   public synchronized void method275(int var1) {
+      if (var1 == 0) {
+         this.method266(0);
          this.remove();
-      } else if(this.__g == 0 && this.__l == 0) {
-         this.__n = 0;
-         this.__q = 0;
-         this.__u = 0;
+      } else if (this.field749 == 0 && this.field750 == 0) {
+         this.field752 = 0;
+         this.field746 = 0;
+         this.field748 = 0;
          this.remove();
       } else {
-         int var2 = -this.__u;
-         if(this.__u > var2) {
-            var2 = this.__u;
+         int var2 = -this.field748;
+         if (this.field748 > var2) {
+            var2 = this.field748;
          }
 
-         if(-this.__g > var2) {
-            var2 = -this.__g;
+         if (-this.field749 > var2) {
+            var2 = -this.field749;
          }
 
-         if(this.__g > var2) {
-            var2 = this.__g;
+         if (this.field749 > var2) {
+            var2 = this.field749;
          }
 
-         if(-this.__l > var2) {
-            var2 = -this.__l;
+         if (-this.field750 > var2) {
+            var2 = -this.field750;
          }
 
-         if(this.__l > var2) {
-            var2 = this.__l;
+         if (this.field750 > var2) {
+            var2 = this.field750;
          }
 
-         if(var1 > var2) {
+         if (var1 > var2) {
             var1 = var2;
          }
 
-         this.__n = var1;
-         this.__q = Integer.MIN_VALUE;
-         this.__i = -this.__u / var1;
-         this.__a = -this.__g / var1;
-         this.__z = -this.__l / var1;
+         this.field752 = var1;
+         this.field746 = Integer.MIN_VALUE;
+         this.field753 = -this.field748 / var1;
+         this.field754 = -this.field749 / var1;
+         this.field755 = -this.field750 / var1;
       }
+
    }
 
    @ObfuscatedName("ah")
-   public synchronized void __ah_193(int var1) {
-      if(this.__f < 0) {
-         this.__f = -var1;
+   public synchronized void method276(int var1) {
+      if (this.field745 < 0) {
+         this.field745 = -var1;
       } else {
-         this.__f = var1;
+         this.field745 = var1;
       }
 
    }
 
    @ObfuscatedName("ab")
-   public synchronized int __ab_194() {
-      return this.__f < 0?-this.__f:this.__f;
+   public synchronized int method277() {
+      return this.field745 < 0 ? -this.field745 : this.field745;
    }
 
    @ObfuscatedName("ae")
-   public boolean __ae_195() {
-      return this.__m < 0 || this.__m >= ((RawSound)super.sound).samples.length << 8;
+   public boolean method278() {
+      return this.field744 < 0 || this.field744 >= ((RawSound)super.sound).samples.length << 8;
    }
 
    @ObfuscatedName("at")
-   public boolean __at_196() {
-      return this.__n != 0;
+   public boolean method279() {
+      return this.field752 != 0;
    }
 
    @ObfuscatedName("ad")
-   int __ad_202(int[] var1, int var2, int var3, int var4, int var5) {
-      while(true) {
-         if(this.__n > 0) {
-            int var6 = var2 + this.__n;
-            if(var6 > var4) {
+   int method280(int[] var1, int var2, int var3, int var4, int var5) {
+      while (true) {
+         if (this.field752 > 0) {
+            int var6 = var2 + this.field752;
+            if (var6 > var4) {
                var6 = var4;
             }
 
-            this.__n += var2;
-            if(this.__f == 256 && (this.__m & 255) == 0) {
-               if(PcmPlayer.isStereo) {
-                  var2 = method2533(0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, this.__a, this.__z, 0, var6, var3, this);
+            this.field752 += var2;
+            if (this.field745 == 256 && (this.field744 & 255) == 0) {
+               if (PcmPlayer.isStereo) {
+                  var2 = method2533(0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, this.field754, this.field755, 0, var6, var3, this);
                } else {
-                  var2 = method2532(((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, this.__i, 0, var6, var3, this);
+                  var2 = method2532(((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, this.field753, 0, var6, var3, this);
                }
-            } else if(PcmPlayer.isStereo) {
-               var2 = method2504(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, this.__a, this.__z, 0, var6, var3, this, this.__f, var5);
+            } else if (PcmPlayer.isStereo) {
+               var2 = method2504(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, this.field754, this.field755, 0, var6, var3, this, this.field745, var5);
             } else {
-               var2 = method2536(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, this.__i, 0, var6, var3, this, this.__f, var5);
+               var2 = method2536(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, this.field753, 0, var6, var3, this, this.field745, var5);
             }
 
-            this.__n -= var2;
-            if(this.__n != 0) {
+            this.field752 -= var2;
+            if (this.field752 != 0) {
                return var2;
             }
 
-            if(!this.__au_204()) {
+            if (!this.method283()) {
                continue;
             }
 
             return var4;
          }
 
-         if(this.__f == 256 && (this.__m & 255) == 0) {
-            if(PcmPlayer.isStereo) {
-               return method2525(0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, 0, var4, var3, this);
+         if (this.field745 == 256 && (this.field744 & 255) == 0) {
+            if (PcmPlayer.isStereo) {
+               return method2525(0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, 0, var4, var3, this);
             }
 
-            return method2563(((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, 0, var4, var3, this);
+            return method2563(((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, 0, var4, var3, this);
          }
 
-         if(PcmPlayer.isStereo) {
-            return method2529(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, 0, var4, var3, this, this.__f, var5);
+         if (PcmPlayer.isStereo) {
+            return method2529(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, 0, var4, var3, this, this.field745, var5);
          }
 
-         return method2528(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, 0, var4, var3, this, this.__f, var5);
+         return method2528(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, 0, var4, var3, this, this.field745, var5);
       }
    }
 
    @ObfuscatedName("ap")
-   int __ap_203(int[] var1, int var2, int var3, int var4, int var5) {
-      while(true) {
-         if(this.__n > 0) {
-            int var6 = var2 + this.__n;
-            if(var6 > var4) {
+   int method281(int[] var1, int var2, int var3, int var4, int var5) {
+      while (true) {
+         if (this.field752 > 0) {
+            int var6 = var2 + this.field752;
+            if (var6 > var4) {
                var6 = var4;
             }
 
-            this.__n += var2;
-            if(this.__f == -256 && (this.__m & 255) == 0) {
-               if(PcmPlayer.isStereo) {
-                  var2 = method2547(0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, this.__a, this.__z, 0, var6, var3, this);
+            this.field752 += var2;
+            if (this.field745 == -256 && (this.field744 & 255) == 0) {
+               if (PcmPlayer.isStereo) {
+                  var2 = method2547(0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, this.field754, this.field755, 0, var6, var3, this);
                } else {
-                  var2 = method2534(((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, this.__i, 0, var6, var3, this);
+                  var2 = method2534(((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, this.field753, 0, var6, var3, this);
                }
-            } else if(PcmPlayer.isStereo) {
-               var2 = method2624(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, this.__a, this.__z, 0, var6, var3, this, this.__f, var5);
+            } else if (PcmPlayer.isStereo) {
+               var2 = method2624(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, this.field754, this.field755, 0, var6, var3, this, this.field745, var5);
             } else {
-               var2 = method2538(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, this.__i, 0, var6, var3, this, this.__f, var5);
+               var2 = method2538(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, this.field753, 0, var6, var3, this, this.field745, var5);
             }
 
-            this.__n -= var2;
-            if(this.__n != 0) {
+            this.field752 -= var2;
+            if (this.field752 != 0) {
                return var2;
             }
 
-            if(!this.__au_204()) {
+            if (!this.method283()) {
                continue;
             }
 
             return var4;
          }
 
-         if(this.__f == -256 && (this.__m & 255) == 0) {
-            if(PcmPlayer.isStereo) {
-               return method2496(0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, 0, var4, var3, this);
+         if (this.field745 == -256 && (this.field744 & 255) == 0) {
+            if (PcmPlayer.isStereo) {
+               return method2496(0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, 0, var4, var3, this);
             }
 
-            return method2636(((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, 0, var4, var3, this);
+            return method2636(((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, 0, var4, var3, this);
          }
 
-         if(PcmPlayer.isStereo) {
-            return method2531(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, 0, var4, var3, this, this.__f, var5);
+         if (PcmPlayer.isStereo) {
+            return method2531(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, 0, var4, var3, this, this.field745, var5);
          }
 
-         return method2509(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, 0, var4, var3, this, this.__f, var5);
+         return method2509(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, 0, var4, var3, this, this.field745, var5);
       }
    }
 
    @ObfuscatedName("az")
-   int __az_179() {
-      int var1 = this.__u * 3 >> 6;
+   int vmethod282() {
+      int var1 = this.field748 * 3 >> 6;
       var1 = (var1 ^ var1 >> 31) + (var1 >>> 31);
-      if(this.numLoops == 0) {
-         var1 -= var1 * this.__m / (((RawSound)super.sound).samples.length << 8);
-      } else if(this.numLoops >= 0) {
+      if (this.numLoops == 0) {
+         var1 -= var1 * this.field744 / (((RawSound)super.sound).samples.length << 8);
+      } else if (this.numLoops >= 0) {
          var1 -= var1 * this.start / ((RawSound)super.sound).samples.length;
       }
 
-      return var1 > 255?255:var1;
+      return var1 > 255 ? 255 : var1;
    }
 
    @ObfuscatedName("au")
-   boolean __au_204() {
-      int var1 = this.__q;
+   boolean method283() {
+      int var1 = this.field746;
       int var2;
       int var3;
-      if(var1 == Integer.MIN_VALUE) {
+      if (var1 == Integer.MIN_VALUE) {
          var3 = 0;
          var2 = 0;
          var1 = 0;
       } else {
-         var2 = method2603(var1, this.__o);
-         var3 = method2494(var1, this.__o);
+         var2 = method2603(var1, this.field747);
+         var3 = method2494(var1, this.field747);
       }
 
-      if(var1 == this.__u && var2 == this.__g && var3 == this.__l) {
-         if(this.__q == Integer.MIN_VALUE) {
-            this.__q = 0;
-            this.__l = 0;
-            this.__g = 0;
-            this.__u = 0;
+      if (var1 == this.field748 && var2 == this.field749 && var3 == this.field750) {
+         if (this.field746 == Integer.MIN_VALUE) {
+            this.field746 = 0;
+            this.field750 = 0;
+            this.field749 = 0;
+            this.field748 = 0;
             this.remove();
             return true;
          } else {
-            this.__o_180();
+            this.method261();
             return false;
          }
       } else {
-         if(this.__u < var1) {
-            this.__i = 1;
-            this.__n = var1 - this.__u;
-         } else if(this.__u > var1) {
-            this.__i = -1;
-            this.__n = this.__u - var1;
+         if (this.field748 < var1) {
+            this.field753 = 1;
+            this.field752 = var1 - this.field748;
+         } else if (this.field748 > var1) {
+            this.field753 = -1;
+            this.field752 = this.field748 - var1;
          } else {
-            this.__i = 0;
+            this.field753 = 0;
          }
 
-         if(this.__g < var2) {
-            this.__a = 1;
-            if(this.__n == 0 || this.__n > var2 - this.__g) {
-               this.__n = var2 - this.__g;
+         if (this.field749 < var2) {
+            this.field754 = 1;
+            if (this.field752 == 0 || this.field752 > var2 - this.field749) {
+               this.field752 = var2 - this.field749;
             }
-         } else if(this.__g > var2) {
-            this.__a = -1;
-            if(this.__n == 0 || this.__n > this.__g - var2) {
-               this.__n = this.__g - var2;
+         } else if (this.field749 > var2) {
+            this.field754 = -1;
+            if (this.field752 == 0 || this.field752 > this.field749 - var2) {
+               this.field752 = this.field749 - var2;
             }
          } else {
-            this.__a = 0;
+            this.field754 = 0;
          }
 
-         if(this.__l < var3) {
-            this.__z = 1;
-            if(this.__n == 0 || this.__n > var3 - this.__l) {
-               this.__n = var3 - this.__l;
+         if (this.field750 < var3) {
+            this.field755 = 1;
+            if (this.field752 == 0 || this.field752 > var3 - this.field750) {
+               this.field752 = var3 - this.field750;
             }
-         } else if(this.__l > var3) {
-            this.__z = -1;
-            if(this.__n == 0 || this.__n > this.__l - var3) {
-               this.__n = this.__l - var3;
+         } else if (this.field750 > var3) {
+            this.field755 = -1;
+            if (this.field752 == 0 || this.field752 > this.field750 - var3) {
+               this.field752 = this.field750 - var3;
             }
          } else {
-            this.__z = 0;
+            this.field755 = 0;
          }
 
          return false;
@@ -830,12 +832,12 @@ public class RawPcmStream extends PcmStream {
 
    @ObfuscatedName("m")
    static int method2603(int var0, int var1) {
-      return var1 < 0?var0:(int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D);
+      return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D);
    }
 
    @ObfuscatedName("f")
    static int method2494(int var0, int var1) {
-      return var1 < 0?-var0:(int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D);
+      return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D);
    }
 
    @ObfuscatedName("q")
@@ -844,7 +846,7 @@ public class RawPcmStream extends PcmStream {
    )
    @Export("createRawPcmStream")
    public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) {
-      return var0.samples != null && var0.samples.length != 0?new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(class309.PcmPlayer_sampleRate * 100)), var2 << 6):null;
+      return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(class309.PcmPlayer_sampleRate * 100)), var2 << 6) : null;
    }
 
    @ObfuscatedName("w")
@@ -852,7 +854,7 @@ public class RawPcmStream extends PcmStream {
       signature = "(Lcx;III)Lds;"
    )
    public static RawPcmStream method2524(RawSound var0, int var1, int var2, int var3) {
-      return var0.samples != null && var0.samples.length != 0?new RawPcmStream(var0, var1, var2, var3):null;
+      return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null;
    }
 
    @ObfuscatedName("ao")
@@ -863,26 +865,26 @@ public class RawPcmStream extends PcmStream {
       var2 >>= 8;
       var7 >>= 8;
       var4 <<= 2;
-      if((var5 = var3 + var7 - var2) > var6) {
+      if ((var5 = var3 + var7 - var2) > var6) {
          var5 = var6;
       }
 
-      int var10001;
-      for(var5 -= 3; var3 < var5; var1[var10001] += var0[var2++] * var4) {
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
-         var10001 = var3++;
+      int var9;
+      for (var5 -= 3; var3 < var5; var1[var9] += var0[var2++] * var4) {
+         var9 = var3++;
+         var1[var9] += var0[var2++] * var4;
+         var9 = var3++;
+         var1[var9] += var0[var2++] * var4;
+         var9 = var3++;
+         var1[var9] += var0[var2++] * var4;
+         var9 = var3++;
       }
 
-      for(var5 += 3; var3 < var5; var1[var10001] += var0[var2++] * var4) {
-         var10001 = var3++;
+      for (var5 += 3; var3 < var5; var1[var9] += var0[var2++] * var4) {
+         var9 = var3++;
       }
 
-      var8.__m = var2 << 8;
+      var8.field744 = var2 << 8;
       return var3;
    }
 
@@ -895,45 +897,45 @@ public class RawPcmStream extends PcmStream {
       var9 >>= 8;
       var5 <<= 2;
       var6 <<= 2;
-      if((var7 = var4 + var9 - var3) > var8) {
+      if ((var7 = var4 + var9 - var3) > var8) {
          var7 = var8;
       }
 
       var4 <<= 1;
       var7 <<= 1;
 
-      int var10001;
-      byte var11;
-      for(var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) {
-         var11 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
-         var2[var10001] += var11 * var6;
-         var11 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
-         var2[var10001] += var11 * var6;
-         var11 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
-         var2[var10001] += var11 * var6;
-         var11 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
+      int var11;
+      byte var12;
+      for (var7 -= 6; var4 < var7; var2[var11] += var12 * var6) {
+         var12 = var1[var3++];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
+         var2[var11] += var12 * var6;
+         var12 = var1[var3++];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
+         var2[var11] += var12 * var6;
+         var12 = var1[var3++];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
+         var2[var11] += var12 * var6;
+         var12 = var1[var3++];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
       }
 
-      for(var7 += 6; var4 < var7; var2[var10001] += var11 * var6) {
-         var11 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
+      for (var7 += 6; var4 < var7; var2[var11] += var12 * var6) {
+         var12 = var1[var3++];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
       }
 
-      var10.__m = var3 << 8;
+      var10.field744 = var3 << 8;
       return var4 >> 1;
    }
 
@@ -945,26 +947,26 @@ public class RawPcmStream extends PcmStream {
       var2 >>= 8;
       var7 >>= 8;
       var4 <<= 2;
-      if((var5 = var3 + var2 - (var7 - 1)) > var6) {
+      if ((var5 = var3 + var2 - (var7 - 1)) > var6) {
          var5 = var6;
       }
 
-      int var10001;
-      for(var5 -= 3; var3 < var5; var1[var10001] += var0[var2--] * var4) {
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
-         var10001 = var3++;
+      int var9;
+      for (var5 -= 3; var3 < var5; var1[var9] += var0[var2--] * var4) {
+         var9 = var3++;
+         var1[var9] += var0[var2--] * var4;
+         var9 = var3++;
+         var1[var9] += var0[var2--] * var4;
+         var9 = var3++;
+         var1[var9] += var0[var2--] * var4;
+         var9 = var3++;
       }
 
-      for(var5 += 3; var3 < var5; var1[var10001] += var0[var2--] * var4) {
-         var10001 = var3++;
+      for (var5 += 3; var3 < var5; var1[var9] += var0[var2--] * var4) {
+         var9 = var3++;
       }
 
-      var8.__m = var2 << 8;
+      var8.field744 = var2 << 8;
       return var3;
    }
 
@@ -977,45 +979,45 @@ public class RawPcmStream extends PcmStream {
       var9 >>= 8;
       var5 <<= 2;
       var6 <<= 2;
-      if((var7 = var3 + var4 - (var9 - 1)) > var8) {
+      if ((var7 = var3 + var4 - (var9 - 1)) > var8) {
          var7 = var8;
       }
 
       var4 <<= 1;
       var7 <<= 1;
 
-      int var10001;
-      byte var11;
-      for(var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) {
-         var11 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
-         var2[var10001] += var11 * var6;
-         var11 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
-         var2[var10001] += var11 * var6;
-         var11 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
-         var2[var10001] += var11 * var6;
-         var11 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
+      int var11;
+      byte var12;
+      for (var7 -= 6; var4 < var7; var2[var11] += var12 * var6) {
+         var12 = var1[var3--];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
+         var2[var11] += var12 * var6;
+         var12 = var1[var3--];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
+         var2[var11] += var12 * var6;
+         var12 = var1[var3--];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
+         var2[var11] += var12 * var6;
+         var12 = var1[var3--];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
       }
 
-      for(var7 += 6; var4 < var7; var2[var10001] += var11 * var6) {
-         var11 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
+      for (var7 += 6; var4 < var7; var2[var11] += var12 * var6) {
+         var12 = var1[var3--];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
       }
 
-      var10.__m = var3 << 8;
+      var10.field744 = var3 << 8;
       return var4 >> 1;
    }
 
@@ -1024,31 +1026,31 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIILds;II)I"
    )
    static int method2528(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) {
-      if(var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) {
+      if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) {
          var7 = var8;
       }
 
       byte var13;
-      int var10001;
-      while(var5 < var7) {
+      int var14;
+      while (var5 < var7) {
          var1 = var4 >> 8;
          var13 = var2[var1];
-         var10001 = var5++;
-         var3[var10001] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 255)) * var6 >> 6;
+         var14 = var5++;
+         var3[var14] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 255)) * var6 >> 6;
          var4 += var11;
       }
 
-      if(var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) {
+      if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) {
          var7 = var8;
       }
 
-      for(var1 = var12; var5 < var7; var4 += var11) {
+      for (var1 = var12; var5 < var7; var4 += var11) {
          var13 = var2[var4 >> 8];
-         var10001 = var5++;
-         var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6;
+         var14 = var5++;
+         var3[var14] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6;
       }
 
-      var10.__m = var4;
+      var10.field744 = var4;
       return var5;
    }
 
@@ -1057,40 +1059,40 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIIILds;II)I"
    )
    static int method2529(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
-      if(var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) {
+      if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) {
          var8 = var9;
       }
 
       var5 <<= 1;
 
       byte var14;
-      int var10001;
-      for(var8 <<= 1; var5 < var8; var4 += var12) {
+      int var15;
+      for (var8 <<= 1; var5 < var8; var4 += var12) {
          var1 = var4 >> 8;
          var14 = var2[var1];
          var0 = (var14 << 8) + (var4 & 255) * (var2[var1 + 1] - var14);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         var15 = var5++;
+         var3[var15] += var0 * var6 >> 6;
+         var15 = var5++;
+         var3[var15] += var0 * var7 >> 6;
       }
 
-      if(var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12 - 1) / var12) > var9) {
+      if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12 - 1) / var12) > var9) {
          var8 = var9;
       }
 
       var8 <<= 1;
 
-      for(var1 = var13; var5 < var8; var4 += var12) {
+      for (var1 = var13; var5 < var8; var4 += var12) {
          var14 = var2[var4 >> 8];
          var0 = (var14 << 8) + (var1 - var14) * (var4 & 255);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         var15 = var5++;
+         var3[var15] += var0 * var6 >> 6;
+         var15 = var5++;
+         var3[var15] += var0 * var7 >> 6;
       }
 
-      var11.__m = var4;
+      var11.field744 = var4;
       return var5 >> 1;
    }
 
@@ -1099,31 +1101,31 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIILds;II)I"
    )
    static int method2509(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) {
-      if(var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) {
+      if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) {
          var7 = var8;
       }
 
-      int var10001;
-      while(var5 < var7) {
+      int var13;
+      while (var5 < var7) {
          var1 = var4 >> 8;
-         byte var13 = var2[var1 - 1];
-         var10001 = var5++;
-         var3[var10001] += ((var13 << 8) + (var2[var1] - var13) * (var4 & 255)) * var6 >> 6;
+         byte var14 = var2[var1 - 1];
+         var13 = var5++;
+         var3[var13] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6;
          var4 += var11;
       }
 
-      if(var11 == 0 || (var7 = var5 + (var11 + (var9 - var4)) / var11) > var8) {
+      if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4)) / var11) > var8) {
          var7 = var8;
       }
 
       var0 = var12;
 
-      for(var1 = var11; var5 < var7; var4 += var1) {
-         var10001 = var5++;
-         var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6;
+      for (var1 = var11; var5 < var7; var4 += var1) {
+         var13 = var5++;
+         var3[var13] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6;
       }
 
-      var10.__m = var4;
+      var10.field744 = var4;
       return var5;
    }
 
@@ -1132,38 +1134,38 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIIILds;II)I"
    )
    static int method2531(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
-      if(var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) {
+      if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) {
          var8 = var9;
       }
 
       var5 <<= 1;
 
-      int var10001;
-      for(var8 <<= 1; var5 < var8; var4 += var12) {
+      int var14;
+      for (var8 <<= 1; var5 < var8; var4 += var12) {
          var1 = var4 >> 8;
-         byte var14 = var2[var1 - 1];
-         var0 = (var2[var1] - var14) * (var4 & 255) + (var14 << 8);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         byte var15 = var2[var1 - 1];
+         var0 = (var2[var1] - var15) * (var4 & 255) + (var15 << 8);
+         var14 = var5++;
+         var3[var14] += var0 * var6 >> 6;
+         var14 = var5++;
+         var3[var14] += var0 * var7 >> 6;
       }
 
-      if(var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) {
+      if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) {
          var8 = var9;
       }
 
       var8 <<= 1;
 
-      for(var1 = var13; var5 < var8; var4 += var12) {
+      for (var1 = var13; var5 < var8; var4 += var12) {
          var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         var14 = var5++;
+         var3[var14] += var0 * var6 >> 6;
+         var14 = var5++;
+         var3[var14] += var0 * var7 >> 6;
       }
 
-      var11.__m = var4;
+      var11.field744 = var4;
       return var5 >> 1;
    }
 
@@ -1176,35 +1178,35 @@ public class RawPcmStream extends PcmStream {
       var8 >>= 8;
       var4 <<= 2;
       var5 <<= 2;
-      if((var6 = var3 + var8 - var2) > var7) {
+      if ((var6 = var3 + var8 - var2) > var7) {
          var6 = var7;
       }
 
-      var9.__g += var9.__a * (var6 - var3);
-      var9.__l += var9.__z * (var6 - var3);
+      var9.field749 += var9.field754 * (var6 - var3);
+      var9.field750 += var9.field755 * (var6 - var3);
 
-      int var10001;
-      for(var6 -= 3; var3 < var6; var4 += var5) {
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
+      int var10;
+      for (var6 -= 3; var3 < var6; var4 += var5) {
+         var10 = var3++;
+         var1[var10] += var0[var2++] * var4;
          var4 += var5;
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
+         var10 = var3++;
+         var1[var10] += var0[var2++] * var4;
          var4 += var5;
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
+         var10 = var3++;
+         var1[var10] += var0[var2++] * var4;
          var4 += var5;
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
+         var10 = var3++;
+         var1[var10] += var0[var2++] * var4;
       }
 
-      for(var6 += 3; var3 < var6; var4 += var5) {
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
+      for (var6 += 3; var3 < var6; var4 += var5) {
+         var10 = var3++;
+         var1[var10] += var0[var2++] * var4;
       }
 
-      var9.__u = var4 >> 2;
-      var9.__m = var2 << 8;
+      var9.field748 = var4 >> 2;
+      var9.field744 = var2 << 8;
       return var3;
    }
 
@@ -1219,58 +1221,58 @@ public class RawPcmStream extends PcmStream {
       var6 <<= 2;
       var7 <<= 2;
       var8 <<= 2;
-      if((var9 = var11 + var4 - var3) > var10) {
+      if ((var9 = var11 + var4 - var3) > var10) {
          var9 = var10;
       }
 
-      var12.__u += var12.__i * (var9 - var4);
+      var12.field748 += var12.field753 * (var9 - var4);
       var4 <<= 1;
       var9 <<= 1;
 
       byte var13;
-      int var10001;
-      for(var9 -= 6; var4 < var9; var6 += var8) {
+      int var14;
+      for (var9 -= 6; var4 < var9; var6 += var8) {
          var13 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
          var6 += var8;
          var13 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
          var6 += var8;
          var13 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
          var6 += var8;
          var13 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
       }
 
-      for(var9 += 6; var4 < var9; var6 += var8) {
+      for (var9 += 6; var4 < var9; var6 += var8) {
          var13 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
       }
 
-      var12.__g = var5 >> 2;
-      var12.__l = var6 >> 2;
-      var12.__m = var3 << 8;
+      var12.field749 = var5 >> 2;
+      var12.field750 = var6 >> 2;
+      var12.field744 = var3 << 8;
       return var4 >> 1;
    }
 
@@ -1283,35 +1285,35 @@ public class RawPcmStream extends PcmStream {
       var8 >>= 8;
       var4 <<= 2;
       var5 <<= 2;
-      if((var6 = var3 + var2 - (var8 - 1)) > var7) {
+      if ((var6 = var3 + var2 - (var8 - 1)) > var7) {
          var6 = var7;
       }
 
-      var9.__g += var9.__a * (var6 - var3);
-      var9.__l += var9.__z * (var6 - var3);
+      var9.field749 += var9.field754 * (var6 - var3);
+      var9.field750 += var9.field755 * (var6 - var3);
 
-      int var10001;
-      for(var6 -= 3; var3 < var6; var4 += var5) {
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
+      int var10;
+      for (var6 -= 3; var3 < var6; var4 += var5) {
+         var10 = var3++;
+         var1[var10] += var0[var2--] * var4;
          var4 += var5;
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
+         var10 = var3++;
+         var1[var10] += var0[var2--] * var4;
          var4 += var5;
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
+         var10 = var3++;
+         var1[var10] += var0[var2--] * var4;
          var4 += var5;
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
+         var10 = var3++;
+         var1[var10] += var0[var2--] * var4;
       }
 
-      for(var6 += 3; var3 < var6; var4 += var5) {
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
+      for (var6 += 3; var3 < var6; var4 += var5) {
+         var10 = var3++;
+         var1[var10] += var0[var2--] * var4;
       }
 
-      var9.__u = var4 >> 2;
-      var9.__m = var2 << 8;
+      var9.field748 = var4 >> 2;
+      var9.field744 = var2 << 8;
       return var3;
    }
 
@@ -1326,58 +1328,58 @@ public class RawPcmStream extends PcmStream {
       var6 <<= 2;
       var7 <<= 2;
       var8 <<= 2;
-      if((var9 = var3 + var4 - (var11 - 1)) > var10) {
+      if ((var9 = var3 + var4 - (var11 - 1)) > var10) {
          var9 = var10;
       }
 
-      var12.__u += var12.__i * (var9 - var4);
+      var12.field748 += var12.field753 * (var9 - var4);
       var4 <<= 1;
       var9 <<= 1;
 
       byte var13;
-      int var10001;
-      for(var9 -= 6; var4 < var9; var6 += var8) {
+      int var14;
+      for (var9 -= 6; var4 < var9; var6 += var8) {
          var13 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
          var6 += var8;
          var13 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
          var6 += var8;
          var13 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
          var6 += var8;
          var13 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
       }
 
-      for(var9 += 6; var4 < var9; var6 += var8) {
+      for (var9 += 6; var4 < var9; var6 += var8) {
          var13 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
       }
 
-      var12.__g = var5 >> 2;
-      var12.__l = var6 >> 2;
-      var12.__m = var3 << 8;
+      var12.field749 = var5 >> 2;
+      var12.field750 = var6 >> 2;
+      var12.field744 = var3 << 8;
       return var4 >> 1;
    }
 
@@ -1386,38 +1388,38 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIIILds;II)I"
    )
    static int method2536(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
-      var11.__g -= var11.__a * var5;
-      var11.__l -= var11.__z * var5;
-      if(var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) {
+      var11.field749 -= var11.field754 * var5;
+      var11.field750 -= var11.field755 * var5;
+      if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) {
          var8 = var9;
       }
 
       byte var14;
-      int var10001;
-      while(var5 < var8) {
+      int var15;
+      while (var5 < var8) {
          var1 = var4 >> 8;
          var14 = var2[var1];
-         var10001 = var5++;
-         var3[var10001] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6;
+         var15 = var5++;
+         var3[var15] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6;
          var6 += var7;
          var4 += var12;
       }
 
-      if(var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 1) / var12) > var9) {
+      if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 1) / var12) > var9) {
          var8 = var9;
       }
 
-      for(var1 = var13; var5 < var8; var4 += var12) {
+      for (var1 = var13; var5 < var8; var4 += var12) {
          var14 = var2[var4 >> 8];
-         var10001 = var5++;
-         var3[var10001] += ((var14 << 8) + (var1 - var14) * (var4 & 255)) * var6 >> 6;
+         var15 = var5++;
+         var3[var15] += ((var14 << 8) + (var1 - var14) * (var4 & 255)) * var6 >> 6;
          var6 += var7;
       }
 
-      var11.__g += var11.__a * var5;
-      var11.__l += var11.__z * var5;
-      var11.__u = var6;
-      var11.__m = var4;
+      var11.field749 += var11.field754 * var5;
+      var11.field750 += var11.field755 * var5;
+      var11.field748 = var6;
+      var11.field744 = var4;
       return var5;
    }
 
@@ -1426,49 +1428,49 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIIIIILds;II)I"
    )
    static int method2504(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) {
-      var13.__u -= var5 * var13.__i;
-      if(var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) {
+      var13.field748 -= var5 * var13.field753;
+      if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) {
          var10 = var11;
       }
 
       var5 <<= 1;
 
       byte var16;
-      int var10001;
-      for(var10 <<= 1; var5 < var10; var4 += var14) {
+      int var17;
+      for (var10 <<= 1; var5 < var10; var4 += var14) {
          var1 = var4 >> 8;
          var16 = var2[var1];
          var0 = (var16 << 8) + (var4 & 255) * (var2[var1 + 1] - var16);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
+         var17 = var5++;
+         var3[var17] += var0 * var6 >> 6;
          var6 += var8;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         var17 = var5++;
+         var3[var17] += var0 * var7 >> 6;
          var7 += var9;
       }
 
-      if(var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14 - 1) / var14) > var11) {
+      if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14 - 1) / var14) > var11) {
          var10 = var11;
       }
 
       var10 <<= 1;
 
-      for(var1 = var15; var5 < var10; var4 += var14) {
+      for (var1 = var15; var5 < var10; var4 += var14) {
          var16 = var2[var4 >> 8];
          var0 = (var16 << 8) + (var1 - var16) * (var4 & 255);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
+         var17 = var5++;
+         var3[var17] += var0 * var6 >> 6;
          var6 += var8;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         var17 = var5++;
+         var3[var17] += var0 * var7 >> 6;
          var7 += var9;
       }
 
       var5 >>= 1;
-      var13.__u += var13.__i * var5;
-      var13.__g = var6;
-      var13.__l = var7;
-      var13.__m = var4;
+      var13.field748 += var13.field753 * var5;
+      var13.field749 = var6;
+      var13.field750 = var7;
+      var13.field744 = var4;
       return var5;
    }
 
@@ -1477,38 +1479,38 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIIILds;II)I"
    )
    static int method2538(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
-      var11.__g -= var11.__a * var5;
-      var11.__l -= var11.__z * var5;
-      if(var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) {
+      var11.field749 -= var11.field754 * var5;
+      var11.field750 -= var11.field755 * var5;
+      if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) {
          var8 = var9;
       }
 
-      int var10001;
-      while(var5 < var8) {
+      int var14;
+      while (var5 < var8) {
          var1 = var4 >> 8;
-         byte var14 = var2[var1 - 1];
-         var10001 = var5++;
-         var3[var10001] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6;
+         byte var15 = var2[var1 - 1];
+         var14 = var5++;
+         var3[var14] += ((var15 << 8) + (var2[var1] - var15) * (var4 & 255)) * var6 >> 6;
          var6 += var7;
          var4 += var12;
       }
 
-      if(var12 == 0 || (var8 = var5 + (var10 - var4 + var12) / var12) > var9) {
+      if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12) / var12) > var9) {
          var8 = var9;
       }
 
       var0 = var13;
 
-      for(var1 = var12; var5 < var8; var4 += var1) {
-         var10001 = var5++;
-         var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6;
+      for (var1 = var12; var5 < var8; var4 += var1) {
+         var14 = var5++;
+         var3[var14] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6;
          var6 += var7;
       }
 
-      var11.__g += var11.__a * var5;
-      var11.__l += var11.__z * var5;
-      var11.__u = var6;
-      var11.__m = var4;
+      var11.field749 += var11.field754 * var5;
+      var11.field750 += var11.field755 * var5;
+      var11.field748 = var6;
+      var11.field744 = var4;
       return var5;
    }
 
@@ -1517,47 +1519,47 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIIIIILds;II)I"
    )
    static int method2624(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) {
-      var13.__u -= var5 * var13.__i;
-      if(var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) {
+      var13.field748 -= var5 * var13.field753;
+      if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) {
          var10 = var11;
       }
 
       var5 <<= 1;
 
-      int var10001;
-      for(var10 <<= 1; var5 < var10; var4 += var14) {
+      int var16;
+      for (var10 <<= 1; var5 < var10; var4 += var14) {
          var1 = var4 >> 8;
-         byte var16 = var2[var1 - 1];
-         var0 = (var2[var1] - var16) * (var4 & 255) + (var16 << 8);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
+         byte var17 = var2[var1 - 1];
+         var0 = (var2[var1] - var17) * (var4 & 255) + (var17 << 8);
+         var16 = var5++;
+         var3[var16] += var0 * var6 >> 6;
          var6 += var8;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         var16 = var5++;
+         var3[var16] += var0 * var7 >> 6;
          var7 += var9;
       }
 
-      if(var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14) / var14) > var11) {
+      if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14) / var14) > var11) {
          var10 = var11;
       }
 
       var10 <<= 1;
 
-      for(var1 = var15; var5 < var10; var4 += var14) {
+      for (var1 = var15; var5 < var10; var4 += var14) {
          var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
+         var16 = var5++;
+         var3[var16] += var0 * var6 >> 6;
          var6 += var8;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         var16 = var5++;
+         var3[var16] += var0 * var7 >> 6;
          var7 += var9;
       }
 
       var5 >>= 1;
-      var13.__u += var13.__i * var5;
-      var13.__g = var6;
-      var13.__l = var7;
-      var13.__m = var4;
+      var13.field748 += var13.field753 * var5;
+      var13.field749 = var6;
+      var13.field750 = var7;
+      var13.field744 = var4;
       return var5;
    }
 }
diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java
index e746b0a448..c1b0778740 100644
--- a/runescape-client/src/main/java/RawSound.java
+++ b/runescape-client/src/main/java/RawSound.java
@@ -19,7 +19,7 @@ public class RawSound extends AbstractSound {
    @Export("end")
    int end;
    @ObfuscatedName("o")
-   public boolean __o;
+   public boolean field756;
 
    RawSound(int var1, byte[] var2, int var3, int var4) {
       this.sampleRate = var1;
@@ -33,7 +33,7 @@ public class RawSound extends AbstractSound {
       this.samples = var2;
       this.start = var3;
       this.end = var4;
-      this.__o = var5;
+      this.field756 = var5;
    }
 
    @ObfuscatedName("m")
@@ -44,12 +44,12 @@ public class RawSound extends AbstractSound {
    public RawSound resample(Decimator var1) {
       this.samples = var1.resample(this.samples);
       this.sampleRate = var1.scaleRate(this.sampleRate);
-      if(this.start == this.end) {
+      if (this.start == this.end) {
          this.start = this.end = var1.scalePosition(this.start);
       } else {
          this.start = var1.scalePosition(this.start);
          this.end = var1.scalePosition(this.end);
-         if(this.start == this.end) {
+         if (this.start == this.end) {
             --this.start;
          }
       }
diff --git a/runescape-client/src/main/java/RectangleMode.java b/runescape-client/src/main/java/RectangleMode.java
index 006557d5f8..53928a6045 100644
--- a/runescape-client/src/main/java/RectangleMode.java
+++ b/runescape-client/src/main/java/RectangleMode.java
@@ -11,17 +11,18 @@ public enum RectangleMode implements Enumerated {
    @ObfuscatedSignature(
       signature = "Llj;"
    )
-   __lj_m(0, 0),
+   field757(0, 0),
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Llj;"
    )
-   __lj_f(1, 1),
+   field758(1, 1),
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Llj;"
    )
-   __lj_q(2, 2);
+   field759(2, 2);
+
    @ObfuscatedName("d")
    @Export("musicTrackBoolean")
    public static boolean musicTrackBoolean;
@@ -38,7 +39,7 @@ public enum RectangleMode implements Enumerated {
    @Export("id2")
    final int id2;
 
-   RectangleMode(int var3, int var4) {
+   private RectangleMode(int var3, int var4) {
       this.id = var3;
       this.id2 = var4;
    }
@@ -60,7 +61,7 @@ public enum RectangleMode implements Enumerated {
    )
    public static void method6028(AbstractIndexCache var0, AbstractIndexCache var1, boolean var2) {
       ObjectDefinition.ObjectDefinition_indexCache = var0;
-      ObjectDefinition.__jr_q = var1;
+      ObjectDefinition.field640 = var1;
       ObjectDefinition.ObjectDefinition_isLowDetail = var2;
    }
 }
diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java
index 47bf872c16..23ce144181 100644
--- a/runescape-client/src/main/java/RouteStrategy.java
+++ b/runescape-client/src/main/java/RouteStrategy.java
@@ -4,8 +4,7 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("fe")
-public abstract class RouteStrategy
-{
+public abstract class RouteStrategy {
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -1237576843
@@ -13,7 +12,7 @@ public abstract class RouteStrategy
    @Export("Interpreter_intStackSize")
    static int Interpreter_intStackSize;
    @ObfuscatedName("e")
-   static byte[][][] __fe_e;
+   static byte[][][] field760;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 123677543
@@ -53,15 +52,15 @@ public abstract class RouteStrategy
    )
    public static int method3642(int var0, int var1) {
       int var2;
-      for(var2 = 1; var1 > 1; var1 >>= 1) {
-         if((var1 & 1) != 0) {
+      for (var2 = 1; var1 > 1; var1 >>= 1) {
+         if ((var1 & 1) != 0) {
             var2 = var0 * var2;
          }
 
          var0 *= var0;
       }
 
-      if(var1 == 1) {
+      if (var1 == 1) {
          return var0 * var2;
       } else {
          return var2;
@@ -76,7 +75,7 @@ public abstract class RouteStrategy
    @Export("loadSpriteFlat")
    static boolean loadSpriteFlat(AbstractIndexCache var0, int var1) {
       byte[] var2 = var0.takeRecordFlat(var1);
-      if(var2 == null) {
+      if (var2 == null) {
          return false;
       } else {
          DevicePcmPlayerProvider.decodeSprite(var2);
diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java
index 75df0eac82..64669fbe91 100644
--- a/runescape-client/src/main/java/RunException.java
+++ b/runescape-client/src/main/java/RunException.java
@@ -24,7 +24,7 @@ public class RunException extends RuntimeException {
    @ObfuscatedGetter(
       intValue = 121013503
    )
-   public static int __fx_w;
+   public static int field761;
    @ObfuscatedName("o")
    @Export("string")
    String string;
@@ -54,13 +54,12 @@ public class RunException extends RuntimeException {
    public static void method3431() {
       Object var0 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
       synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) {
-         if(IndexStoreActionHandler.__iv_q != 0) {
-            IndexStoreActionHandler.__iv_q = 1;
+         if (IndexStoreActionHandler.field412 != 0) {
+            IndexStoreActionHandler.field412 = 1;
 
             try {
                IndexStoreActionHandler.IndexStoreActionHandler_lock.wait();
-            } catch (InterruptedException var3) {
-               ;
+            } catch (InterruptedException var4) {
             }
          }
 
diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java
index 85a75d1337..3fee0d60ae 100644
--- a/runescape-client/src/main/java/Scene.java
+++ b/runescape-client/src/main/java/Scene.java
@@ -112,19 +112,19 @@ public class Scene {
    @Export("Scene_tilesDeque")
    static NodeDeque Scene_tilesDeque;
    @ObfuscatedName("au")
-   static final int[] __em_au;
+   static final int[] field762;
    @ObfuscatedName("ao")
-   static final int[] __em_ao;
+   static final int[] field763;
    @ObfuscatedName("aa")
-   static final int[] __em_aa;
+   static final int[] field764;
    @ObfuscatedName("ax")
-   static final int[] __em_ax;
+   static final int[] field765;
    @ObfuscatedName("af")
-   static final int[] __em_af;
+   static final int[] field766;
    @ObfuscatedName("ai")
-   static final int[] __em_ai;
+   static final int[] field767;
    @ObfuscatedName("ba")
-   static final int[] __em_ba;
+   static final int[] field768;
    @ObfuscatedName("bc")
    @Export("visibilityMap")
    static boolean[][][][] visibilityMap;
@@ -180,51 +180,23 @@ public class Scene {
    @Export("tempGameObjects")
    GameObject[] tempGameObjects;
    @ObfuscatedName("x")
-   int[][][] __x;
+   int[][][] field769;
    @ObfuscatedName("bk")
-   int[][] __bk;
+   int[][] field770;
    @ObfuscatedName("bd")
-   int[][] __bd;
-
-   static {
-      Scene_isLowDetail = true;
-      tileUpdateCount = 0;
-      Scene_plane = 0;
-      Scene_gameObjects = new GameObject[100];
-      checkClick = false;
-      Scene_selectedPlane = 0;
-      Scene_selectedScreenX = 0;
-      Scene_selectedScreenY = 0;
-      Scene_selectedX = -1;
-      Scene_selectedY = -1;
-      viewportWalking = false;
-      Scene_planesCount = 4;
-      Scene_planeOccluderCounts = new int[Scene_planesCount];
-      Scene_planeOccluders = new Occluder[Scene_planesCount][500];
-      Scene_currentOccludersCount = 0;
-      Scene_currentOccluders = new Occluder[500];
-      Scene_tilesDeque = new NodeDeque();
-      __em_au = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76};
-      __em_ao = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160};
-      __em_aa = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19};
-      __em_ax = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0};
-      __em_af = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4};
-      __em_ai = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0};
-      __em_ba = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8};
-      visibilityMap = new boolean[8][32][51][51];
-   }
+   int[][] field771;
 
    public Scene(int var1, int var2, int var3, int[][][] var4) {
       this.Scene_minPlane = 0;
       this.tempGameObjectsCount = 0;
       this.tempGameObjects = new GameObject[5000];
-      this.__bk = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}};
-      this.__bd = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}};
+      this.field770 = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}};
+      this.field771 = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}};
       this.planes = var1;
       this.xSize = var2;
       this.ySize = var3;
       this.tiles = new Tile[var1][var2][var3];
-      this.__x = new int[var1][var2 + 1][var3 + 1];
+      this.field769 = new int[var1][var2 + 1][var3 + 1];
       this.tileHeights = var4;
       this.clear();
    }
@@ -234,29 +206,29 @@ public class Scene {
    public void clear() {
       int var1;
       int var2;
-      for(var1 = 0; var1 < this.planes; ++var1) {
-         for(var2 = 0; var2 < this.xSize; ++var2) {
-            for(int var3 = 0; var3 < this.ySize; ++var3) {
+      for (var1 = 0; var1 < this.planes; ++var1) {
+         for (var2 = 0; var2 < this.xSize; ++var2) {
+            for (int var3 = 0; var3 < this.ySize; ++var3) {
                this.tiles[var1][var2][var3] = null;
             }
          }
       }
 
-      for(var1 = 0; var1 < Scene_planesCount; ++var1) {
-         for(var2 = 0; var2 < Scene_planeOccluderCounts[var1]; ++var2) {
+      for (var1 = 0; var1 < Scene_planesCount; ++var1) {
+         for (var2 = 0; var2 < Scene_planeOccluderCounts[var1]; ++var2) {
             Scene_planeOccluders[var1][var2] = null;
          }
 
          Scene_planeOccluderCounts[var1] = 0;
       }
 
-      for(var1 = 0; var1 < this.tempGameObjectsCount; ++var1) {
+      for (var1 = 0; var1 < this.tempGameObjectsCount; ++var1) {
          this.tempGameObjects[var1] = null;
       }
 
       this.tempGameObjectsCount = 0;
 
-      for(var1 = 0; var1 < Scene_gameObjects.length; ++var1) {
+      for (var1 = 0; var1 < Scene_gameObjects.length; ++var1) {
          Scene_gameObjects[var1] = null;
       }
 
@@ -267,9 +239,9 @@ public class Scene {
    public void init(int var1) {
       this.Scene_minPlane = var1;
 
-      for(int var2 = 0; var2 < this.xSize; ++var2) {
-         for(int var3 = 0; var3 < this.ySize; ++var3) {
-            if(this.tiles[var1][var2][var3] == null) {
+      for (int var2 = 0; var2 < this.xSize; ++var2) {
+         for (int var3 = 0; var3 < this.ySize; ++var3) {
+            if (this.tiles[var1][var2][var3] == null) {
                this.tiles[var1][var2][var3] = new Tile(var1, var2, var3);
             }
          }
@@ -282,24 +254,24 @@ public class Scene {
    public void setLinkBelow(int var1, int var2) {
       Tile var3 = this.tiles[0][var1][var2];
 
-      for(int var4 = 0; var4 < 3; ++var4) {
+      for (int var4 = 0; var4 < 3; ++var4) {
          Tile var5 = this.tiles[var4][var1][var2] = this.tiles[var4 + 1][var1][var2];
-         if(var5 != null) {
+         if (var5 != null) {
             --var5.plane;
 
-            for(int var6 = 0; var6 < var5.gameObjectsCount; ++var6) {
+            for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) {
                GameObject var7 = var5.gameObjects[var6];
-               long var9 = var7.tag;
-               int var11 = (int)(var9 >>> 14 & 3L);
-               boolean var8 = var11 == 2;
-               if(var8 && var7.startX == var1 && var2 == var7.startY) {
+               long var8 = var7.tag;
+               int var10 = (int)(var8 >>> 14 & 3L);
+               boolean var11 = var10 == 2;
+               if (var11 && var7.startX == var1 && var2 == var7.startY) {
                   --var7.plane;
                }
             }
          }
       }
 
-      if(this.tiles[0][var1][var2] == null) {
+      if (this.tiles[0][var1][var2] == null) {
          this.tiles[0][var1][var2] = new Tile(0, var1, var2);
       }
 
@@ -311,9 +283,10 @@ public class Scene {
    @Export("setTileMinPlane")
    public void setTileMinPlane(int var1, int var2, int var3, int var4) {
       Tile var5 = this.tiles[var1][var2][var3];
-      if(var5 != null) {
+      if (var5 != null) {
          this.tiles[var1][var2][var3].minPlane = var4;
       }
+
    }
 
    @ObfuscatedName("u")
@@ -321,21 +294,21 @@ public class Scene {
    public void addTile(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 var20) {
       TilePaint var21;
       int var22;
-      if(var4 == 0) {
+      if (var4 == 0) {
          var21 = new TilePaint(var11, var12, var13, var14, -1, var19, false);
 
-         for(var22 = var1; var22 >= 0; --var22) {
-            if(this.tiles[var22][var2][var3] == null) {
+         for (var22 = var1; var22 >= 0; --var22) {
+            if (this.tiles[var22][var2][var3] == null) {
                this.tiles[var22][var2][var3] = new Tile(var22, var2, var3);
             }
          }
 
          this.tiles[var1][var2][var3].paint = var21;
-      } else if(var4 != 1) {
+      } else if (var4 != 1) {
          TileModel var23 = new TileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20);
 
-         for(var22 = var1; var22 >= 0; --var22) {
-            if(this.tiles[var22][var2][var3] == null) {
+         for (var22 = var1; var22 >= 0; --var22) {
+            if (this.tiles[var22][var2][var3] == null) {
                this.tiles[var22][var2][var3] = new Tile(var22, var2, var3);
             }
          }
@@ -344,14 +317,15 @@ public class Scene {
       } else {
          var21 = new TilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7);
 
-         for(var22 = var1; var22 >= 0; --var22) {
-            if(this.tiles[var22][var2][var3] == null) {
+         for (var22 = var1; var22 >= 0; --var22) {
+            if (this.tiles[var22][var2][var3] == null) {
                this.tiles[var22][var2][var3] = new Tile(var22, var2, var3);
             }
          }
 
          this.tiles[var1][var2][var3].paint = var21;
       }
+
    }
 
    @ObfuscatedName("g")
@@ -360,7 +334,7 @@ public class Scene {
    )
    @Export("newFloorDecoration")
    public void newFloorDecoration(int var1, int var2, int var3, int var4, Entity var5, long var6, int var8) {
-      if(var5 != null) {
+      if (var5 != null) {
          FloorDecoration var9 = new FloorDecoration();
          var9.entity = var5;
          var9.x = var2 * 128 + 64;
@@ -368,12 +342,13 @@ public class Scene {
          var9.tileHeight = var4;
          var9.tag = var6;
          var9.flags = var8;
-         if(this.tiles[var1][var2][var3] == null) {
+         if (this.tiles[var1][var2][var3] == null) {
             this.tiles[var1][var2][var3] = new Tile(var1, var2, var3);
          }
 
          this.tiles[var1][var2][var3].floorDecoration = var9;
       }
+
    }
 
    @ObfuscatedName("l")
@@ -392,12 +367,12 @@ public class Scene {
       var10.third = var9;
       int var11 = 0;
       Tile var12 = this.tiles[var1][var2][var3];
-      if(var12 != null) {
-         for(int var13 = 0; var13 < var12.gameObjectsCount; ++var13) {
-            if((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].entity instanceof Model) {
+      if (var12 != null) {
+         for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) {
+            if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].entity instanceof Model) {
                Model var14 = (Model)var12.gameObjects[var13].entity;
                var14.calculateBoundsCylinder();
-               if(var14.height > var11) {
+               if (var14.height > var11) {
                   var11 = var14.height;
                }
             }
@@ -405,7 +380,7 @@ public class Scene {
       }
 
       var10.height = var11;
-      if(this.tiles[var1][var2][var3] == null) {
+      if (this.tiles[var1][var2][var3] == null) {
          this.tiles[var1][var2][var3] = new Tile(var1, var2, var3);
       }
 
@@ -418,7 +393,7 @@ public class Scene {
    )
    @Export("newBoundaryObject")
    public void newBoundaryObject(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, long var9, int var11) {
-      if(var5 != null || var6 != null) {
+      if (var5 != null || var6 != null) {
          BoundaryObject var12 = new BoundaryObject();
          var12.tag = var9;
          var12.flags = var11;
@@ -430,14 +405,15 @@ public class Scene {
          var12.orientationA = var7;
          var12.orientationB = var8;
 
-         for(int var13 = var1; var13 >= 0; --var13) {
-            if(this.tiles[var13][var2][var3] == null) {
+         for (int var13 = var1; var13 >= 0; --var13) {
+            if (this.tiles[var13][var2][var3] == null) {
                this.tiles[var13][var2][var3] = new Tile(var13, var2, var3);
             }
          }
 
          this.tiles[var1][var2][var3].boundaryObject = var12;
       }
+
    }
 
    @ObfuscatedName("x")
@@ -446,7 +422,7 @@ public class Scene {
    )
    @Export("newWallDecoration")
    public void newWallDecoration(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long var11, int var13) {
-      if(var5 != null) {
+      if (var5 != null) {
          WallDecoration var14 = new WallDecoration();
          var14.tag = var11;
          var14.flags = var13;
@@ -460,22 +436,23 @@ public class Scene {
          var14.xOffset = var9;
          var14.yOffset = var10;
 
-         for(int var15 = var1; var15 >= 0; --var15) {
-            if(this.tiles[var15][var2][var3] == null) {
+         for (int var15 = var1; var15 >= 0; --var15) {
+            if (this.tiles[var15][var2][var3] == null) {
                this.tiles[var15][var2][var3] = new Tile(var15, var2, var3);
             }
          }
 
          this.tiles[var1][var2][var3].wallDecoration = var14;
       }
+
    }
 
    @ObfuscatedName("d")
    @ObfuscatedSignature(
       signature = "(IIIIIILex;IJI)Z"
    )
-   public boolean __d_238(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) {
-      if(var7 == null) {
+   public boolean method284(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) {
+      if (var7 == null) {
          return true;
       } else {
          int var12 = var5 * 64 + var2 * 128;
@@ -488,28 +465,28 @@ public class Scene {
    @ObfuscatedSignature(
       signature = "(IIIIILex;IJZ)Z"
    )
-   public boolean __a_239(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) {
-      if(var6 == null) {
+   public boolean method285(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) {
+      if (var6 == null) {
          return true;
       } else {
          int var11 = var2 - var5;
          int var12 = var3 - var5;
          int var13 = var5 + var2;
          int var14 = var3 + var5;
-         if(var10) {
-            if(var7 > 640 && var7 < 1408) {
+         if (var10) {
+            if (var7 > 640 && var7 < 1408) {
                var14 += 128;
             }
 
-            if(var7 > 1152 && var7 < 1920) {
+            if (var7 > 1152 && var7 < 1920) {
                var13 += 128;
             }
 
-            if(var7 > 1664 || var7 < 384) {
+            if (var7 > 1664 || var7 < 384) {
                var12 -= 128;
             }
 
-            if(var7 > 128 && var7 < 896) {
+            if (var7 > 128 && var7 < 896) {
                var11 -= 128;
             }
          }
@@ -526,8 +503,8 @@ public class Scene {
    @ObfuscatedSignature(
       signature = "(IIIIILex;IJIIII)Z"
    )
-   public boolean __z_240(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, int var10, int var11, int var12, int var13) {
-      return var6 == null?true:this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0);
+   public boolean method286(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, int var10, int var11, int var12, int var13) {
+      return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0);
    }
 
    @ObfuscatedName("j")
@@ -536,69 +513,69 @@ public class Scene {
    )
    @Export("newGameObject")
    boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Entity var9, int var10, boolean var11, long var12, int var14) {
-      int var16;
-      for(int var15 = var2; var15 < var2 + var4; ++var15) {
-         for(var16 = var3; var16 < var3 + var5; ++var16) {
-            if(var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) {
+      int var15;
+      for (int var16 = var2; var16 < var2 + var4; ++var16) {
+         for (var15 = var3; var15 < var3 + var5; ++var15) {
+            if (var16 < 0 || var15 < 0 || var16 >= this.xSize || var15 >= this.ySize) {
                return false;
             }
 
-            Tile var17 = this.tiles[var1][var15][var16];
-            if(var17 != null && var17.gameObjectsCount >= 5) {
+            Tile var17 = this.tiles[var1][var16][var15];
+            if (var17 != null && var17.gameObjectsCount >= 5) {
                return false;
             }
          }
       }
 
-      GameObject var21 = new GameObject();
-      var21.tag = var12;
-      var21.flags = var14;
-      var21.plane = var1;
-      var21.centerX = var6;
-      var21.centerY = var7;
-      var21.height = var8;
-      var21.entity = var9;
-      var21.orientation = var10;
-      var21.startX = var2;
-      var21.startY = var3;
-      var21.endX = var2 + var4 - 1;
-      var21.endY = var3 + var5 - 1;
+      GameObject var20 = new GameObject();
+      var20.tag = var12;
+      var20.flags = var14;
+      var20.plane = var1;
+      var20.centerX = var6;
+      var20.centerY = var7;
+      var20.height = var8;
+      var20.entity = var9;
+      var20.orientation = var10;
+      var20.startX = var2;
+      var20.startY = var3;
+      var20.endX = var2 + var4 - 1;
+      var20.endY = var3 + var5 - 1;
 
-      for(var16 = var2; var16 < var2 + var4; ++var16) {
-         for(int var22 = var3; var22 < var3 + var5; ++var22) {
+      for (var15 = var2; var15 < var2 + var4; ++var15) {
+         for (int var21 = var3; var21 < var3 + var5; ++var21) {
             int var18 = 0;
-            if(var16 > var2) {
+            if (var15 > var2) {
                ++var18;
             }
 
-            if(var16 < var2 + var4 - 1) {
+            if (var15 < var2 + var4 - 1) {
                var18 += 4;
             }
 
-            if(var22 > var3) {
+            if (var21 > var3) {
                var18 += 8;
             }
 
-            if(var22 < var3 + var5 - 1) {
+            if (var21 < var3 + var5 - 1) {
                var18 += 2;
             }
 
-            for(int var19 = var1; var19 >= 0; --var19) {
-               if(this.tiles[var19][var16][var22] == null) {
-                  this.tiles[var19][var16][var22] = new Tile(var19, var16, var22);
+            for (int var19 = var1; var19 >= 0; --var19) {
+               if (this.tiles[var19][var15][var21] == null) {
+                  this.tiles[var19][var15][var21] = new Tile(var19, var15, var21);
                }
             }
 
-            Tile var23 = this.tiles[var1][var16][var22];
-            var23.gameObjects[var23.gameObjectsCount] = var21;
-            var23.gameObjectEdgeMasks[var23.gameObjectsCount] = var18;
-            var23.gameObjectsEdgeMask |= var18;
-            ++var23.gameObjectsCount;
+            Tile var22 = this.tiles[var1][var15][var21];
+            var22.gameObjects[var22.gameObjectsCount] = var20;
+            var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18;
+            var22.gameObjectsEdgeMask |= var18;
+            ++var22.gameObjectsCount;
          }
       }
 
-      if(var11) {
-         this.tempGameObjects[this.tempGameObjectsCount++] = var21;
+      if (var11) {
+         this.tempGameObjects[this.tempGameObjectsCount++] = var20;
       }
 
       return true;
@@ -607,7 +584,7 @@ public class Scene {
    @ObfuscatedName("s")
    @Export("clearTempGameObjects")
    public void clearTempGameObjects() {
-      for(int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) {
+      for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) {
          GameObject var2 = this.tempGameObjects[var1];
          this.removeGameObject(var2);
          this.tempGameObjects[var1] = null;
@@ -622,16 +599,16 @@ public class Scene {
    )
    @Export("removeGameObject")
    void removeGameObject(GameObject var1) {
-      for(int var2 = var1.startX; var2 <= var1.endX; ++var2) {
-         for(int var3 = var1.startY; var3 <= var1.endY; ++var3) {
+      for (int var2 = var1.startX; var2 <= var1.endX; ++var2) {
+         for (int var3 = var1.startY; var3 <= var1.endY; ++var3) {
             Tile var4 = this.tiles[var1.plane][var2][var3];
-            if(var4 != null) {
+            if (var4 != null) {
                int var5;
-               for(var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
-                  if(var4.gameObjects[var5] == var1) {
+               for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
+                  if (var4.gameObjects[var5] == var1) {
                      --var4.gameObjectsCount;
 
-                     for(int var6 = var5; var6 < var4.gameObjectsCount; ++var6) {
+                     for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) {
                         var4.gameObjects[var6] = var4.gameObjects[var6 + 1];
                         var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1];
                      }
@@ -643,7 +620,7 @@ public class Scene {
 
                var4.gameObjectsEdgeMask = 0;
 
-               for(var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
+               for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
                   var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5];
                }
             }
@@ -653,69 +630,74 @@ public class Scene {
    }
 
    @ObfuscatedName("y")
-   public void __y_241(int var1, int var2, int var3, int var4) {
+   public void method287(int var1, int var2, int var3, int var4) {
       Tile var5 = this.tiles[var1][var2][var3];
-      if(var5 != null) {
+      if (var5 != null) {
          WallDecoration var6 = var5.wallDecoration;
-         if(var6 != null) {
+         if (var6 != null) {
             var6.xOffset = var4 * var6.xOffset / 16;
             var6.yOffset = var4 * var6.yOffset / 16;
          }
       }
+
    }
 
    @ObfuscatedName("h")
    @Export("removeBoundaryObject")
    public void removeBoundaryObject(int var1, int var2, int var3) {
       Tile var4 = this.tiles[var1][var2][var3];
-      if(var4 != null) {
+      if (var4 != null) {
          var4.boundaryObject = null;
       }
+
    }
 
    @ObfuscatedName("b")
    @Export("removeWallDecoration")
    public void removeWallDecoration(int var1, int var2, int var3) {
       Tile var4 = this.tiles[var1][var2][var3];
-      if(var4 != null) {
+      if (var4 != null) {
          var4.wallDecoration = null;
       }
+
    }
 
    @ObfuscatedName("c")
-   public void __c_242(int var1, int var2, int var3) {
+   public void method288(int var1, int var2, int var3) {
       Tile var4 = this.tiles[var1][var2][var3];
-      if(var4 != null) {
-         for(int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
+      if (var4 != null) {
+         for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
             GameObject var6 = var4.gameObjects[var5];
-            long var8 = var6.tag;
-            int var10 = (int)(var8 >>> 14 & 3L);
-            boolean var7 = var10 == 2;
-            if(var7 && var2 == var6.startX && var3 == var6.startY) {
+            long var7 = var6.tag;
+            int var9 = (int)(var7 >>> 14 & 3L);
+            boolean var10 = var9 == 2;
+            if (var10 && var2 == var6.startX && var3 == var6.startY) {
                this.removeGameObject(var6);
                return;
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("p")
    @Export("removeFloorDecoration")
    public void removeFloorDecoration(int var1, int var2, int var3) {
       Tile var4 = this.tiles[var1][var2][var3];
-      if(var4 != null) {
+      if (var4 != null) {
          var4.floorDecoration = null;
       }
+
    }
 
    @ObfuscatedName("v")
    @Export("removeGroundItemPile")
    public void removeGroundItemPile(int var1, int var2, int var3) {
       Tile var4 = this.tiles[var1][var2][var3];
-      if(var4 != null) {
+      if (var4 != null) {
          var4.groundItemPile = null;
       }
+
    }
 
    @ObfuscatedName("ag")
@@ -725,7 +707,7 @@ public class Scene {
    @Export("getBoundaryObject")
    public BoundaryObject getBoundaryObject(int var1, int var2, int var3) {
       Tile var4 = this.tiles[var1][var2][var3];
-      return var4 == null?null:var4.boundaryObject;
+      return var4 == null ? null : var4.boundaryObject;
    }
 
    @ObfuscatedName("aq")
@@ -735,24 +717,24 @@ public class Scene {
    @Export("getWallDecoration")
    public WallDecoration getWallDecoration(int var1, int var2, int var3) {
       Tile var4 = this.tiles[var1][var2][var3];
-      return var4 == null?null:var4.wallDecoration;
+      return var4 == null ? null : var4.wallDecoration;
    }
 
    @ObfuscatedName("aj")
    @ObfuscatedSignature(
       signature = "(III)Leh;"
    )
-   public GameObject __aj_243(int var1, int var2, int var3) {
+   public GameObject method289(int var1, int var2, int var3) {
       Tile var4 = this.tiles[var1][var2][var3];
-      if(var4 == null) {
+      if (var4 == null) {
          return null;
       } else {
-         for(int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
+         for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
             GameObject var6 = var4.gameObjects[var5];
-            long var8 = var6.tag;
-            int var10 = (int)(var8 >>> 14 & 3L);
-            boolean var7 = var10 == 2;
-            if(var7 && var2 == var6.startX && var3 == var6.startY) {
+            long var7 = var6.tag;
+            int var9 = (int)(var7 >>> 14 & 3L);
+            boolean var10 = var9 == 2;
+            if (var10 && var2 == var6.startX && var3 == var6.startY) {
                return var6;
             }
          }
@@ -768,33 +750,33 @@ public class Scene {
    @Export("getFloorDecoration")
    public FloorDecoration getFloorDecoration(int var1, int var2, int var3) {
       Tile var4 = this.tiles[var1][var2][var3];
-      return var4 != null && var4.floorDecoration != null?var4.floorDecoration:null;
+      return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null;
    }
 
    @ObfuscatedName("ar")
-   public long __ar_244(int var1, int var2, int var3) {
+   public long method290(int var1, int var2, int var3) {
       Tile var4 = this.tiles[var1][var2][var3];
-      return var4 != null && var4.boundaryObject != null?var4.boundaryObject.tag:0L;
+      return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L;
    }
 
    @ObfuscatedName("ac")
-   public long __ac_245(int var1, int var2, int var3) {
+   public long method291(int var1, int var2, int var3) {
       Tile var4 = this.tiles[var1][var2][var3];
-      return var4 != null && var4.wallDecoration != null?var4.wallDecoration.tag:0L;
+      return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L;
    }
 
    @ObfuscatedName("ay")
-   public long __ay_246(int var1, int var2, int var3) {
+   public long method292(int var1, int var2, int var3) {
       Tile var4 = this.tiles[var1][var2][var3];
-      if(var4 == null) {
+      if (var4 == null) {
          return 0L;
       } else {
-         for(int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
+         for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
             GameObject var6 = var4.gameObjects[var5];
-            long var8 = var6.tag;
-            int var10 = (int)(var8 >>> 14 & 3L);
-            boolean var7 = var10 == 2;
-            if(var7 && var2 == var6.startX && var3 == var6.startY) {
+            long var7 = var6.tag;
+            int var9 = (int)(var7 >>> 14 & 3L);
+            boolean var10 = var9 == 2;
+            if (var10 && var2 == var6.startX && var3 == var6.startY) {
                return var6.tag;
             }
          }
@@ -807,24 +789,24 @@ public class Scene {
    @Export("getFloorDecorationTag")
    public long getFloorDecorationTag(int var1, int var2, int var3) {
       Tile var4 = this.tiles[var1][var2][var3];
-      return var4 != null && var4.floorDecoration != null?var4.floorDecoration.tag:0L;
+      return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L;
    }
 
    @ObfuscatedName("ak")
    @Export("getObjectFlags")
    public int getObjectFlags(int var1, int var2, int var3, long var4) {
       Tile var6 = this.tiles[var1][var2][var3];
-      if(var6 == null) {
+      if (var6 == null) {
          return -1;
-      } else if(var6.boundaryObject != null && var6.boundaryObject.tag == var4) {
+      } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) {
          return var6.boundaryObject.flags & 255;
-      } else if(var6.wallDecoration != null && var6.wallDecoration.tag == var4) {
+      } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) {
          return var6.wallDecoration.flags & 255;
-      } else if(var6.floorDecoration != null && var6.floorDecoration.tag == var4) {
+      } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) {
          return var6.floorDecoration.flags & 255;
       } else {
-         for(int var7 = 0; var7 < var6.gameObjectsCount; ++var7) {
-            if(var6.gameObjects[var7].tag == var4) {
+         for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) {
+            if (var6.gameObjects[var7].tag == var4) {
                return var6.gameObjects[var7].flags & 255;
             }
          }
@@ -834,41 +816,41 @@ public class Scene {
    }
 
    @ObfuscatedName("aw")
-   public void __aw_247(int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < this.planes; ++var4) {
-         for(int var5 = 0; var5 < this.xSize; ++var5) {
-            for(int var6 = 0; var6 < this.ySize; ++var6) {
+   public void method293(int var1, int var2, int var3) {
+      for (int var4 = 0; var4 < this.planes; ++var4) {
+         for (int var5 = 0; var5 < this.xSize; ++var5) {
+            for (int var6 = 0; var6 < this.ySize; ++var6) {
                Tile var7 = this.tiles[var4][var5][var6];
-               if(var7 != null) {
+               if (var7 != null) {
                   BoundaryObject var8 = var7.boundaryObject;
-                  ModelData var10;
-                  if(var8 != null && var8.entity1 instanceof ModelData) {
-                     ModelData var9 = (ModelData)var8.entity1;
-                     this.__ab_249(var9, var4, var5, var6, 1, 1);
-                     if(var8.entity2 instanceof ModelData) {
-                        var10 = (ModelData)var8.entity2;
-                        this.__ab_249(var10, var4, var5, var6, 1, 1);
-                        ModelData.method2800(var9, var10, 0, 0, 0, false);
-                        var8.entity2 = var10.toModel(var10.__aq, var10.__aj, var1, var2, var3);
+                  ModelData var9;
+                  if (var8 != null && var8.entity1 instanceof ModelData) {
+                     ModelData var10 = (ModelData)var8.entity1;
+                     this.method295(var10, var4, var5, var6, 1, 1);
+                     if (var8.entity2 instanceof ModelData) {
+                        var9 = (ModelData)var8.entity2;
+                        this.method295(var9, var4, var5, var6, 1, 1);
+                        ModelData.method2800(var10, var9, 0, 0, 0, false);
+                        var8.entity2 = var9.toModel(var9.field559, var9.field560, var1, var2, var3);
                      }
 
-                     var8.entity1 = var9.toModel(var9.__aq, var9.__aj, var1, var2, var3);
+                     var8.entity1 = var10.toModel(var10.field559, var10.field560, var1, var2, var3);
                   }
 
-                  for(int var12 = 0; var12 < var7.gameObjectsCount; ++var12) {
-                     GameObject var14 = var7.gameObjects[var12];
-                     if(var14 != null && var14.entity instanceof ModelData) {
-                        ModelData var11 = (ModelData)var14.entity;
-                        this.__ab_249(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1);
-                        var14.entity = var11.toModel(var11.__aq, var11.__aj, var1, var2, var3);
+                  for (int var13 = 0; var13 < var7.gameObjectsCount; ++var13) {
+                     GameObject var11 = var7.gameObjects[var13];
+                     if (var11 != null && var11.entity instanceof ModelData) {
+                        ModelData var12 = (ModelData)var11.entity;
+                        this.method295(var12, var4, var5, var6, var11.endX - var11.startX + 1, var11.endY - var11.startY + 1);
+                        var11.entity = var12.toModel(var12.field559, var12.field560, var1, var2, var3);
                      }
                   }
 
-                  FloorDecoration var13 = var7.floorDecoration;
-                  if(var13 != null && var13.entity instanceof ModelData) {
-                     var10 = (ModelData)var13.entity;
-                     this.__al_248(var10, var4, var5, var6);
-                     var13.entity = var10.toModel(var10.__aq, var10.__aj, var1, var2, var3);
+                  FloorDecoration var14 = var7.floorDecoration;
+                  if (var14 != null && var14.entity instanceof ModelData) {
+                     var9 = (ModelData)var14.entity;
+                     this.method294(var9, var4, var5, var6);
+                     var14.entity = var9.toModel(var9.field559, var9.field560, var1, var2, var3);
                   }
                }
             }
@@ -881,36 +863,36 @@ public class Scene {
    @ObfuscatedSignature(
       signature = "(Ldw;III)V"
    )
-   void __al_248(ModelData var1, int var2, int var3, int var4) {
+   void method294(ModelData var1, int var2, int var3, int var4) {
       Tile var5;
       ModelData var6;
-      if(var3 < this.xSize) {
+      if (var3 < this.xSize) {
          var5 = this.tiles[var2][var3 + 1][var4];
-         if(var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
+         if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
             var6 = (ModelData)var5.floorDecoration.entity;
             ModelData.method2800(var1, var6, 128, 0, 0, true);
          }
       }
 
-      if(var4 < this.xSize) {
+      if (var4 < this.xSize) {
          var5 = this.tiles[var2][var3][var4 + 1];
-         if(var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
+         if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
             var6 = (ModelData)var5.floorDecoration.entity;
             ModelData.method2800(var1, var6, 0, 0, 128, true);
          }
       }
 
-      if(var3 < this.xSize && var4 < this.ySize) {
+      if (var3 < this.xSize && var4 < this.ySize) {
          var5 = this.tiles[var2][var3 + 1][var4 + 1];
-         if(var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
+         if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
             var6 = (ModelData)var5.floorDecoration.entity;
             ModelData.method2800(var1, var6, 128, 0, 128, true);
          }
       }
 
-      if(var3 < this.xSize && var4 > 0) {
+      if (var3 < this.xSize && var4 > 0) {
          var5 = this.tiles[var2][var3 + 1][var4 - 1];
-         if(var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
+         if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
             var6 = (ModelData)var5.floorDecoration.entity;
             ModelData.method2800(var1, var6, 128, 0, -128, true);
          }
@@ -922,39 +904,39 @@ public class Scene {
    @ObfuscatedSignature(
       signature = "(Ldw;IIIII)V"
    )
-   void __ab_249(ModelData var1, int var2, int var3, int var4, int var5, int var6) {
+   void method295(ModelData var1, int var2, int var3, int var4, int var5, int var6) {
       boolean var7 = true;
       int var8 = var3;
       int var9 = var3 + var5;
       int var10 = var4 - 1;
       int var11 = var4 + var6;
 
-      for(int var12 = var2; var12 <= var2 + 1; ++var12) {
-         if(var12 != this.planes) {
-            for(int var13 = var8; var13 <= var9; ++var13) {
-               if(var13 >= 0 && var13 < this.xSize) {
-                  for(int var14 = var10; var14 <= var11; ++var14) {
-                     if(var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) {
+      for (int var12 = var2; var12 <= var2 + 1; ++var12) {
+         if (var12 != this.planes) {
+            for (int var13 = var8; var13 <= var9; ++var13) {
+               if (var13 >= 0 && var13 < this.xSize) {
+                  for (int var14 = var10; var14 <= var11; ++var14) {
+                     if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) {
                         Tile var15 = this.tiles[var12][var13][var14];
-                        if(var15 != null) {
+                        if (var15 != null) {
                            int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4;
                            BoundaryObject var17 = var15.boundaryObject;
-                           if(var17 != null) {
+                           if (var17 != null) {
                               ModelData var18;
-                              if(var17.entity1 instanceof ModelData) {
+                              if (var17.entity1 instanceof ModelData) {
                                  var18 = (ModelData)var17.entity1;
                                  ModelData.method2800(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7);
                               }
 
-                              if(var17.entity2 instanceof ModelData) {
+                              if (var17.entity2 instanceof ModelData) {
                                  var18 = (ModelData)var17.entity2;
                                  ModelData.method2800(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7);
                               }
                            }
 
-                           for(int var23 = 0; var23 < var15.gameObjectsCount; ++var23) {
+                           for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) {
                               GameObject var19 = var15.gameObjects[var23];
-                              if(var19 != null && var19.entity instanceof ModelData) {
+                              if (var19 != null && var19.entity instanceof ModelData) {
                                  ModelData var20 = (ModelData)var19.entity;
                                  int var21 = var19.endX - var19.startX + 1;
                                  int var22 = var19.endY - var19.startY + 1;
@@ -978,71 +960,70 @@ public class Scene {
    @Export("drawTileMinimap")
    public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) {
       Tile var7 = this.tiles[var4][var5][var6];
-      if(var7 != null) {
+      if (var7 != null) {
          TilePaint var8 = var7.paint;
-         int var10;
-         if(var8 != null) {
-            int var9 = var8.rgb;
-            if(var9 != 0) {
-               for(var10 = 0; var10 < 4; ++var10) {
-                  var1[var2] = var9;
-                  var1[var2 + 1] = var9;
-                  var1[var2 + 2] = var9;
-                  var1[var2 + 3] = var9;
+         int var9;
+         if (var8 != null) {
+            int var10 = var8.rgb;
+            if (var10 != 0) {
+               for (var9 = 0; var9 < 4; ++var9) {
+                  var1[var2] = var10;
+                  var1[var2 + 1] = var10;
+                  var1[var2 + 2] = var10;
+                  var1[var2 + 3] = var10;
                   var2 += var3;
                }
-
             }
          } else {
             TileModel var18 = var7.model;
-            if(var18 != null) {
-               var10 = var18.shape;
+            if (var18 != null) {
+               var9 = var18.shape;
                int var11 = var18.rotation;
                int var12 = var18.underlayRgb;
                int var13 = var18.overlayRgb;
-               int[] var14 = this.__bk[var10];
-               int[] var15 = this.__bd[var11];
+               int[] var14 = this.field770[var9];
+               int[] var15 = this.field771[var11];
                int var16 = 0;
                int var17;
-               if(var12 != 0) {
-                  for(var17 = 0; var17 < 4; ++var17) {
-                     var1[var2] = var14[var15[var16++]] == 0?var12:var13;
-                     var1[var2 + 1] = var14[var15[var16++]] == 0?var12:var13;
-                     var1[var2 + 2] = var14[var15[var16++]] == 0?var12:var13;
-                     var1[var2 + 3] = var14[var15[var16++]] == 0?var12:var13;
+               if (var12 != 0) {
+                  for (var17 = 0; var17 < 4; ++var17) {
+                     var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13;
+                     var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13;
+                     var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13;
+                     var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13;
                      var2 += var3;
                   }
                } else {
-                  for(var17 = 0; var17 < 4; ++var17) {
-                     if(var14[var15[var16++]] != 0) {
+                  for (var17 = 0; var17 < 4; ++var17) {
+                     if (var14[var15[var16++]] != 0) {
                         var1[var2] = var13;
                      }
 
-                     if(var14[var15[var16++]] != 0) {
+                     if (var14[var15[var16++]] != 0) {
                         var1[var2 + 1] = var13;
                      }
 
-                     if(var14[var15[var16++]] != 0) {
+                     if (var14[var15[var16++]] != 0) {
                         var1[var2 + 2] = var13;
                      }
 
-                     if(var14[var15[var16++]] != 0) {
+                     if (var14[var15[var16++]] != 0) {
                         var1[var2 + 3] = var13;
                      }
 
                      var2 += var3;
                   }
                }
-
             }
          }
       }
+
    }
 
    @ObfuscatedName("ap")
    @Export("menuOpen")
    public void menuOpen(int var1, int var2, int var3, boolean var4) {
-      if(!method3187() || var4) {
+      if (!method3187() || var4) {
          checkClick = true;
          viewportWalking = var4;
          Scene_selectedPlane = var1;
@@ -1051,31 +1032,32 @@ public class Scene {
          Scene_selectedX = -1;
          Scene_selectedY = -1;
       }
+
    }
 
    @ObfuscatedName("as")
-   public void __as_250() {
+   public void method296() {
       viewportWalking = true;
    }
 
    @ObfuscatedName("az")
    @Export("draw")
    public void draw(int var1, int var2, int var3, int var4, int var5, int var6) {
-      if(var1 < 0) {
+      if (var1 < 0) {
          var1 = 0;
-      } else if(var1 >= this.xSize * 128) {
+      } else if (var1 >= this.xSize * 128) {
          var1 = this.xSize * 128 - 1;
       }
 
-      if(var3 < 0) {
+      if (var3 < 0) {
          var3 = 0;
-      } else if(var3 >= this.ySize * 128) {
+      } else if (var3 >= this.ySize * 128) {
          var3 = this.ySize * 128 - 1;
       }
 
-      if(var4 < 128) {
+      if (var4 < 128) {
          var4 = 128;
-      } else if(var4 > 383) {
+      } else if (var4 > 383) {
          var4 = 383;
       }
 
@@ -1092,22 +1074,22 @@ public class Scene {
       Scene_cameraYTile = var3 / 128;
       Scene_plane = var6;
       Scene_cameraXTileMin = Scene_cameraXTile - 25;
-      if(Scene_cameraXTileMin < 0) {
+      if (Scene_cameraXTileMin < 0) {
          Scene_cameraXTileMin = 0;
       }
 
       Scene_cameraYTileMin = Scene_cameraYTile - 25;
-      if(Scene_cameraYTileMin < 0) {
+      if (Scene_cameraYTileMin < 0) {
          Scene_cameraYTileMin = 0;
       }
 
       Scene_cameraXTileMax = Scene_cameraXTile + 25;
-      if(Scene_cameraXTileMax > this.xSize) {
+      if (Scene_cameraXTileMax > this.xSize) {
          Scene_cameraXTileMax = this.xSize;
       }
 
       Scene_cameraYTileMax = Scene_cameraYTile + 25;
-      if(Scene_cameraYTileMax > this.ySize) {
+      if (Scene_cameraYTileMax > this.ySize) {
          Scene_cameraYTileMax = this.ySize;
       }
 
@@ -1118,21 +1100,21 @@ public class Scene {
       Tile[][] var8;
       int var9;
       int var10;
-      for(var7 = this.Scene_minPlane; var7 < this.planes; ++var7) {
+      for (var7 = this.Scene_minPlane; var7 < this.planes; ++var7) {
          var8 = this.tiles[var7];
 
-         for(var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) {
-            for(var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) {
+         for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) {
+            for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) {
                Tile var11 = var8[var9][var10];
-               if(var11 != null) {
-                  if(var11.minPlane > var6 || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - var2 < 2000) {
+               if (var11 != null) {
+                  if (var11.minPlane > var6 || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - var2 < 2000) {
                      var11.drawPrimary = false;
                      var11.drawSecondary = false;
                      var11.drawGameObjectEdges = 0;
                   } else {
                      var11.drawPrimary = true;
                      var11.drawSecondary = true;
-                     if(var11.gameObjectsCount > 0) {
+                     if (var11.gameObjectsCount > 0) {
                         var11.drawGameObjects = true;
                      } else {
                         var11.drawGameObjects = false;
@@ -1147,52 +1129,52 @@ public class Scene {
 
       int var12;
       int var13;
-      int var14;
-      Tile var15;
+      Tile var14;
+      int var15;
       int var16;
-      for(var7 = this.Scene_minPlane; var7 < this.planes; ++var7) {
+      for (var7 = this.Scene_minPlane; var7 < this.planes; ++var7) {
          var8 = this.tiles[var7];
 
-         for(var9 = -25; var9 <= 0; ++var9) {
+         for (var9 = -25; var9 <= 0; ++var9) {
             var10 = var9 + Scene_cameraXTile;
-            var16 = Scene_cameraXTile - var9;
-            if(var10 >= Scene_cameraXTileMin || var16 < Scene_cameraXTileMax) {
-               for(var12 = -25; var12 <= 0; ++var12) {
-                  var13 = var12 + Scene_cameraYTile;
-                  var14 = Scene_cameraYTile - var12;
-                  if(var10 >= Scene_cameraXTileMin) {
-                     if(var13 >= Scene_cameraYTileMin) {
-                        var15 = var8[var10][var13];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, true);
+            var15 = Scene_cameraXTile - var9;
+            if (var10 >= Scene_cameraXTileMin || var15 < Scene_cameraXTileMax) {
+               for (var16 = -25; var16 <= 0; ++var16) {
+                  var12 = var16 + Scene_cameraYTile;
+                  var13 = Scene_cameraYTile - var16;
+                  if (var10 >= Scene_cameraXTileMin) {
+                     if (var12 >= Scene_cameraYTileMin) {
+                        var14 = var8[var10][var12];
+                        if (var14 != null && var14.drawPrimary) {
+                           this.drawTile(var14, true);
                         }
                      }
 
-                     if(var14 < Scene_cameraYTileMax) {
-                        var15 = var8[var10][var14];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, true);
+                     if (var13 < Scene_cameraYTileMax) {
+                        var14 = var8[var10][var13];
+                        if (var14 != null && var14.drawPrimary) {
+                           this.drawTile(var14, true);
                         }
                      }
                   }
 
-                  if(var16 < Scene_cameraXTileMax) {
-                     if(var13 >= Scene_cameraYTileMin) {
-                        var15 = var8[var16][var13];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, true);
+                  if (var15 < Scene_cameraXTileMax) {
+                     if (var12 >= Scene_cameraYTileMin) {
+                        var14 = var8[var15][var12];
+                        if (var14 != null && var14.drawPrimary) {
+                           this.drawTile(var14, true);
                         }
                      }
 
-                     if(var14 < Scene_cameraYTileMax) {
-                        var15 = var8[var16][var14];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, true);
+                     if (var13 < Scene_cameraYTileMax) {
+                        var14 = var8[var15][var13];
+                        if (var14 != null && var14.drawPrimary) {
+                           this.drawTile(var14, true);
                         }
                      }
                   }
 
-                  if(tileUpdateCount == 0) {
+                  if (tileUpdateCount == 0) {
                      checkClick = false;
                      return;
                   }
@@ -1201,49 +1183,49 @@ public class Scene {
          }
       }
 
-      for(var7 = this.Scene_minPlane; var7 < this.planes; ++var7) {
+      for (var7 = this.Scene_minPlane; var7 < this.planes; ++var7) {
          var8 = this.tiles[var7];
 
-         for(var9 = -25; var9 <= 0; ++var9) {
+         for (var9 = -25; var9 <= 0; ++var9) {
             var10 = var9 + Scene_cameraXTile;
-            var16 = Scene_cameraXTile - var9;
-            if(var10 >= Scene_cameraXTileMin || var16 < Scene_cameraXTileMax) {
-               for(var12 = -25; var12 <= 0; ++var12) {
-                  var13 = var12 + Scene_cameraYTile;
-                  var14 = Scene_cameraYTile - var12;
-                  if(var10 >= Scene_cameraXTileMin) {
-                     if(var13 >= Scene_cameraYTileMin) {
-                        var15 = var8[var10][var13];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, false);
+            var15 = Scene_cameraXTile - var9;
+            if (var10 >= Scene_cameraXTileMin || var15 < Scene_cameraXTileMax) {
+               for (var16 = -25; var16 <= 0; ++var16) {
+                  var12 = var16 + Scene_cameraYTile;
+                  var13 = Scene_cameraYTile - var16;
+                  if (var10 >= Scene_cameraXTileMin) {
+                     if (var12 >= Scene_cameraYTileMin) {
+                        var14 = var8[var10][var12];
+                        if (var14 != null && var14.drawPrimary) {
+                           this.drawTile(var14, false);
                         }
                      }
 
-                     if(var14 < Scene_cameraYTileMax) {
-                        var15 = var8[var10][var14];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, false);
+                     if (var13 < Scene_cameraYTileMax) {
+                        var14 = var8[var10][var13];
+                        if (var14 != null && var14.drawPrimary) {
+                           this.drawTile(var14, false);
                         }
                      }
                   }
 
-                  if(var16 < Scene_cameraXTileMax) {
-                     if(var13 >= Scene_cameraYTileMin) {
-                        var15 = var8[var16][var13];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, false);
+                  if (var15 < Scene_cameraXTileMax) {
+                     if (var12 >= Scene_cameraYTileMin) {
+                        var14 = var8[var15][var12];
+                        if (var14 != null && var14.drawPrimary) {
+                           this.drawTile(var14, false);
                         }
                      }
 
-                     if(var14 < Scene_cameraYTileMax) {
-                        var15 = var8[var16][var14];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, false);
+                     if (var13 < Scene_cameraYTileMax) {
+                        var14 = var8[var15][var13];
+                        if (var14 != null && var14.drawPrimary) {
+                           this.drawTile(var14, false);
                         }
                      }
                   }
 
-                  if(tileUpdateCount == 0) {
+                  if (tileUpdateCount == 0) {
                      checkClick = false;
                      return;
                   }
@@ -1263,7 +1245,7 @@ public class Scene {
    void drawTile(Tile var1, boolean var2) {
       Scene_tilesDeque.addFirst(var1);
 
-      while(true) {
+      while (true) {
          Tile var3;
          int var4;
          int var5;
@@ -1271,30 +1253,30 @@ public class Scene {
          int var7;
          Tile[][] var8;
          Tile var9;
+         int var10;
          int var11;
+         int var12;
+         int var13;
          int var14;
          int var15;
-         int var16;
-         int var24;
-         int var25;
          do {
             do {
                do {
                   do {
                      do {
                         do {
-                           while(true) {
-                              BoundaryObject var10;
-                              GameObject var12;
-                              int var17;
+                           while (true) {
+                              BoundaryObject var16;
+                              GameObject var17;
                               int var18;
+                              int var19;
                               boolean var20;
                               int var21;
-                              Tile var36;
-                              while(true) {
+                              Tile var22;
+                              while (true) {
                                  do {
                                     var3 = (Tile)Scene_tilesDeque.removeLast();
-                                    if(var3 == null) {
+                                    if (var3 == null) {
                                        return;
                                     }
                                  } while(!var3.drawSecondary);
@@ -1304,42 +1286,42 @@ public class Scene {
                                  var6 = var3.plane;
                                  var7 = var3.originalPlane;
                                  var8 = this.tiles[var6];
-                                 if(!var3.drawPrimary) {
+                                 if (!var3.drawPrimary) {
                                     break;
                                  }
 
-                                 if(var2) {
-                                    if(var6 > 0) {
+                                 if (var2) {
+                                    if (var6 > 0) {
                                        var9 = this.tiles[var6 - 1][var4][var5];
-                                       if(var9 != null && var9.drawSecondary) {
+                                       if (var9 != null && var9.drawSecondary) {
                                           continue;
                                        }
                                     }
 
-                                    if(var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) {
+                                    if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) {
                                        var9 = var8[var4 - 1][var5];
-                                       if(var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) {
+                                       if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) {
                                           continue;
                                        }
                                     }
 
-                                    if(var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) {
+                                    if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) {
                                        var9 = var8[var4 + 1][var5];
-                                       if(var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) {
+                                       if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) {
                                           continue;
                                        }
                                     }
 
-                                    if(var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) {
+                                    if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) {
                                        var9 = var8[var4][var5 - 1];
-                                       if(var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) {
+                                       if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) {
                                           continue;
                                        }
                                     }
 
-                                    if(var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) {
+                                    if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) {
                                        var9 = var8[var4][var5 + 1];
-                                       if(var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) {
+                                       if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) {
                                           continue;
                                        }
                                     }
@@ -1348,311 +1330,312 @@ public class Scene {
                                  }
 
                                  var3.drawPrimary = false;
-                                 if(var3.linkedBelowTile != null) {
+                                 if (var3.linkedBelowTile != null) {
                                     var9 = var3.linkedBelowTile;
-                                    if(var9.paint != null) {
-                                       if(!this.__ba_253(0, var4, var5)) {
+                                    if (var9.paint != null) {
+                                       if (!this.method297(0, var4, var5)) {
                                           this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
                                        }
-                                    } else if(var9.model != null && !this.__ba_253(0, var4, var5)) {
+                                    } else if (var9.model != null && !this.method297(0, var4, var5)) {
                                        this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
                                     }
 
-                                    var10 = var9.boundaryObject;
-                                    if(var10 != null) {
-                                       var10.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag);
+                                    var16 = var9.boundaryObject;
+                                    if (var16 != null) {
+                                       var16.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag);
                                     }
 
-                                    for(var11 = 0; var11 < var9.gameObjectsCount; ++var11) {
-                                       var12 = var9.gameObjects[var11];
-                                       if(var12 != null) {
-                                          var12.entity.renderDraw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag);
+                                    for (var10 = 0; var10 < var9.gameObjectsCount; ++var10) {
+                                       var17 = var9.gameObjects[var10];
+                                       if (var17 != null) {
+                                          var17.entity.renderDraw(var17.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var17.centerX - Scene_cameraX, var17.height - Scene_cameraY, var17.centerY - Scene_cameraZ, var17.tag);
                                        }
                                     }
                                  }
 
                                  var20 = false;
-                                 if(var3.paint != null) {
-                                    if(!this.__ba_253(var7, var4, var5)) {
+                                 if (var3.paint != null) {
+                                    if (!this.method297(var7, var4, var5)) {
                                        var20 = true;
-                                       if(var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) {
+                                       if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) {
                                           this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
                                        }
                                     }
-                                 } else if(var3.model != null && !this.__ba_253(var7, var4, var5)) {
+                                 } else if (var3.model != null && !this.method297(var7, var4, var5)) {
                                     var20 = true;
                                     this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
                                  }
 
                                  var21 = 0;
-                                 var11 = 0;
-                                 BoundaryObject var31 = var3.boundaryObject;
-                                 WallDecoration var13 = var3.wallDecoration;
-                                 if(var31 != null || var13 != null) {
-                                    if(var4 == Scene_cameraXTile) {
+                                 var10 = 0;
+                                 BoundaryObject var23 = var3.boundaryObject;
+                                 WallDecoration var24 = var3.wallDecoration;
+                                 if (var23 != null || var24 != null) {
+                                    if (var4 == Scene_cameraXTile) {
                                        ++var21;
-                                    } else if(Scene_cameraXTile < var4) {
+                                    } else if (Scene_cameraXTile < var4) {
                                        var21 += 2;
                                     }
 
-                                    if(var5 == Scene_cameraYTile) {
+                                    if (var5 == Scene_cameraYTile) {
                                        var21 += 3;
-                                    } else if(Scene_cameraYTile > var5) {
+                                    } else if (Scene_cameraYTile > var5) {
                                        var21 += 6;
                                     }
 
-                                    var11 = __em_au[var21];
-                                    var3.__b = __em_aa[var21];
+                                    var10 = field762[var21];
+                                    var3.field899 = field764[var21];
                                  }
 
-                                 if(var31 != null) {
-                                    if((var31.orientationA & __em_ao[var21]) != 0) {
-                                       if(var31.orientationA == 16) {
+                                 if (var23 != null) {
+                                    if ((var23.orientationA & field763[var21]) != 0) {
+                                       if (var23.orientationA == 16) {
                                           var3.drawGameObjectEdges = 3;
-                                          var3.__y = __em_ax[var21];
-                                          var3.__h = 3 - var3.__y;
-                                       } else if(var31.orientationA == 32) {
+                                          var3.field897 = field765[var21];
+                                          var3.field898 = 3 - var3.field897;
+                                       } else if (var23.orientationA == 32) {
                                           var3.drawGameObjectEdges = 6;
-                                          var3.__y = __em_af[var21];
-                                          var3.__h = 6 - var3.__y;
-                                       } else if(var31.orientationA == 64) {
+                                          var3.field897 = field766[var21];
+                                          var3.field898 = 6 - var3.field897;
+                                       } else if (var23.orientationA == 64) {
                                           var3.drawGameObjectEdges = 12;
-                                          var3.__y = __em_ai[var21];
-                                          var3.__h = 12 - var3.__y;
+                                          var3.field897 = field767[var21];
+                                          var3.field898 = 12 - var3.field897;
                                        } else {
                                           var3.drawGameObjectEdges = 9;
-                                          var3.__y = __em_ba[var21];
-                                          var3.__h = 9 - var3.__y;
+                                          var3.field897 = field768[var21];
+                                          var3.field898 = 9 - var3.field897;
                                        }
                                     } else {
                                        var3.drawGameObjectEdges = 0;
                                     }
 
-                                    if((var31.orientationA & var11) != 0 && !this.__bb_254(var7, var4, var5, var31.orientationA)) {
-                                       var31.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
+                                    if ((var23.orientationA & var10) != 0 && !this.method298(var7, var4, var5, var23.orientationA)) {
+                                       var23.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
                                     }
 
-                                    if((var31.orientationB & var11) != 0 && !this.__bb_254(var7, var4, var5, var31.orientationB)) {
-                                       var31.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
+                                    if ((var23.orientationB & var10) != 0 && !this.method298(var7, var4, var5, var23.orientationB)) {
+                                       var23.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
                                     }
                                  }
 
-                                 if(var13 != null && !this.__bs_255(var7, var4, var5, var13.entity1.height)) {
-                                    if((var13.orientation & var11) != 0) {
-                                       var13.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag);
-                                    } else if(var13.orientation == 256) {
-                                       var14 = var13.x - Scene_cameraX;
-                                       var15 = var13.tileHeight - Scene_cameraY;
-                                       var16 = var13.y - Scene_cameraZ;
-                                       var17 = var13.orientation2;
-                                       if(var17 != 1 && var17 != 2) {
-                                          var18 = var14;
+                                 if (var24 != null && !this.method299(var7, var4, var5, var24.entity1.height)) {
+                                    if ((var24.orientation & var10) != 0) {
+                                       var24.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var24.x - Scene_cameraX + var24.xOffset, var24.tileHeight - Scene_cameraY, var24.y - Scene_cameraZ + var24.yOffset, var24.tag);
+                                    } else if (var24.orientation == 256) {
+                                       var11 = var24.x - Scene_cameraX;
+                                       var12 = var24.tileHeight - Scene_cameraY;
+                                       var13 = var24.y - Scene_cameraZ;
+                                       var18 = var24.orientation2;
+                                       if (var18 != 1 && var18 != 2) {
+                                          var19 = var11;
                                        } else {
-                                          var18 = -var14;
+                                          var19 = -var11;
                                        }
 
-                                       int var19;
-                                       if(var17 != 2 && var17 != 3) {
-                                          var19 = var16;
+                                       int var25;
+                                       if (var18 != 2 && var18 != 3) {
+                                          var25 = var13;
                                        } else {
-                                          var19 = -var16;
+                                          var25 = -var13;
                                        }
 
-                                       if(var19 < var18) {
-                                          var13.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag);
-                                       } else if(var13.entity2 != null) {
-                                          var13.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag);
+                                       if (var25 < var19) {
+                                          var24.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var24.xOffset, var12, var13 + var24.yOffset, var24.tag);
+                                       } else if (var24.entity2 != null) {
+                                          var24.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var12, var13, var24.tag);
                                        }
                                     }
                                  }
 
-                                 if(var20) {
-                                    FloorDecoration var22 = var3.floorDecoration;
-                                    if(var22 != null) {
-                                       var22.entity.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag);
+                                 if (var20) {
+                                    FloorDecoration var34 = var3.floorDecoration;
+                                    if (var34 != null) {
+                                       var34.entity.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var34.x - Scene_cameraX, var34.tileHeight - Scene_cameraY, var34.y - Scene_cameraZ, var34.tag);
                                     }
 
-                                    GroundItemPile var23 = var3.groundItemPile;
-                                    if(var23 != null && var23.height == 0) {
-                                       if(var23.second != null) {
-                                          var23.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
+                                    GroundItemPile var26 = var3.groundItemPile;
+                                    if (var26 != null && var26.height == 0) {
+                                       if (var26.second != null) {
+                                          var26.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag);
                                        }
 
-                                       if(var23.third != null) {
-                                          var23.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
+                                       if (var26.third != null) {
+                                          var26.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag);
                                        }
 
-                                       if(var23.first != null) {
-                                          var23.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
+                                       if (var26.first != null) {
+                                          var26.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag);
                                        }
                                     }
                                  }
 
-                                 var14 = var3.gameObjectsEdgeMask;
-                                 if(var14 != 0) {
-                                    if(var4 < Scene_cameraXTile && (var14 & 4) != 0) {
-                                       var36 = var8[var4 + 1][var5];
-                                       if(var36 != null && var36.drawSecondary) {
-                                          Scene_tilesDeque.addFirst(var36);
+                                 var11 = var3.gameObjectsEdgeMask;
+                                 if (var11 != 0) {
+                                    if (var4 < Scene_cameraXTile && (var11 & 4) != 0) {
+                                       var22 = var8[var4 + 1][var5];
+                                       if (var22 != null && var22.drawSecondary) {
+                                          Scene_tilesDeque.addFirst(var22);
                                        }
                                     }
 
-                                    if(var5 < Scene_cameraYTile && (var14 & 2) != 0) {
-                                       var36 = var8[var4][var5 + 1];
-                                       if(var36 != null && var36.drawSecondary) {
-                                          Scene_tilesDeque.addFirst(var36);
+                                    if (var5 < Scene_cameraYTile && (var11 & 2) != 0) {
+                                       var22 = var8[var4][var5 + 1];
+                                       if (var22 != null && var22.drawSecondary) {
+                                          Scene_tilesDeque.addFirst(var22);
                                        }
                                     }
 
-                                    if(var4 > Scene_cameraXTile && (var14 & 1) != 0) {
-                                       var36 = var8[var4 - 1][var5];
-                                       if(var36 != null && var36.drawSecondary) {
-                                          Scene_tilesDeque.addFirst(var36);
+                                    if (var4 > Scene_cameraXTile && (var11 & 1) != 0) {
+                                       var22 = var8[var4 - 1][var5];
+                                       if (var22 != null && var22.drawSecondary) {
+                                          Scene_tilesDeque.addFirst(var22);
                                        }
                                     }
 
-                                    if(var5 > Scene_cameraYTile && (var14 & 8) != 0) {
-                                       var36 = var8[var4][var5 - 1];
-                                       if(var36 != null && var36.drawSecondary) {
-                                          Scene_tilesDeque.addFirst(var36);
+                                    if (var5 > Scene_cameraYTile && (var11 & 8) != 0) {
+                                       var22 = var8[var4][var5 - 1];
+                                       if (var22 != null && var22.drawSecondary) {
+                                          Scene_tilesDeque.addFirst(var22);
                                        }
                                     }
                                  }
                                  break;
                               }
 
-                              if(var3.drawGameObjectEdges != 0) {
+                              if (var3.drawGameObjectEdges != 0) {
                                  var20 = true;
 
-                                 for(var21 = 0; var21 < var3.gameObjectsCount; ++var21) {
-                                    if(var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.__y) {
+                                 for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) {
+                                    if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field897) {
                                        var20 = false;
                                        break;
                                     }
                                  }
 
-                                 if(var20) {
-                                    var10 = var3.boundaryObject;
-                                    if(!this.__bb_254(var7, var4, var5, var10.orientationA)) {
-                                       var10.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag);
+                                 if (var20) {
+                                    var16 = var3.boundaryObject;
+                                    if (!this.method298(var7, var4, var5, var16.orientationA)) {
+                                       var16.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag);
                                     }
 
                                     var3.drawGameObjectEdges = 0;
                                  }
                               }
 
-                              if(!var3.drawGameObjects) {
+                              if (!var3.drawGameObjects) {
                                  break;
                               }
 
                               try {
-                                 int var34 = var3.gameObjectsCount;
+                                 int var32 = var3.gameObjectsCount;
                                  var3.drawGameObjects = false;
                                  var21 = 0;
 
-                                 label563:
-                                 for(var11 = 0; var11 < var34; ++var11) {
-                                    var12 = var3.gameObjects[var11];
-                                    if(var12.lastDrawn != Scene_drawnCount) {
-                                       for(var24 = var12.startX; var24 <= var12.endX; ++var24) {
-                                          for(var14 = var12.startY; var14 <= var12.endY; ++var14) {
-                                             var36 = var8[var24][var14];
-                                             if(var36.drawPrimary) {
+                                 label562:
+                                 for (var10 = 0; var10 < var32; ++var10) {
+                                    var17 = var3.gameObjects[var10];
+                                    if (var17.lastDrawn != Scene_drawnCount) {
+                                       for (var14 = var17.startX; var14 <= var17.endX; ++var14) {
+                                          for (var11 = var17.startY; var11 <= var17.endY; ++var11) {
+                                             var22 = var8[var14][var11];
+                                             if (var22.drawPrimary) {
                                                 var3.drawGameObjects = true;
-                                                continue label563;
+                                                continue label562;
                                              }
 
-                                             if(var36.drawGameObjectEdges != 0) {
-                                                var16 = 0;
-                                                if(var24 > var12.startX) {
-                                                   ++var16;
+                                             if (var22.drawGameObjectEdges != 0) {
+                                                var13 = 0;
+                                                if (var14 > var17.startX) {
+                                                   ++var13;
                                                 }
 
-                                                if(var24 < var12.endX) {
-                                                   var16 += 4;
+                                                if (var14 < var17.endX) {
+                                                   var13 += 4;
                                                 }
 
-                                                if(var14 > var12.startY) {
-                                                   var16 += 8;
+                                                if (var11 > var17.startY) {
+                                                   var13 += 8;
                                                 }
 
-                                                if(var14 < var12.endY) {
-                                                   var16 += 2;
+                                                if (var11 < var17.endY) {
+                                                   var13 += 2;
                                                 }
 
-                                                if((var16 & var36.drawGameObjectEdges) == var3.__h) {
+                                                if ((var13 & var22.drawGameObjectEdges) == var3.field898) {
                                                    var3.drawGameObjects = true;
-                                                   continue label563;
+                                                   continue label562;
                                                 }
                                              }
                                           }
                                        }
 
-                                       Scene_gameObjects[var21++] = var12;
-                                       var24 = Scene_cameraXTile - var12.startX;
-                                       var14 = var12.endX - Scene_cameraXTile;
-                                       if(var14 > var24) {
-                                          var24 = var14;
+                                       Scene_gameObjects[var21++] = var17;
+                                       var14 = Scene_cameraXTile - var17.startX;
+                                       var11 = var17.endX - Scene_cameraXTile;
+                                       if (var11 > var14) {
+                                          var14 = var11;
                                        }
 
-                                       var15 = Scene_cameraYTile - var12.startY;
-                                       var16 = var12.endY - Scene_cameraYTile;
-                                       if(var16 > var15) {
-                                          var12.__d = var24 + var16;
+                                       var12 = Scene_cameraYTile - var17.startY;
+                                       var13 = var17.endY - Scene_cameraYTile;
+                                       if (var13 > var12) {
+                                          var17.field360 = var14 + var13;
                                        } else {
-                                          var12.__d = var24 + var15;
+                                          var17.field360 = var14 + var12;
                                        }
                                     }
                                  }
 
-                                 while(var21 > 0) {
-                                    var11 = -50;
-                                    var25 = -1;
+                                 while (var21 > 0) {
+                                    var10 = -50;
+                                    var15 = -1;
 
-                                    for(var24 = 0; var24 < var21; ++var24) {
-                                       GameObject var35 = Scene_gameObjects[var24];
-                                       if(var35.lastDrawn != Scene_drawnCount) {
-                                          if(var35.__d > var11) {
-                                             var11 = var35.__d;
-                                             var25 = var24;
-                                          } else if(var11 == var35.__d) {
-                                             var15 = var35.centerX - Scene_cameraX;
-                                             var16 = var35.centerY - Scene_cameraZ;
-                                             var17 = Scene_gameObjects[var25].centerX - Scene_cameraX;
-                                             var18 = Scene_gameObjects[var25].centerY - Scene_cameraZ;
-                                             if(var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) {
-                                                var25 = var24;
+                                    GameObject var33;
+                                    for (var14 = 0; var14 < var21; ++var14) {
+                                       var33 = Scene_gameObjects[var14];
+                                       if (var33.lastDrawn != Scene_drawnCount) {
+                                          if (var33.field360 > var10) {
+                                             var10 = var33.field360;
+                                             var15 = var14;
+                                          } else if (var10 == var33.field360) {
+                                             var12 = var33.centerX - Scene_cameraX;
+                                             var13 = var33.centerY - Scene_cameraZ;
+                                             var18 = Scene_gameObjects[var15].centerX - Scene_cameraX;
+                                             var19 = Scene_gameObjects[var15].centerY - Scene_cameraZ;
+                                             if (var12 * var12 + var13 * var13 > var18 * var18 + var19 * var19) {
+                                                var15 = var14;
                                              }
                                           }
                                        }
                                     }
 
-                                    if(var25 == -1) {
+                                    if (var15 == -1) {
                                        break;
                                     }
 
-                                    GameObject var33 = Scene_gameObjects[var25];
+                                    var33 = Scene_gameObjects[var15];
                                     var33.lastDrawn = Scene_drawnCount;
-                                    if(!this.__bq_256(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) {
+                                    if (!this.method300(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) {
                                        var33.entity.renderDraw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag);
                                     }
 
-                                    for(var14 = var33.startX; var14 <= var33.endX; ++var14) {
-                                       for(var15 = var33.startY; var15 <= var33.endY; ++var15) {
-                                          Tile var26 = var8[var14][var15];
-                                          if(var26.drawGameObjectEdges != 0) {
-                                             Scene_tilesDeque.addFirst(var26);
-                                          } else if((var14 != var4 || var15 != var5) && var26.drawSecondary) {
-                                             Scene_tilesDeque.addFirst(var26);
+                                    for (var11 = var33.startX; var11 <= var33.endX; ++var11) {
+                                       for (var12 = var33.startY; var12 <= var33.endY; ++var12) {
+                                          Tile var35 = var8[var11][var12];
+                                          if (var35.drawGameObjectEdges != 0) {
+                                             Scene_tilesDeque.addFirst(var35);
+                                          } else if ((var11 != var4 || var12 != var5) && var35.drawSecondary) {
+                                             Scene_tilesDeque.addFirst(var35);
                                           }
                                        }
                                     }
                                  }
 
-                                 if(!var3.drawGameObjects) {
+                                 if (!var3.drawGameObjects) {
                                     break;
                                  }
-                              } catch (Exception var28) {
+                              } catch (Exception var27) {
                                  var3.drawGameObjects = false;
                                  break;
                               }
@@ -1660,28 +1643,28 @@ public class Scene {
                         } while(!var3.drawSecondary);
                      } while(var3.drawGameObjectEdges != 0);
 
-                     if(var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) {
+                     if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) {
                         break;
                      }
 
                      var9 = var8[var4 - 1][var5];
                   } while(var9 != null && var9.drawSecondary);
 
-                  if(var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) {
+                  if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) {
                      break;
                   }
 
                   var9 = var8[var4 + 1][var5];
                } while(var9 != null && var9.drawSecondary);
 
-               if(var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) {
+               if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) {
                   break;
                }
 
                var9 = var8[var4][var5 - 1];
             } while(var9 != null && var9.drawSecondary);
 
-            if(var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) {
+            if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) {
                break;
             }
 
@@ -1690,95 +1673,95 @@ public class Scene {
 
          var3.drawSecondary = false;
          --tileUpdateCount;
-         GroundItemPile var32 = var3.groundItemPile;
-         if(var32 != null && var32.height != 0) {
-            if(var32.second != null) {
-               var32.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag);
+         GroundItemPile var28 = var3.groundItemPile;
+         if (var28 != null && var28.height != 0) {
+            if (var28.second != null) {
+               var28.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag);
             }
 
-            if(var32.third != null) {
-               var32.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag);
+            if (var28.third != null) {
+               var28.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag);
             }
 
-            if(var32.first != null) {
-               var32.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag);
+            if (var28.first != null) {
+               var28.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag);
             }
          }
 
-         if(var3.__b != 0) {
+         if (var3.field899 != 0) {
             WallDecoration var29 = var3.wallDecoration;
-            if(var29 != null && !this.__bs_255(var7, var4, var5, var29.entity1.height)) {
-               if((var29.orientation & var3.__b) != 0) {
+            if (var29 != null && !this.method299(var7, var4, var5, var29.entity1.height)) {
+               if ((var29.orientation & var3.field899) != 0) {
                   var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag);
-               } else if(var29.orientation == 256) {
-                  var11 = var29.x - Scene_cameraX;
-                  var25 = var29.tileHeight - Scene_cameraY;
-                  var24 = var29.y - Scene_cameraZ;
-                  var14 = var29.orientation2;
-                  if(var14 != 1 && var14 != 2) {
-                     var15 = var11;
+               } else if (var29.orientation == 256) {
+                  var10 = var29.x - Scene_cameraX;
+                  var15 = var29.tileHeight - Scene_cameraY;
+                  var14 = var29.y - Scene_cameraZ;
+                  var11 = var29.orientation2;
+                  if (var11 != 1 && var11 != 2) {
+                     var12 = var10;
                   } else {
-                     var15 = -var11;
+                     var12 = -var10;
                   }
 
-                  if(var14 != 2 && var14 != 3) {
-                     var16 = var24;
+                  if (var11 != 2 && var11 != 3) {
+                     var13 = var14;
                   } else {
-                     var16 = -var24;
+                     var13 = -var14;
                   }
 
-                  if(var16 >= var15) {
-                     var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag);
-                  } else if(var29.entity2 != null) {
-                     var29.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag);
+                  if (var13 >= var12) {
+                     var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10 + var29.xOffset, var15, var14 + var29.yOffset, var29.tag);
+                  } else if (var29.entity2 != null) {
+                     var29.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10, var15, var14, var29.tag);
                   }
                }
             }
 
-            BoundaryObject var27 = var3.boundaryObject;
-            if(var27 != null) {
-               if((var27.orientationB & var3.__b) != 0 && !this.__bb_254(var7, var4, var5, var27.orientationB)) {
-                  var27.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
+            BoundaryObject var31 = var3.boundaryObject;
+            if (var31 != null) {
+               if ((var31.orientationB & var3.field899) != 0 && !this.method298(var7, var4, var5, var31.orientationB)) {
+                  var31.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
                }
 
-               if((var27.orientationA & var3.__b) != 0 && !this.__bb_254(var7, var4, var5, var27.orientationA)) {
-                  var27.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
+               if ((var31.orientationA & var3.field899) != 0 && !this.method298(var7, var4, var5, var31.orientationA)) {
+                  var31.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
                }
             }
          }
 
          Tile var30;
-         if(var6 < this.planes - 1) {
+         if (var6 < this.planes - 1) {
             var30 = this.tiles[var6 + 1][var4][var5];
-            if(var30 != null && var30.drawSecondary) {
+            if (var30 != null && var30.drawSecondary) {
                Scene_tilesDeque.addFirst(var30);
             }
          }
 
-         if(var4 < Scene_cameraXTile) {
+         if (var4 < Scene_cameraXTile) {
             var30 = var8[var4 + 1][var5];
-            if(var30 != null && var30.drawSecondary) {
+            if (var30 != null && var30.drawSecondary) {
                Scene_tilesDeque.addFirst(var30);
             }
          }
 
-         if(var5 < Scene_cameraYTile) {
+         if (var5 < Scene_cameraYTile) {
             var30 = var8[var4][var5 + 1];
-            if(var30 != null && var30.drawSecondary) {
+            if (var30 != null && var30.drawSecondary) {
                Scene_tilesDeque.addFirst(var30);
             }
          }
 
-         if(var4 > Scene_cameraXTile) {
+         if (var4 > Scene_cameraXTile) {
             var30 = var8[var4 - 1][var5];
-            if(var30 != null && var30.drawSecondary) {
+            if (var30 != null && var30.drawSecondary) {
                Scene_tilesDeque.addFirst(var30);
             }
          }
 
-         if(var5 > Scene_cameraYTile) {
+         if (var5 > Scene_cameraYTile) {
             var30 = var8[var4][var5 - 1];
-            if(var30 != null && var30.drawSecondary) {
+            if (var30 != null && var30.drawSecondary) {
                Scene_tilesDeque.addFirst(var30);
             }
          }
@@ -1809,27 +1792,27 @@ public class Scene {
       var21 = var17 * var4 - var3 * var12 >> 16;
       var12 = var3 * var17 + var12 * var4 >> 16;
       var17 = var21;
-      if(var12 >= 50) {
+      if (var12 >= 50) {
          var21 = var14 * var6 + var5 * var11 >> 16;
          var11 = var11 * var6 - var5 * var14 >> 16;
          var14 = var21;
          var21 = var18 * var4 - var3 * var11 >> 16;
          var11 = var3 * var18 + var11 * var4 >> 16;
          var18 = var21;
-         if(var11 >= 50) {
+         if (var11 >= 50) {
             var21 = var13 * var6 + var5 * var16 >> 16;
             var16 = var16 * var6 - var5 * var13 >> 16;
             var13 = var21;
             var21 = var19 * var4 - var3 * var16 >> 16;
             var16 = var3 * var19 + var16 * var4 >> 16;
             var19 = var21;
-            if(var16 >= 50) {
+            if (var16 >= 50) {
                var21 = var9 * var6 + var5 * var15 >> 16;
                var15 = var15 * var6 - var5 * var9 >> 16;
                var9 = var21;
                var21 = var20 * var4 - var3 * var15 >> 16;
                var15 = var3 * var20 + var15 * var4 >> 16;
-               if(var15 >= 50) {
+               if (var15 >= 50) {
                   int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX;
                   int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY;
                   int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX;
@@ -1840,60 +1823,60 @@ public class Scene {
                   int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY;
                   Rasterizer3D.Rasterizer3D_alpha = 0;
                   int var30;
-                  if((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) {
-                     Rasterizer3D.__et_m = false;
-                     if(var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) {
-                        Rasterizer3D.__et_m = true;
+                  if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) {
+                     Rasterizer3D.field739 = false;
+                     if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) {
+                        Rasterizer3D.field739 = true;
                      }
 
-                     if(checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) {
+                     if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) {
                         Scene_selectedX = var7;
                         Scene_selectedY = var8;
                      }
 
-                     if(var1.texture == -1) {
-                        if(var1.neColor != 12345678) {
+                     if (var1.texture == -1) {
+                        if (var1.neColor != 12345678) {
                            Rasterizer3D.method3037(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor);
                         }
-                     } else if(!Scene_isLowDetail) {
-                        if(var1.isFlat) {
+                     } else if (!Scene_isLowDetail) {
+                        if (var1.isFlat) {
                            Rasterizer3D.method3012(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture);
                         } else {
                            Rasterizer3D.method3012(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture);
                         }
                      } else {
-                        var30 = Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var1.texture);
+                        var30 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var1.texture);
                         Rasterizer3D.method3037(var27, var29, var25, var26, var28, var24, method3108(var30, var1.neColor), method3108(var30, var1.nwColor), method3108(var30, var1.seColor));
                      }
                   }
 
-                  if((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) {
-                     Rasterizer3D.__et_m = false;
-                     if(var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) {
-                        Rasterizer3D.__et_m = true;
+                  if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) {
+                     Rasterizer3D.field739 = false;
+                     if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) {
+                        Rasterizer3D.field739 = true;
                      }
 
-                     if(checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) {
+                     if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) {
                         Scene_selectedX = var7;
                         Scene_selectedY = var8;
                      }
 
-                     if(var1.texture == -1) {
-                        if(var1.swColor != 12345678) {
+                     if (var1.texture == -1) {
+                        if (var1.swColor != 12345678) {
                            Rasterizer3D.method3037(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor);
                         }
-                     } else if(!Scene_isLowDetail) {
+                     } else if (!Scene_isLowDetail) {
                         Rasterizer3D.method3012(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture);
                      } else {
-                        var30 = Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var1.texture);
+                        var30 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var1.texture);
                         Rasterizer3D.method3037(var23, var25, var29, var22, var24, var28, method3108(var30, var1.swColor), method3108(var30, var1.seColor), method3108(var30, var1.nwColor));
                      }
                   }
-
                }
             }
          }
       }
+
    }
 
    @ObfuscatedName("aa")
@@ -1909,7 +1892,7 @@ public class Scene {
       int var11;
       int var12;
       int var13;
-      for(var9 = 0; var9 < var8; ++var9) {
+      for (var9 = 0; var9 < var8; ++var9) {
          var10 = var1.vertexX[var9] - Scene_cameraX;
          var11 = var1.vertexY[var9] - Scene_cameraY;
          var12 = var1.vertexZ[var9] - Scene_cameraZ;
@@ -1918,56 +1901,56 @@ public class Scene {
          var10 = var13;
          var13 = var3 * var11 - var12 * var2 >> 16;
          var12 = var11 * var2 + var3 * var12 >> 16;
-         if(var12 < 50) {
+         if (var12 < 50) {
             return;
          }
 
-         if(var1.triangleTextureId != null) {
-            TileModel.__dv_s[var9] = var10;
-            TileModel.__dv_t[var9] = var13;
-            TileModel.__dv_y[var9] = var12;
+         if (var1.triangleTextureId != null) {
+            TileModel.field902[var9] = var10;
+            TileModel.field903[var9] = var13;
+            TileModel.field904[var9] = var12;
          }
 
-         TileModel.__dv_z[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX;
-         TileModel.__dv_j[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY;
+         TileModel.field900[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX;
+         TileModel.field901[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY;
       }
 
       Rasterizer3D.Rasterizer3D_alpha = 0;
       var8 = var1.faceX.length;
 
-      for(var9 = 0; var9 < var8; ++var9) {
+      for (var9 = 0; var9 < var8; ++var9) {
          var10 = var1.faceX[var9];
          var11 = var1.faceY[var9];
          var12 = var1.faceZ[var9];
-         var13 = TileModel.__dv_z[var10];
-         int var14 = TileModel.__dv_z[var11];
-         int var15 = TileModel.__dv_z[var12];
-         int var16 = TileModel.__dv_j[var10];
-         int var17 = TileModel.__dv_j[var11];
-         int var18 = TileModel.__dv_j[var12];
-         if((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) {
-            Rasterizer3D.__et_m = false;
-            if(var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) {
-               Rasterizer3D.__et_m = true;
+         var13 = TileModel.field900[var10];
+         int var14 = TileModel.field900[var11];
+         int var15 = TileModel.field900[var12];
+         int var16 = TileModel.field901[var10];
+         int var17 = TileModel.field901[var11];
+         int var18 = TileModel.field901[var12];
+         if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) {
+            Rasterizer3D.field739 = false;
+            if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) {
+               Rasterizer3D.field739 = true;
             }
 
-            if(checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) {
+            if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) {
                Scene_selectedX = var6;
                Scene_selectedY = var7;
             }
 
-            if(var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) {
-               if(!Scene_isLowDetail) {
-                  if(var1.isFlat) {
-                     Rasterizer3D.method3012(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.__dv_s[0], TileModel.__dv_s[1], TileModel.__dv_s[3], TileModel.__dv_t[0], TileModel.__dv_t[1], TileModel.__dv_t[3], TileModel.__dv_y[0], TileModel.__dv_y[1], TileModel.__dv_y[3], var1.triangleTextureId[var9]);
+            if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) {
+               if (!Scene_isLowDetail) {
+                  if (var1.isFlat) {
+                     Rasterizer3D.method3012(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field902[0], TileModel.field902[1], TileModel.field902[3], TileModel.field903[0], TileModel.field903[1], TileModel.field903[3], TileModel.field904[0], TileModel.field904[1], TileModel.field904[3], var1.triangleTextureId[var9]);
                   } else {
-                     Rasterizer3D.method3012(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.__dv_s[var10], TileModel.__dv_s[var11], TileModel.__dv_s[var12], TileModel.__dv_t[var10], TileModel.__dv_t[var11], TileModel.__dv_t[var12], TileModel.__dv_y[var10], TileModel.__dv_y[var11], TileModel.__dv_y[var12], var1.triangleTextureId[var9]);
+                     Rasterizer3D.method3012(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field902[var10], TileModel.field902[var11], TileModel.field902[var12], TileModel.field903[var10], TileModel.field903[var11], TileModel.field903[var12], TileModel.field904[var10], TileModel.field904[var11], TileModel.field904[var12], var1.triangleTextureId[var9]);
                   }
                } else {
-                  int var19 = Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var1.triangleTextureId[var9]);
+                  int var19 = Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var1.triangleTextureId[var9]);
                   Rasterizer3D.method3037(var16, var17, var18, var13, var14, var15, method3108(var19, var1.triangleColorA[var9]), method3108(var19, var1.triangleColorB[var9]), method3108(var19, var1.triangleColorC[var9]));
                }
-            } else if(var1.triangleColorA[var9] != 12345678) {
+            } else if (var1.triangleColorA[var9] != 12345678) {
                Rasterizer3D.method3037(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]);
             }
          }
@@ -1982,139 +1965,139 @@ public class Scene {
       Occluder[] var2 = Scene_planeOccluders[Scene_plane];
       Scene_currentOccludersCount = 0;
 
-      for(int var3 = 0; var3 < var1; ++var3) {
+      for (int var3 = 0; var3 < var1; ++var3) {
          Occluder var4 = var2[var3];
          int var5;
          int var6;
          int var7;
-         int var9;
-         boolean var13;
-         if(var4.type == 1) {
+         int var8;
+         boolean var9;
+         if (var4.type == 1) {
             var5 = var4.minTileX - Scene_cameraXTile + 25;
-            if(var5 >= 0 && var5 <= 50) {
+            if (var5 >= 0 && var5 <= 50) {
                var6 = var4.minTileY - Scene_cameraYTile + 25;
-               if(var6 < 0) {
+               if (var6 < 0) {
                   var6 = 0;
                }
 
                var7 = var4.maxTileY - Scene_cameraYTile + 25;
-               if(var7 > 50) {
+               if (var7 > 50) {
                   var7 = 50;
                }
 
-               var13 = false;
+               var9 = false;
 
-               while(var6 <= var7) {
-                  if(visibleTiles[var5][var6++]) {
-                     var13 = true;
+               while (var6 <= var7) {
+                  if (visibleTiles[var5][var6++]) {
+                     var9 = true;
                      break;
                   }
                }
 
-               if(var13) {
-                  var9 = Scene_cameraX - var4.minX;
-                  if(var9 > 32) {
-                     var4.__k = 1;
+               if (var9) {
+                  var8 = Scene_cameraX - var4.minX;
+                  if (var8 > 32) {
+                     var4.field656 = 1;
                   } else {
-                     if(var9 >= -32) {
+                     if (var8 >= -32) {
                         continue;
                      }
 
-                     var4.__k = 2;
-                     var9 = -var9;
+                     var4.field656 = 2;
+                     var8 = -var8;
                   }
 
-                  var4.__a = (var4.minZ - Scene_cameraZ << 8) / var9;
-                  var4.__z = (var4.maxZ - Scene_cameraZ << 8) / var9;
-                  var4.__j = (var4.minY - Scene_cameraY << 8) / var9;
-                  var4.__s = (var4.maxY - Scene_cameraY << 8) / var9;
+                  var4.field659 = (var4.minZ - Scene_cameraZ << 8) / var8;
+                  var4.field660 = (var4.maxZ - Scene_cameraZ << 8) / var8;
+                  var4.field661 = (var4.minY - Scene_cameraY << 8) / var8;
+                  var4.field662 = (var4.maxY - Scene_cameraY << 8) / var8;
                   Scene_currentOccluders[Scene_currentOccludersCount++] = var4;
                }
             }
-         } else if(var4.type == 2) {
+         } else if (var4.type == 2) {
             var5 = var4.minTileY - Scene_cameraYTile + 25;
-            if(var5 >= 0 && var5 <= 50) {
+            if (var5 >= 0 && var5 <= 50) {
                var6 = var4.minTileX - Scene_cameraXTile + 25;
-               if(var6 < 0) {
+               if (var6 < 0) {
                   var6 = 0;
                }
 
                var7 = var4.maxTileX - Scene_cameraXTile + 25;
-               if(var7 > 50) {
+               if (var7 > 50) {
                   var7 = 50;
                }
 
-               var13 = false;
+               var9 = false;
 
-               while(var6 <= var7) {
-                  if(visibleTiles[var6++][var5]) {
-                     var13 = true;
+               while (var6 <= var7) {
+                  if (visibleTiles[var6++][var5]) {
+                     var9 = true;
                      break;
                   }
                }
 
-               if(var13) {
-                  var9 = Scene_cameraZ - var4.minZ;
-                  if(var9 > 32) {
-                     var4.__k = 3;
+               if (var9) {
+                  var8 = Scene_cameraZ - var4.minZ;
+                  if (var8 > 32) {
+                     var4.field656 = 3;
                   } else {
-                     if(var9 >= -32) {
+                     if (var8 >= -32) {
                         continue;
                      }
 
-                     var4.__k = 4;
-                     var9 = -var9;
+                     var4.field656 = 4;
+                     var8 = -var8;
                   }
 
-                  var4.__n = (var4.minX - Scene_cameraX << 8) / var9;
-                  var4.__i = (var4.maxX - Scene_cameraX << 8) / var9;
-                  var4.__j = (var4.minY - Scene_cameraY << 8) / var9;
-                  var4.__s = (var4.maxY - Scene_cameraY << 8) / var9;
+                  var4.field657 = (var4.minX - Scene_cameraX << 8) / var8;
+                  var4.field658 = (var4.maxX - Scene_cameraX << 8) / var8;
+                  var4.field661 = (var4.minY - Scene_cameraY << 8) / var8;
+                  var4.field662 = (var4.maxY - Scene_cameraY << 8) / var8;
                   Scene_currentOccluders[Scene_currentOccludersCount++] = var4;
                }
             }
-         } else if(var4.type == 4) {
+         } else if (var4.type == 4) {
             var5 = var4.minY - Scene_cameraY;
-            if(var5 > 128) {
+            if (var5 > 128) {
                var6 = var4.minTileY - Scene_cameraYTile + 25;
-               if(var6 < 0) {
+               if (var6 < 0) {
                   var6 = 0;
                }
 
                var7 = var4.maxTileY - Scene_cameraYTile + 25;
-               if(var7 > 50) {
+               if (var7 > 50) {
                   var7 = 50;
                }
 
-               if(var6 <= var7) {
-                  int var8 = var4.minTileX - Scene_cameraXTile + 25;
-                  if(var8 < 0) {
-                     var8 = 0;
+               if (var6 <= var7) {
+                  int var10 = var4.minTileX - Scene_cameraXTile + 25;
+                  if (var10 < 0) {
+                     var10 = 0;
                   }
 
-                  var9 = var4.maxTileX - Scene_cameraXTile + 25;
-                  if(var9 > 50) {
-                     var9 = 50;
+                  var8 = var4.maxTileX - Scene_cameraXTile + 25;
+                  if (var8 > 50) {
+                     var8 = 50;
                   }
 
-                  boolean var10 = false;
+                  boolean var11 = false;
 
-                  label144:
-                  for(int var11 = var8; var11 <= var9; ++var11) {
-                     for(int var12 = var6; var12 <= var7; ++var12) {
-                        if(visibleTiles[var11][var12]) {
-                           var10 = true;
-                           break label144;
+                  label140:
+                  for (int var12 = var10; var12 <= var8; ++var12) {
+                     for (int var13 = var6; var13 <= var7; ++var13) {
+                        if (visibleTiles[var12][var13]) {
+                           var11 = true;
+                           break label140;
                         }
                      }
                   }
 
-                  if(var10) {
-                     var4.__k = 5;
-                     var4.__n = (var4.minX - Scene_cameraX << 8) / var5;
-                     var4.__i = (var4.maxX - Scene_cameraX << 8) / var5;
-                     var4.__a = (var4.minZ - Scene_cameraZ << 8) / var5;
-                     var4.__z = (var4.maxZ - Scene_cameraZ << 8) / var5;
+                  if (var11) {
+                     var4.field656 = 5;
+                     var4.field657 = (var4.minX - Scene_cameraX << 8) / var5;
+                     var4.field658 = (var4.maxX - Scene_cameraX << 8) / var5;
+                     var4.field659 = (var4.minZ - Scene_cameraZ << 8) / var5;
+                     var4.field660 = (var4.maxZ - Scene_cameraZ << 8) / var5;
                      Scene_currentOccluders[Scene_currentOccludersCount++] = var4;
                   }
                }
@@ -2125,28 +2108,28 @@ public class Scene {
    }
 
    @ObfuscatedName("ba")
-   boolean __ba_253(int var1, int var2, int var3) {
-      int var4 = this.__x[var1][var2][var3];
-      if(var4 == -Scene_drawnCount) {
+   boolean method297(int var1, int var2, int var3) {
+      int var4 = this.field769[var1][var2][var3];
+      if (var4 == -Scene_drawnCount) {
          return false;
-      } else if(var4 == Scene_drawnCount) {
+      } else if (var4 == Scene_drawnCount) {
          return true;
       } else {
          int var5 = var2 << 7;
          int var6 = var3 << 7;
-         if(this.__bn_257(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.__bn_257(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.__bn_257(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.__bn_257(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) {
-            this.__x[var1][var2][var3] = Scene_drawnCount;
+         if (this.method301(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method301(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method301(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method301(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) {
+            this.field769[var1][var2][var3] = Scene_drawnCount;
             return true;
          } else {
-            this.__x[var1][var2][var3] = -Scene_drawnCount;
+            this.field769[var1][var2][var3] = -Scene_drawnCount;
             return false;
          }
       }
    }
 
    @ObfuscatedName("bb")
-   boolean __bb_254(int var1, int var2, int var3, int var4) {
-      if(!this.__ba_253(var1, var2, var3)) {
+   boolean method298(int var1, int var2, int var3, int var4) {
+      if (!this.method297(var1, var2, var3)) {
          return false;
       } else {
          int var5 = var2 << 7;
@@ -2155,129 +2138,129 @@ public class Scene {
          int var8 = var7 - 120;
          int var9 = var7 - 230;
          int var10 = var7 - 238;
-         if(var4 < 16) {
-            if(var4 == 1) {
-               if(var5 > Scene_cameraX) {
-                  if(!this.__bn_257(var5, var7, var6)) {
+         if (var4 < 16) {
+            if (var4 == 1) {
+               if (var5 > Scene_cameraX) {
+                  if (!this.method301(var5, var7, var6)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5, var7, var6 + 128)) {
+                  if (!this.method301(var5, var7, var6 + 128)) {
                      return false;
                   }
                }
 
-               if(var1 > 0) {
-                  if(!this.__bn_257(var5, var8, var6)) {
+               if (var1 > 0) {
+                  if (!this.method301(var5, var8, var6)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5, var8, var6 + 128)) {
+                  if (!this.method301(var5, var8, var6 + 128)) {
                      return false;
                   }
                }
 
-               if(!this.__bn_257(var5, var9, var6)) {
+               if (!this.method301(var5, var9, var6)) {
                   return false;
                }
 
-               if(!this.__bn_257(var5, var9, var6 + 128)) {
+               if (!this.method301(var5, var9, var6 + 128)) {
                   return false;
                }
 
                return true;
             }
 
-            if(var4 == 2) {
-               if(var6 < Scene_cameraZ) {
-                  if(!this.__bn_257(var5, var7, var6 + 128)) {
+            if (var4 == 2) {
+               if (var6 < Scene_cameraZ) {
+                  if (!this.method301(var5, var7, var6 + 128)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5 + 128, var7, var6 + 128)) {
+                  if (!this.method301(var5 + 128, var7, var6 + 128)) {
                      return false;
                   }
                }
 
-               if(var1 > 0) {
-                  if(!this.__bn_257(var5, var8, var6 + 128)) {
+               if (var1 > 0) {
+                  if (!this.method301(var5, var8, var6 + 128)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5 + 128, var8, var6 + 128)) {
+                  if (!this.method301(var5 + 128, var8, var6 + 128)) {
                      return false;
                   }
                }
 
-               if(!this.__bn_257(var5, var9, var6 + 128)) {
+               if (!this.method301(var5, var9, var6 + 128)) {
                   return false;
                }
 
-               if(!this.__bn_257(var5 + 128, var9, var6 + 128)) {
+               if (!this.method301(var5 + 128, var9, var6 + 128)) {
                   return false;
                }
 
                return true;
             }
 
-            if(var4 == 4) {
-               if(var5 < Scene_cameraX) {
-                  if(!this.__bn_257(var5 + 128, var7, var6)) {
+            if (var4 == 4) {
+               if (var5 < Scene_cameraX) {
+                  if (!this.method301(var5 + 128, var7, var6)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5 + 128, var7, var6 + 128)) {
+                  if (!this.method301(var5 + 128, var7, var6 + 128)) {
                      return false;
                   }
                }
 
-               if(var1 > 0) {
-                  if(!this.__bn_257(var5 + 128, var8, var6)) {
+               if (var1 > 0) {
+                  if (!this.method301(var5 + 128, var8, var6)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5 + 128, var8, var6 + 128)) {
+                  if (!this.method301(var5 + 128, var8, var6 + 128)) {
                      return false;
                   }
                }
 
-               if(!this.__bn_257(var5 + 128, var9, var6)) {
+               if (!this.method301(var5 + 128, var9, var6)) {
                   return false;
                }
 
-               if(!this.__bn_257(var5 + 128, var9, var6 + 128)) {
+               if (!this.method301(var5 + 128, var9, var6 + 128)) {
                   return false;
                }
 
                return true;
             }
 
-            if(var4 == 8) {
-               if(var6 > Scene_cameraZ) {
-                  if(!this.__bn_257(var5, var7, var6)) {
+            if (var4 == 8) {
+               if (var6 > Scene_cameraZ) {
+                  if (!this.method301(var5, var7, var6)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5 + 128, var7, var6)) {
+                  if (!this.method301(var5 + 128, var7, var6)) {
                      return false;
                   }
                }
 
-               if(var1 > 0) {
-                  if(!this.__bn_257(var5, var8, var6)) {
+               if (var1 > 0) {
+                  if (!this.method301(var5, var8, var6)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5 + 128, var8, var6)) {
+                  if (!this.method301(var5 + 128, var8, var6)) {
                      return false;
                   }
                }
 
-               if(!this.__bn_257(var5, var9, var6)) {
+               if (!this.method301(var5, var9, var6)) {
                   return false;
                }
 
-               if(!this.__bn_257(var5 + 128, var9, var6)) {
+               if (!this.method301(var5 + 128, var9, var6)) {
                   return false;
                }
 
@@ -2285,37 +2268,37 @@ public class Scene {
             }
          }
 
-         return !this.__bn_257(var5 + 64, var10, var6 + 64)?false:(var4 == 16?this.__bn_257(var5, var9, var6 + 128):(var4 == 32?this.__bn_257(var5 + 128, var9, var6 + 128):(var4 == 64?this.__bn_257(var5 + 128, var9, var6):(var4 == 128?this.__bn_257(var5, var9, var6):true))));
+         return !this.method301(var5 + 64, var10, var6 + 64) ? false : (var4 == 16 ? this.method301(var5, var9, var6 + 128) : (var4 == 32 ? this.method301(var5 + 128, var9, var6 + 128) : (var4 == 64 ? this.method301(var5 + 128, var9, var6) : (var4 == 128 ? this.method301(var5, var9, var6) : true))));
       }
    }
 
    @ObfuscatedName("bs")
-   boolean __bs_255(int var1, int var2, int var3, int var4) {
-      if(!this.__ba_253(var1, var2, var3)) {
+   boolean method299(int var1, int var2, int var3, int var4) {
+      if (!this.method297(var1, var2, var3)) {
          return false;
       } else {
          int var5 = var2 << 7;
          int var6 = var3 << 7;
-         return this.__bn_257(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.__bn_257(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.__bn_257(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.__bn_257(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1);
+         return this.method301(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method301(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method301(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method301(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1);
       }
    }
 
    @ObfuscatedName("bq")
-   boolean __bq_256(int var1, int var2, int var3, int var4, int var5, int var6) {
+   boolean method300(int var1, int var2, int var3, int var4, int var5, int var6) {
       int var7;
       int var8;
-      if(var3 == var2 && var5 == var4) {
-         if(!this.__ba_253(var1, var2, var4)) {
+      if (var3 == var2 && var5 == var4) {
+         if (!this.method297(var1, var2, var4)) {
             return false;
          } else {
             var7 = var2 << 7;
             var8 = var4 << 7;
-            return this.__bn_257(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.__bn_257(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.__bn_257(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.__bn_257(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1);
+            return this.method301(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method301(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method301(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method301(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1);
          }
       } else {
-         for(var7 = var2; var7 <= var3; ++var7) {
-            for(var8 = var4; var8 <= var5; ++var8) {
-               if(this.__x[var1][var7][var8] == -Scene_drawnCount) {
+         for (var7 = var2; var7 <= var3; ++var7) {
+            for (var8 = var4; var8 <= var5; ++var8) {
+               if (this.field769[var1][var7][var8] == -Scene_drawnCount) {
                   return false;
                }
             }
@@ -2324,17 +2307,17 @@ public class Scene {
          var7 = (var2 << 7) + 1;
          var8 = (var4 << 7) + 2;
          int var9 = this.tileHeights[var1][var2][var4] - var6;
-         if(!this.__bn_257(var7, var9, var8)) {
+         if (!this.method301(var7, var9, var8)) {
             return false;
          } else {
             int var10 = (var3 << 7) - 1;
-            if(!this.__bn_257(var10, var9, var8)) {
+            if (!this.method301(var10, var9, var8)) {
                return false;
             } else {
                int var11 = (var5 << 7) - 1;
-               if(!this.__bn_257(var7, var9, var11)) {
+               if (!this.method301(var7, var9, var11)) {
                   return false;
-               } else if(!this.__bn_257(var10, var9, var11)) {
+               } else if (!this.method301(var10, var9, var11)) {
                   return false;
                } else {
                   return true;
@@ -2345,66 +2328,66 @@ public class Scene {
    }
 
    @ObfuscatedName("bn")
-   boolean __bn_257(int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) {
+   boolean method301(int var1, int var2, int var3) {
+      for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) {
          Occluder var5 = Scene_currentOccluders[var4];
          int var6;
          int var7;
          int var8;
          int var9;
          int var10;
-         if(var5.__k == 1) {
+         if (var5.field656 == 1) {
             var6 = var5.minX - var1;
-            if(var6 > 0) {
-               var7 = (var6 * var5.__a >> 8) + var5.minZ;
-               var8 = (var6 * var5.__z >> 8) + var5.maxZ;
-               var9 = (var6 * var5.__j >> 8) + var5.minY;
-               var10 = (var6 * var5.__s >> 8) + var5.maxY;
-               if(var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) {
+            if (var6 > 0) {
+               var7 = (var6 * var5.field659 >> 8) + var5.minZ;
+               var8 = (var6 * var5.field660 >> 8) + var5.maxZ;
+               var9 = (var6 * var5.field661 >> 8) + var5.minY;
+               var10 = (var6 * var5.field662 >> 8) + var5.maxY;
+               if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) {
                   return true;
                }
             }
-         } else if(var5.__k == 2) {
+         } else if (var5.field656 == 2) {
             var6 = var1 - var5.minX;
-            if(var6 > 0) {
-               var7 = (var6 * var5.__a >> 8) + var5.minZ;
-               var8 = (var6 * var5.__z >> 8) + var5.maxZ;
-               var9 = (var6 * var5.__j >> 8) + var5.minY;
-               var10 = (var6 * var5.__s >> 8) + var5.maxY;
-               if(var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) {
+            if (var6 > 0) {
+               var7 = (var6 * var5.field659 >> 8) + var5.minZ;
+               var8 = (var6 * var5.field660 >> 8) + var5.maxZ;
+               var9 = (var6 * var5.field661 >> 8) + var5.minY;
+               var10 = (var6 * var5.field662 >> 8) + var5.maxY;
+               if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) {
                   return true;
                }
             }
-         } else if(var5.__k == 3) {
+         } else if (var5.field656 == 3) {
             var6 = var5.minZ - var3;
-            if(var6 > 0) {
-               var7 = (var6 * var5.__n >> 8) + var5.minX;
-               var8 = (var6 * var5.__i >> 8) + var5.maxX;
-               var9 = (var6 * var5.__j >> 8) + var5.minY;
-               var10 = (var6 * var5.__s >> 8) + var5.maxY;
-               if(var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) {
+            if (var6 > 0) {
+               var7 = (var6 * var5.field657 >> 8) + var5.minX;
+               var8 = (var6 * var5.field658 >> 8) + var5.maxX;
+               var9 = (var6 * var5.field661 >> 8) + var5.minY;
+               var10 = (var6 * var5.field662 >> 8) + var5.maxY;
+               if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) {
                   return true;
                }
             }
-         } else if(var5.__k == 4) {
+         } else if (var5.field656 == 4) {
             var6 = var3 - var5.minZ;
-            if(var6 > 0) {
-               var7 = (var6 * var5.__n >> 8) + var5.minX;
-               var8 = (var6 * var5.__i >> 8) + var5.maxX;
-               var9 = (var6 * var5.__j >> 8) + var5.minY;
-               var10 = (var6 * var5.__s >> 8) + var5.maxY;
-               if(var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) {
+            if (var6 > 0) {
+               var7 = (var6 * var5.field657 >> 8) + var5.minX;
+               var8 = (var6 * var5.field658 >> 8) + var5.maxX;
+               var9 = (var6 * var5.field661 >> 8) + var5.minY;
+               var10 = (var6 * var5.field662 >> 8) + var5.maxY;
+               if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) {
                   return true;
                }
             }
-         } else if(var5.__k == 5) {
+         } else if (var5.field656 == 5) {
             var6 = var2 - var5.minY;
-            if(var6 > 0) {
-               var7 = (var6 * var5.__n >> 8) + var5.minX;
-               var8 = (var6 * var5.__i >> 8) + var5.maxX;
-               var9 = (var6 * var5.__a >> 8) + var5.minZ;
-               var10 = (var6 * var5.__z >> 8) + var5.maxZ;
-               if(var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) {
+            if (var6 > 0) {
+               var7 = (var6 * var5.field657 >> 8) + var5.minX;
+               var8 = (var6 * var5.field658 >> 8) + var5.maxX;
+               var9 = (var6 * var5.field659 >> 8) + var5.minZ;
+               var10 = (var6 * var5.field660 >> 8) + var5.maxZ;
+               if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) {
                   return true;
                }
             }
@@ -2447,10 +2430,10 @@ public class Scene {
       int var7;
       int var8;
       int var9;
+      int var10;
       int var11;
-      int var12;
-      for(var6 = 128; var6 <= 383; var6 += 32) {
-         for(var7 = 0; var7 < 2048; var7 += 64) {
+      for (var6 = 128; var6 <= 383; var6 += 32) {
+         for (var7 = 0; var7 < 2048; var7 += 64) {
             Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6];
             Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6];
             Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7];
@@ -2458,50 +2441,50 @@ public class Scene {
             var8 = (var6 - 128) / 32;
             var9 = var7 / 64;
 
-            for(int var10 = -26; var10 < 26; ++var10) {
-               for(var11 = -26; var11 < 26; ++var11) {
-                  var12 = var10 * 128;
-                  int var13 = var11 * 128;
+            for (int var12 = -26; var12 < 26; ++var12) {
+               for (var10 = -26; var10 < 26; ++var10) {
+                  var11 = var12 * 128;
+                  int var13 = var10 * 128;
                   boolean var14 = false;
 
-                  for(int var15 = -var1; var15 <= var2; var15 += 128) {
-                     if(method3100(var12, var0[var8] + var15, var13)) {
+                  for (int var15 = -var1; var15 <= var2; var15 += 128) {
+                     if (method3100(var11, var0[var8] + var15, var13)) {
                         var14 = true;
                         break;
                      }
                   }
 
-                  var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14;
+                  var5[var8][var9][var12 + 1 + 25][var10 + 1 + 25] = var14;
                }
             }
          }
       }
 
-      for(var6 = 0; var6 < 8; ++var6) {
-         for(var7 = 0; var7 < 32; ++var7) {
-            for(var8 = -25; var8 < 25; ++var8) {
-               for(var9 = -25; var9 < 25; ++var9) {
+      for (var6 = 0; var6 < 8; ++var6) {
+         for (var7 = 0; var7 < 32; ++var7) {
+            for (var8 = -25; var8 < 25; ++var8) {
+               for (var9 = -25; var9 < 25; ++var9) {
                   boolean var16 = false;
 
                   label76:
-                  for(var11 = -1; var11 <= 1; ++var11) {
-                     for(var12 = -1; var12 <= 1; ++var12) {
-                        if(var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) {
+                  for (var10 = -1; var10 <= 1; ++var10) {
+                     for (var11 = -1; var11 <= 1; ++var11) {
+                        if (var5[var6][var7][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) {
                            var16 = true;
                            break label76;
                         }
 
-                        if(var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) {
+                        if (var5[var6][(var7 + 1) % 31][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) {
                            var16 = true;
                            break label76;
                         }
 
-                        if(var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) {
+                        if (var5[var6 + 1][var7][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) {
                            var16 = true;
                            break label76;
                         }
 
-                        if(var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) {
+                        if (var5[var6 + 1][(var7 + 1) % 31][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) {
                            var16 = true;
                            break label76;
                         }
@@ -2522,7 +2505,7 @@ public class Scene {
       int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16;
       int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16;
       int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16;
-      if(var5 >= 50 && var5 <= 3500) {
+      if (var5 >= 50 && var5 <= 3500) {
          int var7 = var3 * 128 / var5 + Scene_viewportXCenter;
          int var8 = var6 * 128 / var5 + Scene_viewportYCenter;
          return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax;
@@ -2545,9 +2528,9 @@ public class Scene {
    @ObfuscatedName("ax")
    static final int method3108(int var0, int var1) {
       var1 = (var0 & 127) * var1 >> 7;
-      if(var1 < 2) {
+      if (var1 < 2) {
          var1 = 2;
-      } else if(var1 > 126) {
+      } else if (var1 > 126) {
          var1 = 126;
       }
 
@@ -2557,19 +2540,47 @@ public class Scene {
    @Export("containsBounds")
    @ObfuscatedName("af")
    static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-      if(var1 < var2 && var1 < var3 && var1 < var4) {
+      if (var1 < var2 && var1 < var3 && var1 < var4) {
          return false;
-      } else if(var1 > var2 && var1 > var3 && var1 > var4) {
+      } else if (var1 > var2 && var1 > var3 && var1 > var4) {
          return false;
-      } else if(var0 < var5 && var0 < var6 && var0 < var7) {
+      } else if (var0 < var5 && var0 < var6 && var0 < var7) {
          return false;
-      } else if(var0 > var5 && var0 > var6 && var0 > var7) {
+      } else if (var0 > var5 && var0 > var6 && var0 > var7) {
          return false;
       } else {
          int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2);
          int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3);
          int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7);
-         return var8 == 0?(var9 != 0?(var9 < 0?var10 <= 0:var10 >= 0):true):(var8 < 0?var9 <= 0 && var10 <= 0:var9 >= 0 && var10 >= 0);
+         return var8 == 0 ? (var9 != 0 ? (var9 < 0 ? var10 <= 0 : var10 >= 0) : true) : (var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0);
       }
    }
+
+   static {
+      Scene_isLowDetail = true;
+      tileUpdateCount = 0;
+      Scene_plane = 0;
+      Scene_gameObjects = new GameObject[100];
+      checkClick = false;
+      Scene_selectedPlane = 0;
+      Scene_selectedScreenX = 0;
+      Scene_selectedScreenY = 0;
+      Scene_selectedX = -1;
+      Scene_selectedY = -1;
+      viewportWalking = false;
+      Scene_planesCount = 4;
+      Scene_planeOccluderCounts = new int[Scene_planesCount];
+      Scene_planeOccluders = new Occluder[Scene_planesCount][500];
+      Scene_currentOccludersCount = 0;
+      Scene_currentOccluders = new Occluder[500];
+      Scene_tilesDeque = new NodeDeque();
+      field762 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76};
+      field763 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160};
+      field764 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19};
+      field765 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0};
+      field766 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4};
+      field767 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0};
+      field768 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8};
+      visibilityMap = new boolean[8][32][51][51];
+   }
 }
diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java
index 585a8793b2..83c0f47574 100644
--- a/runescape-client/src/main/java/Script.java
+++ b/runescape-client/src/main/java/Script.java
@@ -53,16 +53,12 @@ public class Script extends DualNode {
    @Export("switches")
    IterableNodeHashTable[] switches;
 
-   static {
-      Script_cached = new EvictingDualNodeHashTable(128);
-   }
-
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "(II)[Llh;",
       garbageValue = "-729647116"
    )
-   IterableNodeHashTable[] __o_164(int var1) {
+   IterableNodeHashTable[] method302(int var1) {
       return new IterableNodeHashTable[var1];
    }
 
@@ -73,9 +69,10 @@ public class Script extends DualNode {
    )
    static void method2216(int var0) {
       ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          var1.remove();
       }
+
    }
 
    @ObfuscatedName("e")
@@ -115,23 +112,26 @@ public class Script extends DualNode {
       garbageValue = "-1584807244"
    )
    static void method2201(SequenceDefinition var0, int var1, int var2, int var3) {
-      if(Client.soundEffectCount < 50 && Client.__client_qc != 0) {
-         if(var0.__e != null && var1 < var0.__e.length) {
-            int var4 = var0.__e[var1];
-            if(var4 != 0) {
-               int var5 = var4 >> 8;
-               int var6 = var4 >> 4 & 7;
-               int var7 = var4 & 15;
-               Client.soundEffectIds[Client.soundEffectCount] = var5;
-               Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6;
-               Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0;
-               Client.soundEffects[Client.soundEffectCount] = null;
-               int var8 = (var2 - 64) / 128;
-               int var9 = (var3 - 64) / 128;
-               Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16);
-               ++Client.soundEffectCount;
-            }
+      if (Client.soundEffectCount < 50 && Client.field115 != 0 && var0.field776 != null && var1 < var0.field776.length) {
+         int var4 = var0.field776[var1];
+         if (var4 != 0) {
+            int var5 = var4 >> 8;
+            int var6 = var4 >> 4 & 7;
+            int var7 = var4 & 15;
+            Client.soundEffectIds[Client.soundEffectCount] = var5;
+            Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6;
+            Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0;
+            Client.soundEffects[Client.soundEffectCount] = null;
+            int var8 = (var2 - 64) / 128;
+            int var9 = (var3 - 64) / 128;
+            Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16);
+            ++Client.soundEffectCount;
          }
       }
+
+   }
+
+   static {
+      Script_cached = new EvictingDualNodeHashTable(128);
    }
 }
diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java
index a772be2e8d..328851d6dc 100644
--- a/runescape-client/src/main/java/ScriptEvent.java
+++ b/runescape-client/src/main/java/ScriptEvent.java
@@ -74,7 +74,7 @@ public class ScriptEvent extends Node {
    @ObfuscatedGetter(
       intValue = -2138736593
    )
-   int __d;
+   int field772;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = -161292529
@@ -112,51 +112,51 @@ public class ScriptEvent extends Node {
       garbageValue = "0"
    )
    static int method1185(int var0, Script var1, boolean var2) {
-      Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
-      if(var0 == 1600) {
+      Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+      if (var0 == 1600) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollX;
          return 1;
-      } else if(var0 == 1601) {
+      } else if (var0 == 1601) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollY;
          return 1;
-      } else if(var0 == 1602) {
+      } else if (var0 == 1602) {
          Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text;
          return 1;
-      } else if(var0 == 1603) {
+      } else if (var0 == 1603) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollWidth;
          return 1;
-      } else if(var0 == 1604) {
+      } else if (var0 == 1604) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollHeight;
          return 1;
-      } else if(var0 == 1605) {
+      } else if (var0 == 1605) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelZoom;
          return 1;
-      } else if(var0 == 1606) {
+      } else if (var0 == 1606) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleX;
          return 1;
-      } else if(var0 == 1607) {
+      } else if (var0 == 1607) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleZ;
          return 1;
-      } else if(var0 == 1608) {
+      } else if (var0 == 1608) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleY;
          return 1;
-      } else if(var0 == 1609) {
+      } else if (var0 == 1609) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.transparency;
          return 1;
-      } else if(var0 == 1610) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__af;
+      } else if (var0 == 1610) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field960;
          return 1;
-      } else if(var0 == 1611) {
+      } else if (var0 == 1611) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color;
          return 1;
-      } else if(var0 == 1612) {
+      } else if (var0 == 1612) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color2;
          return 1;
-      } else if(var0 == 1613) {
+      } else if (var0 == 1613) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal();
          return 1;
-      } else if(var0 == 1614) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__bv?1:0;
+      } else if (var0 == 1614) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field964 ? 1 : 0;
          return 1;
       } else {
          return 2;
@@ -169,119 +169,119 @@ public class ScriptEvent extends Node {
       garbageValue = "1256509027"
    )
    static int method1187(int var0, Script var1, boolean var2) {
-      if(var0 == 3300) {
+      if (var0 == 3300) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cycle;
          return 1;
       } else {
          int var3;
          int var4;
-         if(var0 == 3301) {
+         if (var0 == 3301) {
             RouteStrategy.Interpreter_intStackSize -= 2;
             var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
             var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class83.method2027(var3, var4);
             return 1;
-         } else if(var0 == 3302) {
+         } else if (var0 == 3302) {
             RouteStrategy.Interpreter_intStackSize -= 2;
             var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
             var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapLabel.method442(var3, var4);
             return 1;
-         } else if(var0 == 3303) {
+         } else if (var0 == 3303) {
             RouteStrategy.Interpreter_intStackSize -= 2;
             var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
             var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class1.method18(var3, var4);
             return 1;
-         } else if(var0 == 3304) {
+         } else if (var0 == 3304) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class231.method4523(var3).size;
             return 1;
-         } else if(var0 == 3305) {
+         } else if (var0 == 3305) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.currentLevels[var3];
             return 1;
-         } else if(var0 == 3306) {
+         } else if (var0 == 3306) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.levels[var3];
             return 1;
-         } else if(var0 == 3307) {
+         } else if (var0 == 3307) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.experience[var3];
             return 1;
          } else {
             int var5;
-            if(var0 == 3308) {
+            if (var0 == 3308) {
                var3 = SoundSystem.plane;
                var4 = (Canvas.localPlayer.x >> 7) + class50.baseX;
                var5 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28);
                return 1;
-            } else if(var0 == 3309) {
+            } else if (var0 == 3309) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 >> 14 & 16383;
                return 1;
-            } else if(var0 == 3310) {
+            } else if (var0 == 3310) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 >> 28;
                return 1;
-            } else if(var0 == 3311) {
+            } else if (var0 == 3311) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & 16383;
                return 1;
-            } else if(var0 == 3312) {
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.isMembersWorld?1:0;
+            } else if (var0 == 3312) {
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0;
                return 1;
-            } else if(var0 == 3313) {
+            } else if (var0 == 3313) {
                RouteStrategy.Interpreter_intStackSize -= 2;
                var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] + 32768;
                var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class83.method2027(var3, var4);
                return 1;
-            } else if(var0 == 3314) {
+            } else if (var0 == 3314) {
                RouteStrategy.Interpreter_intStackSize -= 2;
                var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] + 32768;
                var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapLabel.method442(var3, var4);
                return 1;
-            } else if(var0 == 3315) {
+            } else if (var0 == 3315) {
                RouteStrategy.Interpreter_intStackSize -= 2;
                var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] + 32768;
                var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class1.method18(var3, var4);
                return 1;
-            } else if(var0 == 3316) {
-               if(Client.rights >= 2) {
+            } else if (var0 == 3316) {
+               if (Client.rights >= 2) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rights;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                }
 
                return 1;
-            } else if(var0 == 3317) {
+            } else if (var0 == 3317) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rebootTimer;
                return 1;
-            } else if(var0 == 3318) {
+            } else if (var0 == 3318) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.worldId;
                return 1;
-            } else if(var0 == 3321) {
+            } else if (var0 == 3321) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.runEnergy;
                return 1;
-            } else if(var0 == 3322) {
+            } else if (var0 == 3322) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.weight;
                return 1;
-            } else if(var0 == 3323) {
-               if(Client.__client_mn) {
+            } else if (var0 == 3323) {
+               if (Client.field155) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                }
 
                return 1;
-            } else if(var0 == 3324) {
+            } else if (var0 == 3324) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.worldProperties;
                return 1;
-            } else if(var0 == 3325) {
+            } else if (var0 == 3325) {
                RouteStrategy.Interpreter_intStackSize -= 4;
                var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
                var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
@@ -307,12 +307,12 @@ public class ScriptEvent extends Node {
    static void method1183(int var0, int var1) {
       int[] var2 = new int[9];
 
-      for(int var3 = 0; var3 < var2.length; ++var3) {
+      for (int var3 = 0; var3 < var2.length; ++var3) {
          int var4 = var3 * 32 + 15 + 128;
          int var5 = var4 * 3 + 600;
-         int var7 = Rasterizer3D.Rasterizer3D_sine[var4];
-         int var6 = method1176(var5, var1);
-         var2[var3] = var6 * var7 >> 16;
+         int var6 = Rasterizer3D.Rasterizer3D_sine[var4];
+         int var7 = method1176(var5, var1);
+         var2[var3] = var7 * var6 >> 16;
       }
 
       Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334);
@@ -325,13 +325,13 @@ public class ScriptEvent extends Node {
    )
    static int method1176(int var0, int var1) {
       int var2 = var1 - 334;
-      if(var2 < 0) {
+      if (var2 < 0) {
          var2 = 0;
-      } else if(var2 > 100) {
+      } else if (var2 > 100) {
          var2 = 100;
       }
 
-      int var3 = (Client.__client_rb - Client.__client_re) * var2 / 100 + Client.__client_re;
+      int var3 = (Client.field149 - Client.field150) * var2 / 100 + Client.field150;
       return var0 * var3 / 256;
    }
 
@@ -341,8 +341,8 @@ public class ScriptEvent extends Node {
       garbageValue = "35"
    )
    static final void method1179() {
-      for(class68 var0 = (class68)Client.__client_kh.last(); var0 != null; var0 = (class68)Client.__client_kh.previous()) {
-         if(var0.field910 == -1) {
+      for (class68 var0 = (class68)Client.field214.last(); var0 != null; var0 = (class68)Client.field214.previous()) {
+         if (var0.field910 == -1) {
             var0.field909 = 0;
             class13.method165(var0);
          } else {
diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java
index c31e812dc4..e86e4aea9d 100644
--- a/runescape-client/src/main/java/ScriptFrame.java
+++ b/runescape-client/src/main/java/ScriptFrame.java
@@ -39,9 +39,9 @@ public class ScriptFrame {
    public static Enumerated findEnumerated(Enumerated[] var0, int var1) {
       Enumerated[] var2 = var0;
 
-      for(int var3 = 0; var3 < var2.length; ++var3) {
+      for (int var3 = 0; var3 < var2.length; ++var3) {
          Enumerated var4 = var2[var3];
-         if(var1 == var4.rsOrdinal()) {
+         if (var1 == var4.rsOrdinal()) {
             return var4;
          }
       }
@@ -55,12 +55,12 @@ public class ScriptFrame {
       garbageValue = "-423549686"
    )
    static void method1138() {
-      if(ClientParameter.field3645 != null) {
-         Client.__client_ss = Client.cycle;
+      if (ClientParameter.field3645 != null) {
+         Client.field104 = Client.cycle;
          ClientParameter.field3645.method4719();
 
-         for(int var0 = 0; var0 < Client.players.length; ++var0) {
-            if(Client.players[var0] != null) {
+         for (int var0 = 0; var0 < Client.players.length; ++var0) {
+            if (Client.players[var0] != null) {
                ClientParameter.field3645.method4738((Client.players[var0].x >> 7) + class50.baseX, (Client.players[var0].y >> 7) + GraphicsObject.baseY);
             }
          }
diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java
index fcfe23f2ec..3e02c0905e 100644
--- a/runescape-client/src/main/java/SecureRandomCallable.java
+++ b/runescape-client/src/main/java/SecureRandomCallable.java
@@ -23,7 +23,7 @@ public class SecureRandomCallable implements Callable {
       garbageValue = "64"
    )
    static class27 method1145(byte[] var0) {
-      return var0 == null?new class27():new class27(class27.convertJpgToSprite(var0).pixels);
+      return var0 == null ? new class27() : new class27(class27.convertJpgToSprite(var0).pixels);
    }
 
    @ObfuscatedName("m")
@@ -33,12 +33,12 @@ public class SecureRandomCallable implements Callable {
    )
    public static VarpDefinition method1140(int var0) {
       VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = VarpDefinition.__ix_m.takeRecord(16, var0);
+         byte[] var2 = VarpDefinition.field943.takeRecord(16, var0);
          var1 = new VarpDefinition();
-         if(var2 != null) {
+         if (var2 != null) {
             var1.read(new Buffer(var2));
          }
 
@@ -60,17 +60,17 @@ public class SecureRandomCallable implements Callable {
       DevicePcmPlayerProvider.method845(var1);
       Widget var4 = Huffman.getWidget(var0);
       class22.method295(var4);
-      if(Client.__client_mo != null) {
-         class22.method295(Client.__client_mo);
-         Client.__client_mo = null;
+      if (Client.field127 != null) {
+         class22.method295(Client.field127);
+         Client.field127 = null;
       }
 
       int var5;
       int var6;
-      for(var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
-         if(WorldMapManager.isWidgetMenuOpcode(Client.menuOpcodes[var5])) {
-            if(var5 < Client.menuOptionsCount - 1) {
-               for(var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) {
+      for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
+         if (WorldMapManager.isWidgetMenuOpcode(Client.menuOpcodes[var5])) {
+            if (var5 < Client.menuOptionsCount - 1) {
+               for (var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) {
                   Client.menuActions[var6] = Client.menuActions[var6 + 1];
                   Client.menuTargetNames[var6] = Client.menuTargetNames[var6 + 1];
                   Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1];
@@ -91,19 +91,19 @@ public class SecureRandomCallable implements Callable {
       int var7 = class2.fontBold12.stringWidth("Choose Option");
 
       int var8;
-      for(var8 = 0; var8 < Client.menuOptionsCount; ++var8) {
+      for (var8 = 0; var8 < Client.menuOptionsCount; ++var8) {
          Font var9 = class2.fontBold12;
          String var10;
-         if(var8 < 0) {
+         if (var8 < 0) {
             var10 = "";
-         } else if(Client.menuTargetNames[var8].length() > 0) {
+         } else if (Client.menuTargetNames[var8].length() > 0) {
             var10 = Client.menuActions[var8] + " " + Client.menuTargetNames[var8];
          } else {
             var10 = Client.menuActions[var8];
          }
 
          int var11 = var9.stringWidth(var10);
-         if(var11 > var7) {
+         if (var11 > var7) {
             var7 = var11;
          }
       }
@@ -111,20 +111,20 @@ public class SecureRandomCallable implements Callable {
       var7 += 8;
       var8 = Client.menuOptionsCount * 15 + 22;
       int var12 = var5 - var7 / 2;
-      if(var12 + var7 > SoundCache.canvasWidth) {
+      if (var12 + var7 > SoundCache.canvasWidth) {
          var12 = SoundCache.canvasWidth - var7;
       }
 
-      if(var12 < 0) {
+      if (var12 < 0) {
          var12 = 0;
       }
 
       int var13 = var6;
-      if(var8 + var6 > Huffman.canvasHeight) {
+      if (var8 + var6 > Huffman.canvasHeight) {
          var13 = Huffman.canvasHeight - var8;
       }
 
-      if(var13 < 0) {
+      if (var13 < 0) {
          var13 = 0;
       }
 
@@ -134,7 +134,7 @@ public class SecureRandomCallable implements Callable {
       AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22;
       class39.revalidateWidgetScroll(Widget.widgets[var0 >> 16], var4, false);
       WorldMapSection3.runWidgetOnLoadListener(var1);
-      if(Client.rootWidgetGroup != -1) {
+      if (Client.rootWidgetGroup != -1) {
          GrandExchangeEvents.method74(Client.rootWidgetGroup, 1);
       }
 
diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java
index d9cf7aab24..378872b26b 100644
--- a/runescape-client/src/main/java/SecureRandomFuture.java
+++ b/runescape-client/src/main/java/SecureRandomFuture.java
@@ -84,7 +84,7 @@ public class SecureRandomFuture {
    static void method2104() {
       Iterator var0 = Messages.Messages_hashTable.iterator();
 
-      while(var0.hasNext()) {
+      while (var0.hasNext()) {
          Message var1 = (Message)var0.next();
          var1.clearIsFromIgnored();
       }
diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java
index 0223305001..555ecbd1df 100644
--- a/runescape-client/src/main/java/SequenceDefinition.java
+++ b/runescape-client/src/main/java/SequenceDefinition.java
@@ -17,12 +17,12 @@ public class SequenceDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __jh_f;
+   public static AbstractIndexCache field773;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __jh_q;
+   public static AbstractIndexCache field774;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -33,7 +33,7 @@ public class SequenceDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   public static EvictingDualNodeHashTable __jh_o;
+   public static EvictingDualNodeHashTable field775;
    @ObfuscatedName("u")
    @Export("frameIds")
    public int[] frameIds;
@@ -44,7 +44,7 @@ public class SequenceDefinition extends DualNode {
    @Export("frameLengths")
    public int[] frameLengths;
    @ObfuscatedName("e")
-   public int[] __e;
+   public int[] field776;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = -736885973
@@ -52,14 +52,14 @@ public class SequenceDefinition extends DualNode {
    @Export("frameCount")
    public int frameCount;
    @ObfuscatedName("d")
-   int[] __d;
+   int[] field777;
    @ObfuscatedName("k")
-   public boolean __k;
+   public boolean field778;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
       intValue = 1309695045
    )
-   public int __n;
+   public int field779;
    @ObfuscatedName("i")
    @ObfuscatedGetter(
       intValue = -1308226131
@@ -76,38 +76,33 @@ public class SequenceDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = -28345361
    )
-   public int __z;
+   public int field780;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = 1339014215
    )
-   public int __j;
+   public int field781;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = 2012242069
    )
-   public int __s;
+   public int field782;
    @ObfuscatedName("t")
    @ObfuscatedGetter(
       intValue = 1147391369
    )
-   public int __t;
-
-   static {
-      SequenceDefinition_cached = new EvictingDualNodeHashTable(64);
-      __jh_o = new EvictingDualNodeHashTable(100);
-   }
+   public int field783;
 
    SequenceDefinition() {
       this.frameCount = -1;
-      this.__k = false;
-      this.__n = 5;
+      this.field778 = false;
+      this.field779 = 5;
       this.shield = -1;
       this.weapon = -1;
-      this.__z = 99;
-      this.__j = -1;
-      this.__s = -1;
-      this.__t = 2;
+      this.field780 = 99;
+      this.field781 = -1;
+      this.field782 = -1;
+      this.field783 = 2;
    }
 
    @ObfuscatedName("f")
@@ -117,9 +112,9 @@ public class SequenceDefinition extends DualNode {
    )
    @Export("read")
    void read(Buffer var1) {
-      while(true) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
@@ -134,69 +129,72 @@ public class SequenceDefinition extends DualNode {
    )
    @Export("readNext")
    void readNext(Buffer var1, int var2) {
+      int[] var10000;
       int var3;
       int var4;
-      if(var2 == 1) {
-         var3 = var1.__ag_302();
+      if (var2 == 1) {
+         var3 = var1.method43();
          this.frameLengths = new int[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.frameLengths[var4] = var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.frameLengths[var4] = var1.method43();
          }
 
          this.frameIds = new int[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.frameIds[var4] = var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.frameIds[var4] = var1.method43();
          }
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.frameIds[var4] += var1.__ag_302() << 16;
+         for (var4 = 0; var4 < var3; ++var4) {
+            var10000 = this.frameIds;
+            var10000[var4] += var1.method43() << 16;
          }
-      } else if(var2 == 2) {
-         this.frameCount = var1.__ag_302();
-      } else if(var2 == 3) {
+      } else if (var2 == 2) {
+         this.frameCount = var1.method43();
+      } else if (var2 == 3) {
          var3 = var1.readUnsignedByte();
-         this.__d = new int[var3 + 1];
+         this.field777 = new int[var3 + 1];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.__d[var4] = var1.readUnsignedByte();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.field777[var4] = var1.readUnsignedByte();
          }
 
-         this.__d[var3] = 9999999;
-      } else if(var2 == 4) {
-         this.__k = true;
-      } else if(var2 == 5) {
-         this.__n = var1.readUnsignedByte();
-      } else if(var2 == 6) {
-         this.shield = var1.__ag_302();
-      } else if(var2 == 7) {
-         this.weapon = var1.__ag_302();
-      } else if(var2 == 8) {
-         this.__z = var1.readUnsignedByte();
-      } else if(var2 == 9) {
-         this.__j = var1.readUnsignedByte();
-      } else if(var2 == 10) {
-         this.__s = var1.readUnsignedByte();
-      } else if(var2 == 11) {
-         this.__t = var1.readUnsignedByte();
-      } else if(var2 == 12) {
+         this.field777[var3] = 9999999;
+      } else if (var2 == 4) {
+         this.field778 = true;
+      } else if (var2 == 5) {
+         this.field779 = var1.readUnsignedByte();
+      } else if (var2 == 6) {
+         this.shield = var1.method43();
+      } else if (var2 == 7) {
+         this.weapon = var1.method43();
+      } else if (var2 == 8) {
+         this.field780 = var1.readUnsignedByte();
+      } else if (var2 == 9) {
+         this.field781 = var1.readUnsignedByte();
+      } else if (var2 == 10) {
+         this.field782 = var1.readUnsignedByte();
+      } else if (var2 == 11) {
+         this.field783 = var1.readUnsignedByte();
+      } else if (var2 == 12) {
          var3 = var1.readUnsignedByte();
          this.frameIds2 = new int[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.frameIds2[var4] = var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.frameIds2[var4] = var1.method43();
          }
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.frameIds2[var4] += var1.__ag_302() << 16;
+         for (var4 = 0; var4 < var3; ++var4) {
+            var10000 = this.frameIds2;
+            var10000[var4] += var1.method43() << 16;
          }
-      } else if(var2 == 13) {
+      } else if (var2 == 13) {
          var3 = var1.readUnsignedByte();
-         this.__e = new int[var3];
+         this.field776 = new int[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.__e[var4] = var1.readMedium();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.field776[var4] = var1.readMedium();
          }
       }
 
@@ -209,19 +207,19 @@ public class SequenceDefinition extends DualNode {
    )
    @Export("init")
    void init() {
-      if(this.__j == -1) {
-         if(this.__d != null) {
-            this.__j = 2;
+      if (this.field781 == -1) {
+         if (this.field777 != null) {
+            this.field781 = 2;
          } else {
-            this.__j = 0;
+            this.field781 = 0;
          }
       }
 
-      if(this.__s == -1) {
-         if(this.__d != null) {
-            this.__s = 2;
+      if (this.field782 == -1) {
+         if (this.field777 != null) {
+            this.field782 = 2;
          } else {
-            this.__s = 0;
+            this.field782 = 0;
          }
       }
 
@@ -237,7 +235,7 @@ public class SequenceDefinition extends DualNode {
       var2 = this.frameIds[var2];
       Frames var3 = ItemContainer.getFrames(var2 >> 16);
       var2 &= 65535;
-      if(var3 == null) {
+      if (var3 == null) {
          return var1.toSharedSequenceModel(true);
       } else {
          Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2));
@@ -256,25 +254,25 @@ public class SequenceDefinition extends DualNode {
       var2 = this.frameIds[var2];
       Frames var4 = ItemContainer.getFrames(var2 >> 16);
       var2 &= 65535;
-      if(var4 == null) {
+      if (var4 == null) {
          return var1.toSharedSequenceModel(true);
       } else {
          Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2));
          var3 &= 3;
-         if(var3 == 1) {
+         if (var3 == 1) {
             var5.rotateY270Ccw();
-         } else if(var3 == 2) {
+         } else if (var3 == 2) {
             var5.rotateY180();
-         } else if(var3 == 3) {
+         } else if (var3 == 3) {
             var5.rotateY90Ccw();
          }
 
          var5.animate(var4, var2);
-         if(var3 == 1) {
+         if (var3 == 1) {
             var5.rotateY90Ccw();
-         } else if(var3 == 2) {
+         } else if (var3 == 2) {
             var5.rotateY180();
-         } else if(var3 == 3) {
+         } else if (var3 == 3) {
             var5.rotateY270Ccw();
          }
 
@@ -292,7 +290,7 @@ public class SequenceDefinition extends DualNode {
       var2 = this.frameIds[var2];
       Frames var3 = ItemContainer.getFrames(var2 >> 16);
       var2 &= 65535;
-      if(var3 == null) {
+      if (var3 == null) {
          return var1.toSharedSpotAnimationModel(true);
       } else {
          Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2));
@@ -311,20 +309,20 @@ public class SequenceDefinition extends DualNode {
       var2 = this.frameIds[var2];
       Frames var5 = ItemContainer.getFrames(var2 >> 16);
       var2 &= 65535;
-      if(var5 == null) {
+      if (var5 == null) {
          return var3.animateSequence(var1, var4);
       } else {
          var4 = var3.frameIds[var4];
          Frames var6 = ItemContainer.getFrames(var4 >> 16);
          var4 &= 65535;
          Model var7;
-         if(var6 == null) {
+         if (var6 == null) {
             var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2));
             var7.animate(var5, var2);
             return var7;
          } else {
             var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4));
-            var7.animate2(var5, var2, var6, var4, this.__d);
+            var7.animate2(var5, var2, var6, var4, this.field777);
             return var7;
          }
       }
@@ -340,19 +338,19 @@ public class SequenceDefinition extends DualNode {
       int var3 = this.frameIds[var2];
       Frames var4 = ItemContainer.getFrames(var3 >> 16);
       var3 &= 65535;
-      if(var4 == null) {
+      if (var4 == null) {
          return var1.toSharedSequenceModel(true);
       } else {
          Frames var5 = null;
          int var6 = 0;
-         if(this.frameIds2 != null && var2 < this.frameIds2.length) {
+         if (this.frameIds2 != null && var2 < this.frameIds2.length) {
             var6 = this.frameIds2[var2];
             var5 = ItemContainer.getFrames(var6 >> 16);
             var6 &= 65535;
          }
 
          Model var7;
-         if(var5 != null && var6 != 65535) {
+         if (var5 != null && var6 != 65535) {
             var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6));
             var7.animate(var4, var3);
             var7.animate(var5, var6);
@@ -364,4 +362,9 @@ public class SequenceDefinition extends DualNode {
          }
       }
    }
+
+   static {
+      SequenceDefinition_cached = new EvictingDualNodeHashTable(64);
+      field775 = new EvictingDualNodeHashTable(100);
+   }
 }
diff --git a/runescape-client/src/main/java/ServerBuild.java b/runescape-client/src/main/java/ServerBuild.java
index cf133ba7c4..4723592ad8 100644
--- a/runescape-client/src/main/java/ServerBuild.java
+++ b/runescape-client/src/main/java/ServerBuild.java
@@ -11,22 +11,22 @@ public class ServerBuild {
    @ObfuscatedSignature(
       signature = "Liy;"
    )
-   public static final ServerBuild __iy_m;
+   public static final ServerBuild field784;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Liy;"
    )
-   public static final ServerBuild __iy_f;
+   public static final ServerBuild field785;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Liy;"
    )
-   public static final ServerBuild __iy_q;
+   public static final ServerBuild field786;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Liy;"
    )
-   public static final ServerBuild __iy_w;
+   public static final ServerBuild field787;
    @ObfuscatedName("bx")
    @Export("worldsUrl")
    static String worldsUrl;
@@ -34,7 +34,7 @@ public class ServerBuild {
    @ObfuscatedGetter(
       intValue = -365366303
    )
-   static int __iy_lo;
+   static int field788;
    @ObfuscatedName("o")
    @Export("name")
    public final String name;
@@ -45,15 +45,15 @@ public class ServerBuild {
    @Export("id")
    public final int id;
 
-   static {
-      __iy_m = new ServerBuild("LIVE", 0);
-      __iy_f = new ServerBuild("BUILDLIVE", 3);
-      __iy_q = new ServerBuild("RC", 1);
-      __iy_w = new ServerBuild("WIP", 2);
-   }
-
    ServerBuild(String var1, int var2) {
       this.name = var1;
       this.id = var2;
    }
+
+   static {
+      field784 = new ServerBuild("LIVE", 0);
+      field785 = new ServerBuild("BUILDLIVE", 3);
+      field786 = new ServerBuild("RC", 1);
+      field787 = new ServerBuild("WIP", 2);
+   }
 }
diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java
index c0df9ef55c..175df49e43 100644
--- a/runescape-client/src/main/java/ServerPacket.java
+++ b/runescape-client/src/main/java/ServerPacket.java
@@ -11,427 +11,427 @@ public class ServerPacket {
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_m;
+   public static final ServerPacket field789;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_f;
+   public static final ServerPacket field790;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_q;
+   public static final ServerPacket field791;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_w;
+   public static final ServerPacket field792;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_o;
+   public static final ServerPacket field793;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_u;
+   public static final ServerPacket field794;
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_g;
+   public static final ServerPacket field795;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_l;
+   public static final ServerPacket field796;
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_e;
+   public static final ServerPacket field797;
    @ObfuscatedName("x")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_x;
+   public static final ServerPacket field798;
    @ObfuscatedName("d")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_d;
+   public static final ServerPacket field799;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_k;
+   public static final ServerPacket field800;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_n;
+   public static final ServerPacket field801;
    @ObfuscatedName("i")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_i;
+   public static final ServerPacket field802;
    @ObfuscatedName("a")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_a;
+   public static final ServerPacket field803;
    @ObfuscatedName("z")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_z;
+   public static final ServerPacket field804;
    @ObfuscatedName("j")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_j;
+   public static final ServerPacket field805;
    @ObfuscatedName("s")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_s;
+   public static final ServerPacket field806;
    @ObfuscatedName("t")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_t;
+   public static final ServerPacket field807;
    @ObfuscatedName("y")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_y;
+   public static final ServerPacket field808;
    @ObfuscatedName("h")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_h;
+   public static final ServerPacket field809;
    @ObfuscatedName("b")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_b;
+   public static final ServerPacket field810;
    @ObfuscatedName("c")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_c;
+   public static final ServerPacket field811;
    @ObfuscatedName("r")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_r;
+   public static final ServerPacket field812;
    @ObfuscatedName("p")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_p;
+   public static final ServerPacket field813;
    @ObfuscatedName("v")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_v;
+   public static final ServerPacket field814;
    @ObfuscatedName("ag")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ag;
+   public static final ServerPacket field815;
    @ObfuscatedName("aq")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_aq;
+   public static final ServerPacket field816;
    @ObfuscatedName("aj")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_aj;
+   public static final ServerPacket field817;
    @ObfuscatedName("av")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_av;
+   public static final ServerPacket field818;
    @ObfuscatedName("ar")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ar;
+   public static final ServerPacket field819;
    @ObfuscatedName("ac")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ac;
+   public static final ServerPacket field820;
    @ObfuscatedName("ay")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ay;
+   public static final ServerPacket field821;
    @ObfuscatedName("ah")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ah;
+   public static final ServerPacket field822;
    @ObfuscatedName("ak")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ak;
+   public static final ServerPacket field823;
    @ObfuscatedName("aw")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_aw;
+   public static final ServerPacket field824;
    @ObfuscatedName("al")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_al;
+   public static final ServerPacket field825;
    @ObfuscatedName("ab")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ab;
+   public static final ServerPacket field826;
    @ObfuscatedName("ae")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ae;
+   public static final ServerPacket field827;
    @ObfuscatedName("at")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_at;
+   public static final ServerPacket field828;
    @ObfuscatedName("ad")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ad;
+   public static final ServerPacket field829;
    @ObfuscatedName("ap")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ap;
+   public static final ServerPacket field830;
    @ObfuscatedName("as")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_as;
+   public static final ServerPacket field831;
    @ObfuscatedName("am")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_am;
+   public static final ServerPacket field832;
    @ObfuscatedName("an")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_an;
+   public static final ServerPacket field833;
    @ObfuscatedName("az")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_az;
+   public static final ServerPacket field834;
    @ObfuscatedName("au")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_au;
+   public static final ServerPacket field835;
    @ObfuscatedName("ao")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ao;
+   public static final ServerPacket field836;
    @ObfuscatedName("aa")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_aa;
+   public static final ServerPacket field837;
    @ObfuscatedName("ax")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ax;
+   public static final ServerPacket field838;
    @ObfuscatedName("af")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_af;
+   public static final ServerPacket field839;
    @ObfuscatedName("ai")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ai;
+   public static final ServerPacket field840;
    @ObfuscatedName("ba")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ba;
+   public static final ServerPacket field841;
    @ObfuscatedName("bb")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bb;
+   public static final ServerPacket field842;
    @ObfuscatedName("bs")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bs;
+   public static final ServerPacket field843;
    @ObfuscatedName("bq")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bq;
+   public static final ServerPacket field844;
    @ObfuscatedName("bn")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bn;
+   public static final ServerPacket field845;
    @ObfuscatedName("bk")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bk;
+   public static final ServerPacket field846;
    @ObfuscatedName("bd")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bd;
+   public static final ServerPacket field847;
    @ObfuscatedName("bc")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bc;
+   public static final ServerPacket field848;
    @ObfuscatedName("bo")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bo;
+   public static final ServerPacket field849;
    @ObfuscatedName("bx")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bx;
+   public static final ServerPacket field850;
    @ObfuscatedName("by")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_by;
+   public static final ServerPacket field851;
    @ObfuscatedName("bu")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bu;
+   public static final ServerPacket field852;
    @ObfuscatedName("bm")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bm;
+   public static final ServerPacket field853;
    @ObfuscatedName("bl")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bl;
+   public static final ServerPacket field854;
    @ObfuscatedName("br")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_br;
+   public static final ServerPacket field855;
    @ObfuscatedName("bj")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bj;
+   public static final ServerPacket field856;
    @ObfuscatedName("bi")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bi;
+   public static final ServerPacket field857;
    @ObfuscatedName("bz")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bz;
+   public static final ServerPacket field858;
    @ObfuscatedName("bg")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bg;
+   public static final ServerPacket field859;
    @ObfuscatedName("bt")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bt;
+   public static final ServerPacket field860;
    @ObfuscatedName("bp")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bp;
+   public static final ServerPacket field861;
    @ObfuscatedName("bf")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bf;
+   public static final ServerPacket field862;
    @ObfuscatedName("bh")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bh;
+   public static final ServerPacket field863;
    @ObfuscatedName("be")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_be;
+   public static final ServerPacket field864;
    @ObfuscatedName("bv")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bv;
+   public static final ServerPacket field865;
    @ObfuscatedName("bw")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bw;
+   public static final ServerPacket field866;
    @ObfuscatedName("cr")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_cr;
+   public static final ServerPacket field867;
    @ObfuscatedName("cv")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_cv;
+   public static final ServerPacket field868;
    @ObfuscatedName("ce")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ce;
+   public static final ServerPacket field869;
    @ObfuscatedName("cy")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_cy;
+   public static final ServerPacket field870;
    @ObfuscatedName("cs")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_cs;
+   public static final ServerPacket field871;
    @ObfuscatedName("cm")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_cm;
+   public static final ServerPacket field872;
    @ObfuscatedName("cj")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_cj;
+   public static final ServerPacket field873;
    @ObfuscatedName("ix")
    @ObfuscatedGetter(
       intValue = -1645409107
@@ -451,94 +451,6 @@ public class ServerPacket {
    @Export("length")
    public final int length;
 
-   static {
-      __ge_m = new ServerPacket(0, -2);
-      __ge_f = new ServerPacket(1, 0);
-      __ge_q = new ServerPacket(2, 0);
-      __ge_w = new ServerPacket(3, -1);
-      __ge_o = new ServerPacket(4, 6);
-      __ge_u = new ServerPacket(5, 4);
-      __ge_g = new ServerPacket(6, 4);
-      __ge_l = new ServerPacket(7, 4);
-      __ge_e = new ServerPacket(8, 6);
-      __ge_x = new ServerPacket(9, 4);
-      __ge_d = new ServerPacket(10, -2);
-      __ge_k = new ServerPacket(11, 15);
-      __ge_n = new ServerPacket(12, 5);
-      __ge_i = new ServerPacket(13, 2);
-      __ge_a = new ServerPacket(14, 3);
-      __ge_z = new ServerPacket(15, 7);
-      __ge_j = new ServerPacket(16, 1);
-      __ge_s = new ServerPacket(17, -2);
-      __ge_t = new ServerPacket(18, -2);
-      __ge_y = new ServerPacket(19, -2);
-      __ge_h = new ServerPacket(20, 10);
-      __ge_b = new ServerPacket(21, 5);
-      __ge_c = new ServerPacket(22, 6);
-      __ge_r = new ServerPacket(23, 2);
-      __ge_p = new ServerPacket(24, 6);
-      __ge_v = new ServerPacket(25, 2);
-      __ge_ag = new ServerPacket(26, 5);
-      __ge_aq = new ServerPacket(27, -2);
-      __ge_aj = new ServerPacket(28, 0);
-      __ge_av = new ServerPacket(29, 0);
-      __ge_ar = new ServerPacket(30, 4);
-      __ge_ac = new ServerPacket(31, 6);
-      __ge_ay = new ServerPacket(32, -2);
-      __ge_ah = new ServerPacket(33, -2);
-      __ge_ak = new ServerPacket(34, 1);
-      __ge_aw = new ServerPacket(35, 6);
-      __ge_al = new ServerPacket(36, 6);
-      __ge_ab = new ServerPacket(37, -1);
-      __ge_ae = new ServerPacket(38, -2);
-      __ge_at = new ServerPacket(39, 4);
-      __ge_ad = new ServerPacket(40, 5);
-      __ge_ap = new ServerPacket(41, 8);
-      __ge_as = new ServerPacket(42, 14);
-      __ge_am = new ServerPacket(43, -2);
-      __ge_an = new ServerPacket(44, -2);
-      __ge_az = new ServerPacket(45, -1);
-      __ge_au = new ServerPacket(46, 2);
-      __ge_ao = new ServerPacket(47, -1);
-      __ge_aa = new ServerPacket(48, 12);
-      __ge_ax = new ServerPacket(49, 4);
-      __ge_af = new ServerPacket(50, 10);
-      __ge_ai = new ServerPacket(51, -2);
-      __ge_ba = new ServerPacket(52, 0);
-      __ge_bb = new ServerPacket(53, -2);
-      __ge_bs = new ServerPacket(54, -1);
-      __ge_bq = new ServerPacket(55, 20);
-      __ge_bn = new ServerPacket(56, -2);
-      __ge_bk = new ServerPacket(57, 28);
-      __ge_bd = new ServerPacket(58, -2);
-      __ge_bc = new ServerPacket(59, 8);
-      __ge_bo = new ServerPacket(60, 1);
-      __ge_bx = new ServerPacket(61, 6);
-      __ge_by = new ServerPacket(62, -2);
-      __ge_bu = new ServerPacket(63, 3);
-      __ge_bm = new ServerPacket(64, 2);
-      __ge_bl = new ServerPacket(65, 5);
-      __ge_br = new ServerPacket(66, -1);
-      __ge_bj = new ServerPacket(67, 2);
-      __ge_bi = new ServerPacket(68, 1);
-      __ge_bz = new ServerPacket(69, 8);
-      __ge_bg = new ServerPacket(70, -2);
-      __ge_bt = new ServerPacket(71, 2);
-      __ge_bp = new ServerPacket(72, 2);
-      __ge_bf = new ServerPacket(73, 0);
-      __ge_bh = new ServerPacket(74, 1);
-      __ge_be = new ServerPacket(75, 6);
-      __ge_bv = new ServerPacket(76, 6);
-      __ge_bw = new ServerPacket(77, 7);
-      __ge_cr = new ServerPacket(78, 0);
-      __ge_cv = new ServerPacket(79, -2);
-      __ge_ce = new ServerPacket(80, 2);
-      __ge_cy = new ServerPacket(81, -2);
-      __ge_cs = new ServerPacket(82, 8);
-      __ge_cm = new ServerPacket(83, 6);
-      __ge_cj = new ServerPacket(84, 2);
-   }
-
    ServerPacket(int var1, int var2) {
       this.id = var1;
       this.length = var2;
@@ -565,7 +477,7 @@ public class ServerPacket {
       VarbitDefinition.indexedSpriteWidths = null;
       SecureRandomCallable.indexedSpriteHeights = null;
       class328.indexedSpritePalette = null;
-      class328.spritePixels = null;
+      class328.spritePixels = (byte[][])null;
       return var0;
    }
 
@@ -578,18 +490,18 @@ public class ServerPacket {
       Buffer var10 = new Buffer(var0);
       int var11 = -1;
 
-      while(true) {
-         int var12 = var10.__at_308();
-         if(var12 == 0) {
+      while (true) {
+         int var12 = var10.method49();
+         if (var12 == 0) {
             return;
          }
 
          var11 += var12;
          int var13 = 0;
 
-         while(true) {
-            int var14 = var10.__ae_307();
-            if(var14 == 0) {
+         while (true) {
+            int var14 = var10.method48();
+            if (var14 == 0) {
                break;
             }
 
@@ -600,48 +512,136 @@ public class ServerPacket {
             int var18 = var10.readUnsignedByte();
             int var19 = var18 >> 2;
             int var20 = var18 & 3;
-            if(var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) {
+            if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) {
                ObjectDefinition var21 = class50.getObjectDefinition(var11);
-               int var24 = var16 & 7;
-               int var25 = var15 & 7;
-               int var27 = var21.sizeX;
-               int var28 = var21.sizeY;
-               int var29;
-               if((var20 & 1) == 1) {
-                  var29 = var27;
-                  var27 = var28;
-                  var28 = var29;
+               int var22 = var16 & 7;
+               int var23 = var15 & 7;
+               int var24 = var21.sizeX;
+               int var25 = var21.sizeY;
+               int var26;
+               if ((var20 & 1) == 1) {
+                  var26 = var24;
+                  var24 = var25;
+                  var25 = var26;
                }
 
-               int var26 = var7 & 3;
-               int var23;
-               if(var26 == 0) {
-                  var23 = var24;
-               } else if(var26 == 1) {
-                  var23 = var25;
-               } else if(var26 == 2) {
-                  var23 = 7 - var24 - (var27 - 1);
+               int var27 = var7 & 3;
+               int var28;
+               if (var27 == 0) {
+                  var28 = var22;
+               } else if (var27 == 1) {
+                  var28 = var23;
+               } else if (var27 == 2) {
+                  var28 = 7 - var22 - (var24 - 1);
                } else {
-                  var23 = 7 - var25 - (var28 - 1);
+                  var28 = 7 - var23 - (var25 - 1);
                }
 
-               var29 = var2 + var23;
-               int var30 = var3 + class171.method3496(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20);
-               if(var29 > 0 && var30 > 0 && var29 < 103 && var30 < 103) {
-                  int var31 = var1;
-                  if((Tiles.Tiles_renderFlags[1][var29][var30] & 2) == 2) {
-                     var31 = var1 - 1;
+               var26 = var2 + var28;
+               int var29 = var3 + class171.method3496(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20);
+               if (var26 > 0 && var29 > 0 && var26 < 103 && var29 < 103) {
+                  int var30 = var1;
+                  if ((Tiles.Tiles_renderFlags[1][var26][var29] & 2) == 2) {
+                     var30 = var1 - 1;
                   }
 
-                  CollisionMap var32 = null;
-                  if(var31 >= 0) {
-                     var32 = var9[var31];
+                  CollisionMap var31 = null;
+                  if (var30 >= 0) {
+                     var31 = var9[var30];
                   }
 
-                  class227.method4446(var1, var29, var30, var11, var20 + var7 & 3, var19, var8, var32);
+                  class227.method4446(var1, var26, var29, var11, var20 + var7 & 3, var19, var8, var31);
                }
             }
          }
       }
    }
+
+   static {
+      field789 = new ServerPacket(0, -2);
+      field790 = new ServerPacket(1, 0);
+      field791 = new ServerPacket(2, 0);
+      field792 = new ServerPacket(3, -1);
+      field793 = new ServerPacket(4, 6);
+      field794 = new ServerPacket(5, 4);
+      field795 = new ServerPacket(6, 4);
+      field796 = new ServerPacket(7, 4);
+      field797 = new ServerPacket(8, 6);
+      field798 = new ServerPacket(9, 4);
+      field799 = new ServerPacket(10, -2);
+      field800 = new ServerPacket(11, 15);
+      field801 = new ServerPacket(12, 5);
+      field802 = new ServerPacket(13, 2);
+      field803 = new ServerPacket(14, 3);
+      field804 = new ServerPacket(15, 7);
+      field805 = new ServerPacket(16, 1);
+      field806 = new ServerPacket(17, -2);
+      field807 = new ServerPacket(18, -2);
+      field808 = new ServerPacket(19, -2);
+      field809 = new ServerPacket(20, 10);
+      field810 = new ServerPacket(21, 5);
+      field811 = new ServerPacket(22, 6);
+      field812 = new ServerPacket(23, 2);
+      field813 = new ServerPacket(24, 6);
+      field814 = new ServerPacket(25, 2);
+      field815 = new ServerPacket(26, 5);
+      field816 = new ServerPacket(27, -2);
+      field817 = new ServerPacket(28, 0);
+      field818 = new ServerPacket(29, 0);
+      field819 = new ServerPacket(30, 4);
+      field820 = new ServerPacket(31, 6);
+      field821 = new ServerPacket(32, -2);
+      field822 = new ServerPacket(33, -2);
+      field823 = new ServerPacket(34, 1);
+      field824 = new ServerPacket(35, 6);
+      field825 = new ServerPacket(36, 6);
+      field826 = new ServerPacket(37, -1);
+      field827 = new ServerPacket(38, -2);
+      field828 = new ServerPacket(39, 4);
+      field829 = new ServerPacket(40, 5);
+      field830 = new ServerPacket(41, 8);
+      field831 = new ServerPacket(42, 14);
+      field832 = new ServerPacket(43, -2);
+      field833 = new ServerPacket(44, -2);
+      field834 = new ServerPacket(45, -1);
+      field835 = new ServerPacket(46, 2);
+      field836 = new ServerPacket(47, -1);
+      field837 = new ServerPacket(48, 12);
+      field838 = new ServerPacket(49, 4);
+      field839 = new ServerPacket(50, 10);
+      field840 = new ServerPacket(51, -2);
+      field841 = new ServerPacket(52, 0);
+      field842 = new ServerPacket(53, -2);
+      field843 = new ServerPacket(54, -1);
+      field844 = new ServerPacket(55, 20);
+      field845 = new ServerPacket(56, -2);
+      field846 = new ServerPacket(57, 28);
+      field847 = new ServerPacket(58, -2);
+      field848 = new ServerPacket(59, 8);
+      field849 = new ServerPacket(60, 1);
+      field850 = new ServerPacket(61, 6);
+      field851 = new ServerPacket(62, -2);
+      field852 = new ServerPacket(63, 3);
+      field853 = new ServerPacket(64, 2);
+      field854 = new ServerPacket(65, 5);
+      field855 = new ServerPacket(66, -1);
+      field856 = new ServerPacket(67, 2);
+      field857 = new ServerPacket(68, 1);
+      field858 = new ServerPacket(69, 8);
+      field859 = new ServerPacket(70, -2);
+      field860 = new ServerPacket(71, 2);
+      field861 = new ServerPacket(72, 2);
+      field862 = new ServerPacket(73, 0);
+      field863 = new ServerPacket(74, 1);
+      field864 = new ServerPacket(75, 6);
+      field865 = new ServerPacket(76, 6);
+      field866 = new ServerPacket(77, 7);
+      field867 = new ServerPacket(78, 0);
+      field868 = new ServerPacket(79, -2);
+      field869 = new ServerPacket(80, 2);
+      field870 = new ServerPacket(81, -2);
+      field871 = new ServerPacket(82, 8);
+      field872 = new ServerPacket(83, 6);
+      field873 = new ServerPacket(84, 2);
+   }
 }
diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java
index 5fc72906be..1f17947b6a 100644
--- a/runescape-client/src/main/java/Skeleton.java
+++ b/runescape-client/src/main/java/Skeleton.java
@@ -11,7 +11,7 @@ public class Skeleton extends Node {
    @ObfuscatedGetter(
       intValue = 2096389021
    )
-   static int __ek_x;
+   static int field874;
    @ObfuscatedName("dc")
    @ObfuscatedSignature(
       signature = "Lit;"
@@ -45,16 +45,16 @@ public class Skeleton extends Node {
       this.labels = new int[this.count][];
 
       int var4;
-      for(var4 = 0; var4 < this.count; ++var4) {
+      for (var4 = 0; var4 < this.count; ++var4) {
          this.transformTypes[var4] = var3.readUnsignedByte();
       }
 
-      for(var4 = 0; var4 < this.count; ++var4) {
+      for (var4 = 0; var4 < this.count; ++var4) {
          this.labels[var4] = new int[var3.readUnsignedByte()];
       }
 
-      for(var4 = 0; var4 < this.count; ++var4) {
-         for(int var5 = 0; var5 < this.labels[var4].length; ++var5) {
+      for (var4 = 0; var4 < this.count; ++var4) {
+         for (int var5 = 0; var5 < this.labels[var4].length; ++var5) {
             this.labels[var4][var5] = var3.readUnsignedByte();
          }
       }
@@ -68,24 +68,24 @@ public class Skeleton extends Node {
    )
    static final void method3062(PacketBuffer var0, int var1) {
       int var2 = var0.index;
-      Players.__cq_n = 0;
+      Players.field736 = 0;
       int var3 = 0;
       var0.importIndex();
 
       int var4;
       int var5;
       int var6;
-      for(var4 = 0; var4 < Players.Players_count; ++var4) {
+      for (var4 = 0; var4 < Players.Players_count; ++var4) {
          var5 = Players.Players_indices[var4];
-         if((Players.__cq_q[var5] & 1) == 0) {
-            if(var3 > 0) {
+         if ((Players.field731[var5] & 1) == 0) {
+            if (var3 > 0) {
                --var3;
-               Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+               Players.field731[var5] = (byte)(Players.field731[var5] | 2);
             } else {
                var6 = var0.readBits(1);
-               if(var6 == 0) {
+               if (var6 == 0) {
                   var3 = GrandExchangeOffer.method105(var0);
-                  Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+                  Players.field731[var5] = (byte)(Players.field731[var5] | 2);
                } else {
                   class210.method4101(var0, var5);
                }
@@ -94,22 +94,22 @@ public class Skeleton extends Node {
       }
 
       var0.exportIndex();
-      if(var3 != 0) {
+      if (var3 != 0) {
          throw new RuntimeException();
       } else {
          var0.importIndex();
 
-         for(var4 = 0; var4 < Players.Players_count; ++var4) {
+         for (var4 = 0; var4 < Players.Players_count; ++var4) {
             var5 = Players.Players_indices[var4];
-            if((Players.__cq_q[var5] & 1) != 0) {
-               if(var3 > 0) {
+            if ((Players.field731[var5] & 1) != 0) {
+               if (var3 > 0) {
                   --var3;
-                  Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+                  Players.field731[var5] = (byte)(Players.field731[var5] | 2);
                } else {
                   var6 = var0.readBits(1);
-                  if(var6 == 0) {
+                  if (var6 == 0) {
                      var3 = GrandExchangeOffer.method105(var0);
-                     Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+                     Players.field731[var5] = (byte)(Players.field731[var5] | 2);
                   } else {
                      class210.method4101(var0, var5);
                   }
@@ -118,72 +118,72 @@ public class Skeleton extends Node {
          }
 
          var0.exportIndex();
-         if(var3 != 0) {
+         if (var3 != 0) {
             throw new RuntimeException();
          } else {
             var0.importIndex();
 
-            for(var4 = 0; var4 < Players.__cq_l; ++var4) {
-               var5 = Players.__cq_e[var4];
-               if((Players.__cq_q[var5] & 1) != 0) {
-                  if(var3 > 0) {
+            for (var4 = 0; var4 < Players.field734; ++var4) {
+               var5 = Players.field735[var4];
+               if ((Players.field731[var5] & 1) != 0) {
+                  if (var3 > 0) {
                      --var3;
-                     Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+                     Players.field731[var5] = (byte)(Players.field731[var5] | 2);
                   } else {
                      var6 = var0.readBits(1);
-                     if(var6 == 0) {
+                     if (var6 == 0) {
                         var3 = GrandExchangeOffer.method105(var0);
-                        Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
-                     } else if(class236.updateExternalPlayer(var0, var5)) {
-                        Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+                        Players.field731[var5] = (byte)(Players.field731[var5] | 2);
+                     } else if (class236.updateExternalPlayer(var0, var5)) {
+                        Players.field731[var5] = (byte)(Players.field731[var5] | 2);
                      }
                   }
                }
             }
 
             var0.exportIndex();
-            if(var3 != 0) {
+            if (var3 != 0) {
                throw new RuntimeException();
             } else {
                var0.importIndex();
 
-               for(var4 = 0; var4 < Players.__cq_l; ++var4) {
-                  var5 = Players.__cq_e[var4];
-                  if((Players.__cq_q[var5] & 1) == 0) {
-                     if(var3 > 0) {
+               for (var4 = 0; var4 < Players.field734; ++var4) {
+                  var5 = Players.field735[var4];
+                  if ((Players.field731[var5] & 1) == 0) {
+                     if (var3 > 0) {
                         --var3;
-                        Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+                        Players.field731[var5] = (byte)(Players.field731[var5] | 2);
                      } else {
                         var6 = var0.readBits(1);
-                        if(var6 == 0) {
+                        if (var6 == 0) {
                            var3 = GrandExchangeOffer.method105(var0);
-                           Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
-                        } else if(class236.updateExternalPlayer(var0, var5)) {
-                           Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+                           Players.field731[var5] = (byte)(Players.field731[var5] | 2);
+                        } else if (class236.updateExternalPlayer(var0, var5)) {
+                           Players.field731[var5] = (byte)(Players.field731[var5] | 2);
                         }
                      }
                   }
                }
 
                var0.exportIndex();
-               if(var3 != 0) {
+               if (var3 != 0) {
                   throw new RuntimeException();
                } else {
                   Players.Players_count = 0;
-                  Players.__cq_l = 0;
+                  Players.field734 = 0;
 
-                  for(var4 = 1; var4 < 2048; ++var4) {
-                     Players.__cq_q[var4] = (byte)(Players.__cq_q[var4] >> 1);
+                  for (var4 = 1; var4 < 2048; ++var4) {
+                     Players.field731[var4] = (byte)(Players.field731[var4] >> 1);
                      Player var7 = Client.players[var4];
-                     if(var7 != null) {
+                     if (var7 != null) {
                         Players.Players_indices[++Players.Players_count - 1] = var4;
                      } else {
-                        Players.__cq_e[++Players.__cq_l - 1] = var4;
+                        Players.field735[++Players.field734 - 1] = var4;
                      }
                   }
 
                   class21.method293(var0);
-                  if(var0.index - var2 != var1) {
+                  if (var0.index - var2 != var1) {
                      throw new RuntimeException(var0.index - var2 + " " + var1);
                   }
                }
diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java
index ae1e7c6b0a..a35cc48a35 100644
--- a/runescape-client/src/main/java/Skills.java
+++ b/runescape-client/src/main/java/Skills.java
@@ -13,21 +13,7 @@ public class Skills {
    @Export("Skills_experienceTable")
    public static int[] Skills_experienceTable;
    @ObfuscatedName("ef")
-   static int[] __hc_ef;
-
-   static {
-      Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false};
-      Skills_experienceTable = new int[99];
-      int var0 = 0;
-
-      for(int var1 = 0; var1 < 99; ++var1) {
-         int var2 = var1 + 1;
-         int var3 = (int)((double)var2 + 300.0D * Math.pow(2.0D, (double)var2 / 7.0D));
-         var0 += var3;
-         Skills_experienceTable[var1] = var0 / 4;
-      }
-
-   }
+   static int[] field875;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -37,49 +23,49 @@ public class Skills {
    @Export("getItemDefinition")
    public static ItemDefinition getItemDefinition(int var0) {
       ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
          byte[] var2 = ItemDefinition.ItemDefinition_indexCache.takeRecord(10, var0);
          var1 = new ItemDefinition();
          var1.id = var0;
-         if(var2 != null) {
+         if (var2 != null) {
             var1.read(new Buffer(var2));
          }
 
          var1.post();
-         if(var1.noteTemplate != -1) {
-            var1.__o_426(getItemDefinition(var1.noteTemplate), getItemDefinition(var1.note));
+         if (var1.noteTemplate != -1) {
+            var1.method140(getItemDefinition(var1.noteTemplate), getItemDefinition(var1.note));
          }
 
-         if(var1.notedId != -1) {
-            var1.__u_427(getItemDefinition(var1.notedId), getItemDefinition(var1.unnotedId));
+         if (var1.notedId != -1) {
+            var1.method141(getItemDefinition(var1.notedId), getItemDefinition(var1.unnotedId));
          }
 
-         if(var1.placeholderTemplate != -1) {
-            var1.__g_428(getItemDefinition(var1.placeholderTemplate), getItemDefinition(var1.placeholder));
+         if (var1.placeholderTemplate != -1) {
+            var1.method142(getItemDefinition(var1.placeholderTemplate), getItemDefinition(var1.placeholder));
          }
 
-         if(!class30.inMembersWorld && var1.isMembersOnly) {
+         if (!class30.inMembersWorld && var1.isMembersOnly) {
             var1.name = "Members object";
             var1.isTradable = false;
             var1.groundActions = null;
             var1.inventoryActions = null;
             var1.shiftClickIndex0 = -1;
             var1.int1 = 0;
-            if(var1.params != null) {
+            if (var1.params != null) {
                boolean var3 = false;
 
-               for(Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) {
+               for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) {
                   ParamKeyDefinition var5 = class229.getParamKeyDefinition((int)var4.key);
-                  if(var5.isMembersOnly) {
+                  if (var5.isMembersOnly) {
                      var4.remove();
                   } else {
                      var3 = true;
                   }
                }
 
-               if(!var3) {
+               if (!var3) {
                   var1.params = null;
                }
             }
@@ -89,4 +75,18 @@ public class Skills {
          return var1;
       }
    }
+
+   static {
+      Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false};
+      Skills_experienceTable = new int[99];
+      int var0 = 0;
+
+      for (int var1 = 0; var1 < 99; ++var1) {
+         int var2 = var1 + 1;
+         int var3 = (int)((double)var2 + 300.0D * Math.pow(2.0D, (double)var2 / 7.0D));
+         var0 += var3;
+         Skills_experienceTable[var1] = var0 / 4;
+      }
+
+   }
 }
diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java
index 11816e754e..273e1d1d91 100644
--- a/runescape-client/src/main/java/SoundCache.java
+++ b/runescape-client/src/main/java/SoundCache.java
@@ -59,18 +59,18 @@ public class SoundCache {
       var4 |= var1 << 16;
       long var5 = (long)var4;
       RawSound var7 = (RawSound)this.rawSounds.get(var5);
-      if(var7 != null) {
+      if (var7 != null) {
          return var7;
-      } else if(var3 != null && var3[0] <= 0) {
+      } else if (var3 != null && var3[0] <= 0) {
          return null;
       } else {
          SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2);
-         if(var8 == null) {
+         if (var8 == null) {
             return null;
          } else {
             var7 = var8.toRawSound();
             this.rawSounds.put(var7, var5);
-            if(var3 != null) {
+            if (var3 != null) {
                var3[0] -= var7.samples.length;
             }
 
@@ -90,15 +90,15 @@ public class SoundCache {
       var4 |= var1 << 16;
       long var5 = (long)var4 ^ 4294967296L;
       RawSound var7 = (RawSound)this.rawSounds.get(var5);
-      if(var7 != null) {
+      if (var7 != null) {
          return var7;
-      } else if(var3 != null && var3[0] <= 0) {
+      } else if (var3 != null && var3[0] <= 0) {
          return null;
       } else {
          MusicSample var8 = (MusicSample)this.musicSamples.get(var5);
-         if(var8 == null) {
+         if (var8 == null) {
             var8 = MusicSample.readMusicSample(this.musicSampleIndex, var1, var2);
-            if(var8 == null) {
+            if (var8 == null) {
                return null;
             }
 
@@ -106,7 +106,7 @@ public class SoundCache {
          }
 
          var7 = var8.toRawSound(var3);
-         if(var7 == null) {
+         if (var7 == null) {
             return null;
          } else {
             var8.remove();
@@ -123,9 +123,9 @@ public class SoundCache {
    )
    @Export("getSoundEffect")
    public RawSound getSoundEffect(int var1, int[] var2) {
-      if(this.soundEffectIndex.__t_397() == 1) {
+      if (this.soundEffectIndex.method5() == 1) {
          return this.getSoundEffect0(0, var1, var2);
-      } else if(this.soundEffectIndex.__s_396(var1) == 1) {
+      } else if (this.soundEffectIndex.method4(var1) == 1) {
          return this.getSoundEffect0(var1, 0, var2);
       } else {
          throw new RuntimeException();
@@ -139,9 +139,9 @@ public class SoundCache {
    )
    @Export("getMusicSample")
    public RawSound getMusicSample(int var1, int[] var2) {
-      if(this.musicSampleIndex.__t_397() == 1) {
+      if (this.musicSampleIndex.method5() == 1) {
          return this.getMusicSample0(0, var1, var2);
-      } else if(this.musicSampleIndex.__s_396(var1) == 1) {
+      } else if (this.musicSampleIndex.method4(var1) == 1) {
          return this.getMusicSample0(var1, 0, var2);
       } else {
          throw new RuntimeException();
@@ -157,66 +157,68 @@ public class SoundCache {
    public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) {
       int var5 = var2 - var1;
 
-      for(int var6 = 0; var6 < var5; ++var6) {
+      for (int var6 = 0; var6 < var5; ++var6) {
          char var7 = var0.charAt(var6 + var1);
-         if(var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) {
-            var3[var6 + var4] = (byte)var7;
-         } else if(var7 == 8364) {
-            var3[var6 + var4] = -128;
-         } else if(var7 == 8218) {
-            var3[var6 + var4] = -126;
-         } else if(var7 == 402) {
-            var3[var6 + var4] = -125;
-         } else if(var7 == 8222) {
-            var3[var6 + var4] = -124;
-         } else if(var7 == 8230) {
-            var3[var6 + var4] = -123;
-         } else if(var7 == 8224) {
-            var3[var6 + var4] = -122;
-         } else if(var7 == 8225) {
-            var3[var6 + var4] = -121;
-         } else if(var7 == 710) {
-            var3[var6 + var4] = -120;
-         } else if(var7 == 8240) {
-            var3[var6 + var4] = -119;
-         } else if(var7 == 352) {
-            var3[var6 + var4] = -118;
-         } else if(var7 == 8249) {
-            var3[var6 + var4] = -117;
-         } else if(var7 == 338) {
-            var3[var6 + var4] = -116;
-         } else if(var7 == 381) {
-            var3[var6 + var4] = -114;
-         } else if(var7 == 8216) {
-            var3[var6 + var4] = -111;
-         } else if(var7 == 8217) {
-            var3[var6 + var4] = -110;
-         } else if(var7 == 8220) {
-            var3[var6 + var4] = -109;
-         } else if(var7 == 8221) {
-            var3[var6 + var4] = -108;
-         } else if(var7 == 8226) {
-            var3[var6 + var4] = -107;
-         } else if(var7 == 8211) {
-            var3[var6 + var4] = -106;
-         } else if(var7 == 8212) {
-            var3[var6 + var4] = -105;
-         } else if(var7 == 732) {
-            var3[var6 + var4] = -104;
-         } else if(var7 == 8482) {
-            var3[var6 + var4] = -103;
-         } else if(var7 == 353) {
-            var3[var6 + var4] = -102;
-         } else if(var7 == 8250) {
-            var3[var6 + var4] = -101;
-         } else if(var7 == 339) {
-            var3[var6 + var4] = -100;
-         } else if(var7 == 382) {
-            var3[var6 + var4] = -98;
-         } else if(var7 == 376) {
-            var3[var6 + var4] = -97;
+         if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) {
+            if (var7 == 8364) {
+               var3[var6 + var4] = -128;
+            } else if (var7 == 8218) {
+               var3[var6 + var4] = -126;
+            } else if (var7 == 402) {
+               var3[var6 + var4] = -125;
+            } else if (var7 == 8222) {
+               var3[var6 + var4] = -124;
+            } else if (var7 == 8230) {
+               var3[var6 + var4] = -123;
+            } else if (var7 == 8224) {
+               var3[var6 + var4] = -122;
+            } else if (var7 == 8225) {
+               var3[var6 + var4] = -121;
+            } else if (var7 == 710) {
+               var3[var6 + var4] = -120;
+            } else if (var7 == 8240) {
+               var3[var6 + var4] = -119;
+            } else if (var7 == 352) {
+               var3[var6 + var4] = -118;
+            } else if (var7 == 8249) {
+               var3[var6 + var4] = -117;
+            } else if (var7 == 338) {
+               var3[var6 + var4] = -116;
+            } else if (var7 == 381) {
+               var3[var6 + var4] = -114;
+            } else if (var7 == 8216) {
+               var3[var6 + var4] = -111;
+            } else if (var7 == 8217) {
+               var3[var6 + var4] = -110;
+            } else if (var7 == 8220) {
+               var3[var6 + var4] = -109;
+            } else if (var7 == 8221) {
+               var3[var6 + var4] = -108;
+            } else if (var7 == 8226) {
+               var3[var6 + var4] = -107;
+            } else if (var7 == 8211) {
+               var3[var6 + var4] = -106;
+            } else if (var7 == 8212) {
+               var3[var6 + var4] = -105;
+            } else if (var7 == 732) {
+               var3[var6 + var4] = -104;
+            } else if (var7 == 8482) {
+               var3[var6 + var4] = -103;
+            } else if (var7 == 353) {
+               var3[var6 + var4] = -102;
+            } else if (var7 == 8250) {
+               var3[var6 + var4] = -101;
+            } else if (var7 == 339) {
+               var3[var6 + var4] = -100;
+            } else if (var7 == 382) {
+               var3[var6 + var4] = -98;
+            } else if (var7 == 376) {
+               var3[var6 + var4] = -97;
+            } else {
+               var3[var6 + var4] = 63;
+            }
          } else {
-            var3[var6 + var4] = 63;
+            var3[var6 + var4] = (byte)var7;
          }
       }
 
diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java
index f443c3306f..631add0a0c 100644
--- a/runescape-client/src/main/java/SoundEffect.java
+++ b/runescape-client/src/main/java/SoundEffect.java
@@ -25,17 +25,17 @@ public class SoundEffect {
    SoundEffect(Buffer var1) {
       this.instruments = new Instrument[10];
 
-      for(int var2 = 0; var2 < 10; ++var2) {
+      for (int var2 = 0; var2 < 10; ++var2) {
          int var3 = var1.readUnsignedByte();
-         if(var3 != 0) {
+         if (var3 != 0) {
             --var1.index;
             this.instruments[var2] = new Instrument();
             this.instruments[var2].decode(var1);
          }
       }
 
-      this.start = var1.__ag_302();
-      this.end = var1.__ag_302();
+      this.start = var1.method43();
+      this.end = var1.method43();
    }
 
    @ObfuscatedName("f")
@@ -49,28 +49,29 @@ public class SoundEffect {
    }
 
    @ObfuscatedName("q")
-   public final int __q_174() {
+   public final int method303() {
       int var1 = 9999999;
 
       int var2;
-      for(var2 = 0; var2 < 10; ++var2) {
-         if(this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) {
+      for (var2 = 0; var2 < 10; ++var2) {
+         if (this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) {
             var1 = this.instruments[var2].offset / 20;
          }
       }
 
-      if(this.start < this.end && this.start / 20 < var1) {
+      if (this.start < this.end && this.start / 20 < var1) {
          var1 = this.start / 20;
       }
 
-      if(var1 != 9999999 && var1 != 0) {
-         for(var2 = 0; var2 < 10; ++var2) {
-            if(this.instruments[var2] != null) {
-               this.instruments[var2].offset -= var1 * 20;
+      if (var1 != 9999999 && var1 != 0) {
+         for (var2 = 0; var2 < 10; ++var2) {
+            if (this.instruments[var2] != null) {
+               Instrument var10000 = this.instruments[var2];
+               var10000.offset -= var1 * 20;
             }
          }
 
-         if(this.start < this.end) {
+         if (this.start < this.end) {
             this.start -= var1 * 20;
             this.end -= var1 * 20;
          }
@@ -87,27 +88,27 @@ public class SoundEffect {
       int var1 = 0;
 
       int var2;
-      for(var2 = 0; var2 < 10; ++var2) {
-         if(this.instruments[var2] != null && this.instruments[var2].duration + this.instruments[var2].offset > var1) {
+      for (var2 = 0; var2 < 10; ++var2) {
+         if (this.instruments[var2] != null && this.instruments[var2].duration + this.instruments[var2].offset > var1) {
             var1 = this.instruments[var2].duration + this.instruments[var2].offset;
          }
       }
 
-      if(var1 == 0) {
+      if (var1 == 0) {
          return new byte[0];
       } else {
          var2 = var1 * 22050 / 1000;
          byte[] var3 = new byte[var2];
 
-         for(int var4 = 0; var4 < 10; ++var4) {
-            if(this.instruments[var4] != null) {
+         for (int var4 = 0; var4 < 10; ++var4) {
+            if (this.instruments[var4] != null) {
                int var5 = this.instruments[var4].duration * 22050 / 1000;
                int var6 = this.instruments[var4].offset * 22050 / 1000;
                int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration);
 
-               for(int var8 = 0; var8 < var5; ++var8) {
+               for (int var8 = 0; var8 < var5; ++var8) {
                   int var9 = (var7[var8] >> 8) + var3[var8 + var6];
-                  if((var9 + 128 & -256) != 0) {
+                  if ((var9 + 128 & -256) != 0) {
                      var9 = var9 >> 31 ^ 127;
                   }
 
@@ -127,6 +128,6 @@ public class SoundEffect {
    @Export("readSoundEffect")
    public static SoundEffect readSoundEffect(AbstractIndexCache var0, int var1, int var2) {
       byte[] var3 = var0.takeRecord(var1, var2);
-      return var3 == null?null:new SoundEffect(new Buffer(var3));
+      return var3 == null ? null : new SoundEffect(new Buffer(var3));
    }
 }
diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java
index 633080a2f0..b5d494def3 100644
--- a/runescape-client/src/main/java/SoundEnvelope.java
+++ b/runescape-client/src/main/java/SoundEnvelope.java
@@ -72,9 +72,9 @@ public class SoundEnvelope {
       this.durations = new int[this.segments];
       this.phases = new int[this.segments];
 
-      for(int var2 = 0; var2 < this.segments; ++var2) {
-         this.durations[var2] = var1.__ag_302();
-         this.phases[var2] = var1.__ag_302();
+      for (int var2 = 0; var2 < this.segments; ++var2) {
+         this.durations[var2] = var1.method43();
+         this.phases[var2] = var1.method43();
       }
 
    }
@@ -92,14 +92,14 @@ public class SoundEnvelope {
    @ObfuscatedName("w")
    @Export("doStep")
    final int doStep(int var1) {
-      if(this.max >= this.ticks) {
+      if (this.max >= this.ticks) {
          this.amplitude = this.phases[this.phaseIndex++] << 15;
-         if(this.phaseIndex >= this.segments) {
+         if (this.phaseIndex >= this.segments) {
             this.phaseIndex = this.segments - 1;
          }
 
          this.ticks = (int)((double)this.durations[this.phaseIndex] / 65536.0D * (double)var1);
-         if(this.ticks > this.max) {
+         if (this.ticks > this.max) {
             this.step = ((this.phases[this.phaseIndex] << 15) - this.amplitude) / (this.ticks - this.max);
          }
       }
diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java
index 798f86746b..e80bd0db1f 100644
--- a/runescape-client/src/main/java/SoundSystem.java
+++ b/runescape-client/src/main/java/SoundSystem.java
@@ -28,14 +28,14 @@ public class SoundSystem implements Runnable {
    @ObfuscatedName("run")
    public void run() {
       try {
-         for(int var1 = 0; var1 < 2; ++var1) {
+         for (int var1 = 0; var1 < 2; ++var1) {
             PcmPlayer var2 = this.players[var1];
-            if(var2 != null) {
+            if (var2 != null) {
                var2.run();
             }
          }
-      } catch (Exception var4) {
-         NpcDefinition.sendStackTrace((String)null, var4);
+      } catch (Exception var3) {
+         NPCDefinition.sendStackTrace((String)null, var3);
       }
 
    }
@@ -47,11 +47,11 @@ public class SoundSystem implements Runnable {
    )
    static Script method2451(int var0) {
       Script var1 = (Script)Script.Script_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
          byte[] var2 = Formatting.indexCache12.takeRecord(var0, 0);
-         if(var2 == null) {
+         if (var2 == null) {
             return null;
          } else {
             var1 = Occluder.newScript(var2);
@@ -67,6 +67,6 @@ public class SoundSystem implements Runnable {
       garbageValue = "20"
    )
    static void method2456() {
-      WorldMapRegion.__av_o.clear();
+      WorldMapRegion.field1051.clear();
    }
 }
diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java
index 84807ce61c..cc37a677b7 100644
--- a/runescape-client/src/main/java/SpotAnimationDefinition.java
+++ b/runescape-client/src/main/java/SpotAnimationDefinition.java
@@ -83,25 +83,20 @@ public class SpotAnimationDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = -20619847
    )
-   int __a;
+   int field876;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = 1866148625
    )
-   int __z;
-
-   static {
-      SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64);
-      SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30);
-   }
+   int field877;
 
    SpotAnimationDefinition() {
       this.sequence = -1;
       this.widthScale = 128;
       this.heightScale = 128;
       this.orientation = 0;
-      this.__a = 0;
-      this.__z = 0;
+      this.field876 = 0;
+      this.field877 = 0;
    }
 
    @ObfuscatedName("f")
@@ -111,9 +106,9 @@ public class SpotAnimationDefinition extends DualNode {
    )
    @Export("read")
    void read(Buffer var1) {
-      while(true) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
@@ -128,40 +123,40 @@ public class SpotAnimationDefinition extends DualNode {
    )
    @Export("readNext")
    void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         this.archive = var1.__ag_302();
-      } else if(var2 == 2) {
-         this.sequence = var1.__ag_302();
-      } else if(var2 == 4) {
-         this.widthScale = var1.__ag_302();
-      } else if(var2 == 5) {
-         this.heightScale = var1.__ag_302();
-      } else if(var2 == 6) {
-         this.orientation = var1.__ag_302();
-      } else if(var2 == 7) {
-         this.__a = var1.readUnsignedByte();
-      } else if(var2 == 8) {
-         this.__z = var1.readUnsignedByte();
+      if (var2 == 1) {
+         this.archive = var1.method43();
+      } else if (var2 == 2) {
+         this.sequence = var1.method43();
+      } else if (var2 == 4) {
+         this.widthScale = var1.method43();
+      } else if (var2 == 5) {
+         this.heightScale = var1.method43();
+      } else if (var2 == 6) {
+         this.orientation = var1.method43();
+      } else if (var2 == 7) {
+         this.field876 = var1.readUnsignedByte();
+      } else if (var2 == 8) {
+         this.field877 = var1.readUnsignedByte();
       } else {
          int var3;
          int var4;
-         if(var2 == 40) {
+         if (var2 == 40) {
             var3 = var1.readUnsignedByte();
             this.recolorFrom = new short[var3];
             this.recolorTo = new short[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.recolorFrom[var4] = (short)var1.__ag_302();
-               this.recolorTo[var4] = (short)var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.recolorFrom[var4] = (short)var1.method43();
+               this.recolorTo[var4] = (short)var1.method43();
             }
-         } else if(var2 == 41) {
+         } else if (var2 == 41) {
             var3 = var1.readUnsignedByte();
             this.retextureFrom = new short[var3];
             this.retextureTo = new short[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.retextureFrom[var4] = (short)var1.__ag_302();
-               this.retextureTo[var4] = (short)var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.retextureFrom[var4] = (short)var1.method43();
+               this.retextureTo[var4] = (short)var1.method43();
             }
          }
       }
@@ -176,51 +171,51 @@ public class SpotAnimationDefinition extends DualNode {
    @Export("getModel")
    public final Model getModel(int var1) {
       Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id);
-      if(var2 == null) {
+      if (var2 == null) {
          ModelData var3 = ModelData.method2788(SpotAnimationDefinition_modelIndexCache, this.archive, 0);
-         if(var3 == null) {
+         if (var3 == null) {
             return null;
          }
 
          int var4;
-         if(this.recolorFrom != null) {
-            for(var4 = 0; var4 < this.recolorFrom.length; ++var4) {
+         if (this.recolorFrom != null) {
+            for (var4 = 0; var4 < this.recolorFrom.length; ++var4) {
                var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]);
             }
          }
 
-         if(this.retextureFrom != null) {
-            for(var4 = 0; var4 < this.retextureFrom.length; ++var4) {
+         if (this.retextureFrom != null) {
+            for (var4 = 0; var4 < this.retextureFrom.length; ++var4) {
                var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]);
             }
          }
 
-         var2 = var3.toModel(this.__a + 64, this.__z + 850, -30, -50, -30);
+         var2 = var3.toModel(this.field876 + 64, this.field877 + 850, -30, -50, -30);
          SpotAnimationDefinition_cachedModels.put(var2, (long)this.id);
       }
 
       Model var5;
-      if(this.sequence != -1 && var1 != -1) {
+      if (this.sequence != -1 && var1 != -1) {
          var5 = WorldMapAreaData.getSequenceDefinition(this.sequence).animateSpotAnimation(var2, var1);
       } else {
          var5 = var2.toSharedSpotAnimationModel(true);
       }
 
-      if(this.widthScale != 128 || this.heightScale != 128) {
+      if (this.widthScale != 128 || this.heightScale != 128) {
          var5.scale(this.widthScale, this.heightScale, this.widthScale);
       }
 
-      if(this.orientation != 0) {
-         if(this.orientation == 90) {
+      if (this.orientation != 0) {
+         if (this.orientation == 90) {
             var5.rotateY90Ccw();
          }
 
-         if(this.orientation == 180) {
+         if (this.orientation == 180) {
             var5.rotateY90Ccw();
             var5.rotateY90Ccw();
          }
 
-         if(this.orientation == 270) {
+         if (this.orientation == 270) {
             var5.rotateY90Ccw();
             var5.rotateY90Ccw();
             var5.rotateY90Ccw();
@@ -236,6 +231,11 @@ public class SpotAnimationDefinition extends DualNode {
       garbageValue = "95"
    )
    static int method4822() {
-      return Client.isResizable?2:1;
+      return Client.isResizable ? 2 : 1;
+   }
+
+   static {
+      SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64);
+      SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30);
    }
 }
diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java
index d56f907f4a..58538a0d46 100644
--- a/runescape-client/src/main/java/Sprite.java
+++ b/runescape-client/src/main/java/Sprite.java
@@ -55,8 +55,8 @@ public final class Sprite extends Rasterizer2D {
       var1.yOffset = this.width - this.subWidth - this.yOffset;
       var1.xOffset = this.xOffset;
 
-      for(int var2 = 0; var2 < this.subHeight; ++var2) {
-         for(int var3 = 0; var3 < this.subWidth; ++var3) {
+      for (int var2 = 0; var2 < this.subHeight; ++var2) {
+         for (int var3 = 0; var3 < this.subWidth; ++var3) {
             var1.pixels[var3 + var2 * this.subWidth] = this.pixels[var2 * this.subWidth + this.subWidth - 1 - var3];
          }
       }
@@ -72,8 +72,8 @@ public final class Sprite extends Rasterizer2D {
    public Sprite copyNormalized() {
       Sprite var1 = new Sprite(this.width, this.height);
 
-      for(int var2 = 0; var2 < this.subHeight; ++var2) {
-         for(int var3 = 0; var3 < this.subWidth; ++var3) {
+      for (int var2 = 0; var2 < this.subHeight; ++var2) {
+         for (int var3 = 0; var3 < this.subWidth; ++var3) {
             var1.pixels[var3 + (var2 + this.xOffset) * this.width + this.yOffset] = this.pixels[var3 + var2 * this.subWidth];
          }
       }
@@ -90,11 +90,11 @@ public final class Sprite extends Rasterizer2D {
    @ObfuscatedName("w")
    @Export("normalize")
    public void normalize() {
-      if(this.subWidth != this.width || this.subHeight != this.height) {
+      if (this.subWidth != this.width || this.subHeight != this.height) {
          int[] var1 = new int[this.width * this.height];
 
-         for(int var2 = 0; var2 < this.subHeight; ++var2) {
-            for(int var3 = 0; var3 < this.subWidth; ++var3) {
+         for (int var2 = 0; var2 < this.subHeight; ++var2) {
+            for (int var3 = 0; var3 < this.subWidth; ++var3) {
                var1[var3 + (var2 + this.xOffset) * this.width + this.yOffset] = this.pixels[var3 + var2 * this.subWidth];
             }
          }
@@ -105,28 +105,29 @@ public final class Sprite extends Rasterizer2D {
          this.yOffset = 0;
          this.xOffset = 0;
       }
+
    }
 
    @ObfuscatedName("o")
-   public void __o_499(int var1) {
-      if(this.subWidth != this.width || this.subHeight != this.height) {
+   public void method304(int var1) {
+      if (this.subWidth != this.width || this.subHeight != this.height) {
          int var2 = var1;
-         if(var1 > this.yOffset) {
+         if (var1 > this.yOffset) {
             var2 = this.yOffset;
          }
 
          int var3 = var1;
-         if(var1 + this.yOffset + this.subWidth > this.width) {
+         if (var1 + this.yOffset + this.subWidth > this.width) {
             var3 = this.width - this.yOffset - this.subWidth;
          }
 
          int var4 = var1;
-         if(var1 > this.xOffset) {
+         if (var1 > this.xOffset) {
             var4 = this.xOffset;
          }
 
          int var5 = var1;
-         if(var1 + this.xOffset + this.subHeight > this.height) {
+         if (var1 + this.xOffset + this.subHeight > this.height) {
             var5 = this.height - this.xOffset - this.subHeight;
          }
 
@@ -134,8 +135,8 @@ public final class Sprite extends Rasterizer2D {
          int var7 = var4 + var5 + this.subHeight;
          int[] var8 = new int[var6 * var7];
 
-         for(int var9 = 0; var9 < this.subHeight; ++var9) {
-            for(int var10 = 0; var10 < this.subWidth; ++var10) {
+         for (int var9 = 0; var9 < this.subHeight; ++var9) {
+            for (int var10 = 0; var10 < this.subWidth; ++var10) {
                var8[var6 * (var9 + var4) + var10 + var2] = this.pixels[var10 + var9 * this.subWidth];
             }
          }
@@ -146,15 +147,16 @@ public final class Sprite extends Rasterizer2D {
          this.yOffset -= var2;
          this.xOffset -= var4;
       }
+
    }
 
    @ObfuscatedName("u")
-   public void __u_500() {
+   public void method305() {
       int[] var1 = new int[this.subWidth * this.subHeight];
       int var2 = 0;
 
-      for(int var3 = 0; var3 < this.subHeight; ++var3) {
-         for(int var4 = this.subWidth - 1; var4 >= 0; --var4) {
+      for (int var3 = 0; var3 < this.subHeight; ++var3) {
+         for (int var4 = this.subWidth - 1; var4 >= 0; --var4) {
             var1[var2++] = this.pixels[var4 + var3 * this.subWidth];
          }
       }
@@ -164,12 +166,12 @@ public final class Sprite extends Rasterizer2D {
    }
 
    @ObfuscatedName("g")
-   public void __g_501() {
+   public void method306() {
       int[] var1 = new int[this.subWidth * this.subHeight];
       int var2 = 0;
 
-      for(int var3 = this.subHeight - 1; var3 >= 0; --var3) {
-         for(int var4 = 0; var4 < this.subWidth; ++var4) {
+      for (int var3 = this.subHeight - 1; var3 >= 0; --var3) {
+         for (int var4 = 0; var4 < this.subWidth; ++var4) {
             var1[var2++] = this.pixels[var4 + var3 * this.subWidth];
          }
       }
@@ -179,21 +181,21 @@ public final class Sprite extends Rasterizer2D {
    }
 
    @ObfuscatedName("l")
-   public void __l_502(int var1) {
+   public void method307(int var1) {
       int[] var2 = new int[this.subWidth * this.subHeight];
       int var3 = 0;
 
-      for(int var4 = 0; var4 < this.subHeight; ++var4) {
-         for(int var5 = 0; var5 < this.subWidth; ++var5) {
+      for (int var4 = 0; var4 < this.subHeight; ++var4) {
+         for (int var5 = 0; var5 < this.subWidth; ++var5) {
             int var6 = this.pixels[var3];
-            if(var6 == 0) {
-               if(var5 > 0 && this.pixels[var3 - 1] != 0) {
+            if (var6 == 0) {
+               if (var5 > 0 && this.pixels[var3 - 1] != 0) {
                   var6 = var1;
-               } else if(var4 > 0 && this.pixels[var3 - this.subWidth] != 0) {
+               } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) {
                   var6 = var1;
-               } else if(var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) {
+               } else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) {
                   var6 = var1;
-               } else if(var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) {
+               } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) {
                   var6 = var1;
                }
             }
@@ -206,12 +208,12 @@ public final class Sprite extends Rasterizer2D {
    }
 
    @ObfuscatedName("e")
-   public void __e_503(int var1) {
-      for(int var2 = this.subHeight - 1; var2 > 0; --var2) {
+   public void method308(int var1) {
+      for (int var2 = this.subHeight - 1; var2 > 0; --var2) {
          int var3 = var2 * this.subWidth;
 
-         for(int var4 = this.subWidth - 1; var4 > 0; --var4) {
-            if(this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) {
+         for (int var4 = this.subWidth - 1; var4 > 0; --var4) {
+            if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) {
                this.pixels[var4 + var3] = var1;
             }
          }
@@ -231,7 +233,7 @@ public final class Sprite extends Rasterizer2D {
       int var7 = Rasterizer2D.Rasterizer2D_width - var6;
       int var8 = 0;
       int var9;
-      if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
          var5 -= var9;
          var2 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -239,11 +241,11 @@ public final class Sprite extends Rasterizer2D {
          var3 += var9 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
          var6 -= var9;
          var1 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -253,16 +255,17 @@ public final class Sprite extends Rasterizer2D {
          var7 += var9;
       }
 
-      if(var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var6 -= var9;
          var8 += var9;
          var7 += var9;
       }
 
-      if(var6 > 0 && var5 > 0) {
+      if (var6 > 0 && var5 > 0) {
          Sprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, var4, var3, var6, var5, var7, var8);
       }
+
    }
 
    @ObfuscatedName("a")
@@ -277,7 +280,7 @@ public final class Sprite extends Rasterizer2D {
       int var7 = Rasterizer2D.Rasterizer2D_width - var6;
       int var8 = 0;
       int var9;
-      if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
          var5 -= var9;
          var2 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -285,11 +288,11 @@ public final class Sprite extends Rasterizer2D {
          var3 += var9 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
          var6 -= var9;
          var1 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -299,21 +302,22 @@ public final class Sprite extends Rasterizer2D {
          var7 += var9;
       }
 
-      if(var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var6 -= var9;
          var8 += var9;
          var7 += var9;
       }
 
-      if(var6 > 0 && var5 > 0) {
+      if (var6 > 0 && var5 > 0) {
          Sprite_andAnotherOne(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var4, var3, var6, var5, var7, var8);
       }
+
    }
 
    @ObfuscatedName("j")
-   public void __j_506(int var1, int var2, int var3, int var4) {
-      if(var3 > 0 && var4 > 0) {
+   public void method309(int var1, int var2, int var3, int var4) {
+      if (var3 > 0 && var4 > 0) {
          int var5 = this.subWidth;
          int var6 = this.subHeight;
          int var7 = 0;
@@ -323,47 +327,47 @@ public final class Sprite extends Rasterizer2D {
          int var11 = (var9 << 16) / var3;
          int var12 = (var10 << 16) / var4;
          int var13;
-         if(this.yOffset > 0) {
+         if (this.yOffset > 0) {
             var13 = (var11 + (this.yOffset << 16) - 1) / var11;
             var1 += var13;
             var7 += var13 * var11 - (this.yOffset << 16);
          }
 
-         if(this.xOffset > 0) {
+         if (this.xOffset > 0) {
             var13 = (var12 + (this.xOffset << 16) - 1) / var12;
             var2 += var13;
             var8 += var13 * var12 - (this.xOffset << 16);
          }
 
-         if(var5 < var9) {
+         if (var5 < var9) {
             var3 = (var11 + ((var5 << 16) - var7) - 1) / var11;
          }
 
-         if(var6 < var10) {
+         if (var6 < var10) {
             var4 = (var12 + ((var6 << 16) - var8) - 1) / var12;
          }
 
          var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
          int var14 = Rasterizer2D.Rasterizer2D_width - var3;
-         if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
             var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
          }
 
          int var15;
-         if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+         if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
             var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
             var4 -= var15;
             var13 += var15 * Rasterizer2D.Rasterizer2D_width;
             var8 += var12 * var15;
          }
 
-         if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
             var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
             var3 -= var15;
             var14 += var15;
          }
 
-         if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+         if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
             var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
             var3 -= var15;
             var13 += var15;
@@ -373,12 +377,13 @@ public final class Sprite extends Rasterizer2D {
 
          Sprite_somethingElse(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, var3, var4, var11, var12, var5);
       }
+
    }
 
    @ObfuscatedName("t")
    @Export("drawAtTransOverlay")
    public void drawAtTransOverlay(int var1, int var2, int var3, int var4) {
-      if(var3 == 256) {
+      if (var3 == 256) {
          this.drawAt2(var1, var2);
       } else {
          var1 += this.yOffset;
@@ -390,7 +395,7 @@ public final class Sprite extends Rasterizer2D {
          int var9 = Rasterizer2D.Rasterizer2D_width - var8;
          int var10 = 0;
          int var11;
-         if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+         if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
             var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
             var7 -= var11;
             var2 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -398,11 +403,11 @@ public final class Sprite extends Rasterizer2D {
             var5 += var11 * Rasterizer2D.Rasterizer2D_width;
          }
 
-         if(var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         if (var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
             var7 -= var7 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
          }
 
-         if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+         if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
             var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
             var8 -= var11;
             var1 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -412,21 +417,22 @@ public final class Sprite extends Rasterizer2D {
             var9 += var11;
          }
 
-         if(var8 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         if (var8 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
             var11 = var8 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
             var8 -= var11;
             var10 += var11;
             var9 += var11;
          }
 
-         if(var8 > 0 && var7 > 0) {
+         if (var8 > 0 && var7 > 0) {
             Sprite_anotherOne(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var6, var5, var8, var7, var9, var10, var3, var4);
          }
       }
+
    }
 
    @ObfuscatedName("h")
-   public void __h_508(int var1, int var2, int var3) {
+   public void method310(int var1, int var2, int var3) {
       var1 += this.yOffset;
       var2 += this.xOffset;
       int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
@@ -436,7 +442,7 @@ public final class Sprite extends Rasterizer2D {
       int var8 = Rasterizer2D.Rasterizer2D_width - var7;
       int var9 = 0;
       int var10;
-      if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
          var6 -= var10;
          var2 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -444,11 +450,11 @@ public final class Sprite extends Rasterizer2D {
          var4 += var10 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
          var7 -= var10;
          var1 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -458,21 +464,22 @@ public final class Sprite extends Rasterizer2D {
          var8 += var10;
       }
 
-      if(var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var7 -= var10;
          var9 += var10;
          var8 += var10;
       }
 
-      if(var7 > 0 && var6 > 0) {
+      if (var7 > 0 && var6 > 0) {
          Sprite_alpha1(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, var3);
       }
+
    }
 
    @ObfuscatedName("c")
-   public void __c_509(int var1, int var2, int var3, int var4, int var5) {
-      if(var3 > 0 && var4 > 0) {
+   public void method311(int var1, int var2, int var3, int var4, int var5) {
+      if (var3 > 0 && var4 > 0) {
          int var6 = this.subWidth;
          int var7 = this.subHeight;
          int var8 = 0;
@@ -482,47 +489,47 @@ public final class Sprite extends Rasterizer2D {
          int var12 = (var10 << 16) / var3;
          int var13 = (var11 << 16) / var4;
          int var14;
-         if(this.yOffset > 0) {
+         if (this.yOffset > 0) {
             var14 = (var12 + (this.yOffset << 16) - 1) / var12;
             var1 += var14;
             var8 += var14 * var12 - (this.yOffset << 16);
          }
 
-         if(this.xOffset > 0) {
+         if (this.xOffset > 0) {
             var14 = (var13 + (this.xOffset << 16) - 1) / var13;
             var2 += var14;
             var9 += var14 * var13 - (this.xOffset << 16);
          }
 
-         if(var6 < var10) {
+         if (var6 < var10) {
             var3 = (var12 + ((var6 << 16) - var8) - 1) / var12;
          }
 
-         if(var7 < var11) {
+         if (var7 < var11) {
             var4 = (var13 + ((var7 << 16) - var9) - 1) / var13;
          }
 
          var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
          int var15 = Rasterizer2D.Rasterizer2D_width - var3;
-         if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
             var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
          }
 
          int var16;
-         if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+         if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
             var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
             var4 -= var16;
             var14 += var16 * Rasterizer2D.Rasterizer2D_width;
             var9 += var13 * var16;
          }
 
-         if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
             var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
             var3 -= var16;
             var15 += var16;
          }
 
-         if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+         if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
             var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
             var3 -= var16;
             var14 += var16;
@@ -532,10 +539,11 @@ public final class Sprite extends Rasterizer2D {
 
          Sprite_alpha2(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, var3, var4, var12, var13, var6, var5);
       }
+
    }
 
    @ObfuscatedName("v")
-   public void __v_510(int var1, int var2, int var3) {
+   public void method312(int var1, int var2, int var3) {
       var1 += this.yOffset;
       var2 += this.xOffset;
       int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
@@ -545,7 +553,7 @@ public final class Sprite extends Rasterizer2D {
       int var8 = Rasterizer2D.Rasterizer2D_width - var7;
       int var9 = 0;
       int var10;
-      if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
          var6 -= var10;
          var2 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -553,11 +561,11 @@ public final class Sprite extends Rasterizer2D {
          var4 += var10 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
          var7 -= var10;
          var1 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -567,26 +575,26 @@ public final class Sprite extends Rasterizer2D {
          var8 += var10;
       }
 
-      if(var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var7 -= var10;
          var9 += var10;
          var8 += var10;
       }
 
-      if(var7 > 0 && var6 > 0) {
-         if(var3 == 256) {
+      if (var7 > 0 && var6 > 0) {
+         if (var3 == 256) {
             method6074(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9);
          } else {
             method6075(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3);
          }
-
       }
+
    }
 
    @ObfuscatedName("aj")
-   public void __aj_511(int var1, int var2, int var3, int var4, int var5) {
-      if(var3 > 0 && var4 > 0) {
+   public void method313(int var1, int var2, int var3, int var4, int var5) {
+      if (var3 > 0 && var4 > 0) {
          int var6 = this.subWidth;
          int var7 = this.subHeight;
          int var8 = 0;
@@ -596,47 +604,47 @@ public final class Sprite extends Rasterizer2D {
          int var12 = (var10 << 16) / var3;
          int var13 = (var11 << 16) / var4;
          int var14;
-         if(this.yOffset > 0) {
+         if (this.yOffset > 0) {
             var14 = (var12 + (this.yOffset << 16) - 1) / var12;
             var1 += var14;
             var8 += var14 * var12 - (this.yOffset << 16);
          }
 
-         if(this.xOffset > 0) {
+         if (this.xOffset > 0) {
             var14 = (var13 + (this.xOffset << 16) - 1) / var13;
             var2 += var14;
             var9 += var14 * var13 - (this.xOffset << 16);
          }
 
-         if(var6 < var10) {
+         if (var6 < var10) {
             var3 = (var12 + ((var6 << 16) - var8) - 1) / var12;
          }
 
-         if(var7 < var11) {
+         if (var7 < var11) {
             var4 = (var13 + ((var7 << 16) - var9) - 1) / var13;
          }
 
          var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
          int var15 = Rasterizer2D.Rasterizer2D_width - var3;
-         if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
             var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
          }
 
          int var16;
-         if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+         if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
             var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
             var4 -= var16;
             var14 += var16 * Rasterizer2D.Rasterizer2D_width;
             var9 += var13 * var16;
          }
 
-         if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
             var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
             var3 -= var16;
             var15 += var16;
          }
 
-         if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+         if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
             var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
             var3 -= var16;
             var14 += var16;
@@ -644,53 +652,52 @@ public final class Sprite extends Rasterizer2D {
             var15 += var16;
          }
 
-         if(var5 == 256) {
+         if (var5 == 256) {
             method6144(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6);
          } else {
             method6078(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5);
          }
-
       }
+
    }
 
    @ObfuscatedName("ac")
-   public void __ac_512(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) {
-      int var9 = var2 < 0?-var2:0;
-      int var10 = var2 + this.subHeight <= var6?this.subHeight:var6 - var2;
-      int var11 = var1 < 0?-var1:0;
-      int var10000;
-      if(this.subWidth + var1 <= var5) {
-         var10000 = this.subWidth;
+   public void method314(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) {
+      int var9 = var2 < 0 ? -var2 : 0;
+      int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2;
+      int var11 = var1 < 0 ? -var1 : 0;
+      if (this.subWidth + var1 <= var5) {
+         int var12 = this.subWidth;
       } else {
-         var10000 = var5 - var1;
+         int var10000 = var5 - var1;
       }
 
       int var13 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1;
       int var14 = var9 + var2;
 
-      for(int var15 = var9; var15 < var10; ++var15) {
+      for (int var15 = var9; var15 < var10; ++var15) {
          int var16 = var7[var14];
          int var17 = var8[var14++];
          int var18 = var13;
          int var19;
-         if(var1 < var16) {
+         if (var1 < var16) {
             var19 = var16 - var1;
             var18 = var13 + (var19 - var11);
          } else {
             var19 = var11;
          }
 
-         int var12;
-         if(this.subWidth + var1 <= var16 + var17) {
-            var12 = this.subWidth;
+         int var20;
+         if (this.subWidth + var1 <= var16 + var17) {
+            var20 = this.subWidth;
          } else {
-            var12 = var16 + var17 - var1;
+            var20 = var16 + var17 - var1;
          }
 
-         for(int var20 = var19; var20 < var12; ++var20) {
-            int var21 = this.pixels[var20 + var15 * this.subWidth];
-            if(var21 != 0) {
-               Rasterizer2D.Rasterizer2D_pixels[var18++] = var21;
+         for (int var21 = var19; var21 < var20; ++var21) {
+            int var22 = this.pixels[var21 + var15 * this.subWidth];
+            if (var22 != 0) {
+               Rasterizer2D.Rasterizer2D_pixels[var18++] = var22;
             } else {
                ++var18;
             }
@@ -702,7 +709,7 @@ public final class Sprite extends Rasterizer2D {
    }
 
    @ObfuscatedName("ay")
-   public void __ay_513(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) {
+   public void method315(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) {
       try {
          int var11 = -var3 / 2;
          int var12 = -var4 / 2;
@@ -714,13 +721,13 @@ public final class Sprite extends Rasterizer2D {
          int var16 = var12 * var14 - var11 * var13 + (var6 << 16);
          int var17 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
 
-         for(var2 = 0; var2 < var4; ++var2) {
+         for (var2 = 0; var2 < var4; ++var2) {
             int var18 = var9[var2];
             int var19 = var17 + var18;
             int var20 = var15 + var14 * var18;
             int var21 = var16 - var13 * var18;
 
-            for(var1 = -var10[var2]; var1 < 0; ++var1) {
+            for (var1 = -var10[var2]; var1 < 0; ++var1) {
                Rasterizer2D.Rasterizer2D_pixels[var19++] = this.pixels[this.subWidth * (var21 >> 16) + (var20 >> 16)];
                var20 += var14;
                var21 -= var13;
@@ -730,14 +737,13 @@ public final class Sprite extends Rasterizer2D {
             var16 += var14;
             var17 += Rasterizer2D.Rasterizer2D_width;
          }
-      } catch (Exception var23) {
-         ;
+      } catch (Exception var22) {
       }
 
    }
 
    @ObfuscatedName("ah")
-   public void __ah_514(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) {
+   public void method316(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) {
       try {
          int var10 = -var3 / 2;
          int var11 = -var4 / 2;
@@ -749,14 +755,14 @@ public final class Sprite extends Rasterizer2D {
          int var15 = var11 * var13 - var10 * var12 + (var6 << 16);
          int var16 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
 
-         for(var2 = 0; var2 < var4; ++var2) {
+         for (var2 = 0; var2 < var4; ++var2) {
             int var17 = var16;
             int var18 = var14;
             int var19 = var15;
 
-            for(var1 = -var3; var1 < 0; ++var1) {
+            for (var1 = -var3; var1 < 0; ++var1) {
                int var20 = this.pixels[this.subWidth * (var19 >> 16) + (var18 >> 16)];
-               if(var20 != 0) {
+               if (var20 != 0) {
                   Rasterizer2D.Rasterizer2D_pixels[var17++] = var20;
                } else {
                   ++var17;
@@ -770,20 +776,19 @@ public final class Sprite extends Rasterizer2D {
             var15 += var13;
             var16 += Rasterizer2D.Rasterizer2D_width;
          }
-      } catch (Exception var22) {
-         ;
+      } catch (Exception var21) {
       }
 
    }
 
    @ObfuscatedName("ak")
-   public void __ak_515(int var1, int var2, int var3, int var4) {
-      this.__aw_516(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4);
+   public void method317(int var1, int var2, int var3, int var4) {
+      this.method318(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4);
    }
 
    @ObfuscatedName("aw")
-   void __aw_516(int var1, int var2, int var3, int var4, int var5, int var6) {
-      if(var6 != 0) {
+   void method318(int var1, int var2, int var3, int var4, int var5, int var6) {
+      if (var6 != 0) {
          var1 -= this.yOffset << 4;
          var2 -= this.xOffset << 4;
          double var7 = (double)(var5 & 65535) * 9.587379924285257E-5D;
@@ -799,7 +804,7 @@ public final class Sprite extends Rasterizer2D {
          int var18 = ((this.subHeight << 4) - var2) * var10 + var9 * -((this.subWidth << 4) - var1);
          int var19;
          int var20;
-         if(var11 < var13) {
+         if (var11 < var13) {
             var19 = var11;
             var20 = var13;
          } else {
@@ -807,25 +812,25 @@ public final class Sprite extends Rasterizer2D {
             var20 = var11;
          }
 
-         if(var15 < var19) {
+         if (var15 < var19) {
             var19 = var15;
          }
 
-         if(var17 < var19) {
+         if (var17 < var19) {
             var19 = var17;
          }
 
-         if(var15 > var20) {
+         if (var15 > var20) {
             var20 = var15;
          }
 
-         if(var17 > var20) {
+         if (var17 > var20) {
             var20 = var17;
          }
 
          int var21;
          int var22;
-         if(var12 < var14) {
+         if (var12 < var14) {
             var21 = var12;
             var22 = var14;
          } else {
@@ -833,19 +838,19 @@ public final class Sprite extends Rasterizer2D {
             var22 = var12;
          }
 
-         if(var16 < var21) {
+         if (var16 < var21) {
             var21 = var16;
          }
 
-         if(var18 < var21) {
+         if (var18 < var21) {
             var21 = var18;
          }
 
-         if(var16 > var22) {
+         if (var16 > var22) {
             var22 = var16;
          }
 
-         if(var18 > var22) {
+         if (var18 > var22) {
             var22 = var18;
          }
 
@@ -861,26 +866,26 @@ public final class Sprite extends Rasterizer2D {
          var20 = var20 + 15 >> 4;
          var21 >>= 4;
          var22 = var22 + 15 >> 4;
-         if(var19 < Rasterizer2D.Rasterizer2D_xClipStart) {
+         if (var19 < Rasterizer2D.Rasterizer2D_xClipStart) {
             var19 = Rasterizer2D.Rasterizer2D_xClipStart;
          }
 
-         if(var20 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         if (var20 > Rasterizer2D.Rasterizer2D_xClipEnd) {
             var20 = Rasterizer2D.Rasterizer2D_xClipEnd;
          }
 
-         if(var21 < Rasterizer2D.Rasterizer2D_yClipStart) {
+         if (var21 < Rasterizer2D.Rasterizer2D_yClipStart) {
             var21 = Rasterizer2D.Rasterizer2D_yClipStart;
          }
 
-         if(var22 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         if (var22 > Rasterizer2D.Rasterizer2D_yClipEnd) {
             var22 = Rasterizer2D.Rasterizer2D_yClipEnd;
          }
 
          var20 = var19 - var20;
-         if(var20 < 0) {
+         if (var20 < 0) {
             var22 = var21 - var22;
-            if(var22 < 0) {
+            if (var22 < 0) {
                int var23 = var19 + var21 * Rasterizer2D.Rasterizer2D_width;
                double var24 = 1.6777216E7D / (double)var6;
                int var26 = (int)Math.floor(Math.sin(var7) * var24 + 0.5D);
@@ -896,17 +901,17 @@ public final class Sprite extends Rasterizer2D {
                int var36;
                int var37;
                int var38;
-               if(var27 == 0) {
-                  if(var26 == 0) {
-                     for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+               if (var27 == 0) {
+                  if (var26 == 0) {
+                     for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                         var34 = var23;
                         var35 = var30;
                         var36 = var31;
                         var37 = var20;
-                        if(var30 >= 0 && var31 >= 0 && var30 - (this.subWidth << 12) < 0 && var31 - (this.subHeight << 12) < 0) {
-                           for(; var37 < 0; ++var37) {
+                        if (var30 >= 0 && var31 >= 0 && var30 - (this.subWidth << 12) < 0 && var31 - (this.subHeight << 12) < 0) {
+                           for (; var37 < 0; ++var37) {
                               var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                              if(var38 != 0) {
+                              if (var38 != 0) {
                                  Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                               } else {
                                  ++var34;
@@ -916,27 +921,27 @@ public final class Sprite extends Rasterizer2D {
 
                         ++var33;
                      }
-                  } else if(var26 < 0) {
-                     for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+                  } else if (var26 < 0) {
+                     for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                         var34 = var23;
                         var35 = var30;
                         var36 = (var28 * var26 >> 4) + var31;
                         var37 = var20;
-                        if(var30 >= 0 && var30 - (this.subWidth << 12) < 0) {
-                           if((var32 = var36 - (this.subHeight << 12)) >= 0) {
+                        if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) {
+                           if ((var32 = var36 - (this.subHeight << 12)) >= 0) {
                               var32 = (var26 - var32) / var26;
                               var37 = var20 + var32;
                               var36 += var26 * var32;
                               var34 = var23 + var32;
                            }
 
-                           if((var32 = (var36 - var26) / var26) > var37) {
+                           if ((var32 = (var36 - var26) / var26) > var37) {
                               var37 = var32;
                            }
 
-                           while(var37 < 0) {
+                           while (var37 < 0) {
                               var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                              if(var38 != 0) {
+                              if (var38 != 0) {
                                  Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                               } else {
                                  ++var34;
@@ -951,26 +956,26 @@ public final class Sprite extends Rasterizer2D {
                         var30 -= var26;
                      }
                   } else {
-                     for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+                     for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                         var34 = var23;
                         var35 = var30;
                         var36 = (var28 * var26 >> 4) + var31;
                         var37 = var20;
-                        if(var30 >= 0 && var30 - (this.subWidth << 12) < 0) {
-                           if(var36 < 0) {
+                        if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) {
+                           if (var36 < 0) {
                               var32 = (var26 - 1 - var36) / var26;
                               var37 = var20 + var32;
                               var36 += var26 * var32;
                               var34 = var23 + var32;
                            }
 
-                           if((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) {
+                           if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) {
                               var37 = var32;
                            }
 
-                           while(var37 < 0) {
+                           while (var37 < 0) {
                               var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                              if(var38 != 0) {
+                              if (var38 != 0) {
                                  Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                               } else {
                                  ++var34;
@@ -985,28 +990,28 @@ public final class Sprite extends Rasterizer2D {
                         var30 -= var26;
                      }
                   }
-               } else if(var27 < 0) {
-                  if(var26 == 0) {
-                     for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+               } else if (var27 < 0) {
+                  if (var26 == 0) {
+                     for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                         var34 = var23;
                         var35 = (var28 * var27 >> 4) + var30;
                         var36 = var31;
                         var37 = var20;
-                        if(var31 >= 0 && var31 - (this.subHeight << 12) < 0) {
-                           if((var32 = var35 - (this.subWidth << 12)) >= 0) {
+                        if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) {
+                           if ((var32 = var35 - (this.subWidth << 12)) >= 0) {
                               var32 = (var27 - var32) / var27;
                               var37 = var20 + var32;
                               var35 += var27 * var32;
                               var34 = var23 + var32;
                            }
 
-                           if((var32 = (var35 - var27) / var27) > var37) {
+                           if ((var32 = (var35 - var27) / var27) > var37) {
                               var37 = var32;
                            }
 
-                           while(var37 < 0) {
+                           while (var37 < 0) {
                               var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                              if(var38 != 0) {
+                              if (var38 != 0) {
                                  Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                               } else {
                                  ++var34;
@@ -1020,13 +1025,13 @@ public final class Sprite extends Rasterizer2D {
                         ++var33;
                         var31 += var27;
                      }
-                  } else if(var26 < 0) {
-                     for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+                  } else if (var26 < 0) {
+                     for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                         var34 = var23;
                         var35 = (var28 * var27 >> 4) + var30;
                         var36 = (var28 * var26 >> 4) + var31;
                         var37 = var20;
-                        if((var32 = var35 - (this.subWidth << 12)) >= 0) {
+                        if ((var32 = var35 - (this.subWidth << 12)) >= 0) {
                            var32 = (var27 - var32) / var27;
                            var37 = var20 + var32;
                            var35 += var27 * var32;
@@ -1034,11 +1039,11 @@ public final class Sprite extends Rasterizer2D {
                            var34 = var23 + var32;
                         }
 
-                        if((var32 = (var35 - var27) / var27) > var37) {
+                        if ((var32 = (var35 - var27) / var27) > var37) {
                            var37 = var32;
                         }
 
-                        if((var32 = var36 - (this.subHeight << 12)) >= 0) {
+                        if ((var32 = var36 - (this.subHeight << 12)) >= 0) {
                            var32 = (var26 - var32) / var26;
                            var37 += var32;
                            var35 += var27 * var32;
@@ -1046,13 +1051,13 @@ public final class Sprite extends Rasterizer2D {
                            var34 += var32;
                         }
 
-                        if((var32 = (var36 - var26) / var26) > var37) {
+                        if ((var32 = (var36 - var26) / var26) > var37) {
                            var37 = var32;
                         }
 
-                        while(var37 < 0) {
+                        while (var37 < 0) {
                            var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                           if(var38 != 0) {
+                           if (var38 != 0) {
                               Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                            } else {
                               ++var34;
@@ -1068,12 +1073,12 @@ public final class Sprite extends Rasterizer2D {
                         var31 += var27;
                      }
                   } else {
-                     for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+                     for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                         var34 = var23;
                         var35 = (var28 * var27 >> 4) + var30;
                         var36 = (var28 * var26 >> 4) + var31;
                         var37 = var20;
-                        if((var32 = var35 - (this.subWidth << 12)) >= 0) {
+                        if ((var32 = var35 - (this.subWidth << 12)) >= 0) {
                            var32 = (var27 - var32) / var27;
                            var37 = var20 + var32;
                            var35 += var27 * var32;
@@ -1081,11 +1086,11 @@ public final class Sprite extends Rasterizer2D {
                            var34 = var23 + var32;
                         }
 
-                        if((var32 = (var35 - var27) / var27) > var37) {
+                        if ((var32 = (var35 - var27) / var27) > var37) {
                            var37 = var32;
                         }
 
-                        if(var36 < 0) {
+                        if (var36 < 0) {
                            var32 = (var26 - 1 - var36) / var26;
                            var37 += var32;
                            var35 += var27 * var32;
@@ -1093,13 +1098,13 @@ public final class Sprite extends Rasterizer2D {
                            var34 += var32;
                         }
 
-                        if((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) {
+                        if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) {
                            var37 = var32;
                         }
 
-                        while(var37 < 0) {
+                        while (var37 < 0) {
                            var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                           if(var38 != 0) {
+                           if (var38 != 0) {
                               Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                            } else {
                               ++var34;
@@ -1115,27 +1120,27 @@ public final class Sprite extends Rasterizer2D {
                         var31 += var27;
                      }
                   }
-               } else if(var26 == 0) {
-                  for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+               } else if (var26 == 0) {
+                  for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                      var34 = var23;
                      var35 = (var28 * var27 >> 4) + var30;
                      var36 = var31;
                      var37 = var20;
-                     if(var31 >= 0 && var31 - (this.subHeight << 12) < 0) {
-                        if(var35 < 0) {
+                     if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) {
+                        if (var35 < 0) {
                            var32 = (var27 - 1 - var35) / var27;
                            var37 = var20 + var32;
                            var35 += var27 * var32;
                            var34 = var23 + var32;
                         }
 
-                        if((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) {
+                        if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) {
                            var37 = var32;
                         }
 
-                        while(var37 < 0) {
+                        while (var37 < 0) {
                            var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                           if(var38 != 0) {
+                           if (var38 != 0) {
                               Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                            } else {
                               ++var34;
@@ -1149,13 +1154,13 @@ public final class Sprite extends Rasterizer2D {
                      ++var33;
                      var31 += var27;
                   }
-               } else if(var26 < 0) {
-                  for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+               } else if (var26 < 0) {
+                  for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                      var34 = var23;
                      var35 = (var28 * var27 >> 4) + var30;
                      var36 = (var28 * var26 >> 4) + var31;
                      var37 = var20;
-                     if(var35 < 0) {
+                     if (var35 < 0) {
                         var32 = (var27 - 1 - var35) / var27;
                         var37 = var20 + var32;
                         var35 += var27 * var32;
@@ -1163,11 +1168,11 @@ public final class Sprite extends Rasterizer2D {
                         var34 = var23 + var32;
                      }
 
-                     if((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) {
+                     if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) {
                         var37 = var32;
                      }
 
-                     if((var32 = var36 - (this.subHeight << 12)) >= 0) {
+                     if ((var32 = var36 - (this.subHeight << 12)) >= 0) {
                         var32 = (var26 - var32) / var26;
                         var37 += var32;
                         var35 += var27 * var32;
@@ -1175,13 +1180,13 @@ public final class Sprite extends Rasterizer2D {
                         var34 += var32;
                      }
 
-                     if((var32 = (var36 - var26) / var26) > var37) {
+                     if ((var32 = (var36 - var26) / var26) > var37) {
                         var37 = var32;
                      }
 
-                     while(var37 < 0) {
+                     while (var37 < 0) {
                         var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                        if(var38 != 0) {
+                        if (var38 != 0) {
                            Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                         } else {
                            ++var34;
@@ -1197,12 +1202,12 @@ public final class Sprite extends Rasterizer2D {
                      var31 += var27;
                   }
                } else {
-                  for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+                  for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                      var34 = var23;
                      var35 = (var28 * var27 >> 4) + var30;
                      var36 = (var28 * var26 >> 4) + var31;
                      var37 = var20;
-                     if(var35 < 0) {
+                     if (var35 < 0) {
                         var32 = (var27 - 1 - var35) / var27;
                         var37 = var20 + var32;
                         var35 += var27 * var32;
@@ -1210,11 +1215,11 @@ public final class Sprite extends Rasterizer2D {
                         var34 = var23 + var32;
                      }
 
-                     if((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) {
+                     if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) {
                         var37 = var32;
                      }
 
-                     if(var36 < 0) {
+                     if (var36 < 0) {
                         var32 = (var26 - 1 - var36) / var26;
                         var37 += var32;
                         var35 += var27 * var32;
@@ -1222,13 +1227,13 @@ public final class Sprite extends Rasterizer2D {
                         var34 += var32;
                      }
 
-                     if((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) {
+                     if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) {
                         var37 = var32;
                      }
 
-                     while(var37 < 0) {
+                     while (var37 < 0) {
                         var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                        if(var38 != 0) {
+                        if (var38 != 0) {
                            Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                         } else {
                            ++var34;
@@ -1244,41 +1249,41 @@ public final class Sprite extends Rasterizer2D {
                      var31 += var27;
                   }
                }
-
             }
          }
       }
+
    }
 
    @ObfuscatedName("al")
-   public void __al_517(int var1, int var2, int var3, int var4) {
-      if(var3 <= this.width && var4 <= this.height) {
+   public void method319(int var1, int var2, int var3, int var4) {
+      if (var3 <= this.width && var4 <= this.height) {
          int var5 = var3 * this.yOffset / this.width + var1;
          int var6 = (var3 * (this.yOffset + this.subWidth) + this.width - 1) / this.width + var1;
          int var7 = var2 + var4 * this.xOffset / this.height;
          int var8 = var2 + (this.height + (this.xOffset + this.subHeight) * var4 - 1) / this.height;
-         if(var5 < Rasterizer2D.Rasterizer2D_xClipStart) {
+         if (var5 < Rasterizer2D.Rasterizer2D_xClipStart) {
             var5 = Rasterizer2D.Rasterizer2D_xClipStart;
          }
 
-         if(var6 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         if (var6 > Rasterizer2D.Rasterizer2D_xClipEnd) {
             var6 = Rasterizer2D.Rasterizer2D_xClipEnd;
          }
 
-         if(var7 < Rasterizer2D.Rasterizer2D_yClipStart) {
+         if (var7 < Rasterizer2D.Rasterizer2D_yClipStart) {
             var7 = Rasterizer2D.Rasterizer2D_yClipStart;
          }
 
-         if(var8 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         if (var8 > Rasterizer2D.Rasterizer2D_yClipEnd) {
             var8 = Rasterizer2D.Rasterizer2D_yClipEnd;
          }
 
-         if(var5 < var6 && var7 < var8) {
+         if (var5 < var6 && var7 < var8) {
             int var9 = var5 + var7 * Rasterizer2D.Rasterizer2D_width;
             int var10 = Rasterizer2D.Rasterizer2D_width - (var6 - var5);
-            if(var9 < Rasterizer2D.Rasterizer2D_pixels.length) {
-               for(int var11 = var7; var11 < var8; ++var11) {
-                  for(int var12 = var5; var12 < var6; ++var12) {
+            if (var9 < Rasterizer2D.Rasterizer2D_pixels.length) {
+               for (int var11 = var7; var11 < var8; ++var11) {
+                  for (int var12 = var5; var12 < var6; ++var12) {
                      int var13 = var12 - var1 << 4;
                      int var14 = var11 - var2 << 4;
                      int var15 = var13 * this.width / var3 - (this.yOffset << 4);
@@ -1286,20 +1291,20 @@ public final class Sprite extends Rasterizer2D {
                      int var17 = var14 * this.height / var4 - (this.xOffset << 4);
                      int var18 = (var14 + 16) * this.height / var4 - (this.xOffset << 4);
                      int var19 = (var16 - var15) * (var18 - var17) >> 1;
-                     if(var19 != 0) {
-                        if(var15 < 0) {
+                     if (var19 != 0) {
+                        if (var15 < 0) {
                            var15 = 0;
                         }
 
-                        if(var16 >= this.subWidth << 4) {
+                        if (var16 >= this.subWidth << 4) {
                            var16 = this.subWidth << 4;
                         }
 
-                        if(var17 < 0) {
+                        if (var17 < 0) {
                            var17 = 0;
                         }
 
-                        if(var18 >= this.subHeight << 4) {
+                        if (var18 >= this.subHeight << 4) {
                            var18 = this.subHeight << 4;
                         }
 
@@ -1319,23 +1324,23 @@ public final class Sprite extends Rasterizer2D {
                         int var27 = 0;
 
                         int var28;
-                        for(var28 = var17; var28 <= var18; ++var28) {
+                        for (var28 = var17; var28 <= var18; ++var28) {
                            int var29 = 16;
-                           if(var28 == var17) {
+                           if (var28 == var17) {
                               var29 = var22;
                            }
 
-                           if(var28 == var18) {
+                           if (var28 == var18) {
                               var29 = var23;
                            }
 
-                           for(int var30 = var15; var30 <= var16; ++var30) {
+                           for (int var30 = var15; var30 <= var16; ++var30) {
                               int var31 = this.pixels[var30 + var28 * this.subWidth];
-                              if(var31 != 0) {
+                              if (var31 != 0) {
                                  int var32;
-                                 if(var30 == var15) {
+                                 if (var30 == var15) {
                                     var32 = var29 * var20;
-                                 } else if(var30 == var16) {
+                                 } else if (var30 == var16) {
                                     var32 = var29 * var21;
                                  } else {
                                     var32 = var29 << 4;
@@ -1349,9 +1354,9 @@ public final class Sprite extends Rasterizer2D {
                            }
                         }
 
-                        if(var27 >= var19) {
+                        if (var27 >= var19) {
                            var28 = var26 / var27 + (var24 / var27 << 16) + (var25 / var27 << 8);
-                           if(var28 == 0) {
+                           if (var28 == 0) {
                               var28 = 1;
                            }
 
@@ -1364,9 +1369,9 @@ public final class Sprite extends Rasterizer2D {
 
                   var9 += var10;
                }
-
             }
          }
+
       } else {
          throw new IllegalArgumentException();
       }
@@ -1375,16 +1380,15 @@ public final class Sprite extends Rasterizer2D {
    @ObfuscatedName("d")
    @Export("Sprite_something")
    static void Sprite_something(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-      for(int var8 = -var5; var8 < 0; ++var8) {
+      for (int var8 = -var5; var8 < 0; ++var8) {
          int var9;
-         for(var9 = var3 + var4 - 3; var3 < var9; var0[var3++] = var1[var2++]) {
+         for (var9 = var3 + var4 - 3; var3 < var9; var0[var3++] = var1[var2++]) {
             var0[var3++] = var1[var2++];
             var0[var3++] = var1[var2++];
             var0[var3++] = var1[var2++];
          }
 
-         for(var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) {
-            ;
+         for (var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) {
          }
 
          var3 += var6;
@@ -1399,41 +1403,41 @@ public final class Sprite extends Rasterizer2D {
       int var9 = -(var5 >> 2);
       var5 = -(var5 & 3);
 
-      for(int var10 = -var6; var10 < 0; ++var10) {
+      for (int var10 = -var6; var10 < 0; ++var10) {
          int var11;
-         for(var11 = var9; var11 < 0; ++var11) {
+         for (var11 = var9; var11 < 0; ++var11) {
             var2 = var1[var3++];
-            if(var2 != 0) {
+            if (var2 != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
 
             var2 = var1[var3++];
-            if(var2 != 0) {
+            if (var2 != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
 
             var2 = var1[var3++];
-            if(var2 != 0) {
+            if (var2 != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
 
             var2 = var1[var3++];
-            if(var2 != 0) {
+            if (var2 != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
          }
 
-         for(var11 = var5; var11 < 0; ++var11) {
+         for (var11 = var5; var11 < 0; ++var11) {
             var2 = var1[var3++];
-            if(var2 != 0) {
+            if (var2 != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
@@ -1451,12 +1455,12 @@ public final class Sprite extends Rasterizer2D {
    static void Sprite_somethingElse(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 = var3;
 
-      for(int var13 = -var8; var13 < 0; ++var13) {
+      for (int var13 = -var8; var13 < 0; ++var13) {
          int var14 = var11 * (var4 >> 16);
 
-         for(int var15 = -var7; var15 < 0; ++var15) {
+         for (int var15 = -var7; var15 < 0; ++var15) {
             var2 = var1[(var3 >> 16) + var14];
-            if(var2 != 0) {
+            if (var2 != 0) {
                var0[var5++] = var2;
             } else {
                ++var5;
@@ -1480,10 +1484,10 @@ public final class Sprite extends Rasterizer2D {
       int var13 = (var10 & 65280) * var11 & 16711680;
       var10 = (var12 | var13) >>> 8;
 
-      for(int var14 = -var6; var14 < 0; ++var14) {
-         for(int var15 = -var5; var15 < 0; ++var15) {
+      for (int var14 = -var6; var14 < 0; ++var14) {
+         for (int var15 = -var5; var15 < 0; ++var15) {
             var2 = var1[var3++];
-            if(var2 != 0) {
+            if (var2 != 0) {
                var12 = var9 * (var2 & 16711935) & -16711936;
                var13 = (var2 & 65280) * var9 & 16711680;
                var0[var4++] = var10 + ((var12 | var13) >>> 8);
@@ -1503,10 +1507,10 @@ public final class Sprite extends Rasterizer2D {
    static void Sprite_alpha1(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) {
       int var10 = 256 - var9;
 
-      for(int var11 = -var6; var11 < 0; ++var11) {
-         for(int var12 = -var5; var12 < 0; ++var12) {
+      for (int var11 = -var6; var11 < 0; ++var11) {
+         for (int var12 = -var5; var12 < 0; ++var12) {
             var2 = var1[var3++];
-            if(var2 != 0) {
+            if (var2 != 0) {
                int var13 = var0[var4];
                var0[var4++] = ((var13 & 16711935) * var10 + var9 * (var2 & 16711935) & -16711936) + ((var2 & 65280) * var9 + var10 * (var13 & 65280) & 16711680) >> 8;
             } else {
@@ -1526,12 +1530,12 @@ public final class Sprite extends Rasterizer2D {
       int var13 = 256 - var12;
       int var14 = var3;
 
-      for(int var15 = -var8; var15 < 0; ++var15) {
+      for (int var15 = -var8; var15 < 0; ++var15) {
          int var16 = var11 * (var4 >> 16);
 
-         for(int var17 = -var7; var17 < 0; ++var17) {
+         for (int var17 = -var7; var17 < 0; ++var17) {
             var2 = var1[(var3 >> 16) + var16];
-            if(var2 != 0) {
+            if (var2 != 0) {
                int var18 = var0[var5];
                var0[var5++] = ((var2 & 65280) * var12 + var13 * (var18 & 65280) & 16711680) + ((var18 & 16711935) * var13 + var12 * (var2 & 16711935) & -16711936) >> 8;
             } else {
@@ -1550,10 +1554,10 @@ public final class Sprite extends Rasterizer2D {
 
    @ObfuscatedName("ag")
    static void method6074(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) {
-      for(var8 = -var10; var8 < 0; ++var8) {
-         for(var6 = -var9; var6 < 0; ++var6) {
+      for (var8 = -var10; var8 < 0; ++var8) {
+         for (var6 = -var9; var6 < 0; ++var6) {
             var0 = var4[var5++];
-            if(var0 != 0) {
+            if (var0 != 0) {
                var1 = var3[var7];
                var2 = var0 + var1;
                var0 = (var0 & 16711935) + (var1 & 16711935);
@@ -1572,10 +1576,10 @@ public final class Sprite extends Rasterizer2D {
 
    @ObfuscatedName("aq")
    static void method6075(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) {
-      for(var8 = -var10; var8 < 0; ++var8) {
-         for(var6 = -var9; var6 < 0; ++var6) {
+      for (var8 = -var10; var8 < 0; ++var8) {
+         for (var6 = -var9; var6 < 0; ++var6) {
             var0 = var4[var5++];
-            if(var0 != 0) {
+            if (var0 != 0) {
                var1 = var13 * (var0 & 16711935);
                var0 = (var1 & -16711936) + (var13 * var0 - var1 & 16711680) >>> 8;
                var1 = var3[var7];
@@ -1596,12 +1600,12 @@ public final class Sprite extends Rasterizer2D {
 
    @ObfuscatedName("av")
    static void method6144(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) {
-      for(int var16 = var3; var8 < 0; ++var8) {
+      for (int var16 = var3; var8 < 0; ++var8) {
          var7 = var15 * (var9 >> 16);
 
-         for(var6 = -var12; var6 < 0; ++var6) {
+         for (var6 = -var12; var6 < 0; ++var6) {
             var0 = var4[(var3 >> 16) + var7];
-            if(var0 != 0) {
+            if (var0 != 0) {
                var1 = var5[var10];
                var2 = var0 + var1;
                var0 = (var0 & 16711935) + (var1 & 16711935);
@@ -1623,12 +1627,12 @@ public final class Sprite extends Rasterizer2D {
 
    @ObfuscatedName("ar")
    static void method6078(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) {
-      for(int var17 = var3; var8 < 0; ++var8) {
+      for (int var17 = var3; var8 < 0; ++var8) {
          var7 = var15 * (var9 >> 16);
 
-         for(var6 = -var12; var6 < 0; ++var6) {
+         for (var6 = -var12; var6 < 0; ++var6) {
             var0 = var4[(var3 >> 16) + var7];
-            if(var0 != 0) {
+            if (var0 != 0) {
                var1 = (var0 & 16711935) * var16;
                var0 = (var1 & -16711936) + (var0 * var16 - var1 & 16711680) >>> 8;
                var1 = var5[var10];
diff --git a/runescape-client/src/main/java/SpriteIds.java b/runescape-client/src/main/java/SpriteIds.java
index e0db3df86e..a21e1d23ec 100644
--- a/runescape-client/src/main/java/SpriteIds.java
+++ b/runescape-client/src/main/java/SpriteIds.java
@@ -11,12 +11,12 @@ public class SpriteIds {
    @ObfuscatedGetter(
       intValue = 1673796151
    )
-   public int __m;
+   public int field878;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 159591367
    )
-   public int __f;
+   public int field879;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = -104203005
@@ -73,8 +73,8 @@ public class SpriteIds {
    public int modIcons;
 
    public SpriteIds() {
-      this.__m = -1;
-      this.__f = -1;
+      this.field878 = -1;
+      this.field879 = -1;
       this.mapScenes = -1;
       this.headIconsPk = -1;
       this.headIconsPrayer = -1;
@@ -96,9 +96,9 @@ public class SpriteIds {
       byte[] var2 = var1.takeRecordFlat(class311.field3810.field3809);
       Buffer var3 = new Buffer(var2);
 
-      while(true) {
+      while (true) {
          int var4 = var3.readUnsignedByte();
-         if(var4 == 0) {
+         if (var4 == 0) {
             return;
          }
 
@@ -107,17 +107,17 @@ public class SpriteIds {
             var3.readMedium();
             break;
          case 2:
-            this.__m = var3.__ap_310();
-            this.__f = var3.__ap_310();
-            this.mapScenes = var3.__ap_310();
-            this.headIconsPk = var3.__ap_310();
-            this.headIconsPrayer = var3.__ap_310();
-            this.headIconsHint = var3.__ap_310();
-            this.mapMarkers = var3.__ap_310();
-            this.crosses = var3.__ap_310();
-            this.mapDots = var3.__ap_310();
-            this.scrollBars = var3.__ap_310();
-            this.modIcons = var3.__ap_310();
+            this.field878 = var3.method51();
+            this.field879 = var3.method51();
+            this.mapScenes = var3.method51();
+            this.headIconsPk = var3.method51();
+            this.headIconsPrayer = var3.method51();
+            this.headIconsHint = var3.method51();
+            this.mapMarkers = var3.method51();
+            this.crosses = var3.method51();
+            this.mapDots = var3.method51();
+            this.scrollBars = var3.method51();
+            this.modIcons = var3.method51();
          }
       }
    }
@@ -128,25 +128,25 @@ public class SpriteIds {
       garbageValue = "195396240"
    )
    public static Font method5823(AbstractIndexCache var0, AbstractIndexCache var1, int var2, int var3) {
-      if(!SpriteMask.loadSprite(var0, var2, var3)) {
+      if (!SpriteMask.loadSprite(var0, var2, var3)) {
          return null;
       } else {
-         byte[] var5 = var1.takeRecord(var2, var3);
-         Font var4;
-         if(var5 == null) {
-            var4 = null;
+         byte[] var4 = var1.takeRecord(var2, var3);
+         Font var5;
+         if (var4 == null) {
+            var5 = null;
          } else {
-            Font var6 = new Font(var5, class328.indexedSpriteOffsetXs, class328.indexedSpriteOffsetYs, VarbitDefinition.indexedSpriteWidths, SecureRandomCallable.indexedSpriteHeights, class328.indexedSpritePalette, class328.spritePixels);
+            Font var6 = new Font(var4, class328.indexedSpriteOffsetXs, class328.indexedSpriteOffsetYs, VarbitDefinition.indexedSpriteWidths, SecureRandomCallable.indexedSpriteHeights, class328.indexedSpritePalette, class328.spritePixels);
             class328.indexedSpriteOffsetXs = null;
             class328.indexedSpriteOffsetYs = null;
             VarbitDefinition.indexedSpriteWidths = null;
             SecureRandomCallable.indexedSpriteHeights = null;
             class328.indexedSpritePalette = null;
-            class328.spritePixels = null;
-            var4 = var6;
+            class328.spritePixels = (byte[][])null;
+            var5 = var6;
          }
 
-         return var4;
+         return var5;
       }
    }
 
@@ -156,12 +156,12 @@ public class SpriteIds {
       garbageValue = "58"
    )
    static final void method5828(Actor var0) {
-      int var1 = var0.__bw - Client.cycle;
-      int var2 = var0.__bf * 128 + var0.size * 64;
-      int var3 = var0.__be * 128 + var0.size * 64;
+      int var1 = var0.field19 - Client.cycle;
+      int var2 = var0.field15 * 128 + var0.size * 64;
+      int var3 = var0.field17 * 128 + var0.size * 64;
       var0.x += (var2 - var0.x) / var1;
       var0.y += (var3 - var0.y) / var1;
-      var0.__cq = 0;
-      var0.orientation = var0.__cv;
+      var0.field24 = 0;
+      var0.orientation = var0.field21;
    }
 }
diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java
index abcc91283c..e14649895e 100644
--- a/runescape-client/src/main/java/SpriteMask.java
+++ b/runescape-client/src/main/java/SpriteMask.java
@@ -40,9 +40,9 @@ public class SpriteMask extends DualNode {
    )
    @Export("contains")
    public boolean contains(int var1, int var2) {
-      if(var2 >= 0 && var2 < this.xStarts.length) {
+      if (var2 >= 0 && var2 < this.xStarts.length) {
          int var3 = this.xStarts[var2];
-         if(var1 >= var3 && var1 <= var3 + this.xWidths[var2]) {
+         if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) {
             return true;
          }
       }
@@ -56,13 +56,13 @@ public class SpriteMask extends DualNode {
       garbageValue = "-1301156444"
    )
    static void method4390() {
-      for(ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) {
-         if(var0.stream1 != null) {
+      for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) {
+         if (var0.stream1 != null) {
             TaskHandler.pcmStreamMixer.removeSubStream(var0.stream1);
             var0.stream1 = null;
          }
 
-         if(var0.stream2 != null) {
+         if (var0.stream2 != null) {
             TaskHandler.pcmStreamMixer.removeSubStream(var0.stream2);
             var0.stream2 = null;
          }
@@ -87,7 +87,7 @@ public class SpriteMask extends DualNode {
    )
    static int method4391(int var0) {
       Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
-      return var1 == null?-1:(var1.nextDual == Messages.Messages_queue.sentinel?-1:((Message)var1.nextDual).count);
+      return var1 == null ? -1 : (var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count);
    }
 
    @ObfuscatedName("x")
@@ -98,7 +98,7 @@ public class SpriteMask extends DualNode {
    @Export("loadSprite")
    public static boolean loadSprite(AbstractIndexCache var0, int var1, int var2) {
       byte[] var3 = var0.takeRecord(var1, var2);
-      if(var3 == null) {
+      if (var3 == null) {
          return false;
       } else {
          DevicePcmPlayerProvider.decodeSprite(var3);
diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java
index a0c5f48aac..07e4155771 100644
--- a/runescape-client/src/main/java/Strings.java
+++ b/runescape-client/src/main/java/Strings.java
@@ -7,23 +7,15 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Strings")
 public class Strings {
    @ObfuscatedName("bq")
-   public static String __id_bq;
+   public static String field880;
    @ObfuscatedName("cp")
-   public static String __id_cp;
+   public static String field881;
    @ObfuscatedName("jr")
-   public static String __id_jr;
+   public static String field882;
    @ObfuscatedName("jv")
-   public static String __id_jv;
+   public static String field883;
    @ObfuscatedName("ju")
-   public static String __id_ju;
-
-   static {
-      __id_bq = "Please visit the support page for assistance.";
-      __id_cp = "Please visit the support page for assistance.";
-      __id_jr = "";
-      __id_jv = "Page has opened in a new window.";
-      __id_ju = "(Please check your popup blocker.)";
-   }
+   public static String field884;
 
    @ObfuscatedName("ay")
    @ObfuscatedSignature(
@@ -35,26 +27,36 @@ public class Strings {
       Buffer var1 = new Buffer(var0);
       int var2 = var1.readUnsignedByte();
       int var3 = var1.readInt();
-      if(var3 < 0 || AbstractIndexCache.__ir_s != 0 && var3 > AbstractIndexCache.__ir_s) {
-         throw new RuntimeException();
-      } else if(var2 == 0) {
-         byte[] var4 = new byte[var3];
-         var1.__al_305(var4, 0, var3);
-         return var4;
-      } else {
-         int var6 = var1.readInt();
-         if(var6 < 0 || AbstractIndexCache.__ir_s != 0 && var6 > AbstractIndexCache.__ir_s) {
-            throw new RuntimeException();
+      if (var3 >= 0 && (AbstractIndexCache.field1 == 0 || var3 <= AbstractIndexCache.field1)) {
+         if (var2 == 0) {
+            byte[] var6 = new byte[var3];
+            var1.method46(var6, 0, var3);
+            return var6;
          } else {
-            byte[] var5 = new byte[var6];
-            if(var2 == 1) {
-               Bzip2Decompressor.Bzip2Decompressor_decompress(var5, var6, var0, var3, 9);
+            int var4 = var1.readInt();
+            if (var4 < 0 || AbstractIndexCache.field1 != 0 && var4 > AbstractIndexCache.field1) {
+               throw new RuntimeException();
             } else {
-               AbstractIndexCache.gzipDecompressor.decompress(var1, var5);
-            }
+               byte[] var5 = new byte[var4];
+               if (var2 == 1) {
+                  Bzip2Decompressor.Bzip2Decompressor_decompress(var5, var4, var0, var3, 9);
+               } else {
+                  AbstractIndexCache.gzipDecompressor.decompress(var1, var5);
+               }
 
-            return var5;
+               return var5;
+            }
          }
+      } else {
+         throw new RuntimeException();
       }
    }
+
+   static {
+      field880 = "Please visit the support page for assistance.";
+      field881 = "Please visit the support page for assistance.";
+      field882 = "";
+      field883 = "Page has opened in a new window.";
+      field884 = "(Please check your popup blocker.)";
+   }
 }
diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java
index 898e0a5a9c..6a9c2c932f 100644
--- a/runescape-client/src/main/java/StructDefinition.java
+++ b/runescape-client/src/main/java/StructDefinition.java
@@ -10,12 +10,12 @@ public class StructDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __jq_m;
+   public static AbstractIndexCache field885;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   public static EvictingDualNodeHashTable __jq_f;
+   public static EvictingDualNodeHashTable field886;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Llh;"
@@ -23,10 +23,6 @@ public class StructDefinition extends DualNode {
    @Export("params")
    IterableNodeHashTable params;
 
-   static {
-      __jq_f = new EvictingDualNodeHashTable(64);
-   }
-
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "(B)V",
@@ -43,9 +39,9 @@ public class StructDefinition extends DualNode {
    )
    @Export("read")
    void read(Buffer var1) {
-      while(true) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
@@ -60,7 +56,7 @@ public class StructDefinition extends DualNode {
    )
    @Export("readNext")
    void readNext(Buffer var1, int var2) {
-      if(var2 == 249) {
+      if (var2 == 249) {
          this.params = AbstractIndexCache.readStringIntParameters(var1, this.params);
       }
 
@@ -73,20 +69,20 @@ public class StructDefinition extends DualNode {
    )
    @Export("getIntParam")
    public int getIntParam(int var1, int var2) {
-      IterableNodeHashTable var4 = this.params;
-      int var3;
-      if(var4 == null) {
-         var3 = var2;
+      IterableNodeHashTable var3 = this.params;
+      int var4;
+      if (var3 == null) {
+         var4 = var2;
       } else {
-         IntegerNode var5 = (IntegerNode)var4.get((long)var1);
-         if(var5 == null) {
-            var3 = var2;
+         IntegerNode var5 = (IntegerNode)var3.get((long)var1);
+         if (var5 == null) {
+            var4 = var2;
          } else {
-            var3 = var5.integer;
+            var4 = var5.integer;
          }
       }
 
-      return var3;
+      return var4;
    }
 
    @ObfuscatedName("u")
@@ -105,181 +101,181 @@ public class StructDefinition extends DualNode {
       garbageValue = "2127224103"
    )
    static int method4952(int var0, Script var1, boolean var2) {
-      int var4 = -1;
-      Widget var3;
-      if(var0 >= 2000) {
+      int var3 = -1;
+      Widget var4;
+      if (var0 >= 2000) {
          var0 -= 1000;
-         var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         var3 = Huffman.getWidget(var4);
+         var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         var4 = Huffman.getWidget(var3);
       } else {
-         var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
+         var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
       }
 
-      if(var0 == 1100) {
+      if (var0 == 1100) {
          RouteStrategy.Interpreter_intStackSize -= 2;
-         var3.scrollX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-         if(var3.scrollX > var3.scrollWidth - var3.width) {
-            var3.scrollX = var3.scrollWidth - var3.width;
+         var4.scrollX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+         if (var4.scrollX > var4.scrollWidth - var4.width) {
+            var4.scrollX = var4.scrollWidth - var4.width;
          }
 
-         if(var3.scrollX < 0) {
-            var3.scrollX = 0;
+         if (var4.scrollX < 0) {
+            var4.scrollX = 0;
          }
 
-         var3.scrollY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         if(var3.scrollY > var3.scrollHeight - var3.height) {
-            var3.scrollY = var3.scrollHeight - var3.height;
+         var4.scrollY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+         if (var4.scrollY > var4.scrollHeight - var4.height) {
+            var4.scrollY = var4.scrollHeight - var4.height;
          }
 
-         if(var3.scrollY < 0) {
-            var3.scrollY = 0;
+         if (var4.scrollY < 0) {
+            var4.scrollY = 0;
          }
 
-         class22.method295(var3);
+         class22.method295(var4);
          return 1;
-      } else if(var0 == 1101) {
-         var3.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         class22.method295(var3);
+      } else if (var0 == 1101) {
+         var4.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         class22.method295(var4);
          return 1;
-      } else if(var0 == 1102) {
-         var3.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-         class22.method295(var3);
+      } else if (var0 == 1102) {
+         var4.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+         class22.method295(var4);
          return 1;
-      } else if(var0 == 1103) {
-         var3.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         class22.method295(var3);
+      } else if (var0 == 1103) {
+         var4.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         class22.method295(var4);
          return 1;
-      } else if(var0 == 1104) {
-         var3.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         class22.method295(var3);
+      } else if (var0 == 1104) {
+         var4.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         class22.method295(var4);
          return 1;
-      } else if(var0 == 1105) {
-         var3.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         class22.method295(var3);
+      } else if (var0 == 1105) {
+         var4.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         class22.method295(var4);
          return 1;
-      } else if(var0 == 1106) {
-         var3.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         class22.method295(var3);
+      } else if (var0 == 1106) {
+         var4.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         class22.method295(var4);
          return 1;
-      } else if(var0 == 1107) {
-         var3.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-         class22.method295(var3);
+      } else if (var0 == 1107) {
+         var4.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+         class22.method295(var4);
          return 1;
-      } else if(var0 == 1108) {
-         var3.modelType = 1;
-         var3.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         class22.method295(var3);
+      } else if (var0 == 1108) {
+         var4.modelType = 1;
+         var4.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         class22.method295(var4);
          return 1;
-      } else if(var0 == 1109) {
+      } else if (var0 == 1109) {
          RouteStrategy.Interpreter_intStackSize -= 6;
-         var3.modelOffsetX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-         var3.modelOffsetY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         var3.modelAngleX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-         var3.modelAngleY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
-         var3.modelAngleZ = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4];
-         var3.modelZoom = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 5];
-         class22.method295(var3);
+         var4.modelOffsetX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+         var4.modelOffsetY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+         var4.modelAngleX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+         var4.modelAngleY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
+         var4.modelAngleZ = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4];
+         var4.modelZoom = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 5];
+         class22.method295(var4);
          return 1;
       } else {
-         int var8;
-         if(var0 == 1110) {
-            var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            if(var8 != var3.sequenceId) {
-               var3.sequenceId = var8;
-               var3.modelFrame = 0;
-               var3.modelFrameCycle = 0;
-               class22.method295(var3);
+         int var5;
+         if (var0 == 1110) {
+            var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            if (var5 != var4.sequenceId) {
+               var4.sequenceId = var5;
+               var4.modelFrame = 0;
+               var4.modelFrameCycle = 0;
+               class22.method295(var4);
             }
 
             return 1;
-         } else if(var0 == 1111) {
-            var3.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-            class22.method295(var3);
+         } else if (var0 == 1111) {
+            var4.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+            class22.method295(var4);
             return 1;
-         } else if(var0 == 1112) {
-            String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-            if(!var7.equals(var3.text)) {
-               var3.text = var7;
-               class22.method295(var3);
+         } else if (var0 == 1112) {
+            String var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+            if (!var8.equals(var4.text)) {
+               var4.text = var8;
+               class22.method295(var4);
             }
 
             return 1;
-         } else if(var0 == 1113) {
-            var3.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            class22.method295(var3);
+         } else if (var0 == 1113) {
+            var4.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            class22.method295(var4);
             return 1;
-         } else if(var0 == 1114) {
+         } else if (var0 == 1114) {
             RouteStrategy.Interpreter_intStackSize -= 3;
-            var3.textXAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-            var3.textYAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-            var3.textLineHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-            class22.method295(var3);
+            var4.textXAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+            var4.textYAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+            var4.textLineHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+            class22.method295(var4);
             return 1;
-         } else if(var0 == 1115) {
-            var3.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-            class22.method295(var3);
+         } else if (var0 == 1115) {
+            var4.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+            class22.method295(var4);
             return 1;
-         } else if(var0 == 1116) {
-            var3.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            class22.method295(var3);
+         } else if (var0 == 1116) {
+            var4.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            class22.method295(var4);
             return 1;
-         } else if(var0 == 1117) {
-            var3.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            class22.method295(var3);
+         } else if (var0 == 1117) {
+            var4.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            class22.method295(var4);
             return 1;
-         } else if(var0 == 1118) {
-            var3.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-            class22.method295(var3);
+         } else if (var0 == 1118) {
+            var4.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+            class22.method295(var4);
             return 1;
-         } else if(var0 == 1119) {
-            var3.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-            class22.method295(var3);
+         } else if (var0 == 1119) {
+            var4.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+            class22.method295(var4);
             return 1;
-         } else if(var0 == 1120) {
+         } else if (var0 == 1120) {
             RouteStrategy.Interpreter_intStackSize -= 2;
-            var3.scrollWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-            var3.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-            class22.method295(var3);
-            if(var4 != -1 && var3.type == 0) {
-               class39.revalidateWidgetScroll(Widget.widgets[var4 >> 16], var3, false);
+            var4.scrollWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+            var4.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+            class22.method295(var4);
+            if (var3 != -1 && var4.type == 0) {
+               class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false);
             }
 
             return 1;
-         } else if(var0 == 1121) {
-            TilePaint.method3060(var3.id, var3.childIndex);
-            Client.__client_mo = var3;
-            class22.method295(var3);
+         } else if (var0 == 1121) {
+            TilePaint.method3060(var4.id, var4.childIndex);
+            Client.field127 = var4;
+            class22.method295(var4);
             return 1;
-         } else if(var0 == 1122) {
-            var3.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            class22.method295(var3);
+         } else if (var0 == 1122) {
+            var4.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            class22.method295(var4);
             return 1;
-         } else if(var0 == 1123) {
-            var3.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            class22.method295(var3);
+         } else if (var0 == 1123) {
+            var4.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            class22.method295(var4);
             return 1;
-         } else if(var0 == 1124) {
-            var3.__af = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            class22.method295(var3);
+         } else if (var0 == 1124) {
+            var4.field960 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            class22.method295(var4);
             return 1;
-         } else if(var0 == 1125) {
-            var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            RectangleMode var6 = (RectangleMode)ScriptFrame.findEnumerated(class311.method5822(), var8);
-            if(var6 != null) {
-               var3.rectangleMode = var6;
-               class22.method295(var3);
+         } else if (var0 == 1125) {
+            var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            RectangleMode var7 = (RectangleMode)ScriptFrame.findEnumerated(class311.method5822(), var5);
+            if (var7 != null) {
+               var4.rectangleMode = var7;
+               class22.method295(var4);
             }
 
             return 1;
          } else {
-            boolean var5;
-            if(var0 == 1126) {
-               var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-               var3.__ba = var5;
+            boolean var6;
+            if (var0 == 1126) {
+               var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               var4.field961 = var6;
                return 1;
-            } else if(var0 == 1127) {
-               var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-               var3.__bv = var5;
+            } else if (var0 == 1127) {
+               var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               var4.field964 = var6;
                return 1;
             } else {
                return 2;
@@ -287,4 +283,8 @@ public class StructDefinition extends DualNode {
          }
       }
    }
+
+   static {
+      field886 = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java
index 4e175febd8..8a6694afac 100644
--- a/runescape-client/src/main/java/StudioGame.java
+++ b/runescape-client/src/main/java/StudioGame.java
@@ -11,33 +11,33 @@ public enum StudioGame implements Enumerated {
    @ObfuscatedSignature(
       signature = "Lis;"
    )
-   __is_m("runescape", "RuneScape", 0),
+   field887("runescape", "RuneScape", 0),
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lis;"
    )
-   __is_f("stellardawn", "Stellar Dawn", 1),
+   field888("stellardawn", "Stellar Dawn", 1),
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lis;"
    )
-   __is_q("game3", "Game 3", 2),
+   field889("game3", "Game 3", 2),
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lis;"
    )
-  __is_w("game4", "Game 4", 3),
+   field890("game4", "Game 4", 3),
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Lis;"
    )
-   __is_o("game5", "Game 5", 4),
+   field891("game5", "Game 5", 4),
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Lis;"
    )
-   __is_u("oldscape", "RuneScape 2007", 5);
-   
+   field892("oldscape", "RuneScape 2007", 5);
+
    @ObfuscatedName("g")
    @Export("name")
    public final String name;
@@ -47,8 +47,8 @@ public enum StudioGame implements Enumerated {
    )
    @Export("id")
    final int id;
-   
-   StudioGame(String var3, String var4, int var5) {
+
+   private StudioGame(String var3, String var4, int var5) {
       this.name = var3;
       this.id = var5;
    }
@@ -70,12 +70,12 @@ public enum StudioGame implements Enumerated {
    )
    public static UnderlayDefinition method4550(int var0) {
       UnderlayDefinition var1 = (UnderlayDefinition)UnderlayDefinition.UnderlayDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
          byte[] var2 = UnderlayDefinition.UnderlayDefinition_indexCache.takeRecord(1, var0);
          var1 = new UnderlayDefinition();
-         if(var2 != null) {
+         if (var2 != null) {
             var1.read(new Buffer(var2), var0);
          }
 
diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java
index 0ab109ab03..5a6c3f2bf9 100644
--- a/runescape-client/src/main/java/TaskHandler.java
+++ b/runescape-client/src/main/java/TaskHandler.java
@@ -52,7 +52,6 @@ public class TaskHandler implements Runnable {
          javaVendor = System.getProperty("java.vendor");
          javaVersion = System.getProperty("java.version");
       } catch (Exception var2) {
-         ;
       }
 
       this.isClosed = false;
@@ -77,7 +76,6 @@ public class TaskHandler implements Runnable {
       try {
          this.thread.join();
       } catch (InterruptedException var3) {
-         ;
       }
 
    }
@@ -94,7 +92,7 @@ public class TaskHandler implements Runnable {
       var5.intArgument = var2;
       var5.objectArgument = var4;
       synchronized(this) {
-         if(this.task0 != null) {
+         if (this.task0 != null) {
             this.task0.next = var5;
             this.task0 = var5;
          } else {
@@ -129,18 +127,18 @@ public class TaskHandler implements Runnable {
    @Export("run")
    @ObfuscatedName("run")
    public final void run() {
-      while(true) {
+      while (true) {
          Task var1;
          synchronized(this) {
-            while(true) {
-               if(this.isClosed) {
+            while (true) {
+               if (this.isClosed) {
                   return;
                }
 
-               if(this.current != null) {
+               if (this.current != null) {
                   var1 = this.current;
                   this.current = this.current.next;
-                  if(this.current == null) {
+                  if (this.current == null) {
                      this.task0 = null;
                   }
                   break;
@@ -148,30 +146,29 @@ public class TaskHandler implements Runnable {
 
                try {
                   this.wait();
-               } catch (InterruptedException var8) {
-                  ;
+               } catch (InterruptedException var7) {
                }
             }
          }
 
          try {
-            int var5 = var1.type;
-            if(var5 == 1) {
+            int var2 = var1.type;
+            if (var2 == 1) {
                var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument);
-            } else if(var5 == 2) {
+            } else if (var2 == 2) {
                Thread var3 = new Thread((Runnable)var1.objectArgument);
                var3.setDaemon(true);
                var3.start();
                var3.setPriority(var1.intArgument);
                var1.result = var3;
-            } else if(var5 == 4) {
+            } else if (var2 == 4) {
                var1.result = new DataInputStream(((URL)var1.objectArgument).openStream());
             }
 
             var1.status = 1;
-         } catch (ThreadDeath var6) {
-            throw var6;
-         } catch (Throwable var7) {
+         } catch (ThreadDeath var5) {
+            throw var5;
+         } catch (Throwable var6) {
             var1.status = 2;
          }
       }
diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java
index b17f92e690..cc4f89e197 100644
--- a/runescape-client/src/main/java/Texture.java
+++ b/runescape-client/src/main/java/Texture.java
@@ -13,16 +13,16 @@ public class Texture extends Node {
    @Export("int1")
    int int1;
    @ObfuscatedName("u")
-   boolean __u;
+   boolean field893;
    @ObfuscatedName("g")
    @Export("records")
    int[] records;
    @ObfuscatedName("l")
-   int[] __l;
+   int[] field894;
    @ObfuscatedName("e")
-   int[] __e;
+   int[] field895;
    @ObfuscatedName("x")
-   int[] __x;
+   int[] field896;
    @ObfuscatedName("d")
    @Export("animationDirection")
    int animationDirection;
@@ -41,37 +41,37 @@ public class Texture extends Node {
    )
    Texture(Buffer var1) {
       this.isLoaded = false;
-      this.int1 = var1.__ag_302();
-      this.__u = var1.readUnsignedByte() == 1;
+      this.int1 = var1.method43();
+      this.field893 = var1.readUnsignedByte() == 1;
       int var2 = var1.readUnsignedByte();
-      if(var2 >= 1 && var2 <= 4) {
+      if (var2 >= 1 && var2 <= 4) {
          this.records = new int[var2];
 
          int var3;
-         for(var3 = 0; var3 < var2; ++var3) {
-            this.records[var3] = var1.__ag_302();
+         for (var3 = 0; var3 < var2; ++var3) {
+            this.records[var3] = var1.method43();
          }
 
-         if(var2 > 1) {
-            this.__l = new int[var2 - 1];
+         if (var2 > 1) {
+            this.field894 = new int[var2 - 1];
 
-            for(var3 = 0; var3 < var2 - 1; ++var3) {
-               this.__l[var3] = var1.readUnsignedByte();
+            for (var3 = 0; var3 < var2 - 1; ++var3) {
+               this.field894[var3] = var1.readUnsignedByte();
             }
          }
 
-         if(var2 > 1) {
-            this.__e = new int[var2 - 1];
+         if (var2 > 1) {
+            this.field895 = new int[var2 - 1];
 
-            for(var3 = 0; var3 < var2 - 1; ++var3) {
-               this.__e[var3] = var1.readUnsignedByte();
+            for (var3 = 0; var3 < var2 - 1; ++var3) {
+               this.field895[var3] = var1.readUnsignedByte();
             }
          }
 
-         this.__x = new int[var2];
+         this.field896 = new int[var2];
 
-         for(var3 = 0; var3 < var2; ++var3) {
-            this.__x[var3] = var1.readInt();
+         for (var3 = 0; var3 < var2; ++var3) {
+            this.field896[var3] = var1.readInt();
          }
 
          this.animationDirection = var1.readUnsignedByte();
@@ -86,10 +86,10 @@ public class Texture extends Node {
    @ObfuscatedSignature(
       signature = "(DILir;)Z"
    )
-   boolean __m_230(double var1, int var3, AbstractIndexCache var4) {
+   boolean method320(double var1, int var3, AbstractIndexCache var4) {
       int var5;
-      for(var5 = 0; var5 < this.records.length; ++var5) {
-         if(var4.getRecordFlat(this.records[var5]) == null) {
+      for (var5 = 0; var5 < this.records.length; ++var5) {
+         if (var4.getRecordFlat(this.records[var5]) == null) {
             return false;
          }
       }
@@ -97,85 +97,80 @@ public class Texture extends Node {
       var5 = var3 * var3;
       this.pixels = new int[var5];
 
-      for(int var6 = 0; var6 < this.records.length; ++var6) {
+      for (int var6 = 0; var6 < this.records.length; ++var6) {
          IndexedSprite var7 = class83.method2028(var4, this.records[var6]);
          var7.normalize();
          byte[] var8 = var7.pixels;
          int[] var9 = var7.palette;
-         int var10 = this.__x[var6];
-         if((var10 & -16777216) == 16777216) {
-            ;
+         int var10 = this.field896[var6];
+         if ((var10 & -16777216) == 16777216) {
          }
 
-         if((var10 & -16777216) == 33554432) {
-            ;
+         if ((var10 & -16777216) == 33554432) {
          }
 
          int var11;
          int var12;
          int var13;
          int var14;
-         if((var10 & -16777216) == 50331648) {
+         if ((var10 & -16777216) == 50331648) {
             var11 = var10 & 16711935;
             var12 = var10 >> 8 & 255;
 
-            for(var13 = 0; var13 < var9.length; ++var13) {
+            for (var13 = 0; var13 < var9.length; ++var13) {
                var14 = var9[var13];
-               if(var14 >> 8 == (var14 & 65535)) {
+               if (var14 >> 8 == (var14 & 65535)) {
                   var14 &= 255;
                   var9[var13] = var11 * var14 >> 8 & 16711935 | var12 * var14 & 65280;
                }
             }
          }
 
-         for(var11 = 0; var11 < var9.length; ++var11) {
+         for (var11 = 0; var11 < var9.length; ++var11) {
             var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1);
          }
 
-         if(var6 == 0) {
+         if (var6 == 0) {
             var11 = 0;
          } else {
-            var11 = this.__l[var6 - 1];
+            var11 = this.field894[var6 - 1];
          }
 
-         if(var11 == 0) {
-            if(var3 == var7.subWidth) {
-               for(var12 = 0; var12 < var5; ++var12) {
+         if (var11 == 0) {
+            if (var3 == var7.subWidth) {
+               for (var12 = 0; var12 < var5; ++var12) {
                   this.pixels[var12] = var9[var8[var12] & 255];
                }
-            } else if(var7.subWidth == 64 && var3 == 128) {
+            } else if (var7.subWidth == 64 && var3 == 128) {
                var12 = 0;
 
-               for(var13 = 0; var13 < var3; ++var13) {
-                  for(var14 = 0; var14 < var3; ++var14) {
+               for (var13 = 0; var13 < var3; ++var13) {
+                  for (var14 = 0; var14 < var3; ++var14) {
                      this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255];
                   }
                }
             } else {
-               if(var7.subWidth != 128 || var3 != 64) {
+               if (var7.subWidth != 128 || var3 != 64) {
                   throw new RuntimeException();
                }
 
                var12 = 0;
 
-               for(var13 = 0; var13 < var3; ++var13) {
-                  for(var14 = 0; var14 < var3; ++var14) {
+               for (var13 = 0; var13 < var3; ++var13) {
+                  for (var14 = 0; var14 < var3; ++var14) {
                      this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255];
                   }
                }
             }
          }
 
-         if(var11 == 1) {
-            ;
+         if (var11 == 1) {
          }
 
-         if(var11 == 2) {
-            ;
+         if (var11 == 2) {
          }
 
-         if(var11 == 3) {
-            ;
+         if (var11 == 3) {
          }
       }
 
@@ -191,20 +186,20 @@ public class Texture extends Node {
    @ObfuscatedName("q")
    @Export("Texture_animate")
    void Texture_animate(int var1) {
-      if(this.pixels != null) {
+      if (this.pixels != null) {
          short var2;
          int var3;
          int var4;
          int var5;
          int var6;
          int var7;
-         int[] var10;
-         if(this.animationDirection == 1 || this.animationDirection == 3) {
-            if(Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) {
+         int[] var8;
+         if (this.animationDirection == 1 || this.animationDirection == 3) {
+            if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) {
                Texture_animatedPixels = new int[this.pixels.length];
             }
 
-            if(this.pixels.length == 4096) {
+            if (this.pixels.length == 4096) {
                var2 = 64;
             } else {
                var2 = 128;
@@ -213,26 +208,26 @@ public class Texture extends Node {
             var3 = this.pixels.length;
             var4 = var2 * this.animationSpeed * var1;
             var5 = var3 - 1;
-            if(this.animationDirection == 1) {
+            if (this.animationDirection == 1) {
                var4 = -var4;
             }
 
-            for(var6 = 0; var6 < var3; ++var6) {
+            for (var6 = 0; var6 < var3; ++var6) {
                var7 = var6 + var4 & var5;
                Texture_animatedPixels[var6] = this.pixels[var7];
             }
 
-            var10 = this.pixels;
+            var8 = this.pixels;
             this.pixels = Texture_animatedPixels;
-            Texture_animatedPixels = var10;
+            Texture_animatedPixels = var8;
          }
 
-         if(this.animationDirection == 2 || this.animationDirection == 4) {
-            if(Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) {
+         if (this.animationDirection == 2 || this.animationDirection == 4) {
+            if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) {
                Texture_animatedPixels = new int[this.pixels.length];
             }
 
-            if(this.pixels.length == 4096) {
+            if (this.pixels.length == 4096) {
                var2 = 64;
             } else {
                var2 = 128;
@@ -241,23 +236,23 @@ public class Texture extends Node {
             var3 = this.pixels.length;
             var4 = this.animationSpeed * var1;
             var5 = var2 - 1;
-            if(this.animationDirection == 2) {
+            if (this.animationDirection == 2) {
                var4 = -var4;
             }
 
-            for(var6 = 0; var6 < var3; var6 += var2) {
-               for(var7 = 0; var7 < var2; ++var7) {
-                  int var8 = var6 + var7;
-                  int var9 = var6 + (var7 + var4 & var5);
-                  Texture_animatedPixels[var8] = this.pixels[var9];
+            for (var6 = 0; var6 < var3; var6 += var2) {
+               for (var7 = 0; var7 < var2; ++var7) {
+                  int var9 = var6 + var7;
+                  int var10 = var6 + (var7 + var4 & var5);
+                  Texture_animatedPixels[var9] = this.pixels[var10];
                }
             }
 
-            var10 = this.pixels;
+            var8 = this.pixels;
             this.pixels = Texture_animatedPixels;
-            Texture_animatedPixels = var10;
+            Texture_animatedPixels = var8;
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java
index 7656d33409..ef97959b05 100644
--- a/runescape-client/src/main/java/TextureLoader.java
+++ b/runescape-client/src/main/java/TextureLoader.java
@@ -19,14 +19,14 @@ public interface TextureLoader {
       signature = "(II)I",
       garbageValue = "-1641984961"
    )
-   int __w_213(int var1);
+   int vmethod324(int var1);
 
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "(IB)Z",
       garbageValue = "14"
    )
-   boolean __o_214(int var1);
+   boolean vmethod325(int var1);
 
    @ObfuscatedName("u")
    @ObfuscatedSignature(
diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java
index da771e9d17..347ad0ba62 100644
--- a/runescape-client/src/main/java/TextureProvider.java
+++ b/runescape-client/src/main/java/TextureProvider.java
@@ -66,11 +66,11 @@ public class TextureProvider implements TextureLoader {
       this.remaining = this.capacity;
       this.brightness0 = var4;
       this.textureSize = var6;
-      int[] var7 = var1.__j_395(0);
+      int[] var7 = var1.method3(0);
       int var8 = var7.length;
-      this.textures = new Texture[var1.__s_396(0)];
+      this.textures = new Texture[var1.method4(0)];
 
-      for(int var9 = 0; var9 < var8; ++var9) {
+      for (int var9 = 0; var9 < var8; ++var9) {
          Buffer var10 = new Buffer(var1.takeRecord(0, var7[var9]));
          this.textures[var7[var9]] = new Texture(var10);
       }
@@ -82,27 +82,27 @@ public class TextureProvider implements TextureLoader {
       signature = "(I)I",
       garbageValue = "-1996487053"
    )
-   public int __m_212() {
+   public int method323() {
       int var1 = 0;
       int var2 = 0;
       Texture[] var3 = this.textures;
 
-      for(int var4 = 0; var4 < var3.length; ++var4) {
+      for (int var4 = 0; var4 < var3.length; ++var4) {
          Texture var5 = var3[var4];
-         if(var5 != null && var5.records != null) {
+         if (var5 != null && var5.records != null) {
             var1 += var5.records.length;
             int[] var6 = var5.records;
 
-            for(int var7 = 0; var7 < var6.length; ++var7) {
+            for (int var7 = 0; var7 < var6.length; ++var7) {
                int var8 = var6[var7];
-               if(this.indexCache.__u_393(var8)) {
+               if (this.indexCache.method1(var8)) {
                   ++var2;
                }
             }
          }
       }
 
-      if(var1 == 0) {
+      if (var1 == 0) {
          return 0;
       } else {
          return var2 * 100 / var1;
@@ -124,16 +124,16 @@ public class TextureProvider implements TextureLoader {
    @Export("load")
    public int[] load(int var1) {
       Texture var2 = this.textures[var1];
-      if(var2 != null) {
-         if(var2.pixels != null) {
+      if (var2 != null) {
+         if (var2.pixels != null) {
             this.deque.addLast(var2);
             var2.isLoaded = true;
             return var2.pixels;
          }
 
-         boolean var3 = var2.__m_230(this.brightness0, this.textureSize, this.indexCache);
-         if(var3) {
-            if(this.remaining == 0) {
+         boolean var3 = var2.method320(this.brightness0, this.textureSize, this.indexCache);
+         if (var3) {
+            if (this.remaining == 0) {
                Texture var4 = (Texture)this.deque.removeFirst();
                var4.reset();
             } else {
@@ -154,8 +154,8 @@ public class TextureProvider implements TextureLoader {
       signature = "(II)I",
       garbageValue = "-1641984961"
    )
-   public int __w_213(int var1) {
-      return this.textures[var1] != null?this.textures[var1].int1:0;
+   public int vmethod324(int var1) {
+      return this.textures[var1] != null ? this.textures[var1].int1 : 0;
    }
 
    @ObfuscatedName("o")
@@ -163,8 +163,8 @@ public class TextureProvider implements TextureLoader {
       signature = "(IB)Z",
       garbageValue = "14"
    )
-   public boolean __o_214(int var1) {
-      return this.textures[var1].__u;
+   public boolean vmethod325(int var1) {
+      return this.textures[var1].field893;
    }
 
    @ObfuscatedName("u")
@@ -184,8 +184,8 @@ public class TextureProvider implements TextureLoader {
    )
    @Export("clear")
    public void clear() {
-      for(int var1 = 0; var1 < this.textures.length; ++var1) {
-         if(this.textures[var1] != null) {
+      for (int var1 = 0; var1 < this.textures.length; ++var1) {
+         if (this.textures[var1] != null) {
             this.textures[var1].reset();
          }
       }
@@ -201,9 +201,9 @@ public class TextureProvider implements TextureLoader {
    )
    @Export("animate")
    public void animate(int var1) {
-      for(int var2 = 0; var2 < this.textures.length; ++var2) {
+      for (int var2 = 0; var2 < this.textures.length; ++var2) {
          Texture var3 = this.textures[var2];
-         if(var3 != null && var3.animationDirection != 0 && var3.isLoaded) {
+         if (var3 != null && var3.animationDirection != 0 && var3.isLoaded) {
             var3.Texture_animate(var1);
             var3.isLoaded = false;
          }
@@ -220,7 +220,7 @@ public class TextureProvider implements TextureLoader {
       int var2 = var0.index;
       byte[] var3 = class230.method4516(var1);
       var0.writeSmartByteShort(var3.length);
-      var0.index += class303.huffman.__m_293(var3, 0, var3.length, var0.array, var0.index);
+      var0.index += class303.huffman.method127(var3, 0, var3.length, var0.array, var0.index);
       return var0.index - var2;
    }
 
@@ -231,19 +231,19 @@ public class TextureProvider implements TextureLoader {
    )
    @Export("byteArrayFromObject")
    public static byte[] byteArrayFromObject(Object var0, boolean var1) {
-      if(var0 == null) {
+      if (var0 == null) {
          return null;
-      } else if(var0 instanceof byte[]) {
-         byte[] var6 = (byte[])((byte[])var0);
-         if(var1) {
-            int var4 = var6.length;
-            byte[] var5 = new byte[var4];
-            System.arraycopy(var6, 0, var5, 0, var4);
-            return var5;
+      } else if (var0 instanceof byte[]) {
+         byte[] var5 = (byte[])((byte[])((byte[])var0));
+         if (var1) {
+            int var3 = var5.length;
+            byte[] var4 = new byte[var3];
+            System.arraycopy(var5, 0, var4, 0, var3);
+            return var4;
          } else {
-            return var6;
+            return var5;
          }
-      } else if(var0 instanceof AbstractByteArrayCopier) {
+      } else if (var0 instanceof AbstractByteArrayCopier) {
          AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0;
          return var2.get();
       } else {
@@ -261,10 +261,10 @@ public class TextureProvider implements TextureLoader {
       Buffer var4 = new Buffer(var0);
       int var5 = -1;
 
-      label69:
-      while(true) {
-         int var6 = var4.__at_308();
-         if(var6 == 0) {
+      label71:
+      while (true) {
+         int var6 = var4.method49();
+         if (var6 == 0) {
             return var3;
          }
 
@@ -272,39 +272,51 @@ public class TextureProvider implements TextureLoader {
          int var7 = 0;
          boolean var8 = false;
 
-         while(true) {
-            int var9;
-            while(!var8) {
-               var9 = var4.__ae_307();
-               if(var9 == 0) {
-                  continue label69;
-               }
+         while (true) {
+            int var12;
+            ObjectDefinition var15;
+            do {
+               int var13;
+               int var14;
+               do {
+                  do {
+                     do {
+                        do {
+                           int var9;
+                           while (var8) {
+                              var9 = var4.method48();
+                              if (var9 == 0) {
+                                 continue label71;
+                              }
 
-               var7 += var9 - 1;
-               int var10 = var7 & 63;
-               int var11 = var7 >> 6 & 63;
-               int var12 = var4.readUnsignedByte() >> 2;
-               int var13 = var11 + var1;
-               int var14 = var10 + var2;
-               if(var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) {
-                  ObjectDefinition var15 = class50.getObjectDefinition(var5);
-                  if(var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) {
-                     if(!var15.__g_422()) {
-                        ++Client.__client_fk;
-                        var3 = false;
-                     }
+                              var4.readUnsignedByte();
+                           }
 
-                     var8 = true;
-                  }
-               }
+                           var9 = var4.method48();
+                           if (var9 == 0) {
+                              continue label71;
+                           }
+
+                           var7 += var9 - 1;
+                           int var10 = var7 & 63;
+                           int var11 = var7 >> 6 & 63;
+                           var12 = var4.readUnsignedByte() >> 2;
+                           var13 = var11 + var1;
+                           var14 = var10 + var2;
+                        } while(var13 <= 0);
+                     } while(var14 <= 0);
+                  } while(var13 >= 103);
+               } while(var14 >= 103);
+
+               var15 = class50.getObjectDefinition(var5);
+            } while(var12 == 22 && Client.isLowDetail && var15.int1 == 0 && var15.interactType != 1 && !var15.boolean2);
+
+            if (!var15.method231()) {
+               ++Client.field179;
+               var3 = false;
             }
 
-            var9 = var4.__ae_307();
-            if(var9 == 0) {
-               break;
-            }
-
-            var4.readUnsignedByte();
+            var8 = true;
          }
       }
    }
@@ -317,93 +329,93 @@ public class TextureProvider implements TextureLoader {
    static int method2752(int var0, Script var1, boolean var2) {
       int var3;
       int var4;
-      if(var0 == 4000) {
+      if (var0 == 4000) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + var4;
          return 1;
-      } else if(var0 == 4001) {
+      } else if (var0 == 4001) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 - var4;
          return 1;
-      } else if(var0 == 4002) {
+      } else if (var0 == 4002) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 * var3;
          return 1;
-      } else if(var0 == 4003) {
+      } else if (var0 == 4003) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 / var4;
          return 1;
-      } else if(var0 == 4004) {
+      } else if (var0 == 4004) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3);
          return 1;
-      } else if(var0 == 4005) {
+      } else if (var0 == 4005) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1));
          return 1;
-      } else if(var0 == 4006) {
+      } else if (var0 == 4006) {
          RouteStrategy.Interpreter_intStackSize -= 5;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         int var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+         int var11 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
          int var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
-         int var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4];
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5);
+         int var12 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4];
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + (var12 - var11) * (var4 - var3) / (var6 - var11);
          return 1;
-      } else if(var0 == 4007) {
+      } else if (var0 == 4007) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100;
          return 1;
-      } else if(var0 == 4008) {
+      } else if (var0 == 4008) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 | 1 << var4;
          return 1;
-      } else if(var0 == 4009) {
+      } else if (var0 == 4009) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4);
          return 1;
-      } else if(var0 == 4010) {
+      } else if (var0 == 4010) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0?1:0;
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0;
          return 1;
-      } else if(var0 == 4011) {
+      } else if (var0 == 4011) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 % var4;
          return 1;
-      } else if(var0 == 4012) {
+      } else if (var0 == 4012) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         if(var3 == 0) {
+         if (var3 == 0) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
          } else {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4);
          }
 
          return 1;
-      } else if(var0 == 4013) {
+      } else if (var0 == 4013) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         if(var3 == 0) {
+         if (var3 == 0) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
             return 1;
          } else {
@@ -429,24 +441,24 @@ public class TextureProvider implements TextureLoader {
 
             return 1;
          }
-      } else if(var0 == 4014) {
+      } else if (var0 == 4014) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & var4;
          return 1;
-      } else if(var0 == 4015) {
+      } else if (var0 == 4015) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 | var4;
          return 1;
-      } else if(var0 == 4018) {
+      } else if (var0 == 4018) {
          RouteStrategy.Interpreter_intStackSize -= 3;
-         long var9 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-         long var11 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         long var13 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11);
+         long var5 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+         long var7 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+         long var9 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(var9 * var5 / var7);
          return 1;
       } else {
          return 2;
@@ -463,14 +475,14 @@ public class TextureProvider implements TextureLoader {
       FontName.method5641();
       class65.scene.clear();
 
-      for(int var0 = 0; var0 < 4; ++var0) {
+      for (int var0 = 0; var0 < 4; ++var0) {
          Client.collisionMaps[var0].clear();
       }
 
       System.gc();
       AbstractSocket.method3488(2);
-      Client.__client_qy = -1;
-      Client.__client_qq = false;
+      Client.field112 = -1;
+      Client.field107 = false;
       SpriteMask.method4390();
       GameShell.updateGameState(10);
    }
diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java
index 8a2336572e..679acac7ce 100644
--- a/runescape-client/src/main/java/Tile.java
+++ b/runescape-client/src/main/java/Tile.java
@@ -113,17 +113,17 @@ public final class Tile extends Node {
    @ObfuscatedGetter(
       intValue = 1724493981
    )
-   int __y;
+   int field897;
    @ObfuscatedName("h")
    @ObfuscatedGetter(
       intValue = -172066661
    )
-   int __h;
+   int field898;
    @ObfuscatedName("b")
    @ObfuscatedGetter(
       intValue = 2030010491
    )
-   int __b;
+   int field899;
    @ObfuscatedName("c")
    @ObfuscatedSignature(
       signature = "Ldj;"
@@ -155,132 +155,129 @@ public final class Tile extends Node {
       garbageValue = "117"
    )
    @Export("addNpcToMenu")
-   static final void addNpcToMenu(NpcDefinition var0, int var1, int var2, int var3) {
-      if(Client.menuOptionsCount < 400) {
-         if(var0.transforms != null) {
+   static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) {
+      if (Client.menuOptionsCount < 400) {
+         if (var0.transforms != null) {
             var0 = var0.transform();
          }
 
-         if(var0 != null) {
-            if(var0.isInteractable) {
-               if(!var0.isFollower || Client.followerIndex == var1) {
-                  String var4 = var0.name;
-                  int var7;
-                  int var8;
-                  if(var0.combatLevel != 0) {
-                     var7 = var0.combatLevel;
-                     var8 = Canvas.localPlayer.combatLevel;
-                     int var9 = var8 - var7;
-                     String var6;
-                     if(var9 < -9) {
-                        var6 = BufferedFile.colorStartTag(16711680);
-                     } else if(var9 < -6) {
-                        var6 = BufferedFile.colorStartTag(16723968);
-                     } else if(var9 < -3) {
-                        var6 = BufferedFile.colorStartTag(16740352);
-                     } else if(var9 < 0) {
-                        var6 = BufferedFile.colorStartTag(16756736);
-                     } else if(var9 > 9) {
-                        var6 = BufferedFile.colorStartTag(65280);
-                     } else if(var9 > 6) {
-                        var6 = BufferedFile.colorStartTag(4259584);
-                     } else if(var9 > 3) {
-                        var6 = BufferedFile.colorStartTag(8453888);
-                     } else if(var9 > 0) {
-                        var6 = BufferedFile.colorStartTag(12648192);
-                     } else {
-                        var6 = BufferedFile.colorStartTag(16776960);
+         if (var0 != null && var0.isInteractable && (!var0.isFollower || Client.followerIndex == var1)) {
+            String var4 = var0.name;
+            int var5;
+            int var6;
+            int var7;
+            if (var0.combatLevel != 0) {
+               var5 = var0.combatLevel;
+               var6 = Canvas.localPlayer.combatLevel;
+               var7 = var6 - var5;
+               String var8;
+               if (var7 < -9) {
+                  var8 = BufferedFile.colorStartTag(16711680);
+               } else if (var7 < -6) {
+                  var8 = BufferedFile.colorStartTag(16723968);
+               } else if (var7 < -3) {
+                  var8 = BufferedFile.colorStartTag(16740352);
+               } else if (var7 < 0) {
+                  var8 = BufferedFile.colorStartTag(16756736);
+               } else if (var7 > 9) {
+                  var8 = BufferedFile.colorStartTag(65280);
+               } else if (var7 > 6) {
+                  var8 = BufferedFile.colorStartTag(4259584);
+               } else if (var7 > 3) {
+                  var8 = BufferedFile.colorStartTag(8453888);
+               } else if (var7 > 0) {
+                  var8 = BufferedFile.colorStartTag(12648192);
+               } else {
+                  var8 = BufferedFile.colorStartTag(16776960);
+               }
+
+               var4 = var4 + var8 + "  (level-" + var0.combatLevel + ")";
+            }
+
+            if (var0.isFollower && Client.followerOpsLowPriority) {
+               Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
+            }
+
+            if (Client.isItemSelected == 1) {
+               Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 7, var1, var2, var3);
+            } else if (Client.isSpellSelected) {
+               if ((FloorDecoration.selectedSpellFlags & 2) == 2) {
+                  Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 8, var1, var2, var3);
+               }
+            } else {
+               var7 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0;
+               String[] var10 = var0.actions;
+               if (var10 != null) {
+                  for (var5 = 4; var5 >= 0; --var5) {
+                     if (var10[var5] != null && !var10[var5].equalsIgnoreCase("Attack")) {
+                        var6 = 0;
+                        if (var5 == 0) {
+                           var6 = var7 + 9;
+                        }
+
+                        if (var5 == 1) {
+                           var6 = var7 + 10;
+                        }
+
+                        if (var5 == 2) {
+                           var6 = var7 + 11;
+                        }
+
+                        if (var5 == 3) {
+                           var6 = var7 + 12;
+                        }
+
+                        if (var5 == 4) {
+                           var6 = var7 + 13;
+                        }
+
+                        Tiles.insertMenuItemNoShift(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, var1, var2, var3);
                      }
-
-                     var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")";
                   }
+               }
 
-                  if(var0.isFollower && Client.followerOpsLowPriority) {
-                     Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
-                  }
-
-                  if(Client.isItemSelected == 1) {
-                     Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16776960) + var4, 7, var1, var2, var3);
-                  } else if(Client.isSpellSelected) {
-                     if((FloorDecoration.selectedSpellFlags & 2) == 2) {
-                        Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16776960) + var4, 8, var1, var2, var3);
-                     }
-                  } else {
-                     int var10 = var0.isFollower && Client.followerOpsLowPriority?2000:0;
-                     String[] var11 = var0.actions;
-                     if(var11 != null) {
-                        for(var7 = 4; var7 >= 0; --var7) {
-                           if(var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) {
-                              var8 = 0;
-                              if(var7 == 0) {
-                                 var8 = var10 + 9;
-                              }
-
-                              if(var7 == 1) {
-                                 var8 = var10 + 10;
-                              }
-
-                              if(var7 == 2) {
-                                 var8 = var10 + 11;
-                              }
-
-                              if(var7 == 3) {
-                                 var8 = var10 + 12;
-                              }
-
-                              if(var7 == 4) {
-                                 var8 = var10 + 13;
-                              }
-
-                              Tiles.insertMenuItemNoShift(var11[var7], BufferedFile.colorStartTag(16776960) + var4, var8, var1, var2, var3);
+               if (var10 != null) {
+                  for (var5 = 4; var5 >= 0; --var5) {
+                     if (var10[var5] != null && var10[var5].equalsIgnoreCase("Attack")) {
+                        short var9 = 0;
+                        if (AttackOption.AttackOption_hidden != Client.npcAttackOption) {
+                           if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > Canvas.localPlayer.combatLevel) {
+                              var9 = 2000;
                            }
+
+                           var6 = 0;
+                           if (var5 == 0) {
+                              var6 = var9 + 9;
+                           }
+
+                           if (var5 == 1) {
+                              var6 = var9 + 10;
+                           }
+
+                           if (var5 == 2) {
+                              var6 = var9 + 11;
+                           }
+
+                           if (var5 == 3) {
+                              var6 = var9 + 12;
+                           }
+
+                           if (var5 == 4) {
+                              var6 = var9 + 13;
+                           }
+
+                           Tiles.insertMenuItemNoShift(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, var1, var2, var3);
                         }
                      }
-
-                     if(var11 != null) {
-                        for(var7 = 4; var7 >= 0; --var7) {
-                           if(var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) {
-                              short var12 = 0;
-                              if(AttackOption.AttackOption_hidden != Client.npcAttackOption) {
-                                 if(AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > Canvas.localPlayer.combatLevel) {
-                                    var12 = 2000;
-                                 }
-
-                                 var8 = 0;
-                                 if(var7 == 0) {
-                                    var8 = var12 + 9;
-                                 }
-
-                                 if(var7 == 1) {
-                                    var8 = var12 + 10;
-                                 }
-
-                                 if(var7 == 2) {
-                                    var8 = var12 + 11;
-                                 }
-
-                                 if(var7 == 3) {
-                                    var8 = var12 + 12;
-                                 }
-
-                                 if(var7 == 4) {
-                                    var8 = var12 + 13;
-                                 }
-
-                                 Tiles.insertMenuItemNoShift(var11[var7], BufferedFile.colorStartTag(16776960) + var4, var8, var1, var2, var3);
-                              }
-                           }
-                        }
-                     }
-
-                     if(!var0.isFollower || !Client.followerOpsLowPriority) {
-                        Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
-                     }
                   }
+               }
 
+               if (!var0.isFollower || !Client.followerOpsLowPriority) {
+                  Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
                }
             }
          }
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/TileLocation.java b/runescape-client/src/main/java/TileLocation.java
index 35e6007294..20e031a17f 100644
--- a/runescape-client/src/main/java/TileLocation.java
+++ b/runescape-client/src/main/java/TileLocation.java
@@ -42,7 +42,7 @@ public class TileLocation {
    }
 
    public TileLocation(int var1) {
-      if(var1 == -1) {
+      if (var1 == -1) {
          this.plane = -1;
       } else {
          this.plane = var1 >> 28 & 3;
@@ -69,7 +69,7 @@ public class TileLocation {
    )
    @Export("equals0")
    boolean equals0(TileLocation var1) {
-      return this.plane != var1.plane?false:(this.x != var1.x?false:this.y == var1.y);
+      return this.plane != var1.plane ? false : (this.x != var1.x ? false : this.y == var1.y);
    }
 
    @ObfuscatedName("q")
@@ -83,17 +83,17 @@ public class TileLocation {
    }
 
    @ObfuscatedName("equals")
-   public boolean __equals_382(Object var1) {
-      return this == var1?true:(!(var1 instanceof TileLocation)?false:this.equals0((TileLocation)var1));
+   public boolean method326(Object var1) {
+      return this == var1 ? true : (!(var1 instanceof TileLocation) ? false : this.equals0((TileLocation)var1));
    }
 
    @ObfuscatedName("hashCode")
-   public int __hashCode_383() {
+   public int method327() {
       return this.packed();
    }
 
    @ObfuscatedName("toString")
-   public String __toString_384() {
+   public String method328() {
       return this.toString0(",");
    }
 }
diff --git a/runescape-client/src/main/java/TileModel.java b/runescape-client/src/main/java/TileModel.java
index 43694cdb9b..ba633f0b6b 100644
--- a/runescape-client/src/main/java/TileModel.java
+++ b/runescape-client/src/main/java/TileModel.java
@@ -6,19 +6,19 @@ import net.runelite.mapping.ObfuscatedName;
 @Implements("TileModel")
 public final class TileModel {
    @ObfuscatedName("z")
-   static int[] __dv_z;
+   static int[] field900;
    @ObfuscatedName("j")
-   static int[] __dv_j;
+   static int[] field901;
    @ObfuscatedName("s")
-   static int[] __dv_s;
+   static int[] field902;
    @ObfuscatedName("t")
-   static int[] __dv_t;
+   static int[] field903;
    @ObfuscatedName("y")
-   static int[] __dv_y;
+   static int[] field904;
    @ObfuscatedName("h")
-   static final int[][] __dv_h;
+   static final int[][] field905;
    @ObfuscatedName("b")
-   static final int[][] __dv_b;
+   static final int[][] field906;
    @ObfuscatedName("m")
    @Export("vertexX")
    int[] vertexX;
@@ -65,19 +65,9 @@ public final class TileModel {
    @Export("overlayRgb")
    int overlayRgb;
 
-   static {
-      __dv_z = new int[6];
-      __dv_j = new int[6];
-      __dv_s = new int[6];
-      __dv_t = new int[6];
-      __dv_y = new int[6];
-      __dv_h = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}};
-      __dv_b = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}};
-   }
-
    TileModel(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) {
       this.isFlat = true;
-      if(var7 != var6 || var8 != var6 || var9 != var6) {
+      if (var7 != var6 || var8 != var6 || var9 != var6) {
          this.isFlat = false;
       }
 
@@ -89,7 +79,7 @@ public final class TileModel {
       int var21 = var20 / 2;
       int var22 = var20 / 4;
       int var23 = var20 * 3 / 4;
-      int[] var24 = __dv_h[var1];
+      int[] var24 = field905[var1];
       int var25 = var24.length;
       this.vertexX = new int[var25];
       this.vertexY = new int[var25];
@@ -99,210 +89,220 @@ public final class TileModel {
       int var28 = var20 * var4;
       int var29 = var5 * var20;
 
+      int var30;
       int var31;
       int var32;
       int var33;
       int var34;
       int var35;
-      int var36;
-      for(int var30 = 0; var30 < var25; ++var30) {
-         var31 = var24[var30];
-         if((var31 & 1) == 0 && var31 <= 8) {
-            var31 = (var31 - var2 - var2 - 1 & 7) + 1;
+      for (int var36 = 0; var36 < var25; ++var36) {
+         var30 = var24[var36];
+         if ((var30 & 1) == 0 && var30 <= 8) {
+            var30 = (var30 - var2 - var2 - 1 & 7) + 1;
          }
 
-         if(var31 > 8 && var31 <= 12) {
-            var31 = (var31 - 9 - var2 & 3) + 9;
+         if (var30 > 8 && var30 <= 12) {
+            var30 = (var30 - 9 - var2 & 3) + 9;
          }
 
-         if(var31 > 12 && var31 <= 16) {
-            var31 = (var31 - 13 - var2 & 3) + 13;
+         if (var30 > 12 && var30 <= 16) {
+            var30 = (var30 - 13 - var2 & 3) + 13;
          }
 
-         if(var31 == 1) {
-            var32 = var28;
-            var33 = var29;
-            var34 = var6;
-            var35 = var10;
-            var36 = var14;
-         } else if(var31 == 2) {
-            var32 = var28 + var21;
-            var33 = var29;
-            var34 = var7 + var6 >> 1;
-            var35 = var11 + var10 >> 1;
-            var36 = var15 + var14 >> 1;
-         } else if(var31 == 3) {
-            var32 = var28 + var20;
-            var33 = var29;
-            var34 = var7;
-            var35 = var11;
-            var36 = var15;
-         } else if(var31 == 4) {
-            var32 = var28 + var20;
-            var33 = var29 + var21;
-            var34 = var8 + var7 >> 1;
-            var35 = var11 + var12 >> 1;
-            var36 = var15 + var16 >> 1;
-         } else if(var31 == 5) {
-            var32 = var28 + var20;
-            var33 = var29 + var20;
-            var34 = var8;
-            var35 = var12;
-            var36 = var16;
-         } else if(var31 == 6) {
-            var32 = var28 + var21;
-            var33 = var29 + var20;
-            var34 = var8 + var9 >> 1;
-            var35 = var13 + var12 >> 1;
-            var36 = var17 + var16 >> 1;
-         } else if(var31 == 7) {
-            var32 = var28;
-            var33 = var29 + var20;
-            var34 = var9;
-            var35 = var13;
-            var36 = var17;
-         } else if(var31 == 8) {
-            var32 = var28;
-            var33 = var29 + var21;
-            var34 = var9 + var6 >> 1;
-            var35 = var13 + var10 >> 1;
-            var36 = var17 + var14 >> 1;
-         } else if(var31 == 9) {
-            var32 = var28 + var21;
-            var33 = var29 + var22;
-            var34 = var7 + var6 >> 1;
-            var35 = var11 + var10 >> 1;
-            var36 = var15 + var14 >> 1;
-         } else if(var31 == 10) {
-            var32 = var28 + var23;
-            var33 = var29 + var21;
-            var34 = var8 + var7 >> 1;
-            var35 = var11 + var12 >> 1;
-            var36 = var15 + var16 >> 1;
-         } else if(var31 == 11) {
-            var32 = var28 + var21;
-            var33 = var29 + var23;
-            var34 = var8 + var9 >> 1;
-            var35 = var13 + var12 >> 1;
-            var36 = var17 + var16 >> 1;
-         } else if(var31 == 12) {
-            var32 = var28 + var22;
-            var33 = var29 + var21;
-            var34 = var9 + var6 >> 1;
-            var35 = var13 + var10 >> 1;
-            var36 = var17 + var14 >> 1;
-         } else if(var31 == 13) {
-            var32 = var28 + var22;
-            var33 = var29 + var22;
-            var34 = var6;
-            var35 = var10;
-            var36 = var14;
-         } else if(var31 == 14) {
-            var32 = var28 + var23;
-            var33 = var29 + var22;
-            var34 = var7;
-            var35 = var11;
-            var36 = var15;
-         } else if(var31 == 15) {
-            var32 = var28 + var23;
-            var33 = var29 + var23;
-            var34 = var8;
-            var35 = var12;
-            var36 = var16;
+         if (var30 == 1) {
+            var31 = var28;
+            var32 = var29;
+            var33 = var6;
+            var34 = var10;
+            var35 = var14;
+         } else if (var30 == 2) {
+            var31 = var28 + var21;
+            var32 = var29;
+            var33 = var7 + var6 >> 1;
+            var34 = var11 + var10 >> 1;
+            var35 = var15 + var14 >> 1;
+         } else if (var30 == 3) {
+            var31 = var28 + var20;
+            var32 = var29;
+            var33 = var7;
+            var34 = var11;
+            var35 = var15;
+         } else if (var30 == 4) {
+            var31 = var28 + var20;
+            var32 = var29 + var21;
+            var33 = var8 + var7 >> 1;
+            var34 = var11 + var12 >> 1;
+            var35 = var15 + var16 >> 1;
+         } else if (var30 == 5) {
+            var31 = var28 + var20;
+            var32 = var29 + var20;
+            var33 = var8;
+            var34 = var12;
+            var35 = var16;
+         } else if (var30 == 6) {
+            var31 = var28 + var21;
+            var32 = var29 + var20;
+            var33 = var8 + var9 >> 1;
+            var34 = var13 + var12 >> 1;
+            var35 = var17 + var16 >> 1;
+         } else if (var30 == 7) {
+            var31 = var28;
+            var32 = var29 + var20;
+            var33 = var9;
+            var34 = var13;
+            var35 = var17;
+         } else if (var30 == 8) {
+            var31 = var28;
+            var32 = var29 + var21;
+            var33 = var9 + var6 >> 1;
+            var34 = var13 + var10 >> 1;
+            var35 = var17 + var14 >> 1;
+         } else if (var30 == 9) {
+            var31 = var28 + var21;
+            var32 = var29 + var22;
+            var33 = var7 + var6 >> 1;
+            var34 = var11 + var10 >> 1;
+            var35 = var15 + var14 >> 1;
+         } else if (var30 == 10) {
+            var31 = var28 + var23;
+            var32 = var29 + var21;
+            var33 = var8 + var7 >> 1;
+            var34 = var11 + var12 >> 1;
+            var35 = var15 + var16 >> 1;
+         } else if (var30 == 11) {
+            var31 = var28 + var21;
+            var32 = var29 + var23;
+            var33 = var8 + var9 >> 1;
+            var34 = var13 + var12 >> 1;
+            var35 = var17 + var16 >> 1;
+         } else if (var30 == 12) {
+            var31 = var28 + var22;
+            var32 = var29 + var21;
+            var33 = var9 + var6 >> 1;
+            var34 = var13 + var10 >> 1;
+            var35 = var17 + var14 >> 1;
+         } else if (var30 == 13) {
+            var31 = var28 + var22;
+            var32 = var29 + var22;
+            var33 = var6;
+            var34 = var10;
+            var35 = var14;
+         } else if (var30 == 14) {
+            var31 = var28 + var23;
+            var32 = var29 + var22;
+            var33 = var7;
+            var34 = var11;
+            var35 = var15;
+         } else if (var30 == 15) {
+            var31 = var28 + var23;
+            var32 = var29 + var23;
+            var33 = var8;
+            var34 = var12;
+            var35 = var16;
          } else {
-            var32 = var28 + var22;
-            var33 = var29 + var23;
-            var34 = var9;
-            var35 = var13;
-            var36 = var17;
+            var31 = var28 + var22;
+            var32 = var29 + var23;
+            var33 = var9;
+            var34 = var13;
+            var35 = var17;
          }
 
-         this.vertexX[var30] = var32;
-         this.vertexY[var30] = var34;
-         this.vertexZ[var30] = var33;
-         var26[var30] = var35;
-         var27[var30] = var36;
+         this.vertexX[var36] = var31;
+         this.vertexY[var36] = var33;
+         this.vertexZ[var36] = var32;
+         var26[var36] = var34;
+         var27[var36] = var35;
       }
 
-      int[] var38 = __dv_b[var1];
-      var31 = var38.length / 4;
-      this.faceX = new int[var31];
-      this.faceY = new int[var31];
-      this.faceZ = new int[var31];
-      this.triangleColorA = new int[var31];
-      this.triangleColorB = new int[var31];
-      this.triangleColorC = new int[var31];
-      if(var3 != -1) {
-         this.triangleTextureId = new int[var31];
+      int[] var38 = field906[var1];
+      var30 = var38.length / 4;
+      this.faceX = new int[var30];
+      this.faceY = new int[var30];
+      this.faceZ = new int[var30];
+      this.triangleColorA = new int[var30];
+      this.triangleColorB = new int[var30];
+      this.triangleColorC = new int[var30];
+      if (var3 != -1) {
+         this.triangleTextureId = new int[var30];
       }
 
-      var32 = 0;
+      var31 = 0;
 
-      for(var33 = 0; var33 < var31; ++var33) {
-         var34 = var38[var32];
-         var35 = var38[var32 + 1];
-         var36 = var38[var32 + 2];
-         int var37 = var38[var32 + 3];
-         var32 += 4;
-         if(var35 < 4) {
+      for (var32 = 0; var32 < var30; ++var32) {
+         var33 = var38[var31];
+         var34 = var38[var31 + 1];
+         var35 = var38[var31 + 2];
+         int var37 = var38[var31 + 3];
+         var31 += 4;
+         if (var34 < 4) {
+            var34 = var34 - var2 & 3;
+         }
+
+         if (var35 < 4) {
             var35 = var35 - var2 & 3;
          }
 
-         if(var36 < 4) {
-            var36 = var36 - var2 & 3;
-         }
-
-         if(var37 < 4) {
+         if (var37 < 4) {
             var37 = var37 - var2 & 3;
          }
 
-         this.faceX[var33] = var35;
-         this.faceY[var33] = var36;
-         this.faceZ[var33] = var37;
-         if(var34 == 0) {
-            this.triangleColorA[var33] = var26[var35];
-            this.triangleColorB[var33] = var26[var36];
-            this.triangleColorC[var33] = var26[var37];
-            if(this.triangleTextureId != null) {
-               this.triangleTextureId[var33] = -1;
+         this.faceX[var32] = var34;
+         this.faceY[var32] = var35;
+         this.faceZ[var32] = var37;
+         if (var33 == 0) {
+            this.triangleColorA[var32] = var26[var34];
+            this.triangleColorB[var32] = var26[var35];
+            this.triangleColorC[var32] = var26[var37];
+            if (this.triangleTextureId != null) {
+               this.triangleTextureId[var32] = -1;
             }
          } else {
-            this.triangleColorA[var33] = var27[var35];
-            this.triangleColorB[var33] = var27[var36];
-            this.triangleColorC[var33] = var27[var37];
-            if(this.triangleTextureId != null) {
-               this.triangleTextureId[var33] = var3;
+            this.triangleColorA[var32] = var27[var34];
+            this.triangleColorB[var32] = var27[var35];
+            this.triangleColorC[var32] = var27[var37];
+            if (this.triangleTextureId != null) {
+               this.triangleTextureId[var32] = var3;
             }
          }
       }
 
-      var33 = var6;
-      var34 = var7;
-      if(var7 < var6) {
+      var32 = var6;
+      var33 = var7;
+      if (var7 < var6) {
+         var32 = var7;
+      }
+
+      if (var7 > var7) {
          var33 = var7;
       }
 
-      if(var7 > var7) {
-         var34 = var7;
+      if (var8 < var32) {
+         var32 = var8;
       }
 
-      if(var8 < var33) {
+      if (var8 > var33) {
          var33 = var8;
       }
 
-      if(var8 > var34) {
-         var34 = var8;
+      if (var9 < var32) {
+         var32 = var9;
       }
 
-      if(var9 < var33) {
+      if (var9 > var33) {
          var33 = var9;
       }
 
-      if(var9 > var34) {
-         var34 = var9;
-      }
-
+      var32 /= 14;
       var33 /= 14;
-      var34 /= 14;
+   }
+
+   static {
+      field900 = new int[6];
+      field901 = new int[6];
+      field902 = new int[6];
+      field903 = new int[6];
+      field904 = new int[6];
+      field905 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}};
+      field906 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}};
    }
 }
diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java
index e63ed8340a..e42027a483 100644
--- a/runescape-client/src/main/java/TilePaint.java
+++ b/runescape-client/src/main/java/TilePaint.java
@@ -11,7 +11,7 @@ public final class TilePaint {
    @ObfuscatedSignature(
       signature = "Lla;"
    )
-   static Bounds __eb_ah;
+   static Bounds field907;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 181759449
@@ -70,49 +70,50 @@ public final class TilePaint {
    )
    static final void method3061(int var0, int var1) {
       NodeDeque var2 = Client.groundItems[SoundSystem.plane][var0][var1];
-      if(var2 == null) {
+      if (var2 == null) {
          class65.scene.removeGroundItemPile(SoundSystem.plane, var0, var1);
       } else {
          long var3 = -99999999L;
          GroundItem var5 = null;
 
          GroundItem var6;
-         for(var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) {
+         for (var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) {
             ItemDefinition var7 = Skills.getItemDefinition(var6.id);
             long var8 = (long)var7.price;
-            if(var7.isStackable == 1) {
+            if (var7.isStackable == 1) {
                var8 *= (long)(var6.quantity + 1);
             }
 
-            if(var8 > var3) {
+            if (var8 > var3) {
                var3 = var8;
                var5 = var6;
             }
          }
 
-         if(var5 == null) {
+         if (var5 == null) {
             class65.scene.removeGroundItemPile(SoundSystem.plane, var0, var1);
          } else {
             var2.addLast(var5);
-            GroundItem var12 = null;
             GroundItem var11 = null;
+            GroundItem var12 = null;
 
-            for(var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) {
-               if(var5.id != var6.id) {
-                  if(var12 == null) {
-                     var12 = var6;
+            for (var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) {
+               if (var5.id != var6.id) {
+                  if (var11 == null) {
+                     var11 = var6;
                   }
 
-                  if(var12.id != var6.id && var11 == null) {
-                     var11 = var6;
+                  if (var11.id != var6.id && var12 == null) {
+                     var12 = var6;
                   }
                }
             }
 
             long var9 = FontName.method5637(var0, var1, 3, false, 0);
-            class65.scene.newGroundItemPile(SoundSystem.plane, var0, var1, class32.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.plane), var5, var9, var12, var11);
+            class65.scene.newGroundItemPile(SoundSystem.plane, var0, var1, class32.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.plane), var5, var9, var11, var12);
          }
       }
+
    }
 
    @ObfuscatedName("id")
@@ -121,9 +122,9 @@ public final class TilePaint {
       garbageValue = "-2025682764"
    )
    static void method3060(int var0, int var1) {
-      PacketBufferNode var2 = Interpreter.method1915(ClientPacket.__gs_bg, Client.packetWriter.isaacCipher);
+      PacketBufferNode var2 = Interpreter.method1915(ClientPacket.field292, Client.packetWriter.isaacCipher);
       var2.packetBuffer.writeIntLE16(var0);
-      var2.packetBuffer.__bo_322(var1);
-      Client.packetWriter.__q_167(var2);
+      var2.packetBuffer.method63(var1);
+      Client.packetWriter.method241(var2);
    }
 }
diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java
index 2c80cd3d1a..a5bba19237 100644
--- a/runescape-client/src/main/java/Tiles.java
+++ b/runescape-client/src/main/java/Tiles.java
@@ -20,47 +20,33 @@ public final class Tiles {
    @Export("Tiles_minPlane")
    static int Tiles_minPlane;
    @ObfuscatedName("w")
-   static byte[][][] __bq_w;
+   static byte[][][] field908;
    @ObfuscatedName("l")
-   static byte[][][] __bq_l;
+   static byte[][][] field909;
    @ObfuscatedName("a")
-   static int[][][] __bq_a;
+   static int[][][] field910;
    @ObfuscatedName("t")
-   static final int[] __bq_t;
+   static final int[] field911;
    @ObfuscatedName("y")
-   static final int[] __bq_y;
+   static final int[] field912;
    @ObfuscatedName("h")
-   static final int[] __bq_h;
+   static final int[] field913;
    @ObfuscatedName("b")
-   static final int[] __bq_b;
+   static final int[] field914;
    @ObfuscatedName("c")
-   static final int[] __bq_c;
+   static final int[] field915;
    @ObfuscatedName("r")
-   static final int[] __bq_r;
+   static final int[] field916;
    @ObfuscatedName("p")
    @ObfuscatedGetter(
       intValue = -2142579405
    )
-   static int __bq_p;
+   static int field917;
    @ObfuscatedName("v")
    @ObfuscatedGetter(
       intValue = 834543729
    )
-   static int __bq_v;
-
-   static {
-      Tiles_heights = new int[4][105][105];
-      Tiles_renderFlags = new byte[4][104][104];
-      Tiles_minPlane = 99;
-      __bq_t = new int[]{1, 2, 4, 8};
-      __bq_y = new int[]{16, 32, 64, 128};
-      __bq_h = new int[]{1, 0, -1, 0};
-      __bq_b = new int[]{0, -1, 0, 1};
-      __bq_c = new int[]{1, -1, -1, 1};
-      __bq_r = new int[]{-1, -1, 1, 1};
-      __bq_p = (int)(Math.random() * 17.0D) - 8;
-      __bq_v = (int)(Math.random() * 33.0D) - 16;
-   }
+   static int field918;
 
    @ObfuscatedName("aq")
    @ObfuscatedSignature(
@@ -68,7 +54,7 @@ public final class Tiles {
       garbageValue = "1832579963"
    )
    public static final void method1097(int var0, boolean var1, int var2) {
-      if(var0 >= 8000 && var0 <= 48000) {
+      if (var0 >= 8000 && var0 <= 48000) {
          class309.PcmPlayer_sampleRate = var0;
          PcmPlayer.isStereo = var1;
          Login.pcmPlayerCount = var2;
@@ -86,4 +72,18 @@ public final class Tiles {
    public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) {
       class16.insertMenuItem(var0, var1, var2, var3, var4, var5, false);
    }
+
+   static {
+      Tiles_heights = new int[4][105][105];
+      Tiles_renderFlags = new byte[4][104][104];
+      Tiles_minPlane = 99;
+      field911 = new int[]{1, 2, 4, 8};
+      field912 = new int[]{16, 32, 64, 128};
+      field913 = new int[]{1, 0, -1, 0};
+      field914 = new int[]{0, -1, 0, 1};
+      field915 = new int[]{1, -1, -1, 1};
+      field916 = new int[]{-1, -1, 1, 1};
+      field917 = (int)(Math.random() * 17.0D) - 8;
+      field918 = (int)(Math.random() * 33.0D) - 16;
+   }
 }
diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java
index 97088532cc..e2bd0099ce 100644
--- a/runescape-client/src/main/java/Timer.java
+++ b/runescape-client/src/main/java/Timer.java
@@ -11,61 +11,61 @@ public class Timer {
    @ObfuscatedGetter(
       longValue = 6181704275746246665L
    )
-   long __m;
+   long field919;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       longValue = -8166664055136527097L
    )
-   long __f;
+   long field920;
    @ObfuscatedName("q")
-   public boolean __q;
+   public boolean field921;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       longValue = -6206176920376957899L
    )
-   long __w;
+   long field922;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       longValue = -5820022560321695785L
    )
-   long __o;
+   long field923;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       longValue = -7044840680232740733L
    )
-   long __u;
+   long field924;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = -500639955
    )
-   int __g;
+   int field925;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = 2043109577
    )
-   int __l;
+   int field926;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = 978183419
    )
-   int __e;
+   int field927;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = 1684916659
    )
-   int __x;
+   int field928;
 
    public Timer() {
-      this.__m = -1L;
-      this.__f = -1L;
-      this.__q = false;
-      this.__w = 0L;
-      this.__o = 0L;
-      this.__u = 0L;
-      this.__g = 0;
-      this.__l = 0;
-      this.__e = 0;
-      this.__x = 0;
+      this.field919 = -1L;
+      this.field920 = -1L;
+      this.field921 = false;
+      this.field922 = 0L;
+      this.field923 = 0L;
+      this.field924 = 0L;
+      this.field925 = 0;
+      this.field926 = 0;
+      this.field927 = 0;
+      this.field928 = 0;
    }
 
    @ObfuscatedName("m")
@@ -73,8 +73,8 @@ public class Timer {
       signature = "(I)V",
       garbageValue = "2027048361"
    )
-   public void __m_453() {
-      this.__m = class203.currentTimeMs();
+   public void method329() {
+      this.field919 = class203.currentTimeMs();
    }
 
    @ObfuscatedName("f")
@@ -82,10 +82,10 @@ public class Timer {
       signature = "(B)V",
       garbageValue = "3"
    )
-   public void __f_454() {
-      if(-1L != this.__m) {
-         this.__o = class203.currentTimeMs() - this.__m;
-         this.__m = -1L;
+   public void method330() {
+      if (-1L != this.field919) {
+         this.field923 = class203.currentTimeMs() - this.field919;
+         this.field919 = -1L;
       }
 
    }
@@ -95,9 +95,9 @@ public class Timer {
       signature = "(II)V",
       garbageValue = "-1162738177"
    )
-   public void __q_455(int var1) {
-      this.__f = class203.currentTimeMs();
-      this.__g = var1;
+   public void method331(int var1) {
+      this.field920 = class203.currentTimeMs();
+      this.field925 = var1;
    }
 
    @ObfuscatedName("w")
@@ -105,14 +105,14 @@ public class Timer {
       signature = "(I)V",
       garbageValue = "-1855026926"
    )
-   public void __w_456() {
-      if(this.__f != -1L) {
-         this.__w = class203.currentTimeMs() - this.__f;
-         this.__f = -1L;
+   public void method332() {
+      if (this.field920 != -1L) {
+         this.field922 = class203.currentTimeMs() - this.field920;
+         this.field920 = -1L;
       }
 
-      ++this.__e;
-      this.__q = true;
+      ++this.field927;
+      this.field921 = true;
    }
 
    @ObfuscatedName("o")
@@ -120,9 +120,9 @@ public class Timer {
       signature = "(S)V",
       garbageValue = "-30171"
    )
-   public void __o_457() {
-      this.__q = false;
-      this.__l = 0;
+   public void method333() {
+      this.field921 = false;
+      this.field926 = 0;
    }
 
    @ObfuscatedName("u")
@@ -130,8 +130,8 @@ public class Timer {
       signature = "(I)V",
       garbageValue = "-812012402"
    )
-   public void __u_458() {
-      this.__w_456();
+   public void method334() {
+      this.method332();
    }
 
    @ObfuscatedName("g")
@@ -141,36 +141,36 @@ public class Timer {
    )
    @Export("write")
    public void write(Buffer var1) {
-      long var2 = this.__o;
+      long var2 = this.field923;
       var2 /= 10L;
-      if(var2 < 0L) {
+      if (var2 < 0L) {
          var2 = 0L;
-      } else if(var2 > 65535L) {
+      } else if (var2 > 65535L) {
          var2 = 65535L;
       }
 
       var1.writeShort((int)var2);
-      long var4 = this.__w;
+      long var4 = this.field922;
       var4 /= 10L;
-      if(var4 < 0L) {
+      if (var4 < 0L) {
          var4 = 0L;
-      } else if(var4 > 65535L) {
+      } else if (var4 > 65535L) {
          var4 = 65535L;
       }
 
       var1.writeShort((int)var4);
-      long var6 = this.__u;
+      long var6 = this.field924;
       var6 /= 10L;
-      if(var6 < 0L) {
+      if (var6 < 0L) {
          var6 = 0L;
-      } else if(var6 > 65535L) {
+      } else if (var6 > 65535L) {
          var6 = 65535L;
       }
 
       var1.writeShort((int)var6);
-      var1.writeShort(this.__g);
-      var1.writeShort(this.__l);
-      var1.writeShort(this.__e);
-      var1.writeShort(this.__x);
+      var1.writeShort(this.field925);
+      var1.writeShort(this.field926);
+      var1.writeShort(this.field927);
+      var1.writeShort(this.field928);
    }
 }
diff --git a/runescape-client/src/main/java/TotalQuantityComparator.java b/runescape-client/src/main/java/TotalQuantityComparator.java
index 14da8aef2c..7437594cb0 100644
--- a/runescape-client/src/main/java/TotalQuantityComparator.java
+++ b/runescape-client/src/main/java/TotalQuantityComparator.java
@@ -12,18 +12,18 @@ final class TotalQuantityComparator implements Comparator {
       signature = "(Ll;Ll;I)I",
       garbageValue = "-573736433"
    )
-   int __m_5(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-      return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity?-1:(var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity?0:1);
+   int method335(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+      return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1);
    }
 
    @Export("compare")
    @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_5((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+      return this.method335((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
    }
 
    @ObfuscatedName("equals")
-   public boolean __equals_7(Object var1) {
+   public boolean method336(Object var1) {
       return super.equals(var1);
    }
 
@@ -35,68 +35,68 @@ final class TotalQuantityComparator implements Comparator {
    @Export("loadTerrain")
    static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) {
       int var7;
-      if(var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) {
+      if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) {
          Tiles.Tiles_renderFlags[var1][var2][var3] = 0;
 
-         while(true) {
+         while (true) {
             var7 = var0.readUnsignedByte();
-            if(var7 == 0) {
-               if(var1 == 0) {
-                  int[] var8 = Tiles.Tiles_heights[0][var2];
-                  int var11 = var2 + var4 + 932731;
-                  int var12 = var3 + var5 + 556238;
-                  int var13 = Script.method2204(var11 + 45365, var12 + 91923, 4) - 128 + (Script.method2204(10294 + var11, 37821 + var12, 2) - 128 >> 1) + (Script.method2204(var11, var12, 1) - 128 >> 2);
-                  var13 = (int)((double)var13 * 0.3D) + 35;
-                  if(var13 < 10) {
-                     var13 = 10;
-                  } else if(var13 > 60) {
-                     var13 = 60;
+            if (var7 == 0) {
+               if (var1 == 0) {
+                  int[] var12 = Tiles.Tiles_heights[0][var2];
+                  int var9 = var2 + var4 + 932731;
+                  int var10 = var3 + var5 + 556238;
+                  int var11 = Script.method2204(var9 + 45365, var10 + 91923, 4) - 128 + (Script.method2204(10294 + var9, 37821 + var10, 2) - 128 >> 1) + (Script.method2204(var9, var10, 1) - 128 >> 2);
+                  var11 = (int)((double)var11 * 0.3D) + 35;
+                  if (var11 < 10) {
+                     var11 = 10;
+                  } else if (var11 > 60) {
+                     var11 = 60;
                   }
 
-                  var8[var3] = -var13 * 8;
+                  var12[var3] = -var11 * 8;
                } else {
                   Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240;
                }
                break;
             }
 
-            if(var7 == 1) {
-               int var14 = var0.readUnsignedByte();
-               if(var14 == 1) {
-                  var14 = 0;
+            if (var7 == 1) {
+               int var8 = var0.readUnsignedByte();
+               if (var8 == 1) {
+                  var8 = 0;
                }
 
-               if(var1 == 0) {
-                  Tiles.Tiles_heights[0][var2][var3] = -var14 * 8;
+               if (var1 == 0) {
+                  Tiles.Tiles_heights[0][var2][var3] = -var8 * 8;
                } else {
-                  Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var14 * 8;
+                  Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8;
                }
                break;
             }
 
-            if(var7 <= 49) {
-               Fonts.__kz_o[var1][var2][var3] = var0.readByte();
-               class32.__ay_u[var1][var2][var3] = (byte)((var7 - 2) / 4);
-               class307.__kc_g[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3);
-            } else if(var7 <= 81) {
+            if (var7 <= 49) {
+               Fonts.field350[var1][var2][var3] = var0.readByte();
+               class32.field1157[var1][var2][var3] = (byte)((var7 - 2) / 4);
+               class307.field1155[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3);
+            } else if (var7 <= 81) {
                Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49);
             } else {
-               Tiles.__bq_w[var1][var2][var3] = (byte)(var7 - 81);
+               Tiles.field908[var1][var2][var3] = (byte)(var7 - 81);
             }
          }
       } else {
-         while(true) {
+         while (true) {
             var7 = var0.readUnsignedByte();
-            if(var7 == 0) {
+            if (var7 == 0) {
                break;
             }
 
-            if(var7 == 1) {
+            if (var7 == 1) {
                var0.readUnsignedByte();
                break;
             }
 
-            if(var7 <= 49) {
+            if (var7 <= 49) {
                var0.readUnsignedByte();
             }
          }
@@ -115,7 +115,7 @@ final class TotalQuantityComparator implements Comparator {
       int var5 = (Canvas.localPlayer.x >> 7) + class50.baseX;
       int var6 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
       TileLocation var7 = new TileLocation(var4, var5, var6);
-      BufferedFile.worldMap().__h_526(var3, var7, var1, var2);
+      BufferedFile.worldMap().method367(var3, var7, var1, var2);
    }
 
    @ObfuscatedName("ik")
@@ -125,87 +125,85 @@ final class TotalQuantityComparator implements Comparator {
    )
    @Export("addPlayerToMenu")
    static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
-      if(Canvas.localPlayer != var0) {
-         if(Client.menuOptionsCount < 400) {
-            String var4;
-            int var7;
-            if(var0.skillLevel == 0) {
-               String var5 = var0.actions[0] + var0.username + var0.actions[1];
-               var7 = var0.combatLevel;
-               int var8 = Canvas.localPlayer.combatLevel;
-               int var9 = var8 - var7;
-               String var6;
-               if(var9 < -9) {
-                  var6 = BufferedFile.colorStartTag(16711680);
-               } else if(var9 < -6) {
-                  var6 = BufferedFile.colorStartTag(16723968);
-               } else if(var9 < -3) {
-                  var6 = BufferedFile.colorStartTag(16740352);
-               } else if(var9 < 0) {
-                  var6 = BufferedFile.colorStartTag(16756736);
-               } else if(var9 > 9) {
-                  var6 = BufferedFile.colorStartTag(65280);
-               } else if(var9 > 6) {
-                  var6 = BufferedFile.colorStartTag(4259584);
-               } else if(var9 > 3) {
-                  var6 = BufferedFile.colorStartTag(8453888);
-               } else if(var9 > 0) {
-                  var6 = BufferedFile.colorStartTag(12648192);
-               } else {
-                  var6 = BufferedFile.colorStartTag(16776960);
-               }
-
-               var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2];
+      if (Canvas.localPlayer != var0 && Client.menuOptionsCount < 400) {
+         String var4;
+         int var5;
+         if (var0.skillLevel == 0) {
+            String var6 = var0.actions[0] + var0.username + var0.actions[1];
+            var5 = var0.combatLevel;
+            int var7 = Canvas.localPlayer.combatLevel;
+            int var8 = var7 - var5;
+            String var9;
+            if (var8 < -9) {
+               var9 = BufferedFile.colorStartTag(16711680);
+            } else if (var8 < -6) {
+               var9 = BufferedFile.colorStartTag(16723968);
+            } else if (var8 < -3) {
+               var9 = BufferedFile.colorStartTag(16740352);
+            } else if (var8 < 0) {
+               var9 = BufferedFile.colorStartTag(16756736);
+            } else if (var8 > 9) {
+               var9 = BufferedFile.colorStartTag(65280);
+            } else if (var8 > 6) {
+               var9 = BufferedFile.colorStartTag(4259584);
+            } else if (var8 > 3) {
+               var9 = BufferedFile.colorStartTag(8453888);
+            } else if (var8 > 0) {
+               var9 = BufferedFile.colorStartTag(12648192);
             } else {
-               var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2];
+               var9 = BufferedFile.colorStartTag(16776960);
             }
 
-            int var10;
-            if(Client.isItemSelected == 1) {
-               Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16777215) + var4, 14, var1, var2, var3);
-            } else if(Client.isSpellSelected) {
-               if((FloorDecoration.selectedSpellFlags & 8) == 8) {
-                  Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16777215) + var4, 15, var1, var2, var3);
-               }
-            } else {
-               for(var10 = 7; var10 >= 0; --var10) {
-                  if(Client.playerMenuActions[var10] != null) {
-                     short var11 = 0;
-                     if(Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) {
-                        if(AttackOption.AttackOption_hidden == Client.playerAttackOption) {
-                           continue;
-                        }
+            var4 = var6 + var9 + "  (level-" + var0.combatLevel + ")" + var0.actions[2];
+         } else {
+            var4 = var0.actions[0] + var0.username + var0.actions[1] + "  (skill-" + var0.skillLevel + ")" + var0.actions[2];
+         }
 
-                        if(AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > Canvas.localPlayer.combatLevel) {
-                           var11 = 2000;
-                        }
+         int var10;
+         if (Client.isItemSelected == 1) {
+            Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 14, var1, var2, var3);
+         } else if (Client.isSpellSelected) {
+            if ((FloorDecoration.selectedSpellFlags & 8) == 8) {
+               Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 15, var1, var2, var3);
+            }
+         } else {
+            for (var10 = 7; var10 >= 0; --var10) {
+               if (Client.playerMenuActions[var10] != null) {
+                  short var11 = 0;
+                  if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) {
+                     if (AttackOption.AttackOption_hidden == Client.playerAttackOption) {
+                        continue;
+                     }
 
-                        if(Canvas.localPlayer.team != 0 && var0.team != 0) {
-                           if(var0.team == Canvas.localPlayer.team) {
-                              var11 = 2000;
-                           } else {
-                              var11 = 0;
-                           }
-                        }
-                     } else if(Client.playerOptionsPriorities[var10]) {
+                     if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > Canvas.localPlayer.combatLevel) {
                         var11 = 2000;
                      }
 
-                     boolean var12 = false;
-                     var7 = Client.playerMenuOpcodes[var10] + var11;
-                     Tiles.insertMenuItemNoShift(Client.playerMenuActions[var10], BufferedFile.colorStartTag(16777215) + var4, var7, var1, var2, var3);
+                     if (Canvas.localPlayer.team != 0 && var0.team != 0) {
+                        if (var0.team == Canvas.localPlayer.team) {
+                           var11 = 2000;
+                        } else {
+                           var11 = 0;
+                        }
+                     }
+                  } else if (Client.playerOptionsPriorities[var10]) {
+                     var11 = 2000;
                   }
+
+                  boolean var12 = false;
+                  var5 = Client.playerMenuOpcodes[var10] + var11;
+                  Tiles.insertMenuItemNoShift(Client.playerMenuActions[var10], BufferedFile.colorStartTag(16777215) + var4, var5, var1, var2, var3);
                }
             }
+         }
 
-            for(var10 = 0; var10 < Client.menuOptionsCount; ++var10) {
-               if(Client.menuOpcodes[var10] == 23) {
-                  Client.menuTargetNames[var10] = BufferedFile.colorStartTag(16777215) + var4;
-                  break;
-               }
+         for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) {
+            if (Client.menuOpcodes[var10] == 23) {
+               Client.menuTargetNames[var10] = BufferedFile.colorStartTag(16777215) + var4;
+               break;
             }
-
          }
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java
index dd0f2233b5..d15489313e 100644
--- a/runescape-client/src/main/java/TriBool.java
+++ b/runescape-client/src/main/java/TriBool.java
@@ -31,21 +31,21 @@ public class TriBool {
    @Export("urlRequester")
    static UrlRequester urlRequester;
 
-   static {
-      TriBool_unknown = new TriBool();
-      TriBool_true = new TriBool();
-      TriBool_false = new TriBool();
-   }
-
    @ObfuscatedName("go")
    @ObfuscatedSignature(
       signature = "(I)V",
       garbageValue = "-1009406649"
    )
    static void method5560() {
-      if(Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) {
+      if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) {
          WorldMapCacheName.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false);
       }
 
    }
+
+   static {
+      TriBool_unknown = new TriBool();
+      TriBool_true = new TriBool();
+      TriBool_false = new TriBool();
+   }
 }
diff --git a/runescape-client/src/main/java/UnderlayDefinition.java b/runescape-client/src/main/java/UnderlayDefinition.java
index 67346653c6..8ebdfe0da9 100644
--- a/runescape-client/src/main/java/UnderlayDefinition.java
+++ b/runescape-client/src/main/java/UnderlayDefinition.java
@@ -50,10 +50,6 @@ public class UnderlayDefinition extends DualNode {
    @Export("hueMultiplier")
    public int hueMultiplier;
 
-   static {
-      UnderlayDefinition_cached = new EvictingDualNodeHashTable(64);
-   }
-
    UnderlayDefinition() {
       this.rgb = 0;
    }
@@ -75,9 +71,9 @@ public class UnderlayDefinition extends DualNode {
    )
    @Export("read")
    void read(Buffer var1, int var2) {
-      while(true) {
+      while (true) {
          int var3 = var1.readUnsignedByte();
-         if(var3 == 0) {
+         if (var3 == 0) {
             return;
          }
 
@@ -92,7 +88,7 @@ public class UnderlayDefinition extends DualNode {
    )
    @Export("readNext")
    void readNext(Buffer var1, int var2, int var3) {
-      if(var2 == 1) {
+      if (var2 == 1) {
          this.rgb = var1.readMedium();
       }
 
@@ -109,40 +105,40 @@ public class UnderlayDefinition extends DualNode {
       double var4 = (double)(var1 >> 8 & 255) / 256.0D;
       double var6 = (double)(var1 & 255) / 256.0D;
       double var8 = var2;
-      if(var4 < var2) {
+      if (var4 < var2) {
          var8 = var4;
       }
 
-      if(var6 < var8) {
+      if (var6 < var8) {
          var8 = var6;
       }
 
       double var10 = var2;
-      if(var4 > var2) {
+      if (var4 > var2) {
          var10 = var4;
       }
 
-      if(var6 > var10) {
+      if (var6 > var10) {
          var10 = var6;
       }
 
       double var12 = 0.0D;
       double var14 = 0.0D;
       double var16 = (var10 + var8) / 2.0D;
-      if(var10 != var8) {
-         if(var16 < 0.5D) {
+      if (var10 != var8) {
+         if (var16 < 0.5D) {
             var14 = (var10 - var8) / (var10 + var8);
          }
 
-         if(var16 >= 0.5D) {
+         if (var16 >= 0.5D) {
             var14 = (var10 - var8) / (2.0D - var10 - var8);
          }
 
-         if(var2 == var10) {
+         if (var2 == var10) {
             var12 = (var4 - var6) / (var10 - var8);
-         } else if(var4 == var10) {
+         } else if (var4 == var10) {
             var12 = 2.0D + (var6 - var2) / (var10 - var8);
-         } else if(var10 == var6) {
+         } else if (var10 == var6) {
             var12 = (var2 - var4) / (var10 - var8) + 4.0D;
          }
       }
@@ -150,25 +146,25 @@ public class UnderlayDefinition extends DualNode {
       var12 /= 6.0D;
       this.saturation = (int)(256.0D * var14);
       this.lightness = (int)(256.0D * var16);
-      if(this.saturation < 0) {
+      if (this.saturation < 0) {
          this.saturation = 0;
-      } else if(this.saturation > 255) {
+      } else if (this.saturation > 255) {
          this.saturation = 255;
       }
 
-      if(this.lightness < 0) {
+      if (this.lightness < 0) {
          this.lightness = 0;
-      } else if(this.lightness > 255) {
+      } else if (this.lightness > 255) {
          this.lightness = 255;
       }
 
-      if(var16 > 0.5D) {
+      if (var16 > 0.5D) {
          this.hueMultiplier = (int)(var14 * (1.0D - var16) * 512.0D);
       } else {
          this.hueMultiplier = (int)(var16 * var14 * 512.0D);
       }
 
-      if(this.hueMultiplier < 1) {
+      if (this.hueMultiplier < 1) {
          this.hueMultiplier = 1;
       }
 
@@ -183,4 +179,8 @@ public class UnderlayDefinition extends DualNode {
    static class249[] method4839() {
       return new class249[]{class249.field3277, class249.field3273, class249.field3274};
    }
+
+   static {
+      UnderlayDefinition_cached = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/UnitPriceComparator.java b/runescape-client/src/main/java/UnitPriceComparator.java
index 57e4706f23..d1c09b9fe3 100644
--- a/runescape-client/src/main/java/UnitPriceComparator.java
+++ b/runescape-client/src/main/java/UnitPriceComparator.java
@@ -25,18 +25,18 @@ final class UnitPriceComparator implements Comparator {
       signature = "(Ll;Ll;I)I",
       garbageValue = "-120071238"
    )
-   int __m_11(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-      return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice?-1:(var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice?0:1);
+   int method337(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+      return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1);
    }
 
    @Export("compare")
    @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_11((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+      return this.method337((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
    }
 
    @ObfuscatedName("equals")
-   public boolean __equals_13(Object var1) {
+   public boolean method338(Object var1) {
       return super.equals(var1);
    }
 
@@ -69,14 +69,14 @@ final class UnitPriceComparator implements Comparator {
       garbageValue = "2032203362"
    )
    static final int method131() {
-      if(ReflectionCheck.clientPreferences.roofsHidden) {
+      if (ReflectionCheck.clientPreferences.roofsHidden) {
          return SoundSystem.plane;
       } else {
          int var0 = 3;
-         if(WorldMapIcon1.cameraPitch < 310) {
+         if (WorldMapIcon1.cameraPitch < 310) {
             int var1;
             int var2;
-            if(Client.oculusOrbState == 1) {
+            if (Client.oculusOrbState == 1) {
                var1 = MouseHandler.oculusOrbFocalPointX >> 7;
                var2 = ScriptEvent.oculusOrbFocalPointY >> 7;
             } else {
@@ -86,27 +86,27 @@ final class UnitPriceComparator implements Comparator {
 
             int var3 = WorldMapSection1.cameraX >> 7;
             int var4 = class11.cameraZ >> 7;
-            if(var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) {
+            if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) {
                return SoundSystem.plane;
             }
 
-            if(var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) {
+            if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) {
                return SoundSystem.plane;
             }
 
-            if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
+            if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
                var0 = SoundSystem.plane;
             }
 
             int var5;
-            if(var1 > var3) {
+            if (var1 > var3) {
                var5 = var1 - var3;
             } else {
                var5 = var3 - var1;
             }
 
             int var6;
-            if(var2 > var4) {
+            if (var2 > var4) {
                var6 = var2 - var4;
             } else {
                var6 = var4 - var2;
@@ -114,60 +114,60 @@ final class UnitPriceComparator implements Comparator {
 
             int var7;
             int var8;
-            if(var5 > var6) {
+            if (var5 > var6) {
                var7 = var6 * 65536 / var5;
                var8 = 32768;
 
-               while(var3 != var1) {
-                  if(var3 < var1) {
+               while (var3 != var1) {
+                  if (var3 < var1) {
                      ++var3;
-                  } else if(var3 > var1) {
+                  } else if (var3 > var1) {
                      --var3;
                   }
 
-                  if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
+                  if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
                      var0 = SoundSystem.plane;
                   }
 
                   var8 += var7;
-                  if(var8 >= 65536) {
+                  if (var8 >= 65536) {
                      var8 -= 65536;
-                     if(var4 < var2) {
+                     if (var4 < var2) {
                         ++var4;
-                     } else if(var4 > var2) {
+                     } else if (var4 > var2) {
                         --var4;
                      }
 
-                     if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
+                     if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
                         var0 = SoundSystem.plane;
                      }
                   }
                }
-            } else if(var6 > 0) {
+            } else if (var6 > 0) {
                var7 = var5 * 65536 / var6;
                var8 = 32768;
 
-               while(var4 != var2) {
-                  if(var4 < var2) {
+               while (var4 != var2) {
+                  if (var4 < var2) {
                      ++var4;
-                  } else if(var4 > var2) {
+                  } else if (var4 > var2) {
                      --var4;
                   }
 
-                  if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
+                  if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
                      var0 = SoundSystem.plane;
                   }
 
                   var8 += var7;
-                  if(var8 >= 65536) {
+                  if (var8 >= 65536) {
                      var8 -= 65536;
-                     if(var3 < var1) {
+                     if (var3 < var1) {
                         ++var3;
-                     } else if(var3 > var1) {
+                     } else if (var3 > var1) {
                         --var3;
                      }
 
-                     if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
+                     if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
                         var0 = SoundSystem.plane;
                      }
                   }
@@ -175,8 +175,8 @@ final class UnitPriceComparator implements Comparator {
             }
          }
 
-         if(Canvas.localPlayer.x >= 0 && Canvas.localPlayer.y >= 0 && Canvas.localPlayer.x < 13312 && Canvas.localPlayer.y < 13312) {
-            if((Tiles.Tiles_renderFlags[SoundSystem.plane][Canvas.localPlayer.x >> 7][Canvas.localPlayer.y >> 7] & 4) != 0) {
+         if (Canvas.localPlayer.x >= 0 && Canvas.localPlayer.y >= 0 && Canvas.localPlayer.x < 13312 && Canvas.localPlayer.y < 13312) {
+            if ((Tiles.Tiles_renderFlags[SoundSystem.plane][Canvas.localPlayer.x >> 7][Canvas.localPlayer.y >> 7] & 4) != 0) {
                var0 = SoundSystem.plane;
             }
 
@@ -193,12 +193,12 @@ final class UnitPriceComparator implements Comparator {
       garbageValue = "-239357025"
    )
    static final void method136(int var0, int var1) {
-      if(Client.hintArrowType == 2) {
+      if (Client.hintArrowType == 2) {
          WorldMapLabel.worldToScreen((Client.hintArrowX - class50.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - GraphicsObject.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2);
-         if(Client.viewportTempX > -1 && Client.cycle % 20 < 10) {
+         if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) {
             Player.headIconHintSprites[0].drawAt2(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28);
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java
index f34eb61bc9..2ba47e291b 100644
--- a/runescape-client/src/main/java/UrlRequester.java
+++ b/runescape-client/src/main/java/UrlRequester.java
@@ -18,12 +18,12 @@ public class UrlRequester implements Runnable {
    @ObfuscatedGetter(
       intValue = -883931753
    )
-   static int __eo_u;
+   static int field929;
    @ObfuscatedName("ak")
    @ObfuscatedSignature(
       signature = "Lla;"
    )
-   static Bounds __eo_ak;
+   static Bounds field930;
    @ObfuscatedName("m")
    @Export("thread")
    final Thread thread;
@@ -72,7 +72,6 @@ public class UrlRequester implements Runnable {
 
          this.thread.join();
       } catch (InterruptedException var4) {
-         ;
       }
 
    }
@@ -80,16 +79,15 @@ public class UrlRequester implements Runnable {
    @Export("run")
    @ObfuscatedName("run")
    public void run() {
-      while(!this.isClosed) {
+      while (!this.isClosed) {
          try {
             UrlRequest var1;
             synchronized(this) {
                var1 = (UrlRequest)this.requests.poll();
-               if(var1 == null) {
+               if (var1 == null) {
                   try {
                      this.wait();
-                  } catch (InterruptedException var13) {
-                     ;
+                  } catch (InterruptedException var12) {
                   }
                   continue;
                }
@@ -104,29 +102,29 @@ public class UrlRequester implements Runnable {
                var3.setReadTimeout(5000);
                var3.setUseCaches(false);
                var3.setRequestProperty("Connection", "close");
-               int var7 = var3.getContentLength();
-               if(var7 >= 0) {
-                  byte[] var5 = new byte[var7];
+               int var4 = var3.getContentLength();
+               if (var4 >= 0) {
+                  byte[] var5 = new byte[var4];
                   var2 = new DataInputStream(var3.getInputStream());
                   var2.readFully(var5);
                   var1.response0 = var5;
                }
 
                var1.isDone0 = true;
-            } catch (IOException var14) {
+            } catch (IOException var13) {
                var1.isDone0 = true;
             } finally {
-               if(var2 != null) {
+               if (var2 != null) {
                   var2.close();
                }
 
-               if(var3 != null && var3 instanceof HttpURLConnection) {
+               if (var3 != null && var3 instanceof HttpURLConnection) {
                   ((HttpURLConnection)var3).disconnect();
                }
 
             }
-         } catch (Exception var17) {
-            NpcDefinition.sendStackTrace((String)null, var17);
+         } catch (Exception var16) {
+            NPCDefinition.sendStackTrace((String)null, var16);
          }
       }
 
@@ -146,17 +144,17 @@ public class UrlRequester implements Runnable {
       int[] var8 = Players.Players_indices;
 
       int var9;
-      for(var9 = 0; var9 < var7 + Client.npcCount; ++var9) {
+      for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) {
          Object var10;
-         if(var9 < var7) {
+         if (var9 < var7) {
             var10 = Client.players[var8[var9]];
-            if(var8[var9] == Client.combatTargetPlayerIndex) {
+            if (var8[var9] == Client.combatTargetPlayerIndex) {
                var4 = true;
                var5 = var9;
                continue;
             }
 
-            if(var10 == Canvas.localPlayer) {
+            if (var10 == Canvas.localPlayer) {
                var6 = var9;
                continue;
             }
@@ -167,26 +165,26 @@ public class UrlRequester implements Runnable {
          class39.drawActor2d((Actor)var10, var9, var0, var1, var2, var3);
       }
 
-      if(Client.renderSelf && var6 != -1) {
+      if (Client.renderSelf && var6 != -1) {
          class39.drawActor2d(Canvas.localPlayer, var6, var0, var1, var2, var3);
       }
 
-      if(var4) {
+      if (var4) {
          class39.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3);
       }
 
-      for(var9 = 0; var9 < Client.overheadTextCount; ++var9) {
+      for (var9 = 0; var9 < Client.overheadTextCount; ++var9) {
          int var19 = Client.overheadTextXs[var9];
          int var11 = Client.overheadTextYs[var9];
          int var12 = Client.overheadTextXOffsets[var9];
          int var13 = Client.overheadTextAscents[var9];
          boolean var14 = true;
 
-         while(var14) {
+         while (var14) {
             var14 = false;
 
-            for(int var15 = 0; var15 < var9; ++var15) {
-               if(var11 + 2 > Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] && var11 - var13 < Client.overheadTextYs[var15] + 2 && var19 - var12 < Client.overheadTextXOffsets[var15] + Client.overheadTextXs[var15] && var19 + var12 > Client.overheadTextXs[var15] - Client.overheadTextXOffsets[var15] && Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] < var11) {
+            for (int var15 = 0; var15 < var9; ++var15) {
+               if (var11 + 2 > Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] && var11 - var13 < Client.overheadTextYs[var15] + 2 && var19 - var12 < Client.overheadTextXOffsets[var15] + Client.overheadTextXs[var15] && var19 + var12 > Client.overheadTextXs[var15] - Client.overheadTextXOffsets[var15] && Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] < var11) {
                   var11 = Client.overheadTextYs[var15] - Client.overheadTextAscents[var15];
                   var14 = true;
                }
@@ -196,87 +194,87 @@ public class UrlRequester implements Runnable {
          Client.viewportTempX = Client.overheadTextXs[var9];
          Client.viewportTempY = Client.overheadTextYs[var9] = var11;
          String var20 = Client.overheadText[var9];
-         if(Client.chatEffects == 0) {
+         if (Client.chatEffects == 0) {
             int var16 = 16776960;
-            if(Client.overheadTextColors[var9] < 6) {
-               var16 = Client.__client_pv[Client.overheadTextColors[var9]];
+            if (Client.overheadTextColors[var9] < 6) {
+               var16 = Client.field160[Client.overheadTextColors[var9]];
             }
 
-            if(Client.overheadTextColors[var9] == 6) {
-               var16 = Client.viewportDrawCount % 20 < 10?16711680:16776960;
+            if (Client.overheadTextColors[var9] == 6) {
+               var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960;
             }
 
-            if(Client.overheadTextColors[var9] == 7) {
-               var16 = Client.viewportDrawCount % 20 < 10?255:'\uffff';
+            if (Client.overheadTextColors[var9] == 7) {
+               var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff';
             }
 
-            if(Client.overheadTextColors[var9] == 8) {
-               var16 = Client.viewportDrawCount % 20 < 10?'뀀':8454016;
+            if (Client.overheadTextColors[var9] == 8) {
+               var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016;
             }
 
             int var17;
-            if(Client.overheadTextColors[var9] == 9) {
+            if (Client.overheadTextColors[var9] == 9) {
                var17 = 150 - Client.overheadTextCyclesRemaining[var9];
-               if(var17 < 50) {
+               if (var17 < 50) {
                   var16 = var17 * 1280 + 16711680;
-               } else if(var17 < 100) {
+               } else if (var17 < 100) {
                   var16 = 16776960 - (var17 - 50) * 327680;
-               } else if(var17 < 150) {
+               } else if (var17 < 150) {
                   var16 = (var17 - 100) * 5 + 65280;
                }
             }
 
-            if(Client.overheadTextColors[var9] == 10) {
+            if (Client.overheadTextColors[var9] == 10) {
                var17 = 150 - Client.overheadTextCyclesRemaining[var9];
-               if(var17 < 50) {
+               if (var17 < 50) {
                   var16 = var17 * 5 + 16711680;
-               } else if(var17 < 100) {
+               } else if (var17 < 100) {
                   var16 = 16711935 - (var17 - 50) * 327680;
-               } else if(var17 < 150) {
+               } else if (var17 < 150) {
                   var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5;
                }
             }
 
-            if(Client.overheadTextColors[var9] == 11) {
+            if (Client.overheadTextColors[var9] == 11) {
                var17 = 150 - Client.overheadTextCyclesRemaining[var9];
-               if(var17 < 50) {
+               if (var17 < 50) {
                   var16 = 16777215 - var17 * 327685;
-               } else if(var17 < 100) {
+               } else if (var17 < 100) {
                   var16 = (var17 - 50) * 327685 + 65280;
-               } else if(var17 < 150) {
+               } else if (var17 < 150) {
                   var16 = 16777215 - (var17 - 100) * 327680;
                }
             }
 
-            if(Client.overheadTextEffects[var9] == 0) {
+            if (Client.overheadTextEffects[var9] == 0) {
                class2.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0);
             }
 
-            if(Client.overheadTextEffects[var9] == 1) {
+            if (Client.overheadTextEffects[var9] == 1) {
                class2.fontBold12.drawCenteredWave(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount);
             }
 
-            if(Client.overheadTextEffects[var9] == 2) {
+            if (Client.overheadTextEffects[var9] == 2) {
                class2.fontBold12.drawCenteredWave2(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount);
             }
 
-            if(Client.overheadTextEffects[var9] == 3) {
+            if (Client.overheadTextEffects[var9] == 3) {
                class2.fontBold12.drawCenteredShake(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]);
             }
 
-            if(Client.overheadTextEffects[var9] == 4) {
+            if (Client.overheadTextEffects[var9] == 4) {
                var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (class2.fontBold12.stringWidth(var20) + 100) / 150;
                Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1);
                class2.fontBold12.draw(var20, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0);
                Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1);
             }
 
-            if(Client.overheadTextEffects[var9] == 5) {
+            if (Client.overheadTextEffects[var9] == 5) {
                var17 = 150 - Client.overheadTextCyclesRemaining[var9];
                int var18 = 0;
-               if(var17 < 25) {
+               if (var17 < 25) {
                   var18 = var17 - 25;
-               } else if(var17 > 125) {
+               } else if (var17 > 125) {
                   var18 = var17 - 125;
                }
 
diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java
index 4a1913ceb9..51a619cdf7 100644
--- a/runescape-client/src/main/java/User.java
+++ b/runescape-client/src/main/java/User.java
@@ -36,7 +36,7 @@ public class User implements Comparable {
    )
    @Export("name")
    public String name() {
-      return this.username0 == null?"":this.username0.getName();
+      return this.username0 == null ? "" : this.username0.getName();
    }
 
    @ObfuscatedName("ag")
@@ -46,7 +46,7 @@ public class User implements Comparable {
    )
    @Export("previousName")
    public String previousName() {
-      return this.previousUsername == null?"":this.previousUsername.getName();
+      return this.previousUsername == null ? "" : this.previousUsername.getName();
    }
 
    @ObfuscatedName("aq")
@@ -56,7 +56,7 @@ public class User implements Comparable {
    )
    @Export("set")
    void set(Username var1, Username var2) {
-      if(var1 == null) {
+      if (var1 == null) {
          throw new NullPointerException();
       } else {
          this.username0 = var1;
diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java
index a289a2a733..2adcca3189 100644
--- a/runescape-client/src/main/java/UserComparator1.java
+++ b/runescape-client/src/main/java/UserComparator1.java
@@ -8,10 +8,10 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator1")
 public class UserComparator1 implements Comparator {
    @ObfuscatedName("m")
-   final boolean __m;
+   final boolean field931;
 
    public UserComparator1(boolean var1) {
-      this.__m = var1;
+      this.field931 = var1;
    }
 
    @ObfuscatedName("m")
@@ -19,18 +19,18 @@ public class UserComparator1 implements Comparator {
       signature = "(Ljs;Ljs;B)I",
       garbageValue = "68"
    )
-   int __m_476(User var1, User var2) {
-      return this.__m?var1.compareTo0(var2):var2.compareTo0(var1);
+   int method339(User var1, User var2) {
+      return this.field931 ? var1.compareTo0(var2) : var2.compareTo0(var1);
    }
 
    @Export("compare")
    @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_476((User)var1, (User)var2);
+      return this.method339((User)var1, (User)var2);
    }
 
    @ObfuscatedName("equals")
-   public boolean __equals_478(Object var1) {
+   public boolean method340(Object var1) {
       return super.equals(var1);
    }
 }
diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java
index 693298d8ab..e1fdf2f164 100644
--- a/runescape-client/src/main/java/UserComparator10.java
+++ b/runescape-client/src/main/java/UserComparator10.java
@@ -8,10 +8,10 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator10")
 public class UserComparator10 extends AbstractUserComparator {
    @ObfuscatedName("m")
-   final boolean __m;
+   final boolean field932;
 
    public UserComparator10(boolean var1) {
-      this.__m = var1;
+      this.field932 = var1;
    }
 
    @ObfuscatedName("m")
@@ -19,14 +19,14 @@ public class UserComparator10 extends AbstractUserComparator {
       signature = "(Lke;Lke;B)I",
       garbageValue = "-15"
    )
-   int __m_268(Buddy var1, Buddy var2) {
-      return Client.worldId == var1.world0 && var2.world0 == Client.worldId?(this.__m?var1.int2 - var2.int2:var2.int2 - var1.int2):this.__x_461(var1, var2);
+   int method341(Buddy var1, Buddy var2) {
+      return Client.worldId == var1.world0 && var2.world0 == Client.worldId ? (this.field932 ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.method12(var1, var2);
    }
 
    @Export("compare")
    @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_268((Buddy)var1, (Buddy)var2);
+      return this.method341((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("hn")
@@ -36,20 +36,20 @@ public class UserComparator10 extends AbstractUserComparator {
    )
    static final void method3352(boolean var0) {
       class13.playPcmPlayers();
-      ++Client.packetWriter.__d;
-      if(Client.packetWriter.__d >= 50 || var0) {
-         Client.packetWriter.__d = 0;
-         if(!Client.__client_fh && Client.packetWriter.getSocket() != null) {
-            PacketBufferNode var1 = Interpreter.method1915(ClientPacket.__gs_c, Client.packetWriter.isaacCipher);
-            Client.packetWriter.__q_167(var1);
+      ++Client.packetWriter.field675;
+      if (Client.packetWriter.field675 >= 50 || var0) {
+         Client.packetWriter.field675 = 0;
+         if (!Client.field176 && Client.packetWriter.getSocket() != null) {
+            PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field244, Client.packetWriter.isaacCipher);
+            Client.packetWriter.method241(var1);
 
             try {
-               Client.packetWriter.__f_166();
+               Client.packetWriter.method240();
             } catch (IOException var3) {
-               Client.__client_fh = true;
+               Client.field176 = true;
             }
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java
index cf58e0cd5c..44a97180b0 100644
--- a/runescape-client/src/main/java/UserComparator2.java
+++ b/runescape-client/src/main/java/UserComparator2.java
@@ -8,10 +8,10 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator2")
 public class UserComparator2 implements Comparator {
    @ObfuscatedName("m")
-   final boolean __m;
+   final boolean field933;
 
    public UserComparator2(boolean var1) {
-      this.__m = var1;
+      this.field933 = var1;
    }
 
    @ObfuscatedName("m")
@@ -19,18 +19,18 @@ public class UserComparator2 implements Comparator {
       signature = "(Ljs;Ljs;I)I",
       garbageValue = "-2069683911"
    )
-   int __m_479(User var1, User var2) {
-      return this.__m?var1.username().compareTo0(var2.username()):var2.username().compareTo0(var1.username());
+   int method342(User var1, User var2) {
+      return this.field933 ? var1.username().compareTo0(var2.username()) : var2.username().compareTo0(var1.username());
    }
 
    @ObfuscatedName("equals")
-   public boolean __equals_481(Object var1) {
+   public boolean method343(Object var1) {
       return super.equals(var1);
    }
 
    @Export("compare")
    @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_479((User)var1, (User)var2);
+      return this.method342((User)var1, (User)var2);
    }
 }
diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java
index f6e38ee6bf..d016050749 100644
--- a/runescape-client/src/main/java/UserComparator3.java
+++ b/runescape-client/src/main/java/UserComparator3.java
@@ -19,10 +19,10 @@ public class UserComparator3 extends AbstractUserComparator {
    @Export("socketTask")
    static Task socketTask;
    @ObfuscatedName("m")
-   final boolean __m;
+   final boolean field934;
 
    public UserComparator3(boolean var1) {
-      this.__m = var1;
+      this.field934 = var1;
    }
 
    @ObfuscatedName("m")
@@ -30,14 +30,14 @@ public class UserComparator3 extends AbstractUserComparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "-1157645406"
    )
-   int __m_274(Buddy var1, Buddy var2) {
-      return var2.world0 != var1.world0?(this.__m?var1.world0 - var2.world0:var2.world0 - var1.world0):this.__x_461(var1, var2);
+   int method344(Buddy var1, Buddy var2) {
+      return var2.world0 != var1.world0 ? (this.field934 ? var1.world0 - var2.world0 : var2.world0 - var1.world0) : this.method12(var1, var2);
    }
 
    @Export("compare")
    @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_274((Buddy)var1, (Buddy)var2);
+      return this.method344((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("o")
diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java
index b6b05a509f..98b1c71cd6 100644
--- a/runescape-client/src/main/java/UserComparator4.java
+++ b/runescape-client/src/main/java/UserComparator4.java
@@ -15,10 +15,10 @@ public class UserComparator4 implements Comparator {
    @Export("WorldMapElement_count")
    public static int WorldMapElement_count;
    @ObfuscatedName("m")
-   final boolean __m;
+   final boolean field935;
 
    public UserComparator4(boolean var1) {
-      this.__m = var1;
+      this.field935 = var1;
    }
 
    @ObfuscatedName("m")
@@ -26,19 +26,19 @@ public class UserComparator4 implements Comparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "950234237"
    )
-   int __m_261(Buddy var1, Buddy var2) {
-      return this.__m?var1.int2 - var2.int2:var2.int2 - var1.int2;
+   int method345(Buddy var1, Buddy var2) {
+      return this.field935 ? var1.int2 - var2.int2 : var2.int2 - var1.int2;
    }
 
    @ObfuscatedName("equals")
-   public boolean __equals_263(Object var1) {
+   public boolean method346(Object var1) {
       return super.equals(var1);
    }
 
    @Export("compare")
    @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_261((Buddy)var1, (Buddy)var2);
+      return this.method345((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("f")
@@ -56,23 +56,23 @@ public class UserComparator4 implements Comparator {
       garbageValue = "-2050984400"
    )
    static int method3335(int var0, Script var1, boolean var2) {
-      if(var0 == 5306) {
+      if (var0 == 5306) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpotAnimationDefinition.method4822();
          return 1;
       } else {
          int var3;
-         if(var0 == 5307) {
+         if (var0 == 5307) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            if(var3 == 1 || var3 == 2) {
+            if (var3 == 1 || var3 == 2) {
                GroundItem.method2095(var3);
             }
 
             return 1;
-         } else if(var0 == 5308) {
+         } else if (var0 == 5308) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.windowMode;
             return 1;
-         } else if(var0 != 5309) {
-            if(var0 == 5310) {
+         } else if (var0 != 5309) {
+            if (var0 == 5310) {
                --RouteStrategy.Interpreter_intStackSize;
                return 1;
             } else {
@@ -80,7 +80,7 @@ public class UserComparator4 implements Comparator {
             }
          } else {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            if(var3 == 1 || var3 == 2) {
+            if (var3 == 1 || var3 == 2) {
                ReflectionCheck.clientPreferences.windowMode = var3;
                WorldMapSection0.savePreferences();
             }
diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java
index 0ee89e85f2..7ef94fba67 100644
--- a/runescape-client/src/main/java/UserComparator5.java
+++ b/runescape-client/src/main/java/UserComparator5.java
@@ -7,10 +7,10 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator5")
 public class UserComparator5 extends AbstractUserComparator {
    @ObfuscatedName("m")
-   final boolean __m;
+   final boolean field936;
 
    public UserComparator5(boolean var1) {
-      this.__m = var1;
+      this.field936 = var1;
    }
 
    @ObfuscatedName("m")
@@ -18,22 +18,22 @@ public class UserComparator5 extends AbstractUserComparator {
       signature = "(Lke;Lke;B)I",
       garbageValue = "-22"
    )
-   int __m_272(Buddy var1, Buddy var2) {
-      if(var1.world0 != 0) {
-         if(var2.world0 == 0) {
-            return this.__m?-1:1;
+   int method347(Buddy var1, Buddy var2) {
+      if (var1.world0 != 0) {
+         if (var2.world0 == 0) {
+            return this.field936 ? -1 : 1;
          }
-      } else if(var2.world0 != 0) {
-         return this.__m?1:-1;
+      } else if (var2.world0 != 0) {
+         return this.field936 ? 1 : -1;
       }
 
-      return this.__x_461(var1, var2);
+      return this.method12(var1, var2);
    }
 
    @Export("compare")
    @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_272((Buddy)var1, (Buddy)var2);
+      return this.method347((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("jk")
@@ -44,7 +44,7 @@ public class UserComparator5 extends AbstractUserComparator {
    @Export("worldToMinimap")
    static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
       int var6 = var3 * var3 + var2 * var2;
-      if(var6 > 4225 && var6 < 90000) {
+      if (var6 > 4225 && var6 < 90000) {
          int var7 = Client.minimapOrientation & 2047;
          int var8 = Rasterizer3D.Rasterizer3D_sine[var7];
          int var9 = Rasterizer3D.Rasterizer3D_cosine[var7];
@@ -55,7 +55,7 @@ public class UserComparator5 extends AbstractUserComparator {
          int var15 = (int)(Math.sin(var12) * (double)var14);
          int var16 = (int)(Math.cos(var12) * (double)var14);
          byte var17 = 20;
-         FaceNormal.__el_gm.__ah_514(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256);
+         FaceNormal.field345.method316(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256);
       } else {
          NetFileRequest.method4554(var0, var1, var2, var3, var4, var5);
       }
diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java
index 90761a877b..58325e9817 100644
--- a/runescape-client/src/main/java/UserComparator6.java
+++ b/runescape-client/src/main/java/UserComparator6.java
@@ -16,12 +16,12 @@ public class UserComparator6 extends AbstractUserComparator {
    @ObfuscatedSignature(
       signature = "Lho;"
    )
-   static Widget __fg_jh;
+   static Widget field937;
    @ObfuscatedName("m")
-   final boolean __m;
+   final boolean field938;
 
    public UserComparator6(boolean var1) {
-      this.__m = var1;
+      this.field938 = var1;
    }
 
    @ObfuscatedName("m")
@@ -29,14 +29,14 @@ public class UserComparator6 extends AbstractUserComparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "750521759"
    )
-   int __m_276(Buddy var1, Buddy var2) {
-      return var1.world0 != 0 && var2.world0 != 0?(this.__m?var1.username().compareTo0(var2.username()):var2.username().compareTo0(var1.username())):this.__x_461(var1, var2);
+   int method348(Buddy var1, Buddy var2) {
+      return var1.world0 != 0 && var2.world0 != 0 ? (this.field938 ? var1.username().compareTo0(var2.username()) : var2.username().compareTo0(var1.username())) : this.method12(var1, var2);
    }
 
    @Export("compare")
    @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_276((Buddy)var1, (Buddy)var2);
+      return this.method348((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("f")
@@ -45,23 +45,23 @@ public class UserComparator6 extends AbstractUserComparator {
       garbageValue = "-1968376475"
    )
    static final void method3390(int var0, int var1, int var2, int var3) {
-      for(int var4 = var1; var4 <= var3 + var1; ++var4) {
-         for(int var5 = var0; var5 <= var0 + var2; ++var5) {
-            if(var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) {
-               Tiles.__bq_l[0][var5][var4] = 127;
-               if(var0 == var5 && var5 > 0) {
+      for (int var4 = var1; var4 <= var3 + var1; ++var4) {
+         for (int var5 = var0; var5 <= var0 + var2; ++var5) {
+            if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) {
+               Tiles.field909[0][var5][var4] = 127;
+               if (var0 == var5 && var5 > 0) {
                   Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4];
                }
 
-               if(var5 == var0 + var2 && var5 < 103) {
+               if (var5 == var0 + var2 && var5 < 103) {
                   Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4];
                }
 
-               if(var4 == var1 && var4 > 0) {
+               if (var4 == var1 && var4 > 0) {
                   Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1];
                }
 
-               if(var3 + var1 == var4 && var4 < 103) {
+               if (var3 + var1 == var4 && var4 < 103) {
                   Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1];
                }
             }
diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java
index f5387fbc87..72f05177c9 100644
--- a/runescape-client/src/main/java/UserComparator7.java
+++ b/runescape-client/src/main/java/UserComparator7.java
@@ -10,10 +10,10 @@ import net.runelite.rs.Reflection;
 @Implements("UserComparator7")
 public class UserComparator7 extends AbstractUserComparator {
    @ObfuscatedName("m")
-   final boolean __m;
+   final boolean field939;
 
    public UserComparator7(boolean var1) {
-      this.__m = var1;
+      this.field939 = var1;
    }
 
    @ObfuscatedName("m")
@@ -21,14 +21,14 @@ public class UserComparator7 extends AbstractUserComparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "-9252550"
    )
-   int __m_270(Buddy var1, Buddy var2) {
-      return var1.world0 != 0 && var2.world0 != 0?(this.__m?var1.int2 - var2.int2:var2.int2 - var1.int2):this.__x_461(var1, var2);
+   int method349(Buddy var1, Buddy var2) {
+      return var1.world0 != 0 && var2.world0 != 0 ? (this.field939 ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.method12(var1, var2);
    }
 
    @Export("compare")
    @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_270((Buddy)var1, (Buddy)var2);
+      return this.method349((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("q")
@@ -47,65 +47,65 @@ public class UserComparator7 extends AbstractUserComparator {
       var2.methods = new Method[var2.size];
       var2.arguments = new byte[var2.size][][];
 
-      for(int var3 = 0; var3 < var2.size; ++var3) {
+      for (int var3 = 0; var3 < var2.size; ++var3) {
          try {
             int var4 = var0.readUnsignedByte();
             String var5;
             String var6;
             int var7;
-            if(var4 != 0 && var4 != 1 && var4 != 2) {
-               if(var4 == 3 || var4 == 4) {
+            if (var4 != 0 && var4 != 1 && var4 != 2) {
+               if (var4 == 3 || var4 == 4) {
                   var5 = var0.readStringCp1252NullTerminated();
                   var6 = var0.readStringCp1252NullTerminated();
                   var7 = var0.readUnsignedByte();
                   String[] var8 = new String[var7];
 
-                  for(int var9 = 0; var9 < var7; ++var9) {
+                  for (int var9 = 0; var9 < var7; ++var9) {
                      var8[var9] = var0.readStringCp1252NullTerminated();
                   }
 
-                  String var20 = var0.readStringCp1252NullTerminated();
+                  String var26 = var0.readStringCp1252NullTerminated();
                   byte[][] var10 = new byte[var7][];
-                  int var12;
-                  if(var4 == 3) {
-                     for(int var11 = 0; var11 < var7; ++var11) {
-                        var12 = var0.readInt();
-                        var10[var11] = new byte[var12];
-                        var0.__al_305(var10[var11], 0, var12);
+                  int var11;
+                  if (var4 == 3) {
+                     for (int var12 = 0; var12 < var7; ++var12) {
+                        var11 = var0.readInt();
+                        var10[var12] = new byte[var11];
+                        var0.method46(var10[var12], 0, var11);
                      }
                   }
 
                   var2.operations[var3] = var4;
-                  Class[] var21 = new Class[var7];
+                  Class[] var27 = new Class[var7];
 
-                  for(var12 = 0; var12 < var7; ++var12) {
-                     var21[var12] = VarcInt.loadClassFromDescriptor(var8[var12]);
+                  for (var11 = 0; var11 < var7; ++var11) {
+                     var27[var11] = VarcInt.loadClassFromDescriptor(var8[var11]);
                   }
 
-                  Class var22 = VarcInt.loadClassFromDescriptor(var20);
-                  if(VarcInt.loadClassFromDescriptor(var5).getClassLoader() == null) {
+                  Class var13 = VarcInt.loadClassFromDescriptor(var26);
+                  if (VarcInt.loadClassFromDescriptor(var5).getClassLoader() == null) {
                      throw new SecurityException();
                   }
 
-                  Method[] var13 = VarcInt.loadClassFromDescriptor(var5).getDeclaredMethods();
-                  Method[] var14 = var13;
+                  Method[] var14 = VarcInt.loadClassFromDescriptor(var5).getDeclaredMethods();
+                  Method[] var15 = var14;
 
-                  for(int var15 = 0; var15 < var14.length; ++var15) {
-                     Method var16 = var14[var15];
-                     if(Reflection.getMethodName(var16).equals(var6)) {
-                        Class[] var17 = Reflection.getParameterTypes(var16);
-                        if(var21.length == var17.length) {
-                           boolean var18 = true;
+                  for (int var16 = 0; var16 < var15.length; ++var16) {
+                     Method var17 = var15[var16];
+                     if (Reflection.getMethodName(var17).equals(var6)) {
+                        Class[] var18 = Reflection.getParameterTypes(var17);
+                        if (var27.length == var18.length) {
+                           boolean var19 = true;
 
-                           for(int var19 = 0; var19 < var21.length; ++var19) {
-                              if(var21[var19] != var17[var19]) {
-                                 var18 = false;
+                           for (int var20 = 0; var20 < var27.length; ++var20) {
+                              if (var27[var20] != var18[var20]) {
+                                 var19 = false;
                                  break;
                               }
                            }
 
-                           if(var18 && var22 == var16.getReturnType()) {
-                              var2.methods[var3] = var16;
+                           if (var19 && var13 == var17.getReturnType()) {
+                              var2.methods[var3] = var17;
                            }
                         }
                      }
@@ -117,27 +117,27 @@ public class UserComparator7 extends AbstractUserComparator {
                var5 = var0.readStringCp1252NullTerminated();
                var6 = var0.readStringCp1252NullTerminated();
                var7 = 0;
-               if(var4 == 1) {
+               if (var4 == 1) {
                   var7 = var0.readInt();
                }
 
                var2.operations[var3] = var4;
                var2.intReplaceValues[var3] = var7;
-               if(VarcInt.loadClassFromDescriptor(var5).getClassLoader() == null) {
+               if (VarcInt.loadClassFromDescriptor(var5).getClassLoader() == null) {
                   throw new SecurityException();
                }
 
                var2.fields[var3] = Reflection.findField(VarcInt.loadClassFromDescriptor(var5), var6);
             }
-         } catch (ClassNotFoundException var24) {
+         } catch (ClassNotFoundException var21) {
             var2.creationErrors[var3] = -1;
-         } catch (SecurityException var25) {
+         } catch (SecurityException var22) {
             var2.creationErrors[var3] = -2;
-         } catch (NullPointerException var26) {
+         } catch (NullPointerException var23) {
             var2.creationErrors[var3] = -3;
-         } catch (Exception var27) {
+         } catch (Exception var24) {
             var2.creationErrors[var3] = -4;
-         } catch (Throwable var28) {
+         } catch (Throwable var25) {
             var2.creationErrors[var3] = -5;
          }
       }
@@ -151,11 +151,11 @@ public class UserComparator7 extends AbstractUserComparator {
       garbageValue = "2084569794"
    )
    static final boolean method3364(int var0) {
-      if(var0 < 0) {
+      if (var0 < 0) {
          return false;
       } else {
          int var1 = Client.menuOpcodes[var0];
-         if(var1 >= 2000) {
+         if (var1 >= 2000) {
             var1 -= 2000;
          }
 
diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java
index ae6288a967..a5a40b8595 100644
--- a/runescape-client/src/main/java/UserComparator8.java
+++ b/runescape-client/src/main/java/UserComparator8.java
@@ -7,10 +7,10 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator8")
 public class UserComparator8 extends AbstractUserComparator {
    @ObfuscatedName("m")
-   final boolean __m;
+   final boolean field940;
 
    public UserComparator8(boolean var1) {
-      this.__m = var1;
+      this.field940 = var1;
    }
 
    @ObfuscatedName("m")
@@ -18,22 +18,22 @@ public class UserComparator8 extends AbstractUserComparator {
       signature = "(Lke;Lke;B)I",
       garbageValue = "0"
    )
-   int __m_266(Buddy var1, Buddy var2) {
-      if(Client.worldId == var1.world0) {
-         if(var2.world0 != Client.worldId) {
-            return this.__m?-1:1;
+   int method350(Buddy var1, Buddy var2) {
+      if (Client.worldId == var1.world0) {
+         if (var2.world0 != Client.worldId) {
+            return this.field940 ? -1 : 1;
          }
-      } else if(var2.world0 == Client.worldId) {
-         return this.__m?1:-1;
+      } else if (var2.world0 == Client.worldId) {
+         return this.field940 ? 1 : -1;
       }
 
-      return this.__x_461(var1, var2);
+      return this.method12(var1, var2);
    }
 
    @Export("compare")
    @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_266((Buddy)var1, (Buddy)var2);
+      return this.method350((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("ke")
@@ -42,7 +42,7 @@ public class UserComparator8 extends AbstractUserComparator {
       garbageValue = "1"
    )
    static final void method3349() {
-      Client.__client_nh = Client.cycleCntr;
-      VertexNormal.__dq_pe = true;
+      Client.field129 = Client.cycleCntr;
+      VertexNormal.field945 = true;
    }
 }
diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java
index b44d9086e3..0a6ed5f44d 100644
--- a/runescape-client/src/main/java/UserComparator9.java
+++ b/runescape-client/src/main/java/UserComparator9.java
@@ -8,10 +8,10 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator9")
 public class UserComparator9 extends AbstractUserComparator {
    @ObfuscatedName("m")
-   final boolean __m;
+   final boolean field941;
 
    public UserComparator9(boolean var1) {
-      this.__m = var1;
+      this.field941 = var1;
    }
 
    @ObfuscatedName("m")
@@ -19,14 +19,14 @@ public class UserComparator9 extends AbstractUserComparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "1966780392"
    )
-   int __m_264(Buddy var1, Buddy var2) {
-      return Client.worldId == var1.world0 && var2.world0 == Client.worldId?(this.__m?var1.username().compareTo0(var2.username()):var2.username().compareTo0(var1.username())):this.__x_461(var1, var2);
+   int method351(Buddy var1, Buddy var2) {
+      return Client.worldId == var1.world0 && var2.world0 == Client.worldId ? (this.field941 ? var1.username().compareTo0(var2.username()) : var2.username().compareTo0(var1.username())) : this.method12(var1, var2);
    }
 
    @Export("compare")
    @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_264((Buddy)var1, (Buddy)var2);
+      return this.method351((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("m")
@@ -35,24 +35,23 @@ public class UserComparator9 extends AbstractUserComparator {
       garbageValue = "-1"
    )
    public static void method3343(boolean var0) {
-      if(NetCache.NetCache_socket != null) {
+      if (NetCache.NetCache_socket != null) {
          try {
             Buffer var1 = new Buffer(4);
-            var1.writeByte(var0?2:3);
+            var1.writeByte(var0 ? 2 : 3);
             var1.writeMedium(0);
             NetCache.NetCache_socket.write(var1.array, 0, 4);
          } catch (IOException var4) {
             try {
                NetCache.NetCache_socket.close();
             } catch (Exception var3) {
-               ;
             }
 
             ++NetCache.NetCache_ioExceptions;
             NetCache.NetCache_socket = null;
          }
-
       }
+
    }
 
    @ObfuscatedName("l")
@@ -64,7 +63,7 @@ public class UserComparator9 extends AbstractUserComparator {
    public static Sprite[] createSpriteArray() {
       Sprite[] var0 = new Sprite[class328.indexedSpriteCount];
 
-      for(int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) {
+      for (int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) {
          Sprite var2 = var0[var1] = new Sprite();
          var2.width = class328.indexedSpriteWidth;
          var2.height = class328.indexedSpriteHeight;
@@ -76,7 +75,7 @@ public class UserComparator9 extends AbstractUserComparator {
          byte[] var4 = class328.spritePixels[var1];
          var2.pixels = new int[var3];
 
-         for(int var5 = 0; var5 < var3; ++var5) {
+         for (int var5 = 0; var5 < var3; ++var5) {
             var2.pixels[var5] = class328.indexedSpritePalette[var4[var5] & 255];
          }
       }
@@ -86,7 +85,7 @@ public class UserComparator9 extends AbstractUserComparator {
       VarbitDefinition.indexedSpriteWidths = null;
       SecureRandomCallable.indexedSpriteHeights = null;
       class328.indexedSpritePalette = null;
-      class328.spritePixels = null;
+      class328.spritePixels = (byte[][])null;
       return var0;
    }
 }
diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java
index 85c03c5fcf..bca808e17d 100644
--- a/runescape-client/src/main/java/UserList.java
+++ b/runescape-client/src/main/java/UserList.java
@@ -114,7 +114,7 @@ public abstract class UserList {
    @Export("getByUsername")
    public User getByUsername(Username var1) {
       User var2 = this.getByCurrentUsername(var1);
-      return var2 != null?var2:this.getByPreviousUsername(var1);
+      return var2 != null ? var2 : this.getByPreviousUsername(var1);
    }
 
    @ObfuscatedName("h")
@@ -124,7 +124,7 @@ public abstract class UserList {
    )
    @Export("getByCurrentUsername")
    User getByCurrentUsername(Username var1) {
-      return !var1.hasCleanName()?null:(User)this.usernamesMap.get(var1);
+      return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1);
    }
 
    @ObfuscatedName("b")
@@ -134,7 +134,7 @@ public abstract class UserList {
    )
    @Export("getByPreviousUsername")
    User getByPreviousUsername(Username var1) {
-      return !var1.hasCleanName()?null:(User)this.previousUsernamesMap.get(var1);
+      return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1);
    }
 
    @ObfuscatedName("c")
@@ -145,7 +145,7 @@ public abstract class UserList {
    @Export("removeByUsername")
    public final boolean removeByUsername(Username var1) {
       User var2 = this.getByCurrentUsername(var1);
-      if(var2 == null) {
+      if (var2 == null) {
          return false;
       } else {
          this.remove(var2);
@@ -161,10 +161,11 @@ public abstract class UserList {
    @Export("remove")
    final void remove(User var1) {
       int var2 = this.indexOf(var1);
-      if(var2 != -1) {
+      if (var2 != -1) {
          this.arrayRemove(var2);
          this.mapRemove(var1);
       }
+
    }
 
    @ObfuscatedName("v")
@@ -184,7 +185,7 @@ public abstract class UserList {
    )
    @Export("addLast")
    User addLast(Username var1, Username var2) {
-      if(this.getByCurrentUsername(var1) != null) {
+      if (this.getByCurrentUsername(var1) != null) {
          throw new IllegalStateException();
       } else {
          User var3 = this.newInstance();
@@ -202,7 +203,7 @@ public abstract class UserList {
    )
    @Export("get")
    public final User get(int var1) {
-      if(var1 >= 0 && var1 < this.size0) {
+      if (var1 >= 0 && var1 < this.size0) {
          return this.array[var1];
       } else {
          throw new ArrayIndexOutOfBoundsException(var1);
@@ -216,7 +217,7 @@ public abstract class UserList {
    )
    @Export("sort")
    public final void sort() {
-      if(this.comparator == null) {
+      if (this.comparator == null) {
          Arrays.sort(this.array, 0, this.size0);
       } else {
          Arrays.sort(this.array, 0, this.size0, this.comparator);
@@ -243,8 +244,8 @@ public abstract class UserList {
    )
    @Export("indexOf")
    final int indexOf(User var1) {
-      for(int var2 = 0; var2 < this.size0; ++var2) {
-         if(this.array[var2] == var1) {
+      for (int var2 = 0; var2 < this.size0; ++var2) {
+         if (this.array[var2] == var1) {
             return var2;
          }
       }
@@ -259,7 +260,7 @@ public abstract class UserList {
    )
    @Export("mapRemove")
    final void mapRemove(User var1) {
-      if(var1.previousUsername != null) {
+      if (var1.previousUsername != null) {
          this.previousUsernamesMap.remove(var1.previousUsername);
       }
 
@@ -283,9 +284,9 @@ public abstract class UserList {
    @Export("mapPut")
    final void mapPut(User var1) {
       this.usernamesMap.put(var1.username0, var1);
-      if(var1.previousUsername != null) {
+      if (var1.previousUsername != null) {
          User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1);
-         if(var2 != null && var2 != var1) {
+         if (var2 != null && var2 != var1) {
             var2.previousUsername = null;
          }
       }
@@ -300,7 +301,7 @@ public abstract class UserList {
    @Export("arrayRemove")
    final void arrayRemove(int var1) {
       --this.size0;
-      if(var1 < this.size0) {
+      if (var1 < this.size0) {
          System.arraycopy(this.array, var1 + 1, this.array, var1, this.size0 - var1);
       }
 
@@ -323,10 +324,10 @@ public abstract class UserList {
    )
    @Export("addComparator")
    public final void addComparator(Comparator var1) {
-      if(this.comparator == null) {
+      if (this.comparator == null) {
          this.comparator = var1;
-      } else if(this.comparator instanceof AbstractUserComparator) {
-         ((AbstractUserComparator)this.comparator).__e_460(var1);
+      } else if (this.comparator instanceof AbstractUserComparator) {
+         ((AbstractUserComparator)this.comparator).method11(var1);
       }
 
    }
diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java
index bbcdaf3dee..8d5f6e22b8 100644
--- a/runescape-client/src/main/java/Username.java
+++ b/runescape-client/src/main/java/Username.java
@@ -51,34 +51,31 @@ public class Username implements Comparable {
    )
    @Export("compareTo0")
    public int compareTo0(Username var1) {
-      return this.cleanName == null?(var1.cleanName == null?0:1):(var1.cleanName == null?-1:this.cleanName.compareTo(var1.cleanName));
+      return this.cleanName == null ? (var1.cleanName == null ? 0 : 1) : (var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName));
    }
 
    @Export("equals")
    @ObfuscatedName("equals")
    public boolean equals(Object var1) {
-      if(var1 instanceof Username) {
+      if (var1 instanceof Username) {
          Username var2 = (Username)var1;
-		  if (this.cleanName == null)
-		  {
-			  return var2.cleanName == null;
-		  }
-		  else
-		  {
-			  return var2.cleanName != null && (this.__hashCode_467() == var2.__hashCode_467() && this.cleanName.equals(var2.cleanName));
-		  }
+         if (this.cleanName == null) {
+            return var2.cleanName == null;
+         } else {
+            return var2.cleanName != null && this.method352() == var2.method352() && this.cleanName.equals(var2.cleanName);
+         }
       } else {
          return false;
       }
    }
 
    @ObfuscatedName("hashCode")
-   public int __hashCode_467() {
-      return this.cleanName == null?0:this.cleanName.hashCode();
+   public int method352() {
+      return this.cleanName == null ? 0 : this.cleanName.hashCode();
    }
 
    @ObfuscatedName("toString")
-   public String __toString_468() {
+   public String method353() {
       return this.getName();
    }
 
diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java
index 3734f09ca3..6479d49090 100644
--- a/runescape-client/src/main/java/VarbitDefinition.java
+++ b/runescape-client/src/main/java/VarbitDefinition.java
@@ -41,10 +41,6 @@ public class VarbitDefinition extends DualNode {
    @Export("highBit")
    public int highBit;
 
-   static {
-      VarbitDefinition_cached = new EvictingDualNodeHashTable(64);
-   }
-
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "(Lgr;I)V",
@@ -52,9 +48,9 @@ public class VarbitDefinition extends DualNode {
    )
    @Export("read")
    void read(Buffer var1) {
-      while(true) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
@@ -69,8 +65,8 @@ public class VarbitDefinition extends DualNode {
    )
    @Export("readNext")
    void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         this.varp = var1.__ag_302();
+      if (var2 == 1) {
+         this.varp = var1.method43();
          this.lowBit = var1.readUnsignedByte();
          this.highBit = var1.readUnsignedByte();
       }
@@ -84,14 +80,18 @@ public class VarbitDefinition extends DualNode {
    )
    static final boolean method4910(int var0, int var1) {
       ObjectDefinition var2 = class50.getObjectDefinition(var0);
-      if(var1 == 11) {
+      if (var1 == 11) {
          var1 = 10;
       }
 
-      if(var1 >= 5 && var1 <= 8) {
+      if (var1 >= 5 && var1 <= 8) {
          var1 = 4;
       }
 
-      return var2.__u_421(var1);
+      return var2.method230(var1);
+   }
+
+   static {
+      VarbitDefinition_cached = new EvictingDualNodeHashTable(64);
    }
 }
diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java
index 4734f53ee8..359502ebb5 100644
--- a/runescape-client/src/main/java/VarcInt.java
+++ b/runescape-client/src/main/java/VarcInt.java
@@ -11,7 +11,7 @@ public class VarcInt extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   static AbstractIndexCache __iw_m;
+   static AbstractIndexCache field942;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -22,10 +22,6 @@ public class VarcInt extends DualNode {
    @Export("persist")
    public boolean persist;
 
-   static {
-      cachedVarcInts = new EvictingDualNodeHashTable(64);
-   }
-
    VarcInt() {
       this.persist = false;
    }
@@ -35,14 +31,14 @@ public class VarcInt extends DualNode {
       signature = "(Lgr;I)V",
       garbageValue = "1023420886"
    )
-   void __q_411(Buffer var1) {
-      while(true) {
+   void method354(Buffer var1) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
-         this.__w_412(var1, var2);
+         this.method355(var1, var2);
       }
    }
 
@@ -51,8 +47,8 @@ public class VarcInt extends DualNode {
       signature = "(Lgr;II)V",
       garbageValue = "-202810982"
    )
-   void __w_412(Buffer var1, int var2) {
-      if(var2 == 2) {
+   void method355(Buffer var1, int var2) {
+      if (var2 == 2) {
          this.persist = true;
       }
 
@@ -65,7 +61,7 @@ public class VarcInt extends DualNode {
    )
    @Export("loadClassFromDescriptor")
    static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException {
-      return var0.equals("B")?Byte.TYPE:(var0.equals("I")?Integer.TYPE:(var0.equals("S")?Short.TYPE:(var0.equals("J")?Long.TYPE:(var0.equals("Z")?Boolean.TYPE:(var0.equals("F")?Float.TYPE:(var0.equals("D")?Double.TYPE:(var0.equals("C")?Character.TYPE:(var0.equals("void")?Void.TYPE:Reflection.findClass(var0)))))))));
+      return var0.equals("B") ? Byte.TYPE : (var0.equals("I") ? Integer.TYPE : (var0.equals("S") ? Short.TYPE : (var0.equals("J") ? Long.TYPE : (var0.equals("Z") ? Boolean.TYPE : (var0.equals("F") ? Float.TYPE : (var0.equals("D") ? Double.TYPE : (var0.equals("C") ? Character.TYPE : (var0.equals("void") ? Void.TYPE : Reflection.findClass(var0)))))))));
    }
 
    @ObfuscatedName("a")
@@ -77,4 +73,8 @@ public class VarcInt extends DualNode {
    public static boolean isAlphaNumeric(char var0) {
       return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
    }
+
+   static {
+      cachedVarcInts = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java
index 8efa66c2e2..5813666fd3 100644
--- a/runescape-client/src/main/java/Varcs.java
+++ b/runescape-client/src/main/java/Varcs.java
@@ -33,19 +33,19 @@ public class Varcs {
 
    Varcs() {
       this.unwrittenChanges = false;
-      int var1 = ObjectSound.indexCache2.__s_396(19);
+      int var1 = ObjectSound.indexCache2.method4(19);
       this.map = new HashMap();
       this.intsPersistence = new boolean[var1];
 
       int var2;
-      for(var2 = 0; var2 < var1; ++var2) {
+      for (var2 = 0; var2 < var1; ++var2) {
          VarcInt var3 = AbstractByteArrayCopier.getVarcInt(var2);
          this.intsPersistence[var2] = var3.persist;
       }
 
       var2 = 0;
-      if(ObjectSound.indexCache2.__df_408(15)) {
-         var2 = ObjectSound.indexCache2.__s_396(15);
+      if (ObjectSound.indexCache2.method133(15)) {
+         var2 = ObjectSound.indexCache2.method4(15);
       }
 
       this.strings = new String[var2];
@@ -59,8 +59,8 @@ public class Varcs {
    )
    @Export("setInt")
    void setInt(int var1, int var2) {
-      this.map.put(Integer.valueOf(var1), Integer.valueOf(var2));
-      if(this.intsPersistence[var1]) {
+      this.map.put(var1, var2);
+      if (this.intsPersistence[var1]) {
          this.unwrittenChanges = true;
       }
 
@@ -73,8 +73,8 @@ public class Varcs {
    )
    @Export("getInt")
    int getInt(int var1) {
-      Object var2 = this.map.get(Integer.valueOf(var1));
-      return var2 instanceof Integer?((Integer)var2).intValue():-1;
+      Object var2 = this.map.get(var1);
+      return var2 instanceof Integer ? (Integer)var2 : -1;
    }
 
    @ObfuscatedName("q")
@@ -84,7 +84,7 @@ public class Varcs {
    )
    @Export("setString")
    void setString(int var1, String var2) {
-      this.map.put(Integer.valueOf(var1), var2);
+      this.map.put(var1, var2);
    }
 
    @ObfuscatedName("w")
@@ -94,8 +94,8 @@ public class Varcs {
    )
    @Export("getString")
    String getString(int var1) {
-      Object var2 = this.map.get(Integer.valueOf(var1));
-      return var2 instanceof String?(String)var2:"";
+      Object var2 = this.map.get(var1);
+      return var2 instanceof String ? (String)var2 : "";
    }
 
    @ObfuscatedName("o")
@@ -126,13 +126,13 @@ public class Varcs {
    @Export("clearTransient")
    void clearTransient() {
       int var1;
-      for(var1 = 0; var1 < this.intsPersistence.length; ++var1) {
-         if(!this.intsPersistence[var1]) {
-            this.map.remove(Integer.valueOf(var1));
+      for (var1 = 0; var1 < this.intsPersistence.length; ++var1) {
+         if (!this.intsPersistence[var1]) {
+            this.map.remove(var1);
          }
       }
 
-      for(var1 = 0; var1 < this.strings.length; ++var1) {
+      for (var1 = 0; var1 < this.strings.length; ++var1) {
          this.strings[var1] = null;
       }
 
@@ -162,15 +162,15 @@ public class Varcs {
          int var3 = 0;
          Iterator var4 = this.map.entrySet().iterator();
 
-         while(var4.hasNext()) {
+         while (var4.hasNext()) {
             Entry var5 = (Entry)var4.next();
-            int var6 = ((Integer)var5.getKey()).intValue();
-            if(this.intsPersistence[var6]) {
+            int var6 = (Integer)var5.getKey();
+            if (this.intsPersistence[var6]) {
                Object var7 = var5.getValue();
                var2 += 3;
-               if(var7 instanceof Integer) {
+               if (var7 instanceof Integer) {
                   var2 += 4;
-               } else if(var7 instanceof String) {
+               } else if (var7 instanceof String) {
                   var2 += WorldMapRegion.method550((String)var7);
                }
 
@@ -178,82 +178,72 @@ public class Varcs {
             }
          }
 
-         Buffer var32 = new Buffer(var2);
-         var32.writeByte(2);
-         var32.writeShort(var3);
-         Iterator var33 = this.map.entrySet().iterator();
+         Buffer var29 = new Buffer(var2);
+         var29.writeByte(2);
+         var29.writeShort(var3);
+         Iterator var30 = this.map.entrySet().iterator();
 
-         label185:
-         while(true) {
-            Entry var20;
-            int var21;
+         label187:
+         while (true) {
+            int var8;
+            Entry var31;
             do {
-               if(!var33.hasNext()) {
-                  var1.write(var32.array, 0, var32.index);
-                  break label185;
+               if (!var30.hasNext()) {
+                  var1.write(var29.array, 0, var29.index);
+                  break label187;
                }
 
-               var20 = (Entry)var33.next();
-               var21 = ((Integer)var20.getKey()).intValue();
-            } while(!this.intsPersistence[var21]);
+               var31 = (Entry)var30.next();
+               var8 = (Integer)var31.getKey();
+            } while(!this.intsPersistence[var8]);
 
-            var32.writeShort(var21);
-            Object var8 = var20.getValue();
-            Class var10 = var8.getClass();
+            var29.writeShort(var8);
+            Object var9 = var31.getValue();
+            Class var10 = var9.getClass();
             class3[] var11 = class3.method34();
-            int var12 = 0;
 
-            class3 var9;
-            while(true) {
-               if(var12 >= var11.length) {
-                  var9 = null;
-                  break;
+            class3 var13;
+            label174: {
+               for (int var12 = 0; var12 < var11.length; ++var12) {
+                  class3 var14 = var11[var12];
+                  if (var10 == var14.field18) {
+                     var13 = var14;
+                     break label174;
+                  }
                }
 
-               class3 var13 = var11[var12];
-               if(var10 == var13.field18) {
-                  var9 = var13;
-                  break;
-               }
-
-               ++var12;
+               var13 = null;
             }
 
-            var32.writeByte(var9.id);
-            Class var34 = var8.getClass();
+            var29.writeByte(var13.field1147);
+            Class var32 = var9.getClass();
             class3[] var15 = class3.method34();
-            int var16 = 0;
 
-            class3 var14;
-            while(true) {
-               if(var16 >= var15.length) {
-                  var14 = null;
-                  break;
+            class3 var17;
+            label184: {
+               for (int var16 = 0; var16 < var15.length; ++var16) {
+                  class3 var18 = var15[var16];
+                  if (var32 == var18.field18) {
+                     var17 = var18;
+                     break label184;
+                  }
                }
 
-               class3 var17 = var15[var16];
-               if(var34 == var17.field18) {
-                  var14 = var17;
-                  break;
-               }
-
-               ++var16;
+               var17 = null;
             }
 
-            if(var14 == null) {
+            if (var17 == null) {
                throw new IllegalArgumentException();
             }
 
-            class0 var22 = var14.field19;
-            var22.vmethod44(var8, var32);
+            class0 var33 = var17.field19;
+            var33.vmethod44(var9, var29);
          }
-      } catch (Exception var30) {
-         ;
+      } catch (Exception var27) {
       } finally {
          try {
             var1.close();
-         } catch (Exception var29) {
-            ;
+         } catch (Exception var26) {
          }
 
       }
@@ -271,80 +261,79 @@ public class Varcs {
    void read() {
       AccessFile var1 = this.getPreferencesFile(false);
 
-      label215: {
+      label225: {
          try {
             byte[] var2 = new byte[(int)var1.length()];
 
-            int var4;
-            for(int var3 = 0; var3 < var2.length; var3 += var4) {
-               var4 = var1.read(var2, var3, var2.length - var3);
-               if(var4 == -1) {
+            int var3;
+            for (int var4 = 0; var4 < var2.length; var4 += var3) {
+               var3 = var1.read(var2, var4, var2.length - var4);
+               if (var3 == -1) {
                   throw new EOFException();
                }
             }
 
-            Buffer var14 = new Buffer(var2);
-            if(var14.array.length - var14.index >= 1) {
-               int var15 = var14.readUnsignedByte();
-               if(var15 < 0 || var15 > 2) {
-                  return;
-               }
+            Buffer var25 = new Buffer(var2);
+            if (var25.array.length - var25.index < 1) {
+               return;
+            }
 
+            int var5 = var25.readUnsignedByte();
+            if (var5 >= 0 && var5 <= 2) {
+               int var6;
                int var7;
                int var8;
                int var9;
-               int var16;
-               if(var15 >= 2) {
-                  var16 = var14.__ag_302();
-                  var7 = 0;
+               if (var5 >= 2) {
+                  var9 = var25.method43();
+                  var6 = 0;
 
-                  while(true) {
-                     if(var7 >= var16) {
-                        break label215;
+                  while (true) {
+                     if (var6 >= var9) {
+                        break label225;
                      }
 
-                     var8 = var14.__ag_302();
-                     var9 = var14.readUnsignedByte();
-                     class3 var10 = (class3)ScriptFrame.findEnumerated(class3.method34(), var9);
-                     Object var11 = var10.method31(var14);
-                     if(this.intsPersistence[var8]) {
-                        this.map.put(Integer.valueOf(var8), var11);
+                     var7 = var25.method43();
+                     var8 = var25.readUnsignedByte();
+                     class3 var10 = (class3)ScriptFrame.findEnumerated(class3.method34(), var8);
+                     Object var11 = var10.method31(var25);
+                     if (this.intsPersistence[var7]) {
+                        this.map.put(var7, var11);
                      }
 
-                     ++var7;
+                     ++var6;
                   }
                } else {
-                  var16 = var14.__ag_302();
+                  var9 = var25.method43();
 
-                  for(var7 = 0; var7 < var16; ++var7) {
-                     var8 = var14.__ag_302();
-                     var9 = var14.readInt();
-                     if(this.intsPersistence[var8]) {
-                        this.map.put(Integer.valueOf(var8), Integer.valueOf(var9));
+                  for (var6 = 0; var6 < var9; ++var6) {
+                     var7 = var25.method43();
+                     var8 = var25.readInt();
+                     if (this.intsPersistence[var7]) {
+                        this.map.put(var7, var8);
                      }
                   }
 
-                  var7 = var14.__ag_302();
-                  var8 = 0;
+                  var6 = var25.method43();
+                  var7 = 0;
 
-                  while(true) {
-                     if(var8 >= var7) {
-                        break label215;
+                  while (true) {
+                     if (var7 >= var6) {
+                        break label225;
                      }
 
-                     var14.__ag_302();
-                     var14.readStringCp1252NullTerminated();
-                     ++var8;
+                     var25.method43();
+                     var25.readStringCp1252NullTerminated();
+                     ++var7;
                   }
                }
             }
-         } catch (Exception var25) {
-            break label215;
+         } catch (Exception var23) {
+            break label225;
          } finally {
             try {
                var1.close();
-            } catch (Exception var24) {
-               ;
+            } catch (Exception var22) {
             }
 
          }
@@ -362,7 +351,7 @@ public class Varcs {
    )
    @Export("tryWrite")
    void tryWrite() {
-      if(this.unwrittenChanges && this.lastWriteTimeMs < class203.currentTimeMs() - 60000L) {
+      if (this.unwrittenChanges && this.lastWriteTimeMs < class203.currentTimeMs() - 60000L) {
          this.write();
       }
 
@@ -384,7 +373,7 @@ public class Varcs {
       garbageValue = "321265868"
    )
    public static void method2160(AbstractIndexCache var0) {
-      OverlayDefinition.__jf_m = var0;
+      OverlayDefinition.field663 = var0;
    }
 
    @ObfuscatedName("q")
@@ -393,13 +382,14 @@ public class Varcs {
       garbageValue = "1119202993"
    )
    static final void method2166(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) {
+      int var6;
       int var7;
-      int var8;
-      for(int var6 = 0; var6 < 4; ++var6) {
-         for(var7 = 0; var7 < 64; ++var7) {
-            for(var8 = 0; var8 < 64; ++var8) {
-               if(var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) {
-                  var5[var6].flags[var7 + var1][var8 + var2] &= -16777217;
+      for (int var8 = 0; var8 < 4; ++var8) {
+         for (var6 = 0; var6 < 64; ++var6) {
+            for (var7 = 0; var7 < 64; ++var7) {
+               if (var6 + var1 > 0 && var6 + var1 < 103 && var7 + var2 > 0 && var7 + var2 < 103) {
+                  int[] var10000 = var5[var8].flags[var6 + var1];
+                  var10000[var7 + var2] &= -16777217;
                }
             }
          }
@@ -407,10 +397,10 @@ public class Varcs {
 
       Buffer var10 = new Buffer(var0);
 
-      for(var7 = 0; var7 < 4; ++var7) {
-         for(var8 = 0; var8 < 64; ++var8) {
-            for(int var9 = 0; var9 < 64; ++var9) {
-               TotalQuantityComparator.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0);
+      for (var6 = 0; var6 < 4; ++var6) {
+         for (var7 = 0; var7 < 64; ++var7) {
+            for (int var9 = 0; var9 < 64; ++var9) {
+               TotalQuantityComparator.loadTerrain(var10, var6, var7 + var1, var9 + var2, var3, var4, 0);
             }
          }
       }
@@ -423,11 +413,11 @@ public class Varcs {
       garbageValue = "1592367053"
    )
    static final void method2168(Widget var0, int var1, int var2, int var3) {
-      if(var0.__cc == null) {
+      if (var0.field968 == null) {
          throw new RuntimeException();
       } else {
-         var0.__cc[var1] = var2;
-         var0.__ci[var1] = var3;
+         var0.field968[var1] = var2;
+         var0.field969[var1] = var3;
       }
    }
 }
diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java
index 1fb5900843..658062221e 100644
--- a/runescape-client/src/main/java/VarpDefinition.java
+++ b/runescape-client/src/main/java/VarpDefinition.java
@@ -11,12 +11,12 @@ public class VarpDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __ix_m;
+   public static AbstractIndexCache field943;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 510774535
    )
-   public static int __ix_f;
+   public static int field944;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -30,10 +30,6 @@ public class VarpDefinition extends DualNode {
    @Export("type")
    public int type;
 
-   static {
-      VarpDefinition_cached = new EvictingDualNodeHashTable(64);
-   }
-
    VarpDefinition() {
       this.type = 0;
    }
@@ -45,9 +41,9 @@ public class VarpDefinition extends DualNode {
    )
    @Export("read")
    void read(Buffer var1) {
-      while(true) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
@@ -62,9 +58,13 @@ public class VarpDefinition extends DualNode {
    )
    @Export("readNext")
    void readNext(Buffer var1, int var2) {
-      if(var2 == 5) {
-         this.type = var1.__ag_302();
+      if (var2 == 5) {
+         this.type = var1.method43();
       }
 
    }
+
+   static {
+      VarpDefinition_cached = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java
index 9e064f5004..57745938a0 100644
--- a/runescape-client/src/main/java/Varps.java
+++ b/runescape-client/src/main/java/Varps.java
@@ -23,19 +23,6 @@ public class Varps {
    @Export("loginBoxCenter")
    static int loginBoxCenter;
 
-   static {
-      Varps_masks = new int[32];
-      int var0 = 2;
-
-      for(int var1 = 0; var1 < 32; ++var1) {
-         Varps_masks[var1] = var0 - 1;
-         var0 += var0;
-      }
-
-      Varps_temp = new int[4000];
-      Varps_main = new int[4000];
-   }
-
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Lir;I)V",
@@ -51,11 +38,25 @@ public class Varps {
       garbageValue = "-1714608824"
    )
    static void method4400(Buffer var0) {
-      if(Client.__client_ev != null) {
-         var0.__s_297(Client.__client_ev, 0, Client.__client_ev.length);
+      if (Client.field172 != null) {
+         var0.method38(Client.field172, 0, Client.field172.length);
       } else {
          byte[] var1 = AttackOption.method2032();
-         var0.__s_297(var1, 0, var1.length);
+         var0.method38(var1, 0, var1.length);
       }
+
+   }
+
+   static {
+      Varps_masks = new int[32];
+      int var0 = 2;
+
+      for (int var1 = 0; var1 < 32; ++var1) {
+         Varps_masks[var1] = var0 - 1;
+         var0 += var0;
+      }
+
+      Varps_temp = new int[4000];
+      Varps_main = new int[4000];
    }
 }
diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java
index 05c9b9616c..213155cbe1 100644
--- a/runescape-client/src/main/java/VertexNormal.java
+++ b/runescape-client/src/main/java/VertexNormal.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
@@ -8,32 +7,32 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("VertexNormal")
 public class VertexNormal {
    @ObfuscatedName("pe")
-   static boolean __dq_pe;
+   static boolean field945;
    @ObfuscatedName("rq")
    @ObfuscatedGetter(
       intValue = 1351620693
    )
-   static int __dq_rq;
+   static int field946;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 1414310131
    )
-   int __m;
+   int field947;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = -1493845293
    )
-   int __f;
+   int field948;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 1575149515
    )
-   int __q;
+   int field949;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = -487323631
    )
-   int __w;
+   int field950;
 
    VertexNormal() {
    }
@@ -42,10 +41,10 @@ public class VertexNormal {
       signature = "(Ldq;)V"
    )
    VertexNormal(VertexNormal var1) {
-      this.__m = var1.__m;
-      this.__f = var1.__f;
-      this.__q = var1.__q;
-      this.__w = var1.__w;
+      this.field947 = var1.field947;
+      this.field948 = var1.field948;
+      this.field949 = var1.field949;
+      this.field950 = var1.field950;
    }
 
    @ObfuscatedName("w")
@@ -54,22 +53,20 @@ public class VertexNormal {
       garbageValue = "-86"
    )
    static synchronized void method2984(byte[] var0) {
-      if(var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) {
+      if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) {
          ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0;
-      } else if(var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) {
+      } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) {
          ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0;
-      } else if(var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) {
+      } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) {
          ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0;
-      } else {
-         if(RouteStrategy.__fe_e != null) {
-            for(int var1 = 0; var1 < ByteArrayPool.__gi_g.length; ++var1) {
-               if(var0.length == ByteArrayPool.__gi_g[var1] && WorldMapSection2.__ah_l[var1] < RouteStrategy.__fe_e[var1].length) {
-                  RouteStrategy.__fe_e[var1][WorldMapSection2.__ah_l[var1]++] = var0;
-                  return;
-               }
+      } else if (RouteStrategy.field760 != null) {
+         for (int var1 = 0; var1 < ByteArrayPool.field55.length; ++var1) {
+            if (var0.length == ByteArrayPool.field55[var1] && WorldMapSection2.field1082[var1] < RouteStrategy.field760[var1].length) {
+               RouteStrategy.field760[var1][WorldMapSection2.field1082[var1]++] = var0;
+               return;
             }
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java
index c1ff7b8b25..57312a18ae 100644
--- a/runescape-client/src/main/java/ViewportMouse.java
+++ b/runescape-client/src/main/java/ViewportMouse.java
@@ -29,22 +29,22 @@ public class ViewportMouse {
    @ObfuscatedGetter(
       intValue = 1135175963
    )
-   static int __dm_u;
+   static int field951;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = 262104267
    )
-   static int __dm_g;
+   static int field952;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -2071972829
    )
-   static int __dm_l;
+   static int field953;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = -852671813
    )
-   static int __dm_k;
+   static int field954;
    @ObfuscatedName("i")
    @ObfuscatedGetter(
       intValue = -2140977119
@@ -55,15 +55,6 @@ public class ViewportMouse {
    @Export("ViewportMouse_entityTags")
    public static long[] ViewportMouse_entityTags;
 
-   static {
-      ViewportMouse_isInViewport = false;
-      ViewportMouse_x = 0;
-      ViewportMouse_y = 0;
-      ViewportMouse_false0 = false;
-      ViewportMouse_entityCount = 0;
-      ViewportMouse_entityTags = new long[1000];
-   }
-
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(IB)Lic;",
@@ -71,7 +62,7 @@ public class ViewportMouse {
    )
    @Export("getWorldMapElement")
    public static WorldMapElement getWorldMapElement(int var0) {
-      return var0 >= 0 && var0 < Widget.WorldMapElement_cached.length && Widget.WorldMapElement_cached[var0] != null?Widget.WorldMapElement_cached[var0]:new WorldMapElement(var0);
+      return var0 >= 0 && var0 < Widget.WorldMapElement_cached.length && Widget.WorldMapElement_cached[var0] != null ? Widget.WorldMapElement_cached[var0] : new WorldMapElement(var0);
    }
 
    @ObfuscatedName("h")
@@ -81,22 +72,22 @@ public class ViewportMouse {
    )
    static int method2983(int var0, Script var1, boolean var2) {
       Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-      if(var0 == 2500) {
+      if (var0 == 2500) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.x;
          return 1;
-      } else if(var0 == 2501) {
+      } else if (var0 == 2501) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.y;
          return 1;
-      } else if(var0 == 2502) {
+      } else if (var0 == 2502) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.width;
          return 1;
-      } else if(var0 == 2503) {
+      } else if (var0 == 2503) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.height;
          return 1;
-      } else if(var0 == 2504) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden?1:0;
+      } else if (var0 == 2504) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
          return 1;
-      } else if(var0 == 2505) {
+      } else if (var0 == 2505) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.parentId;
          return 1;
       } else {
@@ -111,40 +102,49 @@ public class ViewportMouse {
    )
    static final boolean method2957(Widget var0) {
       int var1 = var0.contentType;
-      if(var1 == 205) {
-         Client.__client_fd = 250;
+      if (var1 == 205) {
+         Client.field175 = 250;
          return true;
       } else {
          int var2;
          int var3;
-         if(var1 >= 300 && var1 <= 313) {
+         if (var1 >= 300 && var1 <= 313) {
             var2 = (var1 - 300) / 2;
             var3 = var1 & 1;
-            Client.__client_ru.__f_386(var2, var3 == 1);
+            Client.field119.method257(var2, var3 == 1);
          }
 
-         if(var1 >= 314 && var1 <= 323) {
+         if (var1 >= 314 && var1 <= 323) {
             var2 = (var1 - 314) / 2;
             var3 = var1 & 1;
-            Client.__client_ru.__q_387(var2, var3 == 1);
+            Client.field119.method258(var2, var3 == 1);
          }
 
-         if(var1 == 324) {
-            Client.__client_ru.__w_388(false);
+         if (var1 == 324) {
+            Client.field119.method259(false);
          }
 
-         if(var1 == 325) {
-            Client.__client_ru.__w_388(true);
+         if (var1 == 325) {
+            Client.field119.method259(true);
          }
 
-         if(var1 == 326) {
-            PacketBufferNode var4 = Interpreter.method1915(ClientPacket.__gs_n, Client.packetWriter.isaacCipher);
-            Client.__client_ru.__o_389(var4.packetBuffer);
-            Client.packetWriter.__q_167(var4);
+         if (var1 == 326) {
+            PacketBufferNode var4 = Interpreter.method1915(ClientPacket.field234, Client.packetWriter.isaacCipher);
+            Client.field119.method260(var4.packetBuffer);
+            Client.packetWriter.method241(var4);
             return true;
          } else {
             return false;
          }
       }
    }
+
+   static {
+      ViewportMouse_isInViewport = false;
+      ViewportMouse_x = 0;
+      ViewportMouse_y = 0;
+      ViewportMouse_false0 = false;
+      ViewportMouse_entityCount = 0;
+      ViewportMouse_entityTags = new long[1000];
+   }
 }
diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java
index b472fef687..517e9deb81 100644
--- a/runescape-client/src/main/java/WallDecoration.java
+++ b/runescape-client/src/main/java/WallDecoration.java
@@ -85,14 +85,14 @@ public final class WallDecoration {
       garbageValue = "1120739015"
    )
    public static int method3257(byte[] var0, int var1) {
-      int var3 = -1;
+      int var2 = -1;
 
-      for(int var4 = 0; var4 < var1; ++var4) {
-         var3 = var3 >>> 8 ^ Buffer.__gr_q[(var3 ^ var0[var4]) & 255];
+      for (int var3 = 0; var3 < var1; ++var3) {
+         var2 = var2 >>> 8 ^ Buffer.field45[(var2 ^ var0[var3]) & 255];
       }
 
-      var3 = ~var3;
-      return var3;
+      var2 = ~var2;
+      return var2;
    }
 
    @ObfuscatedName("t")
@@ -101,6 +101,6 @@ public final class WallDecoration {
       garbageValue = "-881894911"
    )
    public static int method3256(int var0) {
-      return var0 > 0?1:(var0 < 0?-1:0);
+      return var0 > 0 ? 1 : (var0 < 0 ? -1 : 0);
    }
 }
diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java
index afda76d29b..46cb448535 100644
--- a/runescape-client/src/main/java/Widget.java
+++ b/runescape-client/src/main/java/Widget.java
@@ -32,7 +32,7 @@ public class Widget extends Node {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __ho_d;
+   public static AbstractIndexCache field955;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -55,9 +55,9 @@ public class Widget extends Node {
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   static EvictingDualNodeHashTable __ho_z;
+   static EvictingDualNodeHashTable field956;
    @ObfuscatedName("j")
-   public static boolean __ho_j;
+   public static boolean field957;
    @ObfuscatedName("s")
    @Export("isIf3")
    public boolean isIf3;
@@ -167,12 +167,12 @@ public class Widget extends Node {
    @ObfuscatedGetter(
       intValue = 206556853
    )
-   public int __aw;
+   public int field958;
    @ObfuscatedName("al")
    @ObfuscatedGetter(
       intValue = -1047989223
    )
-   public int __al;
+   public int field959;
    @ObfuscatedName("ab")
    @ObfuscatedGetter(
       intValue = -617209253
@@ -249,7 +249,7 @@ public class Widget extends Node {
    @ObfuscatedGetter(
       intValue = -1853255291
    )
-   public int __af;
+   public int field960;
    @ObfuscatedName("ai")
    @ObfuscatedGetter(
       intValue = -110526699
@@ -257,7 +257,7 @@ public class Widget extends Node {
    @Export("lineWid")
    public int lineWid;
    @ObfuscatedName("ba")
-   public boolean __ba;
+   public boolean field961;
    @ObfuscatedName("bb")
    @ObfuscatedGetter(
       intValue = -1074168553
@@ -373,17 +373,17 @@ public class Widget extends Node {
    @ObfuscatedGetter(
       intValue = -1692331135
    )
-   public int __bf;
+   public int field962;
    @ObfuscatedName("bh")
    @ObfuscatedGetter(
       intValue = 727421593
    )
-   public int __bh;
+   public int field963;
    @ObfuscatedName("be")
    @Export("modelOrthog")
    public boolean modelOrthog;
    @ObfuscatedName("bv")
-   public boolean __bv;
+   public boolean field964;
    @ObfuscatedName("bw")
    @ObfuscatedGetter(
       intValue = -1658511475
@@ -454,15 +454,15 @@ public class Widget extends Node {
    @Export("clickMask")
    public int clickMask;
    @ObfuscatedName("cg")
-   public boolean __cg;
+   public boolean field965;
    @ObfuscatedName("cf")
-   public byte[][] __cf;
+   public byte[][] field966;
    @ObfuscatedName("cp")
-   public byte[][] __cp;
+   public byte[][] field967;
    @ObfuscatedName("cc")
-   public int[] __cc;
+   public int[] field968;
    @ObfuscatedName("ci")
-   public int[] __ci;
+   public int[] field969;
    @ObfuscatedName("de")
    @Export("dataText")
    public String dataText;
@@ -560,27 +560,27 @@ public class Widget extends Node {
    @Export("onScroll")
    public Object[] onScroll;
    @ObfuscatedName("em")
-   public Object[] __em;
+   public Object[] field970;
    @ObfuscatedName("ed")
    @Export("onKeyListener")
    public Object[] onKeyListener;
    @ObfuscatedName("ex")
-   public Object[] __ex;
+   public Object[] field971;
    @ObfuscatedName("ej")
-   public Object[] __ej;
+   public Object[] field972;
    @ObfuscatedName("el")
-   public Object[] __el;
+   public Object[] field973;
    @ObfuscatedName("en")
    @Export("onDialogAbortListener")
    public Object[] onDialogAbortListener;
    @ObfuscatedName("ei")
-   public Object[] __ei;
+   public Object[] field974;
    @ObfuscatedName("ee")
-   public Object[] __ee;
+   public Object[] field975;
    @ObfuscatedName("eq")
-   public Object[] __eq;
+   public Object[] field976;
    @ObfuscatedName("eh")
-   public Object[] __eh;
+   public Object[] field977;
    @ObfuscatedName("eo")
    @Export("cs1Instructions")
    public int[][] cs1Instructions;
@@ -639,29 +639,29 @@ public class Widget extends Node {
    @Export("children")
    public Widget[] children;
    @ObfuscatedName("fq")
-   public boolean __fq;
+   public boolean field978;
    @ObfuscatedName("fw")
-   public boolean __fw;
+   public boolean field979;
    @ObfuscatedName("fg")
    @ObfuscatedGetter(
       intValue = -1520351537
    )
-   public int __fg;
+   public int field980;
    @ObfuscatedName("fc")
    @ObfuscatedGetter(
       intValue = 209458049
    )
-   public int __fc;
+   public int field981;
    @ObfuscatedName("fl")
    @ObfuscatedGetter(
       intValue = -672198209
    )
-   public int __fl;
+   public int field982;
    @ObfuscatedName("fj")
    @ObfuscatedGetter(
       intValue = 876695207
    )
-   public int __fj;
+   public int field983;
    @ObfuscatedName("fp")
    @ObfuscatedGetter(
       intValue = 365867737
@@ -675,7 +675,7 @@ public class Widget extends Node {
    @Export("cycle")
    public int cycle;
    @ObfuscatedName("fh")
-   public int[] __fh;
+   public int[] field984;
    @ObfuscatedName("fx")
    @Export("noClickThrough")
    public boolean noClickThrough;
@@ -683,15 +683,7 @@ public class Widget extends Node {
    @Export("noScrollThrough")
    public boolean noScrollThrough;
    @ObfuscatedName("fz")
-   public boolean __fz;
-
-   static {
-      widgetSpriteCache = new EvictingDualNodeHashTable(200);
-      Widget_cachedModels = new EvictingDualNodeHashTable(50);
-      Widget_cachedFonts = new EvictingDualNodeHashTable(20);
-      __ho_z = new EvictingDualNodeHashTable(8);
-      __ho_j = false;
-   }
+   public boolean field985;
 
    public Widget() {
       this.isIf3 = false;
@@ -711,8 +703,8 @@ public class Widget extends Node {
       this.y = 0;
       this.width = 0;
       this.height = 0;
-      this.__aw = 1;
-      this.__al = 1;
+      this.field958 = 1;
+      this.field959 = 1;
       this.parentId = -1;
       this.isHidden = false;
       this.scrollX = 0;
@@ -724,11 +716,11 @@ public class Widget extends Node {
       this.mouseOverColor = 0;
       this.mouseOverColor2 = 0;
       this.fill = false;
-      this.rectangleMode = RectangleMode.__lj_m;
+      this.rectangleMode = RectangleMode.field757;
       this.transparency = 0;
-      this.__af = 0;
+      this.field960 = 0;
       this.lineWid = 1;
-      this.__ba = false;
+      this.field961 = false;
       this.spriteId2 = -1;
       this.spriteId = -1;
       this.spriteAngle = 0;
@@ -747,10 +739,10 @@ public class Widget extends Node {
       this.modelAngleY = 0;
       this.modelAngleZ = 0;
       this.modelZoom = 100;
-      this.__bf = 0;
-      this.__bh = 0;
+      this.field962 = 0;
+      this.field963 = 0;
       this.modelOrthog = false;
-      this.__bv = false;
+      this.field964 = false;
       this.itemQuantityMode = 2;
       this.fontId = -1;
       this.text = "";
@@ -762,7 +754,7 @@ public class Widget extends Node {
       this.paddingX = 0;
       this.paddingY = 0;
       this.clickMask = 0;
-      this.__cg = false;
+      this.field965 = false;
       this.dataText = "";
       this.parent = null;
       this.dragZoneSize = 0;
@@ -777,17 +769,17 @@ public class Widget extends Node {
       this.itemQuantity = 0;
       this.modelFrame = 0;
       this.modelFrameCycle = 0;
-      this.__fq = false;
-      this.__fw = false;
-      this.__fg = -1;
-      this.__fc = 0;
-      this.__fl = 0;
-      this.__fj = 0;
+      this.field978 = false;
+      this.field979 = false;
+      this.field980 = -1;
+      this.field981 = 0;
+      this.field982 = 0;
+      this.field983 = 0;
       this.rootIndex = -1;
       this.cycle = -1;
       this.noClickThrough = false;
       this.noScrollThrough = false;
-      this.__fz = false;
+      this.field985 = false;
    }
 
    @ObfuscatedName("o")
@@ -800,33 +792,33 @@ public class Widget extends Node {
       this.isIf3 = false;
       this.type = var1.readUnsignedByte();
       this.buttonType = var1.readUnsignedByte();
-      this.contentType = var1.__ag_302();
-      this.rawX = var1.__aq_303();
-      this.rawY = var1.__aq_303();
-      this.rawWidth = var1.__ag_302();
-      this.rawHeight = var1.__ag_302();
+      this.contentType = var1.method43();
+      this.rawX = var1.method44();
+      this.rawY = var1.method44();
+      this.rawWidth = var1.method43();
+      this.rawHeight = var1.method43();
       this.transparency = var1.readUnsignedByte();
-      this.parentId = var1.__ag_302();
-      if(this.parentId == 65535) {
+      this.parentId = var1.method43();
+      if (this.parentId == 65535) {
          this.parentId = -1;
       } else {
          this.parentId += this.id & -65536;
       }
 
-      this.mouseOverRedirect = var1.__ag_302();
-      if(this.mouseOverRedirect == 65535) {
+      this.mouseOverRedirect = var1.method43();
+      if (this.mouseOverRedirect == 65535) {
          this.mouseOverRedirect = -1;
       }
 
       int var2 = var1.readUnsignedByte();
       int var3;
-      if(var2 > 0) {
+      if (var2 > 0) {
          this.cs1Comparisons = new int[var2];
          this.cs1ComparisonValues = new int[var2];
 
-         for(var3 = 0; var3 < var2; ++var3) {
+         for (var3 = 0; var3 < var2; ++var3) {
             this.cs1Comparisons[var3] = var1.readUnsignedByte();
-            this.cs1ComparisonValues[var3] = var1.__ag_302();
+            this.cs1ComparisonValues[var3] = var1.method43();
          }
       }
 
@@ -834,52 +826,52 @@ public class Widget extends Node {
       int var4;
       int var5;
       int var6;
-      if(var3 > 0) {
+      if (var3 > 0) {
          this.cs1Instructions = new int[var3][];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            var5 = var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            var5 = var1.method43();
             this.cs1Instructions[var4] = new int[var5];
 
-            for(var6 = 0; var6 < var5; ++var6) {
-               this.cs1Instructions[var4][var6] = var1.__ag_302();
-               if(this.cs1Instructions[var4][var6] == 65535) {
+            for (var6 = 0; var6 < var5; ++var6) {
+               this.cs1Instructions[var4][var6] = var1.method43();
+               if (this.cs1Instructions[var4][var6] == 65535) {
                   this.cs1Instructions[var4][var6] = -1;
                }
             }
          }
       }
 
-      if(this.type == 0) {
-         this.scrollHeight = var1.__ag_302();
+      if (this.type == 0) {
+         this.scrollHeight = var1.method43();
          this.isHidden = var1.readUnsignedByte() == 1;
       }
 
-      if(this.type == 1) {
-         var1.__ag_302();
+      if (this.type == 1) {
+         var1.method43();
          var1.readUnsignedByte();
       }
 
-      if(this.type == 2) {
+      if (this.type == 2) {
          this.itemIds = new int[this.rawHeight * this.rawWidth];
          this.itemQuantities = new int[this.rawWidth * this.rawHeight];
          var4 = var1.readUnsignedByte();
-         if(var4 == 1) {
+         if (var4 == 1) {
             this.clickMask |= 268435456;
          }
 
          var5 = var1.readUnsignedByte();
-         if(var5 == 1) {
+         if (var5 == 1) {
             this.clickMask |= 1073741824;
          }
 
          var6 = var1.readUnsignedByte();
-         if(var6 == 1) {
+         if (var6 == 1) {
             this.clickMask |= Integer.MIN_VALUE;
          }
 
          int var7 = var1.readUnsignedByte();
-         if(var7 == 1) {
+         if (var7 == 1) {
             this.clickMask |= 536870912;
          }
 
@@ -890,11 +882,11 @@ public class Widget extends Node {
          this.inventorySprites = new int[20];
 
          int var8;
-         for(var8 = 0; var8 < 20; ++var8) {
+         for (var8 = 0; var8 < 20; ++var8) {
             int var9 = var1.readUnsignedByte();
-            if(var9 == 1) {
-               this.inventoryXOffsets[var8] = var1.__aq_303();
-               this.inventoryYOffsets[var8] = var1.__aq_303();
+            if (var9 == 1) {
+               this.inventoryXOffsets[var8] = var1.method44();
+               this.inventoryYOffsets[var8] = var1.method44();
                this.inventorySprites[var8] = var1.readInt();
             } else {
                this.inventorySprites[var8] = -1;
@@ -903,145 +895,145 @@ public class Widget extends Node {
 
          this.itemActions = new String[5];
 
-         for(var8 = 0; var8 < 5; ++var8) {
+         for (var8 = 0; var8 < 5; ++var8) {
             String var11 = var1.readStringCp1252NullTerminated();
-            if(var11.length() > 0) {
+            if (var11.length() > 0) {
                this.itemActions[var8] = var11;
                this.clickMask |= 1 << var8 + 23;
             }
          }
       }
 
-      if(this.type == 3) {
+      if (this.type == 3) {
          this.fill = var1.readUnsignedByte() == 1;
       }
 
-      if(this.type == 4 || this.type == 1) {
+      if (this.type == 4 || this.type == 1) {
          this.textXAlignment = var1.readUnsignedByte();
          this.textYAlignment = var1.readUnsignedByte();
          this.textLineHeight = var1.readUnsignedByte();
-         this.fontId = var1.__ag_302();
-         if(this.fontId == 65535) {
+         this.fontId = var1.method43();
+         if (this.fontId == 65535) {
             this.fontId = -1;
          }
 
          this.textShadowed = var1.readUnsignedByte() == 1;
       }
 
-      if(this.type == 4) {
+      if (this.type == 4) {
          this.text = var1.readStringCp1252NullTerminated();
          this.text2 = var1.readStringCp1252NullTerminated();
       }
 
-      if(this.type == 1 || this.type == 3 || this.type == 4) {
+      if (this.type == 1 || this.type == 3 || this.type == 4) {
          this.color = var1.readInt();
       }
 
-      if(this.type == 3 || this.type == 4) {
+      if (this.type == 3 || this.type == 4) {
          this.color2 = var1.readInt();
          this.mouseOverColor = var1.readInt();
          this.mouseOverColor2 = var1.readInt();
       }
 
-      if(this.type == 5) {
+      if (this.type == 5) {
          this.spriteId2 = var1.readInt();
          this.spriteId = var1.readInt();
       }
 
-      if(this.type == 6) {
+      if (this.type == 6) {
          this.modelType = 1;
-         this.modelId = var1.__ag_302();
-         if(this.modelId == 65535) {
+         this.modelId = var1.method43();
+         if (this.modelId == 65535) {
             this.modelId = -1;
          }
 
          this.modelType2 = 1;
-         this.modelId2 = var1.__ag_302();
-         if(this.modelId2 == 65535) {
+         this.modelId2 = var1.method43();
+         if (this.modelId2 == 65535) {
             this.modelId2 = -1;
          }
 
-         this.sequenceId = var1.__ag_302();
-         if(this.sequenceId == 65535) {
+         this.sequenceId = var1.method43();
+         if (this.sequenceId == 65535) {
             this.sequenceId = -1;
          }
 
-         this.sequenceId2 = var1.__ag_302();
-         if(this.sequenceId2 == 65535) {
+         this.sequenceId2 = var1.method43();
+         if (this.sequenceId2 == 65535) {
             this.sequenceId2 = -1;
          }
 
-         this.modelZoom = var1.__ag_302();
-         this.modelAngleX = var1.__ag_302();
-         this.modelAngleY = var1.__ag_302();
+         this.modelZoom = var1.method43();
+         this.modelAngleX = var1.method43();
+         this.modelAngleY = var1.method43();
       }
 
-      if(this.type == 7) {
+      if (this.type == 7) {
          this.itemIds = new int[this.rawHeight * this.rawWidth];
          this.itemQuantities = new int[this.rawWidth * this.rawHeight];
          this.textXAlignment = var1.readUnsignedByte();
-         this.fontId = var1.__ag_302();
-         if(this.fontId == 65535) {
+         this.fontId = var1.method43();
+         if (this.fontId == 65535) {
             this.fontId = -1;
          }
 
          this.textShadowed = var1.readUnsignedByte() == 1;
          this.color = var1.readInt();
-         this.paddingX = var1.__aq_303();
-         this.paddingY = var1.__aq_303();
+         this.paddingX = var1.method44();
+         this.paddingY = var1.method44();
          var4 = var1.readUnsignedByte();
-         if(var4 == 1) {
+         if (var4 == 1) {
             this.clickMask |= 1073741824;
          }
 
          this.itemActions = new String[5];
 
-         for(var5 = 0; var5 < 5; ++var5) {
+         for (var5 = 0; var5 < 5; ++var5) {
             String var10 = var1.readStringCp1252NullTerminated();
-            if(var10.length() > 0) {
+            if (var10.length() > 0) {
                this.itemActions[var5] = var10;
                this.clickMask |= 1 << var5 + 23;
             }
          }
       }
 
-      if(this.type == 8) {
+      if (this.type == 8) {
          this.text = var1.readStringCp1252NullTerminated();
       }
 
-      if(this.buttonType == 2 || this.type == 2) {
+      if (this.buttonType == 2 || this.type == 2) {
          this.spellActionName = var1.readStringCp1252NullTerminated();
          this.spellName = var1.readStringCp1252NullTerminated();
-         var4 = var1.__ag_302() & 63;
+         var4 = var1.method43() & 63;
          this.clickMask |= var4 << 11;
       }
 
-      if(this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) {
+      if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) {
          this.buttonText = var1.readStringCp1252NullTerminated();
-         if(this.buttonText.length() == 0) {
-            if(this.buttonType == 1) {
+         if (this.buttonText.length() == 0) {
+            if (this.buttonType == 1) {
                this.buttonText = "Ok";
             }
 
-            if(this.buttonType == 4) {
+            if (this.buttonType == 4) {
                this.buttonText = "Select";
             }
 
-            if(this.buttonType == 5) {
+            if (this.buttonType == 5) {
                this.buttonText = "Select";
             }
 
-            if(this.buttonType == 6) {
+            if (this.buttonType == 6) {
                this.buttonText = "Continue";
             }
          }
       }
 
-      if(this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) {
+      if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) {
          this.clickMask |= 4194304;
       }
 
-      if(this.buttonType == 6) {
+      if (this.buttonType == 6) {
          this.clickMask |= 1;
       }
 
@@ -1057,37 +1049,37 @@ public class Widget extends Node {
       var1.readUnsignedByte();
       this.isIf3 = true;
       this.type = var1.readUnsignedByte();
-      this.contentType = var1.__ag_302();
-      this.rawX = var1.__aq_303();
-      this.rawY = var1.__aq_303();
-      this.rawWidth = var1.__ag_302();
-      if(this.type == 9) {
-         this.rawHeight = var1.__aq_303();
+      this.contentType = var1.method43();
+      this.rawX = var1.method44();
+      this.rawY = var1.method44();
+      this.rawWidth = var1.method43();
+      if (this.type == 9) {
+         this.rawHeight = var1.method44();
       } else {
-         this.rawHeight = var1.__ag_302();
+         this.rawHeight = var1.method43();
       }
 
       this.widthAlignment = var1.readByte();
       this.heightAlignment = var1.readByte();
       this.xAlignment = var1.readByte();
       this.yAlignment = var1.readByte();
-      this.parentId = var1.__ag_302();
-      if(this.parentId == 65535) {
+      this.parentId = var1.method43();
+      if (this.parentId == 65535) {
          this.parentId = -1;
       } else {
          this.parentId += this.id & -65536;
       }
 
       this.isHidden = var1.readUnsignedByte() == 1;
-      if(this.type == 0) {
-         this.scrollWidth = var1.__ag_302();
-         this.scrollHeight = var1.__ag_302();
+      if (this.type == 0) {
+         this.scrollWidth = var1.method43();
+         this.scrollHeight = var1.method43();
          this.noClickThrough = var1.readUnsignedByte() == 1;
       }
 
-      if(this.type == 5) {
+      if (this.type == 5) {
          this.spriteId2 = var1.readInt();
-         this.spriteAngle = var1.__ag_302();
+         this.spriteAngle = var1.method43();
          this.spriteTiling = var1.readUnsignedByte() == 1;
          this.transparency = var1.readUnsignedByte();
          this.outline = var1.readUnsignedByte();
@@ -1096,38 +1088,38 @@ public class Widget extends Node {
          this.spriteFlipH = var1.readUnsignedByte() == 1;
       }
 
-      if(this.type == 6) {
+      if (this.type == 6) {
          this.modelType = 1;
-         this.modelId = var1.__ag_302();
-         if(this.modelId == 65535) {
+         this.modelId = var1.method43();
+         if (this.modelId == 65535) {
             this.modelId = -1;
          }
 
-         this.modelOffsetX = var1.__aq_303();
-         this.modelOffsetY = var1.__aq_303();
-         this.modelAngleX = var1.__ag_302();
-         this.modelAngleY = var1.__ag_302();
-         this.modelAngleZ = var1.__ag_302();
-         this.modelZoom = var1.__ag_302();
-         this.sequenceId = var1.__ag_302();
-         if(this.sequenceId == 65535) {
+         this.modelOffsetX = var1.method44();
+         this.modelOffsetY = var1.method44();
+         this.modelAngleX = var1.method43();
+         this.modelAngleY = var1.method43();
+         this.modelAngleZ = var1.method43();
+         this.modelZoom = var1.method43();
+         this.sequenceId = var1.method43();
+         if (this.sequenceId == 65535) {
             this.sequenceId = -1;
          }
 
          this.modelOrthog = var1.readUnsignedByte() == 1;
-         var1.__ag_302();
-         if(this.widthAlignment != 0) {
-            this.__bf = var1.__ag_302();
+         var1.method43();
+         if (this.widthAlignment != 0) {
+            this.field962 = var1.method43();
          }
 
-         if(this.heightAlignment != 0) {
-            var1.__ag_302();
+         if (this.heightAlignment != 0) {
+            var1.method43();
          }
       }
 
-      if(this.type == 4) {
-         this.fontId = var1.__ag_302();
-         if(this.fontId == 65535) {
+      if (this.type == 4) {
+         this.fontId = var1.method43();
+         if (this.fontId == 65535) {
             this.fontId = -1;
          }
 
@@ -1139,25 +1131,25 @@ public class Widget extends Node {
          this.color = var1.readInt();
       }
 
-      if(this.type == 3) {
+      if (this.type == 3) {
          this.color = var1.readInt();
          this.fill = var1.readUnsignedByte() == 1;
          this.transparency = var1.readUnsignedByte();
       }
 
-      if(this.type == 9) {
+      if (this.type == 9) {
          this.lineWid = var1.readUnsignedByte();
          this.color = var1.readInt();
-         this.__ba = var1.readUnsignedByte() == 1;
+         this.field961 = var1.readUnsignedByte() == 1;
       }
 
       this.clickMask = var1.readMedium();
       this.dataText = var1.readStringCp1252NullTerminated();
       int var2 = var1.readUnsignedByte();
-      if(var2 > 0) {
+      if (var2 > 0) {
          this.actions = new String[var2];
 
-         for(int var3 = 0; var3 < var2; ++var3) {
+         for (int var3 = 0; var3 < var2; ++var3) {
             this.actions[var3] = var1.readStringCp1252NullTerminated();
          }
       }
@@ -1197,16 +1189,16 @@ public class Widget extends Node {
    @Export("readListener")
    Object[] readListener(Buffer var1) {
       int var2 = var1.readUnsignedByte();
-      if(var2 == 0) {
+      if (var2 == 0) {
          return null;
       } else {
          Object[] var3 = new Object[var2];
 
-         for(int var4 = 0; var4 < var2; ++var4) {
+         for (int var4 = 0; var4 < var2; ++var4) {
             int var5 = var1.readUnsignedByte();
-            if(var5 == 0) {
+            if (var5 == 0) {
                var3[var4] = new Integer(var1.readInt());
-            } else if(var5 == 1) {
+            } else if (var5 == 1) {
                var3[var4] = var1.readStringCp1252NullTerminated();
             }
          }
@@ -1224,12 +1216,12 @@ public class Widget extends Node {
    @Export("readListenerTriggers")
    int[] readListenerTriggers(Buffer var1) {
       int var2 = var1.readUnsignedByte();
-      if(var2 == 0) {
+      if (var2 == 0) {
          return null;
       } else {
          int[] var3 = new int[var2];
 
-         for(int var4 = 0; var4 < var2; ++var4) {
+         for (int var4 = 0; var4 < var2; ++var4) {
             var3[var4] = var1.readInt();
          }
 
@@ -1259,49 +1251,49 @@ public class Widget extends Node {
    )
    @Export("getSprite")
    public Sprite getSprite(boolean var1) {
-      __ho_j = false;
+      field957 = false;
       int var2;
-      if(var1) {
+      if (var1) {
          var2 = this.spriteId;
       } else {
          var2 = this.spriteId2;
       }
 
-      if(var2 == -1) {
+      if (var2 == -1) {
          return null;
       } else {
-         long var3 = ((this.spriteFlipV?1L:0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH?1L:0L) << 39) + ((long)this.spriteShadow << 40);
-         Sprite var5 = (Sprite) widgetSpriteCache.get(var3);
-         if(var5 != null) {
+         long var3 = ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40);
+         Sprite var5 = (Sprite)widgetSpriteCache.get(var3);
+         if (var5 != null) {
             return var5;
          } else {
-            var5 = class322.readSprite(__ho_d, var2, 0);
-            if(var5 == null) {
-               __ho_j = true;
+            var5 = class322.readSprite(field955, var2, 0);
+            if (var5 == null) {
+               field957 = true;
                return null;
             } else {
-               if(this.spriteFlipV) {
-                  var5.__g_501();
+               if (this.spriteFlipV) {
+                  var5.method306();
                }
 
-               if(this.spriteFlipH) {
-                  var5.__u_500();
+               if (this.spriteFlipH) {
+                  var5.method305();
                }
 
-               if(this.outline > 0) {
-                  var5.__o_499(this.outline);
+               if (this.outline > 0) {
+                  var5.method304(this.outline);
                }
 
-               if(this.outline >= 1) {
-                  var5.__l_502(1);
+               if (this.outline >= 1) {
+                  var5.method307(1);
                }
 
-               if(this.outline >= 2) {
-                  var5.__l_502(16777215);
+               if (this.outline >= 2) {
+                  var5.method307(16777215);
                }
 
-               if(this.spriteShadow != 0) {
-                  var5.__e_503(this.spriteShadow);
+               if (this.spriteShadow != 0) {
+                  var5.method308(this.spriteShadow);
                }
 
                widgetSpriteCache.put(var5, var3);
@@ -1318,19 +1310,19 @@ public class Widget extends Node {
    )
    @Export("getFont")
    public Font getFont() {
-      __ho_j = false;
-      if(this.fontId == -1) {
+      field957 = false;
+      if (this.fontId == -1) {
          return null;
       } else {
          Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId);
-         if(var1 != null) {
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = SpriteIds.method5823(__ho_d, class27.__aq_k, this.fontId, 0);
-            if(var1 != null) {
+            var1 = SpriteIds.method5823(field955, class27.field1143, this.fontId, 0);
+            if (var1 != null) {
                Widget_cachedFonts.put(var1, (long)this.fontId);
             } else {
-               __ho_j = true;
+               field957 = true;
             }
 
             return var1;
@@ -1345,21 +1337,21 @@ public class Widget extends Node {
    )
    @Export("getInventorySprite")
    public Sprite getInventorySprite(int var1) {
-      __ho_j = false;
-      if(var1 >= 0 && var1 < this.inventorySprites.length) {
+      field957 = false;
+      if (var1 >= 0 && var1 < this.inventorySprites.length) {
          int var2 = this.inventorySprites[var1];
-         if(var2 == -1) {
+         if (var2 == -1) {
             return null;
          } else {
-            Sprite var3 = (Sprite) widgetSpriteCache.get((long)var2);
-            if(var3 != null) {
+            Sprite var3 = (Sprite)widgetSpriteCache.get((long)var2);
+            if (var3 != null) {
                return var3;
             } else {
-               var3 = class322.readSprite(__ho_d, var2, 0);
-               if(var3 != null) {
+               var3 = class322.readSprite(field955, var2, 0);
+               if (var3 != null) {
                   widgetSpriteCache.put(var3, (long)var2);
                } else {
-                  __ho_j = true;
+                  field957 = true;
                }
 
                return var3;
@@ -1377,10 +1369,10 @@ public class Widget extends Node {
    )
    @Export("getModel")
    public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerAppearance var4) {
-      __ho_j = false;
+      field957 = false;
       int var5;
       int var6;
-      if(var3) {
+      if (var3) {
          var5 = this.modelType2;
          var6 = this.modelId2;
       } else {
@@ -1388,53 +1380,53 @@ public class Widget extends Node {
          var6 = this.modelId;
       }
 
-      if(var5 == 0) {
+      if (var5 == 0) {
          return null;
-      } else if(var5 == 1 && var6 == -1) {
+      } else if (var5 == 1 && var6 == -1) {
          return null;
       } else {
          Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16)));
-         if(var7 == null) {
+         if (var7 == null) {
             ModelData var8;
-            if(var5 == 1) {
-               var8 = ModelData.method2788(BufferedSource.__fh_x, var6, 0);
-               if(var8 == null) {
-                  __ho_j = true;
+            if (var5 == 1) {
+               var8 = ModelData.method2788(BufferedSource.field54, var6, 0);
+               if (var8 == null) {
+                  field957 = true;
                   return null;
                }
 
                var7 = var8.toModel(64, 768, -50, -10, -50);
             }
 
-            if(var5 == 2) {
+            if (var5 == 2) {
                var8 = ObjectDefinition.getNpcDefinition(var6).getModelData();
-               if(var8 == null) {
-                  __ho_j = true;
+               if (var8 == null) {
+                  field957 = true;
                   return null;
                }
 
                var7 = var8.toModel(64, 768, -50, -10, -50);
             }
 
-            if(var5 == 3) {
-               if(var4 == null) {
+            if (var5 == 3) {
+               if (var4 == null) {
                   return null;
                }
 
                var8 = var4.getModelData();
-               if(var8 == null) {
-                  __ho_j = true;
+               if (var8 == null) {
+                  field957 = true;
                   return null;
                }
 
                var7 = var8.toModel(64, 768, -50, -10, -50);
             }
 
-            if(var5 == 4) {
+            if (var5 == 4) {
                ItemDefinition var9 = Skills.getItemDefinition(var6);
-               var8 = var9.__l_429(10);
-               if(var8 == null) {
-                  __ho_j = true;
+               var8 = var9.method143(10);
+               if (var8 == null) {
+                  field957 = true;
                   return null;
                }
 
@@ -1444,7 +1436,7 @@ public class Widget extends Node {
             Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16)));
          }
 
-         if(var1 != null) {
+         if (var1 != null) {
             var7 = var1.animateWidget(var7, var2);
          }
 
@@ -1459,41 +1451,41 @@ public class Widget extends Node {
    )
    @Export("getSpriteMask")
    public SpriteMask getSpriteMask(boolean var1) {
-      if(this.spriteId == -1) {
+      if (this.spriteId == -1) {
          var1 = false;
       }
 
-      int var2 = var1?this.spriteId:this.spriteId2;
-      if(var2 == -1) {
+      int var2 = var1 ? this.spriteId : this.spriteId2;
+      if (var2 == -1) {
          return null;
       } else {
-         long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH?1L:0L) << 39) + ((this.spriteFlipV?1L:0L) << 38) + ((long)this.outline << 36) + (long)var2;
-         SpriteMask var5 = (SpriteMask)__ho_z.get(var3);
-         if(var5 != null) {
+         long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2;
+         SpriteMask var5 = (SpriteMask)field956.get(var3);
+         if (var5 != null) {
             return var5;
          } else {
             Sprite var6 = this.getSprite(var1);
-            if(var6 == null) {
+            if (var6 == null) {
                return null;
             } else {
                Sprite var7 = var6.copyNormalized();
                int[] var8 = new int[var7.subHeight];
                int[] var9 = new int[var7.subHeight];
 
-               for(int var10 = 0; var10 < var7.subHeight; ++var10) {
+               for (int var10 = 0; var10 < var7.subHeight; ++var10) {
                   int var11 = 0;
                   int var12 = var7.subWidth;
 
                   int var13;
-                  for(var13 = 0; var13 < var7.subWidth; ++var13) {
-                     if(var7.pixels[var13 + var10 * var7.subWidth] == 0) {
+                  for (var13 = 0; var13 < var7.subWidth; ++var13) {
+                     if (var7.pixels[var13 + var10 * var7.subWidth] == 0) {
                         var11 = var13;
                         break;
                      }
                   }
 
-                  for(var13 = var7.subWidth - 1; var13 >= var11; --var13) {
-                     if(var7.pixels[var13 + var10 * var7.subWidth] == 0) {
+                  for (var13 = var7.subWidth - 1; var13 >= var11; --var13) {
+                     if (var7.pixels[var13 + var10 * var7.subWidth] == 0) {
                         var12 = var13 + 1;
                         break;
                      }
@@ -1504,7 +1496,7 @@ public class Widget extends Node {
                }
 
                var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2);
-               __ho_z.put(var5, var3);
+               field956.put(var5, var3);
                return var5;
             }
          }
@@ -1518,10 +1510,10 @@ public class Widget extends Node {
    )
    @Export("setAction")
    public void setAction(int var1, String var2) {
-      if(this.actions == null || this.actions.length <= var1) {
+      if (this.actions == null || this.actions.length <= var1) {
          String[] var3 = new String[var1 + 1];
-         if(this.actions != null) {
-            for(int var4 = 0; var4 < this.actions.length; ++var4) {
+         if (this.actions != null) {
+            for (int var4 = 0; var4 < this.actions.length; ++var4) {
                var3[var4] = this.actions[var4];
             }
          }
@@ -1548,16 +1540,24 @@ public class Widget extends Node {
          IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3);
       }
 
-      Object var9 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
+      Object var5 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
       synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) {
-         if(IndexStoreActionHandler.__iv_q == 0) {
+         if (IndexStoreActionHandler.field412 == 0) {
             Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler());
             Frames.IndexStoreActionHandler_thread.setDaemon(true);
             Frames.IndexStoreActionHandler_thread.start();
             Frames.IndexStoreActionHandler_thread.setPriority(5);
          }
 
-         IndexStoreActionHandler.__iv_q = 600;
+         IndexStoreActionHandler.field412 = 600;
       }
    }
+
+   static {
+      widgetSpriteCache = new EvictingDualNodeHashTable(200);
+      Widget_cachedModels = new EvictingDualNodeHashTable(50);
+      Widget_cachedFonts = new EvictingDualNodeHashTable(20);
+      field956 = new EvictingDualNodeHashTable(8);
+      field957 = false;
+   }
 }
diff --git a/runescape-client/src/main/java/WidgetGroupParent.java b/runescape-client/src/main/java/WidgetGroupParent.java
index 491c7b8343..19c90b5d88 100644
--- a/runescape-client/src/main/java/WidgetGroupParent.java
+++ b/runescape-client/src/main/java/WidgetGroupParent.java
@@ -17,7 +17,7 @@ public class WidgetGroupParent extends Node {
    @ObfuscatedGetter(
       intValue = -992379173
    )
-   static int __bx_o;
+   static int field986;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = -707461797
@@ -45,22 +45,22 @@ public class WidgetGroupParent extends Node {
    )
    static Script method1175(int var0, int var1) {
       Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16));
-      if(var2 != null) {
+      if (var2 != null) {
          return var2;
       } else {
          String var3 = String.valueOf(var0);
          int var4 = Formatting.indexCache12.getArchiveId(var3);
-         if(var4 == -1) {
+         if (var4 == -1) {
             return null;
          } else {
             byte[] var5 = Formatting.indexCache12.takeRecordFlat(var4);
-            if(var5 != null) {
-               if(var5.length <= 1) {
+            if (var5 != null) {
+               if (var5.length <= 1) {
                   return null;
                }
 
                var2 = Occluder.newScript(var5);
-               if(var2 != null) {
+               if (var2 != null) {
                   Script.Script_cached.put(var2, (long)(var0 << 16));
                   return var2;
                }
@@ -81,12 +81,12 @@ public class WidgetGroupParent extends Node {
       char[] var3 = new char[var2];
       int var4 = 0;
 
-      for(int var5 = 0; var5 < var2; ++var5) {
+      for (int var5 = 0; var5 < var2; ++var5) {
          int var6 = var0[var5 + var1] & 255;
-         if(var6 != 0) {
-            if(var6 >= 128 && var6 < 160) {
+         if (var6 != 0) {
+            if (var6 >= 128 && var6 < 160) {
                char var7 = class304.cp1252AsciiExtension[var6 - 128];
-               if(var7 == 0) {
+               if (var7 == 0) {
                   var7 = '?';
                }
 
@@ -106,7 +106,7 @@ public class WidgetGroupParent extends Node {
       garbageValue = "32"
    )
    static int method1174(int var0) {
-      ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(Integer.valueOf(var0));
-      return var1 == null?0:var1.size();
+      ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0);
+      return var1 == null ? 0 : var1.size();
    }
 }
diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java
index 17297fb7e8..410e309591 100644
--- a/runescape-client/src/main/java/World.java
+++ b/runescape-client/src/main/java/World.java
@@ -17,7 +17,7 @@ public class World {
    @ObfuscatedGetter(
       intValue = 1143875805
    )
-   static int __bt_g;
+   static int field987;
    @ObfuscatedName("l")
    @Export("sortOption2")
    static int[] sortOption2;
@@ -61,13 +61,6 @@ public class World {
    @Export("index")
    int index;
 
-   static {
-      worldsCount = 0;
-      __bt_g = 0;
-      sortOption2 = new int[]{1, 1, 1, 1};
-      sortOption1 = new int[]{0, 1, 2, 3};
-   }
-
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "(I)Z",
@@ -83,7 +76,7 @@ public class World {
       signature = "(B)Z",
       garbageValue = "0"
    )
-   boolean __x_145() {
+   boolean method356() {
       return (2 & this.properties) != 0;
    }
 
@@ -102,7 +95,7 @@ public class World {
       signature = "(I)Z",
       garbageValue = "-1662622660"
    )
-   boolean __a_147() {
+   boolean method357() {
       return (8 & this.properties) != 0;
    }
 
@@ -113,7 +106,7 @@ public class World {
    )
    @Export("isDeadman")
    boolean isDeadman() {
-      return (0x20000000 & this.properties) != 0; // 1 << 29
+      return (536870912 & this.properties) != 0;
    }
 
    @ObfuscatedName("j")
@@ -123,7 +116,7 @@ public class World {
    )
    @Export("isBeta")
    boolean isBeta() {
-      return (0x2000000 & this.properties) != 0; // 1 << 25
+      return (33554432 & this.properties) != 0;
    }
 
    @ObfuscatedName("f")
@@ -140,4 +133,11 @@ public class World {
       var0 |= var0 >>> 16;
       return var0 + 1;
    }
+
+   static {
+      worldsCount = 0;
+      field987 = 0;
+      sortOption2 = new int[]{1, 1, 1, 1};
+      sortOption1 = new int[]{0, 1, 2, 3};
+   }
 }
diff --git a/runescape-client/src/main/java/WorldComparator.java b/runescape-client/src/main/java/WorldComparator.java
index 1f284bc1a2..b186520c8a 100644
--- a/runescape-client/src/main/java/WorldComparator.java
+++ b/runescape-client/src/main/java/WorldComparator.java
@@ -8,25 +8,25 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("WorldComparator")
 final class WorldComparator implements Comparator {
    @ObfuscatedName("n")
-   public static boolean __u_n;
+   public static boolean field988;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Ll;Ll;I)I",
       garbageValue = "707844889"
    )
-   int __m_0(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-      return var1.world < var2.world?-1:(var2.world == var1.world?0:1);
+   int method358(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+      return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1);
    }
 
    @Export("compare")
    @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_0((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+      return this.method358((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
    }
 
    @ObfuscatedName("equals")
-   public boolean __equals_2(Object var1) {
+   public boolean method359(Object var1) {
       return super.equals(var1);
    }
 
@@ -45,14 +45,14 @@ final class WorldComparator implements Comparator {
       garbageValue = "108"
    )
    static int method68(int var0, Script var1, boolean var2) {
-      if(var0 == 3200) {
+      if (var0 == 3200) {
          RouteStrategy.Interpreter_intStackSize -= 3;
          Ignored.queueSoundEffect(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]);
          return 1;
-      } else if(var0 == 3201) {
+      } else if (var0 == 3201) {
          AbstractUserComparator.method5437(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
          return 1;
-      } else if(var0 == 3202) {
+      } else if (var0 == 3202) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          HealthBar.method1994(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
          return 1;
@@ -67,13 +67,13 @@ final class WorldComparator implements Comparator {
       garbageValue = "96"
    )
    static final void method67(PacketBuffer var0) {
-      for(int var1 = 0; var1 < Client.__client_fw; ++var1) {
-         int var2 = Client.__client_fg[var1];
-         Npc var3 = Client.npcs[var2];
+      for (int var1 = 0; var1 < Client.field173; ++var1) {
+         int var2 = Client.field174[var1];
+         NPC var3 = Client.npcs[var2];
          int var4 = var0.readUnsignedByte();
-         if((var4 & 1) != 0) {
-            var3.targetIndex = var0.__by_324();
-            if(var3.targetIndex == 65535) {
+         if ((var4 & 1) != 0) {
+            var3.targetIndex = var0.method65();
+            if (var3.targetIndex == 65535) {
                var3.targetIndex = -1;
             }
          }
@@ -82,49 +82,49 @@ final class WorldComparator implements Comparator {
          int var6;
          int var7;
          int var8;
-         if((var4 & 64) != 0) {
-            var5 = var0.__bm_326();
-            var6 = var0.__bm_326();
+         if ((var4 & 64) != 0) {
+            var5 = var0.method67();
+            var6 = var0.method67();
             var7 = var3.x - (var5 - class50.baseX - class50.baseX) * 64;
             var8 = var3.y - (var6 - GraphicsObject.baseY - GraphicsObject.baseY) * 64;
-            if(var7 != 0 || var8 != 0) {
-               var3.__bc = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047;
+            if (var7 != 0 || var8 != 0) {
+               var3.field12 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047;
             }
          }
 
-         if((var4 & 32) != 0) {
-            var5 = var0.__ag_302();
-            if(var5 == 65535) {
+         if ((var4 & 32) != 0) {
+            var5 = var0.method43();
+            if (var5 == 65535) {
                var5 = -1;
             }
 
-            var6 = var0.__bq_318();
-            if(var5 == var3.sequence && var5 != -1) {
-               var7 = WorldMapAreaData.getSequenceDefinition(var5).__t;
-               if(var7 == 1) {
+            var6 = var0.method59();
+            if (var5 == var3.sequence && var5 != -1) {
+               var7 = WorldMapAreaData.getSequenceDefinition(var5).field783;
+               if (var7 == 1) {
                   var3.sequenceFrame = 0;
                   var3.sequenceFrameCycle = 0;
                   var3.sequenceDelay = var6;
-                  var3.__bj = 0;
+                  var3.field13 = 0;
                }
 
-               if(var7 == 2) {
-                  var3.__bj = 0;
+               if (var7 == 2) {
+                  var3.field13 = 0;
                }
-            } else if(var5 == -1 || var3.sequence == -1 || WorldMapAreaData.getSequenceDefinition(var5).__n >= WorldMapAreaData.getSequenceDefinition(var3.sequence).__n) {
+            } else if (var5 == -1 || var3.sequence == -1 || WorldMapAreaData.getSequenceDefinition(var5).field779 >= WorldMapAreaData.getSequenceDefinition(var3.sequence).field779) {
                var3.sequence = var5;
                var3.sequenceFrame = 0;
                var3.sequenceFrameCycle = 0;
                var3.sequenceDelay = var6;
-               var3.__bj = 0;
-               var3.__ch = var3.pathLength;
+               var3.field13 = 0;
+               var3.field25 = var3.pathLength;
             }
          }
 
-         if((var4 & 4) != 0) {
-            var3.definition = ObjectDefinition.getNpcDefinition(var0.__ag_302());
+         if ((var4 & 4) != 0) {
+            var3.definition = ObjectDefinition.getNpcDefinition(var0.method43());
             var3.size = var3.definition.size;
-            var3.__cj = var3.definition.__av;
+            var3.field23 = var3.definition.field639;
             var3.walkSequence = var3.definition.walkSequence;
             var3.walkTurnSequence = var3.definition.walkTurnSequence;
             var3.walkTurnLeftSequence = var3.definition.walkTurnLeftSequence;
@@ -134,42 +134,42 @@ final class WorldComparator implements Comparator {
             var3.turnRightSequence = var3.definition.turnRightSequence;
          }
 
-         if((var4 & 16) != 0) {
+         if ((var4 & 16) != 0) {
             var5 = var0.readUnsignedByteNegate();
             int var9;
             int var10;
             int var11;
-            if(var5 > 0) {
-               for(var6 = 0; var6 < var5; ++var6) {
+            if (var5 > 0) {
+               for (var6 = 0; var6 < var5; ++var6) {
                   var8 = -1;
                   var9 = -1;
                   var10 = -1;
-                  var7 = var0.__ae_307();
-                  if(var7 == 32767) {
-                     var7 = var0.__ae_307();
-                     var9 = var0.__ae_307();
-                     var8 = var0.__ae_307();
-                     var10 = var0.__ae_307();
-                  } else if(var7 != 32766) {
-                     var9 = var0.__ae_307();
+                  var7 = var0.method48();
+                  if (var7 == 32767) {
+                     var7 = var0.method48();
+                     var9 = var0.method48();
+                     var8 = var0.method48();
+                     var10 = var0.method48();
+                  } else if (var7 != 32766) {
+                     var9 = var0.method48();
                   } else {
                      var7 = -1;
                   }
 
-                  var11 = var0.__ae_307();
+                  var11 = var0.method48();
                   var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11);
                }
             }
 
-            var6 = var0.__bb_317();
-            if(var6 > 0) {
-               for(var7 = 0; var7 < var6; ++var7) {
-                  var8 = var0.__ae_307();
-                  var9 = var0.__ae_307();
-                  if(var9 != 32767) {
-                     var10 = var0.__ae_307();
+            var6 = var0.method58();
+            if (var6 > 0) {
+               for (var7 = 0; var7 < var6; ++var7) {
+                  var8 = var0.method48();
+                  var9 = var0.method48();
+                  if (var9 != 32767) {
+                     var10 = var0.method48();
                      var11 = var0.readUnsignedByte();
-                     int var12 = var9 > 0?var0.__bq_318():var11;
+                     int var12 = var9 > 0 ? var0.method59() : var11;
                      var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12);
                   } else {
                      var3.removeHealthBar(var8);
@@ -178,23 +178,23 @@ final class WorldComparator implements Comparator {
             }
          }
 
-         if((var4 & 8) != 0) {
-            var3.spotAnimation = var0.__by_324();
-            var5 = var0.__bp_331();
+         if ((var4 & 8) != 0) {
+            var3.spotAnimation = var0.method65();
+            var5 = var0.method72();
             var3.heightOffset = var5 >> 16;
-            var3.__bt = (var5 & 65535) + Client.cycle;
+            var3.field14 = (var5 & 65535) + Client.cycle;
             var3.spotAnimationFrame = 0;
             var3.spotAnimationFrameCycle = 0;
-            if(var3.__bt > Client.cycle) {
+            if (var3.field14 > Client.cycle) {
                var3.spotAnimationFrame = -1;
             }
 
-            if(var3.spotAnimation == 65535) {
+            if (var3.spotAnimation == 65535) {
                var3.spotAnimation = -1;
             }
          }
 
-         if((var4 & 2) != 0) {
+         if ((var4 & 2) != 0) {
             var3.overheadText = var0.readStringCp1252NullTerminated();
             var3.overheadTextCyclesRemaining = 100;
          }
diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java
index 13b495ddb3..323886684a 100644
--- a/runescape-client/src/main/java/WorldMap.java
+++ b/runescape-client/src/main/java/WorldMap.java
@@ -35,17 +35,17 @@ public class WorldMap {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   AbstractIndexCache __g;
+   AbstractIndexCache field989;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   AbstractIndexCache __l;
+   AbstractIndexCache field990;
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   AbstractIndexCache __e;
+   AbstractIndexCache field991;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lkk;"
@@ -80,7 +80,7 @@ public class WorldMap {
    @ObfuscatedSignature(
       signature = "Lag;"
    )
-   WorldMapArea __t;
+   WorldMapArea field992;
    @ObfuscatedName("y")
    @ObfuscatedSignature(
       signature = "Lal;"
@@ -151,12 +151,12 @@ public class WorldMap {
    @ObfuscatedGetter(
       intValue = -1653084915
    )
-   int __ac;
+   int field993;
    @ObfuscatedName("ay")
    @ObfuscatedGetter(
       intValue = 1664740569
    )
-   int __ay;
+   int field994;
    @ObfuscatedName("ah")
    @Export("perpetualFlash0")
    boolean perpetualFlash0;
@@ -167,49 +167,49 @@ public class WorldMap {
    @ObfuscatedGetter(
       intValue = -1683910031
    )
-   int __aw;
+   int field995;
    @ObfuscatedName("al")
    @ObfuscatedGetter(
       intValue = 2064651113
    )
-   int __al;
+   int field996;
    @ObfuscatedName("ab")
    @ObfuscatedGetter(
       intValue = -1979665983
    )
-   int __ab;
+   int field997;
    @ObfuscatedName("ae")
    @ObfuscatedGetter(
       intValue = 547126547
    )
-   int __ae;
+   int field998;
    @ObfuscatedName("at")
    @ObfuscatedGetter(
       intValue = -815748997
    )
-   int __at;
+   int field999;
    @ObfuscatedName("ad")
    @ObfuscatedGetter(
       intValue = -988933407
    )
-   int __ad;
+   int field1000;
    @ObfuscatedName("ap")
    @ObfuscatedGetter(
       longValue = -4747643242047040283L
    )
-   long __ap;
+   long field1001;
    @ObfuscatedName("as")
    @ObfuscatedGetter(
       intValue = -969094439
    )
-   int __as;
+   int field1002;
    @ObfuscatedName("am")
    @ObfuscatedGetter(
       intValue = -869889187
    )
-   int __am;
+   int field1003;
    @ObfuscatedName("an")
-   boolean __an;
+   boolean field1004;
    @ObfuscatedName("ao")
    @Export("enabledElements")
    HashSet enabledElements;
@@ -217,9 +217,9 @@ public class WorldMap {
    @Export("enabledCategories")
    HashSet enabledCategories;
    @ObfuscatedName("ax")
-   HashSet __ax;
+   HashSet field1005;
    @ObfuscatedName("af")
-   HashSet __af;
+   HashSet field1006;
    @ObfuscatedName("ai")
    @Export("elementsDisabled")
    boolean elementsDisabled;
@@ -227,16 +227,16 @@ public class WorldMap {
    @ObfuscatedGetter(
       intValue = -237734529
    )
-   int __ba;
+   int field1007;
    @ObfuscatedName("bs")
-   final int[] __bs;
+   final int[] field1008;
    @ObfuscatedName("bq")
-   List __bq;
+   List field1009;
    @ObfuscatedName("bn")
    @Export("iconIterator")
    Iterator iconIterator;
    @ObfuscatedName("bk")
-   HashSet __bk;
+   HashSet field1010;
    @ObfuscatedName("bd")
    @ObfuscatedSignature(
       signature = "Lhu;"
@@ -256,28 +256,22 @@ public class WorldMap {
    @ObfuscatedGetter(
       intValue = 2031417343
    )
-   int __bx;
+   int field1011;
    @ObfuscatedName("by")
    @ObfuscatedGetter(
       intValue = 754899959
    )
-   int __by;
+   int field1012;
    @ObfuscatedName("bu")
    @ObfuscatedGetter(
       intValue = 2064728623
    )
-   int __bu;
+   int field1013;
    @ObfuscatedName("bm")
    @ObfuscatedGetter(
       intValue = -1774424249
    )
-   int __bm;
-
-   static {
-      fontNameVerdana11 = FontName.FontName_verdana11;
-      fontNameVerdana13 = FontName.FontName_verdana13;
-      fontNameVerdana15 = FontName.FontName_verdana15;
-   }
+   int field1014;
 
    public WorldMap() {
       this.worldMapTargetX = -1;
@@ -286,30 +280,30 @@ public class WorldMap {
       this.worldMapDisplayHeight = -1;
       this.worldMapDisplayX = -1;
       this.worldMapDisplayY = -1;
-      this.__ac = 3;
-      this.__ay = 50;
+      this.field993 = 3;
+      this.field994 = 50;
       this.perpetualFlash0 = false;
       this.flashingElements = null;
-      this.__aw = -1;
-      this.__al = -1;
-      this.__ab = -1;
-      this.__ae = -1;
-      this.__at = -1;
-      this.__ad = -1;
-      this.__an = true;
+      this.field995 = -1;
+      this.field996 = -1;
+      this.field997 = -1;
+      this.field998 = -1;
+      this.field999 = -1;
+      this.field1000 = -1;
+      this.field1004 = true;
       this.enabledElements = new HashSet();
       this.enabledCategories = new HashSet();
-      this.__ax = new HashSet();
-      this.__af = new HashSet();
+      this.field1005 = new HashSet();
+      this.field1006 = new HashSet();
       this.elementsDisabled = false;
-      this.__ba = 0;
-      this.__bs = new int[]{1008, 1009, 1010, 1011, 1012};
-      this.__bk = new HashSet();
+      this.field1007 = 0;
+      this.field1008 = new int[]{1008, 1009, 1010, 1011, 1012};
+      this.field1010 = new HashSet();
       this.mouseCoord = null;
       this.showCoord = false;
-      this.__by = -1;
-      this.__bu = -1;
-      this.__bm = -1;
+      this.field1012 = -1;
+      this.field1013 = -1;
+      this.field1014 = -1;
    }
 
    @ObfuscatedName("m")
@@ -320,31 +314,31 @@ public class WorldMap {
    @Export("init")
    public void init(AbstractIndexCache var1, AbstractIndexCache var2, AbstractIndexCache var3, Font var4, HashMap var5, IndexedSprite[] var6) {
       this.mapSceneSprites = var6;
-      this.__g = var1;
-      this.__l = var2;
-      this.__e = var3;
+      this.field989 = var1;
+      this.field990 = var2;
+      this.field991 = var3;
       this.font = var4;
       this.fonts = new HashMap();
       this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_small, var5.get(fontNameVerdana11));
       this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13));
       this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15));
       this.cacheLoader = new WorldMapIndexCacheLoader(var1);
-      int var7 = this.__g.getArchiveId(WorldMapCacheName.WorldMapCacheName_details.name);
-      int[] var8 = this.__g.__j_395(var7);
+      int var7 = this.field989.getArchiveId(WorldMapCacheName.WorldMapCacheName_details.name);
+      int[] var8 = this.field989.method3(var7);
       this.mapAreas = new HashMap(var8.length);
 
-      for(int var9 = 0; var9 < var8.length; ++var9) {
-         Buffer var10 = new Buffer(this.__g.takeRecord(var7, var8[var9]));
+      for (int var9 = 0; var9 < var8.length; ++var9) {
+         Buffer var10 = new Buffer(this.field989.takeRecord(var7, var8[var9]));
          WorldMapArea var11 = new WorldMapArea();
          var11.read(var10, var8[var9]);
          this.mapAreas.put(var11.archiveName(), var11);
-         if(var11.isMain()) {
+         if (var11.isMain()) {
             this.mainMapArea = var11;
          }
       }
 
       this.setCurrentMapArea(this.mainMapArea);
-      this.__t = null;
+      this.field992 = null;
    }
 
    @ObfuscatedName("f")
@@ -352,8 +346,8 @@ public class WorldMap {
       signature = "(I)V",
       garbageValue = "-1144390092"
    )
-   public void __f_518() {
-      WorldMapRegion.__av_o.demote(5);
+   public void method360() {
+      WorldMapRegion.field1051.demote(5);
    }
 
    @ObfuscatedName("q")
@@ -363,48 +357,49 @@ public class WorldMap {
    )
    @Export("onCycle")
    public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) {
-      if(this.cacheLoader.isLoaded()) {
+      if (this.cacheLoader.isLoaded()) {
          this.smoothZoom();
-         this.__g_521();
-         if(var3) {
+         this.method363();
+         if (var3) {
             int var8 = (int)Math.ceil((double)((float)var6 / this.zoom));
             int var9 = (int)Math.ceil((double)((float)var7 / this.zoom));
-            List var10 = this.worldMapManager.__u_74(this.worldMapX - var8 / 2 - 1, this.worldMapY - var9 / 2 - 1, var8 / 2 + this.worldMapX + 1, var9 / 2 + this.worldMapY + 1, var4, var5, var6, var7, var1, var2);
+            List var10 = this.worldMapManager.method403(this.worldMapX - var8 / 2 - 1, this.worldMapY - var9 / 2 - 1, var8 / 2 + this.worldMapX + 1, var9 / 2 + this.worldMapY + 1, var4, var5, var6, var7, var1, var2);
             HashSet var11 = new HashSet();
 
             Iterator var12;
             AbstractWorldMapIcon var13;
             ScriptEvent var14;
             WorldMapEvent var15;
-            for(var12 = var10.iterator(); var12.hasNext(); AbstractIndexCache.runScript(var14)) {
+            for (var12 = var10.iterator(); var12.hasNext(); AbstractIndexCache.runScript(var14)) {
                var13 = (AbstractWorldMapIcon)var12.next();
                var11.add(var13);
                var14 = new ScriptEvent();
-               var15 = new WorldMapEvent(var13.__m_15(), var13.coord1, var13.coord2);
-               var14.setArgs(new Object[]{var15, Integer.valueOf(var1), Integer.valueOf(var2)});
-               if(this.__bk.contains(var13)) {
+               var15 = new WorldMapEvent(var13.vmethod395(), var13.coord1, var13.coord2);
+               var14.setArgs(new Object[]{var15, var1, var2});
+               if (this.field1010.contains(var13)) {
                   var14.setType(17);
                } else {
                   var14.setType(15);
                }
             }
 
-            var12 = this.__bk.iterator();
+            var12 = this.field1010.iterator();
 
-            while(var12.hasNext()) {
+            while (var12.hasNext()) {
                var13 = (AbstractWorldMapIcon)var12.next();
-               if(!var11.contains(var13)) {
+               if (!var11.contains(var13)) {
                   var14 = new ScriptEvent();
-                  var15 = new WorldMapEvent(var13.__m_15(), var13.coord1, var13.coord2);
-                  var14.setArgs(new Object[]{var15, Integer.valueOf(var1), Integer.valueOf(var2)});
+                  var15 = new WorldMapEvent(var13.vmethod395(), var13.coord1, var13.coord2);
+                  var14.setArgs(new Object[]{var15, var1, var2});
                   var14.setType(16);
                   AbstractIndexCache.runScript(var14);
                }
             }
 
-            this.__bk = var11;
+            this.field1010 = var11;
          }
       }
+
    }
 
    @ObfuscatedName("w")
@@ -412,68 +407,69 @@ public class WorldMap {
       signature = "(IIZZS)V",
       garbageValue = "18431"
    )
-   public void __w_519(int var1, int var2, boolean var3, boolean var4) {
+   public void method361(int var1, int var2, boolean var3, boolean var4) {
       long var5 = class203.currentTimeMs();
-      this.__o_520(var1, var2, var4, var5);
-      if(!this.__x_524() && (var4 || var3)) {
-         if(var4) {
-            this.__at = var1;
-            this.__ad = var2;
-            this.__ab = this.worldMapX;
-            this.__ae = this.worldMapY;
+      this.method362(var1, var2, var4, var5);
+      if (this.method365() || !var4 && !var3) {
+         this.method364();
+      } else {
+         if (var4) {
+            this.field999 = var1;
+            this.field1000 = var2;
+            this.field997 = this.worldMapX;
+            this.field998 = this.worldMapY;
          }
 
-         if(this.__ab != -1) {
-            int var7 = var1 - this.__at;
-            int var8 = var2 - this.__ad;
-            this.setWorldMapPosition(this.__ab - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.__ae, false);
+         if (this.field997 != -1) {
+            int var7 = var1 - this.field999;
+            int var8 = var2 - this.field1000;
+            this.setWorldMapPosition(this.field997 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field998, false);
          }
-      } else {
-         this.__e_523();
       }
 
-      if(var4) {
-         this.__ap = var5;
-         this.__as = var1;
-         this.__am = var2;
+      if (var4) {
+         this.field1001 = var5;
+         this.field1002 = var1;
+         this.field1003 = var2;
       }
 
    }
 
    @ObfuscatedName("o")
-   void __o_520(int var1, int var2, boolean var3, long var4) {
-      if(this.currentMapArea0 != null) {
-         int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.__ap_537() * this.zoom / 2.0F) / this.zoom);
-         int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplayY) - (float)this.__as_538() * this.zoom / 2.0F) / this.zoom);
+   void method362(int var1, int var2, boolean var3, long var4) {
+      if (this.currentMapArea0 != null) {
+         int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.method377() * this.zoom / 2.0F) / this.zoom);
+         int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplayY) - (float)this.method378() * this.zoom / 2.0F) / this.zoom);
          this.mouseCoord = this.currentMapArea0.coord(var6 + this.currentMapArea0.minX() * 64, var7 + this.currentMapArea0.minY() * 64);
-         if(this.mouseCoord != null && var3) {
+         if (this.mouseCoord != null && var3) {
+            int var8;
             int var9;
-            int var10;
-            if(FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) {
-               int var13 = this.mouseCoord.x;
-               var9 = this.mouseCoord.y;
-               var10 = this.mouseCoord.plane;
-               PacketBufferNode var11 = Interpreter.method1915(ClientPacket.__gs_bx, Client.packetWriter.isaacCipher);
+            PacketBufferNode var11;
+            if (FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) {
+               int var12 = this.mouseCoord.x;
+               var8 = this.mouseCoord.y;
+               var9 = this.mouseCoord.plane;
+               var11 = Interpreter.method1915(ClientPacket.field283, Client.packetWriter.isaacCipher);
                var11.packetBuffer.writeIntME(0);
-               var11.packetBuffer.writeShortLE(var9);
-               var11.packetBuffer.__ai_315(var10);
-               var11.packetBuffer.writeShort(var13);
-               Client.packetWriter.__q_167(var11);
+               var11.packetBuffer.writeShortLE(var8);
+               var11.packetBuffer.method56(var9);
+               var11.packetBuffer.writeShort(var12);
+               Client.packetWriter.method241(var11);
             } else {
-               boolean var8 = true;
-               if(this.__an) {
-                  var9 = var1 - this.__as;
-                  var10 = var2 - this.__am;
-                  if(var4 - this.__ap > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) {
-                     var8 = false;
+               boolean var10 = true;
+               if (this.field1004) {
+                  var8 = var1 - this.field1002;
+                  var9 = var2 - this.field1003;
+                  if (var4 - this.field1001 > 500L || var8 < -25 || var8 > 25 || var9 < -25 || var9 > 25) {
+                     var10 = false;
                   }
                }
 
-               if(var8) {
-                  PacketBufferNode var12 = Interpreter.method1915(ClientPacket.__gs_az, Client.packetWriter.isaacCipher);
-                  var12.packetBuffer.writeIntME(this.mouseCoord.packed());
-                  Client.packetWriter.__q_167(var12);
-                  this.__ap = 0L;
+               if (var10) {
+                  var11 = Interpreter.method1915(ClientPacket.field267, Client.packetWriter.isaacCipher);
+                  var11.packetBuffer.writeIntME(this.mouseCoord.packed());
+                  Client.packetWriter.method241(var11);
+                  this.field1001 = 0L;
                }
             }
          }
@@ -490,18 +486,18 @@ public class WorldMap {
    )
    @Export("smoothZoom")
    void smoothZoom() {
-      if(ClientParameter.field3645 != null) {
+      if (ClientParameter.field3645 != null) {
          this.zoom = this.zoomTarget;
       } else {
-         if(this.zoom < this.zoomTarget) {
+         if (this.zoom < this.zoomTarget) {
             this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom);
          }
 
-         if(this.zoom > this.zoomTarget) {
+         if (this.zoom > this.zoomTarget) {
             this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F);
          }
-
       }
+
    }
 
    @ObfuscatedName("g")
@@ -509,25 +505,25 @@ public class WorldMap {
       signature = "(I)V",
       garbageValue = "2075446341"
    )
-   void __g_521() {
-      if(this.__x_524()) {
+   void method363() {
+      if (this.method365()) {
          int var1 = this.worldMapTargetX - this.worldMapX;
          int var2 = this.worldMapTargetY - this.worldMapY;
-         if(var1 != 0) {
+         if (var1 != 0) {
             var1 /= Math.min(8, Math.abs(var1));
          }
 
-         if(var2 != 0) {
+         if (var2 != 0) {
             var2 /= Math.min(8, Math.abs(var2));
          }
 
          this.setWorldMapPosition(var1 + this.worldMapX, var2 + this.worldMapY, true);
-         if(this.worldMapTargetX == this.worldMapX && this.worldMapTargetY == this.worldMapY) {
+         if (this.worldMapTargetX == this.worldMapX && this.worldMapTargetY == this.worldMapY) {
             this.worldMapTargetX = -1;
             this.worldMapTargetY = -1;
          }
-
       }
+
    }
 
    @ObfuscatedName("l")
@@ -540,8 +536,8 @@ public class WorldMap {
       this.worldMapX = var1;
       this.worldMapY = var2;
       class203.currentTimeMs();
-      if(var3) {
-         this.__e_523();
+      if (var3) {
+         this.method364();
       }
 
    }
@@ -551,11 +547,11 @@ public class WorldMap {
       signature = "(B)V",
       garbageValue = "35"
    )
-   final void __e_523() {
-      this.__ad = -1;
-      this.__at = -1;
-      this.__ae = -1;
-      this.__ab = -1;
+   final void method364() {
+      this.field1000 = -1;
+      this.field999 = -1;
+      this.field998 = -1;
+      this.field997 = -1;
    }
 
    @ObfuscatedName("x")
@@ -563,7 +559,7 @@ public class WorldMap {
       signature = "(I)Z",
       garbageValue = "1444745621"
    )
-   boolean __x_524() {
+   boolean method365() {
       return this.worldMapTargetX != -1 && this.worldMapTargetY != -1;
    }
 
@@ -576,16 +572,14 @@ public class WorldMap {
    public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) {
       Iterator var4 = this.mapAreas.values().iterator();
 
-      WorldMapArea var5;
-      do {
-         if(!var4.hasNext()) {
-            return null;
+      while (var4.hasNext()) {
+         WorldMapArea var5 = (WorldMapArea)var4.next();
+         if (var5.containsCoord(var1, var2, var3)) {
+            return var5;
          }
+      }
 
-         var5 = (WorldMapArea)var4.next();
-      } while(!var5.containsCoord(var1, var2, var3));
-
-      return var5;
+      return null;
    }
 
    @ObfuscatedName("a")
@@ -593,10 +587,10 @@ public class WorldMap {
       signature = "(IIIZI)V",
       garbageValue = "469045892"
    )
-   public void __a_525(int var1, int var2, int var3, boolean var4) {
+   public void method366(int var1, int var2, int var3, boolean var4) {
       WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3);
-      if(var5 == null) {
-         if(!var4) {
+      if (var5 == null) {
+         if (!var4) {
             return;
          }
 
@@ -604,13 +598,13 @@ public class WorldMap {
       }
 
       boolean var6 = false;
-      if(var5 != this.__t || var4) {
-         this.__t = var5;
+      if (var5 != this.field992 || var4) {
+         this.field992 = var5;
          this.setCurrentMapArea(var5);
          var6 = true;
       }
 
-      if(var6 || var4) {
+      if (var6 || var4) {
          this.jump(var1, var2, var3);
       }
 
@@ -624,7 +618,7 @@ public class WorldMap {
    @Export("setCurrentMapAreaId")
    public void setCurrentMapAreaId(int var1) {
       WorldMapArea var2 = this.getMapArea(var1);
-      if(var2 != null) {
+      if (var2 != null) {
          this.setCurrentMapArea(var2);
       }
 
@@ -637,7 +631,7 @@ public class WorldMap {
    )
    @Export("currentMapAreaId")
    public int currentMapAreaId() {
-      return this.currentMapArea0 == null?-1:this.currentMapArea0.id();
+      return this.currentMapArea0 == null ? -1 : this.currentMapArea0.id();
    }
 
    @ObfuscatedName("s")
@@ -657,10 +651,11 @@ public class WorldMap {
    )
    @Export("setCurrentMapArea")
    void setCurrentMapArea(WorldMapArea var1) {
-      if(this.currentMapArea0 == null || var1 != this.currentMapArea0) {
+      if (this.currentMapArea0 == null || var1 != this.currentMapArea0) {
          this.initializeWorldMap(var1);
          this.jump(-1, -1, -1);
       }
+
    }
 
    @ObfuscatedName("y")
@@ -671,7 +666,7 @@ public class WorldMap {
    @Export("initializeWorldMap")
    void initializeWorldMap(WorldMapArea var1) {
       this.currentMapArea0 = var1;
-      this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.__l, this.__e);
+      this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.field990, this.field991);
       this.cacheLoader.reset(this.currentMapArea0.archiveName());
    }
 
@@ -680,19 +675,19 @@ public class WorldMap {
       signature = "(Lag;Lhu;Lhu;ZI)V",
       garbageValue = "-1430939646"
    )
-   public void __h_526(WorldMapArea var1, TileLocation var2, TileLocation var3, boolean var4) {
-      if(var1 != null) {
-         if(this.currentMapArea0 == null || var1 != this.currentMapArea0) {
+   public void method367(WorldMapArea var1, TileLocation var2, TileLocation var3, boolean var4) {
+      if (var1 != null) {
+         if (this.currentMapArea0 == null || var1 != this.currentMapArea0) {
             this.initializeWorldMap(var1);
          }
 
-         if(!var4 && this.currentMapArea0.containsCoord(var2.plane, var2.x, var2.y)) {
+         if (!var4 && this.currentMapArea0.containsCoord(var2.plane, var2.x, var2.y)) {
             this.jump(var2.plane, var2.x, var2.y);
          } else {
             this.jump(var3.plane, var3.x, var3.y);
          }
-
       }
+
    }
 
    @ObfuscatedName("b")
@@ -702,21 +697,22 @@ public class WorldMap {
    )
    @Export("jump")
    void jump(int var1, int var2, int var3) {
-      if(this.currentMapArea0 != null) {
+      if (this.currentMapArea0 != null) {
          int[] var4 = this.currentMapArea0.position(var1, var2, var3);
-         if(var4 == null) {
+         if (var4 == null) {
             var4 = this.currentMapArea0.position(this.currentMapArea0.originPlane(), this.currentMapArea0.originX(), this.currentMapArea0.originY());
          }
 
          this.setWorldMapPosition(var4[0] - this.currentMapArea0.minX() * 64, var4[1] - this.currentMapArea0.minY() * 64, true);
          this.worldMapTargetX = -1;
          this.worldMapTargetY = -1;
-         this.zoom = this.__av_529(this.currentMapArea0.zoom());
+         this.zoom = this.method370(this.currentMapArea0.zoom());
          this.zoomTarget = this.zoom;
-         this.__bq = null;
+         this.field1009 = null;
          this.iconIterator = null;
          this.worldMapManager.clearIcons();
       }
+
    }
 
    @ObfuscatedName("c")
@@ -731,43 +727,43 @@ public class WorldMap {
       Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4);
       Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216);
       int var7 = this.cacheLoader.percentLoaded();
-      if(var7 < 100) {
+      if (var7 < 100) {
          this.drawLoading(var1, var2, var3, var4, var7);
       } else {
-         if(!this.worldMapManager.isLoaded()) {
-            this.worldMapManager.load(this.__g, this.currentMapArea0.archiveName(), Client.isMembersWorld);
-            if(!this.worldMapManager.isLoaded()) {
+         if (!this.worldMapManager.isLoaded()) {
+            this.worldMapManager.load(this.field989, this.currentMapArea0.archiveName(), Client.isMembersWorld);
+            if (!this.worldMapManager.isLoaded()) {
                return;
             }
          }
 
-         if(this.flashingElements != null) {
-            ++this.__al;
-            if(this.__al % this.__ay == 0) {
-               this.__al = 0;
-               ++this.__aw;
+         if (this.flashingElements != null) {
+            ++this.field996;
+            if (this.field996 % this.field994 == 0) {
+               this.field996 = 0;
+               ++this.field995;
             }
 
-            if(this.__aw >= this.__ac && !this.perpetualFlash0) {
+            if (this.field995 >= this.field993 && !this.perpetualFlash0) {
                this.flashingElements = null;
             }
          }
 
          int var8 = (int)Math.ceil((double)((float)var3 / this.zoom));
          int var9 = (int)Math.ceil((double)((float)var4 / this.zoom));
-         this.worldMapManager.__q_72(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, var1, var2, var3 + var1, var2 + var4);
-         if(!this.elementsDisabled) {
+         this.worldMapManager.method401(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, var1, var2, var3 + var1, var2 + var4);
+         if (!this.elementsDisabled) {
             boolean var10 = false;
-            if(var5 - this.__ba > 100) {
-               this.__ba = var5;
+            if (var5 - this.field1007 > 100) {
+               this.field1007 = var5;
                var10 = true;
             }
 
-            this.worldMapManager.__w_73(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, var1, var2, var3 + var1, var2 + var4, this.__af, this.flashingElements, this.__al, this.__ay, var10);
+            this.worldMapManager.method402(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, var1, var2, var3 + var1, var2 + var4, this.field1006, this.flashingElements, this.field996, this.field994, var10);
          }
 
-         this.__v_528(var1, var2, var3, var4, var8, var9);
-         if(FriendSystem.jmodCheck() && this.showCoord && this.mouseCoord != null) {
+         this.method369(var1, var2, var3, var4, var8, var9);
+         if (FriendSystem.jmodCheck() && this.showCoord && this.mouseCoord != null) {
             this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1);
          }
 
@@ -777,6 +773,7 @@ public class WorldMap {
          this.worldMapDisplayY = var2;
          Rasterizer2D.Rasterizer2D_setClipArray(var6);
       }
+
    }
 
    @ObfuscatedName("p")
@@ -784,8 +781,8 @@ public class WorldMap {
       signature = "(IIIIIII)Z",
       garbageValue = "-1561237851"
    )
-   boolean __p_527(int var1, int var2, int var3, int var4, int var5, int var6) {
-      return this.sprite == null?true:(this.sprite.subWidth == var1 && this.sprite.subHeight == var2?(this.worldMapManager.__z != this.__bx?true:(this.__bm != Client.__client_ss?true:(var3 <= 0 && var4 <= 0?var3 + var1 < var5 || var2 + var4 < var6:true))):true);
+   boolean method368(int var1, int var2, int var3, int var4, int var5, int var6) {
+      return this.sprite == null ? true : (this.sprite.subWidth == var1 && this.sprite.subHeight == var2 ? (this.worldMapManager.field1050 != this.field1011 ? true : (this.field1014 != Client.field104 ? true : (var3 <= 0 && var4 <= 0 ? var3 + var1 < var5 || var2 + var4 < var6 : true))) : true);
    }
 
    @ObfuscatedName("v")
@@ -793,39 +790,39 @@ public class WorldMap {
       signature = "(IIIIIII)V",
       garbageValue = "-2090965249"
    )
-   void __v_528(int var1, int var2, int var3, int var4, int var5, int var6) {
-      if(ClientParameter.field3645 != null) {
-         int var7 = 512 / (this.worldMapManager.__z * 2);
+   void method369(int var1, int var2, int var3, int var4, int var5, int var6) {
+      if (ClientParameter.field3645 != null) {
+         int var7 = 512 / (this.worldMapManager.field1050 * 2);
          int var8 = var3 + 512;
          int var9 = var4 + 512;
          float var10 = 1.0F;
          var8 = (int)((float)var8 / var10);
          var9 = (int)((float)var9 / var10);
-         int var11 = this.__ae_534() - var5 / 2 - var7;
-         int var12 = this.__at_535() - var6 / 2 - var7;
-         int var13 = var1 - (var7 + var11 - this.__by) * this.worldMapManager.__z;
-         int var14 = var2 - this.worldMapManager.__z * (var7 - (var12 - this.__bu));
-         if(this.__p_527(var8, var9, var13, var14, var3, var4)) {
-            if(this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) {
+         int var11 = this.method374() - var5 / 2 - var7;
+         int var12 = this.method375() - var6 / 2 - var7;
+         int var13 = var1 - (var7 + var11 - this.field1012) * this.worldMapManager.field1050;
+         int var14 = var2 - this.worldMapManager.field1050 * (var7 - (var12 - this.field1013));
+         if (this.method368(var8, var9, var13, var14, var3, var4)) {
+            if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) {
                Arrays.fill(this.sprite.pixels, 0);
             } else {
                this.sprite = new Sprite(var8, var9);
             }
 
-            this.__by = this.__ae_534() - var5 / 2 - var7;
-            this.__bu = this.__at_535() - var6 / 2 - var7;
-            this.__bx = this.worldMapManager.__z;
-            ClientParameter.field3645.method4720(this.__by, this.__bu, this.sprite, (float)this.__bx / var10);
-            this.__bm = Client.__client_ss;
-            var13 = var1 - (var11 + var7 - this.__by) * this.worldMapManager.__z;
-            var14 = var2 - this.worldMapManager.__z * (var7 - (var12 - this.__bu));
+            this.field1012 = this.method374() - var5 / 2 - var7;
+            this.field1013 = this.method375() - var6 / 2 - var7;
+            this.field1011 = this.worldMapManager.field1050;
+            ClientParameter.field3645.method4720(this.field1012, this.field1013, this.sprite, (float)this.field1011 / var10);
+            this.field1014 = Client.field104;
+            var13 = var1 - (var11 + var7 - this.field1012) * this.worldMapManager.field1050;
+            var14 = var2 - this.worldMapManager.field1050 * (var7 - (var12 - this.field1013));
          }
 
          Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128);
-         if(1.0F == var10) {
-            this.sprite.__v_510(var13, var14, 192);
+         if (1.0F == var10) {
+            this.sprite.method312(var13, var14, 192);
          } else {
-            this.sprite.__aj_511(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192);
+            this.sprite.method313(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192);
          }
       }
 
@@ -838,16 +835,17 @@ public class WorldMap {
    )
    @Export("drawOverview")
    public void drawOverview(int var1, int var2, int var3, int var4) {
-      if(this.cacheLoader.isLoaded()) {
-         if(!this.worldMapManager.isLoaded()) {
-            this.worldMapManager.load(this.__g, this.currentMapArea0.archiveName(), Client.isMembersWorld);
-            if(!this.worldMapManager.isLoaded()) {
+      if (this.cacheLoader.isLoaded()) {
+         if (!this.worldMapManager.isLoaded()) {
+            this.worldMapManager.load(this.field989, this.currentMapArea0.archiveName(), Client.isMembersWorld);
+            if (!this.worldMapManager.isLoaded()) {
                return;
             }
          }
 
-         this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.__al, this.__ay);
+         this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.field996, this.field994);
       }
+
    }
 
    @ObfuscatedName("aq")
@@ -857,7 +855,7 @@ public class WorldMap {
    )
    @Export("setZoomLevel")
    public void setZoomLevel(int var1) {
-      this.zoomTarget = this.__av_529(var1);
+      this.zoomTarget = this.method370(var1);
    }
 
    @ObfuscatedName("aj")
@@ -881,8 +879,8 @@ public class WorldMap {
       signature = "(IB)F",
       garbageValue = "56"
    )
-   float __av_529(int var1) {
-      return var1 == 25?1.0F:(var1 == 37?1.5F:(var1 == 50?2.0F:(var1 == 75?3.0F:(var1 == 100?4.0F:8.0F))));
+   float method370(int var1) {
+      return var1 == 25 ? 1.0F : (var1 == 37 ? 1.5F : (var1 == 50 ? 2.0F : (var1 == 75 ? 3.0F : (var1 == 100 ? 4.0F : 8.0F))));
    }
 
    @ObfuscatedName("ar")
@@ -892,7 +890,7 @@ public class WorldMap {
    )
    @Export("getZoomLevel")
    public int getZoomLevel() {
-      return (double)this.zoomTarget == 1.0D?25:((double)this.zoomTarget == 1.5D?37:(2.0D == (double)this.zoomTarget?50:(3.0D == (double)this.zoomTarget?75:(4.0D == (double)this.zoomTarget?100:200))));
+      return (double)this.zoomTarget == 1.0D ? 25 : ((double)this.zoomTarget == 1.5D ? 37 : (2.0D == (double)this.zoomTarget ? 50 : (3.0D == (double)this.zoomTarget ? 75 : (4.0D == (double)this.zoomTarget ? 100 : 200))));
    }
 
    @ObfuscatedName("ac")
@@ -924,16 +922,14 @@ public class WorldMap {
    public WorldMapArea getMapArea(int var1) {
       Iterator var2 = this.mapAreas.values().iterator();
 
-      WorldMapArea var3;
-      do {
-         if(!var2.hasNext()) {
-            return null;
+      while (var2.hasNext()) {
+         WorldMapArea var3 = (WorldMapArea)var2.next();
+         if (var3.id() == var1) {
+            return var3;
          }
+      }
 
-         var3 = (WorldMapArea)var2.next();
-      } while(var3.id() != var1);
-
-      return var3;
+      return null;
    }
 
    @ObfuscatedName("ak")
@@ -943,10 +939,11 @@ public class WorldMap {
    )
    @Export("setWorldMapPositionTarget")
    public void setWorldMapPositionTarget(int var1, int var2) {
-      if(this.currentMapArea0 != null && this.currentMapArea0.containsPosition(var1, var2)) {
+      if (this.currentMapArea0 != null && this.currentMapArea0.containsPosition(var1, var2)) {
          this.worldMapTargetX = var1 - this.currentMapArea0.minX() * 64;
          this.worldMapTargetY = var2 - this.currentMapArea0.minY() * 64;
       }
+
    }
 
    @ObfuscatedName("aw")
@@ -954,12 +951,13 @@ public class WorldMap {
       signature = "(III)V",
       garbageValue = "-2147142500"
    )
-   public void __aw_531(int var1, int var2) {
-      if(this.currentMapArea0 != null) {
+   public void method371(int var1, int var2) {
+      if (this.currentMapArea0 != null) {
          this.setWorldMapPosition(var1 - this.currentMapArea0.minX() * 64, var2 - this.currentMapArea0.minY() * 64, true);
          this.worldMapTargetX = -1;
          this.worldMapTargetY = -1;
       }
+
    }
 
    @ObfuscatedName("al")
@@ -967,14 +965,14 @@ public class WorldMap {
       signature = "(IIIB)V",
       garbageValue = "-40"
    )
-   public void __al_532(int var1, int var2, int var3) {
-      if(this.currentMapArea0 != null) {
+   public void method372(int var1, int var2, int var3) {
+      if (this.currentMapArea0 != null) {
          int[] var4 = this.currentMapArea0.position(var1, var2, var3);
-         if(var4 != null) {
+         if (var4 != null) {
             this.setWorldMapPositionTarget(var4[0], var4[1]);
          }
-
       }
+
    }
 
    @ObfuscatedName("ab")
@@ -982,14 +980,14 @@ public class WorldMap {
       signature = "(IIII)V",
       garbageValue = "1808854561"
    )
-   public void __ab_533(int var1, int var2, int var3) {
-      if(this.currentMapArea0 != null) {
+   public void method373(int var1, int var2, int var3) {
+      if (this.currentMapArea0 != null) {
          int[] var4 = this.currentMapArea0.position(var1, var2, var3);
-         if(var4 != null) {
-            this.__aw_531(var4[0], var4[1]);
+         if (var4 != null) {
+            this.method371(var4[0], var4[1]);
          }
-
       }
+
    }
 
    @ObfuscatedName("ae")
@@ -997,8 +995,8 @@ public class WorldMap {
       signature = "(I)I",
       garbageValue = "-659556919"
    )
-   public int __ae_534() {
-      return this.currentMapArea0 == null?-1:this.worldMapX + this.currentMapArea0.minX() * 64;
+   public int method374() {
+      return this.currentMapArea0 == null ? -1 : this.worldMapX + this.currentMapArea0.minX() * 64;
    }
 
    @ObfuscatedName("at")
@@ -1006,8 +1004,8 @@ public class WorldMap {
       signature = "(I)I",
       garbageValue = "1893257871"
    )
-   public int __at_535() {
-      return this.currentMapArea0 == null?-1:this.worldMapY + this.currentMapArea0.minY() * 64;
+   public int method375() {
+      return this.currentMapArea0 == null ? -1 : this.worldMapY + this.currentMapArea0.minY() * 64;
    }
 
    @ObfuscatedName("ad")
@@ -1015,8 +1013,8 @@ public class WorldMap {
       signature = "(I)Lhu;",
       garbageValue = "-2005824064"
    )
-   public TileLocation __ad_536() {
-      return this.currentMapArea0 == null?null:this.currentMapArea0.coord(this.__ae_534(), this.__at_535());
+   public TileLocation method376() {
+      return this.currentMapArea0 == null ? null : this.currentMapArea0.coord(this.method374(), this.method375());
    }
 
    @ObfuscatedName("ap")
@@ -1024,7 +1022,7 @@ public class WorldMap {
       signature = "(I)I",
       garbageValue = "442119278"
    )
-   public int __ap_537() {
+   public int method377() {
       return this.worldMapDisplayWidth;
    }
 
@@ -1033,7 +1031,7 @@ public class WorldMap {
       signature = "(I)I",
       garbageValue = "-2065910749"
    )
-   public int __as_538() {
+   public int method378() {
       return this.worldMapDisplayHeight;
    }
 
@@ -1042,9 +1040,9 @@ public class WorldMap {
       signature = "(II)V",
       garbageValue = "2017050927"
    )
-   public void __am_539(int var1) {
-      if(var1 >= 1) {
-         this.__ac = var1;
+   public void method379(int var1) {
+      if (var1 >= 1) {
+         this.field993 = var1;
       }
 
    }
@@ -1054,8 +1052,8 @@ public class WorldMap {
       signature = "(I)V",
       garbageValue = "-1568631080"
    )
-   public void __an_540() {
-      this.__ac = 3;
+   public void method380() {
+      this.field993 = 3;
    }
 
    @ObfuscatedName("az")
@@ -1063,9 +1061,9 @@ public class WorldMap {
       signature = "(II)V",
       garbageValue = "107295139"
    )
-   public void __az_541(int var1) {
-      if(var1 >= 1) {
-         this.__ay = var1;
+   public void method381(int var1) {
+      if (var1 >= 1) {
+         this.field994 = var1;
       }
 
    }
@@ -1075,8 +1073,8 @@ public class WorldMap {
       signature = "(I)V",
       garbageValue = "2023118274"
    )
-   public void __au_542() {
-      this.__ay = 50;
+   public void method382() {
+      this.field994 = 50;
    }
 
    @ObfuscatedName("ao")
@@ -1097,9 +1095,9 @@ public class WorldMap {
    @Export("flashElement")
    public void flashElement(int var1) {
       this.flashingElements = new HashSet();
-      this.flashingElements.add(Integer.valueOf(var1));
-      this.__aw = 0;
-      this.__al = 0;
+      this.flashingElements.add(var1);
+      this.field995 = 0;
+      this.field996 = 0;
    }
 
    @ObfuscatedName("ax")
@@ -1110,12 +1108,12 @@ public class WorldMap {
    @Export("flashCategory")
    public void flashCategory(int var1) {
       this.flashingElements = new HashSet();
-      this.__aw = 0;
-      this.__al = 0;
+      this.field995 = 0;
+      this.field996 = 0;
 
-      for(int var2 = 0; var2 < UserComparator4.WorldMapElement_count; ++var2) {
-         if(ViewportMouse.getWorldMapElement(var2) != null && ViewportMouse.getWorldMapElement(var2).category == var1) {
-            this.flashingElements.add(Integer.valueOf(ViewportMouse.getWorldMapElement(var2).__o));
+      for (int var2 = 0; var2 < UserComparator4.WorldMapElement_count; ++var2) {
+         if (ViewportMouse.getWorldMapElement(var2) != null && ViewportMouse.getWorldMapElement(var2).category == var1) {
+            this.flashingElements.add(ViewportMouse.getWorldMapElement(var2).field1020);
          }
       }
 
@@ -1148,13 +1146,13 @@ public class WorldMap {
    )
    @Export("disableElement")
    public void disableElement(int var1, boolean var2) {
-      if(!var2) {
-         this.enabledElements.add(Integer.valueOf(var1));
+      if (!var2) {
+         this.enabledElements.add(var1);
       } else {
-         this.enabledElements.remove(Integer.valueOf(var1));
+         this.enabledElements.remove(var1);
       }
 
-      this.__bk_543();
+      this.method383();
    }
 
    @ObfuscatedName("bb")
@@ -1164,24 +1162,24 @@ public class WorldMap {
    )
    @Export("disableCategory")
    public void disableCategory(int var1, boolean var2) {
-      if(!var2) {
-         this.enabledCategories.add(Integer.valueOf(var1));
+      if (!var2) {
+         this.enabledCategories.add(var1);
       } else {
-         this.enabledCategories.remove(Integer.valueOf(var1));
+         this.enabledCategories.remove(var1);
       }
 
-      for(int var3 = 0; var3 < UserComparator4.WorldMapElement_count; ++var3) {
-         if(ViewportMouse.getWorldMapElement(var3) != null && ViewportMouse.getWorldMapElement(var3).category == var1) {
-            int var4 = ViewportMouse.getWorldMapElement(var3).__o;
-            if(!var2) {
-               this.__ax.add(Integer.valueOf(var4));
+      for (int var3 = 0; var3 < UserComparator4.WorldMapElement_count; ++var3) {
+         if (ViewportMouse.getWorldMapElement(var3) != null && ViewportMouse.getWorldMapElement(var3).category == var1) {
+            int var4 = ViewportMouse.getWorldMapElement(var3).field1020;
+            if (!var2) {
+               this.field1005.add(var4);
             } else {
-               this.__ax.remove(Integer.valueOf(var4));
+               this.field1005.remove(var4);
             }
          }
       }
 
-      this.__bk_543();
+      this.method383();
    }
 
    @ObfuscatedName("bs")
@@ -1201,7 +1199,7 @@ public class WorldMap {
    )
    @Export("isElementDisabled")
    public boolean isElementDisabled(int var1) {
-      return !this.enabledElements.contains(Integer.valueOf(var1));
+      return !this.enabledElements.contains(var1);
    }
 
    @ObfuscatedName("bn")
@@ -1211,7 +1209,7 @@ public class WorldMap {
    )
    @Export("isCategoryDisabled")
    public boolean isCategoryDisabled(int var1) {
-      return !this.enabledCategories.contains(Integer.valueOf(var1));
+      return !this.enabledCategories.contains(var1);
    }
 
    @ObfuscatedName("bk")
@@ -1219,10 +1217,10 @@ public class WorldMap {
       signature = "(I)V",
       garbageValue = "758731634"
    )
-   void __bk_543() {
-      this.__af.clear();
-      this.__af.addAll(this.enabledElements);
-      this.__af.addAll(this.__ax);
+   void method383() {
+      this.field1006.clear();
+      this.field1006.addAll(this.enabledElements);
+      this.field1006.addAll(this.field1005);
    }
 
    @ObfuscatedName("bd")
@@ -1230,34 +1228,34 @@ public class WorldMap {
       signature = "(IIIIIIB)V",
       garbageValue = "-73"
    )
-   public void __bd_544(int var1, int var2, int var3, int var4, int var5, int var6) {
-      if(this.cacheLoader.isLoaded()) {
+   public void method384(int var1, int var2, int var3, int var4, int var5, int var6) {
+      if (this.cacheLoader.isLoaded()) {
          int var7 = (int)Math.ceil((double)((float)var3 / this.zoom));
          int var8 = (int)Math.ceil((double)((float)var4 / this.zoom));
-         List var9 = this.worldMapManager.__u_74(this.worldMapX - var7 / 2 - 1, this.worldMapY - var8 / 2 - 1, var7 / 2 + this.worldMapX + 1, var8 / 2 + this.worldMapY + 1, var1, var2, var3, var4, var5, var6);
-         if(!var9.isEmpty()) {
+         List var9 = this.worldMapManager.method403(this.worldMapX - var7 / 2 - 1, this.worldMapY - var8 / 2 - 1, var7 / 2 + this.worldMapX + 1, var8 / 2 + this.worldMapY + 1, var1, var2, var3, var4, var5, var6);
+         if (!var9.isEmpty()) {
             Iterator var10 = var9.iterator();
 
-            boolean var13;
+            boolean var11;
             do {
-               if(!var10.hasNext()) {
+               if (!var10.hasNext()) {
                   return;
                }
 
-               AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next();
-               WorldMapElement var12 = ViewportMouse.getWorldMapElement(var11.__m_15());
-               var13 = false;
+               AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var10.next();
+               WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.vmethod395());
+               var11 = false;
 
-               for(int var14 = this.__bs.length - 1; var14 >= 0; --var14) {
-                  if(var12.strings[var14] != null) {
-                     Tiles.insertMenuItemNoShift(var12.strings[var14], var12.string1, this.__bs[var14], var11.__m_15(), var11.coord1.packed(), var11.coord2.packed());
-                     var13 = true;
+               for (int var14 = this.field1008.length - 1; var14 >= 0; --var14) {
+                  if (var13.strings[var14] != null) {
+                     Tiles.insertMenuItemNoShift(var13.strings[var14], var13.string1, this.field1008[var14], var12.vmethod395(), var12.coord1.packed(), var12.coord2.packed());
+                     var11 = true;
                   }
                }
-            } while(!var13);
-
+            } while(!var11);
          }
       }
+
    }
 
    @ObfuscatedName("bc")
@@ -1265,41 +1263,37 @@ public class WorldMap {
       signature = "(ILhu;I)Lhu;",
       garbageValue = "333454230"
    )
-   public TileLocation __bc_545(int var1, TileLocation var2) {
-      if(!this.cacheLoader.isLoaded()) {
+   public TileLocation method385(int var1, TileLocation var2) {
+      if (!this.cacheLoader.isLoaded()) {
          return null;
-      } else if(!this.worldMapManager.isLoaded()) {
+      } else if (!this.worldMapManager.isLoaded()) {
          return null;
-      } else if(!this.currentMapArea0.containsPosition(var2.x, var2.y)) {
+      } else if (!this.currentMapArea0.containsPosition(var2.x, var2.y)) {
          return null;
       } else {
          HashMap var3 = this.worldMapManager.buildIcons();
-         List var4 = (List)var3.get(Integer.valueOf(var1));
-         if(var4 != null && !var4.isEmpty()) {
+         List var4 = (List)var3.get(var1);
+         if (var4 != null && !var4.isEmpty()) {
             AbstractWorldMapIcon var5 = null;
             int var6 = -1;
             Iterator var7 = var4.iterator();
 
-            while(true) {
-               AbstractWorldMapIcon var8;
-               int var11;
-               do {
-                  if(!var7.hasNext()) {
-                     return var5.coord2;
-                  }
+            while (var7.hasNext()) {
+               AbstractWorldMapIcon var8 = (AbstractWorldMapIcon)var7.next();
+               int var10 = var8.coord2.x - var2.x;
+               int var11 = var8.coord2.y - var2.y;
+               int var9 = var11 * var11 + var10 * var10;
+               if (var9 == 0) {
+                  return var8.coord2;
+               }
 
-                  var8 = (AbstractWorldMapIcon)var7.next();
-                  int var9 = var8.coord2.x - var2.x;
-                  int var10 = var8.coord2.y - var2.y;
-                  var11 = var10 * var10 + var9 * var9;
-                  if(var11 == 0) {
-                     return var8.coord2;
-                  }
-               } while(var11 >= var6 && var5 != null);
-
-               var5 = var8;
-               var6 = var11;
+               if (var9 < var6 || var5 == null) {
+                  var5 = var8;
+                  var6 = var9;
+               }
             }
+
+            return var5.coord2;
          } else {
             return null;
          }
@@ -1343,21 +1337,21 @@ public class WorldMap {
    )
    @Export("iconStart")
    public AbstractWorldMapIcon iconStart() {
-      if(!this.cacheLoader.isLoaded()) {
+      if (!this.cacheLoader.isLoaded()) {
          return null;
-      } else if(!this.worldMapManager.isLoaded()) {
+      } else if (!this.worldMapManager.isLoaded()) {
          return null;
       } else {
          HashMap var1 = this.worldMapManager.buildIcons();
-         this.__bq = new LinkedList();
+         this.field1009 = new LinkedList();
          Iterator var2 = var1.values().iterator();
 
-         while(var2.hasNext()) {
+         while (var2.hasNext()) {
             List var3 = (List)var2.next();
-            this.__bq.addAll(var3);
+            this.field1009.addAll(var3);
          }
 
-         this.iconIterator = this.__bq.iterator();
+         this.iconIterator = this.field1009.iterator();
          return this.iconNext();
       }
    }
@@ -1369,19 +1363,23 @@ public class WorldMap {
    )
    @Export("iconNext")
    public AbstractWorldMapIcon iconNext() {
-      if(this.iconIterator == null) {
+      if (this.iconIterator == null) {
          return null;
       } else {
-         AbstractWorldMapIcon var1;
-         do {
-            if(!this.iconIterator.hasNext()) {
-               return null;
+         while (this.iconIterator.hasNext()) {
+            AbstractWorldMapIcon var1 = (AbstractWorldMapIcon)this.iconIterator.next();
+            if (var1.vmethod395() != -1) {
+               return var1;
             }
+         }
 
-            var1 = (AbstractWorldMapIcon)this.iconIterator.next();
-         } while(var1.__m_15() == -1);
-
-         return var1;
+         return null;
       }
    }
+
+   static {
+      fontNameVerdana11 = FontName.FontName_verdana11;
+      fontNameVerdana13 = FontName.FontName_verdana13;
+      fontNameVerdana15 = FontName.FontName_verdana15;
+   }
 }
diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java
index 2a3d27d961..0d20341aaa 100644
--- a/runescape-client/src/main/java/WorldMapArea.java
+++ b/runescape-client/src/main/java/WorldMapArea.java
@@ -37,7 +37,7 @@ public class WorldMapArea {
    @ObfuscatedGetter(
       intValue = 986239133
    )
-   int __w;
+   int field1015;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = 196514055
@@ -83,7 +83,7 @@ public class WorldMapArea {
 
    public WorldMapArea() {
       this.id0 = -1;
-      this.__w = -1;
+      this.field1015 = -1;
       this.zoom0 = -1;
       this.origin0 = null;
       this.minX0 = Integer.MAX_VALUE;
@@ -104,14 +104,14 @@ public class WorldMapArea {
       this.archiveName0 = var1.readStringCp1252NullTerminated();
       this.name0 = var1.readStringCp1252NullTerminated();
       this.origin0 = new TileLocation(var1.readInt());
-      this.__w = var1.readInt();
+      this.field1015 = var1.readInt();
       var1.readUnsignedByte();
       this.isMain0 = var1.readUnsignedByte() == 1;
       this.zoom0 = var1.readUnsignedByte();
       int var3 = var1.readUnsignedByte();
       this.sections = new LinkedList();
 
-      for(int var4 = 0; var4 < var3; ++var4) {
+      for (int var4 = 0; var4 < var3; ++var4) {
          this.sections.add(this.readWorldMapSection(var1));
       }
 
@@ -126,7 +126,7 @@ public class WorldMapArea {
    @Export("readWorldMapSection")
    WorldMapSection readWorldMapSection(Buffer var1) {
       int var2 = var1.readUnsignedByte();
-      WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.__h_f, WorldMapSectionType.__h_w, WorldMapSectionType.__h_m, WorldMapSectionType.__h_q};
+      WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.field1101, WorldMapSectionType.field1103, WorldMapSectionType.field1100, WorldMapSectionType.field1102};
       WorldMapSectionType var4 = (WorldMapSectionType)ScriptFrame.findEnumerated(var3, var2);
       Object var5 = null;
       switch(var4.type) {
@@ -159,16 +159,14 @@ public class WorldMapArea {
    public boolean containsCoord(int var1, int var2, int var3) {
       Iterator var4 = this.sections.iterator();
 
-      WorldMapSection var5;
-      do {
-         if(!var4.hasNext()) {
-            return false;
+      while (var4.hasNext()) {
+         WorldMapSection var5 = (WorldMapSection)var4.next();
+         if (var5.containsCoord(var1, var2, var3)) {
+            return true;
          }
+      }
 
-         var5 = (WorldMapSection)var4.next();
-      } while(!var5.containsCoord(var1, var2, var3));
-
-      return true;
+      return false;
    }
 
    @ObfuscatedName("w")
@@ -180,20 +178,18 @@ public class WorldMapArea {
    public boolean containsPosition(int var1, int var2) {
       int var3 = var1 / 64;
       int var4 = var2 / 64;
-      if(var3 >= this.minX0 && var3 <= this.maxX0) {
-         if(var4 >= this.minY0 && var4 <= this.maxY0) {
+      if (var3 >= this.minX0 && var3 <= this.maxX0) {
+         if (var4 >= this.minY0 && var4 <= this.maxY0) {
             Iterator var5 = this.sections.iterator();
 
-            WorldMapSection var6;
-            do {
-               if(!var5.hasNext()) {
-                  return false;
+            while (var5.hasNext()) {
+               WorldMapSection var6 = (WorldMapSection)var5.next();
+               if (var6.containsPosition(var1, var2)) {
+                  return true;
                }
+            }
 
-               var6 = (WorldMapSection)var5.next();
-            } while(!var6.containsPosition(var1, var2));
-
-            return true;
+            return false;
          } else {
             return false;
          }
@@ -211,16 +207,14 @@ public class WorldMapArea {
    public int[] position(int var1, int var2, int var3) {
       Iterator var4 = this.sections.iterator();
 
-      WorldMapSection var5;
-      do {
-         if(!var4.hasNext()) {
-            return null;
+      while (var4.hasNext()) {
+         WorldMapSection var5 = (WorldMapSection)var4.next();
+         if (var5.containsCoord(var1, var2, var3)) {
+            return var5.position(var1, var2, var3);
          }
+      }
 
-         var5 = (WorldMapSection)var4.next();
-      } while(!var5.containsCoord(var1, var2, var3));
-
-      return var5.position(var1, var2, var3);
+      return null;
    }
 
    @ObfuscatedName("u")
@@ -232,16 +226,14 @@ public class WorldMapArea {
    public TileLocation coord(int var1, int var2) {
       Iterator var3 = this.sections.iterator();
 
-      WorldMapSection var4;
-      do {
-         if(!var3.hasNext()) {
-            return null;
+      while (var3.hasNext()) {
+         WorldMapSection var4 = (WorldMapSection)var3.next();
+         if (var4.containsPosition(var1, var2)) {
+            return var4.coord(var1, var2);
          }
+      }
 
-         var4 = (WorldMapSection)var3.next();
-      } while(!var4.containsPosition(var1, var2));
-
-      return var4.coord(var1, var2);
+      return null;
    }
 
    @ObfuscatedName("g")
@@ -253,7 +245,7 @@ public class WorldMapArea {
    void setBounds() {
       Iterator var1 = this.sections.iterator();
 
-      while(var1.hasNext()) {
+      while (var1.hasNext()) {
          WorldMapSection var2 = (WorldMapSection)var1.next();
          var2.expandBounds(this);
       }
@@ -305,8 +297,8 @@ public class WorldMapArea {
       signature = "(I)I",
       garbageValue = "-1657905623"
    )
-   int __a_39() {
-      return this.__w;
+   int method386() {
+      return this.field1015;
    }
 
    @ObfuscatedName("z")
@@ -405,12 +397,12 @@ public class WorldMapArea {
       garbageValue = "-1490951132"
    )
    static int method427(int var0, int var1) {
-      if(var0 == -2) {
+      if (var0 == -2) {
          return 12345678;
-      } else if(var0 == -1) {
-         if(var1 < 0) {
+      } else if (var0 == -1) {
+         if (var1 < 0) {
             var1 = 0;
-         } else if(var1 > 127) {
+         } else if (var1 > 127) {
             var1 = 127;
          }
 
@@ -418,9 +410,9 @@ public class WorldMapArea {
          return var1;
       } else {
          var1 = (var0 & 127) * var1 / 128;
-         if(var1 < 2) {
+         if (var1 < 2) {
             var1 = 2;
-         } else if(var1 > 126) {
+         } else if (var1 > 126) {
             var1 = 126;
          }
 
@@ -434,8 +426,8 @@ public class WorldMapArea {
       garbageValue = "-26"
    )
    static void method428() {
-      if(Client.oculusOrbState == 1) {
-         Client.__client_ij = true;
+      if (Client.oculusOrbState == 1) {
+         Client.field199 = true;
       }
 
    }
diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java
index eeacab73f6..6c7931c721 100644
--- a/runescape-client/src/main/java/WorldMapAreaData.java
+++ b/runescape-client/src/main/java/WorldMapAreaData.java
@@ -10,51 +10,51 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("WorldMapAreaData")
 public class WorldMapAreaData extends WorldMapArea {
    @ObfuscatedName("n")
-   HashSet __n;
+   HashSet field1016;
    @ObfuscatedName("i")
-   HashSet __i;
+   HashSet field1017;
    @ObfuscatedName("a")
-   List __a;
+   List field1018;
 
    @ObfuscatedName("ce")
    @ObfuscatedSignature(
       signature = "(Lgr;Lgr;IZI)V",
       garbageValue = "-1999841505"
    )
-   void __ce_76(Buffer var1, Buffer var2, int var3, boolean var4) {
+   void method387(Buffer var1, Buffer var2, int var3, boolean var4) {
       this.read(var1, var3);
-      int var5 = var2.__ag_302();
-      this.__n = new HashSet(var5);
+      int var5 = var2.method43();
+      this.field1016 = new HashSet(var5);
 
       int var6;
-      for(var6 = 0; var6 < var5; ++var6) {
+      for (var6 = 0; var6 < var5; ++var6) {
          class15 var7 = new class15();
 
          try {
             var7.method173(var2);
-         } catch (IllegalStateException var12) {
-            continue;
-         }
-
-         this.__n.add(var7);
-      }
-
-      var6 = var2.__ag_302();
-      this.__i = new HashSet(var6);
-
-      for(int var10 = 0; var10 < var6; ++var10) {
-         class39 var8 = new class39();
-
-         try {
-            var8.method714(var2);
          } catch (IllegalStateException var11) {
             continue;
          }
 
-         this.__i.add(var8);
+         this.field1016.add(var7);
       }
 
-      this.__cy_77(var2, var4);
+      var6 = var2.method43();
+      this.field1017 = new HashSet(var6);
+
+      for (int var12 = 0; var12 < var6; ++var12) {
+         class39 var8 = new class39();
+
+         try {
+            var8.method714(var2);
+         } catch (IllegalStateException var10) {
+            continue;
+         }
+
+         this.field1017.add(var8);
+      }
+
+      this.method388(var2, var4);
    }
 
    @ObfuscatedName("cy")
@@ -62,16 +62,16 @@ public class WorldMapAreaData extends WorldMapArea {
       signature = "(Lgr;ZB)V",
       garbageValue = "48"
    )
-   void __cy_77(Buffer var1, boolean var2) {
-      this.__a = new LinkedList();
-      int var3 = var1.__ag_302();
+   void method388(Buffer var1, boolean var2) {
+      this.field1018 = new LinkedList();
+      int var3 = var1.method43();
 
-      for(int var4 = 0; var4 < var3; ++var4) {
-         int var5 = var1.__ap_310();
+      for (int var4 = 0; var4 < var3; ++var4) {
+         int var5 = var1.method51();
          TileLocation var6 = new TileLocation(var1.readInt());
          boolean var7 = var1.readUnsignedByte() == 1;
-         if(var2 || !var7) {
-            this.__a.add(new WorldMapIcon1((TileLocation)null, var6, var5, (WorldMapLabel)null));
+         if (var2 || !var7) {
+            this.field1018.add(new WorldMapIcon1((TileLocation)null, var6, var5, (WorldMapLabel)null));
          }
       }
 
@@ -85,12 +85,12 @@ public class WorldMapAreaData extends WorldMapArea {
    @Export("getSequenceDefinition")
    public static SequenceDefinition getSequenceDefinition(int var0) {
       SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
          byte[] var2 = SequenceDefinition.SequenceDefinition_indexCache.takeRecord(12, var0);
          var1 = new SequenceDefinition();
-         if(var2 != null) {
+         if (var2 != null) {
             var1.read(new Buffer(var2));
          }
 
@@ -126,19 +126,19 @@ public class WorldMapAreaData extends WorldMapArea {
    static int method710(int var0, Script var1, boolean var2) {
       boolean var3 = true;
       Widget var4;
-      if(var0 >= 2000) {
+      if (var0 >= 2000) {
          var0 -= 1000;
          var4 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
          var3 = false;
       } else {
-         var4 = var2?WorldMapIcon1.__t_i:class12.__n_n;
+         var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
       }
 
-      int var11;
-      if(var0 == 1300) {
-         var11 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] - 1;
-         if(var11 >= 0 && var11 <= 9) {
-            var4.setAction(var11, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
+      int var5;
+      if (var0 == 1300) {
+         var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] - 1;
+         if (var5 >= 0 && var5 <= 9) {
+            var4.setAction(var5, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
             return 1;
          } else {
             --Interpreter.Interpreter_stringStackSize;
@@ -146,106 +146,105 @@ public class WorldMapAreaData extends WorldMapArea {
          }
       } else {
          int var6;
-         if(var0 == 1301) {
+         if (var0 == 1301) {
             RouteStrategy.Interpreter_intStackSize -= 2;
-            var11 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+            var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
             var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-            var4.parent = class204.getWidgetChild(var11, var6);
+            var4.parent = class204.getWidgetChild(var5, var6);
             return 1;
-         } else if(var0 == 1302) {
+         } else if (var0 == 1302) {
             var4.isScrollBar = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
             return 1;
-         } else if(var0 == 1303) {
+         } else if (var0 == 1303) {
             var4.dragZoneSize = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             return 1;
-         } else if(var0 == 1304) {
+         } else if (var0 == 1304) {
             var4.dragThreshold = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             return 1;
-         } else if(var0 == 1305) {
+         } else if (var0 == 1305) {
             var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
             return 1;
-         } else if(var0 == 1306) {
+         } else if (var0 == 1306) {
             var4.spellActionName = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
             return 1;
-         } else if(var0 == 1307) {
+         } else if (var0 == 1307) {
             var4.actions = null;
             return 1;
-         } else if(var0 == 1308) {
-            var4.__fz = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+         } else if (var0 == 1308) {
+            var4.field985 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
             return 1;
          } else {
             int var7;
-            byte[] var9;
-            if(var0 != 1350) {
-               byte var5;
-               if(var0 == 1351) {
+            byte[] var8;
+            if (var0 != 1350) {
+               byte var11;
+               if (var0 == 1351) {
                   RouteStrategy.Interpreter_intStackSize -= 2;
-                  var5 = 10;
-                  var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]};
+                  var11 = 10;
+                  var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]};
                   byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]};
-                  BufferedSink.method3595(var4, var5, var9, var10);
+                  BufferedSink.method3595(var4, var11, var8, var10);
                   return 1;
-               } else if(var0 == 1352) {
+               } else if (var0 == 1352) {
                   RouteStrategy.Interpreter_intStackSize -= 3;
-                  var11 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1;
+                  var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1;
                   var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
                   var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-                  if(var11 >= 0 && var11 <= 9) {
-                     Varcs.method2168(var4, var11, var6, var7);
+                  if (var5 >= 0 && var5 <= 9) {
+                     Varcs.method2168(var4, var5, var6, var7);
                      return 1;
                   } else {
                      throw new RuntimeException();
                   }
-               } else if(var0 == 1353) {
-                  var5 = 10;
+               } else if (var0 == 1353) {
+                  var11 = 10;
                   var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                   var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  Varcs.method2168(var4, var5, var6, var7);
+                  Varcs.method2168(var4, var11, var6, var7);
                   return 1;
-               } else if(var0 == 1354) {
+               } else if (var0 == 1354) {
                   --RouteStrategy.Interpreter_intStackSize;
-                  var11 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1;
-                  if(var11 >= 0 && var11 <= 9) {
-                     WorldMapSection3.method345(var4, var11);
+                  var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1;
+                  if (var5 >= 0 && var5 <= 9) {
+                     WorldMapSection3.method345(var4, var5);
                      return 1;
                   } else {
                      throw new RuntimeException();
                   }
-               } else if(var0 == 1355) {
-                  var5 = 10;
-                  WorldMapSection3.method345(var4, var5);
+               } else if (var0 == 1355) {
+                  var11 = 10;
+                  WorldMapSection3.method345(var4, var11);
                   return 1;
                } else {
                   return 2;
                }
             } else {
-               byte[] var8 = null;
-               var9 = null;
-               if(var3) {
+               byte[] var9 = null;
+               var8 = null;
+               if (var3) {
                   RouteStrategy.Interpreter_intStackSize -= 10;
 
-                  for(var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize] >= 0; var7 += 2) {
-                     ;
+                  for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize] >= 0; var7 += 2) {
                   }
 
-                  if(var7 > 0) {
-                     var8 = new byte[var7 / 2];
+                  if (var7 > 0) {
                      var9 = new byte[var7 / 2];
+                     var8 = new byte[var7 / 2];
 
-                     for(var7 -= 2; var7 >= 0; var7 -= 2) {
-                        var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize];
-                        var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize + 1];
+                     for (var7 -= 2; var7 >= 0; var7 -= 2) {
+                        var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize];
+                        var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize + 1];
                      }
                   }
                } else {
                   RouteStrategy.Interpreter_intStackSize -= 2;
-                  var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]};
-                  var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]};
+                  var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]};
+                  var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]};
                }
 
                var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] - 1;
-               if(var7 >= 0 && var7 <= 9) {
-                  BufferedSink.method3595(var4, var7, var8, var9);
+               if (var7 >= 0 && var7 <= 9) {
+                  BufferedSink.method3595(var4, var7, var9, var8);
                   return 1;
                } else {
                   throw new RuntimeException();
@@ -261,19 +260,19 @@ public class WorldMapAreaData extends WorldMapArea {
       garbageValue = "1705746695"
    )
    static final int method712(int var0, int var1, int var2) {
-      if(var2 > 179) {
+      if (var2 > 179) {
          var1 /= 2;
       }
 
-      if(var2 > 192) {
+      if (var2 > 192) {
          var1 /= 2;
       }
 
-      if(var2 > 217) {
+      if (var2 > 217) {
          var1 /= 2;
       }
 
-      if(var2 > 243) {
+      if (var2 > 243) {
          var1 /= 2;
       }
 
diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java
index 705477fe2c..8a9ca944f4 100644
--- a/runescape-client/src/main/java/WorldMapCacheName.java
+++ b/runescape-client/src/main/java/WorldMapCacheName.java
@@ -49,14 +49,6 @@ public class WorldMapCacheName {
    @Export("name")
    public final String name;
 
-   static {
-      WorldMapCacheName_details = new WorldMapCacheName("details");
-      WorldMapCacheName_compositeMap = new WorldMapCacheName("compositemap");
-      WorldMapCacheName_compositeTexture = new WorldMapCacheName("compositetexture");
-      WorldMapCacheName_area = new WorldMapCacheName("area");
-      WorldMapCacheName_labels = new WorldMapCacheName("labels");
-   }
-
    WorldMapCacheName(String var1) {
       this.name = var1;
    }
@@ -67,20 +59,20 @@ public class WorldMapCacheName {
       garbageValue = "-1459849000"
    )
    public static void method633(int[] var0, int[] var1) {
-      if(var0 != null && var1 != null) {
-         ByteArrayPool.__gi_g = var0;
-         WorldMapSection2.__ah_l = new int[var0.length];
-         RouteStrategy.__fe_e = new byte[var0.length][][];
+      if (var0 != null && var1 != null) {
+         ByteArrayPool.field55 = var0;
+         WorldMapSection2.field1082 = new int[var0.length];
+         RouteStrategy.field760 = new byte[var0.length][][];
 
-         for(int var2 = 0; var2 < ByteArrayPool.__gi_g.length; ++var2) {
-            RouteStrategy.__fe_e[var2] = new byte[var1[var2]][];
+         for (int var2 = 0; var2 < ByteArrayPool.field55.length; ++var2) {
+            RouteStrategy.field760[var2] = new byte[var1[var2]][];
          }
-
       } else {
-         ByteArrayPool.__gi_g = null;
-         WorldMapSection2.__ah_l = null;
-         RouteStrategy.__fe_e = null;
+         ByteArrayPool.field55 = null;
+         WorldMapSection2.field1082 = null;
+         RouteStrategy.field760 = (byte[][][])null;
       }
+
    }
 
    @ObfuscatedName("m")
@@ -89,19 +81,18 @@ public class WorldMapCacheName {
       garbageValue = "1532180466"
    )
    public static void method635(String var0, boolean var1, boolean var2) {
-      if(var1) {
-         if(Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) {
+      if (var1) {
+         if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) {
             try {
                Desktop.getDesktop().browse(new URI(var0));
                return;
             } catch (Exception var4) {
-               ;
             }
          }
 
-         if(class50.__af_f.startsWith("win")) {
+         if (class50.field1160.startsWith("win")) {
             ReflectionCheck.method5920(var0, 0);
-         } else if(class50.__af_f.startsWith("mac")) {
+         } else if (class50.field1160.startsWith("mac")) {
             FaceNormal.method3237(var0, 1, "openjs");
          } else {
             ReflectionCheck.method5920(var0, 2);
@@ -119,27 +110,27 @@ public class WorldMapCacheName {
    )
    public static int method634(int var0) {
       int var1 = 0;
-      if(var0 < 0 || var0 >= 65536) {
+      if (var0 < 0 || var0 >= 65536) {
          var0 >>>= 16;
          var1 += 16;
       }
 
-      if(var0 >= 256) {
+      if (var0 >= 256) {
          var0 >>>= 8;
          var1 += 8;
       }
 
-      if(var0 >= 16) {
+      if (var0 >= 16) {
          var0 >>>= 4;
          var1 += 4;
       }
 
-      if(var0 >= 4) {
+      if (var0 >= 4) {
          var0 >>>= 2;
          var1 += 2;
       }
 
-      if(var0 >= 1) {
+      if (var0 >= 1) {
          var0 >>>= 1;
          ++var1;
       }
@@ -154,24 +145,24 @@ public class WorldMapCacheName {
    )
    @Export("addPlayerToScene")
    static void addPlayerToScene(Player var0, boolean var1) {
-      if(var0 != null && var0.isVisible() && !var0.isHidden) {
+      if (var0 != null && var0.isVisible() && !var0.isHidden) {
          var0.isUnanimated = false;
-         if((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) {
+         if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) {
             var0.isUnanimated = true;
          }
 
          int var2 = var0.x >> 7;
          int var3 = var0.y >> 7;
-         if(var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) {
+         if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) {
             long var4 = FontName.method5637(0, 0, 0, false, var0.index);
-            if(var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) {
+            if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) {
                var0.isUnanimated = false;
                var0.tileHeight = class32.getTileHeight(var0.x, var0.y, SoundSystem.plane);
                var0.playerCycle = Client.cycle;
-               class65.scene.__z_240(SoundSystem.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.__ac, var4, var0.__z, var0.__j, var0.__s, var0.__t);
+               class65.scene.method286(SoundSystem.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.field9, var4, var0.field721, var0.field722, var0.field723, var0.field724);
             } else {
-               if((var0.x & 127) == 64 && (var0.y & 127) == 64) {
-                  if(Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) {
+               if ((var0.x & 127) == 64 && (var0.y & 127) == 64) {
+                  if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) {
                      return;
                   }
 
@@ -180,10 +171,18 @@ public class WorldMapCacheName {
 
                var0.tileHeight = class32.getTileHeight(var0.x, var0.y, SoundSystem.plane);
                var0.playerCycle = Client.cycle;
-               class65.scene.__a_239(SoundSystem.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.__ac, var4, var0.__ay);
+               class65.scene.method285(SoundSystem.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.field9, var4, var0.field10);
             }
          }
       }
 
    }
+
+   static {
+      WorldMapCacheName_details = new WorldMapCacheName("details");
+      WorldMapCacheName_compositeMap = new WorldMapCacheName("compositemap");
+      WorldMapCacheName_compositeTexture = new WorldMapCacheName("compositetexture");
+      WorldMapCacheName_area = new WorldMapCacheName("area");
+      WorldMapCacheName_labels = new WorldMapCacheName("labels");
+   }
 }
diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java
index 04d541e9df..e890251192 100644
--- a/runescape-client/src/main/java/WorldMapElement.java
+++ b/runescape-client/src/main/java/WorldMapElement.java
@@ -11,7 +11,7 @@ public class WorldMapElement extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __ic_m;
+   public static AbstractIndexCache field1019;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -28,7 +28,7 @@ public class WorldMapElement extends DualNode {
    @ObfuscatedGetter(
       intValue = -1579051565
    )
-   public final int __o;
+   public final int field1020;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 2012857993
@@ -42,12 +42,12 @@ public class WorldMapElement extends DualNode {
    @Export("sprite2")
    int sprite2;
    @ObfuscatedName("l")
-   public String __l;
+   public String field1021;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -231067
    )
-   public int __e;
+   public int field1022;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = 1184517129
@@ -61,27 +61,27 @@ public class WorldMapElement extends DualNode {
    @Export("string1")
    public String string1;
    @ObfuscatedName("i")
-   int[] __i;
+   int[] field1023;
    @ObfuscatedName("a")
    @ObfuscatedGetter(
       intValue = 1336803515
    )
-   int __a;
+   int field1024;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = -1825795359
    )
-   int __z;
+   int field1025;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = -1007121521
    )
-   int __j;
+   int field1026;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = -1209054101
    )
-   int __s;
+   int field1027;
    @ObfuscatedName("t")
    @ObfuscatedSignature(
       signature = "Lju;"
@@ -93,9 +93,9 @@ public class WorldMapElement extends DualNode {
    )
    public class249 field3301;
    @ObfuscatedName("h")
-   int[] __h;
+   int[] field1028;
    @ObfuscatedName("b")
-   byte[] __b;
+   byte[] field1029;
    @ObfuscatedName("c")
    @ObfuscatedGetter(
       intValue = -653112729
@@ -103,23 +103,19 @@ public class WorldMapElement extends DualNode {
    @Export("category")
    public int category;
 
-   static {
-      WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256);
-   }
-
    public WorldMapElement(int var1) {
       this.sprite1 = -1;
       this.sprite2 = -1;
       this.textSize = 0;
       this.strings = new String[5];
-      this.__a = Integer.MAX_VALUE;
-      this.__z = Integer.MAX_VALUE;
-      this.__j = Integer.MIN_VALUE;
-      this.__s = Integer.MIN_VALUE;
+      this.field1024 = Integer.MAX_VALUE;
+      this.field1025 = Integer.MAX_VALUE;
+      this.field1026 = Integer.MIN_VALUE;
+      this.field1027 = Integer.MIN_VALUE;
       this.field3287 = class266.field3527;
       this.field3301 = class249.field3273;
       this.category = -1;
-      this.__o = var1;
+      this.field1020 = var1;
    }
 
    @ObfuscatedName("f")
@@ -129,9 +125,9 @@ public class WorldMapElement extends DualNode {
    )
    @Export("read")
    public void read(Buffer var1) {
-      while(true) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
@@ -146,82 +142,80 @@ public class WorldMapElement extends DualNode {
    )
    @Export("readNext")
    void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         this.sprite1 = var1.__ap_310();
-      } else if(var2 == 2) {
-         this.sprite2 = var1.__ap_310();
-      } else if(var2 == 3) {
-         this.__l = var1.readStringCp1252NullTerminated();
-      } else if(var2 == 4) {
-         this.__e = var1.readMedium();
-      } else if(var2 == 5) {
+      if (var2 == 1) {
+         this.sprite1 = var1.method51();
+      } else if (var2 == 2) {
+         this.sprite2 = var1.method51();
+      } else if (var2 == 3) {
+         this.field1021 = var1.readStringCp1252NullTerminated();
+      } else if (var2 == 4) {
+         this.field1022 = var1.readMedium();
+      } else if (var2 == 5) {
          var1.readMedium();
-      } else if(var2 == 6) {
+      } else if (var2 == 6) {
          this.textSize = var1.readUnsignedByte();
       } else {
          int var3;
-         if(var2 == 7) {
+         if (var2 == 7) {
             var3 = var1.readUnsignedByte();
-            if((var3 & 1) == 0) {
-               ;
+            if ((var3 & 1) == 0) {
             }
 
-            if((var3 & 2) == 2) {
-               ;
+            if ((var3 & 2) == 2) {
             }
-         } else if(var2 == 8) {
+         } else if (var2 == 8) {
             var1.readUnsignedByte();
-         } else if(var2 >= 10 && var2 <= 14) {
+         } else if (var2 >= 10 && var2 <= 14) {
             this.strings[var2 - 10] = var1.readStringCp1252NullTerminated();
-         } else if(var2 == 15) {
+         } else if (var2 == 15) {
             var3 = var1.readUnsignedByte();
-            this.__i = new int[var3 * 2];
+            this.field1023 = new int[var3 * 2];
 
             int var4;
-            for(var4 = 0; var4 < var3 * 2; ++var4) {
-               this.__i[var4] = var1.__aq_303();
+            for (var4 = 0; var4 < var3 * 2; ++var4) {
+               this.field1023[var4] = var1.method44();
             }
 
             var1.readInt();
             var4 = var1.readUnsignedByte();
-            this.__h = new int[var4];
+            this.field1028 = new int[var4];
 
             int var5;
-            for(var5 = 0; var5 < this.__h.length; ++var5) {
-               this.__h[var5] = var1.readInt();
+            for (var5 = 0; var5 < this.field1028.length; ++var5) {
+               this.field1028[var5] = var1.readInt();
             }
 
-            this.__b = new byte[var3];
+            this.field1029 = new byte[var3];
 
-            for(var5 = 0; var5 < var3; ++var5) {
-               this.__b[var5] = var1.readByte();
+            for (var5 = 0; var5 < var3; ++var5) {
+               this.field1029[var5] = var1.readByte();
             }
-         } else if(var2 != 16) {
-            if(var2 == 17) {
+         } else if (var2 != 16) {
+            if (var2 == 17) {
                this.string1 = var1.readStringCp1252NullTerminated();
-            } else if(var2 == 18) {
-               var1.__ap_310();
-            } else if(var2 == 19) {
-               this.category = var1.__ag_302();
-            } else if(var2 == 21) {
+            } else if (var2 == 18) {
+               var1.method51();
+            } else if (var2 == 19) {
+               this.category = var1.method43();
+            } else if (var2 == 21) {
                var1.readInt();
-            } else if(var2 == 22) {
+            } else if (var2 == 22) {
                var1.readInt();
-            } else if(var2 == 23) {
+            } else if (var2 == 23) {
                var1.readUnsignedByte();
                var1.readUnsignedByte();
                var1.readUnsignedByte();
-            } else if(var2 == 24) {
-               var1.__aq_303();
-               var1.__aq_303();
-            } else if(var2 == 25) {
-               var1.__ap_310();
-            } else if(var2 == 28) {
+            } else if (var2 == 24) {
+               var1.method44();
+               var1.method44();
+            } else if (var2 == 25) {
+               var1.method51();
+            } else if (var2 == 28) {
                var1.readUnsignedByte();
-            } else if(var2 == 29) {
+            } else if (var2 == 29) {
                class266[] var6 = new class266[]{class266.field3527, class266.field3526, class266.field3529};
                this.field3287 = (class266)ScriptFrame.findEnumerated(var6, var1.readUnsignedByte());
-            } else if(var2 == 30) {
+            } else if (var2 == 30) {
                this.field3301 = (class249)ScriptFrame.findEnumerated(UnderlayDefinition.method4839(), var1.readUnsignedByte());
             }
          }
@@ -234,19 +228,19 @@ public class WorldMapElement extends DualNode {
       signature = "(I)V",
       garbageValue = "1799485224"
    )
-   public void __w_409() {
-      if(this.__i != null) {
-         for(int var1 = 0; var1 < this.__i.length; var1 += 2) {
-            if(this.__i[var1] < this.__a) {
-               this.__a = this.__i[var1];
-            } else if(this.__i[var1] > this.__j) {
-               this.__j = this.__i[var1];
+   public void method389() {
+      if (this.field1023 != null) {
+         for (int var1 = 0; var1 < this.field1023.length; var1 += 2) {
+            if (this.field1023[var1] < this.field1024) {
+               this.field1024 = this.field1023[var1];
+            } else if (this.field1023[var1] > this.field1026) {
+               this.field1026 = this.field1023[var1];
             }
 
-            if(this.__i[var1 + 1] < this.__z) {
-               this.__z = this.__i[var1 + 1];
-            } else if(this.__i[var1 + 1] > this.__s) {
-               this.__s = this.__i[var1 + 1];
+            if (this.field1023[var1 + 1] < this.field1025) {
+               this.field1025 = this.field1023[var1 + 1];
+            } else if (this.field1023[var1 + 1] > this.field1027) {
+               this.field1027 = this.field1023[var1 + 1];
             }
          }
       }
@@ -271,15 +265,15 @@ public class WorldMapElement extends DualNode {
    )
    @Export("getSprite0")
    Sprite getSprite0(int var1) {
-      if(var1 < 0) {
+      if (var1 < 0) {
          return null;
       } else {
          Sprite var2 = (Sprite)WorldMapElement_cachedSprites.get((long)var1);
-         if(var2 != null) {
+         if (var2 != null) {
             return var2;
          } else {
-            var2 = class322.readSprite(__ic_m, var1, 0);
-            if(var2 != null) {
+            var2 = class322.readSprite(field1019, var1, 0);
+            if (var2 != null) {
                WorldMapElement_cachedSprites.put(var2, (long)var1);
             }
 
@@ -293,8 +287,8 @@ public class WorldMapElement extends DualNode {
       signature = "(I)I",
       garbageValue = "821701099"
    )
-   public int __g_410() {
-      return this.__o;
+   public int method390() {
+      return this.field1020;
    }
 
    @ObfuscatedName("m")
@@ -306,13 +300,17 @@ public class WorldMapElement extends DualNode {
       class310[] var1 = new class310[]{class310.field3805, class310.field3807, class310.field3806};
       class310[] var2 = var1;
 
-      for(int var3 = 0; var3 < var2.length; ++var3) {
+      for (int var3 = 0; var3 < var2.length; ++var3) {
          class310 var4 = var2[var3];
-         if(var0 == var4.field3804) {
+         if (var0 == var4.field3804) {
             return var4;
          }
       }
 
       return null;
    }
+
+   static {
+      WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256);
+   }
 }
diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java
index 258935c48c..31641f4ed8 100644
--- a/runescape-client/src/main/java/WorldMapEvent.java
+++ b/runescape-client/src/main/java/WorldMapEvent.java
@@ -55,8 +55,8 @@ public class WorldMapEvent {
       signature = "(IIIIB)V",
       garbageValue = "2"
    )
-   static final void method781(int var0, int var1, int var2, int var3) {
-      if(Client.isItemSelected == 0 && !Client.isSpellSelected) {
+   static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
+      if (Client.isItemSelected == 0 && !Client.isSpellSelected) {
          Tiles.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3);
       }
 
@@ -64,189 +64,189 @@ public class WorldMapEvent {
       long var6 = -1L;
       int var8 = 0;
 
-      while(true) {
-         int var10 = ViewportMouse.ViewportMouse_entityCount;
-         if(var8 >= var10) {
-            if(-1L != var4) {
+      while (true) {
+         int var9 = ViewportMouse.ViewportMouse_entityCount;
+         if (var8 >= var9) {
+            if (-1L != var4) {
                var8 = UnitPriceComparator.method134(var4);
-               int var9 = (int)(var4 >>> 7 & 127L);
+               int var29 = (int)(var4 >>> 7 & 127L);
                Player var11 = Client.players[Client.combatTargetPlayerIndex];
-               TotalQuantityComparator.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9);
+               TotalQuantityComparator.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var29);
             }
 
             return;
          }
 
-         long var26 = ViewportMouse.ViewportMouse_entityTags[var8];
-         if(var6 != var26) {
-            label338: {
-               var6 = var26;
-               int var15 = method780(var8);
-               long var18 = ViewportMouse.ViewportMouse_entityTags[var8];
-               int var17 = (int)(var18 >>> 7 & 127L);
-               var17 = var17;
-               int var28 = GrandExchangeEvent.method80(var8);
-               int var19 = ClientPreferences.method1808(var8);
-               if(var28 == 2 && class65.scene.getObjectFlags(SoundSystem.plane, var15, var17, var26) >= 0) {
-                  ObjectDefinition var20 = class50.getObjectDefinition(var19);
-                  if(var20.transforms != null) {
-                     var20 = var20.transform();
+         long var10 = ViewportMouse.ViewportMouse_entityTags[var8];
+         if (var6 != var10) {
+            label276: {
+               var6 = var10;
+               int var12 = method780(var8);
+               long var13 = ViewportMouse.ViewportMouse_entityTags[var8];
+               int var15 = (int)(var13 >>> 7 & 127L);
+               var15 = var15;
+               int var16 = GrandExchangeEvent.method80(var8);
+               int var17 = ClientPreferences.method1808(var8);
+               if (var16 == 2 && class65.scene.getObjectFlags(SoundSystem.plane, var12, var15, var10) >= 0) {
+                  ObjectDefinition var18 = class50.getObjectDefinition(var17);
+                  if (var18.transforms != null) {
+                     var18 = var18.transform();
                   }
 
-                  if(var20 == null) {
-                     break label338;
+                  if (var18 == null) {
+                     break label276;
                   }
 
-                  if(Client.isItemSelected == 1) {
-                     Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(65535) + var20.name, 1, var19, var15, var17);
-                  } else if(Client.isSpellSelected) {
-                     if((FloorDecoration.selectedSpellFlags & 4) == 4) {
-                        Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(65535) + var20.name, 2, var19, var15, var17);
+                  if (Client.isItemSelected == 1) {
+                     Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 1, var17, var12, var15);
+                  } else if (Client.isSpellSelected) {
+                     if ((FloorDecoration.selectedSpellFlags & 4) == 4) {
+                        Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 2, var17, var12, var15);
                      }
                   } else {
-                     String[] var29 = var20.actions;
-                     if(var29 != null) {
-                        for(int var30 = 4; var30 >= 0; --var30) {
-                           if(var29[var30] != null) {
-                              short var23 = 0;
-                              if(var30 == 0) {
-                                 var23 = 3;
+                     String[] var19 = var18.actions;
+                     if (var19 != null) {
+                        for (int var20 = 4; var20 >= 0; --var20) {
+                           if (var19[var20] != null) {
+                              short var21 = 0;
+                              if (var20 == 0) {
+                                 var21 = 3;
                               }
 
-                              if(var30 == 1) {
-                                 var23 = 4;
+                              if (var20 == 1) {
+                                 var21 = 4;
                               }
 
-                              if(var30 == 2) {
-                                 var23 = 5;
+                              if (var20 == 2) {
+                                 var21 = 5;
                               }
 
-                              if(var30 == 3) {
-                                 var23 = 6;
+                              if (var20 == 3) {
+                                 var21 = 6;
                               }
 
-                              if(var30 == 4) {
-                                 var23 = 1001;
+                              if (var20 == 4) {
+                                 var21 = 1001;
                               }
 
-                              Tiles.insertMenuItemNoShift(var29[var30], BufferedFile.colorStartTag(65535) + var20.name, var23, var19, var15, var17);
+                              Tiles.insertMenuItemNoShift(var19[var20], BufferedFile.colorStartTag(65535) + var18.name, var21, var17, var12, var15);
                            }
                         }
                      }
 
-                     Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(65535) + var20.name, 1002, var20.id, var15, var17);
+                     Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(65535) + var18.name, 1002, var18.id, var12, var15);
                   }
                }
 
-               int var21;
-               Npc var22;
-               Player var24;
-               int[] var36;
-               int var38;
-               if(var28 == 1) {
-                  Npc var33 = Client.npcs[var19];
-                  if(var33 == null) {
-                     break label338;
+               int var22;
+               int var30;
+               NPC var31;
+               Player var32;
+               int[] var34;
+               if (var16 == 1) {
+                  NPC var23 = Client.npcs[var17];
+                  if (var23 == null) {
+                     break label276;
                   }
 
-                  if(var33.definition.size == 1 && (var33.x & 127) == 64 && (var33.y & 127) == 64) {
-                     for(var21 = 0; var21 < Client.npcCount; ++var21) {
-                        var22 = Client.npcs[Client.npcIndices[var21]];
-                        if(var22 != null && var33 != var22 && var22.definition.size == 1 && var22.x == var33.x && var22.y == var33.y) {
-                           Tile.addNpcToMenu(var22.definition, Client.npcIndices[var21], var15, var17);
+                  if (var23.definition.size == 1 && (var23.x & 127) == 64 && (var23.y & 127) == 64) {
+                     for (var30 = 0; var30 < Client.npcCount; ++var30) {
+                        var31 = Client.npcs[Client.npcIndices[var30]];
+                        if (var31 != null && var23 != var31 && var31.definition.size == 1 && var31.x == var23.x && var31.y == var23.y) {
+                           Tile.addNpcToMenu(var31.definition, Client.npcIndices[var30], var12, var15);
                         }
                      }
 
-                     var21 = Players.Players_count;
-                     var36 = Players.Players_indices;
+                     var30 = Players.Players_count;
+                     var34 = Players.Players_indices;
 
-                     for(var38 = 0; var38 < var21; ++var38) {
-                        var24 = Client.players[var36[var38]];
-                        if(var24 != null && var24.x == var33.x && var24.y == var33.y) {
-                           TotalQuantityComparator.addPlayerToMenu(var24, var36[var38], var15, var17);
+                     for (var22 = 0; var22 < var30; ++var22) {
+                        var32 = Client.players[var34[var22]];
+                        if (var32 != null && var32.x == var23.x && var32.y == var23.y) {
+                           TotalQuantityComparator.addPlayerToMenu(var32, var34[var22], var12, var15);
                         }
                      }
                   }
 
-                  Tile.addNpcToMenu(var33.definition, var19, var15, var17);
+                  Tile.addNpcToMenu(var23.definition, var17, var12, var15);
                }
 
-               if(var28 == 0) {
-                  Player var34 = Client.players[var19];
-                  if(var34 == null) {
-                     break label338;
+               if (var16 == 0) {
+                  Player var33 = Client.players[var17];
+                  if (var33 == null) {
+                     break label276;
                   }
 
-                  if((var34.x & 127) == 64 && (var34.y & 127) == 64) {
-                     for(var21 = 0; var21 < Client.npcCount; ++var21) {
-                        var22 = Client.npcs[Client.npcIndices[var21]];
-                        if(var22 != null && var22.definition.size == 1 && var34.x == var22.x && var34.y == var22.y) {
-                           Tile.addNpcToMenu(var22.definition, Client.npcIndices[var21], var15, var17);
+                  if ((var33.x & 127) == 64 && (var33.y & 127) == 64) {
+                     for (var30 = 0; var30 < Client.npcCount; ++var30) {
+                        var31 = Client.npcs[Client.npcIndices[var30]];
+                        if (var31 != null && var31.definition.size == 1 && var33.x == var31.x && var33.y == var31.y) {
+                           Tile.addNpcToMenu(var31.definition, Client.npcIndices[var30], var12, var15);
                         }
                      }
 
-                     var21 = Players.Players_count;
-                     var36 = Players.Players_indices;
+                     var30 = Players.Players_count;
+                     var34 = Players.Players_indices;
 
-                     for(var38 = 0; var38 < var21; ++var38) {
-                        var24 = Client.players[var36[var38]];
-                        if(var24 != null && var24 != var34 && var24.x == var34.x && var24.y == var34.y) {
-                           TotalQuantityComparator.addPlayerToMenu(var24, var36[var38], var15, var17);
+                     for (var22 = 0; var22 < var30; ++var22) {
+                        var32 = Client.players[var34[var22]];
+                        if (var32 != null && var32 != var33 && var32.x == var33.x && var32.y == var33.y) {
+                           TotalQuantityComparator.addPlayerToMenu(var32, var34[var22], var12, var15);
                         }
                      }
                   }
 
-                  if(var19 != Client.combatTargetPlayerIndex) {
-                     TotalQuantityComparator.addPlayerToMenu(var34, var19, var15, var17);
+                  if (var17 != Client.combatTargetPlayerIndex) {
+                     TotalQuantityComparator.addPlayerToMenu(var33, var17, var12, var15);
                   } else {
-                     var4 = var26;
+                     var4 = var10;
                   }
                }
 
-               if(var28 == 3) {
-                  NodeDeque var35 = Client.groundItems[SoundSystem.plane][var15][var17];
-                  if(var35 != null) {
-                     for(GroundItem var39 = (GroundItem)var35.first(); var39 != null; var39 = (GroundItem)var35.next()) {
-                        ItemDefinition var37 = Skills.getItemDefinition(var39.id);
-                        if(Client.isItemSelected == 1) {
-                           Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var37.name, 16, var39.id, var15, var17);
-                        } else if(Client.isSpellSelected) {
-                           if((FloorDecoration.selectedSpellFlags & 1) == 1) {
-                              Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var37.name, 17, var39.id, var15, var17);
+               if (var16 == 3) {
+                  NodeDeque var35 = Client.groundItems[SoundSystem.plane][var12][var15];
+                  if (var35 != null) {
+                     for (GroundItem var24 = (GroundItem)var35.first(); var24 != null; var24 = (GroundItem)var35.next()) {
+                        ItemDefinition var25 = Skills.getItemDefinition(var24.id);
+                        if (Client.isItemSelected == 1) {
+                           Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 16, var24.id, var12, var15);
+                        } else if (Client.isSpellSelected) {
+                           if ((FloorDecoration.selectedSpellFlags & 1) == 1) {
+                              Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 17, var24.id, var12, var15);
                            }
                         } else {
-                           String[] var31 = var37.groundActions;
+                           String[] var26 = var25.groundActions;
 
-                           for(int var32 = 4; var32 >= 0; --var32) {
-                              if(var31 != null && var31[var32] != null) {
-                                 byte var25 = 0;
-                                 if(var32 == 0) {
-                                    var25 = 18;
+                           for (int var27 = 4; var27 >= 0; --var27) {
+                              if (var26 != null && var26[var27] != null) {
+                                 byte var28 = 0;
+                                 if (var27 == 0) {
+                                    var28 = 18;
                                  }
 
-                                 if(var32 == 1) {
-                                    var25 = 19;
+                                 if (var27 == 1) {
+                                    var28 = 19;
                                  }
 
-                                 if(var32 == 2) {
-                                    var25 = 20;
+                                 if (var27 == 2) {
+                                    var28 = 20;
                                  }
 
-                                 if(var32 == 3) {
-                                    var25 = 21;
+                                 if (var27 == 3) {
+                                    var28 = 21;
                                  }
 
-                                 if(var32 == 4) {
-                                    var25 = 22;
+                                 if (var27 == 4) {
+                                    var28 = 22;
                                  }
 
-                                 Tiles.insertMenuItemNoShift(var31[var32], BufferedFile.colorStartTag(16748608) + var37.name, var25, var39.id, var15, var17);
-                              } else if(var32 == 2) {
-                                 Tiles.insertMenuItemNoShift("Take", BufferedFile.colorStartTag(16748608) + var37.name, 20, var39.id, var15, var17);
+                                 Tiles.insertMenuItemNoShift(var26[var27], BufferedFile.colorStartTag(16748608) + var25.name, var28, var24.id, var12, var15);
+                              } else if (var27 == 2) {
+                                 Tiles.insertMenuItemNoShift("Take", BufferedFile.colorStartTag(16748608) + var25.name, 20, var24.id, var12, var15);
                               }
                            }
 
-                           Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var37.name, 1004, var39.id, var15, var17);
+                           Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var25.name, 1004, var24.id, var12, var15);
                         }
                      }
                   }
@@ -263,7 +263,8 @@ public class WorldMapEvent {
       signature = "(B)Z",
       garbageValue = "43"
    )
-   static boolean method779() {
+   @Export("isShiftPressed")
+   static boolean isShiftPressed() {
       return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81];
    }
 }
diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java
index 0e1f232744..a672e3263f 100644
--- a/runescape-client/src/main/java/WorldMapIcon1.java
+++ b/runescape-client/src/main/java/WorldMapIcon1.java
@@ -12,7 +12,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
    @ObfuscatedSignature(
       signature = "Lho;"
    )
-   static Widget __t_i;
+   static Widget field1030;
    @ObfuscatedName("db")
    @ObfuscatedSignature(
       signature = "Lit;"
@@ -32,7 +32,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
    @ObfuscatedGetter(
       intValue = -1722323621
    )
-   final int __m;
+   final int field1031;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Laj;"
@@ -43,28 +43,28 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
    @ObfuscatedGetter(
       intValue = 364253793
    )
-   final int __q;
+   final int field1032;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = -362031241
    )
-   final int __w;
+   final int field1033;
 
    @ObfuscatedSignature(
       signature = "(Lhu;Lhu;ILaj;)V"
    )
    WorldMapIcon1(TileLocation var1, TileLocation var2, int var3, WorldMapLabel var4) {
       super(var1, var2);
-      this.__m = var3;
+      this.field1031 = var3;
       this.label0 = var4;
-      WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.__m_15());
+      WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.vmethod395());
       Sprite var6 = var5.getSprite(false);
-      if(var6 != null) {
-         this.__q = var6.subWidth;
-         this.__w = var6.subHeight;
+      if (var6 != null) {
+         this.field1032 = var6.subWidth;
+         this.field1033 = var6.subHeight;
       } else {
-         this.__q = 0;
-         this.__w = 0;
+         this.field1032 = 0;
+         this.field1033 = 0;
       }
 
    }
@@ -74,8 +74,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
       signature = "(I)I",
       garbageValue = "1990181988"
    )
-   public int __m_15() {
-      return this.__m;
+   public int vmethod395() {
+      return this.field1031;
    }
 
    @ObfuscatedName("f")
@@ -83,7 +83,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
       signature = "(I)Laj;",
       garbageValue = "1159446036"
    )
-   WorldMapLabel __f_16() {
+   WorldMapLabel vmethod396() {
       return this.label0;
    }
 
@@ -92,8 +92,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
       signature = "(B)I",
       garbageValue = "75"
    )
-   int __q_17() {
-      return this.__q;
+   int vmethod397() {
+      return this.field1032;
    }
 
    @ObfuscatedName("w")
@@ -101,8 +101,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
       signature = "(I)I",
       garbageValue = "-1558233611"
    )
-   int __w_18() {
-      return this.__w;
+   int vmethod398() {
+      return this.field1033;
    }
 
    @ObfuscatedName("m")
@@ -120,57 +120,58 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
       garbageValue = "-252304353"
    )
    static final void method212() {
-      for(int var0 = 0; var0 < Client.soundEffectCount; ++var0) {
-         --Client.queuedSoundEffectDelays[var0];
-         if(Client.queuedSoundEffectDelays[var0] >= -10) {
-            SoundEffect var9 = Client.soundEffects[var0];
-            if(var9 == null) {
-               Object var10000 = null;
-               var9 = SoundEffect.readSoundEffect(class25.indexCache4, Client.soundEffectIds[var0], 0);
-               if(var9 == null) {
+      for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) {
+         int var10002 = Client.queuedSoundEffectDelays[var0]--;
+         if (Client.queuedSoundEffectDelays[var0] >= -10) {
+            SoundEffect var10 = Client.soundEffects[var0];
+            if (var10 == null) {
+               Object var2 = null;
+               var10 = SoundEffect.readSoundEffect(class25.indexCache4, Client.soundEffectIds[var0], 0);
+               if (var10 == null) {
                   continue;
                }
 
-               Client.queuedSoundEffectDelays[var0] += var9.__q_174();
-               Client.soundEffects[var0] = var9;
+               int[] var10000 = Client.queuedSoundEffectDelays;
+               var10000[var0] += var10.method303();
+               Client.soundEffects[var0] = var10;
             }
 
-            if(Client.queuedSoundEffectDelays[var0] < 0) {
-               int var2;
-               if(Client.soundLocations[var0] != 0) {
+            if (Client.queuedSoundEffectDelays[var0] < 0) {
+               int var11;
+               if (Client.soundLocations[var0] != 0) {
                   int var3 = (Client.soundLocations[var0] & 255) * 128;
                   int var4 = Client.soundLocations[var0] >> 16 & 255;
                   int var5 = var4 * 128 + 64 - Canvas.localPlayer.x;
-                  if(var5 < 0) {
+                  if (var5 < 0) {
                      var5 = -var5;
                   }
 
                   int var6 = Client.soundLocations[var0] >> 8 & 255;
                   int var7 = var6 * 128 + 64 - Canvas.localPlayer.y;
-                  if(var7 < 0) {
+                  if (var7 < 0) {
                      var7 = -var7;
                   }
 
                   int var8 = var5 + var7 - 128;
-                  if(var8 > var3) {
+                  if (var8 > var3) {
                      Client.queuedSoundEffectDelays[var0] = -100;
                      continue;
                   }
 
-                  if(var8 < 0) {
+                  if (var8 < 0) {
                      var8 = 0;
                   }
 
-                  var2 = (var3 - var8) * Client.__client_qc / var3;
+                  var11 = (var3 - var8) * Client.field115 / var3;
                } else {
-                  var2 = Client.soundEffectVolume;
+                  var11 = Client.soundEffectVolume;
                }
 
-               if(var2 > 0) {
-                  RawSound var10 = var9.toRawSound().resample(MilliClock.decimator);
-                  RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2);
-                  var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1);
-                  TaskHandler.pcmStreamMixer.addSubStream(var11);
+               if (var11 > 0) {
+                  RawSound var12 = var10.toRawSound().resample(MilliClock.decimator);
+                  RawPcmStream var13 = RawPcmStream.createRawPcmStream(var12, 100, var11);
+                  var13.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1);
+                  TaskHandler.pcmStreamMixer.addSubStream(var13);
                }
 
                Client.queuedSoundEffectDelays[var0] = -100;
@@ -178,7 +179,7 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
          } else {
             --Client.soundEffectCount;
 
-            for(int var1 = var0; var1 < Client.soundEffectCount; ++var1) {
+            for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) {
                Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1];
                Client.soundEffects[var1] = Client.soundEffects[var1 + 1];
                Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1];
@@ -190,20 +191,20 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
          }
       }
 
-      if(Client.__client_qq) {
-         boolean var12;
-         if(class214.__hf_o != 0) {
-            var12 = true;
+      if (Client.field107) {
+         boolean var9;
+         if (class214.field1129 != 0) {
+            var9 = true;
          } else {
-            var12 = class214.midiPcmStream.isReady();
+            var9 = class214.midiPcmStream.isReady();
          }
 
-         if(!var12) {
-            if(Client.__client_qf != 0 && Client.__client_qy != -1) {
-               Login.method2076(UserComparator3.indexCache6, Client.__client_qy, 0, Client.__client_qf, false);
+         if (!var9) {
+            if (Client.field128 != 0 && Client.field112 != -1) {
+               Login.method2076(UserComparator3.indexCache6, Client.field112, 0, Client.field128, false);
             }
 
-            Client.__client_qq = false;
+            Client.field107 = false;
          }
       }
 
diff --git a/runescape-client/src/main/java/WorldMapIcon2.java b/runescape-client/src/main/java/WorldMapIcon2.java
index 4ed41ff111..baf78223a7 100644
--- a/runescape-client/src/main/java/WorldMapIcon2.java
+++ b/runescape-client/src/main/java/WorldMapIcon2.java
@@ -13,17 +13,17 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
    @ObfuscatedGetter(
       intValue = -985436813
    )
-   final int __m;
+   final int field1034;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lav;"
    )
-   final WorldMapRegion __f;
+   final WorldMapRegion field1035;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = -25914375
    )
-   int __q;
+   int field1036;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Laj;"
@@ -34,21 +34,21 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
    @ObfuscatedGetter(
       intValue = 927871683
    )
-   int __o;
+   int field1037;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = -1431936619
    )
-   int __u;
+   int field1038;
 
    @ObfuscatedSignature(
       signature = "(Lhu;Lhu;ILav;)V"
    )
    WorldMapIcon2(TileLocation var1, TileLocation var2, int var3, WorldMapRegion var4) {
       super(var1, var2);
-      this.__m = var3;
-      this.__f = var4;
-      this.__z_27();
+      this.field1034 = var3;
+      this.field1035 = var4;
+      this.method399();
    }
 
    @ObfuscatedName("m")
@@ -56,8 +56,8 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       signature = "(I)I",
       garbageValue = "1990181988"
    )
-   public int __m_15() {
-      return this.__q;
+   public int vmethod395() {
+      return this.field1036;
    }
 
    @ObfuscatedName("f")
@@ -65,7 +65,7 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       signature = "(I)Laj;",
       garbageValue = "1159446036"
    )
-   WorldMapLabel __f_16() {
+   WorldMapLabel vmethod396() {
       return this.label0;
    }
 
@@ -74,8 +74,8 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       signature = "(B)I",
       garbageValue = "75"
    )
-   int __q_17() {
-      return this.__o;
+   int vmethod397() {
+      return this.field1037;
    }
 
    @ObfuscatedName("w")
@@ -83,8 +83,8 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       signature = "(I)I",
       garbageValue = "-1558233611"
    )
-   int __w_18() {
-      return this.__u;
+   int vmethod398() {
+      return this.field1038;
    }
 
    @ObfuscatedName("z")
@@ -92,17 +92,17 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       signature = "(I)V",
       garbageValue = "-806344204"
    )
-   void __z_27() {
-      this.__q = class50.getObjectDefinition(this.__m).transform().mapIconId;
-      this.label0 = this.__f.__ab_56(ViewportMouse.getWorldMapElement(this.__q));
-      WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.__m_15());
+   void method399() {
+      this.field1036 = class50.getObjectDefinition(this.field1034).transform().mapIconId;
+      this.label0 = this.field1035.method420(ViewportMouse.getWorldMapElement(this.field1036));
+      WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.vmethod395());
       Sprite var2 = var1.getSprite(false);
-      if(var2 != null) {
-         this.__o = var2.subWidth;
-         this.__u = var2.subHeight;
+      if (var2 != null) {
+         this.field1037 = var2.subWidth;
+         this.field1038 = var2.subHeight;
       } else {
-         this.__o = 0;
-         this.__u = 0;
+         this.field1037 = 0;
+         this.field1038 = 0;
       }
 
    }
@@ -113,7 +113,7 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       garbageValue = "1026409510"
    )
    static LoginPacket[] method300() {
-      return new LoginPacket[]{LoginPacket.__gl_q, LoginPacket.__gl_w, LoginPacket.__gl_m, LoginPacket.__gl_o, LoginPacket.__gl_f};
+      return new LoginPacket[]{LoginPacket.field475, LoginPacket.field476, LoginPacket.field473, LoginPacket.field477, LoginPacket.field474};
    }
 
    @ObfuscatedName("m")
@@ -122,19 +122,19 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       garbageValue = "16723968"
    )
    public static File method315(String var0) {
-      if(!class171.__fo_m) {
+      if (!class171.field1117) {
          throw new RuntimeException("");
       } else {
-         File var1 = (File)class171.__fo_q.get(var0);
-         if(var1 != null) {
+         File var1 = (File)class171.field1119.get(var0);
+         if (var1 != null) {
             return var1;
          } else {
-            File var2 = new File(class171.__fo_f, var0);
+            File var2 = new File(class171.field1118, var0);
             RandomAccessFile var3 = null;
 
             try {
                File var4 = new File(var2.getParent());
-               if(!var4.exists()) {
+               if (!var4.exists()) {
                   throw new RuntimeException("");
                } else {
                   var3 = new RandomAccessFile(var2, "rw");
@@ -143,17 +143,16 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
                   var3.write(var5);
                   var3.seek(0L);
                   var3.close();
-                  class171.__fo_q.put(var0, var2);
+                  class171.field1119.put(var0, var2);
                   return var2;
                }
-            } catch (Exception var8) {
+            } catch (Exception var7) {
                try {
-                  if(var3 != null) {
+                  if (var3 != null) {
                      var3.close();
                      var3 = null;
                   }
-               } catch (Exception var7) {
-                  ;
+               } catch (Exception var6) {
                }
 
                throw new RuntimeException();
@@ -171,22 +170,20 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       int var4 = var0.pathX[0];
       int var5 = var0.pathY[0];
       int var6 = var0.transformedSize();
-      if(var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) {
-         if(var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) {
-            int var9 = var0.transformedSize();
-            Client.field895.approxDestinationX = var1;
-            Client.field895.approxDestinationY = var2;
-            Client.field895.approxDestinationSizeX = 1;
-            Client.field895.approxDestinationSizeY = 1;
-            class65 var10 = Client.field895;
-            int var11 = NetSocket.calculateRoute(var4, var5, var9, var10, Client.collisionMaps[var0.plane], true, Client.__client_tp, Client.__client_th);
-            if(var11 >= 1) {
-               for(int var12 = 0; var12 < var11 - 1; ++var12) {
-                  var0.__a_131(Client.__client_tp[var12], Client.__client_th[var12], var3);
-               }
-
+      if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6 && var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) {
+         int var7 = var0.transformedSize();
+         Client.field895.approxDestinationX = var1;
+         Client.field895.approxDestinationY = var2;
+         Client.field895.approxDestinationSizeX = 1;
+         Client.field895.approxDestinationSizeY = 1;
+         class65 var8 = Client.field895;
+         int var9 = NetSocket.calculateRoute(var4, var5, var7, var8, Client.collisionMaps[var0.plane], true, Client.field113, Client.field114);
+         if (var9 >= 1) {
+            for (int var10 = 0; var10 < var9 - 1; ++var10) {
+               var0.method255(Client.field113[var10], Client.field114[var10], var3);
             }
          }
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java b/runescape-client/src/main/java/WorldMapIndexCacheLoader.java
index 5333cd9d1b..7dadbb8aac 100644
--- a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java
+++ b/runescape-client/src/main/java/WorldMapIndexCacheLoader.java
@@ -42,14 +42,13 @@ public class WorldMapIndexCacheLoader {
    )
    @Export("reset")
    void reset(String var1) {
-      if(var1 != null && !var1.isEmpty()) {
-         if(var1 != this.cacheName) {
-            this.cacheName = var1;
-            this.percentLoaded0 = 0;
-            this.isLoaded0 = false;
-            this.load();
-         }
+      if (var1 != null && !var1.isEmpty() && var1 != this.cacheName) {
+         this.cacheName = var1;
+         this.percentLoaded0 = 0;
+         this.isLoaded0 = false;
+         this.load();
       }
+
    }
 
    @ObfuscatedName("f")
@@ -59,24 +58,24 @@ public class WorldMapIndexCacheLoader {
    )
    @Export("load")
    int load() {
-      if(this.percentLoaded0 < 33) {
-         if(!this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) {
+      if (this.percentLoaded0 < 33) {
+         if (!this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) {
             return this.percentLoaded0;
          }
 
          this.percentLoaded0 = 33;
       }
 
-      if(this.percentLoaded0 == 33) {
-         if(this.indexCache.__ag_401(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) {
+      if (this.percentLoaded0 == 33) {
+         if (this.indexCache.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) {
             return this.percentLoaded0;
          }
 
          this.percentLoaded0 = 66;
       }
 
-      if(this.percentLoaded0 == 66) {
-         if(!this.indexCache.tryLoadRecordByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) {
+      if (this.percentLoaded0 == 66) {
+         if (!this.indexCache.tryLoadRecordByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) {
             return this.percentLoaded0;
          }
 
diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java
index 2aa8c12cc7..0917600d1d 100644
--- a/runescape-client/src/main/java/WorldMapLabel.java
+++ b/runescape-client/src/main/java/WorldMapLabel.java
@@ -21,7 +21,7 @@ public class WorldMapLabel {
    @ObfuscatedGetter(
       intValue = -1536028937
    )
-   public static int __aj_e;
+   public static int field1039;
    @ObfuscatedName("m")
    @Export("text")
    String text;
@@ -61,96 +61,97 @@ public class WorldMapLabel {
    )
    public static void method443(PacketBuffer var0) {
       ReflectionCheck var1 = (ReflectionCheck)class322.reflectionChecks.last();
-      if(var1 != null) {
+      if (var1 != null) {
          int var2 = var0.index;
          var0.writeInt(var1.id);
 
-         for(int var3 = 0; var3 < var1.size; ++var3) {
-            if(var1.creationErrors[var3] != 0) {
+         for (int var3 = 0; var3 < var1.size; ++var3) {
+            if (var1.creationErrors[var3] != 0) {
                var0.writeByte(var1.creationErrors[var3]);
             } else {
                try {
                   int var4 = var1.operations[var3];
                   Field var5;
                   int var6;
-                  if(var4 == 0) {
+                  if (var4 == 0) {
                      var5 = var1.fields[var3];
                      var6 = Reflection.getInt(var5, (Object)null);
                      var0.writeByte(0);
                      var0.writeInt(var6);
-                  } else if(var4 == 1) {
+                  } else if (var4 == 1) {
                      var5 = var1.fields[var3];
                      Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]);
                      var0.writeByte(0);
-                  } else if(var4 == 2) {
+                  } else if (var4 == 2) {
                      var5 = var1.fields[var3];
                      var6 = var5.getModifiers();
                      var0.writeByte(0);
                      var0.writeInt(var6);
                   }
 
-                  Method var25;
-                  if(var4 != 3) {
-                     if(var4 == 4) {
-                        var25 = var1.methods[var3];
-                        var6 = var25.getModifiers();
+                  Method var7;
+                  if (var4 != 3) {
+                     if (var4 == 4) {
+                        var7 = var1.methods[var3];
+                        var6 = var7.getModifiers();
                         var0.writeByte(0);
                         var0.writeInt(var6);
                      }
                   } else {
-                     var25 = var1.methods[var3];
-                     byte[][] var10 = var1.arguments[var3];
-                     Object[] var7 = new Object[var10.length];
+                     var7 = var1.methods[var3];
+                     byte[][] var8 = var1.arguments[var3];
+                     Object[] var9 = new Object[var8.length];
 
-                     for(int var8 = 0; var8 < var10.length; ++var8) {
-                        ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8]));
-                        var7[var8] = var9.readObject();
+                     for (int var10 = 0; var10 < var8.length; ++var10) {
+                        ObjectInputStream var11 = new ObjectInputStream(new ByteArrayInputStream(var8[var10]));
+                        var9[var10] = var11.readObject();
                      }
 
-                     Object var11 = Reflection.invoke(var25, (Object)null, var7);
-                     if(var11 == null) {
+                     Object var24 = Reflection.invoke(var7, (Object)null, var9);
+                     if (var24 == null) {
                         var0.writeByte(0);
-                     } else if(var11 instanceof Number) {
+                     } else if (var24 instanceof Number) {
                         var0.writeByte(1);
-                        var0.writeLong(((Number)var11).longValue());
-                     } else if(var11 instanceof String) {
+                        var0.writeLong(((Number)var24).longValue());
+                     } else if (var24 instanceof String) {
                         var0.writeByte(2);
-                        var0.writeStringCp1252NullTerminated((String)var11);
+                        var0.writeStringCp1252NullTerminated((String)var24);
                      } else {
                         var0.writeByte(4);
                      }
                   }
-               } catch (ClassNotFoundException var13) {
+               } catch (ClassNotFoundException var12) {
                   var0.writeByte(-10);
-               } catch (InvalidClassException var14) {
+               } catch (InvalidClassException var13) {
                   var0.writeByte(-11);
-               } catch (StreamCorruptedException var15) {
+               } catch (StreamCorruptedException var14) {
                   var0.writeByte(-12);
-               } catch (OptionalDataException var16) {
+               } catch (OptionalDataException var15) {
                   var0.writeByte(-13);
-               } catch (IllegalAccessException var17) {
+               } catch (IllegalAccessException var16) {
                   var0.writeByte(-14);
-               } catch (IllegalArgumentException var18) {
+               } catch (IllegalArgumentException var17) {
                   var0.writeByte(-15);
-               } catch (InvocationTargetException var19) {
+               } catch (InvocationTargetException var18) {
                   var0.writeByte(-16);
-               } catch (SecurityException var20) {
+               } catch (SecurityException var19) {
                   var0.writeByte(-17);
-               } catch (IOException var21) {
+               } catch (IOException var20) {
                   var0.writeByte(-18);
-               } catch (NullPointerException var22) {
+               } catch (NullPointerException var21) {
                   var0.writeByte(-19);
-               } catch (Exception var23) {
+               } catch (Exception var22) {
                   var0.writeByte(-20);
-               } catch (Throwable var24) {
+               } catch (Throwable var23) {
                   var0.writeByte(-21);
                }
             }
          }
 
-         var0.__aa_312(var2);
+         var0.method53(var2);
          var1.remove();
       }
+
    }
 
    @ObfuscatedName("f")
@@ -160,7 +161,7 @@ public class WorldMapLabel {
    )
    static int method442(int var0, int var1) {
       ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-      return var2 == null?0:(var1 >= 0 && var1 < var2.quantities.length?var2.quantities[var1]:0);
+      return var2 == null ? 0 : (var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0);
    }
 
    @ObfuscatedName("u")
@@ -172,7 +173,7 @@ public class WorldMapLabel {
    public static IndexedSprite[] createIndexedSpriteArray() {
       IndexedSprite[] var0 = new IndexedSprite[class328.indexedSpriteCount];
 
-      for(int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) {
+      for (int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) {
          IndexedSprite var2 = var0[var1] = new IndexedSprite();
          var2.width = class328.indexedSpriteWidth;
          var2.height = class328.indexedSpriteHeight;
@@ -189,7 +190,7 @@ public class WorldMapLabel {
       VarbitDefinition.indexedSpriteWidths = null;
       SecureRandomCallable.indexedSpriteHeights = null;
       class328.indexedSpritePalette = null;
-      class328.spritePixels = null;
+      class328.spritePixels = (byte[][])null;
       return var0;
    }
 
@@ -200,22 +201,22 @@ public class WorldMapLabel {
    )
    @Export("compareWorlds")
    static int compareWorlds(World var0, World var1, int var2, boolean var3) {
-      if(var2 == 1) {
+      if (var2 == 1) {
          int var4 = var0.population;
          int var5 = var1.population;
-         if(!var3) {
-            if(var4 == -1) {
+         if (!var3) {
+            if (var4 == -1) {
                var4 = 2001;
             }
 
-            if(var5 == -1) {
+            if (var5 == -1) {
                var5 = 2001;
             }
          }
 
          return var4 - var5;
       } else {
-         return var2 == 2?var0.location - var1.location:(var2 == 3?(var0.activity.equals("-")?(var1.activity.equals("-")?0:(var3?-1:1)):(var1.activity.equals("-")?(var3?1:-1):var0.activity.compareTo(var1.activity))):(var2 == 4?(var0.__a_147()?(var1.__a_147()?0:1):(var1.__a_147()?-1:0)):(var2 == 5?(var0.__x_145()?(var1.__x_145()?0:1):(var1.__x_145()?-1:0)):(var2 == 6?(var0.isPvp()?(var1.isPvp()?0:1):(var1.isPvp()?-1:0)):(var2 == 7?(var0.isMembersOnly()?(var1.isMembersOnly()?0:1):(var1.isMembersOnly()?-1:0)):var0.id - var1.id)))));
+         return var2 == 2 ? var0.location - var1.location : (var2 == 3 ? (var0.activity.equals("-") ? (var1.activity.equals("-") ? 0 : (var3 ? -1 : 1)) : (var1.activity.equals("-") ? (var3 ? 1 : -1) : var0.activity.compareTo(var1.activity))) : (var2 == 4 ? (var0.method357() ? (var1.method357() ? 0 : 1) : (var1.method357() ? -1 : 0)) : (var2 == 5 ? (var0.method356() ? (var1.method356() ? 0 : 1) : (var1.method356() ? -1 : 0)) : (var2 == 6 ? (var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0)) : (var2 == 7 ? (var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0)) : var0.id - var1.id)))));
       }
    }
 
@@ -225,8 +226,8 @@ public class WorldMapLabel {
       garbageValue = "60"
    )
    public static void method440() {
-      NpcDefinition.NpcDefinition_cached.clear();
-      NpcDefinition.NpcDefinition_cachedModels.clear();
+      NPCDefinition.NpcDefinition_cached.clear();
+      NPCDefinition.NpcDefinition_cachedModels.clear();
    }
 
    @ObfuscatedName("gx")
@@ -236,7 +237,7 @@ public class WorldMapLabel {
    )
    @Export("worldToScreen")
    static final void worldToScreen(int var0, int var1, int var2) {
-      if(var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) {
+      if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) {
          int var3 = class32.getTileHeight(var0, var1, SoundSystem.plane) - var2;
          var0 -= WorldMapSection1.cameraX;
          var3 -= GrandExchangeEvents.cameraY;
@@ -250,17 +251,17 @@ public class WorldMapLabel {
          var0 = var8;
          var8 = var3 * var5 - var4 * var1 >> 16;
          var1 = var5 * var1 + var3 * var4 >> 16;
-         if(var1 >= 50) {
+         if (var1 >= 50) {
             Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2;
             Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2;
          } else {
             Client.viewportTempX = -1;
             Client.viewportTempY = -1;
          }
-
       } else {
          Client.viewportTempX = -1;
          Client.viewportTempY = -1;
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java
index 3730917588..18cb501ec4 100644
--- a/runescape-client/src/main/java/WorldMapLabelSize.java
+++ b/runescape-client/src/main/java/WorldMapLabelSize.java
@@ -35,38 +35,32 @@ public class WorldMapLabelSize {
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   static IndexCache __s_dq;
+   static IndexCache field1040;
    @ObfuscatedName("fi")
    @ObfuscatedGetter(
       intValue = 1577759565
    )
-   static int __s_fi;
+   static int field1041;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = 1252293513
    )
-   final int __w;
+   final int field1042;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = 707828941
    )
-   final int __o;
+   final int field1043;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = -422937451
    )
-   final int __u;
-
-   static {
-      WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4);
-      WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2);
-      WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0);
-   }
+   final int field1044;
 
    WorldMapLabelSize(int var1, int var2, int var3) {
-      this.__w = var1;
-      this.__o = var2;
-      this.__u = var3;
+      this.field1042 = var1;
+      this.field1043 = var2;
+      this.field1044 = var3;
    }
 
    @ObfuscatedName("f")
@@ -74,8 +68,8 @@ public class WorldMapLabelSize {
       signature = "(FI)Z",
       garbageValue = "2107231705"
    )
-   boolean __f_14(float var1) {
-      return var1 >= (float)this.__u;
+   boolean method400(float var1) {
+      return var1 >= (float)this.field1044;
    }
 
    @ObfuscatedName("m")
@@ -95,9 +89,9 @@ public class WorldMapLabelSize {
    static WorldMapLabelSize method195(int var0) {
       WorldMapLabelSize[] var1 = method192();
 
-      for(int var2 = 0; var2 < var1.length; ++var2) {
+      for (int var2 = 0; var2 < var1.length; ++var2) {
          WorldMapLabelSize var3 = var1[var2];
-         if(var0 == var3.__o) {
+         if (var0 == var3.field1043) {
             return var3;
          }
       }
@@ -111,19 +105,25 @@ public class WorldMapLabelSize {
       garbageValue = "-187598326"
    )
    static final void method198() {
-      PacketBufferNode var0 = Interpreter.method1915(ClientPacket.__gs_h, Client.packetWriter.isaacCipher);
-      Client.packetWriter.__q_167(var0);
+      PacketBufferNode var0 = Interpreter.method1915(ClientPacket.field242, Client.packetWriter.isaacCipher);
+      Client.packetWriter.method241(var0);
 
-      for(WidgetGroupParent var1 = (WidgetGroupParent)Client.widgetGroupParents.first(); var1 != null; var1 = (WidgetGroupParent)Client.widgetGroupParents.next()) {
-         if(var1.type == 0 || var1.type == 3) {
+      for (WidgetGroupParent var1 = (WidgetGroupParent)Client.widgetGroupParents.first(); var1 != null; var1 = (WidgetGroupParent)Client.widgetGroupParents.next()) {
+         if (var1.type == 0 || var1.type == 3) {
             MenuAction.closeWidgetGroup(var1, true);
          }
       }
 
-      if(Client.__client_mo != null) {
-         class22.method295(Client.__client_mo);
-         Client.__client_mo = null;
+      if (Client.field127 != null) {
+         class22.method295(Client.field127);
+         Client.field127 = null;
       }
 
    }
+
+   static {
+      WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4);
+      WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2);
+      WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0);
+   }
 }
diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java
index 7388645bbb..e15da8096e 100644
--- a/runescape-client/src/main/java/WorldMapManager.java
+++ b/runescape-client/src/main/java/WorldMapManager.java
@@ -40,7 +40,7 @@ public final class WorldMapManager {
    @Export("regions")
    WorldMapRegion[][] regions;
    @ObfuscatedName("g")
-   HashMap __g;
+   HashMap field1045;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "[Llq;"
@@ -51,12 +51,12 @@ public final class WorldMapManager {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   final AbstractIndexCache __e;
+   final AbstractIndexCache field1046;
    @ObfuscatedName("x")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   final AbstractIndexCache __x;
+   final AbstractIndexCache field1047;
    @ObfuscatedName("d")
    @Export("fonts")
    final HashMap fonts;
@@ -76,17 +76,17 @@ public final class WorldMapManager {
    @ObfuscatedGetter(
       intValue = 1729323633
    )
-   int __i;
+   int field1048;
    @ObfuscatedName("a")
    @ObfuscatedGetter(
       intValue = -395718741
    )
-   int __a;
+   int field1049;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = 1085359673
    )
-   public int __z;
+   public int field1050;
 
    @ObfuscatedSignature(
       signature = "([Llq;Ljava/util/HashMap;Lir;Lir;)V"
@@ -94,12 +94,12 @@ public final class WorldMapManager {
    public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractIndexCache var3, AbstractIndexCache var4) {
       this.isLoaded0 = false;
       this.loadStarted = false;
-      this.__g = new HashMap();
-      this.__z = 0;
+      this.field1045 = new HashMap();
+      this.field1050 = 0;
       this.mapSceneSprites = var1;
       this.fonts = var2;
-      this.__e = var3;
-      this.__x = var4;
+      this.field1046 = var3;
+      this.field1047 = var4;
    }
 
    @ObfuscatedName("m")
@@ -109,7 +109,7 @@ public final class WorldMapManager {
    )
    @Export("load")
    public void load(AbstractIndexCache var1, String var2, boolean var3) {
-      if(!this.loadStarted) {
+      if (!this.loadStarted) {
          this.isLoaded0 = false;
          this.loadStarted = true;
          System.nanoTime();
@@ -122,8 +122,8 @@ public final class WorldMapManager {
          this.mapAreaData = new WorldMapAreaData();
 
          try {
-            this.mapAreaData.__ce_76(var6, var7, var5, var3);
-         } catch (IllegalStateException var19) {
+            this.mapAreaData.method387(var6, var7, var5, var3);
+         } catch (IllegalStateException var16) {
             return;
          }
 
@@ -132,47 +132,49 @@ public final class WorldMapManager {
          this.mapAreaData.originY();
          this.surfaceOffsetX = this.mapAreaData.minX() * 64;
          this.surfaceOffsetY = this.mapAreaData.minY() * 64;
-         this.__i = (this.mapAreaData.maxX() - this.mapAreaData.minX() + 1) * 64;
-         this.__a = (this.mapAreaData.maxY() - this.mapAreaData.minY() + 1) * 64;
-         int var16 = this.mapAreaData.maxX() - this.mapAreaData.minX() + 1;
+         this.field1048 = (this.mapAreaData.maxX() - this.mapAreaData.minX() + 1) * 64;
+         this.field1049 = (this.mapAreaData.maxY() - this.mapAreaData.minY() + 1) * 64;
+         int var8 = this.mapAreaData.maxX() - this.mapAreaData.minX() + 1;
          int var9 = this.mapAreaData.maxY() - this.mapAreaData.minY() + 1;
          System.nanoTime();
          System.nanoTime();
          SoundSystem.method2456();
-         this.regions = new WorldMapRegion[var16][var9];
-         Iterator var10 = this.mapAreaData.__n.iterator();
+         this.regions = new WorldMapRegion[var8][var9];
+         Iterator var10 = this.mapAreaData.field1016.iterator();
 
-         while(var10.hasNext()) {
+         int var12;
+         while (var10.hasNext()) {
             class15 var11 = (class15)var10.next();
-            int var12 = var11.field149;
+            var12 = var11.field149;
             int var13 = var11.field146;
             int var14 = var12 - this.mapAreaData.minX();
             int var15 = var13 - this.mapAreaData.minY();
-            this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.__a_39(), this.fonts);
-            this.regions[var14][var15].method447(var11, this.mapAreaData.__a);
+            this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.method386(), this.fonts);
+            this.regions[var14][var15].method447(var11, this.mapAreaData.field1018);
          }
 
-         for(int var17 = 0; var17 < var16; ++var17) {
-            for(int var18 = 0; var18 < var9; ++var18) {
-               if(this.regions[var17][var18] == null) {
-                  this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.minX() + var17, this.mapAreaData.minY() + var18, this.mapAreaData.__a_39(), this.fonts);
-                  this.regions[var17][var18].__u_41(this.mapAreaData.__i, this.mapAreaData.__a);
+         for (int var17 = 0; var17 < var8; ++var17) {
+            for (var12 = 0; var12 < var9; ++var12) {
+               if (this.regions[var17][var12] == null) {
+                  this.regions[var17][var12] = new WorldMapRegion(this.mapAreaData.minX() + var17, this.mapAreaData.minY() + var12, this.mapAreaData.method386(), this.fonts);
+                  this.regions[var17][var12].method405(this.mapAreaData.field1017, this.mapAreaData.field1018);
                }
             }
          }
 
          System.nanoTime();
          System.nanoTime();
-         if(var1.__ag_401(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2)) {
-            byte[] var20 = var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2);
-            this.overviewSprite = class27.convertJpgToSprite(var20);
+         if (var1.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2)) {
+            byte[] var18 = var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2);
+            this.overviewSprite = class27.convertJpgToSprite(var18);
          }
 
          System.nanoTime();
-         var1.__y_398();
-         var1.__b_400();
+         var1.method6();
+         var1.method8();
          this.isLoaded0 = true;
       }
+
    }
 
    @ObfuscatedName("f")
@@ -190,7 +192,7 @@ public final class WorldMapManager {
       signature = "(IIIIIIIII)V",
       garbageValue = "1619301748"
    )
-   public final void __q_72(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+   public final void method401(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
       int[] var9 = Rasterizer2D.Rasterizer2D_pixels;
       int var10 = Rasterizer2D.Rasterizer2D_width;
       int var11 = Rasterizer2D.Rasterizer2D_height;
@@ -199,11 +201,11 @@ public final class WorldMapManager {
       class22 var13 = this.method643(var1, var2, var3, var4);
       float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1);
       int var15 = (int)Math.ceil((double)var14);
-      this.__z = var15;
-      if(!this.__g.containsKey(Integer.valueOf(var15))) {
+      this.field1050 = var15;
+      if (!this.field1045.containsKey(var15)) {
          class40 var16 = new class40(var15);
          var16.method763();
-         this.__g.put(Integer.valueOf(var15), var16);
+         this.field1045.put(var15, var16);
       }
 
       int var23 = var13.field166 + var13.field169 - 1;
@@ -211,9 +213,9 @@ public final class WorldMapManager {
 
       int var18;
       int var19;
-      for(var18 = var13.field166; var18 <= var23; ++var18) {
-         for(var19 = var13.field167; var19 <= var17; ++var19) {
-            this.regions[var18][var19].method455(var15, (class40)this.__g.get(Integer.valueOf(var15)), this.mapSceneSprites, this.__e, this.__x);
+      for (var18 = var13.field166; var18 <= var23; ++var18) {
+         for (var19 = var13.field167; var19 <= var17; ++var19) {
+            this.regions[var18][var19].method455(var15, (class40)this.field1045.get(var15), this.mapSceneSprites, this.field1046, this.field1047);
          }
       }
 
@@ -223,9 +225,9 @@ public final class WorldMapManager {
       var19 = this.surfaceOffsetX + var1;
       int var20 = var2 + this.surfaceOffsetY;
 
-      for(int var21 = var13.field166; var21 < var13.field166 + var13.field169; ++var21) {
-         for(int var22 = var13.field167; var22 < var13.field167 + var13.field164; ++var22) {
-            this.regions[var21][var22].__w_40(var5 + var18 * (this.regions[var21][var22].x * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].y * 64 - var20 + 64) / 64, var18);
+      for (int var21 = var13.field166; var21 < var13.field166 + var13.field169; ++var21) {
+         for (int var22 = var13.field167; var22 < var13.field167 + var13.field164; ++var22) {
+            this.regions[var21][var22].method404(var5 + var18 * (this.regions[var21][var22].x * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].y * 64 - var20 + 64) / 64, var18);
          }
       }
 
@@ -236,7 +238,7 @@ public final class WorldMapManager {
       signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V",
       garbageValue = "-71"
    )
-   public final void __w_73(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) {
+   public final void method402(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) {
       class22 var14 = this.method643(var1, var2, var3, var4);
       float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1);
       int var16 = (int)(var15 * 64.0F);
@@ -245,20 +247,20 @@ public final class WorldMapManager {
 
       int var19;
       int var20;
-      for(var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) {
-         for(var20 = var14.field167; var20 < var14.field164 + var14.field167; ++var20) {
-            if(var13) {
-               this.regions[var19][var20].__e_42();
+      for (var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) {
+         for (var20 = var14.field167; var20 < var14.field164 + var14.field167; ++var20) {
+            if (var13) {
+               this.regions[var19][var20].method406();
             }
 
-            this.regions[var19][var20].__j_46(var5 + var16 * (this.regions[var19][var20].x * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].y * 64 - var18 + 64) / 64, var16, var9);
+            this.regions[var19][var20].method410(var5 + var16 * (this.regions[var19][var20].x * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].y * 64 - var18 + 64) / 64, var16, var9);
          }
       }
 
-      if(var10 != null && var11 > 0) {
-         for(var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) {
-            for(var20 = var14.field167; var20 < var14.field167 + var14.field164; ++var20) {
-               this.regions[var19][var20].__s_47(var10, var11, var12);
+      if (var10 != null && var11 > 0) {
+         for (var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) {
+            for (var20 = var14.field167; var20 < var14.field167 + var14.field164; ++var20) {
+               this.regions[var19][var20].method411(var10, var11, var12);
             }
          }
       }
@@ -272,37 +274,38 @@ public final class WorldMapManager {
    )
    @Export("drawOverview")
    public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) {
-      if(this.overviewSprite != null) {
-         this.overviewSprite.__j_506(var1, var2, var3, var4);
-         if(var6 > 0 && var6 % var7 < var7 / 2) {
-            if(this.icons == null) {
+      if (this.overviewSprite != null) {
+         this.overviewSprite.method309(var1, var2, var3, var4);
+         if (var6 > 0 && var6 % var7 < var7 / 2) {
+            if (this.icons == null) {
                this.buildIcons0();
             }
 
             Iterator var8 = var5.iterator();
 
-            while(true) {
-               List var10;
+            while (true) {
+               List var9;
                do {
-                  if(!var8.hasNext()) {
+                  if (!var8.hasNext()) {
                      return;
                   }
 
-                  int var9 = ((Integer)var8.next()).intValue();
-                  var10 = (List)this.icons.get(Integer.valueOf(var9));
-               } while(var10 == null);
+                  int var10 = (Integer)var8.next();
+                  var9 = (List)this.icons.get(var10);
+               } while(var9 == null);
 
-               Iterator var11 = var10.iterator();
+               Iterator var14 = var9.iterator();
 
-               while(var11.hasNext()) {
-                  AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next();
-                  int var13 = var3 * (var12.coord2.x - this.surfaceOffsetX) / this.__i;
-                  int var14 = var4 - (var12.coord2.y - this.surfaceOffsetY) * var4 / this.__a;
-                  Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256);
+               while (var14.hasNext()) {
+                  AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var14.next();
+                  int var12 = var3 * (var11.coord2.x - this.surfaceOffsetX) / this.field1048;
+                  int var13 = var4 - (var11.coord2.y - this.surfaceOffsetY) * var4 / this.field1049;
+                  Rasterizer2D.Rasterizer2D_drawCircleAlpha(var12 + var1, var13 + var2, 2, 16776960, 256);
                }
             }
          }
       }
+
    }
 
    @ObfuscatedName("u")
@@ -310,9 +313,9 @@ public final class WorldMapManager {
       signature = "(IIIIIIIIIII)Ljava/util/List;",
       garbageValue = "1185703832"
    )
-   public List __u_74(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
+   public List method403(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
       LinkedList var11 = new LinkedList();
-      if(!this.isLoaded0) {
+      if (!this.isLoaded0) {
          return var11;
       } else {
          class22 var12 = this.method643(var1, var2, var3, var4);
@@ -321,10 +324,10 @@ public final class WorldMapManager {
          int var15 = this.surfaceOffsetX + var1;
          int var16 = var2 + this.surfaceOffsetY;
 
-         for(int var17 = var12.field166; var17 < var12.field166 + var12.field169; ++var17) {
-            for(int var18 = var12.field167; var18 < var12.field164 + var12.field167; ++var18) {
-               List var19 = this.regions[var17][var18].__ae_57(var5 + var14 * (this.regions[var17][var18].x * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].y * 64 - var16 + 64) / 64, var14, var9, var10);
-               if(!var19.isEmpty()) {
+         for (int var17 = var12.field166; var17 < var12.field166 + var12.field169; ++var17) {
+            for (int var18 = var12.field167; var18 < var12.field164 + var12.field167; ++var18) {
+               List var19 = this.regions[var17][var18].method421(var5 + var14 * (this.regions[var17][var18].x * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].y * 64 - var16 + 64) / 64, var14, var9, var10);
+               if (!var19.isEmpty()) {
                   var11.addAll(var19);
                }
             }
@@ -353,21 +356,21 @@ public final class WorldMapManager {
       var5.field164 = var13 - var11 + 1;
       var5.field166 = var10 - this.mapAreaData.minX();
       var5.field167 = var11 - this.mapAreaData.minY();
-      if(var5.field166 < 0) {
+      if (var5.field166 < 0) {
          var5.field169 += var5.field166;
          var5.field166 = 0;
       }
 
-      if(var5.field166 > this.regions.length - var5.field169) {
+      if (var5.field166 > this.regions.length - var5.field169) {
          var5.field169 = this.regions.length - var5.field166;
       }
 
-      if(var5.field167 < 0) {
+      if (var5.field167 < 0) {
          var5.field164 += var5.field167;
          var5.field167 = 0;
       }
 
-      if(var5.field167 > this.regions[0].length - var5.field164) {
+      if (var5.field167 > this.regions[0].length - var5.field164) {
          var5.field164 = this.regions[0].length - var5.field167;
       }
 
@@ -404,27 +407,27 @@ public final class WorldMapManager {
    )
    @Export("buildIcons0")
    void buildIcons0() {
-      if(this.icons == null) {
+      if (this.icons == null) {
          this.icons = new HashMap();
       }
 
       this.icons.clear();
 
-      for(int var1 = 0; var1 < this.regions.length; ++var1) {
-         for(int var2 = 0; var2 < this.regions[var1].length; ++var2) {
+      for (int var1 = 0; var1 < this.regions.length; ++var1) {
+         for (int var2 = 0; var2 < this.regions[var1].length; ++var2) {
             List var3 = this.regions[var1][var2].icons();
             Iterator var4 = var3.iterator();
 
-            while(var4.hasNext()) {
+            while (var4.hasNext()) {
                AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next();
-               if(var5.__h_67()) {
-                  int var6 = var5.__m_15();
-                  if(!this.icons.containsKey(Integer.valueOf(var6))) {
+               if (var5.method19()) {
+                  int var6 = var5.vmethod395();
+                  if (!this.icons.containsKey(var6)) {
                      LinkedList var7 = new LinkedList();
                      var7.add(var5);
-                     this.icons.put(Integer.valueOf(var6), var7);
+                     this.icons.put(var6, var7);
                   } else {
-                     List var8 = (List)this.icons.get(Integer.valueOf(var6));
+                     List var8 = (List)this.icons.get(var6);
                      var8.add(var5);
                   }
                }
@@ -442,13 +445,13 @@ public final class WorldMapManager {
    @Export("getPixelsPerTile")
    float getPixelsPerTile(int var1, int var2) {
       float var3 = (float)var1 / (float)var2;
-      if(var3 > 8.0F) {
+      if (var3 > 8.0F) {
          return 8.0F;
-      } else if(var3 < 1.0F) {
+      } else if (var3 < 1.0F) {
          return 1.0F;
       } else {
          int var4 = Math.round(var3);
-         return Math.abs((float)var4 - var3) < 0.05F?(float)var4:var3;
+         return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3;
       }
    }
 
@@ -460,22 +463,22 @@ public final class WorldMapManager {
    @Export("itemContainerSetItem")
    static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
       ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-      if(var4 == null) {
+      if (var4 == null) {
          var4 = new ItemContainer();
          ItemContainer.itemContainers.put(var4, (long)var0);
       }
 
-      if(var4.ids.length <= var1) {
+      if (var4.ids.length <= var1) {
          int[] var5 = new int[var1 + 1];
          int[] var6 = new int[var1 + 1];
 
          int var7;
-         for(var7 = 0; var7 < var4.ids.length; ++var7) {
+         for (var7 = 0; var7 < var4.ids.length; ++var7) {
             var5[var7] = var4.ids[var7];
             var6[var7] = var4.quantities[var7];
          }
 
-         for(var7 = var4.ids.length; var7 < var1; ++var7) {
+         for (var7 = var4.ids.length; var7 < var1; ++var7) {
             var5[var7] = -1;
             var6[var7] = 0;
          }
@@ -495,8 +498,8 @@ public final class WorldMapManager {
    )
    public static void method673() {
       ObjectDefinition.ObjectDefinition_cached.clear();
-      ObjectDefinition.__jr_o.clear();
-      ObjectDefinition.__jr_u.clear();
+      ObjectDefinition.field641.clear();
+      ObjectDefinition.field642.clear();
       ObjectDefinition.ObjectDefinition_cachedModels.clear();
    }
 
@@ -516,6 +519,6 @@ public final class WorldMapManager {
       garbageValue = "1341489301"
    )
    static final void method668() {
-      Client.__client_na = Client.cycleCntr;
+      Client.field105 = Client.cycleCntr;
    }
 }
diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java
index 9df1dc4a80..381bc708fe 100644
--- a/runescape-client/src/main/java/WorldMapRegion.java
+++ b/runescape-client/src/main/java/WorldMapRegion.java
@@ -17,7 +17,7 @@ public class WorldMapRegion {
    @ObfuscatedSignature(
       signature = "Lec;"
    )
-   public static DemotingHashTable __av_o;
+   public static DemotingHashTable field1051;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = -1061363609
@@ -36,17 +36,17 @@ public class WorldMapRegion {
    )
    class15 field239;
    @ObfuscatedName("e")
-   LinkedList __e;
+   LinkedList field1052;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = -120515153
    )
-   int __x;
+   int field1053;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = 415972873
    )
-   int __d;
+   int field1054;
    @ObfuscatedName("k")
    @Export("iconsList")
    List iconsList;
@@ -57,17 +57,13 @@ public class WorldMapRegion {
    @Export("fonts")
    final HashMap fonts;
 
-   static {
-      __av_o = new DemotingHashTable(37748736, 256);
-   }
-
    WorldMapRegion(int var1, int var2, int var3, HashMap var4) {
       this.x = var1;
       this.y = var2;
-      this.__e = new LinkedList();
+      this.field1052 = new LinkedList();
       this.iconsList = new LinkedList();
       this.iconsMap = new HashMap();
-      this.__x = var3 | -16777216;
+      this.field1053 = var3 | -16777216;
       this.fonts = var4;
    }
 
@@ -76,16 +72,16 @@ public class WorldMapRegion {
       signature = "(IIIB)V",
       garbageValue = "-87"
    )
-   void __w_40(int var1, int var2, int var3) {
-      Sprite var4 = class13.method164(this.x, this.y, this.__d);
-      if(var4 != null) {
-         if(var3 == this.__d * 64) {
+   void method404(int var1, int var2, int var3) {
+      Sprite var4 = class13.method164(this.x, this.y, this.field1054);
+      if (var4 != null) {
+         if (var3 == this.field1054 * 64) {
             var4.drawAt(var1, var2);
          } else {
-            var4.__al_517(var1, var2, var3, var3);
+            var4.method319(var1, var2, var3, var3);
          }
-
       }
+
    }
 
    @ObfuscatedName("o")
@@ -96,7 +92,7 @@ public class WorldMapRegion {
    void method447(class15 var1, List var2) {
       this.iconsMap.clear();
       this.field239 = var1;
-      this.__x_43(var2);
+      this.method407(var2);
    }
 
    @ObfuscatedName("u")
@@ -104,18 +100,18 @@ public class WorldMapRegion {
       signature = "(Ljava/util/HashSet;Ljava/util/List;B)V",
       garbageValue = "-47"
    )
-   void __u_41(HashSet var1, List var2) {
+   void method405(HashSet var1, List var2) {
       this.iconsMap.clear();
       Iterator var3 = var1.iterator();
 
-      while(var3.hasNext()) {
+      while (var3.hasNext()) {
          class39 var4 = (class39)var3.next();
-         if(var4.method256() == this.x && var4.method264() == this.y) {
-            this.__e.add(var4);
+         if (var4.method256() == this.x && var4.method264() == this.y) {
+            this.field1052.add(var4);
          }
       }
 
-      this.__x_43(var2);
+      this.method407(var2);
    }
 
    @ObfuscatedName("g")
@@ -126,42 +122,42 @@ public class WorldMapRegion {
    void method449(int var1, int var2, int var3, int var4, class21 var5) {
       this.iconsMap.clear();
 
-      for(int var6 = var1; var6 < var3 + var1; ++var6) {
-         label75:
-         for(int var7 = var2; var7 < var2 + var4; ++var7) {
-            for(int var8 = 0; var8 < var5.field156; ++var8) {
+      for (int var6 = var1; var6 < var3 + var1; ++var6) {
+         label66:
+         for (int var7 = var2; var7 < var2 + var4; ++var7) {
+            for (int var8 = 0; var8 < var5.field156; ++var8) {
                class25[] var9 = var5.field144[var8][var6][var7];
-               if(var9 != null && var9.length != 0) {
+               if (var9 != null && var9.length != 0) {
                   class25[] var10 = var9;
 
-                  for(int var11 = 0; var11 < var10.length; ++var11) {
-                     ObjectDefinition var13;
-                     boolean var14;
-                     label66: {
-                        class25 var12 = var10[var11];
-                        var13 = class50.getObjectDefinition(var12.field199);
-                        if(var13.transforms != null) {
-                           int[] var15 = var13.transforms;
+                  for (int var11 = 0; var11 < var10.length; ++var11) {
+                     ObjectDefinition var12;
+                     boolean var13;
+                     label57: {
+                        class25 var14 = var10[var11];
+                        var12 = class50.getObjectDefinition(var14.field199);
+                        if (var12.transforms != null) {
+                           int[] var15 = var12.transforms;
 
-                           for(int var16 = 0; var16 < var15.length; ++var16) {
+                           for (int var16 = 0; var16 < var15.length; ++var16) {
                               int var17 = var15[var16];
                               ObjectDefinition var18 = class50.getObjectDefinition(var17);
-                              if(var18.mapIconId != -1) {
-                                 var14 = true;
-                                 break label66;
+                              if (var18.mapIconId != -1) {
+                                 var13 = true;
+                                 break label57;
                               }
                            }
-                        } else if(var13.mapIconId != -1) {
-                           var14 = true;
-                           break label66;
+                        } else if (var12.mapIconId != -1) {
+                           var13 = true;
+                           break label57;
                         }
 
-                        var14 = false;
+                        var13 = false;
                      }
 
-                     if(var14) {
-                        this.method479(var13, var8, var6, var7, var5);
-                        continue label75;
+                     if (var13) {
+                        this.method479(var12, var8, var6, var7, var5);
+                        continue label66;
                      }
                   }
                }
@@ -179,7 +175,7 @@ public class WorldMapRegion {
    void method479(ObjectDefinition var1, int var2, int var3, int var4, class21 var5) {
       TileLocation var6 = new TileLocation(var2, var3 + this.x * 64, this.y * 64 + var4);
       TileLocation var7 = null;
-      if(this.field239 != null) {
+      if (this.field239 != null) {
          var7 = new TileLocation(this.field239.field148 + var2, var3 + this.field239.field149 * 64, var4 + this.field239.field146 * 64);
       } else {
          class39 var8 = (class39)var5;
@@ -187,11 +183,11 @@ public class WorldMapRegion {
       }
 
       Object var10;
-      if(var1.transforms != null) {
+      if (var1.transforms != null) {
          var10 = new WorldMapIcon2(var7, var6, var1.id, this);
       } else {
          WorldMapElement var9 = ViewportMouse.getWorldMapElement(var1.mapIconId);
-         var10 = new WorldMapIcon1(var7, var6, var9.__o, this.__ab_56(var9));
+         var10 = new WorldMapIcon1(var7, var6, var9.field1020, this.method420(var9));
       }
 
       this.iconsMap.put(new TileLocation(0, var3, var4), var10);
@@ -202,13 +198,13 @@ public class WorldMapRegion {
       signature = "(B)V",
       garbageValue = "5"
    )
-   void __e_42() {
+   void method406() {
       Iterator var1 = this.iconsMap.values().iterator();
 
-      while(var1.hasNext()) {
+      while (var1.hasNext()) {
          AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next();
-         if(var2 instanceof WorldMapIcon2) {
-            ((WorldMapIcon2)var2).__z_27();
+         if (var2 instanceof WorldMapIcon2) {
+            ((WorldMapIcon2)var2).method399();
          }
       }
 
@@ -219,13 +215,13 @@ public class WorldMapRegion {
       signature = "(Ljava/util/List;I)V",
       garbageValue = "128876606"
    )
-   void __x_43(List var1) {
+   void method407(List var1) {
       Iterator var2 = var1.iterator();
 
-      while(var2.hasNext()) {
+      while (var2.hasNext()) {
          WorldMapIcon1 var3 = (WorldMapIcon1)var2.next();
-         if(var3.coord2.x >> 6 == this.x && var3.coord2.y >> 6 == this.y) {
-            WorldMapIcon1 var4 = new WorldMapIcon1(var3.coord2, var3.coord2, var3.__m, this.__al_55(var3.__m));
+         if (var3.coord2.x >> 6 == this.x && var3.coord2.y >> 6 == this.y) {
+            WorldMapIcon1 var4 = new WorldMapIcon1(var3.coord2, var3.coord2, var3.field1031, this.method419(var3.field1031));
             this.iconsList.add(var4);
          }
       }
@@ -237,13 +233,13 @@ public class WorldMapRegion {
       signature = "(I)V",
       garbageValue = "1543354181"
    )
-   void __d_44() {
-      if(this.field239 != null) {
+   void method408() {
+      if (this.field239 != null) {
          this.field239.method282();
       } else {
-         Iterator var1 = this.__e.iterator();
+         Iterator var1 = this.field1052.iterator();
 
-         while(var1.hasNext()) {
+         while (var1.hasNext()) {
             class39 var2 = (class39)var1.next();
             var2.method282();
          }
@@ -256,10 +252,10 @@ public class WorldMapRegion {
       signature = "(Lir;B)Z",
       garbageValue = "2"
    )
-   boolean __a_45(AbstractIndexCache var1) {
-      if(this.field239 != null) {
+   boolean method409(AbstractIndexCache var1) {
+      if (this.field239 != null) {
          this.field239.method263(var1);
-         if(this.field239.method271()) {
+         if (this.field239.method271()) {
             this.method449(0, 0, 64, 64, this.field239);
             return true;
          } else {
@@ -270,15 +266,15 @@ public class WorldMapRegion {
 
          Iterator var3;
          class39 var4;
-         for(var3 = this.__e.iterator(); var3.hasNext(); var2 &= var4.method271()) {
+         for (var3 = this.field1052.iterator(); var3.hasNext(); var2 &= var4.method271()) {
             var4 = (class39)var3.next();
             var4.method263(var1);
          }
 
-         if(var2) {
-            var3 = this.__e.iterator();
+         if (var2) {
+            var3 = this.field1052.iterator();
 
-            while(var3.hasNext()) {
+            while (var3.hasNext()) {
                var4 = (class39)var3.next();
                this.method449(var4.method719() * 8, var4.method720() * 8, 8, 8, var4);
             }
@@ -294,38 +290,37 @@ public class WorldMapRegion {
       garbageValue = "518389076"
    )
    void method455(int var1, class40 var2, IndexedSprite[] var3, AbstractIndexCache var4, AbstractIndexCache var5) {
-      this.__d = var1;
-      if(this.field239 != null || !this.__e.isEmpty()) {
-         if(class13.method164(this.x, this.y, var1) == null) {
-            boolean var6 = true;
-            var6 &= this.__a_45(var4);
-            int var8;
-            if(this.field239 != null) {
-               var8 = this.field239.field150;
+      this.field1054 = var1;
+      if ((this.field239 != null || !this.field1052.isEmpty()) && class13.method164(this.x, this.y, var1) == null) {
+         boolean var6 = true;
+         var6 &= this.method409(var4);
+         int var7;
+         if (this.field239 != null) {
+            var7 = this.field239.field150;
+         } else {
+            var7 = ((class21)this.field1052.getFirst()).field150;
+         }
+
+         var6 &= var5.tryLoadArchive(var7);
+         if (var6) {
+            byte[] var8 = var5.takeRecordFlat(var7);
+            class27 var9 = SecureRandomCallable.method1145(var8);
+            Sprite var10 = new Sprite(this.field1054 * 64, this.field1054 * 64);
+            var10.setRaster();
+            if (this.field239 != null) {
+               this.method546(var2, var3, var9);
             } else {
-               var8 = ((class21)this.__e.getFirst()).field150;
+               this.method459(var2, var3, var9);
             }
 
-            var6 &= var5.tryLoadArchive(var8);
-            if(var6) {
-               byte[] var7 = var5.takeRecordFlat(var8);
-               class27 var9 = SecureRandomCallable.method1145(var7);
-               Sprite var10 = new Sprite(this.__d * 64, this.__d * 64);
-               var10.setRaster();
-               if(this.field239 != null) {
-                  this.method546(var2, var3, var9);
-               } else {
-                  this.method459(var2, var3, var9);
-               }
-
-               int var11 = this.x;
-               int var12 = this.y;
-               int var13 = this.__d;
-               __av_o.put(var10, MouseHandler.method1083(var11, var12, var13), var10.pixels.length * 4);
-               this.__d_44();
-            }
+            int var11 = this.x;
+            int var12 = this.y;
+            int var13 = this.field1054;
+            field1051.put(var10, MouseHandler.method1083(var11, var12, var13), var10.pixels.length * 4);
+            this.method408();
          }
       }
+
    }
 
    @ObfuscatedName("j")
@@ -333,13 +328,13 @@ public class WorldMapRegion {
       signature = "(IIILjava/util/HashSet;I)V",
       garbageValue = "893970699"
    )
-   void __j_46(int var1, int var2, int var3, HashSet var4) {
-      if(var4 == null) {
+   void method410(int var1, int var2, int var3, HashSet var4) {
+      if (var4 == null) {
          var4 = new HashSet();
       }
 
-      this.__aq_48(var1, var2, var4, var3);
-      this.__ah_54(var1, var2, var4, var3);
+      this.method412(var1, var2, var4, var3);
+      this.method418(var1, var2, var4, var3);
    }
 
    @ObfuscatedName("s")
@@ -347,21 +342,21 @@ public class WorldMapRegion {
       signature = "(Ljava/util/HashSet;IIB)V",
       garbageValue = "-70"
    )
-   void __s_47(HashSet var1, int var2, int var3) {
+   void method411(HashSet var1, int var2, int var3) {
       Iterator var4 = this.iconsMap.values().iterator();
 
-      while(var4.hasNext()) {
+      while (var4.hasNext()) {
          AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next();
-         if(var5.__h_67()) {
-            int var6 = var5.__m_15();
-            if(var1.contains(Integer.valueOf(var6))) {
+         if (var5.method19()) {
+            int var6 = var5.vmethod395();
+            if (var1.contains(var6)) {
                WorldMapElement var7 = ViewportMouse.getWorldMapElement(var6);
-               this.__av_50(var7, var5.__e, var5.__x, var2, var3);
+               this.method414(var7, var5.field5, var5.field6, var2, var3);
             }
          }
       }
 
-      this.__aj_49(var1, var2, var3);
+      this.method413(var1, var2, var3);
    }
 
    @ObfuscatedName("t")
@@ -372,15 +367,15 @@ public class WorldMapRegion {
    void method546(class40 var1, IndexedSprite[] var2, class27 var3) {
       int var4;
       int var5;
-      for(var4 = 0; var4 < 64; ++var4) {
-         for(var5 = 0; var5 < 64; ++var5) {
+      for (var4 = 0; var4 < 64; ++var4) {
+         for (var5 = 0; var5 < 64; ++var5) {
             this.method461(var4, var5, this.field239, var1, var3);
             this.method462(var4, var5, this.field239, var1);
          }
       }
 
-      for(var4 = 0; var4 < 64; ++var4) {
-         for(var5 = 0; var5 < 64; ++var5) {
+      for (var4 = 0; var4 < 64; ++var4) {
+         for (var5 = 0; var5 < 64; ++var5) {
             this.method460(var4, var5, this.field239, var1, var2);
          }
       }
@@ -393,29 +388,29 @@ public class WorldMapRegion {
       garbageValue = "752069098"
    )
    void method459(class40 var1, IndexedSprite[] var2, class27 var3) {
-      Iterator var4 = this.__e.iterator();
+      Iterator var4 = this.field1052.iterator();
 
       class39 var5;
       int var6;
       int var7;
-      while(var4.hasNext()) {
+      while (var4.hasNext()) {
          var5 = (class39)var4.next();
 
-         for(var6 = var5.method719() * 8; var6 < var5.method719() * 8 + 8; ++var6) {
-            for(var7 = var5.method720() * 8; var7 < var5.method720() * 8 + 8; ++var7) {
+         for (var6 = var5.method719() * 8; var6 < var5.method719() * 8 + 8; ++var6) {
+            for (var7 = var5.method720() * 8; var7 < var5.method720() * 8 + 8; ++var7) {
                this.method461(var6, var7, var5, var1, var3);
                this.method462(var6, var7, var5, var1);
             }
          }
       }
 
-      var4 = this.__e.iterator();
+      var4 = this.field1052.iterator();
 
-      while(var4.hasNext()) {
+      while (var4.hasNext()) {
          var5 = (class39)var4.next();
 
-         for(var6 = var5.method719() * 8; var6 < var5.method719() * 8 + 8; ++var6) {
-            for(var7 = var5.method720() * 8; var7 < var5.method720() * 8 + 8; ++var7) {
+         for (var6 = var5.method719() * 8; var6 < var5.method719() * 8 + 8; ++var6) {
+            for (var7 = var5.method720() * 8; var7 < var5.method720() * 8 + 8; ++var7) {
                this.method460(var6, var7, var5, var1, var2);
             }
          }
@@ -441,103 +436,107 @@ public class WorldMapRegion {
    void method461(int var1, int var2, class21 var3, class40 var4, class27 var5) {
       int var6 = var3.field151[0][var1][var2] - 1;
       int var7 = var3.field145[0][var1][var2] - 1;
-      if(var6 == -1 && var7 == -1) {
-         Rasterizer2D.Rasterizer2D_fillRectangle(this.__d * var1, this.__d * (63 - var2), this.__d, this.__d, this.__x);
+      if (var6 == -1 && var7 == -1) {
+         Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, this.field1053);
       }
 
       int var8 = 16711935;
       int var9;
-      if(var7 != -1) {
-         int var10 = this.__x;
-         OverlayDefinition var12 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var7);
-         OverlayDefinition var11;
-         if(var12 != null) {
-            var11 = var12;
+      if (var7 != -1) {
+         int var10 = this.field1053;
+         OverlayDefinition var11 = (OverlayDefinition)OverlayDefinition.field664.get((long)var7);
+         OverlayDefinition var12;
+         if (var11 != null) {
+            var12 = var11;
          } else {
-            byte[] var13 = OverlayDefinition.__jf_m.takeRecord(4, var7);
-            var12 = new OverlayDefinition();
-            if(var13 != null) {
-               var12.read(new Buffer(var13), var7);
+            byte[] var13 = OverlayDefinition.field663.takeRecord(4, var7);
+            var11 = new OverlayDefinition();
+            if (var13 != null) {
+               var11.read(new Buffer(var13), var7);
             }
 
-            var12.init();
-            OverlayDefinition.__jf_f.put(var12, (long)var7);
-            var11 = var12;
+            var11.init();
+            OverlayDefinition.field664.put(var11, (long)var7);
+            var12 = var11;
          }
 
-         if(var11 == null) {
-            var9 = var10;
-         } else if(var11.rgb2 >= 0) {
-            var9 = var11.rgb2 | -16777216;
-         } else if(var11.texture >= 0) {
-            int var21 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var11.texture), 96);
-            var9 = Rasterizer3D.Rasterizer3D_colorPalette[var21] | -16777216;
-         } else if(var11.rgb == 16711935) {
+         if (var12 == null) {
             var9 = var10;
+         } else if (var12.rgb2 >= 0) {
+            var9 = var12.rgb2 | -16777216;
          } else {
-            int var14 = var11.hue;
-            int var15 = var11.saturation;
-            int var16 = var11.lightness;
-            if(var16 > 179) {
-               var15 /= 2;
-            }
-
-            if(var16 > 192) {
-               var15 /= 2;
-            }
-
-            if(var16 > 217) {
-               var15 /= 2;
-            }
-
-            if(var16 > 243) {
-               var15 /= 2;
-            }
-
-            int var17 = (var15 / 32 << 7) + var16 / 2 + (var14 / 4 << 10);
-            byte var19 = 96;
-            int var18;
-            if(var17 == -2) {
-               var18 = 12345678;
+            int var20;
+            if (var12.texture >= 0) {
+               var20 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var12.texture), 96);
+               var9 = Rasterizer3D.Rasterizer3D_colorPalette[var20] | -16777216;
+            } else if (var12.rgb == 16711935) {
+               var9 = var10;
             } else {
-               int var22;
-               if(var17 == -1) {
-                  if(var19 < 0) {
-                     var19 = 0;
-                  } else if(var19 > 127) {
-                     var19 = 127;
-                  }
-
-                  var22 = 127 - var19;
-                  var18 = var22;
-               } else {
-                  var22 = var19 * (var17 & 127) / 128;
-                  if(var22 < 2) {
-                     var22 = 2;
-                  } else if(var22 > 126) {
-                     var22 = 126;
-                  }
-
-                  var18 = var22 + (var17 & 65408);
+               var20 = var12.hue;
+               int var14 = var12.saturation;
+               int var15 = var12.lightness;
+               if (var15 > 179) {
+                  var14 /= 2;
                }
-            }
 
-            var9 = Rasterizer3D.Rasterizer3D_colorPalette[var18] | -16777216;
+               if (var15 > 192) {
+                  var14 /= 2;
+               }
+
+               if (var15 > 217) {
+                  var14 /= 2;
+               }
+
+               if (var15 > 243) {
+                  var14 /= 2;
+               }
+
+               int var16 = (var14 / 32 << 7) + var15 / 2 + (var20 / 4 << 10);
+               byte var17 = 96;
+               int var18;
+               if (var16 == -2) {
+                  var18 = 12345678;
+               } else {
+                  int var19;
+                  if (var16 == -1) {
+                     if (var17 < 0) {
+                        var17 = 0;
+                     } else if (var17 > 127) {
+                        var17 = 127;
+                     }
+
+                     var19 = 127 - var17;
+                     var18 = var19;
+                  } else {
+                     var19 = var17 * (var16 & 127) / 128;
+                     if (var19 < 2) {
+                        var19 = 2;
+                     } else if (var19 > 126) {
+                        var19 = 126;
+                     }
+
+                     var18 = var19 + (var16 & 65408);
+                  }
+               }
+
+               var9 = Rasterizer3D.Rasterizer3D_colorPalette[var18] | -16777216;
+            }
          }
 
          var8 = var9;
       }
 
-      if(var7 > -1 && var3.field154[0][var1][var2] == 0) {
-         Rasterizer2D.Rasterizer2D_fillRectangle(this.__d * var1, this.__d * (63 - var2), this.__d, this.__d, var8);
+      if (var7 > -1 && var3.field154[0][var1][var2] == 0) {
+         Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, var8);
       } else {
          var9 = this.method541(var1, var2, var3, var5);
-         if(var7 == -1) {
-            Rasterizer2D.Rasterizer2D_fillRectangle(this.__d * var1, this.__d * (63 - var2), this.__d, this.__d, var9);
+         if (var7 == -1) {
+            Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, var9);
          } else {
-            var4.method743(this.__d * var1, this.__d * (63 - var2), var9, var8, this.__d, this.__d, var3.field154[0][var1][var2], var3.field155[0][var1][var2]);
+            var4.method743(this.field1054 * var1, this.field1054 * (63 - var2), var9, var8, this.field1054, this.field1054, var3.field154[0][var1][var2], var3.field155[0][var1][var2]);
          }
       }
+
    }
 
    @ObfuscatedName("c")
@@ -546,91 +545,94 @@ public class WorldMapRegion {
       garbageValue = "9"
    )
    void method462(int var1, int var2, class21 var3, class40 var4) {
-      for(int var5 = 1; var5 < var3.field156; ++var5) {
+      for (int var5 = 1; var5 < var3.field156; ++var5) {
          int var6 = var3.field145[var5][var1][var2] - 1;
-         if(var6 > -1) {
-            int var8 = this.__x;
-            OverlayDefinition var10 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var6);
+         if (var6 > -1) {
+            int var7 = this.field1053;
+            OverlayDefinition var8 = (OverlayDefinition)OverlayDefinition.field664.get((long)var6);
             OverlayDefinition var9;
-            if(var10 != null) {
-               var9 = var10;
+            if (var8 != null) {
+               var9 = var8;
             } else {
-               byte[] var11 = OverlayDefinition.__jf_m.takeRecord(4, var6);
-               var10 = new OverlayDefinition();
-               if(var11 != null) {
-                  var10.read(new Buffer(var11), var6);
+               byte[] var10 = OverlayDefinition.field663.takeRecord(4, var6);
+               var8 = new OverlayDefinition();
+               if (var10 != null) {
+                  var8.read(new Buffer(var10), var6);
                }
 
-               var10.init();
-               OverlayDefinition.__jf_f.put(var10, (long)var6);
-               var9 = var10;
+               var8.init();
+               OverlayDefinition.field664.put(var8, (long)var6);
+               var9 = var8;
             }
 
-            int var7;
-            if(var9 == null) {
-               var7 = var8;
-            } else if(var9.rgb2 >= 0) {
-               var7 = var9.rgb2 | -16777216;
-            } else if(var9.texture >= 0) {
-               int var20 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var9.texture), 96);
-               var7 = Rasterizer3D.Rasterizer3D_colorPalette[var20] | -16777216;
-            } else if(var9.rgb == 16711935) {
-               var7 = var8;
+            int var18;
+            if (var9 == null) {
+               var18 = var7;
+            } else if (var9.rgb2 >= 0) {
+               var18 = var9.rgb2 | -16777216;
             } else {
-               int var12 = var9.hue;
-               int var13 = var9.saturation;
-               int var14 = var9.lightness;
-               if(var14 > 179) {
-                  var13 /= 2;
-               }
-
-               if(var14 > 192) {
-                  var13 /= 2;
-               }
-
-               if(var14 > 217) {
-                  var13 /= 2;
-               }
-
-               if(var14 > 243) {
-                  var13 /= 2;
-               }
-
-               int var15 = (var13 / 32 << 7) + var14 / 2 + (var12 / 4 << 10);
-               byte var17 = 96;
-               int var16;
-               if(var15 == -2) {
-                  var16 = 12345678;
+               int var11;
+               if (var9.texture >= 0) {
+                  var11 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.vmethod324(var9.texture), 96);
+                  var18 = Rasterizer3D.Rasterizer3D_colorPalette[var11] | -16777216;
+               } else if (var9.rgb == 16711935) {
+                  var18 = var7;
                } else {
-                  int var21;
-                  if(var15 == -1) {
-                     if(var17 < 0) {
-                        var17 = 0;
-                     } else if(var17 > 127) {
-                        var17 = 127;
-                     }
-
-                     var21 = 127 - var17;
-                     var16 = var21;
-                  } else {
-                     var21 = var17 * (var15 & 127) / 128;
-                     if(var21 < 2) {
-                        var21 = 2;
-                     } else if(var21 > 126) {
-                        var21 = 126;
-                     }
-
-                     var16 = var21 + (var15 & 65408);
+                  var11 = var9.hue;
+                  int var12 = var9.saturation;
+                  int var13 = var9.lightness;
+                  if (var13 > 179) {
+                     var12 /= 2;
                   }
-               }
 
-               var7 = Rasterizer3D.Rasterizer3D_colorPalette[var16] | -16777216;
+                  if (var13 > 192) {
+                     var12 /= 2;
+                  }
+
+                  if (var13 > 217) {
+                     var12 /= 2;
+                  }
+
+                  if (var13 > 243) {
+                     var12 /= 2;
+                  }
+
+                  int var14 = (var12 / 32 << 7) + var13 / 2 + (var11 / 4 << 10);
+                  byte var15 = 96;
+                  int var16;
+                  if (var14 == -2) {
+                     var16 = 12345678;
+                  } else {
+                     int var17;
+                     if (var14 == -1) {
+                        if (var15 < 0) {
+                           var15 = 0;
+                        } else if (var15 > 127) {
+                           var15 = 127;
+                        }
+
+                        var17 = 127 - var15;
+                        var16 = var17;
+                     } else {
+                        var17 = var15 * (var14 & 127) / 128;
+                        if (var17 < 2) {
+                           var17 = 2;
+                        } else if (var17 > 126) {
+                           var17 = 126;
+                        }
+
+                        var16 = var17 + (var14 & 65408);
+                     }
+                  }
+
+                  var18 = Rasterizer3D.Rasterizer3D_colorPalette[var16] | -16777216;
+               }
             }
 
-            if(var3.field154[var5][var1][var2] == 0) {
-               Rasterizer2D.Rasterizer2D_fillRectangle(this.__d * var1, this.__d * (63 - var2), this.__d, this.__d, var7);
+            if (var3.field154[var5][var1][var2] == 0) {
+               Rasterizer2D.Rasterizer2D_fillRectangle(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, this.field1054, var18);
             } else {
-               var4.method743(this.__d * var1, this.__d * (63 - var2), 0, var7, this.__d, this.__d, var3.field154[var5][var1][var2], var3.field155[var5][var1][var2]);
+               var4.method743(this.field1054 * var1, this.field1054 * (63 - var2), 0, var18, this.field1054, this.field1054, var3.field154[var5][var1][var2], var3.field155[var5][var1][var2]);
             }
          }
       }
@@ -643,7 +645,7 @@ public class WorldMapRegion {
       garbageValue = "1908333009"
    )
    int method541(int var1, int var2, class21 var3, class27 var4) {
-      return var3.field151[0][var1][var2] == 0?this.__x:var4.method430(var1, var2);
+      return var3.field151[0][var1][var2] == 0 ? this.field1053 : var4.method430(var1, var2);
    }
 
    @ObfuscatedName("v")
@@ -652,20 +654,20 @@ public class WorldMapRegion {
       garbageValue = "-26219"
    )
    void method464(int var1, int var2, class21 var3, IndexedSprite[] var4) {
-      for(int var5 = 0; var5 < var3.field156; ++var5) {
+      for (int var5 = 0; var5 < var3.field156; ++var5) {
          class25[] var6 = var3.field144[var5][var1][var2];
-         if(var6 != null && var6.length != 0) {
+         if (var6 != null && var6.length != 0) {
             class25[] var7 = var6;
 
-            for(int var8 = 0; var8 < var7.length; ++var8) {
+            for (int var8 = 0; var8 < var7.length; ++var8) {
                class25 var9 = var7[var8];
-               if(WorldMapAreaData.method711(var9.field198) || class1.method19(var9.field198)) {
+               if (WorldMapAreaData.method711(var9.field198) || class1.method19(var9.field198)) {
                   ObjectDefinition var10 = class50.getObjectDefinition(var9.field199);
-                  if(var10.mapSceneId != -1) {
-                     if(var10.mapSceneId != 46 && var10.mapSceneId != 52) {
-                        var4[var10.mapSceneId].__o_497(this.__d * var1, this.__d * (63 - var2), this.__d * 2, this.__d * 2);
+                  if (var10.mapSceneId != -1) {
+                     if (var10.mapSceneId != 46 && var10.mapSceneId != 52) {
+                        var4[var10.mapSceneId].method135(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054 * 2, this.field1054 * 2);
                      } else {
-                        var4[var10.mapSceneId].__o_497(this.__d * var1, this.__d * (63 - var2), this.__d * 2 + 1, this.__d * 2 + 1);
+                        var4[var10.mapSceneId].method135(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054 * 2 + 1, this.field1054 * 2 + 1);
                      }
                   }
                }
@@ -681,55 +683,55 @@ public class WorldMapRegion {
       garbageValue = "-31"
    )
    void method465(int var1, int var2, class21 var3) {
-      for(int var4 = 0; var4 < var3.field156; ++var4) {
+      for (int var4 = 0; var4 < var3.field156; ++var4) {
          class25[] var5 = var3.field144[var4][var1][var2];
-         if(var5 != null && var5.length != 0) {
+         if (var5 != null && var5.length != 0) {
             class25[] var6 = var5;
 
-            for(int var7 = 0; var7 < var6.length; ++var7) {
+            for (int var7 = 0; var7 < var6.length; ++var7) {
                class25 var8 = var6[var7];
-               int var10 = var8.field198;
-               boolean var9 = var10 >= class231.field2805.field2820 && var10 <= class231.field2804.field2820 || var10 == class231.field2806.field2820;
-               if(var9) {
+               int var9 = var8.field198;
+               boolean var10 = var9 >= class231.field2805.field2820 && var9 <= class231.field2804.field2820 || var9 == class231.field2806.field2820;
+               if (var10) {
                   ObjectDefinition var11 = class50.getObjectDefinition(var8.field199);
-                  int var12 = var11.int1 != 0?-3407872:-3355444;
-                  if(var8.field198 == class231.field2805.field2820) {
-                     this.__ad_58(var1, var2, var8.field202, var12);
+                  int var12 = var11.int1 != 0 ? -3407872 : -3355444;
+                  if (var8.field198 == class231.field2805.field2820) {
+                     this.method422(var1, var2, var8.field202, var12);
                   }
 
-                  if(var8.field198 == class231.field2813.field2820) {
-                     this.__ad_58(var1, var2, var8.field202, -3355444);
-                     this.__ad_58(var1, var2, var8.field202 + 1, var12);
+                  if (var8.field198 == class231.field2813.field2820) {
+                     this.method422(var1, var2, var8.field202, -3355444);
+                     this.method422(var1, var2, var8.field202 + 1, var12);
                   }
 
-                  if(var8.field198 == class231.field2804.field2820) {
-                     if(var8.field202 == 0) {
-                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1, this.__d * (63 - var2), 1, var12);
+                  if (var8.field198 == class231.field2804.field2820) {
+                     if (var8.field202 == 0) {
+                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2), 1, var12);
                      }
 
-                     if(var8.field202 == 1) {
-                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1 + this.__d - 1, this.__d * (63 - var2), 1, var12);
+                     if (var8.field202 == 1) {
+                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2), 1, var12);
                      }
 
-                     if(var8.field202 == 2) {
-                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1 + this.__d - 1, this.__d * (63 - var2) + this.__d - 1, 1, var12);
+                     if (var8.field202 == 2) {
+                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2) + this.field1054 - 1, 1, var12);
                      }
 
-                     if(var8.field202 == 3) {
-                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1, this.__d * (63 - var2) + this.__d - 1, 1, var12);
+                     if (var8.field202 == 3) {
+                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2) + this.field1054 - 1, 1, var12);
                      }
                   }
 
-                  if(var8.field198 == class231.field2806.field2820) {
+                  if (var8.field198 == class231.field2806.field2820) {
                      int var13 = var8.field202 % 2;
                      int var14;
-                     if(var13 == 0) {
-                        for(var14 = 0; var14 < this.__d; ++var14) {
-                           Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.__d * var1, (64 - var2) * this.__d - 1 - var14, 1, var12);
+                     if (var13 == 0) {
+                        for (var14 = 0; var14 < this.field1054; ++var14) {
+                           Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.field1054 * var1, (64 - var2) * this.field1054 - 1 - var14, 1, var12);
                         }
                      } else {
-                        for(var14 = 0; var14 < this.__d; ++var14) {
-                           Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.__d * var1, var14 + this.__d * (63 - var2), 1, var12);
+                        for (var14 = 0; var14 < this.field1054; ++var14) {
+                           Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.field1054 * var1, var14 + this.field1054 * (63 - var2), 1, var12);
                         }
                      }
                   }
@@ -745,23 +747,23 @@ public class WorldMapRegion {
       signature = "(IILjava/util/HashSet;IB)V",
       garbageValue = "0"
    )
-   void __aq_48(int var1, int var2, HashSet var3, int var4) {
+   void method412(int var1, int var2, HashSet var3, int var4) {
       float var5 = (float)var4 / 64.0F;
       float var6 = var5 / 2.0F;
       Iterator var7 = this.iconsMap.entrySet().iterator();
 
-      while(var7.hasNext()) {
+      while (var7.hasNext()) {
          Entry var8 = (Entry)var7.next();
          TileLocation var9 = (TileLocation)var8.getKey();
          int var10 = (int)((float)var1 + var5 * (float)var9.x - var6);
          int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6);
          AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue();
-         if(var12 != null && var12.__h_67()) {
-            var12.__e = var10;
-            var12.__x = var11;
-            WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.__m_15());
-            if(!var3.contains(Integer.valueOf(var13.__g_410()))) {
-               this.__ar_51(var12, var10, var11, var5);
+         if (var12 != null && var12.method19()) {
+            var12.field5 = var10;
+            var12.field6 = var11;
+            WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.vmethod395());
+            if (!var3.contains(var13.method390())) {
+               this.method415(var12, var10, var11, var5);
             }
          }
       }
@@ -773,15 +775,15 @@ public class WorldMapRegion {
       signature = "(Ljava/util/HashSet;III)V",
       garbageValue = "781854370"
    )
-   void __aj_49(HashSet var1, int var2, int var3) {
+   void method413(HashSet var1, int var2, int var3) {
       Iterator var4 = this.iconsList.iterator();
 
-      while(var4.hasNext()) {
+      while (var4.hasNext()) {
          AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next();
-         if(var5.__h_67()) {
-            WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.__m_15());
-            if(var6 != null && var1.contains(Integer.valueOf(var6.__g_410()))) {
-               this.__av_50(var6, var5.__e, var5.__x, var2, var3);
+         if (var5.method19()) {
+            WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.vmethod395());
+            if (var6 != null && var1.contains(var6.method390())) {
+               this.method414(var6, var5.field5, var5.field6, var2, var3);
             }
          }
       }
@@ -793,16 +795,16 @@ public class WorldMapRegion {
       signature = "(Lic;IIIIB)V",
       garbageValue = "92"
    )
-   void __av_50(WorldMapElement var1, int var2, int var3, int var4, int var5) {
+   void method414(WorldMapElement var1, int var2, int var3, int var4, int var5) {
       Sprite var6 = var1.getSprite(false);
-      if(var6 != null) {
+      if (var6 != null) {
          var6.drawAt2(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2);
-         if(var4 % var5 < var5 / 2) {
+         if (var4 % var5 < var5 / 2) {
             Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128);
             Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256);
          }
-
       }
+
    }
 
    @ObfuscatedName("ar")
@@ -810,10 +812,10 @@ public class WorldMapRegion {
       signature = "(Lak;IIFI)V",
       garbageValue = "-1283733783"
    )
-   void __ar_51(AbstractWorldMapIcon var1, int var2, int var3, float var4) {
-      WorldMapElement var5 = ViewportMouse.getWorldMapElement(var1.__m_15());
-      this.__ac_52(var5, var2, var3);
-      this.__ay_53(var1, var5, var2, var3, var4);
+   void method415(AbstractWorldMapIcon var1, int var2, int var3, float var4) {
+      WorldMapElement var5 = ViewportMouse.getWorldMapElement(var1.vmethod395());
+      this.method416(var5, var2, var3);
+      this.method417(var1, var5, var2, var3, var4);
    }
 
    @ObfuscatedName("ac")
@@ -821,9 +823,9 @@ public class WorldMapRegion {
       signature = "(Lic;III)V",
       garbageValue = "423173487"
    )
-   void __ac_52(WorldMapElement var1, int var2, int var3) {
+   void method416(WorldMapElement var1, int var2, int var3) {
       Sprite var4 = var1.getSprite(false);
-      if(var4 != null) {
+      if (var4 != null) {
          int var5 = this.method473(var4, var1.field3287);
          int var6 = this.method474(var4, var1.field3301);
          var4.drawAt2(var5 + var2, var3 + var6);
@@ -836,14 +838,13 @@ public class WorldMapRegion {
       signature = "(Lak;Lic;IIFI)V",
       garbageValue = "-1237576843"
    )
-   void __ay_53(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) {
-      WorldMapLabel var6 = var1.__f_16();
-      if(var6 != null) {
-         if(var6.size.__f_14(var5)) {
-            Font var7 = (Font)this.fonts.get(var6.size);
-            var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.__e, 0, 1, 0, var7.ascent / 2);
-         }
+   void method417(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) {
+      WorldMapLabel var6 = var1.vmethod396();
+      if (var6 != null && var6.size.method400(var5)) {
+         Font var7 = (Font)this.fonts.get(var6.size);
+         var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1022, 0, 1, 0, var7.ascent / 2);
       }
+
    }
 
    @ObfuscatedName("ah")
@@ -851,19 +852,19 @@ public class WorldMapRegion {
       signature = "(IILjava/util/HashSet;IB)V",
       garbageValue = "-17"
    )
-   void __ah_54(int var1, int var2, HashSet var3, int var4) {
+   void method418(int var1, int var2, HashSet var3, int var4) {
       float var5 = (float)var4 / 64.0F;
       Iterator var6 = this.iconsList.iterator();
 
-      while(var6.hasNext()) {
+      while (var6.hasNext()) {
          AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next();
-         if(var7.__h_67()) {
+         if (var7.method19()) {
             int var8 = var7.coord2.x % 64;
             int var9 = var7.coord2.y % 64;
-            var7.__e = (int)((float)var8 * var5 + (float)var1);
-            var7.__x = (int)(var5 * (float)(63 - var9) + (float)var2);
-            if(!var3.contains(Integer.valueOf(var7.__m_15()))) {
-               this.__ar_51(var7, var7.__e, var7.__x, var5);
+            var7.field5 = (int)((float)var8 * var5 + (float)var1);
+            var7.field6 = (int)(var5 * (float)(63 - var9) + (float)var2);
+            if (!var3.contains(var7.vmethod395())) {
+               this.method415(var7, var7.field5, var7.field6, var5);
             }
          }
       }
@@ -907,9 +908,9 @@ public class WorldMapRegion {
       signature = "(II)Laj;",
       garbageValue = "598030754"
    )
-   WorldMapLabel __al_55(int var1) {
+   WorldMapLabel method419(int var1) {
       WorldMapElement var2 = ViewportMouse.getWorldMapElement(var1);
-      return this.__ab_56(var2);
+      return this.method420(var2);
    }
 
    @ObfuscatedName("ab")
@@ -917,32 +918,32 @@ public class WorldMapRegion {
       signature = "(Lic;B)Laj;",
       garbageValue = "59"
    )
-   WorldMapLabel __ab_56(WorldMapElement var1) {
-      if(var1.__l != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) {
+   WorldMapLabel method420(WorldMapElement var1) {
+      if (var1.field1021 != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) {
          WorldMapLabelSize var2 = WorldMapLabelSize.method195(var1.textSize);
-         if(var2 == null) {
+         if (var2 == null) {
             return null;
          } else {
             Font var3 = (Font)this.fonts.get(var2);
-            if(var3 == null) {
+            if (var3 == null) {
                return null;
             } else {
-               int var4 = var3.lineCount(var1.__l, 1000000);
+               int var4 = var3.lineCount(var1.field1021, 1000000);
                String[] var5 = new String[var4];
-               var3.breakLines(var1.__l, (int[])null, var5);
+               var3.breakLines(var1.field1021, (int[])null, var5);
                int var6 = var5.length * var3.ascent / 2;
                int var7 = 0;
                String[] var8 = var5;
 
-               for(int var9 = 0; var9 < var8.length; ++var9) {
+               for (int var9 = 0; var9 < var8.length; ++var9) {
                   String var10 = var8[var9];
                   int var11 = var3.stringWidth(var10);
-                  if(var11 > var7) {
+                  if (var11 > var7) {
                      var7 = var11;
                   }
                }
 
-               return new WorldMapLabel(var1.__l, var7, var6, var2);
+               return new WorldMapLabel(var1.field1021, var7, var6, var2);
             }
          }
       } else {
@@ -955,25 +956,25 @@ public class WorldMapRegion {
       signature = "(IIIIII)Ljava/util/List;",
       garbageValue = "-1237576843"
    )
-   List __ae_57(int var1, int var2, int var3, int var4, int var5) {
+   List method421(int var1, int var2, int var3, int var4, int var5) {
       LinkedList var6 = new LinkedList();
-      if(var4 >= var1 && var5 >= var2) {
-         if(var4 < var3 + var1 && var5 < var3 + var2) {
+      if (var4 >= var1 && var5 >= var2) {
+         if (var4 < var3 + var1 && var5 < var3 + var2) {
             Iterator var7 = this.iconsMap.values().iterator();
 
             AbstractWorldMapIcon var8;
-            while(var7.hasNext()) {
+            while (var7.hasNext()) {
                var8 = (AbstractWorldMapIcon)var7.next();
-               if(var8.__h_67() && var8.__y_66(var4, var5)) {
+               if (var8.method19() && var8.method18(var4, var5)) {
                   var6.add(var8);
                }
             }
 
             var7 = this.iconsList.iterator();
 
-            while(var7.hasNext()) {
+            while (var7.hasNext()) {
                var8 = (AbstractWorldMapIcon)var7.next();
-               if(var8.__h_67() && var8.__y_66(var4, var5)) {
+               if (var8.method19() && var8.method18(var4, var5)) {
                   var6.add(var8);
                }
             }
@@ -1005,22 +1006,22 @@ public class WorldMapRegion {
       signature = "(IIIII)V",
       garbageValue = "-1516512827"
    )
-   void __ad_58(int var1, int var2, int var3, int var4) {
+   void method422(int var1, int var2, int var3, int var4) {
       var3 %= 4;
-      if(var3 == 0) {
-         Rasterizer2D.Rasterizer2D_drawVerticalLine(this.__d * var1, this.__d * (63 - var2), this.__d, var4);
+      if (var3 == 0) {
+         Rasterizer2D.Rasterizer2D_drawVerticalLine(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, var4);
       }
 
-      if(var3 == 1) {
-         Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1, this.__d * (63 - var2), this.__d, var4);
+      if (var3 == 1) {
+         Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2), this.field1054, var4);
       }
 
-      if(var3 == 2) {
-         Rasterizer2D.Rasterizer2D_drawVerticalLine(this.__d * var1 + this.__d - 1, this.__d * (63 - var2), this.__d, var4);
+      if (var3 == 2) {
+         Rasterizer2D.Rasterizer2D_drawVerticalLine(this.field1054 * var1 + this.field1054 - 1, this.field1054 * (63 - var2), this.field1054, var4);
       }
 
-      if(var3 == 3) {
-         Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1, this.__d * (63 - var2) + this.__d - 1, this.__d, var4);
+      if (var3 == 3) {
+         Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.field1054 * var1, this.field1054 * (63 - var2) + this.field1054 - 1, this.field1054, var4);
       }
 
    }
@@ -1049,47 +1050,45 @@ public class WorldMapRegion {
       garbageValue = "597"
    )
    static final void method567(Widget var0, int var1, int var2) {
-      if(Client.minimapState == 0 || Client.minimapState == 3) {
-         if(!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) {
-            SpriteMask var3 = var0.getSpriteMask(true);
-            if(var3 == null) {
-               return;
-            }
-
-            int var4 = MouseHandler.MouseHandler_lastPressedX - var1;
-            int var5 = MouseHandler.MouseHandler_lastPressedY - var2;
-            if(var3.contains(var4, var5)) {
-               var4 -= var3.width / 2;
-               var5 -= var3.height / 2;
-               int var6 = Client.minimapOrientation & 2047;
-               int var7 = Rasterizer3D.Rasterizer3D_sine[var6];
-               int var8 = Rasterizer3D.Rasterizer3D_cosine[var6];
-               int var9 = var4 * var8 + var7 * var5 >> 11;
-               int var10 = var5 * var8 - var4 * var7 >> 11;
-               int var11 = var9 + Canvas.localPlayer.x >> 7;
-               int var12 = Canvas.localPlayer.y - var10 >> 7;
-               PacketBufferNode var13 = Interpreter.method1915(ClientPacket.__gs_ba, Client.packetWriter.isaacCipher);
-               var13.packetBuffer.writeByte(18);
-               var13.packetBuffer.__bo_322(var12 + GraphicsObject.baseY);
-               var13.packetBuffer.__bo_322(var11 + class50.baseX);
-               var13.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?(KeyHandler.KeyHandler_pressedKeys[81]?2:1):0);
-               var13.packetBuffer.writeByte(var4);
-               var13.packetBuffer.writeByte(var5);
-               var13.packetBuffer.writeShort(Client.minimapOrientation);
-               var13.packetBuffer.writeByte(57);
-               var13.packetBuffer.writeByte(0);
-               var13.packetBuffer.writeByte(0);
-               var13.packetBuffer.writeByte(89);
-               var13.packetBuffer.writeShort(Canvas.localPlayer.x);
-               var13.packetBuffer.writeShort(Canvas.localPlayer.y);
-               var13.packetBuffer.writeByte(63);
-               Client.packetWriter.__q_167(var13);
-               Client.destinationX = var11;
-               Client.destinationY = var12;
-            }
+      if ((Client.minimapState == 0 || Client.minimapState == 3) && !Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) {
+         SpriteMask var3 = var0.getSpriteMask(true);
+         if (var3 == null) {
+            return;
          }
 
+         int var4 = MouseHandler.MouseHandler_lastPressedX - var1;
+         int var5 = MouseHandler.MouseHandler_lastPressedY - var2;
+         if (var3.contains(var4, var5)) {
+            var4 -= var3.width / 2;
+            var5 -= var3.height / 2;
+            int var6 = Client.minimapOrientation & 2047;
+            int var7 = Rasterizer3D.Rasterizer3D_sine[var6];
+            int var8 = Rasterizer3D.Rasterizer3D_cosine[var6];
+            int var9 = var4 * var8 + var7 * var5 >> 11;
+            int var10 = var5 * var8 - var4 * var7 >> 11;
+            int var11 = var9 + Canvas.localPlayer.x >> 7;
+            int var12 = Canvas.localPlayer.y - var10 >> 7;
+            PacketBufferNode var13 = Interpreter.method1915(ClientPacket.field274, Client.packetWriter.isaacCipher);
+            var13.packetBuffer.writeByte(18);
+            var13.packetBuffer.method63(var12 + GraphicsObject.baseY);
+            var13.packetBuffer.method63(var11 + class50.baseX);
+            var13.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0);
+            var13.packetBuffer.writeByte(var4);
+            var13.packetBuffer.writeByte(var5);
+            var13.packetBuffer.writeShort(Client.minimapOrientation);
+            var13.packetBuffer.writeByte(57);
+            var13.packetBuffer.writeByte(0);
+            var13.packetBuffer.writeByte(0);
+            var13.packetBuffer.writeByte(89);
+            var13.packetBuffer.writeShort(Canvas.localPlayer.x);
+            var13.packetBuffer.writeShort(Canvas.localPlayer.y);
+            var13.packetBuffer.writeByte(63);
+            Client.packetWriter.method241(var13);
+            Client.destinationX = var11;
+            Client.destinationY = var12;
+         }
       }
+
    }
 
    @ObfuscatedName("ix")
@@ -1099,32 +1098,36 @@ public class WorldMapRegion {
    )
    @Export("notRevalidateWidgetScroll")
    static void notRevalidateWidgetScroll(Widget[] var0, int var1, int var2, int var3, boolean var4) {
-      for(int var5 = 0; var5 < var0.length; ++var5) {
+      for (int var5 = 0; var5 < var0.length; ++var5) {
          Widget var6 = var0[var5];
-         if(var6 != null && var6.parentId == var1) {
+         if (var6 != null && var6.parentId == var1) {
             WorldMapSection3.alignWidgetSize(var6, var2, var3, var4);
             OverlayDefinition.alignWidgetPosition(var6, var2, var3);
-            if(var6.scrollX > var6.scrollWidth - var6.width) {
+            if (var6.scrollX > var6.scrollWidth - var6.width) {
                var6.scrollX = var6.scrollWidth - var6.width;
             }
 
-            if(var6.scrollX < 0) {
+            if (var6.scrollX < 0) {
                var6.scrollX = 0;
             }
 
-            if(var6.scrollY > var6.scrollHeight - var6.height) {
+            if (var6.scrollY > var6.scrollHeight - var6.height) {
                var6.scrollY = var6.scrollHeight - var6.height;
             }
 
-            if(var6.scrollY < 0) {
+            if (var6.scrollY < 0) {
                var6.scrollY = 0;
             }
 
-            if(var6.type == 0) {
+            if (var6.type == 0) {
                class39.revalidateWidgetScroll(var0, var6, var4);
             }
          }
       }
 
    }
+
+   static {
+      field1051 = new DemotingHashTable(37748736, 256);
+   }
 }
diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java
index 6f10a54e08..a17c8d87aa 100644
--- a/runescape-client/src/main/java/WorldMapSection0.java
+++ b/runescape-client/src/main/java/WorldMapSection0.java
@@ -11,79 +11,79 @@ public class WorldMapSection0 implements WorldMapSection {
    @ObfuscatedGetter(
       intValue = -1946112139
    )
-   static int __y_sn;
+   static int field1055;
    @ObfuscatedName("p")
-   static int[] __y_p;
+   static int[] field1056;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = -2011838881
    )
-   int __m;
+   int field1057;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 1299225715
    )
-   int __f;
+   int field1058;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 82600709
    )
-   int __q;
+   int field1059;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = -477370575
    )
-   int __w;
+   int field1060;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = -671345527
    )
-   int __o;
+   int field1061;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 529427495
    )
-   int __u;
+   int field1062;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = -150870205
    )
-   int __g;
+   int field1063;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = 1009718107
    )
-   int __l;
+   int field1064;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -1022177315
    )
-   int __e;
+   int field1065;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = -1397517463
    )
-   int __x;
+   int field1066;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = -799353317
    )
-   int __d;
+   int field1067;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = -1388959491
    )
-   int __k;
+   int field1068;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
       intValue = -1657956317
    )
-   int __n;
+   int field1069;
    @ObfuscatedName("i")
    @ObfuscatedGetter(
       intValue = 1345061881
    )
-   int __i;
+   int field1070;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -92,20 +92,20 @@ public class WorldMapSection0 implements WorldMapSection {
    )
    @Export("expandBounds")
    public void expandBounds(WorldMapArea var1) {
-      if(var1.minX0 > this.__o) {
-         var1.minX0 = this.__o;
+      if (var1.minX0 > this.field1061) {
+         var1.minX0 = this.field1061;
       }
 
-      if(var1.maxX0 < this.__o) {
-         var1.maxX0 = this.__o;
+      if (var1.maxX0 < this.field1061) {
+         var1.maxX0 = this.field1061;
       }
 
-      if(var1.minY0 > this.__u) {
-         var1.minY0 = this.__u;
+      if (var1.minY0 > this.field1062) {
+         var1.minY0 = this.field1062;
       }
 
-      if(var1.maxY0 < this.__u) {
-         var1.maxY0 = this.__u;
+      if (var1.maxY0 < this.field1062) {
+         var1.maxY0 = this.field1062;
       }
 
    }
@@ -117,7 +117,7 @@ public class WorldMapSection0 implements WorldMapSection {
    )
    @Export("containsCoord")
    public boolean containsCoord(int var1, int var2, int var3) {
-      return var1 >= this.__m && var1 < this.__m + this.__f?var2 >= (this.__q << 6) + (this.__g << 3) && var2 <= (this.__q << 6) + (this.__e << 3) + 7 && var3 >= (this.__w << 6) + (this.__l << 3) && var3 <= (this.__w << 6) + (this.__x << 3) + 7:false;
+      return var1 >= this.field1057 && var1 < this.field1057 + this.field1058 ? var2 >= (this.field1059 << 6) + (this.field1063 << 3) && var2 <= (this.field1059 << 6) + (this.field1065 << 3) + 7 && var3 >= (this.field1060 << 6) + (this.field1064 << 3) && var3 <= (this.field1060 << 6) + (this.field1066 << 3) + 7 : false;
    }
 
    @ObfuscatedName("q")
@@ -127,7 +127,7 @@ public class WorldMapSection0 implements WorldMapSection {
    )
    @Export("containsPosition")
    public boolean containsPosition(int var1, int var2) {
-      return var1 >= (this.__o << 6) + (this.__d << 3) && var1 <= (this.__o << 6) + (this.__n << 3) + 7 && var2 >= (this.__u << 6) + (this.__k << 3) && var2 <= (this.__u << 6) + (this.__i << 3) + 7;
+      return var1 >= (this.field1061 << 6) + (this.field1067 << 3) && var1 <= (this.field1061 << 6) + (this.field1069 << 3) + 7 && var2 >= (this.field1062 << 6) + (this.field1068 << 3) && var2 <= (this.field1062 << 6) + (this.field1070 << 3) + 7;
    }
 
    @ObfuscatedName("w")
@@ -137,10 +137,10 @@ public class WorldMapSection0 implements WorldMapSection {
    )
    @Export("position")
    public int[] position(int var1, int var2, int var3) {
-      if(!this.containsCoord(var1, var2, var3)) {
+      if (!this.containsCoord(var1, var2, var3)) {
          return null;
       } else {
-         int[] var4 = new int[]{this.__o * 64 - this.__q * 64 + var2 + (this.__d * 8 - this.__g * 8), var3 + (this.__u * 64 - this.__w * 64) + (this.__k * 8 - this.__l * 8)};
+         int[] var4 = new int[]{this.field1061 * 64 - this.field1059 * 64 + var2 + (this.field1067 * 8 - this.field1063 * 8), var3 + (this.field1062 * 64 - this.field1060 * 64) + (this.field1068 * 8 - this.field1064 * 8)};
          return var4;
       }
    }
@@ -152,12 +152,12 @@ public class WorldMapSection0 implements WorldMapSection {
    )
    @Export("coord")
    public TileLocation coord(int var1, int var2) {
-      if(!this.containsPosition(var1, var2)) {
+      if (!this.containsPosition(var1, var2)) {
          return null;
       } else {
-         int var3 = this.__q * 64 - this.__o * 64 + (this.__g * 8 - this.__d * 8) + var1;
-         int var4 = this.__w * 64 - this.__u * 64 + var2 + (this.__l * 8 - this.__k * 8);
-         return new TileLocation(this.__m, var3, var4);
+         int var3 = this.field1059 * 64 - this.field1061 * 64 + (this.field1063 * 8 - this.field1067 * 8) + var1;
+         int var4 = this.field1060 * 64 - this.field1062 * 64 + var2 + (this.field1064 * 8 - this.field1068 * 8);
+         return new TileLocation(this.field1057, var3, var4);
       }
    }
 
@@ -168,21 +168,21 @@ public class WorldMapSection0 implements WorldMapSection {
    )
    @Export("read")
    public void read(Buffer var1) {
-      this.__m = var1.readUnsignedByte();
-      this.__f = var1.readUnsignedByte();
-      this.__q = var1.__ag_302();
-      this.__g = var1.readUnsignedByte();
-      this.__e = var1.readUnsignedByte();
-      this.__w = var1.__ag_302();
-      this.__l = var1.readUnsignedByte();
-      this.__x = var1.readUnsignedByte();
-      this.__o = var1.__ag_302();
-      this.__d = var1.readUnsignedByte();
-      this.__n = var1.readUnsignedByte();
-      this.__u = var1.__ag_302();
-      this.__k = var1.readUnsignedByte();
-      this.__i = var1.readUnsignedByte();
-      this.__g_25();
+      this.field1057 = var1.readUnsignedByte();
+      this.field1058 = var1.readUnsignedByte();
+      this.field1059 = var1.method43();
+      this.field1063 = var1.readUnsignedByte();
+      this.field1065 = var1.readUnsignedByte();
+      this.field1060 = var1.method43();
+      this.field1064 = var1.readUnsignedByte();
+      this.field1066 = var1.readUnsignedByte();
+      this.field1061 = var1.method43();
+      this.field1067 = var1.readUnsignedByte();
+      this.field1069 = var1.readUnsignedByte();
+      this.field1062 = var1.method43();
+      this.field1068 = var1.readUnsignedByte();
+      this.field1070 = var1.readUnsignedByte();
+      this.method423();
    }
 
    @ObfuscatedName("g")
@@ -190,7 +190,7 @@ public class WorldMapSection0 implements WorldMapSection {
       signature = "(I)V",
       garbageValue = "1967186894"
    )
-   void __g_25() {
+   void method423() {
    }
 
    @ObfuscatedName("w")
@@ -207,15 +207,13 @@ public class WorldMapSection0 implements WorldMapSection {
          Buffer var1 = ReflectionCheck.clientPreferences.toBuffer();
          var0.write(var1.array, 0, var1.index);
       } catch (Exception var3) {
-         ;
       }
 
       try {
-         if(var0 != null) {
+         if (var0 != null) {
             var0.closeSync(true);
          }
       } catch (Exception var2) {
-         ;
       }
 
    }
@@ -226,7 +224,7 @@ public class WorldMapSection0 implements WorldMapSection {
       garbageValue = "1886145284"
    )
    static final void method245(int var0) {
-      if(var0 >= 0) {
+      if (var0 >= 0) {
          int var1 = Client.menuArguments1[var0];
          int var2 = Client.menuArguments2[var0];
          int var3 = Client.menuOpcodes[var0];
@@ -235,6 +233,7 @@ public class WorldMapSection0 implements WorldMapSection {
          String var6 = Client.menuTargetNames[var0];
          Actor.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
       }
+
    }
 
    @ObfuscatedName("io")
@@ -243,24 +242,24 @@ public class WorldMapSection0 implements WorldMapSection {
       garbageValue = "-1723792771"
    )
    static final void method246(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-      if(Client.__client_hh) {
-         Client.__client_hd = 32;
+      if (Client.field188) {
+         Client.field189 = 32;
       } else {
-         Client.__client_hd = 0;
+         Client.field189 = 0;
       }
 
-      Client.__client_hh = false;
+      Client.field188 = false;
       int var7;
-      if(MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) {
-         if(var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) {
+      if (MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) {
+         if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) {
             var0.scrollY -= 4;
             class22.method295(var0);
-         } else if(var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) {
+         } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) {
             var0.scrollY += 4;
             class22.method295(var0);
-         } else if(var5 >= var1 - Client.__client_hd && var5 < Client.__client_hd + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) {
+         } else if (var5 >= var1 - Client.field189 && var5 < Client.field189 + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) {
             var7 = var3 * (var3 - 32) / var4;
-            if(var7 < 8) {
+            if (var7 < 8) {
                var7 = 8;
             }
 
@@ -268,13 +267,13 @@ public class WorldMapSection0 implements WorldMapSection {
             int var9 = var3 - 32 - var7;
             var0.scrollY = var8 * (var4 - var3) / var9;
             class22.method295(var0);
-            Client.__client_hh = true;
+            Client.field188 = true;
          }
       }
 
-      if(Client.mouseWheelRotation != 0) {
+      if (Client.mouseWheelRotation != 0) {
          var7 = var0.width;
-         if(var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) {
+         if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) {
             var0.scrollY += Client.mouseWheelRotation * 45;
             class22.method295(var0);
          }
diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java
index 8661c099e2..8c5859f173 100644
--- a/runescape-client/src/main/java/WorldMapSection1.java
+++ b/runescape-client/src/main/java/WorldMapSection1.java
@@ -20,7 +20,7 @@ public class WorldMapSection1 implements WorldMapSection {
    @ObfuscatedGetter(
       intValue = -1516124929
    )
-   static int __as_ey;
+   static int field1071;
    @ObfuscatedName("ha")
    @ObfuscatedGetter(
       intValue = 1052834531
@@ -31,52 +31,52 @@ public class WorldMapSection1 implements WorldMapSection {
    @ObfuscatedGetter(
       intValue = -1971304641
    )
-   int __m;
+   int field1072;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 1483447179
    )
-   int __f;
+   int field1073;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = -1875803617
    )
-   int __q;
+   int field1074;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = 284566685
    )
-   int __w;
+   int field1075;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = -1513010233
    )
-   int __o;
+   int field1076;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = -1383826035
    )
-   int __u;
+   int field1077;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = 1526007343
    )
-   int __g;
+   int field1078;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -890169045
    )
-   int __l;
+   int field1079;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -1797724181
    )
-   int __e;
+   int field1080;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = 325777555
    )
-   int __x;
+   int field1081;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -85,20 +85,20 @@ public class WorldMapSection1 implements WorldMapSection {
    )
    @Export("expandBounds")
    public void expandBounds(WorldMapArea var1) {
-      if(var1.minX0 > this.__o) {
-         var1.minX0 = this.__o;
+      if (var1.minX0 > this.field1076) {
+         var1.minX0 = this.field1076;
       }
 
-      if(var1.maxX0 < this.__o) {
-         var1.maxX0 = this.__o;
+      if (var1.maxX0 < this.field1076) {
+         var1.maxX0 = this.field1076;
       }
 
-      if(var1.minY0 > this.__u) {
-         var1.minY0 = this.__u;
+      if (var1.minY0 > this.field1077) {
+         var1.minY0 = this.field1077;
       }
 
-      if(var1.maxY0 < this.__u) {
-         var1.maxY0 = this.__u;
+      if (var1.maxY0 < this.field1077) {
+         var1.maxY0 = this.field1077;
       }
 
    }
@@ -110,7 +110,7 @@ public class WorldMapSection1 implements WorldMapSection {
    )
    @Export("containsCoord")
    public boolean containsCoord(int var1, int var2, int var3) {
-      return var1 >= this.__m && var1 < this.__m + this.__f?var2 >= (this.__q << 6) + (this.__g << 3) && var2 <= (this.__q << 6) + (this.__g << 3) + 7 && var3 >= (this.__w << 6) + (this.__l << 3) && var3 <= (this.__w << 6) + (this.__l << 3) + 7:false;
+      return var1 >= this.field1072 && var1 < this.field1072 + this.field1073 ? var2 >= (this.field1074 << 6) + (this.field1078 << 3) && var2 <= (this.field1074 << 6) + (this.field1078 << 3) + 7 && var3 >= (this.field1075 << 6) + (this.field1079 << 3) && var3 <= (this.field1075 << 6) + (this.field1079 << 3) + 7 : false;
    }
 
    @ObfuscatedName("q")
@@ -120,7 +120,7 @@ public class WorldMapSection1 implements WorldMapSection {
    )
    @Export("containsPosition")
    public boolean containsPosition(int var1, int var2) {
-      return var1 >= (this.__o << 6) + (this.__e << 3) && var1 <= (this.__o << 6) + (this.__e << 3) + 7 && var2 >= (this.__u << 6) + (this.__x << 3) && var2 <= (this.__u << 6) + (this.__x << 3) + 7;
+      return var1 >= (this.field1076 << 6) + (this.field1080 << 3) && var1 <= (this.field1076 << 6) + (this.field1080 << 3) + 7 && var2 >= (this.field1077 << 6) + (this.field1081 << 3) && var2 <= (this.field1077 << 6) + (this.field1081 << 3) + 7;
    }
 
    @ObfuscatedName("w")
@@ -130,10 +130,10 @@ public class WorldMapSection1 implements WorldMapSection {
    )
    @Export("position")
    public int[] position(int var1, int var2, int var3) {
-      if(!this.containsCoord(var1, var2, var3)) {
+      if (!this.containsCoord(var1, var2, var3)) {
          return null;
       } else {
-         int[] var4 = new int[]{this.__o * 64 - this.__q * 64 + var2 + (this.__e * 8 - this.__g * 8), var3 + (this.__u * 64 - this.__w * 64) + (this.__x * 8 - this.__l * 8)};
+         int[] var4 = new int[]{this.field1076 * 64 - this.field1074 * 64 + var2 + (this.field1080 * 8 - this.field1078 * 8), var3 + (this.field1077 * 64 - this.field1075 * 64) + (this.field1081 * 8 - this.field1079 * 8)};
          return var4;
       }
    }
@@ -145,12 +145,12 @@ public class WorldMapSection1 implements WorldMapSection {
    )
    @Export("coord")
    public TileLocation coord(int var1, int var2) {
-      if(!this.containsPosition(var1, var2)) {
+      if (!this.containsPosition(var1, var2)) {
          return null;
       } else {
-         int var3 = this.__q * 64 - this.__o * 64 + (this.__g * 8 - this.__e * 8) + var1;
-         int var4 = this.__w * 64 - this.__u * 64 + var2 + (this.__l * 8 - this.__x * 8);
-         return new TileLocation(this.__m, var3, var4);
+         int var3 = this.field1074 * 64 - this.field1076 * 64 + (this.field1078 * 8 - this.field1080 * 8) + var1;
+         int var4 = this.field1075 * 64 - this.field1077 * 64 + var2 + (this.field1079 * 8 - this.field1081 * 8);
+         return new TileLocation(this.field1072, var3, var4);
       }
    }
 
@@ -161,17 +161,17 @@ public class WorldMapSection1 implements WorldMapSection {
    )
    @Export("read")
    public void read(Buffer var1) {
-      this.__m = var1.readUnsignedByte();
-      this.__f = var1.readUnsignedByte();
-      this.__q = var1.__ag_302();
-      this.__g = var1.readUnsignedByte();
-      this.__w = var1.__ag_302();
-      this.__l = var1.readUnsignedByte();
-      this.__o = var1.__ag_302();
-      this.__e = var1.readUnsignedByte();
-      this.__u = var1.__ag_302();
-      this.__x = var1.readUnsignedByte();
-      this.__g_84();
+      this.field1072 = var1.readUnsignedByte();
+      this.field1073 = var1.readUnsignedByte();
+      this.field1074 = var1.method43();
+      this.field1078 = var1.readUnsignedByte();
+      this.field1075 = var1.method43();
+      this.field1079 = var1.readUnsignedByte();
+      this.field1076 = var1.method43();
+      this.field1080 = var1.readUnsignedByte();
+      this.field1077 = var1.method43();
+      this.field1081 = var1.readUnsignedByte();
+      this.method424();
    }
 
    @ObfuscatedName("g")
@@ -179,7 +179,7 @@ public class WorldMapSection1 implements WorldMapSection {
       signature = "(I)V",
       garbageValue = "2026323437"
    )
-   void __g_84() {
+   void method424() {
    }
 
    @ObfuscatedName("m")
@@ -190,12 +190,12 @@ public class WorldMapSection1 implements WorldMapSection {
    @Export("getKitDefinition")
    public static KitDefinition getKitDefinition(int var0) {
       KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
          byte[] var2 = KitDefinition.KitDefinition_indexCache.takeRecord(3, var0);
          var1 = new KitDefinition();
-         if(var2 != null) {
+         if (var2 != null) {
             var1.read(new Buffer(var2));
          }
 
@@ -212,20 +212,20 @@ public class WorldMapSection1 implements WorldMapSection {
    static void method808() {
       Client.mouseLastLastPressedTimeMillis = 1L;
       Projectile.mouseRecorder.index = 0;
-      class230.__hy_az = true;
-      Client.__client_cw = true;
-      Client.__client_pp = -1L;
+      class230.field1138 = true;
+      Client.field166 = true;
+      Client.field126 = -1L;
       class68.method1694();
-      Client.packetWriter.__m_165();
+      Client.packetWriter.method239();
       Client.packetWriter.packetBuffer.index = 0;
       Client.packetWriter.serverPacket0 = null;
-      Client.packetWriter.__k = null;
-      Client.packetWriter.__n = null;
-      Client.packetWriter.__i = null;
+      Client.packetWriter.field676 = null;
+      Client.packetWriter.field677 = null;
+      Client.packetWriter.field678 = null;
       Client.packetWriter.serverPacket0Length = 0;
-      Client.packetWriter.__x = 0;
+      Client.packetWriter.field674 = 0;
       Client.rebootTimer = 0;
-      Client.__client_fd = 0;
+      Client.field175 = 0;
       Client.hintArrowType = 0;
       Client.menuOptionsCount = 0;
       Client.isMenuOpen = false;
@@ -238,7 +238,7 @@ public class WorldMapSection1 implements WorldMapSection {
       Client.oculusOrbState = 0;
       ClientParameter.field3645 = null;
       Client.minimapState = 0;
-      Client.__client_ph = -1;
+      Client.field125 = -1;
       Client.destinationX = 0;
       Client.destinationY = 0;
       Client.playerAttackOption = AttackOption.AttackOption_hidden;
@@ -247,16 +247,16 @@ public class WorldMapSection1 implements WorldMapSection {
       Players.Players_count = 0;
 
       int var0;
-      for(var0 = 0; var0 < 2048; ++var0) {
-         Players.__cq_o[var0] = null;
-         Players.__cq_w[var0] = 1;
+      for (var0 = 0; var0 < 2048; ++var0) {
+         Players.field733[var0] = null;
+         Players.field732[var0] = 1;
       }
 
-      for(var0 = 0; var0 < 2048; ++var0) {
+      for (var0 = 0; var0 < 2048; ++var0) {
          Client.players[var0] = null;
       }
 
-      for(var0 = 0; var0 < 32768; ++var0) {
+      for (var0 = 0; var0 < 32768; ++var0) {
          Client.npcs[var0] = null;
       }
 
@@ -264,20 +264,20 @@ public class WorldMapSection1 implements WorldMapSection {
       Client.projectiles.clear();
       Client.graphicsObjects.clear();
 
-      for(var0 = 0; var0 < 4; ++var0) {
-         for(int var1 = 0; var1 < 104; ++var1) {
-            for(int var2 = 0; var2 < 104; ++var2) {
+      for (var0 = 0; var0 < 4; ++var0) {
+         for (int var1 = 0; var1 < 104; ++var1) {
+            for (int var2 = 0; var2 < 104; ++var2) {
                Client.groundItems[var0][var1][var2] = null;
             }
          }
       }
 
-      Client.__client_kh = new NodeDeque();
+      Client.field214 = new NodeDeque();
       WorldMapArea.friendSystem.clear();
 
-      for(var0 = 0; var0 < VarpDefinition.__ix_f; ++var0) {
+      for (var0 = 0; var0 < VarpDefinition.field944; ++var0) {
          VarpDefinition var3 = SecureRandomCallable.method1140(var0);
-         if(var3 != null) {
+         if (var3 != null) {
             Varps.Varps_temp[var0] = 0;
             Varps.Varps_main[var0] = 0;
          }
@@ -285,22 +285,22 @@ public class WorldMapSection1 implements WorldMapSection {
 
       class196.varcs.clearTransient();
       Client.followerIndex = -1;
-      if(Client.rootWidgetGroup != -1) {
+      if (Client.rootWidgetGroup != -1) {
          AbstractByteArrayCopier.unloadWidgetGroup(Client.rootWidgetGroup);
       }
 
-      for(WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.first(); var4 != null; var4 = (WidgetGroupParent)Client.widgetGroupParents.next()) {
+      for (WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.first(); var4 != null; var4 = (WidgetGroupParent)Client.widgetGroupParents.next()) {
          MenuAction.closeWidgetGroup(var4, true);
       }
 
       Client.rootWidgetGroup = -1;
       Client.widgetGroupParents = new NodeHashTable(8);
-      Client.__client_mo = null;
+      Client.field127 = null;
       Client.menuOptionsCount = 0;
       Client.isMenuOpen = false;
-      Client.__client_ru.__m_385((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1);
+      Client.field119.method256((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1);
 
-      for(var0 = 0; var0 < 8; ++var0) {
+      for (var0 = 0; var0 < 8; ++var0) {
          Client.playerMenuActions[var0] = null;
          Client.playerOptionsPriorities[var0] = false;
       }
@@ -308,14 +308,14 @@ public class WorldMapSection1 implements WorldMapSection {
       SpriteMask.method4389();
       Client.isLoading = true;
 
-      for(var0 = 0; var0 < 100; ++var0) {
-         Client.__client_od[var0] = true;
+      for (var0 = 0; var0 < 100; ++var0) {
+         Client.field100[var0] = true;
       }
 
       AbstractByteArrayCopier.method4024();
       PacketWriter.clanChat = null;
 
-      for(var0 = 0; var0 < 8; ++var0) {
+      for (var0 = 0; var0 < 8; ++var0) {
          Client.grandExchangeOffers[var0] = new GrandExchangeOffer();
       }
 
diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java
index ce26f97738..593ff56c98 100644
--- a/runescape-client/src/main/java/WorldMapSection2.java
+++ b/runescape-client/src/main/java/WorldMapSection2.java
@@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("WorldMapSection2")
 public class WorldMapSection2 implements WorldMapSection {
    @ObfuscatedName("l")
-   static int[] __ah_l;
+   static int[] field1082;
    @ObfuscatedName("j")
    @Export("cacheDirectoryLocations")
    public static String[] cacheDirectoryLocations;
@@ -16,32 +16,32 @@ public class WorldMapSection2 implements WorldMapSection {
    @ObfuscatedGetter(
       intValue = -1561552223
    )
-   int __m;
+   int field1083;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = -245382089
    )
-   int __f;
+   int field1084;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = -1024859679
    )
-   int __q;
+   int field1085;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = 40495485
    )
-   int __w;
+   int field1086;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = 982234927
    )
-   int __o;
+   int field1087;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = -1272330125
    )
-   int __u;
+   int field1088;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -50,20 +50,20 @@ public class WorldMapSection2 implements WorldMapSection {
    )
    @Export("expandBounds")
    public void expandBounds(WorldMapArea var1) {
-      if(var1.minX0 > this.__o) {
-         var1.minX0 = this.__o;
+      if (var1.minX0 > this.field1087) {
+         var1.minX0 = this.field1087;
       }
 
-      if(var1.maxX0 < this.__o) {
-         var1.maxX0 = this.__o;
+      if (var1.maxX0 < this.field1087) {
+         var1.maxX0 = this.field1087;
       }
 
-      if(var1.minY0 > this.__u) {
-         var1.minY0 = this.__u;
+      if (var1.minY0 > this.field1088) {
+         var1.minY0 = this.field1088;
       }
 
-      if(var1.maxY0 < this.__u) {
-         var1.maxY0 = this.__u;
+      if (var1.maxY0 < this.field1088) {
+         var1.maxY0 = this.field1088;
       }
 
    }
@@ -75,7 +75,7 @@ public class WorldMapSection2 implements WorldMapSection {
    )
    @Export("containsCoord")
    public boolean containsCoord(int var1, int var2, int var3) {
-      return var1 >= this.__m && var1 < this.__m + this.__f?var2 >> 6 == this.__q && var3 >> 6 == this.__w:false;
+      return var1 >= this.field1083 && var1 < this.field1083 + this.field1084 ? var2 >> 6 == this.field1085 && var3 >> 6 == this.field1086 : false;
    }
 
    @ObfuscatedName("q")
@@ -85,7 +85,7 @@ public class WorldMapSection2 implements WorldMapSection {
    )
    @Export("containsPosition")
    public boolean containsPosition(int var1, int var2) {
-      return var1 >> 6 == this.__o && var2 >> 6 == this.__u;
+      return var1 >> 6 == this.field1087 && var2 >> 6 == this.field1088;
    }
 
    @ObfuscatedName("w")
@@ -95,10 +95,10 @@ public class WorldMapSection2 implements WorldMapSection {
    )
    @Export("position")
    public int[] position(int var1, int var2, int var3) {
-      if(!this.containsCoord(var1, var2, var3)) {
+      if (!this.containsCoord(var1, var2, var3)) {
          return null;
       } else {
-         int[] var4 = new int[]{this.__o * 64 - this.__q * 64 + var2, var3 + (this.__u * 64 - this.__w * 64)};
+         int[] var4 = new int[]{this.field1087 * 64 - this.field1085 * 64 + var2, var3 + (this.field1088 * 64 - this.field1086 * 64)};
          return var4;
       }
    }
@@ -110,12 +110,12 @@ public class WorldMapSection2 implements WorldMapSection {
    )
    @Export("coord")
    public TileLocation coord(int var1, int var2) {
-      if(!this.containsPosition(var1, var2)) {
+      if (!this.containsPosition(var1, var2)) {
          return null;
       } else {
-         int var3 = this.__q * 64 - this.__o * 64 + var1;
-         int var4 = this.__w * 64 - this.__u * 64 + var2;
-         return new TileLocation(this.__m, var3, var4);
+         int var3 = this.field1085 * 64 - this.field1087 * 64 + var1;
+         int var4 = this.field1086 * 64 - this.field1088 * 64 + var2;
+         return new TileLocation(this.field1083, var3, var4);
       }
    }
 
@@ -126,13 +126,13 @@ public class WorldMapSection2 implements WorldMapSection {
    )
    @Export("read")
    public void read(Buffer var1) {
-      this.__m = var1.readUnsignedByte();
-      this.__f = var1.readUnsignedByte();
-      this.__q = var1.__ag_302();
-      this.__w = var1.__ag_302();
-      this.__o = var1.__ag_302();
-      this.__u = var1.__ag_302();
-      this.__g_65();
+      this.field1083 = var1.readUnsignedByte();
+      this.field1084 = var1.readUnsignedByte();
+      this.field1085 = var1.method43();
+      this.field1086 = var1.method43();
+      this.field1087 = var1.method43();
+      this.field1088 = var1.method43();
+      this.method425();
    }
 
    @ObfuscatedName("g")
@@ -140,7 +140,7 @@ public class WorldMapSection2 implements WorldMapSection {
       signature = "(I)V",
       garbageValue = "-1602858772"
    )
-   void __g_65() {
+   void method425() {
    }
 
    @ObfuscatedName("m")
@@ -163,105 +163,104 @@ public class WorldMapSection2 implements WorldMapSection {
       signature = "(IILfe;Lfy;I)Z",
       garbageValue = "-2025028346"
    )
-   static final boolean method593(int srcX, int srcY, RouteStrategy strategy, CollisionMap collisionMap) {
-      int var4 = srcX;
-      int var5 = srcY;
+   static final boolean method593(int var0, int var1, RouteStrategy var2, CollisionMap var3) {
+      int var4 = var0;
+      int var5 = var1;
       byte var6 = 64;
       byte var7 = 64;
-      int graphBaseX = srcX - var6;
-      int graphBaseY = srcY - var7;
+      int var8 = var0 - var6;
+      int var9 = var1 - var7;
       class178.directions[var6][var7] = 99;
       class178.distances[var6][var7] = 0;
       byte var10 = 0;
       int var11 = 0;
-      class178.bufferX[var10] = srcX;
-      byte var10001 = var10;
-      int var18 = var10 + 1;
-      class178.bufferY[var10001] = srcY;
-      int[][] var12 = collisionMap.flags;
+      class178.bufferX[var10] = var0;
+      int var13 = var10 + 1;
+      class178.bufferY[var10] = var1;
+      int[][] var14 = var3.flags;
 
-      while(var18 != var11) {
+      while (var13 != var11) {
          var4 = class178.bufferX[var11];
          var5 = class178.bufferY[var11];
          var11 = var11 + 1 & 4095;
-         int var16 = var4 - graphBaseX;
-         int var17 = var5 - graphBaseY;
-         int var13 = var4 - collisionMap.xInset;
-         int var14 = var5 - collisionMap.yInset;
-         if(strategy.vmethod3644(2, var4, var5, collisionMap)) {
-            WidgetGroupParent.__bx_o = var4;
-            UrlRequester.__eo_u = var5;
+         int var15 = var4 - var8;
+         int var16 = var5 - var9;
+         int var17 = var4 - var3.xInset;
+         int var18 = var5 - var3.yInset;
+         if (var2.vmethod3644(2, var4, var5, var3)) {
+            WidgetGroupParent.field986 = var4;
+            UrlRequester.field929 = var5;
             return true;
          }
 
-         int var15 = class178.distances[var16][var17] + 1;
-         if(var16 > 0 && class178.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) {
-            class178.bufferX[var18] = var4 - 1;
-            class178.bufferY[var18] = var5;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16 - 1][var17] = 2;
-            class178.distances[var16 - 1][var17] = var15;
+         int var19 = class178.distances[var15][var16] + 1;
+         if (var15 > 0 && class178.directions[var15 - 1][var16] == 0 && (var14[var17 - 1][var18] & 19136782) == 0 && (var14[var17 - 1][var18 + 1] & 19136824) == 0) {
+            class178.bufferX[var13] = var4 - 1;
+            class178.bufferY[var13] = var5;
+            var13 = var13 + 1 & 4095;
+            class178.directions[var15 - 1][var16] = 2;
+            class178.distances[var15 - 1][var16] = var19;
          }
 
-         if(var16 < 126 && class178.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) {
-            class178.bufferX[var18] = var4 + 1;
-            class178.bufferY[var18] = var5;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16 + 1][var17] = 8;
-            class178.distances[var16 + 1][var17] = var15;
+         if (var15 < 126 && class178.directions[var15 + 1][var16] == 0 && (var14[var17 + 2][var18] & 19136899) == 0 && (var14[var17 + 2][var18 + 1] & 19136992) == 0) {
+            class178.bufferX[var13] = var4 + 1;
+            class178.bufferY[var13] = var5;
+            var13 = var13 + 1 & 4095;
+            class178.directions[var15 + 1][var16] = 8;
+            class178.distances[var15 + 1][var16] = var19;
          }
 
-         if(var17 > 0 && class178.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) {
-            class178.bufferX[var18] = var4;
-            class178.bufferY[var18] = var5 - 1;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16][var17 - 1] = 1;
-            class178.distances[var16][var17 - 1] = var15;
+         if (var16 > 0 && class178.directions[var15][var16 - 1] == 0 && (var14[var17][var18 - 1] & 19136782) == 0 && (var14[var17 + 1][var18 - 1] & 19136899) == 0) {
+            class178.bufferX[var13] = var4;
+            class178.bufferY[var13] = var5 - 1;
+            var13 = var13 + 1 & 4095;
+            class178.directions[var15][var16 - 1] = 1;
+            class178.distances[var15][var16 - 1] = var19;
          }
 
-         if(var17 < 126 && class178.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) {
-            class178.bufferX[var18] = var4;
-            class178.bufferY[var18] = var5 + 1;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16][var17 + 1] = 4;
-            class178.distances[var16][var17 + 1] = var15;
+         if (var16 < 126 && class178.directions[var15][var16 + 1] == 0 && (var14[var17][var18 + 2] & 19136824) == 0 && (var14[var17 + 1][var18 + 2] & 19136992) == 0) {
+            class178.bufferX[var13] = var4;
+            class178.bufferY[var13] = var5 + 1;
+            var13 = var13 + 1 & 4095;
+            class178.directions[var15][var16 + 1] = 4;
+            class178.distances[var15][var16 + 1] = var19;
          }
 
-         if(var16 > 0 && var17 > 0 && class178.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) {
-            class178.bufferX[var18] = var4 - 1;
-            class178.bufferY[var18] = var5 - 1;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16 - 1][var17 - 1] = 3;
-            class178.distances[var16 - 1][var17 - 1] = var15;
+         if (var15 > 0 && var16 > 0 && class178.directions[var15 - 1][var16 - 1] == 0 && (var14[var17 - 1][var18] & 19136830) == 0 && (var14[var17 - 1][var18 - 1] & 19136782) == 0 && (var14[var17][var18 - 1] & 19136911) == 0) {
+            class178.bufferX[var13] = var4 - 1;
+            class178.bufferY[var13] = var5 - 1;
+            var13 = var13 + 1 & 4095;
+            class178.directions[var15 - 1][var16 - 1] = 3;
+            class178.distances[var15 - 1][var16 - 1] = var19;
          }
 
-         if(var16 < 126 && var17 > 0 && class178.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) {
-            class178.bufferX[var18] = var4 + 1;
-            class178.bufferY[var18] = var5 - 1;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16 + 1][var17 - 1] = 9;
-            class178.distances[var16 + 1][var17 - 1] = var15;
+         if (var15 < 126 && var16 > 0 && class178.directions[var15 + 1][var16 - 1] == 0 && (var14[var17 + 1][var18 - 1] & 19136911) == 0 && (var14[var17 + 2][var18 - 1] & 19136899) == 0 && (var14[var17 + 2][var18] & 19136995) == 0) {
+            class178.bufferX[var13] = var4 + 1;
+            class178.bufferY[var13] = var5 - 1;
+            var13 = var13 + 1 & 4095;
+            class178.directions[var15 + 1][var16 - 1] = 9;
+            class178.distances[var15 + 1][var16 - 1] = var19;
          }
 
-         if(var16 > 0 && var17 < 126 && class178.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) {
-            class178.bufferX[var18] = var4 - 1;
-            class178.bufferY[var18] = var5 + 1;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16 - 1][var17 + 1] = 6;
-            class178.distances[var16 - 1][var17 + 1] = var15;
+         if (var15 > 0 && var16 < 126 && class178.directions[var15 - 1][var16 + 1] == 0 && (var14[var17 - 1][var18 + 1] & 19136830) == 0 && (var14[var17 - 1][var18 + 2] & 19136824) == 0 && (var14[var17][var18 + 2] & 19137016) == 0) {
+            class178.bufferX[var13] = var4 - 1;
+            class178.bufferY[var13] = var5 + 1;
+            var13 = var13 + 1 & 4095;
+            class178.directions[var15 - 1][var16 + 1] = 6;
+            class178.distances[var15 - 1][var16 + 1] = var19;
          }
 
-         if(var16 < 126 && var17 < 126 && class178.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) {
-            class178.bufferX[var18] = var4 + 1;
-            class178.bufferY[var18] = var5 + 1;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16 + 1][var17 + 1] = 12;
-            class178.distances[var16 + 1][var17 + 1] = var15;
+         if (var15 < 126 && var16 < 126 && class178.directions[var15 + 1][var16 + 1] == 0 && (var14[var17 + 1][var18 + 2] & 19137016) == 0 && (var14[var17 + 2][var18 + 2] & 19136992) == 0 && (var14[var17 + 2][var18 + 1] & 19136995) == 0) {
+            class178.bufferX[var13] = var4 + 1;
+            class178.bufferY[var13] = var5 + 1;
+            var13 = var13 + 1 & 4095;
+            class178.directions[var15 + 1][var16 + 1] = 12;
+            class178.distances[var15 + 1][var16 + 1] = var19;
          }
       }
 
-      WidgetGroupParent.__bx_o = var4;
-      UrlRequester.__eo_u = var5;
+      WidgetGroupParent.field986 = var4;
+      UrlRequester.field929 = var5;
       return false;
    }
 
@@ -276,30 +275,30 @@ public class WorldMapSection2 implements WorldMapSection {
       boolean var4 = false;
       Username var5 = new Username(var1, KeyHandler.loginType);
 
-      for(int var6 = 0; var6 < var2; ++var6) {
+      for (int var6 = 0; var6 < var2; ++var6) {
          Player var7 = Client.players[var3[var6]];
-         if(var7 != null && var7 != Canvas.localPlayer && var7.username != null && var7.username.equals(var5)) {
+         if (var7 != null && var7 != Canvas.localPlayer && var7.username != null && var7.username.equals(var5)) {
             PacketBufferNode var8;
-            if(var0 == 1) {
-               var8 = Interpreter.method1915(ClientPacket.__gs_ao, Client.packetWriter.isaacCipher);
+            if (var0 == 1) {
+               var8 = Interpreter.method1915(ClientPacket.field269, Client.packetWriter.isaacCipher);
                var8.packetBuffer.writeShort(var3[var6]);
-               var8.packetBuffer.__ai_315(0);
-               Client.packetWriter.__q_167(var8);
-            } else if(var0 == 4) {
-               var8 = Interpreter.method1915(ClientPacket.__gs_aq, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.__bx_323(var3[var6]);
-               var8.packetBuffer.__ai_315(0);
-               Client.packetWriter.__q_167(var8);
-            } else if(var0 == 6) {
-               var8 = Interpreter.method1915(ClientPacket.__gs_cf, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.__bo_322(var3[var6]);
-               var8.packetBuffer.__ba_316(0);
-               Client.packetWriter.__q_167(var8);
-            } else if(var0 == 7) {
-               var8 = Interpreter.method1915(ClientPacket.__gs_be, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.__ba_316(0);
+               var8.packetBuffer.method56(0);
+               Client.packetWriter.method241(var8);
+            } else if (var0 == 4) {
+               var8 = Interpreter.method1915(ClientPacket.field249, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.method64(var3[var6]);
+               var8.packetBuffer.method56(0);
+               Client.packetWriter.method241(var8);
+            } else if (var0 == 6) {
+               var8 = Interpreter.method1915(ClientPacket.field315, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.method63(var3[var6]);
+               var8.packetBuffer.method57(0);
+               Client.packetWriter.method241(var8);
+            } else if (var0 == 7) {
+               var8 = Interpreter.method1915(ClientPacket.field297, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.method57(0);
                var8.packetBuffer.writeShortLE(var3[var6]);
-               Client.packetWriter.__q_167(var8);
+               Client.packetWriter.method241(var8);
             }
 
             var4 = true;
@@ -307,7 +306,7 @@ public class WorldMapSection2 implements WorldMapSection {
          }
       }
 
-      if(!var4) {
+      if (!var4) {
          WorldMapIcon1.method219(4, "", "Unable to find " + var1);
       }
 
diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java
index 77c5862ad7..674ae00ca1 100644
--- a/runescape-client/src/main/java/WorldMapSection3.java
+++ b/runescape-client/src/main/java/WorldMapSection3.java
@@ -20,57 +20,57 @@ public class WorldMapSection3 implements WorldMapSection {
    @ObfuscatedGetter(
       intValue = -948290091
    )
-   static int __p_go;
+   static int field1089;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 1389733201
    )
-   int __m;
+   int field1090;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = -1622972483
    )
-   int __f;
+   int field1091;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 702057599
    )
-   int __q;
+   int field1092;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = -1068088609
    )
-   int __w;
+   int field1093;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = 1257151629
    )
-   int __o;
+   int field1094;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = -1351623663
    )
-   int __u;
+   int field1095;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = 1016557381
    )
-   int __g;
+   int field1096;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = 884736611
    )
-   int __l;
+   int field1097;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = 395786901
    )
-   int __e;
+   int field1098;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = -627081155
    )
-   int __x;
+   int field1099;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -79,20 +79,20 @@ public class WorldMapSection3 implements WorldMapSection {
    )
    @Export("expandBounds")
    public void expandBounds(WorldMapArea var1) {
-      if(var1.minX0 > this.__g) {
-         var1.minX0 = this.__g;
+      if (var1.minX0 > this.field1096) {
+         var1.minX0 = this.field1096;
       }
 
-      if(var1.maxX0 < this.__e) {
-         var1.maxX0 = this.__e;
+      if (var1.maxX0 < this.field1098) {
+         var1.maxX0 = this.field1098;
       }
 
-      if(var1.minY0 > this.__l) {
-         var1.minY0 = this.__l;
+      if (var1.minY0 > this.field1097) {
+         var1.minY0 = this.field1097;
       }
 
-      if(var1.maxY0 < this.__x) {
-         var1.maxY0 = this.__x;
+      if (var1.maxY0 < this.field1099) {
+         var1.maxY0 = this.field1099;
       }
 
    }
@@ -104,7 +104,7 @@ public class WorldMapSection3 implements WorldMapSection {
    )
    @Export("containsCoord")
    public boolean containsCoord(int var1, int var2, int var3) {
-      return var1 >= this.__m && var1 < this.__m + this.__f?var2 >> 6 >= this.__q && var2 >> 6 <= this.__o && var3 >> 6 >= this.__w && var3 >> 6 <= this.__u:false;
+      return var1 >= this.field1090 && var1 < this.field1090 + this.field1091 ? var2 >> 6 >= this.field1092 && var2 >> 6 <= this.field1094 && var3 >> 6 >= this.field1093 && var3 >> 6 <= this.field1095 : false;
    }
 
    @ObfuscatedName("q")
@@ -114,7 +114,7 @@ public class WorldMapSection3 implements WorldMapSection {
    )
    @Export("containsPosition")
    public boolean containsPosition(int var1, int var2) {
-      return var1 >> 6 >= this.__g && var1 >> 6 <= this.__e && var2 >> 6 >= this.__l && var2 >> 6 <= this.__x;
+      return var1 >> 6 >= this.field1096 && var1 >> 6 <= this.field1098 && var2 >> 6 >= this.field1097 && var2 >> 6 <= this.field1099;
    }
 
    @ObfuscatedName("w")
@@ -124,10 +124,10 @@ public class WorldMapSection3 implements WorldMapSection {
    )
    @Export("position")
    public int[] position(int var1, int var2, int var3) {
-      if(!this.containsCoord(var1, var2, var3)) {
+      if (!this.containsCoord(var1, var2, var3)) {
          return null;
       } else {
-         int[] var4 = new int[]{this.__g * 64 - this.__q * 64 + var2, var3 + (this.__l * 64 - this.__w * 64)};
+         int[] var4 = new int[]{this.field1096 * 64 - this.field1092 * 64 + var2, var3 + (this.field1097 * 64 - this.field1093 * 64)};
          return var4;
       }
    }
@@ -139,12 +139,12 @@ public class WorldMapSection3 implements WorldMapSection {
    )
    @Export("coord")
    public TileLocation coord(int var1, int var2) {
-      if(!this.containsPosition(var1, var2)) {
+      if (!this.containsPosition(var1, var2)) {
          return null;
       } else {
-         int var3 = this.__q * 64 - this.__g * 64 + var1;
-         int var4 = this.__w * 64 - this.__l * 64 + var2;
-         return new TileLocation(this.__m, var3, var4);
+         int var3 = this.field1092 * 64 - this.field1096 * 64 + var1;
+         int var4 = this.field1093 * 64 - this.field1097 * 64 + var2;
+         return new TileLocation(this.field1090, var3, var4);
       }
    }
 
@@ -155,17 +155,17 @@ public class WorldMapSection3 implements WorldMapSection {
    )
    @Export("read")
    public void read(Buffer var1) {
-      this.__m = var1.readUnsignedByte();
-      this.__f = var1.readUnsignedByte();
-      this.__q = var1.__ag_302();
-      this.__w = var1.__ag_302();
-      this.__o = var1.__ag_302();
-      this.__u = var1.__ag_302();
-      this.__g = var1.__ag_302();
-      this.__l = var1.__ag_302();
-      this.__e = var1.__ag_302();
-      this.__x = var1.__ag_302();
-      this.__g_38();
+      this.field1090 = var1.readUnsignedByte();
+      this.field1091 = var1.readUnsignedByte();
+      this.field1092 = var1.method43();
+      this.field1093 = var1.method43();
+      this.field1094 = var1.method43();
+      this.field1095 = var1.method43();
+      this.field1096 = var1.method43();
+      this.field1097 = var1.method43();
+      this.field1098 = var1.method43();
+      this.field1099 = var1.method43();
+      this.method426();
    }
 
    @ObfuscatedName("g")
@@ -173,7 +173,7 @@ public class WorldMapSection3 implements WorldMapSection {
       signature = "(B)V",
       garbageValue = "-126"
    )
-   void __g_38() {
+   void method426() {
    }
 
    @ObfuscatedName("d")
@@ -182,14 +182,14 @@ public class WorldMapSection3 implements WorldMapSection {
       garbageValue = "1115233428"
    )
    static final void method345(Widget var0, int var1) {
-      if(var0.__cf == null) {
+      if (var0.field966 == null) {
          throw new RuntimeException();
       } else {
-         if(var0.__fh == null) {
-            var0.__fh = new int[var0.__cf.length];
+         if (var0.field984 == null) {
+            var0.field984 = new int[var0.field966.length];
          }
 
-         var0.__fh[var1] = Integer.MAX_VALUE;
+         var0.field984[var1] = Integer.MAX_VALUE;
       }
    }
 
@@ -200,22 +200,20 @@ public class WorldMapSection3 implements WorldMapSection {
    )
    @Export("runWidgetOnLoadListener")
    static void runWidgetOnLoadListener(int var0) {
-      if(var0 != -1) {
-         if(GroundItemPile.loadWidgetGroup(var0)) {
-            Widget[] var1 = Widget.widgets[var0];
+      if (var0 != -1 && GroundItemPile.loadWidgetGroup(var0)) {
+         Widget[] var1 = Widget.widgets[var0];
 
-            for(int var2 = 0; var2 < var1.length; ++var2) {
-               Widget var3 = var1[var2];
-               if(var3.onLoad != null) {
-                  ScriptEvent var4 = new ScriptEvent();
-                  var4.widget = var3;
-                  var4.args0 = var3.onLoad;
-                  GrandExchangeEvent.runScript0(var4, 5000000);
-               }
+         for (int var2 = 0; var2 < var1.length; ++var2) {
+            Widget var3 = var1[var2];
+            if (var3.onLoad != null) {
+               ScriptEvent var4 = new ScriptEvent();
+               var4.widget = var3;
+               var4.args0 = var3.onLoad;
+               GrandExchangeEvent.runScript0(var4, 5000000);
             }
-
          }
       }
+
    }
 
    @ObfuscatedName("ic")
@@ -227,38 +225,38 @@ public class WorldMapSection3 implements WorldMapSection {
    static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) {
       int var4 = var0.width;
       int var5 = var0.height;
-      if(var0.widthAlignment == 0) {
+      if (var0.widthAlignment == 0) {
          var0.width = var0.rawWidth;
-      } else if(var0.widthAlignment == 1) {
+      } else if (var0.widthAlignment == 1) {
          var0.width = var1 - var0.rawWidth;
-      } else if(var0.widthAlignment == 2) {
+      } else if (var0.widthAlignment == 2) {
          var0.width = var0.rawWidth * var1 >> 14;
       }
 
-      if(var0.heightAlignment == 0) {
+      if (var0.heightAlignment == 0) {
          var0.height = var0.rawHeight;
-      } else if(var0.heightAlignment == 1) {
+      } else if (var0.heightAlignment == 1) {
          var0.height = var2 - var0.rawHeight;
-      } else if(var0.heightAlignment == 2) {
+      } else if (var0.heightAlignment == 2) {
          var0.height = var2 * var0.rawHeight >> 14;
       }
 
-      if(var0.widthAlignment == 4) {
-         var0.width = var0.height * var0.__aw / var0.__al;
+      if (var0.widthAlignment == 4) {
+         var0.width = var0.height * var0.field958 / var0.field959;
       }
 
-      if(var0.heightAlignment == 4) {
-         var0.height = var0.width * var0.__al / var0.__aw;
+      if (var0.heightAlignment == 4) {
+         var0.height = var0.width * var0.field959 / var0.field958;
       }
 
-      if(var0.contentType == 1337) {
+      if (var0.contentType == 1337) {
          Client.viewportWidget = var0;
       }
 
-      if(var3 && var0.__ee != null && (var4 != var0.width || var5 != var0.height)) {
+      if (var3 && var0.field975 != null && (var4 != var0.width || var5 != var0.height)) {
          ScriptEvent var6 = new ScriptEvent();
          var6.widget = var0;
-         var6.args0 = var0.__ee;
+         var6.args0 = var0.field975;
          Client.scriptEvents.addFirst(var6);
       }
 
diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java
index 25bac17559..9e31cd962e 100644
--- a/runescape-client/src/main/java/WorldMapSectionType.java
+++ b/runescape-client/src/main/java/WorldMapSectionType.java
@@ -12,22 +12,23 @@ public enum WorldMapSectionType implements Enumerated {
    @ObfuscatedSignature(
       signature = "Lh;"
    )
-  __h_m(1, (byte)0),
+   field1100(1, (byte)0),
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lh;"
    )
-   __h_f(0, (byte)1),
+   field1101(0, (byte)1),
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lh;"
    )
-   __h_q(3, (byte)2),
+   field1102(3, (byte)2),
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lh;"
    )
-   __h_w(2, (byte)3);
+   field1103(2, (byte)3);
+
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "Llq;"
@@ -35,7 +36,7 @@ public enum WorldMapSectionType implements Enumerated {
    @Export("logoSprite")
    static IndexedSprite logoSprite;
    @ObfuscatedName("n")
-   static int[] __h_n;
+   static int[] field1104;
    @ObfuscatedName("gc")
    @ObfuscatedSignature(
       signature = "[Llq;"
@@ -52,7 +53,7 @@ public enum WorldMapSectionType implements Enumerated {
    @Export("id")
    final byte id;
 
-   WorldMapSectionType(int var3, byte var4) {
+   private WorldMapSectionType(int var3, byte var4) {
       this.type = var3;
       this.id = var4;
    }
@@ -69,15 +70,15 @@ public enum WorldMapSectionType implements Enumerated {
 
    @ObfuscatedName("m")
    public static String method252(long var0) {
-      class211.__hg_q.setTime(new Date(var0));
-      int var2 = class211.__hg_q.get(7);
-      int var3 = class211.__hg_q.get(5);
-      int var4 = class211.__hg_q.get(2);
-      int var5 = class211.__hg_q.get(1);
-      int var6 = class211.__hg_q.get(11);
-      int var7 = class211.__hg_q.get(12);
-      int var8 = class211.__hg_q.get(13);
-      return class211.__hg_f[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + class211.__hg_m[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT";
+      class211.field1126.setTime(new Date(var0));
+      int var2 = class211.field1126.get(7);
+      int var3 = class211.field1126.get(5);
+      int var4 = class211.field1126.get(2);
+      int var5 = class211.field1126.get(1);
+      int var6 = class211.field1126.get(11);
+      int var7 = class211.field1126.get(12);
+      int var8 = class211.field1126.get(13);
+      return class211.field1125[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + class211.field1124[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT";
    }
 
    @ObfuscatedName("w")
@@ -86,7 +87,7 @@ public enum WorldMapSectionType implements Enumerated {
       garbageValue = "2102950996"
    )
    static void method248(int var0, boolean var1, int var2, boolean var3) {
-      if(ItemContainer.worlds != null) {
+      if (ItemContainer.worlds != null) {
          class3.method42(0, ItemContainer.worlds.length - 1, var0, var1, var2, var3);
       }
 
@@ -98,23 +99,23 @@ public enum WorldMapSectionType implements Enumerated {
       garbageValue = "-1520594673"
    )
    static int method253(int var0, Script var1, boolean var2) {
-      Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
-      if(var0 == 1500) {
+      Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+      if (var0 == 1500) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.x;
          return 1;
-      } else if(var0 == 1501) {
+      } else if (var0 == 1501) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.y;
          return 1;
-      } else if(var0 == 1502) {
+      } else if (var0 == 1502) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.width;
          return 1;
-      } else if(var0 == 1503) {
+      } else if (var0 == 1503) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.height;
          return 1;
-      } else if(var0 == 1504) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden?1:0;
+      } else if (var0 == 1504) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
          return 1;
-      } else if(var0 == 1505) {
+      } else if (var0 == 1505) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.parentId;
          return 1;
       } else {
@@ -128,8 +129,8 @@ public enum WorldMapSectionType implements Enumerated {
       garbageValue = "1187868759"
    )
    static void method254() {
-      if(class60.worldMap0 != null) {
-         class60.worldMap0.__a_525(SoundSystem.plane, (Canvas.localPlayer.x >> 7) + class50.baseX, (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY, false);
+      if (class60.worldMap0 != null) {
+         class60.worldMap0.method366(SoundSystem.plane, (Canvas.localPlayer.x >> 7) + class50.baseX, (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY, false);
          class60.worldMap0.loadCache();
       }
 
diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java
index 7e78c1a9c0..bb5a5df529 100644
--- a/runescape-client/src/main/java/class1.java
+++ b/runescape-client/src/main/java/class1.java
@@ -8,7 +8,7 @@ final class class1 implements class0 {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __f_m;
+   public static AbstractIndexCache field1105;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -25,7 +25,7 @@ final class class1 implements class0 {
       garbageValue = "704451908"
    )
    public Object vmethod46(Buffer var1) {
-      return Integer.valueOf(var1.readInt());
+      return var1.readInt();
    }
 
    @ObfuscatedName("g")
@@ -34,7 +34,7 @@ final class class1 implements class0 {
       garbageValue = "-254123307"
    )
    void method6(Integer var1, Buffer var2) {
-      var2.writeInt(var1.intValue());
+      var2.writeInt(var1);
    }
 
    @ObfuscatedName("q")
@@ -53,15 +53,15 @@ final class class1 implements class0 {
    )
    static int method18(int var0, int var1) {
       ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-      if(var2 == null) {
+      if (var2 == null) {
          return 0;
-      } else if(var1 == -1) {
+      } else if (var1 == -1) {
          return 0;
       } else {
          int var3 = 0;
 
-         for(int var4 = 0; var4 < var2.quantities.length; ++var4) {
-            if(var2.ids[var4] == var1) {
+         for (int var4 = 0; var4 < var2.quantities.length; ++var4) {
+            if (var2.ids[var4] == var1) {
                var3 += var2.quantities[var4];
             }
          }
@@ -78,15 +78,15 @@ final class class1 implements class0 {
    static int method8(int var0, Script var1, boolean var2) {
       int var3 = -1;
       Widget var4;
-      if(var0 >= 2000) {
+      if (var0 >= 2000) {
          var0 -= 1000;
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          var4 = Huffman.getWidget(var3);
       } else {
-         var4 = var2?WorldMapIcon1.__t_i:class12.__n_n;
+         var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
       }
 
-      if(var0 == 1000) {
+      if (var0 == 1000) {
          RouteStrategy.Interpreter_intStackSize -= 4;
          var4.rawX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4.rawY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
@@ -94,12 +94,12 @@ final class class1 implements class0 {
          var4.yAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
          class22.method295(var4);
          TextureProvider.client.alignWidget(var4);
-         if(var3 != -1 && var4.type == 0) {
+         if (var3 != -1 && var4.type == 0) {
             class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false);
          }
 
          return 1;
-      } else if(var0 == 1001) {
+      } else if (var0 == 1001) {
          RouteStrategy.Interpreter_intStackSize -= 4;
          var4.rawWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4.rawHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
@@ -107,23 +107,23 @@ final class class1 implements class0 {
          var4.heightAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
          class22.method295(var4);
          TextureProvider.client.alignWidget(var4);
-         if(var3 != -1 && var4.type == 0) {
+         if (var3 != -1 && var4.type == 0) {
             class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false);
          }
 
          return 1;
-      } else if(var0 == 1003) {
+      } else if (var0 == 1003) {
          boolean var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-         if(var5 != var4.isHidden) {
+         if (var5 != var4.isHidden) {
             var4.isHidden = var5;
             class22.method295(var4);
          }
 
          return 1;
-      } else if(var0 == 1005) {
+      } else if (var0 == 1005) {
          var4.noClickThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
          return 1;
-      } else if(var0 == 1006) {
+      } else if (var0 == 1006) {
          var4.noScrollThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
          return 1;
       } else {
@@ -138,107 +138,107 @@ final class class1 implements class0 {
    )
    static int method16(int var0, Script var1, boolean var2) {
       int var3;
-      if(var0 == 4200) {
+      if (var0 == 4200) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var3).name;
          return 1;
       } else {
          int var4;
          ItemDefinition var5;
-         if(var0 == 4201) {
+         if (var0 == 4201) {
             RouteStrategy.Interpreter_intStackSize -= 2;
             var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
             var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
             var5 = Skills.getItemDefinition(var3);
-            if(var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
+            if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1];
             } else {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
             }
 
             return 1;
-         } else if(var0 == 4202) {
+         } else if (var0 == 4202) {
             RouteStrategy.Interpreter_intStackSize -= 2;
             var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
             var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
             var5 = Skills.getItemDefinition(var3);
-            if(var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) {
+            if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1];
             } else {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
             }
 
             return 1;
-         } else if(var0 == 4203) {
+         } else if (var0 == 4203) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).price;
             return 1;
-         } else if(var0 == 4204) {
+         } else if (var0 == 4204) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isStackable == 1?1:0;
+            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isStackable == 1 ? 1 : 0;
             return 1;
          } else {
             ItemDefinition var6;
-            if(var0 == 4205) {
+            if (var0 == 4205) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                var6 = Skills.getItemDefinition(var3);
-               if(var6.noteTemplate == -1 && var6.note >= 0) {
+               if (var6.noteTemplate == -1 && var6.note >= 0) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.note;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3;
                }
 
                return 1;
-            } else if(var0 == 4206) {
+            } else if (var0 == 4206) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                var6 = Skills.getItemDefinition(var3);
-               if(var6.noteTemplate >= 0 && var6.note >= 0) {
+               if (var6.noteTemplate >= 0 && var6.note >= 0) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.note;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3;
                }
 
                return 1;
-            } else if(var0 == 4207) {
+            } else if (var0 == 4207) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isMembersOnly?1:0;
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isMembersOnly ? 1 : 0;
                return 1;
-            } else if(var0 == 4208) {
+            } else if (var0 == 4208) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                var6 = Skills.getItemDefinition(var3);
-               if(var6.placeholderTemplate == -1 && var6.placeholder >= 0) {
+               if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.placeholder;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3;
                }
 
                return 1;
-            } else if(var0 == 4209) {
+            } else if (var0 == 4209) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                var6 = Skills.getItemDefinition(var3);
-               if(var6.placeholderTemplate >= 0 && var6.placeholder >= 0) {
+               if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.placeholder;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3;
                }
 
                return 1;
-            } else if(var0 == 4210) {
+            } else if (var0 == 4210) {
                String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                class50.method900(var7, var4 == 1);
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection0.__y_sn;
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection0.field1055;
                return 1;
-            } else if(var0 != 4211) {
-               if(var0 == 4212) {
-                  class231.__hb_sg = 0;
+            } else if (var0 != 4211) {
+               if (var0 == 4212) {
+                  class231.field1139 = 0;
                   return 1;
                } else {
                   return 2;
                }
             } else {
-               if(AttackOption.__cj_sp != null && class231.__hb_sg < WorldMapSection0.__y_sn) {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.__cj_sp[++class231.__hb_sg - 1] & '\uffff';
+               if (AttackOption.field30 != null && class231.field1139 < WorldMapSection0.field1055) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.field30[++class231.field1139 - 1] & '\uffff';
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                }
@@ -255,8 +255,8 @@ final class class1 implements class0 {
       garbageValue = "-370289311"
    )
    static boolean method15(int var0) {
-      for(int var1 = 0; var1 < Client.__client_pm; ++var1) {
-         if(Client.__client_pn[var1] == var0) {
+      for (int var1 = 0; var1 < Client.field137; ++var1) {
+         if (Client.field145[var1] == var0) {
             return true;
          }
       }
@@ -272,6 +272,6 @@ final class class1 implements class0 {
    @Export("getWidgetClickMask")
    static int getWidgetClickMask(Widget var0) {
       IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get(((long)var0.id << 32) + (long)var0.childIndex);
-      return var1 != null?var1.integer:var0.clickMask;
+      return var1 != null ? var1.integer : var0.clickMask;
    }
 }
diff --git a/runescape-client/src/main/java/class102.java b/runescape-client/src/main/java/class102.java
index 5099b3aa94..0e13792535 100644
--- a/runescape-client/src/main/java/class102.java
+++ b/runescape-client/src/main/java/class102.java
@@ -1,18 +1,17 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("ca")
 public class class102 {
    @ObfuscatedName("m")
-   static final int[] __ca_m;
+   static final int[] field1106;
    @ObfuscatedName("f")
-   static final float[] __ca_f;
+   static final float[] field1107;
    @ObfuscatedName("x")
-   static int[] __ca_x;
+   static int[] field1108;
    @ObfuscatedName("d")
-   static int[] __ca_d;
+   static int[] field1109;
    @ObfuscatedName("k")
-   static boolean[] __ca_k;
+   static boolean[] field1110;
    @ObfuscatedName("q")
    int[] field1353;
    @ObfuscatedName("w")
@@ -28,14 +27,9 @@ public class class102 {
    @ObfuscatedName("e")
    int[][] field1359;
 
-   static {
-      __ca_m = new int[]{256, 128, 86, 64};
-      __ca_f = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F};
-   }
-
    class102() {
       int var1 = MusicSample.method2352(16);
-      if(var1 != 1) {
+      if (var1 != 1) {
          throw new RuntimeException();
       } else {
          int var2 = MusicSample.method2352(5);
@@ -44,10 +38,10 @@ public class class102 {
 
          int var4;
          int var5;
-         for(var4 = 0; var4 < var2; ++var4) {
+         for (var4 = 0; var4 < var2; ++var4) {
             var5 = MusicSample.method2352(4);
             this.field1357[var4] = var5;
-            if(var5 >= var3) {
+            if (var5 >= var3) {
                var3 = var5 + 1;
             }
          }
@@ -57,20 +51,20 @@ public class class102 {
          this.field1358 = new int[var3];
          this.field1359 = new int[var3][];
 
-         int var7;
-         for(var4 = 0; var4 < var3; ++var4) {
+         int var6;
+         for (var4 = 0; var4 < var3; ++var4) {
             this.field1352[var4] = MusicSample.method2352(3) + 1;
             var5 = this.field1356[var4] = MusicSample.method2352(2);
-            if(var5 != 0) {
+            if (var5 != 0) {
                this.field1358[var4] = MusicSample.method2352(8);
             }
 
             var5 = 1 << var5;
-            int[] var6 = new int[var5];
-            this.field1359[var4] = var6;
+            int[] var7 = new int[var5];
+            this.field1359[var4] = var7;
 
-            for(var7 = 0; var7 < var5; ++var7) {
-               var6[var7] = MusicSample.method2352(8) - 1;
+            for (var6 = 0; var6 < var5; ++var6) {
+               var7[var6] = MusicSample.method2352(8) - 1;
             }
          }
 
@@ -79,7 +73,7 @@ public class class102 {
          var5 = 2;
 
          int var9;
-         for(var9 = 0; var9 < var2; ++var9) {
+         for (var9 = 0; var9 < var2; ++var9) {
             var5 += this.field1352[this.field1357[var9]];
          }
 
@@ -88,18 +82,18 @@ public class class102 {
          this.field1353[1] = 1 << var4;
          var5 = 2;
 
-         for(var9 = 0; var9 < var2; ++var9) {
-            var7 = this.field1357[var9];
+         for (var9 = 0; var9 < var2; ++var9) {
+            var6 = this.field1357[var9];
 
-            for(int var8 = 0; var8 < this.field1352[var7]; ++var8) {
+            for (int var8 = 0; var8 < this.field1352[var6]; ++var8) {
                this.field1353[var5++] = MusicSample.method2352(var4);
             }
          }
 
-         if(__ca_x == null || __ca_x.length < var5) {
-            __ca_x = new int[var5];
-            __ca_d = new int[var5];
-            __ca_k = new boolean[var5];
+         if (field1108 == null || field1108.length < var5) {
+            field1108 = new int[var5];
+            field1109 = new int[var5];
+            field1110 = new boolean[var5];
          }
 
       }
@@ -109,103 +103,104 @@ public class class102 {
    int method2379(int var1, int var2, int var3, int var4, int var5) {
       int var6 = var4 - var2;
       int var7 = var3 - var1;
-      int var8 = var6 < 0?-var6:var6;
+      int var8 = var6 < 0 ? -var6 : var6;
       int var9 = (var5 - var1) * var8;
       int var10 = var9 / var7;
-      return var6 < 0?var2 - var10:var10 + var2;
+      return var6 < 0 ? var2 - var10 : var10 + var2;
    }
 
    @ObfuscatedName("w")
    void method2365(int var1, int var2, int var3, int var4, float[] var5, int var6) {
       int var7 = var4 - var2;
       int var8 = var3 - var1;
-      int var9 = var7 < 0?-var7:var7;
+      int var9 = var7 < 0 ? -var7 : var7;
       int var10 = var7 / var8;
       int var11 = var2;
       int var12 = 0;
-      int var13 = var7 < 0?var10 - 1:var10 + 1;
-      var9 -= (var10 < 0?-var10:var10) * var8;
-      var5[var1] *= __ca_f[var2];
-      if(var3 > var6) {
+      int var13 = var7 < 0 ? var10 - 1 : var10 + 1;
+      var9 -= (var10 < 0 ? -var10 : var10) * var8;
+      var5[var1] *= field1107[var2];
+      if (var3 > var6) {
          var3 = var6;
       }
 
-      for(int var14 = var1 + 1; var14 < var3; ++var14) {
+      for (int var14 = var1 + 1; var14 < var3; ++var14) {
          var12 += var9;
-         if(var12 >= var8) {
+         if (var12 >= var8) {
             var12 -= var8;
             var11 += var13;
          } else {
             var11 += var10;
          }
 
-         var5[var14] *= __ca_f[var11];
+         var5[var14] *= field1107[var11];
       }
 
    }
 
    @ObfuscatedName("o")
    void method2366(int var1, int var2) {
-      if(var1 < var2) {
+      if (var1 < var2) {
          int var3 = var1;
-         int var4 = __ca_x[var1];
-         int var5 = __ca_d[var1];
-         boolean var6 = __ca_k[var1];
+         int var4 = field1108[var1];
+         int var5 = field1109[var1];
+         boolean var6 = field1110[var1];
 
-         for(int var7 = var1 + 1; var7 <= var2; ++var7) {
-            int var8 = __ca_x[var7];
-            if(var8 < var4) {
-               __ca_x[var3] = var8;
-               __ca_d[var3] = __ca_d[var7];
-               __ca_k[var3] = __ca_k[var7];
+         for (int var7 = var1 + 1; var7 <= var2; ++var7) {
+            int var8 = field1108[var7];
+            if (var8 < var4) {
+               field1108[var3] = var8;
+               field1109[var3] = field1109[var7];
+               field1110[var3] = field1110[var7];
                ++var3;
-               __ca_x[var7] = __ca_x[var3];
-               __ca_d[var7] = __ca_d[var3];
-               __ca_k[var7] = __ca_k[var3];
+               field1108[var7] = field1108[var3];
+               field1109[var7] = field1109[var3];
+               field1110[var7] = field1110[var3];
             }
          }
 
-         __ca_x[var3] = var4;
-         __ca_d[var3] = var5;
-         __ca_k[var3] = var6;
+         field1108[var3] = var4;
+         field1109[var3] = var5;
+         field1110[var3] = var6;
          this.method2366(var1, var3 - 1);
          this.method2366(var3 + 1, var2);
       }
+
    }
 
    @ObfuscatedName("u")
    boolean method2367() {
       boolean var1 = MusicSample.method2338() != 0;
-      if(!var1) {
+      if (!var1) {
          return false;
       } else {
          int var2 = this.field1353.length;
 
          int var3;
-         for(var3 = 0; var3 < var2; ++var3) {
-            __ca_x[var3] = this.field1353[var3];
+         for (var3 = 0; var3 < var2; ++var3) {
+            field1108[var3] = this.field1353[var3];
          }
 
-         var3 = __ca_m[this.field1360 - 1];
+         var3 = field1106[this.field1360 - 1];
          int var4 = WorldMapCacheName.method634(var3 - 1);
-         __ca_d[0] = MusicSample.method2352(var4);
-         __ca_d[1] = MusicSample.method2352(var4);
+         field1109[0] = MusicSample.method2352(var4);
+         field1109[1] = MusicSample.method2352(var4);
          int var5 = 2;
 
-         for(int var6 = 0; var6 < this.field1357.length; ++var6) {
+         for (int var6 = 0; var6 < this.field1357.length; ++var6) {
             int var7 = this.field1357[var6];
             int var8 = this.field1352[var7];
             int var9 = this.field1356[var7];
             int var10 = (1 << var9) - 1;
             int var11 = 0;
-            if(var9 > 0) {
+            if (var9 > 0) {
                var11 = MusicSample.field1323[this.field1358[var7]].method2306();
             }
 
-            for(int var12 = 0; var12 < var8; ++var12) {
+            for (int var12 = 0; var12 < var8; ++var12) {
                int var13 = this.field1359[var7][var11 & var10];
                var11 >>>= var9;
-               __ca_d[var5++] = var13 >= 0?MusicSample.field1323[var13].method2306():0;
+               field1109[var5++] = var13 >= 0 ? MusicSample.field1323[var13].method2306() : 0;
             }
          }
 
@@ -216,9 +211,9 @@ public class class102 {
    @ObfuscatedName("g")
    void method2375(float[] var1, int var2) {
       int var3 = this.field1353.length;
-      int var4 = __ca_m[this.field1360 - 1];
-      boolean[] var5 = __ca_k;
-      __ca_k[1] = true;
+      int var4 = field1106[this.field1360 - 1];
+      boolean[] var5 = field1110;
+      field1110[1] = true;
       var5[0] = true;
 
       int var6;
@@ -226,39 +221,39 @@ public class class102 {
       int var8;
       int var9;
       int var10;
-      for(var6 = 2; var6 < var3; ++var6) {
-         var7 = method2369(__ca_x, var6);
-         var8 = method2363(__ca_x, var6);
-         var9 = this.method2379(__ca_x[var7], __ca_d[var7], __ca_x[var8], __ca_d[var8], __ca_x[var6]);
-         var10 = __ca_d[var6];
+      for (var6 = 2; var6 < var3; ++var6) {
+         var7 = method2369(field1108, var6);
+         var8 = method2363(field1108, var6);
+         var9 = this.method2379(field1108[var7], field1109[var7], field1108[var8], field1109[var8], field1108[var6]);
+         var10 = field1109[var6];
          int var11 = var4 - var9;
-         int var13 = (var11 < var9?var11:var9) << 1;
-         if(var10 != 0) {
-            boolean[] var14 = __ca_k;
-            __ca_k[var8] = true;
-            var14[var7] = true;
-            __ca_k[var6] = true;
-            if(var10 >= var13) {
-               __ca_d[var6] = var11 > var9?var9 + (var10 - var9):var11 + (var9 - var10) - 1;
+         int var12 = (var11 < var9 ? var11 : var9) << 1;
+         if (var10 != 0) {
+            boolean[] var13 = field1110;
+            field1110[var8] = true;
+            var13[var7] = true;
+            field1110[var6] = true;
+            if (var10 >= var12) {
+               field1109[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1;
             } else {
-               __ca_d[var6] = (var10 & 1) != 0?var9 - (var10 + 1) / 2:var10 / 2 + var9;
+               field1109[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9;
             }
          } else {
-            __ca_k[var6] = false;
-            __ca_d[var6] = var9;
+            field1110[var6] = false;
+            field1109[var6] = var9;
          }
       }
 
       this.method2366(0, var3 - 1);
       var6 = 0;
-      var7 = __ca_d[0] * this.field1360;
+      var7 = field1109[0] * this.field1360;
 
-      for(var8 = 1; var8 < var3; ++var8) {
-         if(__ca_k[var8]) {
-            var9 = __ca_x[var8];
-            var10 = __ca_d[var8] * this.field1360;
+      for (var8 = 1; var8 < var3; ++var8) {
+         if (field1110[var8]) {
+            var9 = field1108[var8];
+            var10 = field1109[var8] * this.field1360;
             this.method2365(var6, var7, var9, var10, var1, var2);
-            if(var9 >= var2) {
+            if (var9 >= var2) {
                return;
             }
 
@@ -267,10 +262,10 @@ public class class102 {
          }
       }
 
-      float var16 = __ca_f[var7];
+      float var14 = field1107[var7];
 
-      for(var9 = var6; var9 < var2; ++var9) {
-         var1[var9] *= var16;
+      for (var9 = var6; var9 < var2; ++var9) {
+         var1[var9] *= var14;
       }
 
    }
@@ -281,9 +276,9 @@ public class class102 {
       int var3 = -1;
       int var4 = Integer.MIN_VALUE;
 
-      for(int var5 = 0; var5 < var1; ++var5) {
+      for (int var5 = 0; var5 < var1; ++var5) {
          int var6 = var0[var5];
-         if(var6 < var2 && var6 > var4) {
+         if (var6 < var2 && var6 > var4) {
             var3 = var5;
             var4 = var6;
          }
@@ -298,9 +293,9 @@ public class class102 {
       int var3 = -1;
       int var4 = Integer.MAX_VALUE;
 
-      for(int var5 = 0; var5 < var1; ++var5) {
+      for (int var5 = 0; var5 < var1; ++var5) {
          int var6 = var0[var5];
-         if(var6 > var2 && var6 < var4) {
+         if (var6 > var2 && var6 < var4) {
             var3 = var5;
             var4 = var6;
          }
@@ -308,4 +303,9 @@ public class class102 {
 
       return var3;
    }
+
+   static {
+      field1106 = new int[]{256, 128, 86, 64};
+      field1107 = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F};
+   }
 }
diff --git a/runescape-client/src/main/java/class109.java b/runescape-client/src/main/java/class109.java
index aa4195a34b..8e91a37d29 100644
--- a/runescape-client/src/main/java/class109.java
+++ b/runescape-client/src/main/java/class109.java
@@ -27,11 +27,11 @@ public class class109 {
       int[] var1 = new int[this.field1405];
 
       int var2;
-      for(var2 = 0; var2 < this.field1405; ++var2) {
+      for (var2 = 0; var2 < this.field1405; ++var2) {
          int var3 = 0;
          int var4 = MusicSample.method2352(3);
          boolean var5 = MusicSample.method2338() != 0;
-         if(var5) {
+         if (var5) {
             var3 = MusicSample.method2352(5);
          }
 
@@ -40,8 +40,8 @@ public class class109 {
 
       this.field1410 = new int[this.field1405 * 8];
 
-      for(var2 = 0; var2 < this.field1405 * 8; ++var2) {
-         this.field1410[var2] = (var1[var2 >> 3] & 1 << (var2 & 7)) != 0?MusicSample.method2352(8):-1;
+      for (var2 = 0; var2 < this.field1405 * 8; ++var2) {
+         this.field1410[var2] = (var1[var2 >> 3] & 1 << (var2 & 7)) != 0 ? MusicSample.method2352(8) : -1;
       }
 
    }
@@ -49,27 +49,27 @@ public class class109 {
    @ObfuscatedName("m")
    void method2473(float[] var1, int var2, boolean var3) {
       int var4;
-      for(var4 = 0; var4 < var2; ++var4) {
+      for (var4 = 0; var4 < var2; ++var4) {
          var1[var4] = 0.0F;
       }
 
-      if(!var3) {
+      if (!var3) {
          var4 = MusicSample.field1323[this.field1411].field1306;
          int var5 = this.field1407 - this.field1406;
          int var6 = var5 / this.field1408;
          int[] var7 = new int[var6];
 
-         for(int var8 = 0; var8 < 8; ++var8) {
+         for (int var8 = 0; var8 < 8; ++var8) {
             int var9 = 0;
 
-            while(var9 < var6) {
+            while (var9 < var6) {
                int var10;
                int var11;
-               if(var8 == 0) {
+               if (var8 == 0) {
                   var10 = MusicSample.field1323[this.field1411].method2306();
 
-                  for(var11 = var4 - 1; var11 >= 0; --var11) {
-                     if(var9 + var11 < var6) {
+                  for (var11 = var4 - 1; var11 >= 0; --var11) {
+                     if (var9 + var11 < var6) {
                         var7[var9 + var11] = var10 % this.field1405;
                      }
 
@@ -77,31 +77,31 @@ public class class109 {
                   }
                }
 
-               for(var10 = 0; var10 < var4; ++var10) {
+               for (var10 = 0; var10 < var4; ++var10) {
                   var11 = var7[var9];
                   int var12 = this.field1410[var8 + var11 * 8];
-                  if(var12 >= 0) {
+                  if (var12 >= 0) {
                      int var13 = var9 * this.field1408 + this.field1406;
                      class98 var14 = MusicSample.field1323[var12];
                      int var15;
-                     if(this.field1409 == 0) {
+                     if (this.field1409 == 0) {
                         var15 = this.field1408 / var14.field1306;
 
-                        for(int var16 = 0; var16 < var15; ++var16) {
-                           float[] var17 = var14.method2307();
+                        for (int var19 = 0; var19 < var15; ++var19) {
+                           float[] var20 = var14.method2307();
 
-                           for(int var18 = 0; var18 < var14.field1306; ++var18) {
-                              var1[var13 + var16 + var18 * var15] += var17[var18];
+                           for (int var18 = 0; var18 < var14.field1306; ++var18) {
+                              var1[var13 + var19 + var18 * var15] += var20[var18];
                            }
                         }
                      } else {
                         var15 = 0;
 
-                        while(var15 < this.field1408) {
-                           float[] var19 = var14.method2307();
+                        while (var15 < this.field1408) {
+                           float[] var16 = var14.method2307();
 
-                           for(int var20 = 0; var20 < var14.field1306; ++var20) {
-                              var1[var13 + var15] += var19[var20];
+                           for (int var17 = 0; var17 < var14.field1306; ++var17) {
+                              var1[var13 + var15] += var16[var17];
                               ++var15;
                            }
                         }
@@ -109,13 +109,13 @@ public class class109 {
                   }
 
                   ++var9;
-                  if(var9 >= var6) {
+                  if (var9 >= var6) {
                      break;
                   }
                }
             }
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java
index 48df6ff7e3..f6646377ed 100644
--- a/runescape-client/src/main/java/class11.java
+++ b/runescape-client/src/main/java/class11.java
@@ -19,7 +19,7 @@ final class class11 implements Comparator {
       garbageValue = "1"
    )
    int method138(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-      return var1.__m_3().compareTo(var2.__m_3());
+      return var1.method119().compareTo(var2.method119());
    }
 
    public boolean equals(Object var1) {
@@ -50,17 +50,17 @@ final class class11 implements Comparator {
       var2.pathY[0] = var6 - GraphicsObject.baseY;
       var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6);
       SoundSystem.plane = var2.plane = var4;
-      if(Players.__cq_o[var1] != null) {
-         var2.read(Players.__cq_o[var1]);
+      if (Players.field733[var1] != null) {
+         var2.read(Players.field733[var1]);
       }
 
       Players.Players_count = 0;
       Players.Players_indices[++Players.Players_count - 1] = var1;
-      Players.__cq_q[var1] = 0;
-      Players.__cq_l = 0;
+      Players.field731[var1] = 0;
+      Players.field734 = 0;
 
-      for(int var7 = 1; var7 < 2048; ++var7) {
-         if(var1 != var7) {
+      for (int var7 = 1; var7 < 2048; ++var7) {
+         if (var1 != var7) {
             int var8 = var0.readBits(18);
             int var9 = var8 >> 16;
             int var10 = var8 >> 8 & 597;
@@ -68,8 +68,8 @@ final class class11 implements Comparator {
             Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28);
             Players.Players_orientations[var7] = 0;
             Players.Players_targetIndices[var7] = -1;
-            Players.__cq_e[++Players.__cq_l - 1] = var7;
-            Players.__cq_q[var7] = 0;
+            Players.field735[++Players.field734 - 1] = var7;
+            Players.field731[var7] = 0;
          }
       }
 
@@ -83,20 +83,19 @@ final class class11 implements Comparator {
    )
    static int method141(int var0, Script var1, boolean var2) {
       Widget var3;
-      if(var0 >= 2000) {
+      if (var0 >= 2000) {
          var0 -= 1000;
          var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
       } else {
-         var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
+         var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
       }
 
       String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
       int[] var5 = null;
-      if(var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') {
+      if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') {
          int var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         if(var6 > 0) {
-            for(var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]) {
-               ;
+         if (var6 > 0) {
+            for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]) {
             }
          }
 
@@ -106,8 +105,8 @@ final class class11 implements Comparator {
       Object[] var8 = new Object[var4.length() + 1];
 
       int var7;
-      for(var7 = var8.length - 1; var7 >= 1; --var7) {
-         if(var4.charAt(var7 - 1) == 's') {
+      for (var7 = var8.length - 1; var7 >= 1; --var7) {
+         if (var4.charAt(var7 - 1) == 's') {
             var8[var7] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
          } else {
             var8[var7] = new Integer(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
@@ -115,73 +114,73 @@ final class class11 implements Comparator {
       }
 
       var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-      if(var7 != -1) {
+      if (var7 != -1) {
          var8[0] = new Integer(var7);
       } else {
          var8 = null;
       }
 
-      if(var0 == 1400) {
+      if (var0 == 1400) {
          var3.onClick = var8;
-      } else if(var0 == 1401) {
+      } else if (var0 == 1401) {
          var3.onHold = var8;
-      } else if(var0 == 1402) {
+      } else if (var0 == 1402) {
          var3.onRelease = var8;
-      } else if(var0 == 1403) {
+      } else if (var0 == 1403) {
          var3.onMouseOver = var8;
-      } else if(var0 == 1404) {
+      } else if (var0 == 1404) {
          var3.onMouseLeave = var8;
-      } else if(var0 == 1405) {
+      } else if (var0 == 1405) {
          var3.onDrag = var8;
-      } else if(var0 == 1406) {
+      } else if (var0 == 1406) {
          var3.onTargetLeave = var8;
-      } else if(var0 == 1407) {
+      } else if (var0 == 1407) {
          var3.onVarTransmit = var8;
          var3.varTransmitTriggers = var5;
-      } else if(var0 == 1408) {
+      } else if (var0 == 1408) {
          var3.onTimer = var8;
-      } else if(var0 == 1409) {
+      } else if (var0 == 1409) {
          var3.onOp = var8;
-      } else if(var0 == 1410) {
+      } else if (var0 == 1410) {
          var3.onDragComplete = var8;
-      } else if(var0 == 1411) {
+      } else if (var0 == 1411) {
          var3.onClickRepeat = var8;
-      } else if(var0 == 1412) {
+      } else if (var0 == 1412) {
          var3.onMouseRepeat = var8;
-      } else if(var0 == 1414) {
+      } else if (var0 == 1414) {
          var3.onInvTransmit = var8;
          var3.invTransmitTriggers = var5;
-      } else if(var0 == 1415) {
+      } else if (var0 == 1415) {
          var3.onStatTransmit = var8;
          var3.statTransmitTriggers = var5;
-      } else if(var0 == 1416) {
+      } else if (var0 == 1416) {
          var3.onTargetEnter = var8;
-      } else if(var0 == 1417) {
+      } else if (var0 == 1417) {
          var3.onScroll = var8;
-      } else if(var0 == 1418) {
-         var3.__em = var8;
-      } else if(var0 == 1419) {
+      } else if (var0 == 1418) {
+         var3.field970 = var8;
+      } else if (var0 == 1419) {
          var3.onKeyListener = var8;
-      } else if(var0 == 1420) {
-         var3.__ex = var8;
-      } else if(var0 == 1421) {
-         var3.__ej = var8;
-      } else if(var0 == 1422) {
-         var3.__el = var8;
-      } else if(var0 == 1423) {
+      } else if (var0 == 1420) {
+         var3.field971 = var8;
+      } else if (var0 == 1421) {
+         var3.field972 = var8;
+      } else if (var0 == 1422) {
+         var3.field973 = var8;
+      } else if (var0 == 1423) {
          var3.onDialogAbortListener = var8;
-      } else if(var0 == 1424) {
-         var3.__ei = var8;
-      } else if(var0 == 1425) {
-         var3.__eq = var8;
-      } else if(var0 == 1426) {
-         var3.__eh = var8;
+      } else if (var0 == 1424) {
+         var3.field974 = var8;
+      } else if (var0 == 1425) {
+         var3.field976 = var8;
+      } else if (var0 == 1426) {
+         var3.field977 = var8;
       } else {
-         if(var0 != 1427) {
+         if (var0 != 1427) {
             return 2;
          }
 
-         var3.__ee = var8;
+         var3.field975 = var8;
       }
 
       var3.hasListener = true;
@@ -195,30 +194,30 @@ final class class11 implements Comparator {
    )
    static int method146(int var0, Script var1, boolean var2) {
       Widget var3;
-      if(var0 == 2700) {
+      if (var0 == 2700) {
          var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemId;
          return 1;
-      } else if(var0 == 2701) {
+      } else if (var0 == 2701) {
          var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-         if(var3.itemId != -1) {
+         if (var3.itemId != -1) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemQuantity;
          } else {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
          }
 
          return 1;
-      } else if(var0 == 2702) {
-         int var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var5);
-         if(var4 != null) {
+      } else if (var0 == 2702) {
+         int var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         WidgetGroupParent var5 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var4);
+         if (var5 != null) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
          } else {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
          }
 
          return 1;
-      } else if(var0 == 2706) {
+      } else if (var0 == 2706) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rootWidgetGroup;
          return 1;
       } else {
@@ -235,15 +234,15 @@ final class class11 implements Comparator {
       UserComparator6.clock.mark();
 
       int var0;
-      for(var0 = 0; var0 < 32; ++var0) {
-         GameShell.__ba_a[var0] = 0L;
+      for (var0 = 0; var0 < 32; ++var0) {
+         GameShell.field365[var0] = 0L;
       }
 
-      for(var0 = 0; var0 < 32; ++var0) {
-         GameShell.__ba_j[var0] = 0L;
+      for (var0 = 0; var0 < 32; ++var0) {
+         GameShell.field366[var0] = 0L;
       }
 
-      GameShell.__ba_l = 0;
+      GameShell.field362 = 0;
    }
 
    @ObfuscatedName("ih")
@@ -254,21 +253,21 @@ final class class11 implements Comparator {
    static final void method148(int var0, int var1, int var2, int var3, int var4) {
       class32.scrollBarSprites[0].drawAt(var0, var1);
       class32.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16);
-      Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.__client_hx);
+      Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field184);
       int var5 = var3 * (var3 - 32) / var4;
-      if(var5 < 8) {
+      if (var5 < 8) {
          var5 = 8;
       }
 
       int var6 = (var3 - 32 - var5) * var2 / (var4 - var3);
-      Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.__client_hn);
-      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.__client_hg);
-      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.__client_hg);
-      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.__client_hg);
-      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.__client_hg);
-      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.__client_hr);
-      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.__client_hr);
-      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.__client_hr);
-      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.__client_hr);
+      Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field185);
+      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field187);
+      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field187);
+      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field187);
+      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field187);
+      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field186);
+      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field186);
+      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field186);
+      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field186);
    }
 }
diff --git a/runescape-client/src/main/java/class114.java b/runescape-client/src/main/java/class114.java
index 8339fc27b5..b45e205c8a 100644
--- a/runescape-client/src/main/java/class114.java
+++ b/runescape-client/src/main/java/class114.java
@@ -13,20 +13,20 @@ public class class114 {
 
    class114() {
       MusicSample.method2352(16);
-      this.field1453 = MusicSample.method2338() != 0?MusicSample.method2352(4) + 1:1;
-      if(MusicSample.method2338() != 0) {
+      this.field1453 = MusicSample.method2338() != 0 ? MusicSample.method2352(4) + 1 : 1;
+      if (MusicSample.method2338() != 0) {
          MusicSample.method2352(8);
       }
 
       MusicSample.method2352(2);
-      if(this.field1453 > 1) {
+      if (this.field1453 > 1) {
          this.field1454 = MusicSample.method2352(4);
       }
 
       this.field1452 = new int[this.field1453];
       this.field1455 = new int[this.field1453];
 
-      for(int var1 = 0; var1 < this.field1453; ++var1) {
+      for (int var1 = 0; var1 < this.field1453; ++var1) {
          MusicSample.method2352(8);
          this.field1452[var1] = MusicSample.method2352(8);
          this.field1455[var1] = MusicSample.method2352(8);
diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java
index f3808368eb..e39aafbbb2 100644
--- a/runescape-client/src/main/java/class12.java
+++ b/runescape-client/src/main/java/class12.java
@@ -1,5 +1,4 @@
 import java.util.Comparator;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
@@ -9,7 +8,7 @@ final class class12 implements Comparator {
    @ObfuscatedSignature(
       signature = "Lho;"
    )
-   static Widget __n_n;
+   static Widget field1111;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -17,7 +16,7 @@ final class class12 implements Comparator {
       garbageValue = "-86"
    )
    int method149(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-      return var1.__f < var2.__f?-1:(var1.__f == var2.__f?0:1);
+      return var1.field370 < var2.field370 ? -1 : (var1.field370 == var2.field370 ? 0 : 1);
    }
 
    public boolean equals(Object var1) {
@@ -43,69 +42,69 @@ final class class12 implements Comparator {
       garbageValue = "1632289577"
    )
    static char method155(char var0, int var1) {
-      if(var0 >= 192 && var0 <= 255) {
-         if(var0 >= 192 && var0 <= 198) {
+      if (var0 >= 192 && var0 <= 255) {
+         if (var0 >= 192 && var0 <= 198) {
             return 'A';
          }
 
-         if(var0 == 199) {
+         if (var0 == 199) {
             return 'C';
          }
 
-         if(var0 >= 200 && var0 <= 203) {
+         if (var0 >= 200 && var0 <= 203) {
             return 'E';
          }
 
-         if(var0 >= 204 && var0 <= 207) {
+         if (var0 >= 204 && var0 <= 207) {
             return 'I';
          }
 
-         if(var0 >= 210 && var0 <= 214) {
+         if (var0 >= 210 && var0 <= 214) {
             return 'O';
          }
 
-         if(var0 >= 217 && var0 <= 220) {
+         if (var0 >= 217 && var0 <= 220) {
             return 'U';
          }
 
-         if(var0 == 221) {
+         if (var0 == 221) {
             return 'Y';
          }
 
-         if(var0 == 223) {
+         if (var0 == 223) {
             return 's';
          }
 
-         if(var0 >= 224 && var0 <= 230) {
+         if (var0 >= 224 && var0 <= 230) {
             return 'a';
          }
 
-         if(var0 == 231) {
+         if (var0 == 231) {
             return 'c';
          }
 
-         if(var0 >= 232 && var0 <= 235) {
+         if (var0 >= 232 && var0 <= 235) {
             return 'e';
          }
 
-         if(var0 >= 236 && var0 <= 239) {
+         if (var0 >= 236 && var0 <= 239) {
             return 'i';
          }
 
-         if(var0 >= 242 && var0 <= 246) {
+         if (var0 >= 242 && var0 <= 246) {
             return 'o';
          }
 
-         if(var0 >= 249 && var0 <= 252) {
+         if (var0 >= 249 && var0 <= 252) {
             return 'u';
          }
 
-         if(var0 == 253 || var0 == 255) {
+         if (var0 == 253 || var0 == 255) {
             return 'y';
          }
       }
 
-      return var0 == 338?'O':(var0 == 339?'o':(var0 == 376?'Y':var0));
+      return var0 == 338 ? 'O' : (var0 == 339 ? 'o' : (var0 == 376 ? 'Y' : var0));
    }
 
    @ObfuscatedName("e")
@@ -115,7 +114,7 @@ final class class12 implements Comparator {
    )
    static int method161(int var0) {
       Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
-      return var1 == null?-1:(var1.previousDual == Messages.Messages_queue.sentinel?-1:((Message)var1.previousDual).count);
+      return var1 == null ? -1 : (var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count);
    }
 
    @ObfuscatedName("ja")
@@ -124,24 +123,24 @@ final class class12 implements Comparator {
       garbageValue = "1731524026"
    )
    static void method159() {
-      for(WidgetGroupParent var0 = (WidgetGroupParent)Client.widgetGroupParents.first(); var0 != null; var0 = (WidgetGroupParent)Client.widgetGroupParents.next()) {
+      for (WidgetGroupParent var0 = (WidgetGroupParent)Client.widgetGroupParents.first(); var0 != null; var0 = (WidgetGroupParent)Client.widgetGroupParents.next()) {
          int var1 = var0.group;
-         if(GroundItemPile.loadWidgetGroup(var1)) {
+         if (GroundItemPile.loadWidgetGroup(var1)) {
             boolean var2 = true;
             Widget[] var3 = Widget.widgets[var1];
 
             int var4;
-            for(var4 = 0; var4 < var3.length; ++var4) {
-               if(var3[var4] != null) {
+            for (var4 = 0; var4 < var3.length; ++var4) {
+               if (var3[var4] != null) {
                   var2 = var3[var4].isIf3;
                   break;
                }
             }
 
-            if(!var2) {
+            if (!var2) {
                var4 = (int)var0.key;
                Widget var5 = Huffman.getWidget(var4);
-               if(var5 != null) {
+               if (var5 != null) {
                   class22.method295(var5);
                }
             }
@@ -156,8 +155,8 @@ final class class12 implements Comparator {
       garbageValue = "-7"
    )
    static final void method158() {
-      PacketBufferNode var0 = Interpreter.method1915(ClientPacket.__gs_cr, Client.packetWriter.isaacCipher);
+      PacketBufferNode var0 = Interpreter.method1915(ClientPacket.field300, Client.packetWriter.isaacCipher);
       var0.packetBuffer.writeByte(0);
-      Client.packetWriter.__q_167(var0);
+      Client.packetWriter.method241(var0);
    }
 }
diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java
index bd6ef3a987..b4652f2105 100644
--- a/runescape-client/src/main/java/class13.java
+++ b/runescape-client/src/main/java/class13.java
@@ -6,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("i")
 public class class13 {
    @ObfuscatedName("x")
-   static int[] __i_x;
+   static int[] field1112;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "Lhe;"
@@ -26,7 +26,7 @@ public class class13 {
       garbageValue = "862375604"
    )
    static Sprite method164(int var0, int var1, int var2) {
-      return (Sprite)WorldMapRegion.__av_o.get(MouseHandler.method1083(var0, var1, var2));
+      return (Sprite)WorldMapRegion.field1051.get(MouseHandler.method1083(var0, var1, var2));
    }
 
    @ObfuscatedName("fm")
@@ -36,11 +36,11 @@ public class class13 {
    )
    @Export("playPcmPlayers")
    static final void playPcmPlayers() {
-      if(AbstractIndexCache.pcmPlayer1 != null) {
+      if (AbstractIndexCache.pcmPlayer1 != null) {
          AbstractIndexCache.pcmPlayer1.run();
       }
 
-      if(WorldMapCacheName.pcmPlayer0 != null) {
+      if (WorldMapCacheName.pcmPlayer0 != null) {
          WorldMapCacheName.pcmPlayer0.run();
       }
 
@@ -56,23 +56,23 @@ public class class13 {
       int var3 = -1;
       int var4 = 0;
       int var5 = 0;
-      if(var0.field906 == 0) {
-         var1 = class65.scene.__ar_244(var0.field911, var0.field913, var0.field901);
+      if (var0.field906 == 0) {
+         var1 = class65.scene.method290(var0.field911, var0.field913, var0.field901);
       }
 
-      if(var0.field906 == 1) {
-         var1 = class65.scene.__ac_245(var0.field911, var0.field913, var0.field901);
+      if (var0.field906 == 1) {
+         var1 = class65.scene.method291(var0.field911, var0.field913, var0.field901);
       }
 
-      if(var0.field906 == 2) {
-         var1 = class65.scene.__ay_246(var0.field911, var0.field913, var0.field901);
+      if (var0.field906 == 2) {
+         var1 = class65.scene.method292(var0.field911, var0.field913, var0.field901);
       }
 
-      if(var0.field906 == 3) {
+      if (var0.field906 == 3) {
          var1 = class65.scene.getFloorDecorationTag(var0.field911, var0.field913, var0.field901);
       }
 
-      if(var1 != 0L) {
+      if (var1 != 0L) {
          int var6 = class65.scene.getObjectFlags(var0.field911, var0.field913, var0.field901, var1);
          var3 = HitSplatDefinition.method4972(var1);
          var4 = var6 & 31;
diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java
index 04ce881b16..c221cc9d65 100644
--- a/runescape-client/src/main/java/class14.java
+++ b/runescape-client/src/main/java/class14.java
@@ -15,10 +15,10 @@ public class class14 {
          AccessFile var2 = new AccessFile(class337.clDat, "rw", 10000L);
          Buffer var3 = new Buffer(500);
          var3.writeByte(3);
-         var3.writeByte(var1 != null?1:0);
-         var3.__j_296(var0.getPath());
-         if(var1 != null) {
-            var3.__j_296("");
+         var3.writeByte(var1 != null ? 1 : 0);
+         var3.method37(var0.getPath());
+         if (var1 != null) {
+            var3.method37("");
          }
 
          var2.write(var3.array, 0, var3.index);
@@ -36,12 +36,12 @@ public class class14 {
    )
    public static char method171(byte var0) {
       int var1 = var0 & 255;
-      if(var1 == 0) {
+      if (var1 == 0) {
          throw new IllegalArgumentException("");
       } else {
-         if(var1 >= 128 && var1 < 160) {
+         if (var1 >= 128 && var1 < 160) {
             char var2 = class304.cp1252AsciiExtension[var1 - 128];
-            if(var2 == 0) {
+            if (var2 == 0) {
                var2 = '?';
             }
 
@@ -58,6 +58,6 @@ public class class14 {
       garbageValue = "-1103685678"
    )
    static boolean method169() {
-      return (Client.__client_ke & 8) != 0;
+      return (Client.field210 & 8) != 0;
    }
 }
diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java
index 0bcb48c166..42d91b8e84 100644
--- a/runescape-client/src/main/java/class15.java
+++ b/runescape-client/src/main/java/class15.java
@@ -9,7 +9,7 @@ public class class15 extends class21 {
    @ObfuscatedGetter(
       longValue = 3423502126894795079L
    )
-   static long __z_si;
+   static long field1113;
    @ObfuscatedName("j")
    @ObfuscatedSignature(
       signature = "Lap;"
@@ -36,17 +36,17 @@ public class class15 extends class21 {
    )
    void method173(Buffer var1) {
       int var2 = var1.readUnsignedByte();
-      if(var2 != class31.field259.field255) {
+      if (var2 != class31.field259.field255) {
          throw new IllegalStateException("");
       } else {
          super.field148 = var1.readUnsignedByte();
          super.field156 = var1.readUnsignedByte();
-         super.field149 = var1.__ag_302();
-         super.field146 = var1.__ag_302();
-         super.field159 = var1.__ag_302();
-         super.field147 = var1.__ag_302();
-         super.field150 = var1.__ap_310();
-         super.field152 = var1.__ap_310();
+         super.field149 = var1.method43();
+         super.field146 = var1.method43();
+         super.field159 = var1.method43();
+         super.field147 = var1.method43();
+         super.field150 = var1.method51();
+         super.field152 = var1.method51();
       }
    }
 
@@ -63,14 +63,14 @@ public class class15 extends class21 {
       super.field155 = new byte[super.field156][64][64];
       super.field144 = new class25[super.field156][64][64][];
       int var2 = var1.readUnsignedByte();
-      if(var2 != class30.field246.field248) {
+      if (var2 != class30.field246.field248) {
          throw new IllegalStateException("");
       } else {
          int var3 = var1.readUnsignedByte();
          int var4 = var1.readUnsignedByte();
-         if(var3 == super.field159 && var4 == super.field147) {
-            for(int var5 = 0; var5 < 64; ++var5) {
-               for(int var6 = 0; var6 < 64; ++var6) {
+         if (var3 == super.field159 && var4 == super.field147) {
+            for (int var5 = 0; var5 < 64; ++var5) {
+               for (int var6 = 0; var6 < 64; ++var6) {
                   this.method259(var5, var6, var1);
                }
             }
@@ -82,7 +82,7 @@ public class class15 extends class21 {
    }
 
    public boolean equals(Object var1) {
-      if(!(var1 instanceof class15)) {
+      if (!(var1 instanceof class15)) {
          return false;
       } else {
          class15 var2 = (class15)var1;
@@ -100,13 +100,13 @@ public class class15 extends class21 {
       garbageValue = "3"
    )
    static final int method183(int var0, int var1) {
-      if(var0 == -1) {
+      if (var0 == -1) {
          return 12345678;
       } else {
          var1 = (var0 & 127) * var1 / 128;
-         if(var1 < 2) {
+         if (var1 < 2) {
             var1 = 2;
-         } else if(var1 > 126) {
+         } else if (var1 > 126) {
             var1 = 126;
          }
 
@@ -121,12 +121,12 @@ public class class15 extends class21 {
    )
    static int method182(int var0, Script var1, boolean var2) {
       Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-      if(var0 == 2800) {
+      if (var0 == 2800) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3));
          return 1;
-      } else if(var0 != 2801) {
-         if(var0 == 2802) {
-            if(var3.dataText == null) {
+      } else if (var0 != 2801) {
+         if (var0 == 2802) {
+            if (var3.dataText == null) {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
             } else {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText;
@@ -139,7 +139,7 @@ public class class15 extends class21 {
       } else {
          int var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          --var4;
-         if(var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
+         if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
             Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4];
          } else {
             Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
@@ -155,10 +155,10 @@ public class class15 extends class21 {
       garbageValue = "-1757982583"
    )
    static final void method184(boolean var0) {
-      if(var0) {
-         Client.field658 = Login.__cu_ba?class159.field1980:class159.field1983;
+      if (var0) {
+         Client.field658 = Login.field470 ? class159.field1980 : class159.field1983;
       } else {
-         Client.field658 = ReflectionCheck.clientPreferences.parameters.containsKey(Integer.valueOf(class279.method5357(Login.Login_username)))?class159.field1982:class159.field1985;
+         Client.field658 = ReflectionCheck.clientPreferences.parameters.containsKey(class279.method5357(Login.Login_username)) ? class159.field1982 : class159.field1985;
       }
 
    }
@@ -170,40 +170,39 @@ public class class15 extends class21 {
    )
    static final void method186(Widget var0) {
       int var1 = var0.contentType;
-      if(var1 == 324) {
-         if(Client.__client_sd == -1) {
-            Client.__client_sd = var0.spriteId2;
-            Client.__client_sl = var0.spriteId;
+      if (var1 == 324) {
+         if (Client.field118 == -1) {
+            Client.field118 = var0.spriteId2;
+            Client.field120 = var0.spriteId;
          }
 
-         if(Client.__client_ru.isFemale) {
-            var0.spriteId2 = Client.__client_sd;
+         if (Client.field119.isFemale) {
+            var0.spriteId2 = Client.field118;
          } else {
-            var0.spriteId2 = Client.__client_sl;
+            var0.spriteId2 = Client.field120;
+         }
+      } else if (var1 == 325) {
+         if (Client.field118 == -1) {
+            Client.field118 = var0.spriteId2;
+            Client.field120 = var0.spriteId;
          }
 
-      } else if(var1 == 325) {
-         if(Client.__client_sd == -1) {
-            Client.__client_sd = var0.spriteId2;
-            Client.__client_sl = var0.spriteId;
-         }
-
-         if(Client.__client_ru.isFemale) {
-            var0.spriteId2 = Client.__client_sl;
+         if (Client.field119.isFemale) {
+            var0.spriteId2 = Client.field120;
          } else {
-            var0.spriteId2 = Client.__client_sd;
+            var0.spriteId2 = Client.field118;
          }
-
-      } else if(var1 == 327) {
+      } else if (var1 == 327) {
          var0.modelAngleX = 150;
          var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
          var0.modelType = 5;
          var0.modelId = 0;
-      } else if(var1 == 328) {
+      } else if (var1 == 328) {
          var0.modelAngleX = 150;
          var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
          var0.modelType = 5;
          var0.modelId = 1;
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/class157.java b/runescape-client/src/main/java/class157.java
index 4f2d436c49..a7d3eb0d9f 100644
--- a/runescape-client/src/main/java/class157.java
+++ b/runescape-client/src/main/java/class157.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
@@ -9,7 +8,7 @@ public class class157 extends AbstractUserComparator {
    @ObfuscatedGetter(
       intValue = 1006519291
    )
-   static int __fw_nm;
+   static int field1114;
    @ObfuscatedName("m")
    final boolean field1969;
 
@@ -23,7 +22,7 @@ public class class157 extends AbstractUserComparator {
       garbageValue = "884616259"
    )
    int method3381(Buddy var1, Buddy var2) {
-      return var2.rank != var1.rank?(this.field1969?var1.rank - var2.rank:var2.rank - var1.rank):this.__x_461(var1, var2);
+      return var2.rank != var1.rank ? (this.field1969 ? var1.rank - var2.rank : var2.rank - var1.rank) : this.method12(var1, var2);
    }
 
    public int compare(Object var1, Object var2) {
@@ -39,6 +38,6 @@ public class class157 extends AbstractUserComparator {
       Widget.widgetSpriteCache.clear();
       Widget.Widget_cachedModels.clear();
       Widget.Widget_cachedFonts.clear();
-      Widget.__ho_z.clear();
+      Widget.field956.clear();
    }
 }
diff --git a/runescape-client/src/main/java/class159.java b/runescape-client/src/main/java/class159.java
index f38ef0ffc0..658ded8e00 100644
--- a/runescape-client/src/main/java/class159.java
+++ b/runescape-client/src/main/java/class159.java
@@ -37,7 +37,7 @@ public enum class159 implements Enumerated {
    )
    final int field1981;
 
-   class159(int var3, int var4) {
+   private class159(int var3, int var4) {
       this.field1984 = var3;
       this.field1981 = var4;
    }
diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java
index ad03754107..37218b7f60 100644
--- a/runescape-client/src/main/java/class16.java
+++ b/runescape-client/src/main/java/class16.java
@@ -38,11 +38,11 @@ public class class16 {
       int var3 = var2.length();
       int var4 = var1;
 
-      for(int var5 = 0; var5 < var3; ++var5) {
+      for (int var5 = 0; var5 < var3; ++var5) {
          char var6 = var2.charAt(var5);
-         if(var6 <= 127) {
+         if (var6 <= 127) {
             var0[var4++] = (byte)var6;
-         } else if(var6 <= 2047) {
+         } else if (var6 <= 2047) {
             var0[var4++] = (byte)(192 | var6 >> 6);
             var0[var4++] = (byte)(128 | var6 & '?');
          } else {
@@ -61,13 +61,13 @@ public class class16 {
       garbageValue = "1394688825"
    )
    static int method188(int var0, Script var1, boolean var2) {
-      Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
-      if(var0 == 1800) {
+      Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+      if (var0 == 1800) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3));
          return 1;
-      } else if(var0 != 1801) {
-         if(var0 == 1802) {
-            if(var3.dataText == null) {
+      } else if (var0 != 1801) {
+         if (var0 == 1802) {
+            if (var3.dataText == null) {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
             } else {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText;
@@ -80,7 +80,7 @@ public class class16 {
       } else {
          int var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          --var4;
-         if(var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
+         if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
             Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4];
          } else {
             Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
@@ -97,44 +97,44 @@ public class class16 {
    )
    static final void method189(class190 var0) {
       PacketBuffer var1 = Client.packetWriter.packetBuffer;
+      int var2;
       int var3;
+      int var4;
       int var5;
       int var6;
       int var7;
       int var8;
       int var9;
-      int var10;
-      int var12;
-      byte var13;
-      int var14;
-      if(class190.field2342 == var0) {
-         byte var2 = var1.__bk_320();
-         var3 = var1.__bm_326();
-         byte var4 = var1.__bk_320();
-         var5 = var1.__bu_325();
-         var6 = var1.__ag_302();
-         var7 = var1.__bb_317();
-         var8 = var7 >> 2;
-         var9 = var7 & 3;
-         var10 = Client.__client_gd[var8];
-         byte var11 = var1.__bn_319();
-         var12 = var1.__by_324();
-         var13 = var1.__bk_320();
-         var14 = var1.readUnsignedByteNegate();
-         int var15 = (var14 >> 4 & 7) + WorldMapSection3.__p_go;
-         int var16 = (var14 & 7) + Canvas.__ao_gk;
+      byte var10;
+      int var11;
+      if (class190.field2342 == var0) {
+         byte var12 = var1.method61();
+         var2 = var1.method67();
+         byte var13 = var1.method61();
+         var3 = var1.method66();
+         var4 = var1.method43();
+         var5 = var1.method58();
+         var6 = var5 >> 2;
+         var7 = var5 & 3;
+         var8 = Client.field182[var6];
+         byte var14 = var1.method60();
+         var9 = var1.method65();
+         var10 = var1.method61();
+         var11 = var1.readUnsignedByteNegate();
+         int var15 = (var11 >> 4 & 7) + WorldMapSection3.field1089;
+         int var16 = (var11 & 7) + Canvas.field95;
          Player var17;
-         if(var12 == Client.localPlayerIndex) {
+         if (var9 == Client.localPlayerIndex) {
             var17 = Canvas.localPlayer;
          } else {
-            var17 = Client.players[var12];
+            var17 = Client.players[var9];
          }
 
-         if(var17 != null) {
-            ObjectDefinition var18 = class50.getObjectDefinition(var5);
+         if (var17 != null) {
+            ObjectDefinition var18 = class50.getObjectDefinition(var3);
             int var19;
             int var20;
-            if(var9 != 1 && var9 != 3) {
+            if (var7 != 1 && var7 != 3) {
                var19 = var18.sizeX;
                var20 = var18.sizeY;
             } else {
@@ -150,259 +150,253 @@ public class class16 {
             int var26 = var25[var22][var23] + var25[var21][var23] + var25[var21][var24] + var25[var22][var24] >> 2;
             int var27 = (var15 << 7) + (var19 << 6);
             int var28 = (var16 << 7) + (var20 << 6);
-            Model var29 = var18.getModel(var8, var9, var25, var27, var26, var28);
-            if(var29 != null) {
-               class258.method4898(SoundSystem.plane, var15, var16, var10, -1, 0, 0, var6 + 1, var3 + 1);
-               var17.animationCycleStart = var6 + Client.cycle;
-               var17.animationCycleEnd = var3 + Client.cycle;
+            Model var29 = var18.getModel(var6, var7, var25, var27, var26, var28);
+            if (var29 != null) {
+               class258.method4898(SoundSystem.plane, var15, var16, var8, -1, 0, 0, var4 + 1, var2 + 1);
+               var17.animationCycleStart = var4 + Client.cycle;
+               var17.animationCycleEnd = var2 + Client.cycle;
                var17.model0 = var29;
-               var17.__k = var15 * 128 + var19 * 64;
-               var17.__i = var16 * 128 + var20 * 64;
+               var17.field719 = var15 * 128 + var19 * 64;
+               var17.field720 = var16 * 128 + var20 * 64;
                var17.tileHeight2 = var26;
                byte var30;
-               if(var2 > var13) {
-                  var30 = var2;
-                  var2 = var13;
+               if (var12 > var10) {
+                  var30 = var12;
+                  var12 = var10;
+                  var10 = var30;
+               }
+
+               if (var14 > var13) {
+                  var30 = var14;
+                  var14 = var13;
                   var13 = var30;
                }
 
-               if(var11 > var4) {
-                  var30 = var11;
-                  var11 = var4;
-                  var4 = var30;
-               }
-
-               var17.__z = var15 + var2;
-               var17.__s = var13 + var15;
-               var17.__j = var11 + var16;
-               var17.__t = var4 + var16;
+               var17.field721 = var15 + var12;
+               var17.field723 = var10 + var15;
+               var17.field722 = var14 + var16;
+               var17.field724 = var13 + var16;
             }
          }
       }
 
-      int var37;
-      int var38;
-      if(class190.field2349 == var0) {
-         var37 = var1.__bb_317();
-         var3 = (var37 >> 4 & 7) + WorldMapSection3.__p_go;
-         var38 = (var37 & 7) + Canvas.__ao_gk;
-         var5 = var1.__bq_318();
-         var6 = var5 >> 2;
-         var7 = var5 & 3;
-         var8 = Client.__client_gd[var6];
-         var9 = var1.__bu_325();
-         if(var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) {
-            class258.method4898(SoundSystem.plane, var3, var38, var8, var9, var6, var7, 0, -1);
+      int var31;
+      int var32;
+      if (class190.field2349 == var0) {
+         var31 = var1.method58();
+         var2 = (var31 >> 4 & 7) + WorldMapSection3.field1089;
+         var32 = (var31 & 7) + Canvas.field95;
+         var3 = var1.method59();
+         var4 = var3 >> 2;
+         var5 = var3 & 3;
+         var6 = Client.field182[var4];
+         var7 = var1.method66();
+         if (var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) {
+            class258.method4898(SoundSystem.plane, var2, var32, var6, var7, var4, var5, 0, -1);
          }
-
       } else {
-         if(class190.field2345 == var0) {
-            var37 = var1.readUnsignedByte();
-            var3 = (var37 >> 4 & 7) + WorldMapSection3.__p_go;
-            var38 = (var37 & 7) + Canvas.__ao_gk;
-            var5 = var1.__bq_318();
-            var6 = var1.__bb_317();
-            var7 = var6 >> 4 & 15;
-            var8 = var6 & 7;
-            var9 = var1.__bm_326();
-            if(var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) {
-               var10 = var7 + 1;
-               if(Canvas.localPlayer.pathX[0] >= var3 - var10 && Canvas.localPlayer.pathX[0] <= var10 + var3 && Canvas.localPlayer.pathY[0] >= var38 - var10 && Canvas.localPlayer.pathY[0] <= var10 + var38 && Client.__client_qc != 0 && var8 > 0 && Client.soundEffectCount < 50) {
-                  Client.soundEffectIds[Client.soundEffectCount] = var9;
-                  Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8;
-                  Client.queuedSoundEffectDelays[Client.soundEffectCount] = var5;
+         if (class190.field2345 == var0) {
+            var31 = var1.readUnsignedByte();
+            var2 = (var31 >> 4 & 7) + WorldMapSection3.field1089;
+            var32 = (var31 & 7) + Canvas.field95;
+            var3 = var1.method59();
+            var4 = var1.method58();
+            var5 = var4 >> 4 & 15;
+            var6 = var4 & 7;
+            var7 = var1.method67();
+            if (var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) {
+               var8 = var5 + 1;
+               if (Canvas.localPlayer.pathX[0] >= var2 - var8 && Canvas.localPlayer.pathX[0] <= var8 + var2 && Canvas.localPlayer.pathY[0] >= var32 - var8 && Canvas.localPlayer.pathY[0] <= var8 + var32 && Client.field115 != 0 && var6 > 0 && Client.soundEffectCount < 50) {
+                  Client.soundEffectIds[Client.soundEffectCount] = var7;
+                  Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6;
+                  Client.queuedSoundEffectDelays[Client.soundEffectCount] = var3;
                   Client.soundEffects[Client.soundEffectCount] = null;
-                  Client.soundLocations[Client.soundEffectCount] = var7 + (var38 << 8) + (var3 << 16);
+                  Client.soundLocations[Client.soundEffectCount] = var5 + (var32 << 8) + (var2 << 16);
                   ++Client.soundEffectCount;
                }
             }
          }
 
-         if(class190.field2341 == var0) {
-            var37 = var1.__ag_302();
-            var3 = var1.__bb_317();
-            var38 = var1.__bu_325();
-            var5 = var1.readUnsignedByte();
-            var6 = (var5 >> 4 & 7) + WorldMapSection3.__p_go;
-            var7 = (var5 & 7) + Canvas.__ao_gk;
-            if(var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) {
-               var6 = var6 * 128 + 64;
-               var7 = var7 * 128 + 64;
-               GraphicsObject var42 = new GraphicsObject(var37, SoundSystem.plane, var6, var7, class32.getTileHeight(var6, var7, SoundSystem.plane) - var3, var38, Client.cycle);
-               Client.graphicsObjects.addFirst(var42);
+         if (class190.field2341 == var0) {
+            var31 = var1.method43();
+            var2 = var1.method58();
+            var32 = var1.method66();
+            var3 = var1.readUnsignedByte();
+            var4 = (var3 >> 4 & 7) + WorldMapSection3.field1089;
+            var5 = (var3 & 7) + Canvas.field95;
+            if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) {
+               var4 = var4 * 128 + 64;
+               var5 = var5 * 128 + 64;
+               GraphicsObject var33 = new GraphicsObject(var31, SoundSystem.plane, var4, var5, class32.getTileHeight(var4, var5, SoundSystem.plane) - var2, var32, Client.cycle);
+               Client.graphicsObjects.addFirst(var33);
             }
-
          } else {
-            int var39;
-            if(class190.field2344 == var0) {
-               var37 = var1.__bq_318();
-               var3 = var37 >> 2;
-               var38 = var37 & 3;
-               var5 = Client.__client_gd[var3];
-               var6 = var1.readUnsignedByteNegate();
-               var7 = (var6 >> 4 & 7) + WorldMapSection3.__p_go;
-               var8 = (var6 & 7) + Canvas.__ao_gk;
-               var9 = var1.__ag_302();
-               if(var7 >= 0 && var8 >= 0 && var7 < 103 && var8 < 103) {
-                  if(var5 == 0) {
-                     BoundaryObject var32 = class65.scene.getBoundaryObject(SoundSystem.plane, var7, var8);
-                     if(var32 != null) {
-                        var39 = HitSplatDefinition.method4972(var32.tag);
-                        if(var3 == 2) {
-                           var32.entity1 = new DynamicObject(var39, 2, var38 + 4, SoundSystem.plane, var7, var8, var9, false, var32.entity1);
-                           var32.entity2 = new DynamicObject(var39, 2, var38 + 1 & 3, SoundSystem.plane, var7, var8, var9, false, var32.entity2);
+            int var35;
+            if (class190.field2344 == var0) {
+               var31 = var1.method59();
+               var2 = var31 >> 2;
+               var32 = var31 & 3;
+               var3 = Client.field182[var2];
+               var4 = var1.readUnsignedByteNegate();
+               var5 = (var4 >> 4 & 7) + WorldMapSection3.field1089;
+               var6 = (var4 & 7) + Canvas.field95;
+               var7 = var1.method43();
+               if (var5 >= 0 && var6 >= 0 && var5 < 103 && var6 < 103) {
+                  if (var3 == 0) {
+                     BoundaryObject var34 = class65.scene.getBoundaryObject(SoundSystem.plane, var5, var6);
+                     if (var34 != null) {
+                        var35 = HitSplatDefinition.method4972(var34.tag);
+                        if (var2 == 2) {
+                           var34.entity1 = new DynamicObject(var35, 2, var32 + 4, SoundSystem.plane, var5, var6, var7, false, var34.entity1);
+                           var34.entity2 = new DynamicObject(var35, 2, var32 + 1 & 3, SoundSystem.plane, var5, var6, var7, false, var34.entity2);
                         } else {
-                           var32.entity1 = new DynamicObject(var39, var3, var38, SoundSystem.plane, var7, var8, var9, false, var32.entity1);
+                           var34.entity1 = new DynamicObject(var35, var2, var32, SoundSystem.plane, var5, var6, var7, false, var34.entity1);
                         }
                      }
                   }
 
-                  if(var5 == 1) {
-                     WallDecoration var43 = class65.scene.getWallDecoration(SoundSystem.plane, var7, var8);
-                     if(var43 != null) {
-                        var39 = HitSplatDefinition.method4972(var43.tag);
-                        if(var3 != 4 && var3 != 5) {
-                           if(var3 == 6) {
-                              var43.entity1 = new DynamicObject(var39, 4, var38 + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity1);
-                           } else if(var3 == 7) {
-                              var43.entity1 = new DynamicObject(var39, 4, (var38 + 2 & 3) + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity1);
-                           } else if(var3 == 8) {
-                              var43.entity1 = new DynamicObject(var39, 4, var38 + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity1);
-                              var43.entity2 = new DynamicObject(var39, 4, (var38 + 2 & 3) + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity2);
+                  if (var3 == 1) {
+                     WallDecoration var36 = class65.scene.getWallDecoration(SoundSystem.plane, var5, var6);
+                     if (var36 != null) {
+                        var35 = HitSplatDefinition.method4972(var36.tag);
+                        if (var2 != 4 && var2 != 5) {
+                           if (var2 == 6) {
+                              var36.entity1 = new DynamicObject(var35, 4, var32 + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity1);
+                           } else if (var2 == 7) {
+                              var36.entity1 = new DynamicObject(var35, 4, (var32 + 2 & 3) + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity1);
+                           } else if (var2 == 8) {
+                              var36.entity1 = new DynamicObject(var35, 4, var32 + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity1);
+                              var36.entity2 = new DynamicObject(var35, 4, (var32 + 2 & 3) + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity2);
                            }
                         } else {
-                           var43.entity1 = new DynamicObject(var39, 4, var38, SoundSystem.plane, var7, var8, var9, false, var43.entity1);
+                           var36.entity1 = new DynamicObject(var35, 4, var32, SoundSystem.plane, var5, var6, var7, false, var36.entity1);
                         }
                      }
                   }
 
-                  if(var5 == 2) {
-                     GameObject var44 = class65.scene.__aj_243(SoundSystem.plane, var7, var8);
-                     if(var3 == 11) {
-                        var3 = 10;
+                  if (var3 == 2) {
+                     GameObject var37 = class65.scene.method289(SoundSystem.plane, var5, var6);
+                     if (var2 == 11) {
+                        var2 = 10;
                      }
 
-                     if(var44 != null) {
-                        var44.entity = new DynamicObject(HitSplatDefinition.method4972(var44.tag), var3, var38, SoundSystem.plane, var7, var8, var9, false, var44.entity);
+                     if (var37 != null) {
+                        var37.entity = new DynamicObject(HitSplatDefinition.method4972(var37.tag), var2, var32, SoundSystem.plane, var5, var6, var7, false, var37.entity);
                      }
                   }
 
-                  if(var5 == 3) {
-                     FloorDecoration var45 = class65.scene.getFloorDecoration(SoundSystem.plane, var7, var8);
-                     if(var45 != null) {
-                        var45.entity = new DynamicObject(HitSplatDefinition.method4972(var45.tag), 22, var38, SoundSystem.plane, var7, var8, var9, false, var45.entity);
+                  if (var3 == 3) {
+                     FloorDecoration var39 = class65.scene.getFloorDecoration(SoundSystem.plane, var5, var6);
+                     if (var39 != null) {
+                        var39.entity = new DynamicObject(HitSplatDefinition.method4972(var39.tag), 22, var32, SoundSystem.plane, var5, var6, var7, false, var39.entity);
                      }
                   }
                }
-
             } else {
-               GroundItem var34;
-               if(class190.field2347 == var0) {
-                  var37 = var1.__bb_317();
-                  var3 = (var37 >> 4 & 7) + WorldMapSection3.__p_go;
-                  var38 = (var37 & 7) + Canvas.__ao_gk;
-                  var5 = var1.__bm_326();
-                  if(var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) {
-                     NodeDeque var33 = Client.groundItems[SoundSystem.plane][var3][var38];
-                     if(var33 != null) {
-                        for(var34 = (GroundItem)var33.last(); var34 != null; var34 = (GroundItem)var33.previous()) {
-                           if((var5 & 32767) == var34.id) {
-                              var34.remove();
+               NodeDeque var38;
+               GroundItem var41;
+               if (class190.field2347 == var0) {
+                  var31 = var1.method58();
+                  var2 = (var31 >> 4 & 7) + WorldMapSection3.field1089;
+                  var32 = (var31 & 7) + Canvas.field95;
+                  var3 = var1.method67();
+                  if (var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) {
+                     var38 = Client.groundItems[SoundSystem.plane][var2][var32];
+                     if (var38 != null) {
+                        for (var41 = (GroundItem)var38.last(); var41 != null; var41 = (GroundItem)var38.previous()) {
+                           if ((var3 & 32767) == var41.id) {
+                              var41.remove();
                               break;
                            }
                         }
 
-                        if(var33.last() == null) {
-                           Client.groundItems[SoundSystem.plane][var3][var38] = null;
+                        if (var38.last() == null) {
+                           Client.groundItems[SoundSystem.plane][var2][var32] = null;
                         }
 
-                        TilePaint.method3061(var3, var38);
+                        TilePaint.method3061(var2, var32);
                      }
                   }
-
-               } else if(class190.field2350 == var0) {
-                  var37 = var1.__bq_318();
-                  var3 = var37 >> 2;
-                  var38 = var37 & 3;
-                  var5 = Client.__client_gd[var3];
-                  var6 = var1.__bq_318();
-                  var7 = (var6 >> 4 & 7) + WorldMapSection3.__p_go;
-                  var8 = (var6 & 7) + Canvas.__ao_gk;
-                  if(var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) {
-                     class258.method4898(SoundSystem.plane, var7, var8, var5, -1, var3, var38, 0, -1);
+               } else if (class190.field2350 == var0) {
+                  var31 = var1.method59();
+                  var2 = var31 >> 2;
+                  var32 = var31 & 3;
+                  var3 = Client.field182[var2];
+                  var4 = var1.method59();
+                  var5 = (var4 >> 4 & 7) + WorldMapSection3.field1089;
+                  var6 = (var4 & 7) + Canvas.field95;
+                  if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
+                     class258.method4898(SoundSystem.plane, var5, var6, var3, -1, var2, var32, 0, -1);
                   }
-
-               } else if(class190.field2352 == var0) {
-                  var37 = var1.__bq_318() * 4;
-                  var3 = var1.__ag_302();
-                  var38 = var1.__bu_325();
-                  var5 = var1.__bq_318() * 4;
-                  var6 = var1.__bl_327();
-                  var7 = var1.readUnsignedByte();
-                  var8 = var1.__bq_318();
-                  var9 = var1.__by_324();
-                  var10 = var1.__bb_317();
-                  var39 = (var10 >> 4 & 7) + WorldMapSection3.__p_go;
-                  var12 = (var10 & 7) + Canvas.__ao_gk;
-                  var13 = var1.__bn_319();
-                  byte var40 = var1.__bk_320();
-                  var14 = var40 + var39;
-                  int var41 = var13 + var12;
-                  if(var39 >= 0 && var12 >= 0 && var39 < 104 && var12 < 104 && var14 >= 0 && var41 >= 0 && var14 < 104 && var41 < 104 && var38 != 65535) {
-                     var39 = var39 * 128 + 64;
-                     var12 = var12 * 128 + 64;
-                     var14 = var14 * 128 + 64;
-                     var41 = var41 * 128 + 64;
-                     Projectile var35 = new Projectile(var38, SoundSystem.plane, var39, var12, class32.getTileHeight(var39, var12, SoundSystem.plane) - var5, var9 + Client.cycle, var3 + Client.cycle, var7, var8, var6, var37);
-                     var35.setDestination(var14, var41, class32.getTileHeight(var14, var41, SoundSystem.plane) - var37, var9 + Client.cycle);
-                     Client.projectiles.addFirst(var35);
+               } else if (class190.field2352 == var0) {
+                  var31 = var1.method59() * 4;
+                  var2 = var1.method43();
+                  var32 = var1.method66();
+                  var3 = var1.method59() * 4;
+                  var4 = var1.method68();
+                  var5 = var1.readUnsignedByte();
+                  var6 = var1.method59();
+                  var7 = var1.method65();
+                  var8 = var1.method58();
+                  var35 = (var8 >> 4 & 7) + WorldMapSection3.field1089;
+                  var9 = (var8 & 7) + Canvas.field95;
+                  var10 = var1.method60();
+                  byte var40 = var1.method61();
+                  var11 = var40 + var35;
+                  int var42 = var10 + var9;
+                  if (var35 >= 0 && var9 >= 0 && var35 < 104 && var9 < 104 && var11 >= 0 && var42 >= 0 && var11 < 104 && var42 < 104 && var32 != 65535) {
+                     var35 = var35 * 128 + 64;
+                     var9 = var9 * 128 + 64;
+                     var11 = var11 * 128 + 64;
+                     var42 = var42 * 128 + 64;
+                     Projectile var43 = new Projectile(var32, SoundSystem.plane, var35, var9, class32.getTileHeight(var35, var9, SoundSystem.plane) - var3, var7 + Client.cycle, var2 + Client.cycle, var5, var6, var4, var31);
+                     var43.setDestination(var11, var42, class32.getTileHeight(var11, var42, SoundSystem.plane) - var31, var7 + Client.cycle);
+                     Client.projectiles.addFirst(var43);
                   }
-
-               } else if(class190.field2346 != var0) {
-                  if(class190.field2343 == var0) {
-                     var37 = var1.__bu_325();
-                     var3 = var1.__bm_326();
-                     var38 = var1.__bb_317();
-                     var5 = (var38 >> 4 & 7) + WorldMapSection3.__p_go;
-                     var6 = (var38 & 7) + Canvas.__ao_gk;
-                     if(var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
-                        var34 = new GroundItem();
-                        var34.id = var3;
-                        var34.quantity = var37;
-                        if(Client.groundItems[SoundSystem.plane][var5][var6] == null) {
-                           Client.groundItems[SoundSystem.plane][var5][var6] = new NodeDeque();
+               } else if (class190.field2346 != var0) {
+                  if (class190.field2343 == var0) {
+                     var31 = var1.method66();
+                     var2 = var1.method67();
+                     var32 = var1.method58();
+                     var3 = (var32 >> 4 & 7) + WorldMapSection3.field1089;
+                     var4 = (var32 & 7) + Canvas.field95;
+                     if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) {
+                        var41 = new GroundItem();
+                        var41.id = var2;
+                        var41.quantity = var31;
+                        if (Client.groundItems[SoundSystem.plane][var3][var4] == null) {
+                           Client.groundItems[SoundSystem.plane][var3][var4] = new NodeDeque();
                         }
 
-                        Client.groundItems[SoundSystem.plane][var5][var6].addFirst(var34);
-                        TilePaint.method3061(var5, var6);
+                        Client.groundItems[SoundSystem.plane][var3][var4].addFirst(var41);
+                        TilePaint.method3061(var3, var4);
                      }
-
                   }
                } else {
-                  var37 = var1.__by_324();
-                  var3 = var1.__bm_326();
-                  var38 = var1.__by_324();
-                  var5 = var1.__bb_317();
-                  var6 = (var5 >> 4 & 7) + WorldMapSection3.__p_go;
-                  var7 = (var5 & 7) + Canvas.__ao_gk;
-                  if(var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) {
-                     NodeDeque var31 = Client.groundItems[SoundSystem.plane][var6][var7];
-                     if(var31 != null) {
-                        for(GroundItem var36 = (GroundItem)var31.last(); var36 != null; var36 = (GroundItem)var31.previous()) {
-                           if((var37 & 32767) == var36.id && var38 == var36.quantity) {
-                              var36.quantity = var3;
+                  var31 = var1.method65();
+                  var2 = var1.method67();
+                  var32 = var1.method65();
+                  var3 = var1.method58();
+                  var4 = (var3 >> 4 & 7) + WorldMapSection3.field1089;
+                  var5 = (var3 & 7) + Canvas.field95;
+                  if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) {
+                     var38 = Client.groundItems[SoundSystem.plane][var4][var5];
+                     if (var38 != null) {
+                        for (GroundItem var44 = (GroundItem)var38.last(); var44 != null; var44 = (GroundItem)var38.previous()) {
+                           if ((var31 & 32767) == var44.id && var32 == var44.quantity) {
+                              var44.quantity = var2;
                               break;
                            }
                         }
 
-                        TilePaint.method3061(var6, var7);
+                        TilePaint.method3061(var4, var5);
                      }
                   }
-
                }
             }
          }
       }
+
    }
 
    @ObfuscatedName("il")
@@ -412,19 +406,17 @@ public class class16 {
    )
    @Export("insertMenuItem")
    static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
-      if(!Client.isMenuOpen) {
-         if(Client.menuOptionsCount < 500) {
-            Client.menuActions[Client.menuOptionsCount] = var0;
-            Client.menuTargetNames[Client.menuOptionsCount] = var1;
-            Client.menuOpcodes[Client.menuOptionsCount] = var2;
-            Client.menuArguments0[Client.menuOptionsCount] = var3;
-            Client.menuArguments1[Client.menuOptionsCount] = var4;
-            Client.menuArguments2[Client.menuOptionsCount] = var5;
-            Client.menuShiftClick[Client.menuOptionsCount] = var6;
-            ++Client.menuOptionsCount;
-         }
-
+      if (!Client.isMenuOpen && Client.menuOptionsCount < 500) {
+         Client.menuActions[Client.menuOptionsCount] = var0;
+         Client.menuTargetNames[Client.menuOptionsCount] = var1;
+         Client.menuOpcodes[Client.menuOptionsCount] = var2;
+         Client.menuArguments0[Client.menuOptionsCount] = var3;
+         Client.menuArguments1[Client.menuOptionsCount] = var4;
+         Client.menuArguments2[Client.menuOptionsCount] = var5;
+         Client.menuShiftClick[Client.menuOptionsCount] = var6;
+         ++Client.menuOptionsCount;
       }
+
    }
 
    @ObfuscatedName("ii")
@@ -433,30 +425,30 @@ public class class16 {
       garbageValue = "931169314"
    )
    static final int method187(Widget var0, int var1) {
-      if(var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) {
+      if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) {
          try {
             int[] var2 = var0.cs1Instructions[var1];
             int var3 = 0;
             int var4 = 0;
             byte var5 = 0;
 
-            while(true) {
+            while (true) {
                int var6 = var2[var4++];
                int var7 = 0;
                byte var8 = 0;
-               if(var6 == 0) {
+               if (var6 == 0) {
                   return var3;
                }
 
-               if(var6 == 1) {
+               if (var6 == 1) {
                   var7 = Client.currentLevels[var2[var4++]];
                }
 
-               if(var6 == 2) {
+               if (var6 == 2) {
                   var7 = Client.levels[var2[var4++]];
                }
 
-               if(var6 == 3) {
+               if (var6 == 3) {
                   var7 = Client.experience[var2[var4++]];
                }
 
@@ -464,52 +456,52 @@ public class class16 {
                Widget var10;
                int var11;
                int var12;
-               if(var6 == 4) {
+               if (var6 == 4) {
                   var9 = var2[var4++] << 16;
                   var9 += var2[var4++];
                   var10 = Huffman.getWidget(var9);
                   var11 = var2[var4++];
-                  if(var11 != -1 && (!Skills.getItemDefinition(var11).isMembersOnly || Client.isMembersWorld)) {
-                     for(var12 = 0; var12 < var10.itemIds.length; ++var12) {
-                        if(var11 + 1 == var10.itemIds[var12]) {
+                  if (var11 != -1 && (!Skills.getItemDefinition(var11).isMembersOnly || Client.isMembersWorld)) {
+                     for (var12 = 0; var12 < var10.itemIds.length; ++var12) {
+                        if (var11 + 1 == var10.itemIds[var12]) {
                            var7 += var10.itemQuantities[var12];
                         }
                      }
                   }
                }
 
-               if(var6 == 5) {
+               if (var6 == 5) {
                   var7 = Varps.Varps_main[var2[var4++]];
                }
 
-               if(var6 == 6) {
+               if (var6 == 6) {
                   var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1];
                }
 
-               if(var6 == 7) {
+               if (var6 == 7) {
                   var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875;
                }
 
-               if(var6 == 8) {
+               if (var6 == 8) {
                   var7 = Canvas.localPlayer.combatLevel;
                }
 
-               if(var6 == 9) {
-                  for(var9 = 0; var9 < 25; ++var9) {
-                     if(Skills.Skills_enabled[var9]) {
+               if (var6 == 9) {
+                  for (var9 = 0; var9 < 25; ++var9) {
+                     if (Skills.Skills_enabled[var9]) {
                         var7 += Client.levels[var9];
                      }
                   }
                }
 
-               if(var6 == 10) {
+               if (var6 == 10) {
                   var9 = var2[var4++] << 16;
                   var9 += var2[var4++];
                   var10 = Huffman.getWidget(var9);
                   var11 = var2[var4++];
-                  if(var11 != -1 && (!Skills.getItemDefinition(var11).isMembersOnly || Client.isMembersWorld)) {
-                     for(var12 = 0; var12 < var10.itemIds.length; ++var12) {
-                        if(var11 + 1 == var10.itemIds[var12]) {
+                  if (var11 != -1 && (!Skills.getItemDefinition(var11).isMembersOnly || Client.isMembersWorld)) {
+                     for (var12 = 0; var12 < var10.itemIds.length; ++var12) {
+                        if (var11 + 1 == var10.itemIds[var12]) {
                            var7 = 999999999;
                            break;
                         }
@@ -517,63 +509,63 @@ public class class16 {
                   }
                }
 
-               if(var6 == 11) {
+               if (var6 == 11) {
                   var7 = Client.runEnergy;
                }
 
-               if(var6 == 12) {
+               if (var6 == 12) {
                   var7 = Client.weight;
                }
 
-               if(var6 == 13) {
+               if (var6 == 13) {
                   var9 = Varps.Varps_main[var2[var4++]];
                   int var13 = var2[var4++];
-                  var7 = (var9 & 1 << var13) != 0?1:0;
+                  var7 = (var9 & 1 << var13) != 0 ? 1 : 0;
                }
 
-               if(var6 == 14) {
+               if (var6 == 14) {
                   var9 = var2[var4++];
                   var7 = WorldMapSection2.getVarbit(var9);
                }
 
-               if(var6 == 15) {
+               if (var6 == 15) {
                   var8 = 1;
                }
 
-               if(var6 == 16) {
+               if (var6 == 16) {
                   var8 = 2;
                }
 
-               if(var6 == 17) {
+               if (var6 == 17) {
                   var8 = 3;
                }
 
-               if(var6 == 18) {
+               if (var6 == 18) {
                   var7 = (Canvas.localPlayer.x >> 7) + class50.baseX;
                }
 
-               if(var6 == 19) {
+               if (var6 == 19) {
                   var7 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
                }
 
-               if(var6 == 20) {
+               if (var6 == 20) {
                   var7 = var2[var4++];
                }
 
-               if(var8 == 0) {
-                  if(var5 == 0) {
+               if (var8 == 0) {
+                  if (var5 == 0) {
                      var3 += var7;
                   }
 
-                  if(var5 == 1) {
+                  if (var5 == 1) {
                      var3 -= var7;
                   }
 
-                  if(var5 == 2 && var7 != 0) {
+                  if (var5 == 2 && var7 != 0) {
                      var3 /= var7;
                   }
 
-                  if(var5 == 3) {
+                  if (var5 == 3) {
                      var3 *= var7;
                   }
 
diff --git a/runescape-client/src/main/java/class168.java b/runescape-client/src/main/java/class168.java
index 4b534460d2..9073494309 100644
--- a/runescape-client/src/main/java/class168.java
+++ b/runescape-client/src/main/java/class168.java
@@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("fs")
 public class class168 {
    @ObfuscatedName("o")
-   public static File __fs_o;
+   public static File field1115;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = -2051451755
@@ -39,12 +39,6 @@ public class class168 {
    @Export("optionButtonSpriteSubWidth")
    static int optionButtonSpriteSubWidth;
 
-   static {
-      randomDat = null;
-      dat2File = null;
-      idx255File = null;
-   }
-
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "(II)Z",
@@ -62,10 +56,16 @@ public class class168 {
    public static String method3450(char var0, int var1) {
       char[] var2 = new char[var1];
 
-      for(int var3 = 0; var3 < var1; ++var3) {
+      for (int var3 = 0; var3 < var1; ++var3) {
          var2[var3] = var0;
       }
 
       return new String(var2);
    }
+
+   static {
+      randomDat = null;
+      dat2File = null;
+      idx255File = null;
+   }
 }
diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java
index e097229418..be6abab812 100644
--- a/runescape-client/src/main/java/class171.java
+++ b/runescape-client/src/main/java/class171.java
@@ -1,6 +1,5 @@
 import java.io.File;
 import java.util.Hashtable;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
@@ -11,18 +10,13 @@ public class class171 {
    @ObfuscatedGetter(
       intValue = -852697585
    )
-   static int __fo_ro;
+   static int field1116;
    @ObfuscatedName("m")
-   public static boolean __fo_m;
+   public static boolean field1117;
    @ObfuscatedName("f")
-   public static File __fo_f;
+   public static File field1118;
    @ObfuscatedName("q")
-   static Hashtable __fo_q;
-
-   static {
-      __fo_m = false;
-      __fo_q = new Hashtable(16);
-   }
+   static Hashtable field1119;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -33,36 +27,36 @@ public class class171 {
       KeyHandler var0 = KeyHandler.KeyHandler_instance;
       synchronized(KeyHandler.KeyHandler_instance) {
          ++KeyHandler.KeyHandler_idleCycles;
-         KeyHandler.__an_ct = KeyHandler.__an_cc;
-         KeyHandler.__an_cl = 0;
-         int var1;
-         if(KeyHandler.__an_cw < 0) {
-            for(var1 = 0; var1 < 112; ++var1) {
-               KeyHandler.KeyHandler_pressedKeys[var1] = false;
+         KeyHandler.field453 = KeyHandler.field455;
+         KeyHandler.field452 = 0;
+         int var2;
+         if (KeyHandler.field448 < 0) {
+            for (var2 = 0; var2 < 112; ++var2) {
+               KeyHandler.KeyHandler_pressedKeys[var2] = false;
             }
 
-            KeyHandler.__an_cw = KeyHandler.__an_ch;
+            KeyHandler.field448 = KeyHandler.field447;
          } else {
-            while(KeyHandler.__an_cw != KeyHandler.__an_ch) {
-               var1 = KeyHandler.__an_cq[KeyHandler.__an_ch];
-               KeyHandler.__an_ch = KeyHandler.__an_ch + 1 & 127;
-               if(var1 < 0) {
-                  KeyHandler.KeyHandler_pressedKeys[~var1] = false;
+            while (KeyHandler.field448 != KeyHandler.field447) {
+               var2 = KeyHandler.field446[KeyHandler.field447];
+               KeyHandler.field447 = KeyHandler.field447 + 1 & 127;
+               if (var2 < 0) {
+                  KeyHandler.KeyHandler_pressedKeys[~var2] = false;
                } else {
-                  if(!KeyHandler.KeyHandler_pressedKeys[var1] && KeyHandler.__an_cl < KeyHandler.__an_cp.length - 1) {
-                     KeyHandler.__an_cp[++KeyHandler.__an_cl - 1] = var1;
+                  if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field452 < KeyHandler.field451.length - 1) {
+                     KeyHandler.field451[++KeyHandler.field452 - 1] = var2;
                   }
 
-                  KeyHandler.KeyHandler_pressedKeys[var1] = true;
+                  KeyHandler.KeyHandler_pressedKeys[var2] = true;
                }
             }
          }
 
-         if(KeyHandler.__an_cl > 0) {
+         if (KeyHandler.field452 > 0) {
             KeyHandler.KeyHandler_idleCycles = 0;
          }
 
-         KeyHandler.__an_cc = KeyHandler.__an_cz;
+         KeyHandler.field455 = KeyHandler.field454;
       }
    }
 
@@ -72,14 +66,14 @@ public class class171 {
       garbageValue = "-1048935304"
    )
    public static int method3496(int var0, int var1, int var2, int var3, int var4, int var5) {
-      if((var5 & 1) == 1) {
+      if ((var5 & 1) == 1) {
          int var6 = var3;
          var3 = var4;
          var4 = var6;
       }
 
       var2 &= 3;
-      return var2 == 0?var1:(var2 == 1?7 - var0 - (var3 - 1):(var2 == 2?7 - var1 - (var4 - 1):var0));
+      return var2 == 0 ? var1 : (var2 == 1 ? 7 - var0 - (var3 - 1) : (var2 == 2 ? 7 - var1 - (var4 - 1) : var0));
    }
 
    @ObfuscatedName("fq")
@@ -89,10 +83,10 @@ public class class171 {
    )
    static void method3497() {
       int var0;
-      if(Client.titleLoadingStage == 0) {
+      if (Client.titleLoadingStage == 0) {
          class65.scene = new Scene(4, 104, 104, Tiles.Tiles_heights);
 
-         for(var0 = 0; var0 < 4; ++var0) {
+         for (var0 = 0; var0 < 4; ++var0) {
             Client.collisionMaps[var0] = new CollisionMap(104, 104);
          }
 
@@ -100,11 +94,11 @@ public class class171 {
          Login.Login_loadingText = "Starting game engine...";
          Login.Login_loadingPercent = 5;
          Client.titleLoadingStage = 20;
-      } else if(Client.titleLoadingStage == 20) {
+      } else if (Client.titleLoadingStage == 20) {
          Login.Login_loadingText = "Prepared visibility map";
          Login.Login_loadingPercent = 10;
          Client.titleLoadingStage = 30;
-      } else if(Client.titleLoadingStage == 30) {
+      } else if (Client.titleLoadingStage == 30) {
          AbstractIndexCache.indexCache0 = class22.newIndexCache(0, false, true, true);
          Skeleton.indexCache1 = class22.newIndexCache(1, false, true, true);
          ObjectSound.indexCache2 = class22.newIndexCache(2, true, false, true);
@@ -122,36 +116,36 @@ public class class171 {
          class2.indexCache14 = class22.newIndexCache(14, false, true, true);
          WorldMapSection1.indexCache15 = class22.newIndexCache(15, false, true, true);
          class22.indexCache16 = class22.newIndexCache(17, true, true, true);
-         WorldMapLabelSize.__s_dq = class22.newIndexCache(18, false, true, true);
-         ItemContainer.__bc_dm = class22.newIndexCache(19, false, true, true);
-         AbstractByteArrayCopier.__gu_et = class22.newIndexCache(20, false, true, true);
+         WorldMapLabelSize.field1040 = class22.newIndexCache(18, false, true, true);
+         ItemContainer.field434 = class22.newIndexCache(19, false, true, true);
+         AbstractByteArrayCopier.field0 = class22.newIndexCache(20, false, true, true);
          Login.Login_loadingText = "Connecting to update server";
          Login.Login_loadingPercent = 20;
          Client.titleLoadingStage = 40;
-      } else if(Client.titleLoadingStage == 40) {
-         byte var33 = 0;
-         var0 = var33 + AbstractIndexCache.indexCache0.__ca_405() * 4 / 100;
-         var0 += Skeleton.indexCache1.__ca_405() * 4 / 100;
-         var0 += ObjectSound.indexCache2.__ca_405() * 2 / 100;
-         var0 += WorldMapIcon1.indexCache3.__ca_405() * 2 / 100;
-         var0 += class25.indexCache4.__ca_405() * 6 / 100;
-         var0 += SecureRandomFuture.indexCache5.__ca_405() * 4 / 100;
-         var0 += UserComparator3.indexCache6.__ca_405() * 2 / 100;
-         var0 += class40.indexCache7.__ca_405() * 56 / 100;
-         var0 += WorldMapSection3.indexCache8.__ca_405() * 2 / 100;
-         var0 += class238.indexCache9.__ca_405() * 2 / 100;
-         var0 += class16.indexCache10.__ca_405() * 2 / 100;
-         var0 += Login.indexCache11.__ca_405() * 2 / 100;
-         var0 += Formatting.indexCache12.__ca_405() * 2 / 100;
-         var0 += ByteArrayPool.indexCache13.__ca_405() * 2 / 100;
-         var0 += class2.indexCache14.__ca_405() * 2 / 100;
-         var0 += WorldMapSection1.indexCache15.__ca_405() * 2 / 100;
-         var0 += ItemContainer.__bc_dm.__ca_405() / 100;
-         var0 += WorldMapLabelSize.__s_dq.__ca_405() / 100;
-         var0 += AbstractByteArrayCopier.__gu_et.__ca_405() / 100;
-         var0 += class22.indexCache16.__cx_404() && class22.indexCache16.__l_394()?1:0;
-         if(var0 != 100) {
-            if(var0 != 0) {
+      } else if (Client.titleLoadingStage == 40) {
+         byte var1 = 0;
+         var0 = var1 + AbstractIndexCache.indexCache0.method131() * 4 / 100;
+         var0 += Skeleton.indexCache1.method131() * 4 / 100;
+         var0 += ObjectSound.indexCache2.method131() * 2 / 100;
+         var0 += WorldMapIcon1.indexCache3.method131() * 2 / 100;
+         var0 += class25.indexCache4.method131() * 6 / 100;
+         var0 += SecureRandomFuture.indexCache5.method131() * 4 / 100;
+         var0 += UserComparator3.indexCache6.method131() * 2 / 100;
+         var0 += class40.indexCache7.method131() * 56 / 100;
+         var0 += WorldMapSection3.indexCache8.method131() * 2 / 100;
+         var0 += class238.indexCache9.method131() * 2 / 100;
+         var0 += class16.indexCache10.method131() * 2 / 100;
+         var0 += Login.indexCache11.method131() * 2 / 100;
+         var0 += Formatting.indexCache12.method131() * 2 / 100;
+         var0 += ByteArrayPool.indexCache13.method131() * 2 / 100;
+         var0 += class2.indexCache14.method131() * 2 / 100;
+         var0 += WorldMapSection1.indexCache15.method131() * 2 / 100;
+         var0 += ItemContainer.field434.method131() / 100;
+         var0 += WorldMapLabelSize.field1040.method131() / 100;
+         var0 += AbstractByteArrayCopier.field0.method131() / 100;
+         var0 += class22.indexCache16.method130() && class22.indexCache16.method2() ? 1 : 0;
+         if (var0 != 100) {
+            if (var0 != 0) {
                Login.Login_loadingText = "Checking for updates - " + var0 + "%";
             }
 
@@ -167,22 +161,22 @@ public class class171 {
             AbstractWorldMapIcon.method625(Login.indexCache11, "Music Jingles");
             AbstractWorldMapIcon.method625(class2.indexCache14, "Music Samples");
             AbstractWorldMapIcon.method625(WorldMapSection1.indexCache15, "Music Patches");
-            AbstractWorldMapIcon.method625(ItemContainer.__bc_dm, "World Map");
-            AbstractWorldMapIcon.method625(WorldMapLabelSize.__s_dq, "World Map Geography");
-            AbstractWorldMapIcon.method625(AbstractByteArrayCopier.__gu_et, "World Map Ground");
+            AbstractWorldMapIcon.method625(ItemContainer.field434, "World Map");
+            AbstractWorldMapIcon.method625(WorldMapLabelSize.field1040, "World Map Geography");
+            AbstractWorldMapIcon.method625(AbstractByteArrayCopier.field0, "World Map Ground");
             class211.spriteIds = new SpriteIds();
             class211.spriteIds.read(class22.indexCache16);
             Login.Login_loadingText = "Loaded update list";
             Login.Login_loadingPercent = 30;
             Client.titleLoadingStage = 45;
          }
-      } else if(Client.titleLoadingStage == 45) {
+      } else if (Client.titleLoadingStage == 45) {
          Tiles.method1097(22050, !Client.isLowDetail, 2);
-         MidiPcmStream var36 = new MidiPcmStream();
-         var36.__j_342(9, 128);
+         MidiPcmStream var28 = new MidiPcmStream();
+         var28.method174(9, 128);
          WorldMapCacheName.pcmPlayer0 = Players.newPcmPlayer(GameShell.taskHandler, 0, 22050);
-         WorldMapCacheName.pcmPlayer0.setStream(var36);
-         NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, class25.indexCache4, var36);
+         WorldMapCacheName.pcmPlayer0.setStream(var28);
+         NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, class25.indexCache4, var28);
          AbstractIndexCache.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048);
          TaskHandler.pcmStreamMixer = new PcmStreamMixer();
          AbstractIndexCache.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer);
@@ -192,15 +186,15 @@ public class class171 {
          Client.titleLoadingStage = 50;
          WorldMapElement.fonts = new Fonts(WorldMapSection3.indexCache8, ByteArrayPool.indexCache13);
       } else {
-         int var1;
-         if(Client.titleLoadingStage == 50) {
-            FontName[] var35 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
-            var1 = var35.length;
-            Fonts var32 = WorldMapElement.fonts;
-            FontName[] var31 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
-            Client.fontsMap = var32.createMap(var31);
-            if(Client.fontsMap.size() < var1) {
-               Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%";
+         int var29;
+         if (Client.titleLoadingStage == 50) {
+            FontName[] var2 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
+            var29 = var2.length;
+            Fonts var3 = WorldMapElement.fonts;
+            FontName[] var4 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
+            Client.fontsMap = var3.createMap(var4);
+            if (Client.fontsMap.size() < var29) {
+               Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var29 + "%";
                Login.Login_loadingPercent = 40;
             } else {
                ScriptEvent.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11);
@@ -211,11 +205,11 @@ public class class171 {
                Login.Login_loadingPercent = 40;
                Client.titleLoadingStage = 60;
             }
-         } else if(Client.titleLoadingStage == 60) {
+         } else if (Client.titleLoadingStage == 60) {
             var0 = FloorDecoration.method2853(class16.indexCache10, WorldMapSection3.indexCache8);
-            var1 = class3.method36();
-            if(var0 < var1) {
-               Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var1 + "%";
+            var29 = class3.method36();
+            if (var0 < var29) {
+               Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var29 + "%";
                Login.Login_loadingPercent = 50;
             } else {
                Login.Login_loadingText = "Loaded title screen";
@@ -224,82 +218,82 @@ public class class171 {
                Client.titleLoadingStage = 70;
             }
          } else {
-            IndexCache var2;
-            if(Client.titleLoadingStage == 70) {
-               if(!ObjectSound.indexCache2.__l_394()) {
+            IndexCache var30;
+            if (Client.titleLoadingStage == 70) {
+               if (!ObjectSound.indexCache2.method2()) {
                   Login.Login_loadingText = "Loading config - " + ObjectSound.indexCache2.loadPercent() + "%";
                   Login.Login_loadingPercent = 60;
                } else {
                   Varcs.method2160(ObjectSound.indexCache2);
                   Varps.method4393(ObjectSound.indexCache2);
-                  IndexCache var34 = ObjectSound.indexCache2;
-                  IndexCache var38 = class40.indexCache7;
-                  KitDefinition.KitDefinition_indexCache = var34;
-                  KitDefinition.__im_f = var38;
-                  KitDefinition.__im_q = KitDefinition.KitDefinition_indexCache.__s_396(3);
+                  IndexCache var31 = ObjectSound.indexCache2;
+                  IndexCache var33 = class40.indexCache7;
+                  KitDefinition.KitDefinition_indexCache = var31;
+                  KitDefinition.field456 = var33;
+                  KitDefinition.field457 = KitDefinition.KitDefinition_indexCache.method4(3);
                   RectangleMode.method6028(ObjectSound.indexCache2, class40.indexCache7, Client.isLowDetail);
                   IsaacCipher.method4082(ObjectSound.indexCache2, class40.indexCache7);
-                  var2 = ObjectSound.indexCache2;
-                  StructDefinition.__jq_m = var2;
-                  IndexCache var3 = ObjectSound.indexCache2;
-                  IndexCache var4 = class40.indexCache7;
-                  boolean var5 = Client.isMembersWorld;
-                  Font var6 = ScriptEvent.fontPlain11;
-                  ItemDefinition.ItemDefinition_indexCache = var3;
-                  ItemDefinition.ItemDefinition_modelIndexCache = var4;
-                  class30.inMembersWorld = var5;
-                  class83.__cm_e = ItemDefinition.ItemDefinition_indexCache.__s_396(10);
-                  class204.__gx_n = var6;
-                  IndexCache var7 = ObjectSound.indexCache2;
-                  IndexCache var8 = AbstractIndexCache.indexCache0;
-                  IndexCache var9 = Skeleton.indexCache1;
-                  SequenceDefinition.SequenceDefinition_indexCache = var7;
-                  SequenceDefinition.__jh_f = var8;
-                  SequenceDefinition.__jh_q = var9;
-                  IndexCache var10 = ObjectSound.indexCache2;
-                  IndexCache var11 = class40.indexCache7;
-                  SpotAnimationDefinition.SpotAnimationDefinition_indexCache = var10;
-                  SpotAnimationDefinition.SpotAnimationDefinition_modelIndexCache = var11;
-                  UnitPriceComparator.method135(ObjectSound.indexCache2);
+                  var30 = ObjectSound.indexCache2;
+                  StructDefinition.field885 = var30;
+                  IndexCache var5 = ObjectSound.indexCache2;
+                  IndexCache var6 = class40.indexCache7;
+                  boolean var7 = Client.isMembersWorld;
+                  Font var8 = ScriptEvent.fontPlain11;
+                  ItemDefinition.ItemDefinition_indexCache = var5;
+                  ItemDefinition.ItemDefinition_modelIndexCache = var6;
+                  class30.inMembersWorld = var7;
+                  class83.field1167 = ItemDefinition.ItemDefinition_indexCache.method4(10);
+                  class204.field1122 = var8;
+                  IndexCache var9 = ObjectSound.indexCache2;
+                  IndexCache var10 = AbstractIndexCache.indexCache0;
+                  IndexCache var11 = Skeleton.indexCache1;
+                  SequenceDefinition.SequenceDefinition_indexCache = var9;
+                  SequenceDefinition.field773 = var10;
+                  SequenceDefinition.field774 = var11;
                   IndexCache var12 = ObjectSound.indexCache2;
-                  VarpDefinition.__ix_m = var12;
-                  VarpDefinition.__ix_f = VarpDefinition.__ix_m.__s_396(16);
-                  IndexCache var13 = WorldMapIcon1.indexCache3;
-                  IndexCache var14 = class40.indexCache7;
-                  IndexCache var15 = WorldMapSection3.indexCache8;
-                  IndexCache var16 = ByteArrayPool.indexCache13;
-                  Widget.Widget_indexCache = var13;
-                  BufferedSource.__fh_x = var14;
-                  Widget.__ho_d = var15;
-                  class27.__aq_k = var16;
-                  Widget.widgets = new Widget[Widget.Widget_indexCache.__t_397()][];
-                  Widget.loadedWidgetGroups = new boolean[Widget.Widget_indexCache.__t_397()];
-                  IndexCache var17 = ObjectSound.indexCache2;
-                  class4.__o_m = var17;
-                  IndexCache var18 = ObjectSound.indexCache2;
-                  EnumDefinition.EnumDefinition_indexCache = var18;
-                  Frames.method3241(ObjectSound.indexCache2);
+                  IndexCache var13 = class40.indexCache7;
+                  SpotAnimationDefinition.SpotAnimationDefinition_indexCache = var12;
+                  SpotAnimationDefinition.SpotAnimationDefinition_modelIndexCache = var13;
+                  UnitPriceComparator.method135(ObjectSound.indexCache2);
+                  IndexCache var14 = ObjectSound.indexCache2;
+                  VarpDefinition.field943 = var14;
+                  VarpDefinition.field944 = VarpDefinition.field943.method4(16);
+                  IndexCache var15 = WorldMapIcon1.indexCache3;
+                  IndexCache var16 = class40.indexCache7;
+                  IndexCache var17 = WorldMapSection3.indexCache8;
+                  IndexCache var18 = ByteArrayPool.indexCache13;
+                  Widget.Widget_indexCache = var15;
+                  BufferedSource.field54 = var16;
+                  Widget.field955 = var17;
+                  class27.field1143 = var18;
+                  Widget.widgets = new Widget[Widget.Widget_indexCache.method5()][];
+                  Widget.loadedWidgetGroups = new boolean[Widget.Widget_indexCache.method5()];
                   IndexCache var19 = ObjectSound.indexCache2;
-                  ParamKeyDefinition.__jb_m = var19;
+                  class4.field1158 = var19;
+                  IndexCache var20 = ObjectSound.indexCache2;
+                  EnumDefinition.EnumDefinition_indexCache = var20;
+                  Frames.method3241(ObjectSound.indexCache2);
+                  IndexCache var21 = ObjectSound.indexCache2;
+                  ParamKeyDefinition.field679 = var21;
                   class196.varcs = new Varcs();
                   class60.method1172(ObjectSound.indexCache2, WorldMapSection3.indexCache8, ByteArrayPool.indexCache13);
-                  IndexCache var20 = ObjectSound.indexCache2;
-                  IndexCache var21 = WorldMapSection3.indexCache8;
-                  HealthBarDefinition.__ii_m = var20;
-                  HealthBarDefinition.__ii_f = var21;
                   IndexCache var22 = ObjectSound.indexCache2;
                   IndexCache var23 = WorldMapSection3.indexCache8;
-                  WorldMapElement.__ic_m = var23;
-                  if(var22.__l_394()) {
-                     UserComparator4.WorldMapElement_count = var22.__s_396(35);
+                  HealthBarDefinition.field379 = var22;
+                  HealthBarDefinition.field380 = var23;
+                  IndexCache var24 = ObjectSound.indexCache2;
+                  IndexCache var25 = WorldMapSection3.indexCache8;
+                  WorldMapElement.field1019 = var25;
+                  if (var24.method2()) {
+                     UserComparator4.WorldMapElement_count = var24.method4(35);
                      Widget.WorldMapElement_cached = new WorldMapElement[UserComparator4.WorldMapElement_count];
 
-                     for(int var24 = 0; var24 < UserComparator4.WorldMapElement_count; ++var24) {
-                        byte[] var25 = var22.takeRecord(35, var24);
-                        Widget.WorldMapElement_cached[var24] = new WorldMapElement(var24);
-                        if(var25 != null) {
-                           Widget.WorldMapElement_cached[var24].read(new Buffer(var25));
-                           Widget.WorldMapElement_cached[var24].__w_409();
+                     for (int var26 = 0; var26 < UserComparator4.WorldMapElement_count; ++var26) {
+                        byte[] var27 = var24.takeRecord(35, var26);
+                        Widget.WorldMapElement_cached[var26] = new WorldMapElement(var26);
+                        if (var27 != null) {
+                           Widget.WorldMapElement_cached[var26].read(new Buffer(var27));
+                           Widget.WorldMapElement_cached[var26].method389();
                         }
                      }
                   }
@@ -308,177 +302,177 @@ public class class171 {
                   Login.Login_loadingPercent = 60;
                   Client.titleLoadingStage = 80;
                }
-            } else if(Client.titleLoadingStage == 80) {
+            } else if (Client.titleLoadingStage == 80) {
                var0 = 0;
-               if(UnitPriceComparator.compass == null) {
-                  UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.__m, 0);
+               if (UnitPriceComparator.compass == null) {
+                  UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.field878, 0);
                } else {
                   ++var0;
                }
 
-               if(FaceNormal.__el_gm == null) {
-                  FaceNormal.__el_gm = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.__f, 0);
+               if (FaceNormal.field345 == null) {
+                  FaceNormal.field345 = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.field879, 0);
                } else {
                   ++var0;
                }
 
-               IndexedSprite[] var27;
-               int var28;
-               if(class192.mapSceneSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.mapScenes;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var27 = null;
+               IndexedSprite[] var32;
+               int var34;
+               if (class192.mapSceneSprites == null) {
+                  var30 = WorldMapSection3.indexCache8;
+                  var34 = class211.spriteIds.mapScenes;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var32 = null;
                   } else {
-                     var27 = WorldMapLabel.createIndexedSpriteArray();
+                     var32 = WorldMapLabel.createIndexedSpriteArray();
                   }
 
-                  class192.mapSceneSprites = var27;
+                  class192.mapSceneSprites = var32;
                } else {
                   ++var0;
                }
 
-               Sprite[] var37;
-               if(class15.headIconPkSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.headIconsPk;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var37 = null;
+               Sprite[] var35;
+               if (class15.headIconPkSprites == null) {
+                  var30 = WorldMapSection3.indexCache8;
+                  var34 = class211.spriteIds.headIconsPk;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var35 = null;
                   } else {
-                     var37 = UserComparator9.createSpriteArray();
+                     var35 = UserComparator9.createSpriteArray();
                   }
 
-                  class15.headIconPkSprites = var37;
+                  class15.headIconPkSprites = var35;
                } else {
                   ++var0;
                }
 
-               if(ClientPreferences.headIconPrayerSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.headIconsPrayer;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var37 = null;
+               if (ClientPreferences.headIconPrayerSprites == null) {
+                  var30 = WorldMapSection3.indexCache8;
+                  var34 = class211.spriteIds.headIconsPrayer;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var35 = null;
                   } else {
-                     var37 = UserComparator9.createSpriteArray();
+                     var35 = UserComparator9.createSpriteArray();
                   }
 
-                  ClientPreferences.headIconPrayerSprites = var37;
+                  ClientPreferences.headIconPrayerSprites = var35;
                } else {
                   ++var0;
                }
 
-               if(Player.headIconHintSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.headIconsHint;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var37 = null;
+               if (Player.headIconHintSprites == null) {
+                  var30 = WorldMapSection3.indexCache8;
+                  var34 = class211.spriteIds.headIconsHint;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var35 = null;
                   } else {
-                     var37 = UserComparator9.createSpriteArray();
+                     var35 = UserComparator9.createSpriteArray();
                   }
 
-                  Player.headIconHintSprites = var37;
+                  Player.headIconHintSprites = var35;
                } else {
                   ++var0;
                }
 
-               if(class16.mapMarkerSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.mapMarkers;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var37 = null;
+               if (class16.mapMarkerSprites == null) {
+                  var30 = WorldMapSection3.indexCache8;
+                  var34 = class211.spriteIds.mapMarkers;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var35 = null;
                   } else {
-                     var37 = UserComparator9.createSpriteArray();
+                     var35 = UserComparator9.createSpriteArray();
                   }
 
-                  class16.mapMarkerSprites = var37;
+                  class16.mapMarkerSprites = var35;
                } else {
                   ++var0;
                }
 
-               if(KeyHandler.crossSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.crosses;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var37 = null;
+               if (KeyHandler.crossSprites == null) {
+                  var30 = WorldMapSection3.indexCache8;
+                  var34 = class211.spriteIds.crosses;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var35 = null;
                   } else {
-                     var37 = UserComparator9.createSpriteArray();
+                     var35 = UserComparator9.createSpriteArray();
                   }
 
-                  KeyHandler.crossSprites = var37;
+                  KeyHandler.crossSprites = var35;
                } else {
                   ++var0;
                }
 
-               if(class39.mapDotSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.mapDots;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var37 = null;
+               if (class39.mapDotSprites == null) {
+                  var30 = WorldMapSection3.indexCache8;
+                  var34 = class211.spriteIds.mapDots;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var35 = null;
                   } else {
-                     var37 = UserComparator9.createSpriteArray();
+                     var35 = UserComparator9.createSpriteArray();
                   }
 
-                  class39.mapDotSprites = var37;
+                  class39.mapDotSprites = var35;
                } else {
                   ++var0;
                }
 
-               if(class32.scrollBarSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.scrollBars;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var27 = null;
+               if (class32.scrollBarSprites == null) {
+                  var30 = WorldMapSection3.indexCache8;
+                  var34 = class211.spriteIds.scrollBars;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var32 = null;
                   } else {
-                     var27 = WorldMapLabel.createIndexedSpriteArray();
+                     var32 = WorldMapLabel.createIndexedSpriteArray();
                   }
 
-                  class32.scrollBarSprites = var27;
+                  class32.scrollBarSprites = var32;
                } else {
                   ++var0;
                }
 
-               if(WorldMapSectionType.modIconSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.modIcons;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var27 = null;
+               if (WorldMapSectionType.modIconSprites == null) {
+                  var30 = WorldMapSection3.indexCache8;
+                  var34 = class211.spriteIds.modIcons;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var32 = null;
                   } else {
-                     var27 = WorldMapLabel.createIndexedSpriteArray();
+                     var32 = WorldMapLabel.createIndexedSpriteArray();
                   }
 
-                  WorldMapSectionType.modIconSprites = var27;
+                  WorldMapSectionType.modIconSprites = var32;
                } else {
                   ++var0;
                }
 
-               if(var0 < 11) {
+               if (var0 < 11) {
                   Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%";
                   Login.Login_loadingPercent = 70;
                } else {
                   AbstractFont.AbstractFont_modIconSprites = WorldMapSectionType.modIconSprites;
-                  FaceNormal.__el_gm.normalize();
-                  var1 = (int)(Math.random() * 21.0D) - 10;
-                  int var29 = (int)(Math.random() * 21.0D) - 10;
-                  var28 = (int)(Math.random() * 21.0D) - 10;
-                  int var30 = (int)(Math.random() * 41.0D) - 20;
-                  class192.mapSceneSprites[0].shiftColors(var30 + var1, var30 + var29, var30 + var28);
+                  FaceNormal.field345.normalize();
+                  var29 = (int)(Math.random() * 21.0D) - 10;
+                  int var36 = (int)(Math.random() * 21.0D) - 10;
+                  var34 = (int)(Math.random() * 21.0D) - 10;
+                  int var38 = (int)(Math.random() * 41.0D) - 20;
+                  class192.mapSceneSprites[0].shiftColors(var38 + var29, var38 + var36, var38 + var34);
                   Login.Login_loadingText = "Loaded sprites";
                   Login.Login_loadingPercent = 70;
                   Client.titleLoadingStage = 90;
                }
-            } else if(Client.titleLoadingStage == 90) {
-               if(!class238.indexCache9.__l_394()) {
-                  Login.Login_loadingText = "Loading textures - " + "0%";
+            } else if (Client.titleLoadingStage == 90) {
+               if (!class238.indexCache9.method2()) {
+                  Login.Login_loadingText = "Loading textures - 0%";
                   Login.Login_loadingPercent = 90;
                } else {
-                  SecureRandomFuture.textureProvider = new TextureProvider(class238.indexCache9, WorldMapSection3.indexCache8, 20, 0.8D, Client.isLowDetail?64:128);
+                  SecureRandomFuture.textureProvider = new TextureProvider(class238.indexCache9, WorldMapSection3.indexCache8, 20, 0.8D, Client.isLowDetail ? 64 : 128);
                   Rasterizer3D.Rasterizer3D_setTextureLoader(SecureRandomFuture.textureProvider);
                   Rasterizer3D.Rasterizer3D_setBrightness(0.8D);
                   Client.titleLoadingStage = 100;
                }
-            } else if(Client.titleLoadingStage == 100) {
-               var0 = SecureRandomFuture.textureProvider.__m_212();
-               if(var0 < 100) {
+            } else if (Client.titleLoadingStage == 100) {
+               var0 = SecureRandomFuture.textureProvider.method323();
+               if (var0 < 100) {
                   Login.Login_loadingText = "Loading textures - " + var0 + "%";
                   Login.Login_loadingPercent = 90;
                } else {
@@ -486,31 +480,31 @@ public class class171 {
                   Login.Login_loadingPercent = 90;
                   Client.titleLoadingStage = 110;
                }
-            } else if(Client.titleLoadingStage == 110) {
+            } else if (Client.titleLoadingStage == 110) {
                Projectile.mouseRecorder = new MouseRecorder();
                GameShell.taskHandler.newThreadTask(Projectile.mouseRecorder, 10);
                Login.Login_loadingText = "Loaded input handler";
                Login.Login_loadingPercent = 92;
                Client.titleLoadingStage = 120;
-            } else if(Client.titleLoadingStage == 120) {
-               if(!class16.indexCache10.tryLoadRecordByNames("huffman", "")) {
-                  Login.Login_loadingText = "Loading wordpack - " + 0 + "%";
+            } else if (Client.titleLoadingStage == 120) {
+               if (!class16.indexCache10.tryLoadRecordByNames("huffman", "")) {
+                  Login.Login_loadingText = "Loading wordpack - 0%";
                   Login.Login_loadingPercent = 94;
                } else {
-                  Huffman var26 = new Huffman(class16.indexCache10.takeRecordByNames("huffman", ""));
-                  class303.huffman = var26;
+                  Huffman var37 = new Huffman(class16.indexCache10.takeRecordByNames("huffman", ""));
+                  class303.huffman = var37;
                   Login.Login_loadingText = "Loaded wordpack";
                   Login.Login_loadingPercent = 94;
                   Client.titleLoadingStage = 130;
                }
-            } else if(Client.titleLoadingStage == 130) {
-               if(!WorldMapIcon1.indexCache3.__l_394()) {
+            } else if (Client.titleLoadingStage == 130) {
+               if (!WorldMapIcon1.indexCache3.method2()) {
                   Login.Login_loadingText = "Loading interfaces - " + WorldMapIcon1.indexCache3.loadPercent() * 4 / 5 + "%";
                   Login.Login_loadingPercent = 96;
-               } else if(!Formatting.indexCache12.__l_394()) {
+               } else if (!Formatting.indexCache12.method2()) {
                   Login.Login_loadingText = "Loading interfaces - " + (80 + Formatting.indexCache12.loadPercent() / 6) + "%";
                   Login.Login_loadingPercent = 96;
-               } else if(!ByteArrayPool.indexCache13.__l_394()) {
+               } else if (!ByteArrayPool.indexCache13.method2()) {
                   Login.Login_loadingText = "Loading interfaces - " + (96 + ByteArrayPool.indexCache13.loadPercent() / 50) + "%";
                   Login.Login_loadingPercent = 96;
                } else {
@@ -518,24 +512,25 @@ public class class171 {
                   Login.Login_loadingPercent = 98;
                   Client.titleLoadingStage = 140;
                }
-            } else if(Client.titleLoadingStage == 140) {
+            } else if (Client.titleLoadingStage == 140) {
                Login.Login_loadingPercent = 100;
-               if(!ItemContainer.__bc_dm.tryLoadArchiveByName(WorldMapCacheName.WorldMapCacheName_details.name)) {
-                  Login.Login_loadingText = "Loading world map - " + ItemContainer.__bc_dm.archiveLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%";
+               if (!ItemContainer.field434.tryLoadArchiveByName(WorldMapCacheName.WorldMapCacheName_details.name)) {
+                  Login.Login_loadingText = "Loading world map - " + ItemContainer.field434.archiveLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%";
                } else {
-                  if(class60.worldMap0 == null) {
+                  if (class60.worldMap0 == null) {
                      class60.worldMap0 = new WorldMap();
-                     class60.worldMap0.init(ItemContainer.__bc_dm, WorldMapLabelSize.__s_dq, AbstractByteArrayCopier.__gu_et, class2.fontBold12, Client.fontsMap, class192.mapSceneSprites);
+                     class60.worldMap0.init(ItemContainer.field434, WorldMapLabelSize.field1040, AbstractByteArrayCopier.field0, class2.fontBold12, Client.fontsMap, class192.mapSceneSprites);
                   }
 
                   Login.Login_loadingText = "Loaded world map";
                   Client.titleLoadingStage = 150;
                }
-            } else if(Client.titleLoadingStage == 150) {
+            } else if (Client.titleLoadingStage == 150) {
                GameShell.updateGameState(10);
             }
          }
       }
+
    }
 
    @ObfuscatedName("ie")
@@ -543,111 +538,116 @@ public class class171 {
       signature = "(IIIILjava/lang/String;I)V",
       garbageValue = "49247882"
    )
-   static void method3494(int opIndex, int parentID, int childID, int itemID, String target) {
-      Widget var5 = class204.getWidgetChild(parentID, childID);
-      if(var5 != null) {
-         if(var5.onOp != null) {
+   static void method3494(int var0, int var1, int var2, int var3, String var4) {
+      Widget var5 = class204.getWidgetChild(var1, var2);
+      if (var5 != null) {
+         if (var5.onOp != null) {
             ScriptEvent var6 = new ScriptEvent();
             var6.widget = var5;
-            var6.opIndex = opIndex;
-            var6.targetName = target;
+            var6.opIndex = var0;
+            var6.targetName = var4;
             var6.args0 = var5.onOp;
             AbstractIndexCache.runScript(var6);
          }
 
          boolean var11 = true;
-         if(var5.contentType > 0) {
+         if (var5.contentType > 0) {
             var11 = ViewportMouse.method2957(var5);
          }
 
-         if(var11) {
-            int var8 = class1.getWidgetClickMask(var5);
-            int var9 = opIndex - 1;
-            boolean var7 = (var8 >> var9 + 1 & 1) != 0;
-            if(var7) {
+         if (var11) {
+            int var7 = class1.getWidgetClickMask(var5);
+            int var8 = var0 - 1;
+            boolean var9 = (var7 >> var8 + 1 & 1) != 0;
+            if (var9) {
                PacketBufferNode var10;
-               if(opIndex == 1) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_bi, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 1) {
+                  var10 = Interpreter.method1915(ClientPacket.field290, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 2) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_b, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 2) {
+                  var10 = Interpreter.method1915(ClientPacket.field243, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 3) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_aa, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 3) {
+                  var10 = Interpreter.method1915(ClientPacket.field270, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 4) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_y, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 4) {
+                  var10 = Interpreter.method1915(ClientPacket.field241, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 5) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_ad, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 5) {
+                  var10 = Interpreter.method1915(ClientPacket.field262, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 6) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_br, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 6) {
+                  var10 = Interpreter.method1915(ClientPacket.field288, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 7) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_cu, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 7) {
+                  var10 = Interpreter.method1915(ClientPacket.field307, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 8) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_a, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 8) {
+                  var10 = Interpreter.method1915(ClientPacket.field236, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 9) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_cj, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 9) {
+                  var10 = Interpreter.method1915(ClientPacket.field306, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 10) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_m, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 10) {
+                  var10 = Interpreter.method1915(ClientPacket.field222, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
-
             }
          }
       }
+
+   }
+
+   static {
+      field1117 = false;
+      field1119 = new Hashtable(16);
    }
 }
diff --git a/runescape-client/src/main/java/class190.java b/runescape-client/src/main/java/class190.java
index b36e1c9dfa..d0a6e50c4b 100644
--- a/runescape-client/src/main/java/class190.java
+++ b/runescape-client/src/main/java/class190.java
@@ -58,19 +58,6 @@ public class class190 {
    @Export("xteaKeys")
    static int[][] xteaKeys;
 
-   static {
-      field2346 = new class190(7);
-      field2352 = new class190(15);
-      field2342 = new class190(14);
-      field2341 = new class190(6);
-      field2344 = new class190(4);
-      field2345 = new class190(5);
-      field2350 = new class190(2);
-      field2347 = new class190(3);
-      field2343 = new class190(5);
-      field2349 = new class190(4);
-   }
-
    @ObfuscatedSignature(
       signature = "(I)V",
       garbageValue = "7"
@@ -84,7 +71,7 @@ public class class190 {
       garbageValue = "-68901151"
    )
    static World method3672() {
-      World.__bt_g = 0;
+      World.field987 = 0;
       return Fonts.method5647();
    }
 
@@ -96,17 +83,17 @@ public class class190 {
    static final void method3669(int var0, int var1, int var2, int var3, int var4, int var5) {
       int var6 = var2 - var0;
       int var7 = var3 - var1;
-      int var8 = var6 >= 0?var6:-var6;
-      int var9 = var7 >= 0?var7:-var7;
+      int var8 = var6 >= 0 ? var6 : -var6;
+      int var9 = var7 >= 0 ? var7 : -var7;
       int var10 = var8;
-      if(var8 < var9) {
+      if (var8 < var9) {
          var10 = var9;
       }
 
-      if(var10 != 0) {
+      if (var10 != 0) {
          int var11 = (var6 << 16) / var10;
          int var12 = (var7 << 16) / var10;
-         if(var12 <= var11) {
+         if (var12 <= var11) {
             var11 = -var11;
          } else {
             var12 = -var12;
@@ -131,5 +118,19 @@ public class class190 {
          Rasterizer3D.method2985(var17, var19, var20);
          Rasterizer3D.method3020(var21, var23, var24, var17, var19, var20, var4);
       }
+
+   }
+
+   static {
+      field2346 = new class190(7);
+      field2352 = new class190(15);
+      field2342 = new class190(14);
+      field2341 = new class190(6);
+      field2344 = new class190(4);
+      field2345 = new class190(5);
+      field2350 = new class190(2);
+      field2347 = new class190(3);
+      field2343 = new class190(5);
+      field2349 = new class190(4);
    }
 }
diff --git a/runescape-client/src/main/java/class196.java b/runescape-client/src/main/java/class196.java
index 750c5159bc..64d8241dc3 100644
--- a/runescape-client/src/main/java/class196.java
+++ b/runescape-client/src/main/java/class196.java
@@ -12,17 +12,13 @@ public class class196 {
    @Export("varcs")
    static Varcs varcs;
 
-   static {
-      new HashMap();
-   }
-
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "(ILcg;ZB)I",
       garbageValue = "125"
    )
    static int method3736(int var0, Script var1, boolean var2) {
-      return var0 < 1000?Canvas.method861(var0, var1, var2):(var0 < 1100?class1.method8(var0, var1, var2):(var0 < 1200?StructDefinition.method4952(var0, var1, var2):(var0 < 1300?class32.method576(var0, var1, var2):(var0 < 1400?WorldMapAreaData.method710(var0, var1, var2):(var0 < 1500?class11.method141(var0, var1, var2):(var0 < 1600?WorldMapSectionType.method253(var0, var1, var2):(var0 < 1700?ScriptEvent.method1185(var0, var1, var2):(var0 < 1800?Formatting.method2023(var0, var1, var2):(var0 < 1900?class16.method188(var0, var1, var2):(var0 < 2000?FriendSystem.method1867(var0, var1, var2):(var0 < 2100?class1.method8(var0, var1, var2):(var0 < 2200?StructDefinition.method4952(var0, var1, var2):(var0 < 2300?class32.method576(var0, var1, var2):(var0 < 2400?WorldMapAreaData.method710(var0, var1, var2):(var0 < 2500?class11.method141(var0, var1, var2):(var0 < 2600?ViewportMouse.method2983(var0, var1, var2):(var0 < 2700?GrandExchangeEvents.method75(var0, var1, var2):(var0 < 2800?class11.method146(var0, var1, var2):(var0 < 2900?class15.method182(var0, var1, var2):(var0 < 3000?FriendSystem.method1867(var0, var1, var2):(var0 < 3200?class4.method54(var0, var1, var2):(var0 < 3300?WorldComparator.method68(var0, var1, var2):(var0 < 3400?ScriptEvent.method1187(var0, var1, var2):(var0 < 3500?Formatting.method2022(var0, var1, var2):(var0 < 3700?FontName.method5639(var0, var1, var2):(var0 < 4000?class248.method4741(var0, var1, var2):(var0 < 4100?TextureProvider.method2752(var0, var1, var2):(var0 < 4200?class211.method4103(var0, var1, var2):(var0 < 4300?class1.method16(var0, var1, var2):(var0 < 5100?DynamicObject.method2223(var0, var1, var2):(var0 < 5400?UserComparator4.method3335(var0, var1, var2):(var0 < 5600?OwnWorldComparator.method1285(var0, var1, var2):(var0 < 5700?Decimator.method2492(var0, var1, var2):(var0 < 6300?class229.method4513(var0, var1, var2):(var0 < 6600?class31.method573(var0, var1, var2):(var0 < 6700?class54.method1093(var0, var1, var2):2))))))))))))))))))))))))))))))))))));
+      return var0 < 1000 ? Canvas.method861(var0, var1, var2) : (var0 < 1100 ? class1.method8(var0, var1, var2) : (var0 < 1200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 1300 ? class32.method576(var0, var1, var2) : (var0 < 1400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 1500 ? class11.method141(var0, var1, var2) : (var0 < 1600 ? WorldMapSectionType.method253(var0, var1, var2) : (var0 < 1700 ? ScriptEvent.method1185(var0, var1, var2) : (var0 < 1800 ? Formatting.method2023(var0, var1, var2) : (var0 < 1900 ? class16.method188(var0, var1, var2) : (var0 < 2000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 2100 ? class1.method8(var0, var1, var2) : (var0 < 2200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 2300 ? class32.method576(var0, var1, var2) : (var0 < 2400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 2500 ? class11.method141(var0, var1, var2) : (var0 < 2600 ? ViewportMouse.method2983(var0, var1, var2) : (var0 < 2700 ? GrandExchangeEvents.method75(var0, var1, var2) : (var0 < 2800 ? class11.method146(var0, var1, var2) : (var0 < 2900 ? class15.method182(var0, var1, var2) : (var0 < 3000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 3200 ? class4.method54(var0, var1, var2) : (var0 < 3300 ? WorldComparator.method68(var0, var1, var2) : (var0 < 3400 ? ScriptEvent.method1187(var0, var1, var2) : (var0 < 3500 ? Formatting.method2022(var0, var1, var2) : (var0 < 3700 ? FontName.method5639(var0, var1, var2) : (var0 < 4000 ? class248.method4741(var0, var1, var2) : (var0 < 4100 ? TextureProvider.method2752(var0, var1, var2) : (var0 < 4200 ? class211.method4103(var0, var1, var2) : (var0 < 4300 ? class1.method16(var0, var1, var2) : (var0 < 5100 ? DynamicObject.method2223(var0, var1, var2) : (var0 < 5400 ? UserComparator4.method3335(var0, var1, var2) : (var0 < 5600 ? OwnWorldComparator.method1285(var0, var1, var2) : (var0 < 5700 ? Decimator.method2492(var0, var1, var2) : (var0 < 6300 ? class229.method4513(var0, var1, var2) : (var0 < 6600 ? class31.method573(var0, var1, var2) : (var0 < 6700 ? class54.method1093(var0, var1, var2) : 2))))))))))))))))))))))))))))))))))));
    }
 
    @ObfuscatedName("u")
@@ -31,7 +27,7 @@ public class class196 {
       garbageValue = "-127"
    )
    static void method3740() {
-      if(Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
+      if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
          Login.currentLoginField = 1;
       } else {
          Login.currentLoginField = 0;
@@ -45,6 +41,10 @@ public class class196 {
       garbageValue = "1247389467"
    )
    static final String method3735(int var0) {
-      return var0 < 100000?"<col=ffff00>" + var0 + "</col>":(var0 < 10000000?"<col=ffffff>" + var0 / 1000 + "K" + "</col>":"<col=00ff80>" + var0 / 1000000 + "M" + "</col>");
+      return var0 < 100000 ? "<col=ffff00>" + var0 + "</col>" : (var0 < 10000000 ? "<col=ffffff>" + var0 / 1000 + "K</col>" : "<col=00ff80>" + var0 / 1000000 + "M</col>");
+   }
+
+   static {
+      new HashMap();
    }
 }
diff --git a/runescape-client/src/main/java/class198.java b/runescape-client/src/main/java/class198.java
index bf77a5a5b6..362dfec973 100644
--- a/runescape-client/src/main/java/class198.java
+++ b/runescape-client/src/main/java/class198.java
@@ -9,6 +9,6 @@ public class class198 {
       garbageValue = "1713547686"
    )
    static String method3745(Widget var0) {
-      return class211.method4107(class1.getWidgetClickMask(var0)) == 0?null:(var0.spellActionName != null && var0.spellActionName.trim().length() != 0?var0.spellActionName:null);
+      return class211.method4107(class1.getWidgetClickMask(var0)) == 0 ? null : (var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null);
    }
 }
diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java
index 7c697769f4..2fc08b58ab 100644
--- a/runescape-client/src/main/java/class2.java
+++ b/runescape-client/src/main/java/class2.java
@@ -39,7 +39,7 @@ final class class2 implements class0 {
       garbageValue = "704451908"
    )
    public Object vmethod46(Buffer var1) {
-      return Long.valueOf(var1.readLong());
+      return var1.readLong();
    }
 
    @ObfuscatedName("g")
@@ -48,7 +48,7 @@ final class class2 implements class0 {
       garbageValue = "1518625016"
    )
    void method21(Long var1, Buffer var2) {
-      var2.writeLong(var1.longValue());
+      var2.writeLong(var1);
    }
 
    @ObfuscatedName("q")
@@ -57,18 +57,17 @@ final class class2 implements class0 {
       garbageValue = "-1535318699"
    )
    static void method27(AbstractIndexCache var0, AbstractIndexCache var1, boolean var2, int var3) {
-      if(Login.__cu_f) {
-         if(var3 == 4) {
+      if (Login.field465) {
+         if (var3 == 4) {
             Login.loginIndex = 4;
          }
-
       } else {
          Login.loginIndex = var3;
          Rasterizer2D.Rasterizer2D_clear();
          byte[] var4 = var0.takeRecordByNames("title.jpg", "");
          Login.leftTitleSprite = class27.convertJpgToSprite(var4);
          Fonts.rightTitleSprite = Login.leftTitleSprite.copy();
-         if((Client.worldProperties & 0x20000000) != 0) {
+         if ((Client.worldProperties & 536870912) != 0) {
             WorldMapSectionType.logoSprite = MenuAction.loadIndexedSpriteByName(var1, "logo_deadman_mode", "");
          } else {
             WorldMapSectionType.logoSprite = MenuAction.loadIndexedSpriteByName(var1, "logo", "");
@@ -76,20 +75,20 @@ final class class2 implements class0 {
 
          Login.titleboxSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebox", "");
          IndexCacheLoader.titlebuttonSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebutton", "");
-         int var6 = var1.getArchiveId("runes");
-         int var7 = var1.getRecordId(var6, "");
-         IndexedSprite[] var8;
-         if(!SpriteMask.loadSprite(var1, var6, var7)) {
-            var8 = null;
+         int var5 = var1.getArchiveId("runes");
+         int var6 = var1.getRecordId(var5, "");
+         IndexedSprite[] var7;
+         if (!SpriteMask.loadSprite(var1, var5, var6)) {
+            var7 = null;
          } else {
-            var8 = WorldMapLabel.createIndexedSpriteArray();
+            var7 = WorldMapLabel.createIndexedSpriteArray();
          }
 
-         WorldMapEvent.runesSprite = var8;
-         var7 = var1.getArchiveId("title_mute");
-         int var10 = var1.getRecordId(var7, "");
+         WorldMapEvent.runesSprite = var7;
+         var6 = var1.getArchiveId("title_mute");
+         int var8 = var1.getRecordId(var6, "");
          IndexedSprite[] var9;
-         if(!SpriteMask.loadSprite(var1, var7, var10)) {
+         if (!SpriteMask.loadSprite(var1, var6, var8)) {
             var9 = null;
          } else {
             var9 = WorldMapLabel.createIndexedSpriteArray();
@@ -103,23 +102,23 @@ final class class2 implements class0 {
          class168.optionButtonSpriteSubWidth = Login.options_buttons_0Sprite.subWidth;
          GroundItemPile.optionButtonSpriteSubHeight = Login.options_buttons_0Sprite.subHeight;
          class16.loginScreenRunesAnimation = new LoginScreenAnimation(WorldMapEvent.runesSprite);
-         if(var2) {
+         if (var2) {
             Login.Login_username = "";
             Login.Login_password = "";
          }
 
          class13.otpInt = 0;
          Login.otp = "";
-         Login.__cu_ba = true;
+         Login.field470 = true;
          Login.worldSelectOpen = false;
-         if(!ReflectionCheck.clientPreferences.titleMusicDisabled) {
+         if (!ReflectionCheck.clientPreferences.titleMusicDisabled) {
             Canvas.method858(2, UserComparator3.indexCache6, "scape main", "", 255, false);
          } else {
             AbstractSocket.method3488(2);
          }
 
          UserComparator9.method3343(false);
-         Login.__cu_f = true;
+         Login.field465 = true;
          Login.xPadding = (SoundCache.canvasWidth - 765) / 2;
          Login.loginBoxX = Login.xPadding + 202;
          Varps.loginBoxCenter = Login.loginBoxX + 180;
@@ -127,6 +126,7 @@ final class class2 implements class0 {
          Fonts.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
          WorldMapSectionType.logoSprite.drawAt(Login.xPadding + 382 - WorldMapSectionType.logoSprite.subWidth / 2, 18);
       }
+
    }
 
    @ObfuscatedName("w")
@@ -138,7 +138,7 @@ final class class2 implements class0 {
       int var3 = var0.getArchiveId(var1);
       int var4 = var0.getRecordId(var3, var2);
       Sprite[] var5;
-      if(!SpriteMask.loadSprite(var0, var3, var4)) {
+      if (!SpriteMask.loadSprite(var0, var3, var4)) {
          var5 = null;
       } else {
          var5 = UserComparator9.createSpriteArray();
diff --git a/runescape-client/src/main/java/class203.java b/runescape-client/src/main/java/class203.java
index 57b042deea..8761324d52 100644
--- a/runescape-client/src/main/java/class203.java
+++ b/runescape-client/src/main/java/class203.java
@@ -26,7 +26,7 @@ public class class203 {
    @Export("currentTimeMs")
    public static synchronized long currentTimeMs() {
       long var0 = System.currentTimeMillis();
-      if(var0 < ModelData0.currentTimeMsLast) {
+      if (var0 < ModelData0.currentTimeMsLast) {
          currentTimeMsOffset += ModelData0.currentTimeMsLast - var0;
       }
 
@@ -36,30 +36,27 @@ public class class203 {
 
    @ObfuscatedName("m")
    public static final void method4010(long var0) {
-      if(var0 > 0L) {
-         if(var0 % 10L == 0L) {
+      if (var0 > 0L) {
+         if (var0 % 10L == 0L) {
             long var2 = var0 - 1L;
 
             try {
                Thread.sleep(var2);
-            } catch (InterruptedException var8) {
-               ;
+            } catch (InterruptedException var7) {
             }
 
             try {
                Thread.sleep(1L);
-            } catch (InterruptedException var7) {
-               ;
+            } catch (InterruptedException var6) {
             }
          } else {
             try {
                Thread.sleep(var0);
-            } catch (InterruptedException var6) {
-               ;
+            } catch (InterruptedException var5) {
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("w")
@@ -68,10 +65,10 @@ public class class203 {
       garbageValue = "571835999"
    )
    public static void method4008(int var0) {
-      if(class214.__hf_o != 0) {
-         WorldMapLabel.__aj_e = var0;
+      if (class214.field1129 != 0) {
+         WorldMapLabel.field1039 = var0;
       } else {
-         class214.midiPcmStream.__m_340(var0);
+         class214.midiPcmStream.method169(var0);
       }
 
    }
diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java
index 191a9e79af..4f769cbdf6 100644
--- a/runescape-client/src/main/java/class204.java
+++ b/runescape-client/src/main/java/class204.java
@@ -5,26 +5,14 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("gx")
 public class class204 {
    @ObfuscatedName("x")
-   static final int[] __gx_x;
+   static final int[] field1120;
    @ObfuscatedName("d")
-   static final int[] __gx_d;
+   static final int[] field1121;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lkk;"
    )
-   public static Font __gx_n;
-
-   static {
-      __gx_x = new int[2048];
-      __gx_d = new int[2048];
-      double var0 = 0.0030679615757712823D;
-
-      for(int var2 = 0; var2 < 2048; ++var2) {
-         __gx_x[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2));
-         __gx_d[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2));
-      }
-
-   }
+   public static Font field1122;
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
@@ -34,7 +22,7 @@ public class class204 {
    @Export("getWidgetChild")
    public static Widget getWidgetChild(int var0, int var1) {
       Widget var2 = Huffman.getWidget(var0);
-      return var1 == -1?var2:(var2 != null && var2.children != null && var1 < var2.children.length?var2.children[var1]:null);
+      return var1 == -1 ? var2 : (var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null);
    }
 
    @ObfuscatedName("f")
@@ -54,43 +42,56 @@ public class class204 {
       garbageValue = "64"
    )
    static final void method4013(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) {
-      int var10;
-      for(int var9 = 0; var9 < 8; ++var9) {
-         for(var10 = 0; var10 < 8; ++var10) {
-            if(var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) {
-               var8[var1].flags[var9 + var2][var3 + var10] &= -16777217;
+      int var9;
+      for (int var10 = 0; var10 < 8; ++var10) {
+         for (var9 = 0; var9 < 8; ++var9) {
+            if (var10 + var2 > 0 && var10 + var2 < 103 && var3 + var9 > 0 && var3 + var9 < 103) {
+               int[] var10000 = var8[var1].flags[var10 + var2];
+               var10000[var3 + var9] &= -16777217;
             }
          }
       }
 
-      Buffer var21 = new Buffer(var0);
+      Buffer var18 = new Buffer(var0);
 
-      for(var10 = 0; var10 < 4; ++var10) {
-         for(int var11 = 0; var11 < 64; ++var11) {
-            for(int var12 = 0; var12 < 64; ++var12) {
-               if(var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) {
-                  int var15 = var2 + CollisionMap.method3632(var11 & 7, var12 & 7, var7);
-                  int var18 = var11 & 7;
-                  int var19 = var12 & 7;
-                  int var20 = var7 & 3;
+      for (var9 = 0; var9 < 4; ++var9) {
+         for (int var11 = 0; var11 < 64; ++var11) {
+            for (int var12 = 0; var12 < 64; ++var12) {
+               if (var9 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) {
+                  int var13 = var2 + CollisionMap.method3632(var11 & 7, var12 & 7, var7);
+                  int var14 = var11 & 7;
+                  int var15 = var12 & 7;
+                  int var16 = var7 & 3;
                   int var17;
-                  if(var20 == 0) {
-                     var17 = var19;
-                  } else if(var20 == 1) {
-                     var17 = 7 - var18;
-                  } else if(var20 == 2) {
-                     var17 = 7 - var19;
+                  if (var16 == 0) {
+                     var17 = var15;
+                  } else if (var16 == 1) {
+                     var17 = 7 - var14;
+                  } else if (var16 == 2) {
+                     var17 = 7 - var15;
                   } else {
-                     var17 = var18;
+                     var17 = var14;
                   }
 
-                  TotalQuantityComparator.loadTerrain(var21, var1, var15, var3 + var17, 0, 0, var7);
+                  TotalQuantityComparator.loadTerrain(var18, var1, var13, var3 + var17, 0, 0, var7);
                } else {
-                  TotalQuantityComparator.loadTerrain(var21, 0, -1, -1, 0, 0, 0);
+                  TotalQuantityComparator.loadTerrain(var18, 0, -1, -1, 0, 0, 0);
                }
             }
          }
       }
 
    }
+
+   static {
+      field1120 = new int[2048];
+      field1121 = new int[2048];
+      double var0 = 0.0030679615757712823D;
+
+      for (int var2 = 0; var2 < 2048; ++var2) {
+         field1120[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2));
+         field1121[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2));
+      }
+
+   }
 }
diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java
index 6aa5d7d036..fcc927ce95 100644
--- a/runescape-client/src/main/java/class21.java
+++ b/runescape-client/src/main/java/class21.java
@@ -1,5 +1,4 @@
 import java.util.LinkedList;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
@@ -7,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("b")
 public abstract class class21 {
    @ObfuscatedName("by")
-   static String __b_by;
+   static String field1123;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = -474193537
@@ -96,15 +95,15 @@ public abstract class class21 {
       garbageValue = "-108"
    )
    void method263(AbstractIndexCache var1) {
-      if(!this.method271()) {
+      if (!this.method271()) {
          byte[] var2 = var1.takeRecord(this.field150, this.field152);
-         if(var2 != null) {
+         if (var2 != null) {
             this.vmethod715(new Buffer(var2));
             this.field157 = true;
             this.field153 = true;
          }
-
       }
+
    }
 
    @ObfuscatedName("x")
@@ -113,11 +112,11 @@ public abstract class class21 {
       garbageValue = "-2111523326"
    )
    void method282() {
-      this.field151 = null;
-      this.field145 = null;
-      this.field154 = null;
-      this.field155 = null;
-      this.field144 = null;
+      this.field151 = (short[][][])null;
+      this.field145 = (short[][][])null;
+      this.field154 = (byte[][][])null;
+      this.field155 = (byte[][][])null;
+      this.field144 = (class25[][][][])null;
       this.field157 = false;
       this.field153 = false;
    }
@@ -129,14 +128,14 @@ public abstract class class21 {
    )
    void method259(int var1, int var2, Buffer var3) {
       int var4 = var3.readUnsignedByte();
-      if(var4 != 0) {
-         if((var4 & 1) != 0) {
+      if (var4 != 0) {
+         if ((var4 & 1) != 0) {
             this.method260(var1, var2, var3, var4);
          } else {
             this.method257(var1, var2, var3, var4);
          }
-
       }
+
    }
 
    @ObfuscatedName("a")
@@ -146,7 +145,7 @@ public abstract class class21 {
    )
    void method260(int var1, int var2, Buffer var3, int var4) {
       boolean var5 = (var4 & 2) != 0;
-      if(var5) {
+      if (var5) {
          this.field145[0][var1][var2] = (short)var3.readUnsignedByte();
       }
 
@@ -165,31 +164,31 @@ public abstract class class21 {
       this.field151[0][var1][var2] = (short)var3.readUnsignedByte();
       int var8;
       int var9;
-      int var11;
-      if(var6) {
+      int var10;
+      if (var6) {
          var8 = var3.readUnsignedByte();
 
-         for(var9 = 0; var9 < var8; ++var9) {
-            int var10 = var3.readUnsignedByte();
-            if(var10 != 0) {
-               this.field145[var9][var1][var2] = (short)var10;
-               var11 = var3.readUnsignedByte();
-               this.field154[var9][var1][var2] = (byte)(var11 >> 2);
-               this.field155[var9][var1][var2] = (byte)(var11 & 3);
+         for (var9 = 0; var9 < var8; ++var9) {
+            int var11 = var3.readUnsignedByte();
+            if (var11 != 0) {
+               this.field145[var9][var1][var2] = (short)var11;
+               var10 = var3.readUnsignedByte();
+               this.field154[var9][var1][var2] = (byte)(var10 >> 2);
+               this.field155[var9][var1][var2] = (byte)(var10 & 3);
             }
          }
       }
 
-      if(var7) {
-         for(var8 = 0; var8 < var5; ++var8) {
+      if (var7) {
+         for (var8 = 0; var8 < var5; ++var8) {
             var9 = var3.readUnsignedByte();
-            if(var9 != 0) {
+            if (var9 != 0) {
                class25[] var14 = this.field144[var8][var1][var2] = new class25[var9];
 
-               for(var11 = 0; var11 < var9; ++var11) {
-                  int var12 = var3.__ap_310();
+               for (var10 = 0; var10 < var9; ++var10) {
+                  int var12 = var3.method51();
                   int var13 = var3.readUnsignedByte();
-                  var14[var11] = new class25(var12, var13 >> 2, var13 & 3);
+                  var14[var10] = new class25(var12, var13 >> 2, var13 & 3);
                }
             }
          }
@@ -221,115 +220,115 @@ public abstract class class21 {
       garbageValue = "-3"
    )
    static final void method293(PacketBuffer var0) {
-      for(int var1 = 0; var1 < Players.__cq_n; ++var1) {
-         int var2 = Players.__cq_i[var1];
+      for (int var1 = 0; var1 < Players.field736; ++var1) {
+         int var2 = Players.field737[var1];
          Player var3 = Client.players[var2];
          int var4 = var0.readUnsignedByte();
-         if((var4 & 8) != 0) {
+         if ((var4 & 8) != 0) {
             var4 += var0.readUnsignedByte() << 8;
          }
 
          byte var5 = -1;
          int var6;
          int var7;
+         int var8;
          int var9;
          int var10;
-         int var13;
-         if((var4 & 64) != 0) {
-            var6 = var0.__bb_317();
-            int var8;
+         if ((var4 & 64) != 0) {
+            var6 = var0.method58();
             int var11;
             int var12;
-            if(var6 > 0) {
-               for(var7 = 0; var7 < var6; ++var7) {
+            int var13;
+            if (var6 > 0) {
+               for (var7 = 0; var7 < var6; ++var7) {
+                  var8 = -1;
                   var9 = -1;
-                  var10 = -1;
-                  var11 = -1;
-                  var8 = var0.__ae_307();
-                  if(var8 == 32767) {
-                     var8 = var0.__ae_307();
-                     var10 = var0.__ae_307();
-                     var9 = var0.__ae_307();
-                     var11 = var0.__ae_307();
-                  } else if(var8 != 32766) {
-                     var10 = var0.__ae_307();
+                  var12 = -1;
+                  var11 = var0.method48();
+                  if (var11 == 32767) {
+                     var11 = var0.method48();
+                     var9 = var0.method48();
+                     var8 = var0.method48();
+                     var12 = var0.method48();
+                  } else if (var11 != 32766) {
+                     var9 = var0.method48();
                   } else {
-                     var8 = -1;
+                     var11 = -1;
                   }
 
-                  var12 = var0.__ae_307();
-                  var3.addHitSplat(var8, var10, var9, var11, Client.cycle, var12);
+                  var13 = var0.method48();
+                  var3.addHitSplat(var11, var9, var8, var12, Client.cycle, var13);
                }
             }
 
             var7 = var0.readUnsignedByteNegate();
-            if(var7 > 0) {
-               for(var8 = 0; var8 < var7; ++var8) {
-                  var9 = var0.__ae_307();
-                  var10 = var0.__ae_307();
-                  if(var10 != 32767) {
-                     var11 = var0.__ae_307();
-                     var12 = var0.__bb_317();
-                     var13 = var10 > 0?var0.readUnsignedByte():var12;
-                     var3.addHealthBar(var9, Client.cycle, var10, var11, var12, var13);
+            if (var7 > 0) {
+               for (var11 = 0; var11 < var7; ++var11) {
+                  var8 = var0.method48();
+                  var9 = var0.method48();
+                  if (var9 != 32767) {
+                     var12 = var0.method48();
+                     var13 = var0.method58();
+                     var10 = var9 > 0 ? var0.readUnsignedByte() : var13;
+                     var3.addHealthBar(var8, Client.cycle, var9, var12, var13, var10);
                   } else {
-                     var3.removeHealthBar(var9);
+                     var3.removeHealthBar(var8);
                   }
                }
             }
          }
 
-         if((var4 & 512) != 0) {
-            var3.spotAnimation = var0.__bm_326();
-            var6 = var0.__bp_331();
+         if ((var4 & 512) != 0) {
+            var3.spotAnimation = var0.method67();
+            var6 = var0.method72();
             var3.heightOffset = var6 >> 16;
-            var3.__bt = (var6 & 65535) + Client.cycle;
+            var3.field14 = (var6 & 65535) + Client.cycle;
             var3.spotAnimationFrame = 0;
             var3.spotAnimationFrameCycle = 0;
-            if(var3.__bt > Client.cycle) {
+            if (var3.field14 > Client.cycle) {
                var3.spotAnimationFrame = -1;
             }
 
-            if(var3.spotAnimation == 65535) {
+            if (var3.spotAnimation == 65535) {
                var3.spotAnimation = -1;
             }
          }
 
-         if((var4 & 4096) != 0) {
-            var5 = var0.__bn_319();
+         if ((var4 & 4096) != 0) {
+            var5 = var0.method60();
          }
 
-         if((var4 & 1024) != 0) {
-            var3.__bf = var0.__bd_321();
-            var3.__be = var0.__bn_319();
-            var3.__bh = var0.__bn_319();
-            var3.__bv = var0.__bd_321();
-            var3.__bw = var0.__bu_325() + Client.cycle;
-            var3.__cr = var0.__by_324() + Client.cycle;
-            var3.__cv = var0.__ag_302();
-            if(var3.__ag) {
-               var3.__bf += var3.tileX;
-               var3.__be += var3.tileY;
-               var3.__bh += var3.tileX;
-               var3.__bv += var3.tileY;
+         if ((var4 & 1024) != 0) {
+            var3.field15 = var0.method62();
+            var3.field17 = var0.method60();
+            var3.field16 = var0.method60();
+            var3.field18 = var0.method62();
+            var3.field19 = var0.method66() + Client.cycle;
+            var3.field20 = var0.method65() + Client.cycle;
+            var3.field21 = var0.method43();
+            if (var3.field725) {
+               var3.field15 += var3.tileX;
+               var3.field17 += var3.tileY;
+               var3.field16 += var3.tileX;
+               var3.field18 += var3.tileY;
                var3.pathLength = 0;
             } else {
-               var3.__bf += var3.pathX[0];
-               var3.__be += var3.pathY[0];
-               var3.__bh += var3.pathX[0];
-               var3.__bv += var3.pathY[0];
+               var3.field15 += var3.pathX[0];
+               var3.field17 += var3.pathY[0];
+               var3.field16 += var3.pathX[0];
+               var3.field18 += var3.pathY[0];
                var3.pathLength = 1;
             }
 
-            var3.__ch = 0;
+            var3.field25 = 0;
          }
 
-         if((var4 & 32) != 0) {
+         if ((var4 & 32) != 0) {
             var3.overheadText = var0.readStringCp1252NullTerminated();
-            if(var3.overheadText.charAt(0) == '~') {
+            if (var3.overheadText.charAt(0) == '~') {
                var3.overheadText = var3.overheadText.substring(1);
                WorldMapIcon1.method219(2, var3.username.getName(), var3.overheadText);
-            } else if(var3 == Canvas.localPlayer) {
+            } else if (var3 == Canvas.localPlayer) {
                WorldMapIcon1.method219(2, var3.username.getName(), var3.overheadText);
             }
 
@@ -339,83 +338,83 @@ public abstract class class21 {
             var3.overheadTextCyclesRemaining = 150;
          }
 
-         if((var4 & 4) != 0) {
-            var3.__bc = var0.__by_324();
-            if(var3.pathLength == 0) {
-               var3.orientation = var3.__bc;
-               var3.__bc = -1;
+         if ((var4 & 4) != 0) {
+            var3.field12 = var0.method65();
+            if (var3.pathLength == 0) {
+               var3.orientation = var3.field12;
+               var3.field12 = -1;
             }
          }
 
-         if((var4 & 1) != 0) {
-            var6 = var0.__bq_318();
-            byte[] var14 = new byte[var6];
-            Buffer var15 = new Buffer(var14);
-            var0.__bh_333(var14, 0, var6);
-            Players.__cq_o[var2] = var15;
-            var3.read(var15);
+         if ((var4 & 1) != 0) {
+            var6 = var0.method59();
+            byte[] var15 = new byte[var6];
+            Buffer var16 = new Buffer(var15);
+            var0.method74(var15, 0, var6);
+            Players.field733[var2] = var16;
+            var3.read(var16);
          }
 
-         if((var4 & 2) != 0) {
-            var3.targetIndex = var0.__bu_325();
-            if(var3.targetIndex == 65535) {
+         if ((var4 & 2) != 0) {
+            var3.targetIndex = var0.method66();
+            if (var3.targetIndex == 65535) {
                var3.targetIndex = -1;
             }
          }
 
-         if((var4 & 2048) != 0) {
-            Players.__cq_w[var2] = var0.__bn_319();
+         if ((var4 & 2048) != 0) {
+            Players.field732[var2] = var0.method60();
          }
 
-         if((var4 & 16) != 0) {
-            var6 = var0.__bu_325();
-            PlayerType var20 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var0.readUnsignedByte());
+         if ((var4 & 16) != 0) {
+            var6 = var0.method66();
+            PlayerType var17 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var0.readUnsignedByte());
             boolean var18 = var0.readUnsignedByteNegate() == 1;
-            var9 = var0.readUnsignedByte();
-            var10 = var0.index;
-            if(var3.username != null && var3.appearance != null) {
+            var8 = var0.readUnsignedByte();
+            var9 = var0.index;
+            if (var3.username != null && var3.appearance != null) {
                boolean var19 = false;
-               if(var20.isUser && WorldMapArea.friendSystem.isIgnored(var3.username)) {
+               if (var17.isUser && WorldMapArea.friendSystem.isIgnored(var3.username)) {
                   var19 = true;
                }
 
-               if(!var19 && Client.__client_jc == 0 && !var3.isHidden) {
-                  Players.__cq_a.index = 0;
-                  var0.__al_305(Players.__cq_a.array, 0, var9);
-                  Players.__cq_a.index = 0;
-                  String var16 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(Players.__cq_a)));
-                  var3.overheadText = var16.trim();
+               if (!var19 && Client.field208 == 0 && !var3.isHidden) {
+                  Players.field738.index = 0;
+                  var0.method46(Players.field738.array, 0, var8);
+                  Players.field738.index = 0;
+                  String var14 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(Players.field738)));
+                  var3.overheadText = var14.trim();
                   var3.overheadTextColor = var6 >> 8;
                   var3.overheadTextEffect = var6 & 255;
                   var3.overheadTextCyclesRemaining = 150;
                   var3.isAutoChatting = var18;
-                  var3.__az = var3 != Canvas.localPlayer && var20.isUser && "" != Client.__client_pz && var16.toLowerCase().indexOf(Client.__client_pz) == -1;
-                  if(var20.isPrivileged) {
-                     var13 = var18?91:1;
+                  var3.field11 = var3 != Canvas.localPlayer && var17.isUser && "" != Client.field158 && var14.toLowerCase().indexOf(Client.field158) == -1;
+                  if (var17.isPrivileged) {
+                     var10 = var18 ? 91 : 1;
                   } else {
-                     var13 = var18?90:2;
+                     var10 = var18 ? 90 : 2;
                   }
 
-                  if(var20.modIcon != -1) {
-                     WorldMapIcon1.method219(var13, ItemContainer.method1170(var20.modIcon) + var3.username.getName(), var16);
+                  if (var17.modIcon != -1) {
+                     WorldMapIcon1.method219(var10, ItemContainer.method1170(var17.modIcon) + var3.username.getName(), var14);
                   } else {
-                     WorldMapIcon1.method219(var13, var3.username.getName(), var16);
+                     WorldMapIcon1.method219(var10, var3.username.getName(), var14);
                   }
                }
             }
 
-            var0.index = var10 + var9;
+            var0.index = var9 + var8;
          }
 
-         if((var4 & 256) != 0) {
-            for(var6 = 0; var6 < 3; ++var6) {
+         if ((var4 & 256) != 0) {
+            for (var6 = 0; var6 < 3; ++var6) {
                var3.actions[var6] = var0.readStringCp1252NullTerminated();
             }
          }
 
-         if((var4 & 128) != 0) {
-            var6 = var0.__ag_302();
-            if(var6 == 65535) {
+         if ((var4 & 128) != 0) {
+            var6 = var0.method43();
+            if (var6 == 65535) {
                var6 = -1;
             }
 
@@ -423,18 +422,18 @@ public abstract class class21 {
             class234.method4534(var3, var6, var7);
          }
 
-         if(var3.__ag) {
-            if(var5 == 127) {
+         if (var3.field725) {
+            if (var5 == 127) {
                var3.resetPath(var3.tileX, var3.tileY);
             } else {
-               byte var17;
-               if(var5 != -1) {
-                  var17 = var5;
+               byte var20;
+               if (var5 != -1) {
+                  var20 = var5;
                } else {
-                  var17 = Players.__cq_w[var2];
+                  var20 = Players.field732[var2];
                }
 
-               var3.__x_130(var3.tileX, var3.tileY, var17);
+               var3.method254(var3.tileX, var3.tileY, var20);
             }
          }
       }
diff --git a/runescape-client/src/main/java/class210.java b/runescape-client/src/main/java/class210.java
index ea27bac5c4..163a3ddb17 100644
--- a/runescape-client/src/main/java/class210.java
+++ b/runescape-client/src/main/java/class210.java
@@ -18,176 +18,178 @@ public class class210 {
    )
    static void method4101(PacketBuffer var0, int var1) {
       boolean var2 = var0.readBits(1) == 1;
-      if(var2) {
-         Players.__cq_i[++Players.__cq_n - 1] = var1;
+      if (var2) {
+         Players.field737[++Players.field736 - 1] = var1;
       }
 
       int var3 = var0.readBits(2);
       Player var4 = Client.players[var1];
-      if(var3 == 0) {
-         if(var2) {
-            var4.__ag = false;
-         } else if(Client.localPlayerIndex == var1) {
-            throw new RuntimeException();
+      if (var3 == 0) {
+         if (var2) {
+            var4.field725 = false;
          } else {
+            if (Client.localPlayerIndex == var1) {
+               throw new RuntimeException();
+            }
+
             Players.Players_regions[var1] = (var4.plane << 28) + (GraphicsObject.baseY + var4.pathY[0] >> 13) + (class50.baseX + var4.pathX[0] >> 13 << 14);
-            if(var4.__bc != -1) {
-               Players.Players_orientations[var1] = var4.__bc;
+            if (var4.field12 != -1) {
+               Players.Players_orientations[var1] = var4.field12;
             } else {
                Players.Players_orientations[var1] = var4.orientation;
             }
 
             Players.Players_targetIndices[var1] = var4.targetIndex;
             Client.players[var1] = null;
-            if(var0.readBits(1) != 0) {
+            if (var0.readBits(1) != 0) {
                class236.updateExternalPlayer(var0, var1);
             }
-
          }
       } else {
          int var5;
          int var6;
          int var7;
-         if(var3 == 1) {
+         if (var3 == 1) {
             var5 = var0.readBits(3);
             var6 = var4.pathX[0];
             var7 = var4.pathY[0];
-            if(var5 == 0) {
+            if (var5 == 0) {
                --var6;
                --var7;
-            } else if(var5 == 1) {
+            } else if (var5 == 1) {
                --var7;
-            } else if(var5 == 2) {
+            } else if (var5 == 2) {
                ++var6;
                --var7;
-            } else if(var5 == 3) {
+            } else if (var5 == 3) {
                --var6;
-            } else if(var5 == 4) {
+            } else if (var5 == 4) {
                ++var6;
-            } else if(var5 == 5) {
+            } else if (var5 == 5) {
                --var6;
                ++var7;
-            } else if(var5 == 6) {
+            } else if (var5 == 6) {
                ++var7;
-            } else if(var5 == 7) {
+            } else if (var5 == 7) {
                ++var6;
                ++var7;
             }
 
-            if(Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
-               var4.resetPath(var6, var7);
-               var4.__ag = false;
-            } else if(var2) {
-               var4.__ag = true;
-               var4.tileX = var6;
-               var4.tileY = var7;
+            if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) {
+               if (var2) {
+                  var4.field725 = true;
+                  var4.tileX = var6;
+                  var4.tileY = var7;
+               } else {
+                  var4.field725 = false;
+                  var4.method254(var6, var7, Players.field732[var1]);
+               }
             } else {
-               var4.__ag = false;
-               var4.__x_130(var6, var7, Players.__cq_w[var1]);
+               var4.resetPath(var6, var7);
+               var4.field725 = false;
             }
-
-         } else if(var3 == 2) {
+         } else if (var3 == 2) {
             var5 = var0.readBits(4);
             var6 = var4.pathX[0];
             var7 = var4.pathY[0];
-            if(var5 == 0) {
+            if (var5 == 0) {
                var6 -= 2;
                var7 -= 2;
-            } else if(var5 == 1) {
+            } else if (var5 == 1) {
                --var6;
                var7 -= 2;
-            } else if(var5 == 2) {
+            } else if (var5 == 2) {
                var7 -= 2;
-            } else if(var5 == 3) {
+            } else if (var5 == 3) {
                ++var6;
                var7 -= 2;
-            } else if(var5 == 4) {
+            } else if (var5 == 4) {
                var6 += 2;
                var7 -= 2;
-            } else if(var5 == 5) {
+            } else if (var5 == 5) {
                var6 -= 2;
                --var7;
-            } else if(var5 == 6) {
+            } else if (var5 == 6) {
                var6 += 2;
                --var7;
-            } else if(var5 == 7) {
+            } else if (var5 == 7) {
                var6 -= 2;
-            } else if(var5 == 8) {
+            } else if (var5 == 8) {
                var6 += 2;
-            } else if(var5 == 9) {
+            } else if (var5 == 9) {
                var6 -= 2;
                ++var7;
-            } else if(var5 == 10) {
+            } else if (var5 == 10) {
                var6 += 2;
                ++var7;
-            } else if(var5 == 11) {
+            } else if (var5 == 11) {
                var6 -= 2;
                var7 += 2;
-            } else if(var5 == 12) {
+            } else if (var5 == 12) {
                --var6;
                var7 += 2;
-            } else if(var5 == 13) {
+            } else if (var5 == 13) {
                var7 += 2;
-            } else if(var5 == 14) {
+            } else if (var5 == 14) {
                ++var6;
                var7 += 2;
-            } else if(var5 == 15) {
+            } else if (var5 == 15) {
                var6 += 2;
                var7 += 2;
             }
 
-            if(Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
-               var4.resetPath(var6, var7);
-               var4.__ag = false;
-            } else if(var2) {
-               var4.__ag = true;
-               var4.tileX = var6;
-               var4.tileY = var7;
+            if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) {
+               if (var2) {
+                  var4.field725 = true;
+                  var4.tileX = var6;
+                  var4.tileY = var7;
+               } else {
+                  var4.field725 = false;
+                  var4.method254(var6, var7, Players.field732[var1]);
+               }
             } else {
-               var4.__ag = false;
-               var4.__x_130(var6, var7, Players.__cq_w[var1]);
+               var4.resetPath(var6, var7);
+               var4.field725 = false;
             }
-
          } else {
             var5 = var0.readBits(1);
             int var8;
             int var9;
             int var10;
             int var11;
-            if(var5 == 0) {
+            if (var5 == 0) {
                var6 = var0.readBits(12);
                var7 = var6 >> 10;
                var8 = var6 >> 5 & 31;
-               if(var8 > 15) {
+               if (var8 > 15) {
                   var8 -= 32;
                }
 
                var9 = var6 & 31;
-               if(var9 > 15) {
+               if (var9 > 15) {
                   var9 -= 32;
                }
 
                var10 = var8 + var4.pathX[0];
                var11 = var9 + var4.pathY[0];
-               if(Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) {
-                  if(var2) {
-                     var4.__ag = true;
+               if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) {
+                  if (var2) {
+                     var4.field725 = true;
                      var4.tileX = var10;
                      var4.tileY = var11;
                   } else {
-                     var4.__ag = false;
-                     var4.__x_130(var10, var11, Players.__cq_w[var1]);
+                     var4.field725 = false;
+                     var4.method254(var10, var11, Players.field732[var1]);
                   }
                } else {
                   var4.resetPath(var10, var11);
-                  var4.__ag = false;
+                  var4.field725 = false;
                }
 
                var4.plane = (byte)(var7 + var4.plane & 3);
-               if(Client.localPlayerIndex == var1) {
+               if (Client.localPlayerIndex == var1) {
                   SoundSystem.plane = var4.plane;
                }
-
             } else {
                var6 = var0.readBits(30);
                var7 = var6 >> 28;
@@ -195,25 +197,25 @@ public class class210 {
                var9 = var6 & 16383;
                var10 = (var8 + class50.baseX + var4.pathX[0] & 16383) - class50.baseX;
                var11 = (var9 + GraphicsObject.baseY + var4.pathY[0] & 16383) - GraphicsObject.baseY;
-               if(Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
+               if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
                   var4.resetPath(var10, var11);
-                  var4.__ag = false;
-               } else if(var2) {
-                  var4.__ag = true;
+                  var4.field725 = false;
+               } else if (var2) {
+                  var4.field725 = true;
                   var4.tileX = var10;
                   var4.tileY = var11;
                } else {
-                  var4.__ag = false;
-                  var4.__x_130(var10, var11, Players.__cq_w[var1]);
+                  var4.field725 = false;
+                  var4.method254(var10, var11, Players.field732[var1]);
                }
 
                var4.plane = (byte)(var7 + var4.plane & 3);
-               if(Client.localPlayerIndex == var1) {
+               if (Client.localPlayerIndex == var1) {
                   SoundSystem.plane = var4.plane;
                }
-
             }
          }
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/class211.java
index 73bb469301..dec93d8492 100644
--- a/runescape-client/src/main/java/class211.java
+++ b/runescape-client/src/main/java/class211.java
@@ -8,11 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("hg")
 public class class211 {
    @ObfuscatedName("m")
-   static final String[][] __hg_m;
+   static final String[][] field1124;
    @ObfuscatedName("f")
-   static final String[] __hg_f;
+   static final String[] field1125;
    @ObfuscatedName("q")
-   static Calendar __hg_q;
+   static Calendar field1126;
    @ObfuscatedName("em")
    @ObfuscatedSignature(
       signature = "Llg;"
@@ -20,13 +20,6 @@ public class class211 {
    @Export("spriteIds")
    static SpriteIds spriteIds;
 
-   static {
-      __hg_m = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}};
-      __hg_f = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-      Calendar.getInstance(TimeZone.getTimeZone("Europe/London"));
-      __hg_q = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
-   }
-
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(II)I",
@@ -44,154 +37,154 @@ public class class211 {
    static int method4103(int var0, Script var1, boolean var2) {
       String var3;
       int var4;
-      if(var0 == 4100) {
+      if (var0 == 4100) {
          var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
          var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4;
          return 1;
       } else {
-         String var9;
-         if(var0 == 4101) {
+         String var5;
+         if (var0 == 4101) {
             Interpreter.Interpreter_stringStackSize -= 2;
             var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-            var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-            Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var9;
+            var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+            Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var5;
             return 1;
-         } else if(var0 == 4102) {
+         } else if (var0 == 4102) {
             var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
             var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + ByteArrayPool.method4001(var4, true);
             return 1;
-         } else if(var0 == 4103) {
+         } else if (var0 == 4103) {
             var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
             Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toLowerCase();
             return 1;
          } else {
             int var6;
-            int var10;
-            if(var0 == 4104) {
-               var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               long var11 = ((long)var10 + 11745L) * 86400000L;
-               Interpreter.Interpreter_calendar.setTime(new Date(var11));
+            int var7;
+            if (var0 == 4104) {
+               var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               long var14 = ((long)var7 + 11745L) * 86400000L;
+               Interpreter.Interpreter_calendar.setTime(new Date(var14));
                var6 = Interpreter.Interpreter_calendar.get(5);
-               int var16 = Interpreter.Interpreter_calendar.get(2);
-               int var8 = Interpreter.Interpreter_calendar.get(1);
-               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.__bv_z[var16] + "-" + var8;
+               int var15 = Interpreter.Interpreter_calendar.get(2);
+               int var16 = Interpreter.Interpreter_calendar.get(1);
+               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.field422[var15] + "-" + var16;
                return 1;
-            } else if(var0 != 4105) {
-               if(var0 == 4106) {
-                  var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var10);
+            } else if (var0 != 4105) {
+               if (var0 == 4106) {
+                  var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var7);
                   return 1;
-               } else if(var0 == 4107) {
+               } else if (var0 == 4107) {
                   Interpreter.Interpreter_stringStackSize -= 2;
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WallDecoration.method3256(AttackOption.method2033(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], Client.language));
                   return 1;
                } else {
-                  int var5;
-                  byte[] var13;
-                  Font var14;
-                  if(var0 == 4108) {
+                  int var8;
+                  byte[] var9;
+                  Font var10;
+                  if (var0 == 4108) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                      RouteStrategy.Interpreter_intStackSize -= 2;
                      var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                     var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                     var13 = ByteArrayPool.indexCache13.takeRecord(var5, 0);
-                     var14 = new Font(var13);
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4);
+                     var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                     var9 = ByteArrayPool.indexCache13.takeRecord(var8, 0);
+                     var10 = new Font(var9);
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineCount(var3, var4);
                      return 1;
-                  } else if(var0 == 4109) {
+                  } else if (var0 == 4109) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                      RouteStrategy.Interpreter_intStackSize -= 2;
                      var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                     var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                     var13 = ByteArrayPool.indexCache13.takeRecord(var5, 0);
-                     var14 = new Font(var13);
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4);
+                     var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                     var9 = ByteArrayPool.indexCache13.takeRecord(var8, 0);
+                     var10 = new Font(var9);
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineWidth(var3, var4);
                      return 1;
-                  } else if(var0 == 4110) {
+                  } else if (var0 == 4110) {
                      Interpreter.Interpreter_stringStackSize -= 2;
                      var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-                     var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-                     if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
+                     var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+                     if (Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
                         Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
                      } else {
-                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9;
+                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5;
                      }
 
                      return 1;
-                  } else if(var0 == 4111) {
+                  } else if (var0 == 4111) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                      Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3);
                      return 1;
-                  } else if(var0 == 4112) {
+                  } else if (var0 == 4112) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                      var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                      Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var4;
                      return 1;
-                  } else if(var0 == 4113) {
-                     var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ChatChannel.method2238((char)var10)?1:0;
+                  } else if (var0 == 4113) {
+                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ChatChannel.method2238((char)var7) ? 1 : 0;
                      return 1;
-                  } else if(var0 == 4114) {
-                     var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = VarcInt.isAlphaNumeric((char)var10)?1:0;
+                  } else if (var0 == 4114) {
+                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = VarcInt.isAlphaNumeric((char)var7) ? 1 : 0;
                      return 1;
-                  } else if(var0 == 4115) {
-                     var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = UrlRequest.method3271((char)var10)?1:0;
+                  } else if (var0 == 4115) {
+                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = UrlRequest.method3271((char)var7) ? 1 : 0;
                      return 1;
-                  } else if(var0 == 4116) {
-                     var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class159.method3394((char)var10)?1:0;
+                  } else if (var0 == 4116) {
+                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class159.method3394((char)var7) ? 1 : 0;
                      return 1;
-                  } else if(var0 == 4117) {
+                  } else if (var0 == 4117) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-                     if(var3 != null) {
+                     if (var3 != null) {
                         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.length();
                      } else {
                         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                      }
 
                      return 1;
-                  } else if(var0 == 4118) {
+                  } else if (var0 == 4118) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                      RouteStrategy.Interpreter_intStackSize -= 2;
                      var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                     var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var4, var5);
+                     var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var4, var8);
                      return 1;
-                  } else if(var0 == 4119) {
+                  } else if (var0 == 4119) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-                     StringBuilder var17 = new StringBuilder(var3.length());
-                     boolean var15 = false;
+                     StringBuilder var11 = new StringBuilder(var3.length());
+                     boolean var12 = false;
 
-                     for(var6 = 0; var6 < var3.length(); ++var6) {
-                        char var7 = var3.charAt(var6);
-                        if(var7 == '<') {
-                           var15 = true;
-                        } else if(var7 == '>') {
-                           var15 = false;
-                        } else if(!var15) {
-                           var17.append(var7);
+                     for (var6 = 0; var6 < var3.length(); ++var6) {
+                        char var13 = var3.charAt(var6);
+                        if (var13 == '<') {
+                           var12 = true;
+                        } else if (var13 == '>') {
+                           var12 = false;
+                        } else if (!var12) {
+                           var11.append(var13);
                         }
                      }
 
-                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var17.toString();
+                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.toString();
                      return 1;
-                  } else if(var0 == 4120) {
+                  } else if (var0 == 4120) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                      var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var4);
                      return 1;
-                  } else if(var0 == 4121) {
+                  } else if (var0 == 4121) {
                      Interpreter.Interpreter_stringStackSize -= 2;
                      var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-                     var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5);
+                     var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+                     var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var5, var8);
                      return 1;
-                  } else if(var0 == 4122) {
+                  } else if (var0 == 4122) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                      Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase();
                      return 1;
@@ -202,9 +195,9 @@ public class class211 {
             } else {
                Interpreter.Interpreter_stringStackSize -= 2;
                var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-               var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-               if(Canvas.localPlayer.appearance != null && Canvas.localPlayer.appearance.isFemale) {
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9;
+               var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+               if (Canvas.localPlayer.appearance != null && Canvas.localPlayer.appearance.isFemale) {
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5;
                } else {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
                }
@@ -214,4 +207,11 @@ public class class211 {
          }
       }
    }
+
+   static {
+      field1124 = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}};
+      field1125 = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
+      Calendar.getInstance(TimeZone.getTimeZone("Europe/London"));
+      field1126 = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+   }
 }
diff --git a/runescape-client/src/main/java/class212.java b/runescape-client/src/main/java/class212.java
index 21afc326ac..24005d53ea 100644
--- a/runescape-client/src/main/java/class212.java
+++ b/runescape-client/src/main/java/class212.java
@@ -5,18 +5,18 @@ import net.runelite.mapping.ObfuscatedName;
 public class class212 {
    @ObfuscatedName("m")
    public static void method4109(byte[] var0, int var1, byte[] var2, int var3, int var4) {
-      if(var2 == var0) {
-         if(var3 == var1) {
+      if (var2 == var0) {
+         if (var3 == var1) {
             return;
          }
 
-         if(var3 > var1 && var3 < var4 + var1) {
+         if (var3 > var1 && var3 < var4 + var1) {
             --var4;
             var1 += var4;
             var3 += var4;
             var4 = var1 - var4;
 
-            for(var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) {
+            for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) {
                var2[var3--] = var0[var1--];
                var2[var3--] = var0[var1--];
                var2[var3--] = var0[var1--];
@@ -26,8 +26,7 @@ public class class212 {
                var2[var3--] = var0[var1--];
             }
 
-            for(var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) {
-               ;
+            for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) {
             }
 
             return;
@@ -36,7 +35,7 @@ public class class212 {
 
       var4 += var1;
 
-      for(var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) {
+      for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) {
          var2[var3++] = var0[var1++];
          var2[var3++] = var0[var1++];
          var2[var3++] = var0[var1++];
@@ -46,8 +45,7 @@ public class class212 {
          var2[var3++] = var0[var1++];
       }
 
-      for(var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) {
-         ;
+      for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) {
       }
 
    }
@@ -55,7 +53,7 @@ public class class212 {
    @ObfuscatedName("x")
    @Export("clearIntArray")
    public static void clearIntArray(int[] var0, int var1, int var2) {
-      for(var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) {
+      for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) {
          var0[var1++] = 0;
          var0[var1++] = 0;
          var0[var1++] = 0;
@@ -65,8 +63,7 @@ public class class212 {
          var0[var1++] = 0;
       }
 
-      for(var2 += 7; var1 < var2; var0[var1++] = 0) {
-         ;
+      for (var2 += 7; var1 < var2; var0[var1++] = 0) {
       }
 
    }
diff --git a/runescape-client/src/main/java/class214.java b/runescape-client/src/main/java/class214.java
index c5924e20a2..e57819a221 100644
--- a/runescape-client/src/main/java/class214.java
+++ b/runescape-client/src/main/java/class214.java
@@ -9,12 +9,12 @@ public class class214 {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __hf_f;
+   public static AbstractIndexCache field1127;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __hf_q;
+   public static AbstractIndexCache field1128;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lhm;"
@@ -25,14 +25,14 @@ public class class214 {
    @ObfuscatedGetter(
       intValue = -848833001
    )
-   public static int __hf_o;
+   public static int field1129;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __hf_u;
+   public static AbstractIndexCache field1130;
    @ObfuscatedName("k")
-   static int[] __hf_k;
+   static int[] field1131;
    @ObfuscatedName("ko")
    @ObfuscatedGetter(
       intValue = 2079315667
@@ -40,62 +40,58 @@ public class class214 {
    @Export("menuWidth")
    static int menuWidth;
 
-   static {
-      __hf_o = 0;
-   }
-
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "(Ljava/lang/CharSequence;IZI)Z",
       garbageValue = "-125135280"
    )
    static boolean method4144(CharSequence var0, int var1, boolean var2) {
-      if(var1 >= 2 && var1 <= 36) {
+      if (var1 >= 2 && var1 <= 36) {
          boolean var3 = false;
          boolean var4 = false;
          int var5 = 0;
          int var6 = var0.length();
 
-         for(int var7 = 0; var7 < var6; ++var7) {
+         for (int var7 = 0; var7 < var6; ++var7) {
             char var8 = var0.charAt(var7);
-            if(var7 == 0) {
-               if(var8 == '-') {
+            if (var7 == 0) {
+               if (var8 == '-') {
                   var3 = true;
                   continue;
                }
 
-               if(var8 == '+') {
+               if (var8 == '+') {
                   continue;
                }
             }
 
-            int var10;
-            if(var8 >= '0' && var8 <= '9') {
-               var10 = var8 - '0';
-            } else if(var8 >= 'A' && var8 <= 'Z') {
-               var10 = var8 - '7';
+            int var9;
+            if (var8 >= '0' && var8 <= '9') {
+               var9 = var8 - '0';
+            } else if (var8 >= 'A' && var8 <= 'Z') {
+               var9 = var8 - '7';
             } else {
-               if(var8 < 'a' || var8 > 'z') {
+               if (var8 < 'a' || var8 > 'z') {
                   return false;
                }
 
-               var10 = var8 - 'W';
+               var9 = var8 - 'W';
             }
 
-            if(var10 >= var1) {
+            if (var9 >= var1) {
                return false;
             }
 
-            if(var3) {
-               var10 = -var10;
+            if (var3) {
+               var9 = -var9;
             }
 
-            int var9 = var5 * var1 + var10;
-            if(var9 / var1 != var5) {
+            int var10 = var5 * var1 + var9;
+            if (var10 / var1 != var5) {
                return false;
             }
 
-            var5 = var9;
+            var5 = var10;
             var4 = true;
          }
 
@@ -113,4 +109,8 @@ public class class214 {
    public static int method4157(CharSequence var0, int var1) {
       return IgnoreList.method5438(var0, var1, true);
    }
+
+   static {
+      field1129 = 0;
+   }
 }
diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java
index abedb5af5a..ca51d2e204 100644
--- a/runescape-client/src/main/java/class22.java
+++ b/runescape-client/src/main/java/class22.java
@@ -43,7 +43,6 @@ public final class class22 {
       intValue = 2138505015
    )
    int field167;
-   // $FF: synthetic field
    @ObfuscatedSignature(
       signature = "Lal;"
    )
@@ -71,10 +70,10 @@ public final class class22 {
       garbageValue = "61"
    )
    static final void method294(String var0) {
-      StringBuilder var10000 = (new StringBuilder()).append(var0);
-      Object var10001 = null;
-      String var1 = var10000.append(" is already on your ignore list").toString();
-      WorldMapIcon1.method219(30, "", var1);
+      StringBuilder var1 = (new StringBuilder()).append(var0);
+      Object var2 = null;
+      String var3 = var1.append(" is already on your ignore list").toString();
+      WorldMapIcon1.method219(30, "", var3);
    }
 
    @ObfuscatedName("fw")
@@ -85,7 +84,7 @@ public final class class22 {
    @Export("newIndexCache")
    static IndexCache newIndexCache(int var0, boolean var1, boolean var2, boolean var3) {
       IndexStore var4 = null;
-      if(class168.dat2File != null) {
+      if (class168.dat2File != null) {
          var4 = new IndexStore(var0, class168.dat2File, IndexStoreAction.idxFiles[var0], 1000000);
       }
 
@@ -98,8 +97,8 @@ public final class class22 {
       garbageValue = "1002272291"
    )
    static void method295(Widget var0) {
-      if(var0.cycle == Client.__client_oo) {
-         Client.__client_od[var0.rootIndex] = true;
+      if (var0.cycle == Client.field98) {
+         Client.field100[var0.rootIndex] = true;
       }
 
    }
@@ -111,13 +110,13 @@ public final class class22 {
    )
    static final void method296(Widget var0, int var1, int var2, int var3) {
       SpriteMask var4 = var0.getSpriteMask(false);
-      if(var4 != null) {
-         if(Client.minimapState < 3) {
-            UnitPriceComparator.compass.__ay_513(var1, var2, var4.width, var4.height, 25, 25, Client.minimapOrientation, 256, var4.xStarts, var4.xWidths);
+      if (var4 != null) {
+         if (Client.minimapState < 3) {
+            UnitPriceComparator.compass.method315(var1, var2, var4.width, var4.height, 25, 25, Client.minimapOrientation, 256, var4.xStarts, var4.xWidths);
          } else {
             Rasterizer2D.method5948(var1, var2, 0, var4.xStarts, var4.xWidths);
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java
index 6ae0e4e5b4..099dbf1a87 100644
--- a/runescape-client/src/main/java/class226.java
+++ b/runescape-client/src/main/java/class226.java
@@ -5,20 +5,13 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("ht")
 public class class226 {
    @ObfuscatedName("m")
-   public static final short[] __ht_m;
+   public static final short[] field1132;
    @ObfuscatedName("f")
-   public static final short[][] __ht_f;
+   public static final short[][] field1133;
    @ObfuscatedName("q")
-   public static final short[] __ht_q;
+   public static final short[] field1134;
    @ObfuscatedName("w")
-   public static final short[][] __ht_w;
-
-   static {
-      __ht_m = new short[]{(short)6798, (short)8741, (short)25238, (short)4626, (short)4550};
-      __ht_f = new short[][]{{(short)6798, (short)107, (short)10283, (short)16, (short)4797, (short)7744, (short)5799, (short)4634, (short)-31839, (short)22433, (short)2983, (short)-11343, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)8741, (short)12, (short)-1506, (short)-22374, (short)7735, (short)8404, (short)1701, (short)-27106, (short)24094, (short)10153, (short)-8915, (short)4783, (short)1341, (short)16578, (short)-30533, (short)25239, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)25238, (short)8742, (short)12, (short)-1506, (short)-22374, (short)7735, (short)8404, (short)1701, (short)-27106, (short)24094, (short)10153, (short)-8915, (short)4783, (short)1341, (short)16578, (short)-30533, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)4626, (short)11146, (short)6439, (short)12, (short)4758, (short)10270}, {(short)4550, (short)4537, (short)5681, (short)5673, (short)5790, (short)6806, (short)8076, (short)4574, (short)17050, (short)0, (short)127, (short)-31821, (short)-17991}};
-      __ht_q = new short[]{(short)-10304, (short)9104, (short)-1, (short)-1, (short)-1};
-      __ht_w = new short[][]{{(short)6554, (short)115, (short)10304, (short)28, (short)5702, (short)7756, (short)5681, (short)4510, (short)-31835, (short)22437, (short)2859, (short)-11339, (short)16, (short)5157, (short)10446, (short)3658, (short)-27314, (short)-21965, (short)472, (short)580, (short)784, (short)21966, (short)28950, (short)-15697, (short)-14002}, {(short)9104, (short)10275, (short)7595, (short)3610, (short)7975, (short)8526, (short)918, (short)-26734, (short)24466, (short)10145, (short)-6882, (short)5027, (short)1457, (short)16565, (short)-30545, (short)25486, (short)24, (short)5392, (short)10429, (short)3673, (short)-27335, (short)-21957, (short)192, (short)687, (short)412, (short)21821, (short)28835, (short)-15460, (short)-14019}, new short[0], new short[0], new short[0]};
-   }
+   public static final short[][] field1135;
 
    @ObfuscatedName("d")
    @ObfuscatedSignature(
@@ -27,54 +20,54 @@ public class class226 {
    )
    @Export("getItemSprite")
    public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) {
-      if(var1 == -1) {
+      if (var1 == -1) {
          var4 = 0;
-      } else if(var4 == 2 && var1 != 1) {
+      } else if (var4 == 2 && var1 != 1) {
          var4 = 1;
       }
 
       long var6 = ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40) + ((long)var3 << 42);
       Sprite var8;
-      if(!var5) {
+      if (!var5) {
          var8 = (Sprite)ItemDefinition.Sprite_cached.get(var6);
-         if(var8 != null) {
+         if (var8 != null) {
             return var8;
          }
       }
 
       ItemDefinition var9 = Skills.getItemDefinition(var0);
-      if(var1 > 1 && var9.__az != null) {
+      if (var1 > 1 && var9.field436 != null) {
          int var10 = -1;
 
-         for(int var11 = 0; var11 < 10; ++var11) {
-            if(var1 >= var9.__au[var11] && var9.__au[var11] != 0) {
-               var10 = var9.__az[var11];
+         for (int var11 = 0; var11 < 10; ++var11) {
+            if (var1 >= var9.field437[var11] && var9.field437[var11] != 0) {
+               var10 = var9.field436[var11];
             }
          }
 
-         if(var10 != -1) {
+         if (var10 != -1) {
             var9 = Skills.getItemDefinition(var10);
          }
       }
 
       Model var19 = var9.getModel(1);
-      if(var19 == null) {
+      if (var19 == null) {
          return null;
       } else {
          Sprite var20 = null;
-         if(var9.noteTemplate != -1) {
+         if (var9.noteTemplate != -1) {
             var20 = getItemSprite(var9.note, 10, 1, 0, 0, true);
-            if(var20 == null) {
+            if (var20 == null) {
                return null;
             }
-         } else if(var9.notedId != -1) {
+         } else if (var9.notedId != -1) {
             var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false);
-            if(var20 == null) {
+            if (var20 == null) {
                return null;
             }
-         } else if(var9.placeholderTemplate != -1) {
+         } else if (var9.placeholderTemplate != -1) {
             var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false);
-            if(var20 == null) {
+            if (var20 == null) {
                return null;
             }
          }
@@ -89,56 +82,63 @@ public class class226 {
          Rasterizer2D.Rasterizer2D_clear();
          Rasterizer3D.Rasterizer3D_method1();
          Rasterizer3D.method2989(16, 16);
-         Rasterizer3D.__et_w = false;
-         if(var9.placeholderTemplate != -1) {
+         Rasterizer3D.field741 = false;
+         if (var9.placeholderTemplate != -1) {
             var20.drawAt2(0, 0);
          }
 
          int var16 = var9.zoom2d;
-         if(var5) {
+         if (var5) {
             var16 = (int)((double)var16 * 1.5D);
-         } else if(var2 == 2) {
+         } else if (var2 == 2) {
             var16 = (int)((double)var16 * 1.04D);
          }
 
          int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16;
          int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16;
          var19.calculateBoundsCylinder();
-         var19.__c_234(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d);
-         if(var9.notedId != -1) {
+         var19.method199(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d);
+         if (var9.notedId != -1) {
             var20.drawAt2(0, 0);
          }
 
-         if(var2 >= 1) {
-            var8.__l_502(1);
+         if (var2 >= 1) {
+            var8.method307(1);
          }
 
-         if(var2 >= 2) {
-            var8.__l_502(16777215);
+         if (var2 >= 2) {
+            var8.method307(16777215);
          }
 
-         if(var3 != 0) {
-            var8.__e_503(var3);
+         if (var3 != 0) {
+            var8.method308(var3);
          }
 
          Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
-         if(var9.noteTemplate != -1) {
+         if (var9.noteTemplate != -1) {
             var20.drawAt2(0, 0);
          }
 
-         if(var4 == 1 || var4 == 2 && var9.isStackable == 1) {
-            class204.__gx_n.draw(class196.method3735(var1), 0, 9, 16776960, 1);
+         if (var4 == 1 || var4 == 2 && var9.isStackable == 1) {
+            class204.field1122.draw(class196.method3735(var1), 0, 9, 16776960, 1);
          }
 
-         if(!var5) {
+         if (!var5) {
             ItemDefinition.Sprite_cached.put(var8, var6);
          }
 
          Rasterizer2D.Rasterizer2D_replace(var12, var13, var14);
          Rasterizer2D.Rasterizer2D_setClipArray(var15);
          Rasterizer3D.Rasterizer3D_method1();
-         Rasterizer3D.__et_w = true;
+         Rasterizer3D.field741 = true;
          return var8;
       }
    }
+
+   static {
+      field1132 = new short[]{6798, 8741, 25238, 4626, 4550};
+      field1133 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}};
+      field1134 = new short[]{-10304, 9104, -1, -1, -1};
+      field1135 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]};
+   }
 }
diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java
index 55b596870c..c6766b9d27 100644
--- a/runescape-client/src/main/java/class227.java
+++ b/runescape-client/src/main/java/class227.java
@@ -1,11 +1,10 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("hj")
 public class class227 {
    @ObfuscatedName("e")
-   public static short[] __hj_e;
+   public static short[] field1136;
 
    @ObfuscatedName("l")
    @ObfuscatedSignature(
@@ -13,15 +12,15 @@ public class class227 {
       garbageValue = "120"
    )
    static final void method4446(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) {
-      if(!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) {
-         if(var0 < Tiles.Tiles_minPlane) {
+      if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) {
+         if (var0 < Tiles.Tiles_minPlane) {
             Tiles.Tiles_minPlane = var0;
          }
 
          ObjectDefinition var8 = class50.getObjectDefinition(var3);
          int var9;
          int var10;
-         if(var4 != 1 && var4 != 3) {
+         if (var4 != 1 && var4 != 3) {
             var9 = var8.sizeX;
             var10 = var8.sizeY;
          } else {
@@ -31,7 +30,7 @@ public class class227 {
 
          int var11;
          int var12;
-         if(var9 + var1 <= 104) {
+         if (var9 + var1 <= 104) {
             var11 = (var9 >> 1) + var1;
             var12 = (var9 + 1 >> 1) + var1;
          } else {
@@ -41,7 +40,7 @@ public class class227 {
 
          int var13;
          int var14;
-         if(var10 + var2 <= 104) {
+         if (var10 + var2 <= 104) {
             var13 = (var10 >> 1) + var2;
             var14 = var2 + (var10 + 1 >> 1);
          } else {
@@ -55,330 +54,337 @@ public class class227 {
          int var18 = (var2 << 7) + (var10 << 6);
          long var19 = FontName.method5637(var1, var2, 2, var8.int1 == 0, var3);
          int var21 = var5 + (var4 << 6);
-         if(var8.int3 == 1) {
+         if (var8.int3 == 1) {
             var21 += 256;
          }
 
+         int var22;
          int var23;
-         int var24;
-         if(var8.__t_424()) {
-            ObjectSound var22 = new ObjectSound();
-            var22.__f = var0;
-            var22.__q = var1 * 128;
-            var22.__w = var2 * 128;
-            var23 = var8.sizeX;
-            var24 = var8.sizeY;
-            if(var4 == 1 || var4 == 3) {
-               var23 = var8.sizeY;
-               var24 = var8.sizeX;
+         if (var8.method233()) {
+            ObjectSound var24 = new ObjectSound();
+            var24.field647 = var0;
+            var24.field648 = var1 * 128;
+            var24.field649 = var2 * 128;
+            var22 = var8.sizeX;
+            var23 = var8.sizeY;
+            if (var4 == 1 || var4 == 3) {
+               var22 = var8.sizeY;
+               var23 = var8.sizeX;
             }
 
-            var22.__o = (var23 + var1) * 128;
-            var22.__u = (var24 + var2) * 128;
-            var22.soundEffectId = var8.ambientSoundId;
-            var22.__g = var8.int4 * 128;
-            var22.__x = var8.int5;
-            var22.__d = var8.int6;
-            var22.soundEffectIds = var8.__ax;
-            if(var8.transforms != null) {
-               var22.obj = var8;
-               var22.set();
+            var24.field650 = (var22 + var1) * 128;
+            var24.field651 = (var23 + var2) * 128;
+            var24.soundEffectId = var8.ambientSoundId;
+            var24.field652 = var8.int4 * 128;
+            var24.field653 = var8.int5;
+            var24.field654 = var8.int6;
+            var24.soundEffectIds = var8.field646;
+            if (var8.transforms != null) {
+               var24.obj = var8;
+               var24.set();
             }
 
-            ObjectSound.objectSounds.addFirst(var22);
-            if(var22.soundEffectIds != null) {
-               var22.__n = var22.__x + (int)(Math.random() * (double)(var22.__d - var22.__x));
+            ObjectSound.objectSounds.addFirst(var24);
+            if (var24.soundEffectIds != null) {
+               var24.field655 = var24.field653 + (int)(Math.random() * (double)(var24.field654 - var24.field653));
             }
          }
 
-         Object var34;
-         if(var5 == 22) {
-            if(!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) {
-               if(var8.animationId == -1 && var8.transforms == null) {
-                  var34 = var8.__l_423(22, var4, var15, var17, var16, var18);
+         Object var31;
+         if (var5 == 22) {
+            if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) {
+               if (var8.animationId == -1 && var8.transforms == null) {
+                  var31 = var8.method232(22, var4, var15, var17, var16, var18);
                } else {
-                  var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                  var31 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
                }
 
-               var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var34, var19, var21);
-               if(var8.interactType == 1 && var7 != null) {
-                  var7.__o_286(var1, var2);
-               }
-
-            }
-         } else if(var5 != 10 && var5 != 11) {
-            if(var5 >= 12) {
-               if(var8.animationId == -1 && var8.transforms == null) {
-                  var34 = var8.__l_423(var5, var4, var15, var17, var16, var18);
-               } else {
-                  var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-               }
-
-               var6.__d_238(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21);
-               if(var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) {
-                  Tiles.__bq_a[var0][var1][var2] |= 2340;
-               }
-
-               if(var8.interactType != 0 && var7 != null) {
-                  var7.__q_284(var1, var2, var9, var10, var8.boolean1);
-               }
-
-            } else if(var5 == 0) {
-               if(var8.animationId == -1 && var8.transforms == null) {
-                  var34 = var8.__l_423(0, var4, var15, var17, var16, var18);
-               } else {
-                  var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-               }
-
-               var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_t[var4], 0, var19, var21);
-               if(var4 == 0) {
-                  if(var8.clipped) {
-                     Tiles.__bq_l[var0][var1][var2] = 50;
-                     Tiles.__bq_l[var0][var1][var2 + 1] = 50;
-                  }
-
-                  if(var8.modelClipped) {
-                     Tiles.__bq_a[var0][var1][var2] |= 585;
-                  }
-               } else if(var4 == 1) {
-                  if(var8.clipped) {
-                     Tiles.__bq_l[var0][var1][var2 + 1] = 50;
-                     Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50;
-                  }
-
-                  if(var8.modelClipped) {
-                     Tiles.__bq_a[var0][var1][1 + var2] |= 1170;
-                  }
-               } else if(var4 == 2) {
-                  if(var8.clipped) {
-                     Tiles.__bq_l[var0][var1 + 1][var2] = 50;
-                     Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50;
-                  }
-
-                  if(var8.modelClipped) {
-                     Tiles.__bq_a[var0][var1 + 1][var2] |= 585;
-                  }
-               } else if(var4 == 3) {
-                  if(var8.clipped) {
-                     Tiles.__bq_l[var0][var1][var2] = 50;
-                     Tiles.__bq_l[var0][var1 + 1][var2] = 50;
-                  }
-
-                  if(var8.modelClipped) {
-                     Tiles.__bq_a[var0][var1][var2] |= 1170;
-                  }
-               }
-
-               if(var8.interactType != 0 && var7 != null) {
-                  var7.__f_283(var1, var2, var5, var4, var8.boolean1);
-               }
-
-               if(var8.int2 != 16) {
-                  var6.__y_241(var0, var1, var2, var8.int2);
-               }
-
-            } else if(var5 == 1) {
-               if(var8.animationId == -1 && var8.transforms == null) {
-                  var34 = var8.__l_423(1, var4, var15, var17, var16, var18);
-               } else {
-                  var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-               }
-
-               var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_y[var4], 0, var19, var21);
-               if(var8.clipped) {
-                  if(var4 == 0) {
-                     Tiles.__bq_l[var0][var1][var2 + 1] = 50;
-                  } else if(var4 == 1) {
-                     Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50;
-                  } else if(var4 == 2) {
-                     Tiles.__bq_l[var0][var1 + 1][var2] = 50;
-                  } else if(var4 == 3) {
-                     Tiles.__bq_l[var0][var1][var2] = 50;
-                  }
-               }
-
-               if(var8.interactType != 0 && var7 != null) {
-                  var7.__f_283(var1, var2, var5, var4, var8.boolean1);
-               }
-
-            } else {
-               int var28;
-               if(var5 == 2) {
-                  var28 = var4 + 1 & 3;
-                  Object var29;
-                  Object var30;
-                  if(var8.animationId == -1 && var8.transforms == null) {
-                     var29 = var8.__l_423(2, var4 + 4, var15, var17, var16, var18);
-                     var30 = var8.__l_423(2, var28, var15, var17, var16, var18);
-                  } else {
-                     var29 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                     var30 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, true, (Entity)null);
-                  }
-
-                  var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)var30, Tiles.__bq_t[var4], Tiles.__bq_t[var28], var19, var21);
-                  if(var8.modelClipped) {
-                     if(var4 == 0) {
-                        Tiles.__bq_a[var0][var1][var2] |= 585;
-                        Tiles.__bq_a[var0][var1][1 + var2] |= 1170;
-                     } else if(var4 == 1) {
-                        Tiles.__bq_a[var0][var1][1 + var2] |= 1170;
-                        Tiles.__bq_a[var0][var1 + 1][var2] |= 585;
-                     } else if(var4 == 2) {
-                        Tiles.__bq_a[var0][var1 + 1][var2] |= 585;
-                        Tiles.__bq_a[var0][var1][var2] |= 1170;
-                     } else if(var4 == 3) {
-                        Tiles.__bq_a[var0][var1][var2] |= 1170;
-                        Tiles.__bq_a[var0][var1][var2] |= 585;
-                     }
-                  }
-
-                  if(var8.interactType != 0 && var7 != null) {
-                     var7.__f_283(var1, var2, var5, var4, var8.boolean1);
-                  }
-
-                  if(var8.int2 != 16) {
-                     var6.__y_241(var0, var1, var2, var8.int2);
-                  }
-
-               } else if(var5 == 3) {
-                  if(var8.animationId == -1 && var8.transforms == null) {
-                     var34 = var8.__l_423(3, var4, var15, var17, var16, var18);
-                  } else {
-                     var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                  }
-
-                  var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_y[var4], 0, var19, var21);
-                  if(var8.clipped) {
-                     if(var4 == 0) {
-                        Tiles.__bq_l[var0][var1][var2 + 1] = 50;
-                     } else if(var4 == 1) {
-                        Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50;
-                     } else if(var4 == 2) {
-                        Tiles.__bq_l[var0][var1 + 1][var2] = 50;
-                     } else if(var4 == 3) {
-                        Tiles.__bq_l[var0][var1][var2] = 50;
-                     }
-                  }
-
-                  if(var8.interactType != 0 && var7 != null) {
-                     var7.__f_283(var1, var2, var5, var4, var8.boolean1);
-                  }
-
-               } else if(var5 == 9) {
-                  if(var8.animationId == -1 && var8.transforms == null) {
-                     var34 = var8.__l_423(var5, var4, var15, var17, var16, var18);
-                  } else {
-                     var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                  }
-
-                  var6.__d_238(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21);
-                  if(var8.interactType != 0 && var7 != null) {
-                     var7.__q_284(var1, var2, var9, var10, var8.boolean1);
-                  }
-
-                  if(var8.int2 != 16) {
-                     var6.__y_241(var0, var1, var2, var8.int2);
-                  }
-
-               } else if(var5 == 4) {
-                  if(var8.animationId == -1 && var8.transforms == null) {
-                     var34 = var8.__l_423(4, var4, var15, var17, var16, var18);
-                  } else {
-                     var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                  }
-
-                  var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_t[var4], 0, 0, 0, var19, var21);
-               } else {
-                  long var31;
-                  Object var33;
-                  if(var5 == 5) {
-                     var28 = 16;
-                     var31 = var6.__ar_244(var0, var1, var2);
-                     if(var31 != 0L) {
-                        var28 = class50.getObjectDefinition(HitSplatDefinition.method4972(var31)).int2;
-                     }
-
-                     if(var8.animationId == -1 && var8.transforms == null) {
-                        var33 = var8.__l_423(4, var4, var15, var17, var16, var18);
-                     } else {
-                        var33 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                     }
-
-                     var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, Tiles.__bq_t[var4], 0, var28 * Tiles.__bq_h[var4], var28 * Tiles.__bq_b[var4], var19, var21);
-                  } else if(var5 == 6) {
-                     var28 = 8;
-                     var31 = var6.__ar_244(var0, var1, var2);
-                     if(var31 != 0L) {
-                        var28 = class50.getObjectDefinition(HitSplatDefinition.method4972(var31)).int2 / 2;
-                     }
-
-                     if(var8.animationId == -1 && var8.transforms == null) {
-                        var33 = var8.__l_423(4, var4 + 4, var15, var17, var16, var18);
-                     } else {
-                        var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                     }
-
-                     var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, 256, var4, var28 * Tiles.__bq_c[var4], var28 * Tiles.__bq_r[var4], var19, var21);
-                  } else if(var5 == 7) {
-                     var23 = var4 + 2 & 3;
-                     if(var8.animationId == -1 && var8.transforms == null) {
-                        var34 = var8.__l_423(4, var23 + 4, var15, var17, var16, var18);
-                     } else {
-                        var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                     }
-
-                     var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, 256, var23, 0, 0, var19, var21);
-                  } else if(var5 == 8) {
-                     var28 = 8;
-                     var31 = var6.__ar_244(var0, var1, var2);
-                     if(var31 != 0L) {
-                        var28 = class50.getObjectDefinition(HitSplatDefinition.method4972(var31)).int2 / 2;
-                     }
-
-                     int var27 = var4 + 2 & 3;
-                     Object var26;
-                     if(var8.animationId == -1 && var8.transforms == null) {
-                        var33 = var8.__l_423(4, var4 + 4, var15, var17, var16, var18);
-                        var26 = var8.__l_423(4, var27 + 4, var15, var17, var16, var18);
-                     } else {
-                        var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                        var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                     }
-
-                     var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)var26, 256, var4, var28 * Tiles.__bq_c[var4], var28 * Tiles.__bq_r[var4], var19, var21);
-                  }
+               var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var31, var19, var21);
+               if (var8.interactType == 1 && var7 != null) {
+                  var7.method93(var1, var2);
                }
             }
          } else {
-            if(var8.animationId == -1 && var8.transforms == null) {
-               var34 = var8.__l_423(10, var4, var15, var17, var16, var18);
-            } else {
-               var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-            }
+            int var25;
+            if (var5 != 10 && var5 != 11) {
+               int[] var10000;
+               if (var5 >= 12) {
+                  if (var8.animationId == -1 && var8.transforms == null) {
+                     var31 = var8.method232(var5, var4, var15, var17, var16, var18);
+                  } else {
+                     var31 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                  }
 
-            if(var34 != null && var6.__d_238(var0, var1, var2, var16, var9, var10, (Entity)var34, var5 == 11?256:0, var19, var21) && var8.clipped) {
-               var23 = 15;
-               if(var34 instanceof Model) {
-                  var23 = ((Model)var34).__l_233() / 4;
-                  if(var23 > 30) {
-                     var23 = 30;
+                  var6.method284(var0, var1, var2, var16, 1, 1, (Entity)var31, 0, var19, var21);
+                  if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) {
+                     var10000 = Tiles.field910[var0][var1];
+                     var10000[var2] |= 2340;
+                  }
+
+                  if (var8.interactType != 0 && var7 != null) {
+                     var7.method91(var1, var2, var9, var10, var8.boolean1);
+                  }
+               } else if (var5 == 0) {
+                  if (var8.animationId == -1 && var8.transforms == null) {
+                     var31 = var8.method232(0, var4, var15, var17, var16, var18);
+                  } else {
+                     var31 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                  }
+
+                  var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field911[var4], 0, var19, var21);
+                  if (var4 == 0) {
+                     if (var8.clipped) {
+                        Tiles.field909[var0][var1][var2] = 50;
+                        Tiles.field909[var0][var1][var2 + 1] = 50;
+                     }
+
+                     if (var8.modelClipped) {
+                        var10000 = Tiles.field910[var0][var1];
+                        var10000[var2] |= 585;
+                     }
+                  } else if (var4 == 1) {
+                     if (var8.clipped) {
+                        Tiles.field909[var0][var1][var2 + 1] = 50;
+                        Tiles.field909[var0][var1 + 1][var2 + 1] = 50;
+                     }
+
+                     if (var8.modelClipped) {
+                        var10000 = Tiles.field910[var0][var1];
+                        var10000[1 + var2] |= 1170;
+                     }
+                  } else if (var4 == 2) {
+                     if (var8.clipped) {
+                        Tiles.field909[var0][var1 + 1][var2] = 50;
+                        Tiles.field909[var0][var1 + 1][var2 + 1] = 50;
+                     }
+
+                     if (var8.modelClipped) {
+                        var10000 = Tiles.field910[var0][var1 + 1];
+                        var10000[var2] |= 585;
+                     }
+                  } else if (var4 == 3) {
+                     if (var8.clipped) {
+                        Tiles.field909[var0][var1][var2] = 50;
+                        Tiles.field909[var0][var1 + 1][var2] = 50;
+                     }
+
+                     if (var8.modelClipped) {
+                        var10000 = Tiles.field910[var0][var1];
+                        var10000[var2] |= 1170;
+                     }
+                  }
+
+                  if (var8.interactType != 0 && var7 != null) {
+                     var7.method90(var1, var2, var5, var4, var8.boolean1);
+                  }
+
+                  if (var8.int2 != 16) {
+                     var6.method287(var0, var1, var2, var8.int2);
+                  }
+               } else if (var5 == 1) {
+                  if (var8.animationId == -1 && var8.transforms == null) {
+                     var31 = var8.method232(1, var4, var15, var17, var16, var18);
+                  } else {
+                     var31 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                  }
+
+                  var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field912[var4], 0, var19, var21);
+                  if (var8.clipped) {
+                     if (var4 == 0) {
+                        Tiles.field909[var0][var1][var2 + 1] = 50;
+                     } else if (var4 == 1) {
+                        Tiles.field909[var0][var1 + 1][var2 + 1] = 50;
+                     } else if (var4 == 2) {
+                        Tiles.field909[var0][var1 + 1][var2] = 50;
+                     } else if (var4 == 3) {
+                        Tiles.field909[var0][var1][var2] = 50;
+                     }
+                  }
+
+                  if (var8.interactType != 0 && var7 != null) {
+                     var7.method90(var1, var2, var5, var4, var8.boolean1);
+                  }
+               } else if (var5 == 2) {
+                  var25 = var4 + 1 & 3;
+                  Object var26;
+                  Object var27;
+                  if (var8.animationId == -1 && var8.transforms == null) {
+                     var26 = var8.method232(2, var4 + 4, var15, var17, var16, var18);
+                     var27 = var8.method232(2, var25, var15, var17, var16, var18);
+                  } else {
+                     var26 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                     var27 = new DynamicObject(var3, 2, var25, var0, var1, var2, var8.animationId, true, (Entity)null);
+                  }
+
+                  var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var26, (Entity)var27, Tiles.field911[var4], Tiles.field911[var25], var19, var21);
+                  if (var8.modelClipped) {
+                     if (var4 == 0) {
+                        var10000 = Tiles.field910[var0][var1];
+                        var10000[var2] |= 585;
+                        var10000 = Tiles.field910[var0][var1];
+                        var10000[1 + var2] |= 1170;
+                     } else if (var4 == 1) {
+                        var10000 = Tiles.field910[var0][var1];
+                        var10000[1 + var2] |= 1170;
+                        var10000 = Tiles.field910[var0][var1 + 1];
+                        var10000[var2] |= 585;
+                     } else if (var4 == 2) {
+                        var10000 = Tiles.field910[var0][var1 + 1];
+                        var10000[var2] |= 585;
+                        var10000 = Tiles.field910[var0][var1];
+                        var10000[var2] |= 1170;
+                     } else if (var4 == 3) {
+                        var10000 = Tiles.field910[var0][var1];
+                        var10000[var2] |= 1170;
+                        var10000 = Tiles.field910[var0][var1];
+                        var10000[var2] |= 585;
+                     }
+                  }
+
+                  if (var8.interactType != 0 && var7 != null) {
+                     var7.method90(var1, var2, var5, var4, var8.boolean1);
+                  }
+
+                  if (var8.int2 != 16) {
+                     var6.method287(var0, var1, var2, var8.int2);
+                  }
+               } else if (var5 == 3) {
+                  if (var8.animationId == -1 && var8.transforms == null) {
+                     var31 = var8.method232(3, var4, var15, var17, var16, var18);
+                  } else {
+                     var31 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                  }
+
+                  var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field912[var4], 0, var19, var21);
+                  if (var8.clipped) {
+                     if (var4 == 0) {
+                        Tiles.field909[var0][var1][var2 + 1] = 50;
+                     } else if (var4 == 1) {
+                        Tiles.field909[var0][var1 + 1][var2 + 1] = 50;
+                     } else if (var4 == 2) {
+                        Tiles.field909[var0][var1 + 1][var2] = 50;
+                     } else if (var4 == 3) {
+                        Tiles.field909[var0][var1][var2] = 50;
+                     }
+                  }
+
+                  if (var8.interactType != 0 && var7 != null) {
+                     var7.method90(var1, var2, var5, var4, var8.boolean1);
+                  }
+               } else if (var5 == 9) {
+                  if (var8.animationId == -1 && var8.transforms == null) {
+                     var31 = var8.method232(var5, var4, var15, var17, var16, var18);
+                  } else {
+                     var31 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                  }
+
+                  var6.method284(var0, var1, var2, var16, 1, 1, (Entity)var31, 0, var19, var21);
+                  if (var8.interactType != 0 && var7 != null) {
+                     var7.method91(var1, var2, var9, var10, var8.boolean1);
+                  }
+
+                  if (var8.int2 != 16) {
+                     var6.method287(var0, var1, var2, var8.int2);
+                  }
+               } else if (var5 == 4) {
+                  if (var8.animationId == -1 && var8.transforms == null) {
+                     var31 = var8.method232(4, var4, var15, var17, var16, var18);
+                  } else {
+                     var31 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                  }
+
+                  var6.newWallDecoration(var0, var1, var2, var16, (Entity)var31, (Entity)null, Tiles.field911[var4], 0, 0, 0, var19, var21);
+               } else {
+                  Object var28;
+                  long var32;
+                  if (var5 == 5) {
+                     var25 = 16;
+                     var32 = var6.method290(var0, var1, var2);
+                     if (var32 != 0L) {
+                        var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var32)).int2;
+                     }
+
+                     if (var8.animationId == -1 && var8.transforms == null) {
+                        var28 = var8.method232(4, var4, var15, var17, var16, var18);
+                     } else {
+                        var28 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                     }
+
+                     var6.newWallDecoration(var0, var1, var2, var16, (Entity)var28, (Entity)null, Tiles.field911[var4], 0, var25 * Tiles.field913[var4], var25 * Tiles.field914[var4], var19, var21);
+                  } else if (var5 == 6) {
+                     var25 = 8;
+                     var32 = var6.method290(var0, var1, var2);
+                     if (var32 != 0L) {
+                        var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var32)).int2 / 2;
+                     }
+
+                     if (var8.animationId == -1 && var8.transforms == null) {
+                        var28 = var8.method232(4, var4 + 4, var15, var17, var16, var18);
+                     } else {
+                        var28 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                     }
+
+                     var6.newWallDecoration(var0, var1, var2, var16, (Entity)var28, (Entity)null, 256, var4, var25 * Tiles.field915[var4], var25 * Tiles.field916[var4], var19, var21);
+                  } else if (var5 == 7) {
+                     var22 = var4 + 2 & 3;
+                     if (var8.animationId == -1 && var8.transforms == null) {
+                        var31 = var8.method232(4, var22 + 4, var15, var17, var16, var18);
+                     } else {
+                        var31 = new DynamicObject(var3, 4, var22 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                     }
+
+                     var6.newWallDecoration(var0, var1, var2, var16, (Entity)var31, (Entity)null, 256, var22, 0, 0, var19, var21);
+                  } else if (var5 == 8) {
+                     var25 = 8;
+                     var32 = var6.method290(var0, var1, var2);
+                     if (var32 != 0L) {
+                        var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var32)).int2 / 2;
+                     }
+
+                     int var29 = var4 + 2 & 3;
+                     Object var30;
+                     if (var8.animationId == -1 && var8.transforms == null) {
+                        var28 = var8.method232(4, var4 + 4, var15, var17, var16, var18);
+                        var30 = var8.method232(4, var29 + 4, var15, var17, var16, var18);
+                     } else {
+                        var28 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                        var30 = new DynamicObject(var3, 4, var29 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                     }
+
+                     var6.newWallDecoration(var0, var1, var2, var16, (Entity)var28, (Entity)var30, 256, var4, var25 * Tiles.field915[var4], var25 * Tiles.field916[var4], var19, var21);
                   }
                }
+            } else {
+               if (var8.animationId == -1 && var8.transforms == null) {
+                  var31 = var8.method232(10, var4, var15, var17, var16, var18);
+               } else {
+                  var31 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+               }
 
-               for(var24 = 0; var24 <= var9; ++var24) {
-                  for(int var25 = 0; var25 <= var10; ++var25) {
-                     if(var23 > Tiles.__bq_l[var0][var24 + var1][var25 + var2]) {
-                        Tiles.__bq_l[var0][var24 + var1][var25 + var2] = (byte)var23;
+               if (var31 != null && var6.method284(var0, var1, var2, var16, var9, var10, (Entity)var31, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) {
+                  var22 = 15;
+                  if (var31 instanceof Model) {
+                     var22 = ((Model)var31).method198() / 4;
+                     if (var22 > 30) {
+                        var22 = 30;
+                     }
+                  }
+
+                  for (var23 = 0; var23 <= var9; ++var23) {
+                     for (var25 = 0; var25 <= var10; ++var25) {
+                        if (var22 > Tiles.field909[var0][var23 + var1][var25 + var2]) {
+                           Tiles.field909[var0][var23 + var1][var25 + var2] = (byte)var22;
+                        }
                      }
                   }
                }
-            }
 
-            if(var8.interactType != 0 && var7 != null) {
-               var7.__q_284(var1, var2, var9, var10, var8.boolean1);
+               if (var8.interactType != 0 && var7 != null) {
+                  var7.method91(var1, var2, var9, var10, var8.boolean1);
+               }
             }
-
          }
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java
index 3ee3edf4e1..6162f555a4 100644
--- a/runescape-client/src/main/java/class229.java
+++ b/runescape-client/src/main/java/class229.java
@@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("hz")
 public class class229 {
    @ObfuscatedName("l")
-   public static short[][] __hz_l;
+   public static short[][] field1137;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -15,12 +15,12 @@ public class class229 {
    @Export("getParamKeyDefinition")
    public static ParamKeyDefinition getParamKeyDefinition(int var0) {
       ParamKeyDefinition var1 = (ParamKeyDefinition)ParamKeyDefinition.ParamKeyDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = ParamKeyDefinition.__jb_m.takeRecord(11, var0);
+         byte[] var2 = ParamKeyDefinition.field679.takeRecord(11, var0);
          var1 = new ParamKeyDefinition();
-         if(var2 != null) {
+         if (var2 != null) {
             var1.read(new Buffer(var2));
          }
 
@@ -36,61 +36,61 @@ public class class229 {
       garbageValue = "1886084106"
    )
    static int method4513(int var0, Script var1, boolean var2) {
-      if(var0 == 6200) {
+      if (var0 == 6200) {
          RouteStrategy.Interpreter_intStackSize -= 2;
-         Client.__client_rw = (short)class161.method3395(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]);
-         if(Client.__client_rw <= 0) {
-            Client.__client_rw = 256;
+         Client.field130 = (short)class161.method3395(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]);
+         if (Client.field130 <= 0) {
+            Client.field130 = 256;
          }
 
-         Client.__client_rm = (short)class161.method3395(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
-         if(Client.__client_rm <= 0) {
-            Client.__client_rm = 256;
+         Client.field131 = (short)class161.method3395(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
+         if (Client.field131 <= 0) {
+            Client.field131 = 256;
          }
 
          return 1;
-      } else if(var0 == 6201) {
+      } else if (var0 == 6201) {
          RouteStrategy.Interpreter_intStackSize -= 2;
-         Client.__client_re = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-         if(Client.__client_re <= 0) {
-            Client.__client_re = 256;
+         Client.field150 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+         if (Client.field150 <= 0) {
+            Client.field150 = 256;
          }
 
-         Client.__client_rb = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         if(Client.__client_rb <= 0) {
-            Client.__client_rb = 320;
+         Client.field149 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+         if (Client.field149 <= 0) {
+            Client.field149 = 320;
          }
 
          return 1;
-      } else if(var0 == 6202) {
+      } else if (var0 == 6202) {
          RouteStrategy.Interpreter_intStackSize -= 4;
-         Client.__client_rv = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-         if(Client.__client_rv <= 0) {
-            Client.__client_rv = 1;
+         Client.field135 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+         if (Client.field135 <= 0) {
+            Client.field135 = 1;
          }
 
-         Client.__client_ri = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         if(Client.__client_ri <= 0) {
-            Client.__client_ri = 32767;
-         } else if(Client.__client_ri < Client.__client_rv) {
-            Client.__client_ri = Client.__client_rv;
+         Client.field134 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+         if (Client.field134 <= 0) {
+            Client.field134 = 32767;
+         } else if (Client.field134 < Client.field135) {
+            Client.field134 = Client.field135;
          }
 
-         Client.__client_rs = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-         if(Client.__client_rs <= 0) {
-            Client.__client_rs = 1;
+         Client.field132 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+         if (Client.field132 <= 0) {
+            Client.field132 = 1;
          }
 
-         Client.__client_rp = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
-         if(Client.__client_rp <= 0) {
-            Client.__client_rp = 32767;
-         } else if(Client.__client_rp < Client.__client_rs) {
-            Client.__client_rp = Client.__client_rs;
+         Client.field133 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
+         if (Client.field133 <= 0) {
+            Client.field133 = 32767;
+         } else if (Client.field133 < Client.field132) {
+            Client.field133 = Client.field132;
          }
 
          return 1;
-      } else if(var0 == 6203) {
-         if(Client.viewportWidget != null) {
+      } else if (var0 == 6203) {
+         if (Client.viewportWidget != null) {
             FontName.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false);
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.viewportWidth;
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.viewportHeight;
@@ -100,13 +100,13 @@ public class class229 {
          }
 
          return 1;
-      } else if(var0 == 6204) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_re;
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_rb;
+      } else if (var0 == 6204) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field150;
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field149;
          return 1;
-      } else if(var0 == 6205) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.__client_rw);
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.__client_rm);
+      } else if (var0 == 6205) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.field130);
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.field131);
          return 1;
       } else {
          return 2;
@@ -119,7 +119,7 @@ public class class229 {
       garbageValue = "-21"
    )
    static void method4514() {
-      if(Canvas.localPlayer.x >> 7 == Client.destinationX && Canvas.localPlayer.y >> 7 == Client.destinationY) {
+      if (Canvas.localPlayer.x >> 7 == Client.destinationX && Canvas.localPlayer.y >> 7 == Client.destinationY) {
          Client.destinationX = 0;
       }
 
@@ -132,7 +132,7 @@ public class class229 {
    )
    static final void method4512() {
       SecureRandomFuture.method2104();
-      if(PacketWriter.clanChat != null) {
+      if (PacketWriter.clanChat != null) {
          PacketWriter.clanChat.clearIgnoreds();
       }
 
diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java
index 320164629a..ab493cd64a 100644
--- a/runescape-client/src/main/java/class230.java
+++ b/runescape-client/src/main/java/class230.java
@@ -1,11 +1,10 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("hy")
 public class class230 {
    @ObfuscatedName("az")
-   protected static boolean __hy_az;
+   protected static boolean field1138;
 
    @ObfuscatedName("q")
    @ObfuscatedSignature(
@@ -16,66 +15,68 @@ public class class230 {
       int var1 = var0.length();
       byte[] var2 = new byte[var1];
 
-      for(int var3 = 0; var3 < var1; ++var3) {
+      for (int var3 = 0; var3 < var1; ++var3) {
          char var4 = var0.charAt(var3);
-         if(var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) {
-            var2[var3] = (byte)var4;
-         } else if(var4 == 8364) {
-            var2[var3] = -128;
-         } else if(var4 == 8218) {
-            var2[var3] = -126;
-         } else if(var4 == 402) {
-            var2[var3] = -125;
-         } else if(var4 == 8222) {
-            var2[var3] = -124;
-         } else if(var4 == 8230) {
-            var2[var3] = -123;
-         } else if(var4 == 8224) {
-            var2[var3] = -122;
-         } else if(var4 == 8225) {
-            var2[var3] = -121;
-         } else if(var4 == 710) {
-            var2[var3] = -120;
-         } else if(var4 == 8240) {
-            var2[var3] = -119;
-         } else if(var4 == 352) {
-            var2[var3] = -118;
-         } else if(var4 == 8249) {
-            var2[var3] = -117;
-         } else if(var4 == 338) {
-            var2[var3] = -116;
-         } else if(var4 == 381) {
-            var2[var3] = -114;
-         } else if(var4 == 8216) {
-            var2[var3] = -111;
-         } else if(var4 == 8217) {
-            var2[var3] = -110;
-         } else if(var4 == 8220) {
-            var2[var3] = -109;
-         } else if(var4 == 8221) {
-            var2[var3] = -108;
-         } else if(var4 == 8226) {
-            var2[var3] = -107;
-         } else if(var4 == 8211) {
-            var2[var3] = -106;
-         } else if(var4 == 8212) {
-            var2[var3] = -105;
-         } else if(var4 == 732) {
-            var2[var3] = -104;
-         } else if(var4 == 8482) {
-            var2[var3] = -103;
-         } else if(var4 == 353) {
-            var2[var3] = -102;
-         } else if(var4 == 8250) {
-            var2[var3] = -101;
-         } else if(var4 == 339) {
-            var2[var3] = -100;
-         } else if(var4 == 382) {
-            var2[var3] = -98;
-         } else if(var4 == 376) {
-            var2[var3] = -97;
+         if ((var4 <= 0 || var4 >= 128) && (var4 < 160 || var4 > 255)) {
+            if (var4 == 8364) {
+               var2[var3] = -128;
+            } else if (var4 == 8218) {
+               var2[var3] = -126;
+            } else if (var4 == 402) {
+               var2[var3] = -125;
+            } else if (var4 == 8222) {
+               var2[var3] = -124;
+            } else if (var4 == 8230) {
+               var2[var3] = -123;
+            } else if (var4 == 8224) {
+               var2[var3] = -122;
+            } else if (var4 == 8225) {
+               var2[var3] = -121;
+            } else if (var4 == 710) {
+               var2[var3] = -120;
+            } else if (var4 == 8240) {
+               var2[var3] = -119;
+            } else if (var4 == 352) {
+               var2[var3] = -118;
+            } else if (var4 == 8249) {
+               var2[var3] = -117;
+            } else if (var4 == 338) {
+               var2[var3] = -116;
+            } else if (var4 == 381) {
+               var2[var3] = -114;
+            } else if (var4 == 8216) {
+               var2[var3] = -111;
+            } else if (var4 == 8217) {
+               var2[var3] = -110;
+            } else if (var4 == 8220) {
+               var2[var3] = -109;
+            } else if (var4 == 8221) {
+               var2[var3] = -108;
+            } else if (var4 == 8226) {
+               var2[var3] = -107;
+            } else if (var4 == 8211) {
+               var2[var3] = -106;
+            } else if (var4 == 8212) {
+               var2[var3] = -105;
+            } else if (var4 == 732) {
+               var2[var3] = -104;
+            } else if (var4 == 8482) {
+               var2[var3] = -103;
+            } else if (var4 == 353) {
+               var2[var3] = -102;
+            } else if (var4 == 8250) {
+               var2[var3] = -101;
+            } else if (var4 == 339) {
+               var2[var3] = -100;
+            } else if (var4 == 382) {
+               var2[var3] = -98;
+            } else if (var4 == 376) {
+               var2[var3] = -97;
+            } else {
+               var2[var3] = 63;
+            }
          } else {
-            var2[var3] = 63;
+            var2[var3] = (byte)var4;
          }
       }
 
diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java
index a448e63e70..7b7a13dd4e 100644
--- a/runescape-client/src/main/java/class231.java
+++ b/runescape-client/src/main/java/class231.java
@@ -125,9 +125,9 @@ public enum class231 implements Enumerated {
    @ObfuscatedGetter(
       intValue = -745071109
    )
-   static int __hb_sg;
+   static int field1139;
    @ObfuscatedName("av")
-   static java.awt.Font __hb_av;
+   static java.awt.Font field1140;
    @ObfuscatedName("r")
    @ObfuscatedGetter(
       intValue = 899733687
@@ -138,7 +138,7 @@ public enum class231 implements Enumerated {
       signature = "(II)V",
       garbageValue = "0"
    )
-   class231(int var3, int var4) {
+   private class231(int var3, int var4) {
       this.field2820 = var3;
    }
 
@@ -158,17 +158,17 @@ public enum class231 implements Enumerated {
       garbageValue = "1"
    )
    public static InvDefinition method4523(int var0) {
-      InvDefinition var1 = (InvDefinition)InvDefinition.__ib_f.get((long)var0);
-      if(var1 != null) {
+      InvDefinition var1 = (InvDefinition)InvDefinition.field427.get((long)var0);
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = class4.__o_m.takeRecord(5, var0);
+         byte[] var2 = class4.field1158.takeRecord(5, var0);
          var1 = new InvDefinition();
-         if(var2 != null) {
+         if (var2 != null) {
             var1.read(new Buffer(var2));
          }
 
-         InvDefinition.__ib_f.put(var1, (long)var0);
+         InvDefinition.field427.put(var1, (long)var0);
          return var1;
       }
    }
@@ -189,8 +189,9 @@ public enum class231 implements Enumerated {
       garbageValue = "1521012895"
    )
    static final void method4517(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-      if(GroundItemPile.loadWidgetGroup(var0)) {
+      if (GroundItemPile.loadWidgetGroup(var0)) {
          class238.updateWidgetGroup(Widget.widgets[var0], -1, var1, var2, var3, var4, var5, var6);
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/class233.java b/runescape-client/src/main/java/class233.java
index 378320997a..f3fc121e9f 100644
--- a/runescape-client/src/main/java/class233.java
+++ b/runescape-client/src/main/java/class233.java
@@ -13,13 +13,13 @@ public class class233 {
       char[] var2 = new char[var1];
       byte var3 = 2;
 
-      for(int var4 = 0; var4 < var1; ++var4) {
+      for (int var4 = 0; var4 < var1; ++var4) {
          char var5 = var0.charAt(var4);
-         if(var3 == 0) {
+         if (var3 == 0) {
             var5 = Character.toLowerCase(var5);
-         } else if(var3 == 2 || Character.isUpperCase(var5)) {
+         } else if (var3 == 2 || Character.isUpperCase(var5)) {
             char var6;
-            if(var5 != 181 && var5 != 402) {
+            if (var5 != 181 && var5 != 402) {
                var6 = Character.toTitleCase(var5);
             } else {
                var6 = var5;
@@ -28,11 +28,11 @@ public class class233 {
             var5 = var6;
          }
 
-         if(Character.isLetter(var5)) {
+         if (Character.isLetter(var5)) {
             var3 = 0;
-         } else if(var5 != '.' && var5 != '?' && var5 != '!') {
-            if(Character.isSpaceChar(var5)) {
-               if(var3 != 2) {
+         } else if (var5 != '.' && var5 != '?' && var5 != '!') {
+            if (Character.isSpaceChar(var5)) {
+               if (var3 != 2) {
                   var3 = 1;
                }
             } else {
diff --git a/runescape-client/src/main/java/class234.java b/runescape-client/src/main/java/class234.java
index 269612760a..2a129de9d2 100644
--- a/runescape-client/src/main/java/class234.java
+++ b/runescape-client/src/main/java/class234.java
@@ -9,25 +9,25 @@ public class class234 {
       garbageValue = "-701527010"
    )
    static void method4534(Player var0, int var1, int var2) {
-      if(var0.sequence == var1 && var1 != -1) {
-         int var3 = WorldMapAreaData.getSequenceDefinition(var1).__t;
-         if(var3 == 1) {
+      if (var0.sequence == var1 && var1 != -1) {
+         int var3 = WorldMapAreaData.getSequenceDefinition(var1).field783;
+         if (var3 == 1) {
             var0.sequenceFrame = 0;
             var0.sequenceFrameCycle = 0;
             var0.sequenceDelay = var2;
-            var0.__bj = 0;
+            var0.field13 = 0;
          }
 
-         if(var3 == 2) {
-            var0.__bj = 0;
+         if (var3 == 2) {
+            var0.field13 = 0;
          }
-      } else if(var1 == -1 || var0.sequence == -1 || WorldMapAreaData.getSequenceDefinition(var1).__n >= WorldMapAreaData.getSequenceDefinition(var0.sequence).__n) {
+      } else if (var1 == -1 || var0.sequence == -1 || WorldMapAreaData.getSequenceDefinition(var1).field779 >= WorldMapAreaData.getSequenceDefinition(var0.sequence).field779) {
          var0.sequence = var1;
          var0.sequenceFrame = 0;
          var0.sequenceFrameCycle = 0;
          var0.sequenceDelay = var2;
-         var0.__bj = 0;
-         var0.__ch = var0.pathLength;
+         var0.field13 = 0;
+         var0.field25 = var0.pathLength;
       }
 
    }
@@ -39,12 +39,11 @@ public class class234 {
    )
    static void method4535(Buffer var0, int var1) {
       class50.method902(var0.array, var1);
-      if(class168.randomDat != null) {
+      if (class168.randomDat != null) {
          try {
             class168.randomDat.seek(0L);
             class168.randomDat.write(var0.array, var1, 24);
          } catch (Exception var3) {
-            ;
          }
       }
 
diff --git a/runescape-client/src/main/java/class236.java b/runescape-client/src/main/java/class236.java
index 77d9f09cf7..214b6ba767 100644
--- a/runescape-client/src/main/java/class236.java
+++ b/runescape-client/src/main/java/class236.java
@@ -14,107 +14,107 @@ public class class236 {
       int var2 = var0.readBits(2);
       int var3;
       int var4;
+      int var5;
+      int var6;
       int var7;
       int var8;
-      int var9;
-      int var10;
-      if(var2 == 0) {
-         if(var0.readBits(1) != 0) {
+      if (var2 == 0) {
+         if (var0.readBits(1) != 0) {
             updateExternalPlayer(var0, var1);
          }
 
          var3 = var0.readBits(13);
          var4 = var0.readBits(13);
-         boolean var12 = var0.readBits(1) == 1;
-         if(var12) {
-            Players.__cq_i[++Players.__cq_n - 1] = var1;
+         boolean var11 = var0.readBits(1) == 1;
+         if (var11) {
+            Players.field737[++Players.field736 - 1] = var1;
          }
 
-         if(Client.players[var1] != null) {
+         if (Client.players[var1] != null) {
             throw new RuntimeException();
          } else {
-            Player var6 = Client.players[var1] = new Player();
-            var6.index = var1;
-            if(Players.__cq_o[var1] != null) {
-               var6.read(Players.__cq_o[var1]);
+            Player var12 = Client.players[var1] = new Player();
+            var12.index = var1;
+            if (Players.field733[var1] != null) {
+               var12.read(Players.field733[var1]);
             }
 
-            var6.orientation = Players.Players_orientations[var1];
-            var6.targetIndex = Players.Players_targetIndices[var1];
-            var7 = Players.Players_regions[var1];
-            var8 = var7 >> 28;
-            var9 = var7 >> 14 & 255;
-            var10 = var7 & 255;
-            var6.pathTraversed[0] = Players.__cq_w[var1];
-            var6.plane = (byte)var8;
-            var6.resetPath((var9 << 13) + var3 - class50.baseX, (var10 << 13) + var4 - GraphicsObject.baseY);
-            var6.__ag = false;
+            var12.orientation = Players.Players_orientations[var1];
+            var12.targetIndex = Players.Players_targetIndices[var1];
+            var5 = Players.Players_regions[var1];
+            var6 = var5 >> 28;
+            var7 = var5 >> 14 & 255;
+            var8 = var5 & 255;
+            var12.pathTraversed[0] = Players.field732[var1];
+            var12.plane = (byte)var6;
+            var12.resetPath((var7 << 13) + var3 - class50.baseX, (var8 << 13) + var4 - GraphicsObject.baseY);
+            var12.field725 = false;
             return true;
          }
-      } else if(var2 == 1) {
+      } else if (var2 == 1) {
          var3 = var0.readBits(2);
          var4 = Players.Players_regions[var1];
          Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455);
          return false;
       } else {
-         int var5;
-         int var11;
-         if(var2 == 2) {
+         int var9;
+         int var10;
+         if (var2 == 2) {
             var3 = var0.readBits(5);
             var4 = var3 >> 3;
-            var5 = var3 & 7;
-            var11 = Players.Players_regions[var1];
-            var7 = (var11 >> 28) + var4 & 3;
-            var8 = var11 >> 14 & 255;
-            var9 = var11 & 255;
-            if(var5 == 0) {
-               --var8;
-               --var9;
+            var9 = var3 & 7;
+            var10 = Players.Players_regions[var1];
+            var5 = (var10 >> 28) + var4 & 3;
+            var6 = var10 >> 14 & 255;
+            var7 = var10 & 255;
+            if (var9 == 0) {
+               --var6;
+               --var7;
             }
 
-            if(var5 == 1) {
-               --var9;
+            if (var9 == 1) {
+               --var7;
             }
 
-            if(var5 == 2) {
-               ++var8;
-               --var9;
+            if (var9 == 2) {
+               ++var6;
+               --var7;
             }
 
-            if(var5 == 3) {
-               --var8;
+            if (var9 == 3) {
+               --var6;
             }
 
-            if(var5 == 4) {
-               ++var8;
+            if (var9 == 4) {
+               ++var6;
             }
 
-            if(var5 == 5) {
-               --var8;
-               ++var9;
+            if (var9 == 5) {
+               --var6;
+               ++var7;
             }
 
-            if(var5 == 6) {
-               ++var9;
+            if (var9 == 6) {
+               ++var7;
             }
 
-            if(var5 == 7) {
-               ++var8;
-               ++var9;
+            if (var9 == 7) {
+               ++var6;
+               ++var7;
             }
 
-            Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28);
+            Players.Players_regions[var1] = (var6 << 14) + var7 + (var5 << 28);
             return false;
          } else {
             var3 = var0.readBits(18);
             var4 = var3 >> 16;
-            var5 = var3 >> 8 & 255;
-            var11 = var3 & 255;
-            var7 = Players.Players_regions[var1];
-            var8 = (var7 >> 28) + var4 & 3;
-            var9 = var5 + (var7 >> 14) & 255;
-            var10 = var7 + var11 & 255;
-            Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28);
+            var9 = var3 >> 8 & 255;
+            var10 = var3 & 255;
+            var5 = Players.Players_regions[var1];
+            var6 = (var5 >> 28) + var4 & 3;
+            var7 = var9 + (var5 >> 14) & 255;
+            var8 = var5 + var10 & 255;
+            Players.Players_regions[var1] = (var7 << 14) + var8 + (var6 << 28);
             return false;
          }
       }
diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java
index aa5ea9e654..09f71a5c0f 100644
--- a/runescape-client/src/main/java/class238.java
+++ b/runescape-client/src/main/java/class238.java
@@ -18,25 +18,25 @@ public final class class238 {
    )
    @Export("runCs1")
    static final boolean runCs1(Widget var0) {
-      if(var0.cs1Comparisons == null) {
+      if (var0.cs1Comparisons == null) {
          return false;
       } else {
-         for(int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) {
+         for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) {
             int var2 = class16.method187(var0, var1);
             int var3 = var0.cs1ComparisonValues[var1];
-            if(var0.cs1Comparisons[var1] == 2) {
-               if(var2 >= var3) {
+            if (var0.cs1Comparisons[var1] == 2) {
+               if (var2 >= var3) {
                   return false;
                }
-            } else if(var0.cs1Comparisons[var1] == 3) {
-               if(var2 <= var3) {
+            } else if (var0.cs1Comparisons[var1] == 3) {
+               if (var2 <= var3) {
                   return false;
                }
-            } else if(var0.cs1Comparisons[var1] == 4) {
-               if(var2 == var3) {
+            } else if (var0.cs1Comparisons[var1] == 4) {
+               if (var2 == var3) {
                   return false;
                }
-            } else if(var3 != var2) {
+            } else if (var3 != var2) {
                return false;
             }
          }
@@ -52,14 +52,14 @@ public final class class238 {
    )
    @Export("updateWidgetGroup")
    static final void updateWidgetGroup(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-      for(int var8 = 0; var8 < var0.length; ++var8) {
+      for (int var8 = 0; var8 < var0.length; ++var8) {
          Widget var9 = var0[var8];
-         if(var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class1.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) {
-            if(var9.isIf3) {
-               if(PacketBufferNode.method3673(var9)) {
+         if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class1.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) {
+            if (var9.isIf3) {
+               if (PacketBufferNode.method3673(var9)) {
                   continue;
                }
-            } else if(var9.type == 0 && var9 != Clock.mousedOverWidgetIf1 && PacketBufferNode.method3673(var9)) {
+            } else if (var9.type == 0 && var9 != Clock.mousedOverWidgetIf1 && PacketBufferNode.method3673(var9)) {
                continue;
             }
 
@@ -69,524 +69,524 @@ public final class class238 {
             int var13;
             int var14;
             int var15;
+            int var16;
             int var17;
-            int var18;
-            if(var9.type == 2) {
+            if (var9.type == 2) {
                var12 = var2;
                var13 = var3;
                var14 = var4;
                var15 = var5;
             } else {
-               int var16;
-               if(var9.type == 9) {
-                  var16 = var10;
-                  var17 = var11;
-                  var18 = var10 + var9.width;
+               int var18;
+               if (var9.type == 9) {
+                  var18 = var10;
+                  var16 = var11;
+                  var17 = var10 + var9.width;
                   int var19 = var11 + var9.height;
-                  if(var18 < var10) {
-                     var16 = var18;
-                     var18 = var10;
+                  if (var17 < var10) {
+                     var18 = var17;
+                     var17 = var10;
                   }
 
-                  if(var19 < var11) {
-                     var17 = var19;
+                  if (var19 < var11) {
+                     var16 = var19;
                      var19 = var11;
                   }
 
-                  ++var18;
+                  ++var17;
                   ++var19;
-                  var12 = var16 > var2?var16:var2;
-                  var13 = var17 > var3?var17:var3;
-                  var14 = var18 < var4?var18:var4;
-                  var15 = var19 < var5?var19:var5;
+                  var12 = var18 > var2 ? var18 : var2;
+                  var13 = var16 > var3 ? var16 : var3;
+                  var14 = var17 < var4 ? var17 : var4;
+                  var15 = var19 < var5 ? var19 : var5;
                } else {
-                  var16 = var10 + var9.width;
-                  var17 = var11 + var9.height;
-                  var12 = var10 > var2?var10:var2;
-                  var13 = var11 > var3?var11:var3;
-                  var14 = var16 < var4?var16:var4;
-                  var15 = var17 < var5?var17:var5;
+                  var18 = var10 + var9.width;
+                  var16 = var11 + var9.height;
+                  var12 = var10 > var2 ? var10 : var2;
+                  var13 = var11 > var3 ? var11 : var3;
+                  var14 = var18 < var4 ? var18 : var4;
+                  var15 = var16 < var5 ? var16 : var5;
                }
             }
 
-            if(var9 == Client.clickedWidget) {
-               Client.__client_nt = true;
-               Client.__client_nk = var10;
-               Client.__client_np = var11;
+            if (var9 == Client.clickedWidget) {
+               Client.field103 = true;
+               Client.field110 = var10;
+               Client.field111 = var11;
             }
 
-            boolean var32 = false;
-            if(var9.__cg) {
-               switch(Client.__client_mf) {
+            boolean var28 = false;
+            if (var9.field965) {
+               switch(Client.field151) {
                case 0:
-                  var32 = true;
+                  var28 = true;
                case 1:
                default:
                   break;
                case 2:
-                  if(Client.__client_ms == var9.id >>> 16) {
-                     var32 = true;
+                  if (Client.field153 == var9.id >>> 16) {
+                     var28 = true;
                   }
                   break;
                case 3:
-                  if(var9.id == Client.__client_ms) {
-                     var32 = true;
+                  if (var9.id == Client.field153) {
+                     var28 = true;
                   }
                }
             }
 
-            if(var32 || !var9.isIf3 || var12 < var14 && var13 < var15) {
-               if(var9.isIf3) {
-                  ScriptEvent var26;
-                  if(var9.noClickThrough) {
-                     if(MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
-                        for(var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) {
-                           if(var26.boolean1) {
-                              var26.remove();
-                              var26.widget.__fq = false;
+            if (var28 || !var9.isIf3 || var12 < var14 && var13 < var15) {
+               if (var9.isIf3) {
+                  ScriptEvent var29;
+                  if (var9.noClickThrough) {
+                     if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+                        for (var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) {
+                           if (var29.boolean1) {
+                              var29.remove();
+                              var29.widget.field978 = false;
                            }
                         }
 
-                        if(MouseRecorder.widgetDragDuration == 0) {
+                        if (MouseRecorder.widgetDragDuration == 0) {
                            Client.clickedWidget = null;
                            Client.clickedWidgetParent = null;
                         }
 
-                        if(!Client.isMenuOpen) {
+                        if (!Client.isMenuOpen) {
                            class30.resetMenuEntries();
                         }
                      }
-                  } else if(var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
-                     for(var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) {
-                        if(var26.boolean1 && var26.widget.onScroll == var26.args0) {
-                           var26.remove();
+                  } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+                     for (var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) {
+                        if (var29.boolean1 && var29.widget.onScroll == var29.args0) {
+                           var29.remove();
                         }
                      }
                   }
                }
 
-               var17 = MouseHandler.MouseHandler_x;
-               var18 = MouseHandler.MouseHandler_y;
-               if(MouseHandler.MouseHandler_lastButton != 0) {
-                  var17 = MouseHandler.MouseHandler_lastPressedX;
-                  var18 = MouseHandler.MouseHandler_lastPressedY;
+               var16 = MouseHandler.MouseHandler_x;
+               var17 = MouseHandler.MouseHandler_y;
+               if (MouseHandler.MouseHandler_lastButton != 0) {
+                  var16 = MouseHandler.MouseHandler_lastPressedX;
+                  var17 = MouseHandler.MouseHandler_lastPressedY;
                }
 
-               boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15;
-               if(var9.contentType == 1337) {
-                  if(!Client.isLoading && !Client.isMenuOpen && var33) {
-                     WorldMapEvent.method781(var17, var18, var12, var13);
+               boolean var30 = var16 >= var12 && var17 >= var13 && var16 < var14 && var17 < var15;
+               if (var9.contentType == 1337) {
+                  if (!Client.isLoading && !Client.isMenuOpen && var30) {
+                     WorldMapEvent.addSceneMenuOptions(var16, var17, var12, var13);
                   }
-               } else if(var9.contentType == 1338) {
+               } else if (var9.contentType == 1338) {
                   WorldMapRegion.method567(var9, var10, var11);
                } else {
-                  if(var9.contentType == 1400) {
-                     class60.worldMap0.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height);
+                  if (var9.contentType == 1400) {
+                     class60.worldMap0.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var30, var10, var11, var9.width, var9.height);
                   }
 
-                  if(!Client.isMenuOpen && var33) {
-                     if(var9.contentType == 1400) {
-                        class60.worldMap0.__bd_544(var10, var11, var9.width, var9.height, var17, var18);
+                  if (!Client.isMenuOpen && var30) {
+                     if (var9.contentType == 1400) {
+                        class60.worldMap0.method384(var10, var11, var9.width, var9.height, var16, var17);
                      } else {
-                        ChatChannel.method2237(var9, var17 - var10, var18 - var11);
+                        ChatChannel.method2237(var9, var16 - var10, var17 - var11);
                      }
                   }
 
-                  boolean var21;
-                  int var23;
-                  if(var32) {
-                     for(int var20 = 0; var20 < var9.__cf.length; ++var20) {
-                        var21 = false;
-                        boolean var22 = false;
-                        if(!var21 && var9.__cf[var20] != null) {
-                           for(var23 = 0; var23 < var9.__cf[var20].length; ++var23) {
+                  boolean var20;
+                  int var21;
+                  if (var28) {
+                     for (int var22 = 0; var22 < var9.field966.length; ++var22) {
+                        var20 = false;
+                        boolean var23 = false;
+                        if (!var20 && var9.field966[var22] != null) {
+                           for (var21 = 0; var21 < var9.field966[var22].length; ++var21) {
                               boolean var24 = false;
-                              if(var9.__fh != null) {
-                                 var24 = KeyHandler.KeyHandler_pressedKeys[var9.__cf[var20][var23]];
+                              if (var9.field984 != null) {
+                                 var24 = KeyHandler.KeyHandler_pressedKeys[var9.field966[var22][var21]];
                               }
 
-                              if(class1.method15(var9.__cf[var20][var23]) || var24) {
-                                 var21 = true;
-                                 if(var9.__fh != null && var9.__fh[var20] > Client.cycle) {
+                              if (class1.method15(var9.field966[var22][var21]) || var24) {
+                                 var20 = true;
+                                 if (var9.field984 != null && var9.field984[var22] > Client.cycle) {
                                     break;
                                  }
 
-                                 byte var25 = var9.__cp[var20][var23];
-                                 if(var25 == 0 || ((var25 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var25 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var25 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var25 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) {
-                                    var22 = true;
+                                 byte var25 = var9.field967[var22][var21];
+                                 if (var25 == 0 || ((var25 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var25 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var25 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var25 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) {
+                                    var23 = true;
                                     break;
                                  }
                               }
                            }
                         }
 
-                        if(var22) {
-                           if(var20 < 10) {
-                              class171.method3494(var20 + 1, var9.id, var9.childIndex, var9.itemId, "");
-                           } else if(var20 == 10) {
+                        if (var23) {
+                           if (var22 < 10) {
+                              class171.method3494(var22 + 1, var9.id, var9.childIndex, var9.itemId, "");
+                           } else if (var22 == 10) {
                               Player.method1281();
                               class25.method350(var9.id, var9.childIndex, class211.method4107(class1.getWidgetClickMask(var9)), var9.itemId);
                               Client.selectedSpellActionName = class198.method3745(var9);
-                              if(Client.selectedSpellActionName == null) {
+                              if (Client.selectedSpellActionName == null) {
                                  Client.selectedSpellActionName = "null";
                               }
 
                               Client.selectedSpellName = var9.dataText + BufferedFile.colorStartTag(16777215);
                            }
 
-                           var23 = var9.__cc[var20];
-                           if(var9.__fh == null) {
-                              var9.__fh = new int[var9.__cf.length];
+                           var21 = var9.field968[var22];
+                           if (var9.field984 == null) {
+                              var9.field984 = new int[var9.field966.length];
                            }
 
-                           if(var9.__ci == null) {
-                              var9.__ci = new int[var9.__cf.length];
+                           if (var9.field969 == null) {
+                              var9.field969 = new int[var9.field966.length];
                            }
 
-                           if(var23 != 0) {
-                              if(var9.__fh[var20] == 0) {
-                                 var9.__fh[var20] = var23 + Client.cycle + var9.__ci[var20];
+                           if (var21 != 0) {
+                              if (var9.field984[var22] == 0) {
+                                 var9.field984[var22] = var21 + Client.cycle + var9.field969[var22];
                               } else {
-                                 var9.__fh[var20] = var23 + Client.cycle;
+                                 var9.field984[var22] = var21 + Client.cycle;
                               }
                            } else {
-                              var9.__fh[var20] = Integer.MAX_VALUE;
+                              var9.field984[var22] = Integer.MAX_VALUE;
                            }
                         }
 
-                        if(!var21 && var9.__fh != null) {
-                           var9.__fh[var20] = 0;
+                        if (!var20 && var9.field984 != null) {
+                           var9.field984[var22] = 0;
                         }
                      }
                   }
 
-                  if(var9.isIf3) {
-                     if(MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
-                        var33 = true;
+                  ScriptEvent var32;
+                  if (var9.isIf3) {
+                     if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+                        var30 = true;
                      } else {
-                        var33 = false;
+                        var30 = false;
                      }
 
-                     boolean var34 = false;
-                     if((MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) {
-                        var34 = true;
+                     boolean var31 = false;
+                     if ((MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var30) {
+                        var31 = true;
                      }
 
-                     var21 = false;
-                     if((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) {
-                        var21 = true;
+                     var20 = false;
+                     if ((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) {
+                        var20 = true;
                      }
 
-                     if(var21) {
+                     if (var20) {
                         Players.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11);
                      }
 
-                     if(var9.contentType == 1400) {
-                        class60.worldMap0.__w_519(var17, var18, var33 & var34, var33 & var21);
+                     if (var9.contentType == 1400) {
+                        class60.worldMap0.method361(var16, var17, var30 & var31, var30 & var20);
                      }
 
-                     if(Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && class54.method1090(class1.getWidgetClickMask(var9))) {
+                     if (Client.clickedWidget != null && var9 != Client.clickedWidget && var30 && class54.method1090(class1.getWidgetClickMask(var9))) {
                         Client.draggedOnWidget = var9;
                      }
 
-                     if(var9 == Client.clickedWidgetParent) {
-                        Client.__client_nn = true;
-                        Client.__client_nw = var10;
-                        Client.__client_nl = var11;
+                     if (var9 == Client.clickedWidgetParent) {
+                        Client.field106 = true;
+                        Client.field108 = var10;
+                        Client.field109 = var11;
                      }
 
-                     if(var9.hasListener) {
-                        ScriptEvent var27;
-                        if(var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) {
-                           var27 = new ScriptEvent();
-                           var27.boolean1 = true;
-                           var27.widget = var9;
-                           var27.mouseY = Client.mouseWheelRotation;
-                           var27.args0 = var9.onScroll;
-                           Client.scriptEvents.addFirst(var27);
+                     if (var9.hasListener) {
+                        if (var30 && Client.mouseWheelRotation != 0 && var9.onScroll != null) {
+                           var32 = new ScriptEvent();
+                           var32.boolean1 = true;
+                           var32.widget = var9;
+                           var32.mouseY = Client.mouseWheelRotation;
+                           var32.args0 = var9.onScroll;
+                           Client.scriptEvents.addFirst(var32);
                         }
 
-                        if(Client.clickedWidget != null || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) {
-                           var21 = false;
-                           var34 = false;
-                           var33 = false;
+                        if (Client.clickedWidget != null || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) {
+                           var20 = false;
+                           var31 = false;
+                           var30 = false;
                         }
 
-                        if(!var9.__fw && var21) {
-                           var9.__fw = true;
-                           if(var9.onClick != null) {
-                              var27 = new ScriptEvent();
-                              var27.boolean1 = true;
-                              var27.widget = var9;
-                              var27.mouseX = MouseHandler.MouseHandler_lastPressedX - var10;
-                              var27.mouseY = MouseHandler.MouseHandler_lastPressedY - var11;
-                              var27.args0 = var9.onClick;
-                              Client.scriptEvents.addFirst(var27);
+                        if (!var9.field979 && var20) {
+                           var9.field979 = true;
+                           if (var9.onClick != null) {
+                              var32 = new ScriptEvent();
+                              var32.boolean1 = true;
+                              var32.widget = var9;
+                              var32.mouseX = MouseHandler.MouseHandler_lastPressedX - var10;
+                              var32.mouseY = MouseHandler.MouseHandler_lastPressedY - var11;
+                              var32.args0 = var9.onClick;
+                              Client.scriptEvents.addFirst(var32);
                            }
                         }
 
-                        if(var9.__fw && var34 && var9.onClickRepeat != null) {
-                           var27 = new ScriptEvent();
-                           var27.boolean1 = true;
-                           var27.widget = var9;
-                           var27.mouseX = MouseHandler.MouseHandler_x - var10;
-                           var27.mouseY = MouseHandler.MouseHandler_y - var11;
-                           var27.args0 = var9.onClickRepeat;
-                           Client.scriptEvents.addFirst(var27);
+                        if (var9.field979 && var31 && var9.onClickRepeat != null) {
+                           var32 = new ScriptEvent();
+                           var32.boolean1 = true;
+                           var32.widget = var9;
+                           var32.mouseX = MouseHandler.MouseHandler_x - var10;
+                           var32.mouseY = MouseHandler.MouseHandler_y - var11;
+                           var32.args0 = var9.onClickRepeat;
+                           Client.scriptEvents.addFirst(var32);
                         }
 
-                        if(var9.__fw && !var34) {
-                           var9.__fw = false;
-                           if(var9.onRelease != null) {
-                              var27 = new ScriptEvent();
-                              var27.boolean1 = true;
-                              var27.widget = var9;
-                              var27.mouseX = MouseHandler.MouseHandler_x - var10;
-                              var27.mouseY = MouseHandler.MouseHandler_y - var11;
-                              var27.args0 = var9.onRelease;
-                              Client.__client_oc.addFirst(var27);
+                        if (var9.field979 && !var31) {
+                           var9.field979 = false;
+                           if (var9.onRelease != null) {
+                              var32 = new ScriptEvent();
+                              var32.boolean1 = true;
+                              var32.widget = var9;
+                              var32.mouseX = MouseHandler.MouseHandler_x - var10;
+                              var32.mouseY = MouseHandler.MouseHandler_y - var11;
+                              var32.args0 = var9.onRelease;
+                              Client.field148.addFirst(var32);
                            }
                         }
 
-                        if(var34 && var9.onHold != null) {
-                           var27 = new ScriptEvent();
-                           var27.boolean1 = true;
-                           var27.widget = var9;
-                           var27.mouseX = MouseHandler.MouseHandler_x - var10;
-                           var27.mouseY = MouseHandler.MouseHandler_y - var11;
-                           var27.args0 = var9.onHold;
-                           Client.scriptEvents.addFirst(var27);
+                        if (var31 && var9.onHold != null) {
+                           var32 = new ScriptEvent();
+                           var32.boolean1 = true;
+                           var32.widget = var9;
+                           var32.mouseX = MouseHandler.MouseHandler_x - var10;
+                           var32.mouseY = MouseHandler.MouseHandler_y - var11;
+                           var32.args0 = var9.onHold;
+                           Client.scriptEvents.addFirst(var32);
                         }
 
-                        if(!var9.__fq && var33) {
-                           var9.__fq = true;
-                           if(var9.onMouseOver != null) {
-                              var27 = new ScriptEvent();
-                              var27.boolean1 = true;
-                              var27.widget = var9;
-                              var27.mouseX = MouseHandler.MouseHandler_x - var10;
-                              var27.mouseY = MouseHandler.MouseHandler_y - var11;
-                              var27.args0 = var9.onMouseOver;
-                              Client.scriptEvents.addFirst(var27);
+                        if (!var9.field978 && var30) {
+                           var9.field978 = true;
+                           if (var9.onMouseOver != null) {
+                              var32 = new ScriptEvent();
+                              var32.boolean1 = true;
+                              var32.widget = var9;
+                              var32.mouseX = MouseHandler.MouseHandler_x - var10;
+                              var32.mouseY = MouseHandler.MouseHandler_y - var11;
+                              var32.args0 = var9.onMouseOver;
+                              Client.scriptEvents.addFirst(var32);
                            }
                         }
 
-                        if(var9.__fq && var33 && var9.onMouseRepeat != null) {
-                           var27 = new ScriptEvent();
-                           var27.boolean1 = true;
-                           var27.widget = var9;
-                           var27.mouseX = MouseHandler.MouseHandler_x - var10;
-                           var27.mouseY = MouseHandler.MouseHandler_y - var11;
-                           var27.args0 = var9.onMouseRepeat;
-                           Client.scriptEvents.addFirst(var27);
+                        if (var9.field978 && var30 && var9.onMouseRepeat != null) {
+                           var32 = new ScriptEvent();
+                           var32.boolean1 = true;
+                           var32.widget = var9;
+                           var32.mouseX = MouseHandler.MouseHandler_x - var10;
+                           var32.mouseY = MouseHandler.MouseHandler_y - var11;
+                           var32.args0 = var9.onMouseRepeat;
+                           Client.scriptEvents.addFirst(var32);
                         }
 
-                        if(var9.__fq && !var33) {
-                           var9.__fq = false;
-                           if(var9.onMouseLeave != null) {
-                              var27 = new ScriptEvent();
-                              var27.boolean1 = true;
-                              var27.widget = var9;
-                              var27.mouseX = MouseHandler.MouseHandler_x - var10;
-                              var27.mouseY = MouseHandler.MouseHandler_y - var11;
-                              var27.args0 = var9.onMouseLeave;
-                              Client.__client_oc.addFirst(var27);
+                        if (var9.field978 && !var30) {
+                           var9.field978 = false;
+                           if (var9.onMouseLeave != null) {
+                              var32 = new ScriptEvent();
+                              var32.boolean1 = true;
+                              var32.widget = var9;
+                              var32.mouseX = MouseHandler.MouseHandler_x - var10;
+                              var32.mouseY = MouseHandler.MouseHandler_y - var11;
+                              var32.args0 = var9.onMouseLeave;
+                              Client.field148.addFirst(var32);
                            }
                         }
 
-                        if(var9.onTimer != null) {
-                           var27 = new ScriptEvent();
-                           var27.widget = var9;
-                           var27.args0 = var9.onTimer;
-                           Client.__client_oh.addFirst(var27);
+                        if (var9.onTimer != null) {
+                           var32 = new ScriptEvent();
+                           var32.widget = var9;
+                           var32.args0 = var9.onTimer;
+                           Client.field147.addFirst(var32);
                         }
 
-                        ScriptEvent var30;
+                        int var26;
+                        ScriptEvent var34;
                         int var35;
-                        int var36;
-                        if(var9.onVarTransmit != null && Client.__client_nd > var9.__fc) {
-                           if(var9.varTransmitTriggers != null && Client.__client_nd - var9.__fc <= 32) {
-                              label887:
-                              for(var35 = var9.__fc; var35 < Client.__client_nd; ++var35) {
-                                 var23 = Client.__client_nr[var35 & 31];
+                        if (var9.onVarTransmit != null && Client.field123 > var9.field981) {
+                           if (var9.varTransmitTriggers != null && Client.field123 - var9.field981 <= 32) {
+                              label590:
+                              for (var35 = var9.field981; var35 < Client.field123; ++var35) {
+                                 var21 = Client.field121[var35 & 31];
 
-                                 for(var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) {
-                                    if(var23 == var9.varTransmitTriggers[var36]) {
-                                       var30 = new ScriptEvent();
-                                       var30.widget = var9;
-                                       var30.args0 = var9.onVarTransmit;
-                                       Client.scriptEvents.addFirst(var30);
-                                       break label887;
+                                 for (var26 = 0; var26 < var9.varTransmitTriggers.length; ++var26) {
+                                    if (var21 == var9.varTransmitTriggers[var26]) {
+                                       var34 = new ScriptEvent();
+                                       var34.widget = var9;
+                                       var34.args0 = var9.onVarTransmit;
+                                       Client.scriptEvents.addFirst(var34);
+                                       break label590;
                                     }
                                  }
                               }
                            } else {
-                              var27 = new ScriptEvent();
-                              var27.widget = var9;
-                              var27.args0 = var9.onVarTransmit;
-                              Client.scriptEvents.addFirst(var27);
+                              var32 = new ScriptEvent();
+                              var32.widget = var9;
+                              var32.args0 = var9.onVarTransmit;
+                              Client.scriptEvents.addFirst(var32);
                            }
 
-                           var9.__fc = Client.__client_nd;
+                           var9.field981 = Client.field123;
                         }
 
-                        if(var9.onInvTransmit != null && Client.__client_ns > var9.__fl) {
-                           if(var9.invTransmitTriggers != null && Client.__client_ns - var9.__fl <= 32) {
-                              label863:
-                              for(var35 = var9.__fl; var35 < Client.__client_ns; ++var35) {
-                                 var23 = Client.__client_nz[var35 & 31];
+                        if (var9.onInvTransmit != null && Client.field117 > var9.field982) {
+                           if (var9.invTransmitTriggers != null && Client.field117 - var9.field982 <= 32) {
+                              label566:
+                              for (var35 = var9.field982; var35 < Client.field117; ++var35) {
+                                 var21 = Client.field116[var35 & 31];
 
-                                 for(var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) {
-                                    if(var23 == var9.invTransmitTriggers[var36]) {
-                                       var30 = new ScriptEvent();
-                                       var30.widget = var9;
-                                       var30.args0 = var9.onInvTransmit;
-                                       Client.scriptEvents.addFirst(var30);
-                                       break label863;
+                                 for (var26 = 0; var26 < var9.invTransmitTriggers.length; ++var26) {
+                                    if (var21 == var9.invTransmitTriggers[var26]) {
+                                       var34 = new ScriptEvent();
+                                       var34.widget = var9;
+                                       var34.args0 = var9.onInvTransmit;
+                                       Client.scriptEvents.addFirst(var34);
+                                       break label566;
                                     }
                                  }
                               }
                            } else {
-                              var27 = new ScriptEvent();
-                              var27.widget = var9;
-                              var27.args0 = var9.onInvTransmit;
-                              Client.scriptEvents.addFirst(var27);
+                              var32 = new ScriptEvent();
+                              var32.widget = var9;
+                              var32.args0 = var9.onInvTransmit;
+                              Client.scriptEvents.addFirst(var32);
                            }
 
-                           var9.__fl = Client.__client_ns;
+                           var9.field982 = Client.field117;
                         }
 
-                        if(var9.onStatTransmit != null && Client.changedSkillsCount > var9.__fj) {
-                           if(var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.__fj <= 32) {
-                              label839:
-                              for(var35 = var9.__fj; var35 < Client.changedSkillsCount; ++var35) {
-                                 var23 = Client.changedSkills[var35 & 31];
+                        if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field983) {
+                           if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field983 <= 32) {
+                              label542:
+                              for (var35 = var9.field983; var35 < Client.changedSkillsCount; ++var35) {
+                                 var21 = Client.changedSkills[var35 & 31];
 
-                                 for(var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) {
-                                    if(var23 == var9.statTransmitTriggers[var36]) {
-                                       var30 = new ScriptEvent();
-                                       var30.widget = var9;
-                                       var30.args0 = var9.onStatTransmit;
-                                       Client.scriptEvents.addFirst(var30);
-                                       break label839;
+                                 for (var26 = 0; var26 < var9.statTransmitTriggers.length; ++var26) {
+                                    if (var21 == var9.statTransmitTriggers[var26]) {
+                                       var34 = new ScriptEvent();
+                                       var34.widget = var9;
+                                       var34.args0 = var9.onStatTransmit;
+                                       Client.scriptEvents.addFirst(var34);
+                                       break label542;
                                     }
                                  }
                               }
                            } else {
-                              var27 = new ScriptEvent();
-                              var27.widget = var9;
-                              var27.args0 = var9.onStatTransmit;
-                              Client.scriptEvents.addFirst(var27);
+                              var32 = new ScriptEvent();
+                              var32.widget = var9;
+                              var32.args0 = var9.onStatTransmit;
+                              Client.scriptEvents.addFirst(var32);
                            }
 
-                           var9.__fj = Client.changedSkillsCount;
+                           var9.field983 = Client.changedSkillsCount;
                         }
 
-                        if(Client.chatCycle > var9.__fg && var9.__em != null) {
-                           var27 = new ScriptEvent();
-                           var27.widget = var9;
-                           var27.args0 = var9.__em;
-                           Client.scriptEvents.addFirst(var27);
+                        if (Client.chatCycle > var9.field980 && var9.field970 != null) {
+                           var32 = new ScriptEvent();
+                           var32.widget = var9;
+                           var32.args0 = var9.field970;
+                           Client.scriptEvents.addFirst(var32);
                         }
 
-                        if(Client.__client_na > var9.__fg && var9.__ex != null) {
-                           var27 = new ScriptEvent();
-                           var27.widget = var9;
-                           var27.args0 = var9.__ex;
-                           Client.scriptEvents.addFirst(var27);
+                        if (Client.field105 > var9.field980 && var9.field971 != null) {
+                           var32 = new ScriptEvent();
+                           var32.widget = var9;
+                           var32.args0 = var9.field971;
+                           Client.scriptEvents.addFirst(var32);
                         }
 
-                        if(Client.__client_nh > var9.__fg && var9.__ej != null) {
-                           var27 = new ScriptEvent();
-                           var27.widget = var9;
-                           var27.args0 = var9.__ej;
-                           Client.scriptEvents.addFirst(var27);
+                        if (Client.field129 > var9.field980 && var9.field972 != null) {
+                           var32 = new ScriptEvent();
+                           var32.widget = var9;
+                           var32.args0 = var9.field972;
+                           Client.scriptEvents.addFirst(var32);
                         }
 
-                        if(Client.__client_nv > var9.__fg && var9.__eq != null) {
-                           var27 = new ScriptEvent();
-                           var27.widget = var9;
-                           var27.args0 = var9.__eq;
-                           Client.scriptEvents.addFirst(var27);
+                        if (Client.field122 > var9.field980 && var9.field976 != null) {
+                           var32 = new ScriptEvent();
+                           var32.widget = var9;
+                           var32.args0 = var9.field976;
+                           Client.scriptEvents.addFirst(var32);
                         }
 
-                        if(Client.__client_nc > var9.__fg && var9.__eh != null) {
-                           var27 = new ScriptEvent();
-                           var27.widget = var9;
-                           var27.args0 = var9.__eh;
-                           Client.scriptEvents.addFirst(var27);
+                        if (Client.field154 > var9.field980 && var9.field977 != null) {
+                           var32 = new ScriptEvent();
+                           var32.widget = var9;
+                           var32.args0 = var9.field977;
+                           Client.scriptEvents.addFirst(var32);
                         }
 
-                        if(Client.__client_ni > var9.__fg && var9.__el != null) {
-                           var27 = new ScriptEvent();
-                           var27.widget = var9;
-                           var27.args0 = var9.__el;
-                           Client.scriptEvents.addFirst(var27);
+                        if (Client.field124 > var9.field980 && var9.field973 != null) {
+                           var32 = new ScriptEvent();
+                           var32.widget = var9;
+                           var32.args0 = var9.field973;
+                           Client.scriptEvents.addFirst(var32);
                         }
 
-                        var9.__fg = Client.cycleCntr;
-                        if(var9.onKeyListener != null) {
-                           for(var35 = 0; var35 < Client.__client_pm; ++var35) {
-                              ScriptEvent var31 = new ScriptEvent();
-                              var31.widget = var9;
-                              var31.keyTyped = Client.__client_pn[var35];
-                              var31.keyPressed = Client.__client_pq[var35];
-                              var31.args0 = var9.onKeyListener;
-                              Client.scriptEvents.addFirst(var31);
+                        var9.field980 = Client.cycleCntr;
+                        if (var9.onKeyListener != null) {
+                           for (var35 = 0; var35 < Client.field137; ++var35) {
+                              ScriptEvent var27 = new ScriptEvent();
+                              var27.widget = var9;
+                              var27.keyTyped = Client.field145[var35];
+                              var27.keyPressed = Client.field146[var35];
+                              var27.args0 = var9.onKeyListener;
+                              Client.scriptEvents.addFirst(var27);
                            }
                         }
                      }
                   }
 
-                  if(!var9.isIf3) {
-                     if(Client.clickedWidget != null || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) {
+                  if (!var9.isIf3) {
+                     if (Client.clickedWidget != null || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) {
                         continue;
                      }
 
-                     if((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
-                        if(var9.mouseOverRedirect >= 0) {
+                     if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+                        if (var9.mouseOverRedirect >= 0) {
                            Clock.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect];
                         } else {
                            Clock.mousedOverWidgetIf1 = var9;
                         }
                      }
 
-                     if(var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
-                        AccessFile.__dk_lm = var9;
+                     if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+                        AccessFile.field8 = var9;
                      }
 
-                     if(var9.scrollHeight > var9.height) {
+                     if (var9.scrollHeight > var9.height) {
                         WorldMapSection0.method246(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y);
                      }
                   }
 
-                  if(var9.type == 0) {
+                  if (var9.type == 0) {
                      updateWidgetGroup(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
-                     if(var9.children != null) {
+                     if (var9.children != null) {
                         updateWidgetGroup(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
                      }
 
-                     WidgetGroupParent var28 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var9.id);
-                     if(var28 != null) {
-                        if(var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) {
-                           for(ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) {
-                              if(var29.boolean1) {
-                                 var29.remove();
-                                 var29.widget.__fq = false;
+                     WidgetGroupParent var33 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var9.id);
+                     if (var33 != null) {
+                        if (var33.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) {
+                           for (var32 = (ScriptEvent)Client.scriptEvents.last(); var32 != null; var32 = (ScriptEvent)Client.scriptEvents.previous()) {
+                              if (var32.boolean1) {
+                                 var32.remove();
+                                 var32.widget.field978 = false;
                               }
                            }
 
-                           if(MouseRecorder.widgetDragDuration == 0) {
+                           if (MouseRecorder.widgetDragDuration == 0) {
                               Client.clickedWidget = null;
                               Client.clickedWidgetParent = null;
                            }
 
-                           if(!Client.isMenuOpen) {
+                           if (!Client.isMenuOpen) {
                               class30.resetMenuEntries();
                            }
                         }
 
-                        class231.method4517(var28.group, var12, var13, var14, var15, var10, var11);
+                        class231.method4517(var33.group, var12, var13, var14, var15, var10, var11);
                      }
                   }
                }
diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java
index 7d529fbf77..b3ada630e4 100644
--- a/runescape-client/src/main/java/class248.java
+++ b/runescape-client/src/main/java/class248.java
@@ -1,5 +1,4 @@
 import java.util.HashMap;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
@@ -7,12 +6,12 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("iu")
 public class class248 {
    @ObfuscatedName("e")
-   static int[] __iu_e;
+   static int[] field1141;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
       intValue = 662119345
    )
-   static int __iu_n;
+   static int field1142;
    @ObfuscatedName("m")
    final HashMap field3267;
    @ObfuscatedName("f")
@@ -51,17 +50,17 @@ public class class248 {
       int[] var6 = new int[var2 * var2];
       boolean var7 = false;
 
-      for(int var8 = 0; var8 < var2; ++var8) {
-         for(int var9 = 0; var9 < var2; ++var9) {
+      for (int var8 = 0; var8 < var2; ++var8) {
+         for (int var9 = 0; var9 < var2; ++var9) {
             int var10 = var6[var9 + var2 * var8] = (int)(256.0D * (var3[var9] * var3[var8] / var4));
-            if(!var7 && var10 > 0) {
+            if (!var7 && var10 > 0) {
                var7 = true;
             }
          }
       }
 
       Sprite var11 = new Sprite(var6, var2, var2);
-      this.field3267.put(Integer.valueOf(var1), var11);
+      this.field3267.put(var1, var11);
    }
 
    @ObfuscatedName("q")
@@ -70,11 +69,11 @@ public class class248 {
       garbageValue = "-1847730067"
    )
    Sprite method4718(int var1) {
-      if(!this.field3267.containsKey(Integer.valueOf(var1))) {
+      if (!this.field3267.containsKey(var1)) {
          this.method4716(var1);
       }
 
-      return (Sprite)this.field3267.get(Integer.valueOf(var1));
+      return (Sprite)this.field3267.get(var1);
    }
 
    @ObfuscatedName("w")
@@ -83,11 +82,12 @@ public class class248 {
       garbageValue = "-703491177"
    )
    public final void method4738(int var1, int var2) {
-      if(this.field3266 < this.field3271.length) {
+      if (this.field3266 < this.field3271.length) {
          this.field3271[this.field3266] = var1;
          this.field3262[this.field3266] = var2;
          ++this.field3266;
       }
+
    }
 
    @ObfuscatedName("o")
@@ -110,38 +110,38 @@ public class class248 {
       int var7 = var5 * 2 + 1;
       Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight);
       Bounds var9 = new Bounds(0, 0);
-      this.field3263.__f_488(var7, var7);
+      this.field3263.method29(var7, var7);
       System.nanoTime();
 
       int var10;
       int var11;
       int var12;
-      for(var10 = 0; var10 < this.field3266; ++var10) {
+      for (var10 = 0; var10 < this.field3266; ++var10) {
          var11 = this.field3271[var10];
          var12 = this.field3262[var10];
          int var13 = (int)(var4 * (float)(var11 - var1)) - var5;
          int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5;
-         this.field3263.__m_487(var13, var14);
-         this.field3263.__q_490(var8, var9);
+         this.field3263.method28(var13, var14);
+         this.field3263.method30(var8, var9);
          this.method4721(var6, var3, var9);
       }
 
       System.nanoTime();
       System.nanoTime();
 
-      for(var10 = 0; var10 < var3.pixels.length; ++var10) {
-         if(var3.pixels[var10] == 0) {
+      for (var10 = 0; var10 < var3.pixels.length; ++var10) {
+         if (var3.pixels[var10] == 0) {
             var3.pixels[var10] = -16777216;
          } else {
             var11 = (var3.pixels[var10] + 64 - 1) / 256;
-            if(var11 <= 0) {
+            if (var11 <= 0) {
                var3.pixels[var10] = -16777216;
             } else {
-               if(var11 > __iu_e.length) {
-                  var11 = __iu_e.length;
+               if (var11 > field1141.length) {
+                  var11 = field1141.length;
                }
 
-               var12 = __iu_e[var11 - 1];
+               var12 = field1141[var11 - 1];
                var3.pixels[var10] = -16777216 | var12;
             }
          }
@@ -156,31 +156,32 @@ public class class248 {
       garbageValue = "112"
    )
    void method4721(Sprite var1, Sprite var2, Bounds var3) {
-      if(var3.__q != 0 && var3.__w != 0) {
+      if (var3.field43 != 0 && var3.field44 != 0) {
          int var4 = 0;
          int var5 = 0;
-         if(var3.__m == 0) {
-            var4 = var1.subWidth - var3.__q;
+         if (var3.field41 == 0) {
+            var4 = var1.subWidth - var3.field43;
          }
 
-         if(var3.__f == 0) {
-            var5 = var1.subHeight - var3.__w;
+         if (var3.field42 == 0) {
+            var5 = var1.subHeight - var3.field44;
          }
 
          int var6 = var4 + var5 * var1.subWidth;
-         int var7 = var2.subWidth * var3.__f + var3.__m;
+         int var7 = var2.subWidth * var3.field42 + var3.field41;
 
-         for(int var8 = 0; var8 < var3.__w; ++var8) {
-            for(int var9 = 0; var9 < var3.__q; ++var9) {
-               int var10001 = var7++;
-               var2.pixels[var10001] += var1.pixels[var6++];
+         for (int var8 = 0; var8 < var3.field44; ++var8) {
+            for (int var9 = 0; var9 < var3.field43; ++var9) {
+               int var10 = var7++;
+               int[] var11 = var2.pixels;
+               var11[var10] += var1.pixels[var6++];
             }
 
-            var6 += var1.subWidth - var3.__q;
-            var7 += var2.subWidth - var3.__q;
+            var6 += var1.subWidth - var3.field43;
+            var7 += var2.subWidth - var3.field43;
          }
-
       }
+
    }
 
    @ObfuscatedName("ar")
@@ -190,136 +191,136 @@ public class class248 {
    )
    static int method4741(int var0, Script var1, boolean var2) {
       int var3;
-      if(var0 == 3903) {
+      if (var0 == 3903) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type();
          return 1;
-      } else if(var0 == 3904) {
+      } else if (var0 == 3904) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id;
          return 1;
-      } else if(var0 == 3905) {
+      } else if (var0 == 3905) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice;
          return 1;
-      } else if(var0 == 3906) {
+      } else if (var0 == 3906) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity;
          return 1;
-      } else if(var0 == 3907) {
+      } else if (var0 == 3907) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity;
          return 1;
-      } else if(var0 == 3908) {
+      } else if (var0 == 3908) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice;
          return 1;
       } else {
-         int var12;
-         if(var0 == 3910) {
+         int var4;
+         if (var0 == 3910) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            var12 = Client.grandExchangeOffers[var3].status();
-            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 0?1:0;
+            var4 = Client.grandExchangeOffers[var3].status();
+            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 0 ? 1 : 0;
             return 1;
-         } else if(var0 == 3911) {
+         } else if (var0 == 3911) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            var12 = Client.grandExchangeOffers[var3].status();
-            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 2?1:0;
+            var4 = Client.grandExchangeOffers[var3].status();
+            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 2 ? 1 : 0;
             return 1;
-         } else if(var0 == 3912) {
+         } else if (var0 == 3912) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            var12 = Client.grandExchangeOffers[var3].status();
-            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 5?1:0;
+            var4 = Client.grandExchangeOffers[var3].status();
+            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 5 ? 1 : 0;
             return 1;
-         } else if(var0 == 3913) {
+         } else if (var0 == 3913) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            var12 = Client.grandExchangeOffers[var3].status();
-            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 1?1:0;
+            var4 = Client.grandExchangeOffers[var3].status();
+            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 1 ? 1 : 0;
             return 1;
          } else {
-            boolean var13;
-            if(var0 == 3914) {
-               var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-               if(FloorDecoration.grandExchangeEvents != null) {
-                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_w, var13);
+            boolean var5;
+            if (var0 == 3914) {
+               var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               if (FloorDecoration.grandExchangeEvents != null) {
+                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field373, var5);
                }
 
                return 1;
-            } else if(var0 == 3915) {
-               var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-               if(FloorDecoration.grandExchangeEvents != null) {
-                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_q, var13);
+            } else if (var0 == 3915) {
+               var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               if (FloorDecoration.grandExchangeEvents != null) {
+                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field372, var5);
                }
 
                return 1;
-            } else if(var0 == 3916) {
+            } else if (var0 == 3916) {
                RouteStrategy.Interpreter_intStackSize -= 2;
-               var13 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == 1;
-               boolean var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
-               if(FloorDecoration.grandExchangeEvents != null) {
-                  Client.__client_sj.__m = var4;
-                  FloorDecoration.grandExchangeEvents.sort(Client.__client_sj, var13);
+               var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == 1;
+               boolean var13 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
+               if (FloorDecoration.grandExchangeEvents != null) {
+                  Client.field159.field666 = var13;
+                  FloorDecoration.grandExchangeEvents.sort(Client.field159, var5);
                }
 
                return 1;
-            } else if(var0 == 3917) {
-               var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-               if(FloorDecoration.grandExchangeEvents != null) {
-                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_f, var13);
+            } else if (var0 == 3917) {
+               var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               if (FloorDecoration.grandExchangeEvents != null) {
+                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field371, var5);
                }
 
                return 1;
-            } else if(var0 == 3918) {
-               var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-               if(FloorDecoration.grandExchangeEvents != null) {
-                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_o, var13);
+            } else if (var0 == 3918) {
+               var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               if (FloorDecoration.grandExchangeEvents != null) {
+                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field374, var5);
                }
 
                return 1;
-            } else if(var0 == 3919) {
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = FloorDecoration.grandExchangeEvents == null?0:FloorDecoration.grandExchangeEvents.events.size();
+            } else if (var0 == 3919) {
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = FloorDecoration.grandExchangeEvents == null ? 0 : FloorDecoration.grandExchangeEvents.events.size();
                return 1;
             } else {
-               GrandExchangeEvent var11;
-               if(var0 == 3920) {
+               GrandExchangeEvent var6;
+               if (var0 == 3920) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.world;
+                  var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.world;
                   return 1;
-               } else if(var0 == 3921) {
+               } else if (var0 == 3921) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.__m_3();
+                  var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.method119();
                   return 1;
-               } else if(var0 == 3922) {
+               } else if (var0 == 3922) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.__f_4();
+                  var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.method120();
                   return 1;
-               } else if(var0 == 3923) {
+               } else if (var0 == 3923) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  long var5 = class203.currentTimeMs() - class15.__z_si - var11.__f;
-                  int var7 = (int)(var5 / 3600000L);
-                  int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L);
-                  int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L);
-                  String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10;
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10;
+                  var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+                  long var7 = class203.currentTimeMs() - class15.field1113 - var6.field370;
+                  int var9 = (int)(var7 / 3600000L);
+                  int var10 = (int)((var7 - (long)(var9 * 3600000)) / 60000L);
+                  int var11 = (int)((var7 - (long)(var9 * 3600000) - (long)(var10 * 60000)) / 1000L);
+                  String var12 = var9 + ":" + var10 / 10 + var10 % 10 + ":" + var11 / 10 + var11 % 10;
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12;
                   return 1;
-               } else if(var0 == 3924) {
+               } else if (var0 == 3924) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity;
+                  var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.totalQuantity;
                   return 1;
-               } else if(var0 == 3925) {
+               } else if (var0 == 3925) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice;
+                  var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.unitPrice;
                   return 1;
-               } else if(var0 == 3926) {
+               } else if (var0 == 3926) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id;
+                  var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.id;
                   return 1;
                } else {
                   return 2;
diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java
index 05f3efda01..5693e89cd6 100644
--- a/runescape-client/src/main/java/class249.java
+++ b/runescape-client/src/main/java/class249.java
@@ -32,7 +32,7 @@ public enum class249 implements Enumerated {
    )
    final int field3276;
 
-   class249(int var3, int var4) {
+   private class249(int var3, int var4) {
       this.field3275 = var3;
       this.field3276 = var4;
    }
diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/class25.java
index 5bd96c6c26..59cad88368 100644
--- a/runescape-client/src/main/java/class25.java
+++ b/runescape-client/src/main/java/class25.java
@@ -45,21 +45,21 @@ public class class25 {
       garbageValue = "-1540935608"
    )
    static final int method348(int var0, int var1) {
-      if(var0 == -2) {
+      if (var0 == -2) {
          return 12345678;
-      } else if(var0 == -1) {
-         if(var1 < 2) {
+      } else if (var0 == -1) {
+         if (var1 < 2) {
             var1 = 2;
-         } else if(var1 > 126) {
+         } else if (var1 > 126) {
             var1 = 126;
          }
 
          return var1;
       } else {
          var1 = (var0 & 127) * var1 / 128;
-         if(var1 < 2) {
+         if (var1 < 2) {
             var1 = 2;
-         } else if(var1 > 126) {
+         } else if (var1 > 126) {
             var1 = 126;
          }
 
@@ -73,7 +73,7 @@ public class class25 {
       garbageValue = "641029128"
    )
    static void method349() {
-      if(Client.renderSelf) {
+      if (Client.renderSelf) {
          WorldMapCacheName.addPlayerToScene(Canvas.localPlayer, false);
       }
 
@@ -86,17 +86,17 @@ public class class25 {
    )
    static void method350(int var0, int var1, int var2, int var3) {
       Widget var4 = class204.getWidgetChild(var0, var1);
-      if(var4 != null && var4.onTargetEnter != null) {
+      if (var4 != null && var4.onTargetEnter != null) {
          ScriptEvent var5 = new ScriptEvent();
          var5.widget = var4;
          var5.args0 = var4.onTargetEnter;
          AbstractIndexCache.runScript(var5);
       }
 
-      Client.__client_mh = var3;
+      Client.field157 = var3;
       Client.isSpellSelected = true;
-      ServerBuild.__iy_lo = var0;
-      Client.__client_lc = var1;
+      ServerBuild.field788 = var0;
+      Client.field220 = var1;
       FloorDecoration.selectedSpellFlags = var2;
       class22.method295(var4);
    }
diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java
index 94185ddd44..90c200d0eb 100644
--- a/runescape-client/src/main/java/class258.java
+++ b/runescape-client/src/main/java/class258.java
@@ -20,7 +20,7 @@ public class class258 {
       byte[] var2 = class328.spritePixels[0];
       var0.pixels = new int[var1];
 
-      for(int var3 = 0; var3 < var1; ++var3) {
+      for (int var3 = 0; var3 < var1; ++var3) {
          var0.pixels[var3] = class328.indexedSpritePalette[var2[var3] & 255];
       }
 
@@ -29,7 +29,7 @@ public class class258 {
       VarbitDefinition.indexedSpriteWidths = null;
       SecureRandomCallable.indexedSpriteHeights = null;
       class328.indexedSpritePalette = null;
-      class328.spritePixels = null;
+      class328.spritePixels = (byte[][])null;
       return var0;
    }
 
@@ -41,21 +41,21 @@ public class class258 {
    static final void method4898(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
       class68 var9 = null;
 
-      for(class68 var10 = (class68)Client.__client_kh.last(); var10 != null; var10 = (class68)Client.__client_kh.previous()) {
-         if(var0 == var10.field911 && var10.field913 == var1 && var2 == var10.field901 && var3 == var10.field906) {
+      for (class68 var10 = (class68)Client.field214.last(); var10 != null; var10 = (class68)Client.field214.previous()) {
+         if (var0 == var10.field911 && var10.field913 == var1 && var2 == var10.field901 && var3 == var10.field906) {
             var9 = var10;
             break;
          }
       }
 
-      if(var9 == null) {
+      if (var9 == null) {
          var9 = new class68();
          var9.field911 = var0;
          var9.field906 = var3;
          var9.field913 = var1;
          var9.field901 = var2;
          class13.method165(var9);
-         Client.__client_kh.addFirst(var9);
+         Client.field214.addFirst(var9);
       }
 
       var9.field899 = var4;
diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java
index 72071e4fc6..530e82e647 100644
--- a/runescape-client/src/main/java/class266.java
+++ b/runescape-client/src/main/java/class266.java
@@ -35,7 +35,7 @@ public enum class266 implements Enumerated {
    )
    final int field3530;
 
-   class266(int var3, int var4) {
+   private class266(int var3, int var4) {
       this.field3528 = var3;
       this.field3530 = var4;
    }
@@ -56,13 +56,13 @@ public enum class266 implements Enumerated {
       garbageValue = "1908348747"
    )
    static final void method5120() {
-      if(VertexNormal.__dq_pe) {
-         if(PacketWriter.clanChat != null) {
+      if (VertexNormal.field945) {
+         if (PacketWriter.clanChat != null) {
             PacketWriter.clanChat.sort();
          }
 
          FontName.method5635();
-         VertexNormal.__dq_pe = false;
+         VertexNormal.field945 = false;
       }
 
    }
diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java
index 56f35f4e9d..1bc9f8323c 100644
--- a/runescape-client/src/main/java/class27.java
+++ b/runescape-client/src/main/java/class27.java
@@ -13,7 +13,7 @@ public final class class27 {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __aq_k;
+   public static AbstractIndexCache field1143;
    @ObfuscatedName("f")
    final int[] field225;
 
@@ -40,7 +40,7 @@ public final class class27 {
       garbageValue = "37"
    )
    public static ServerPacket[] method429() {
-      return new ServerPacket[]{ServerPacket.__ge_m, ServerPacket.__ge_f, ServerPacket.__ge_q, ServerPacket.__ge_w, ServerPacket.__ge_o, ServerPacket.__ge_u, ServerPacket.__ge_g, ServerPacket.__ge_l, ServerPacket.__ge_e, ServerPacket.__ge_x, ServerPacket.__ge_d, ServerPacket.__ge_k, ServerPacket.__ge_n, ServerPacket.__ge_i, ServerPacket.__ge_a, ServerPacket.__ge_z, ServerPacket.__ge_j, ServerPacket.__ge_s, ServerPacket.__ge_t, ServerPacket.__ge_y, ServerPacket.__ge_h, ServerPacket.__ge_b, ServerPacket.__ge_c, ServerPacket.__ge_r, ServerPacket.__ge_p, ServerPacket.__ge_v, ServerPacket.__ge_ag, ServerPacket.__ge_aq, ServerPacket.__ge_aj, ServerPacket.__ge_av, ServerPacket.__ge_ar, ServerPacket.__ge_ac, ServerPacket.__ge_ay, ServerPacket.__ge_ah, ServerPacket.__ge_ak, ServerPacket.__ge_aw, ServerPacket.__ge_al, ServerPacket.__ge_ab, ServerPacket.__ge_ae, ServerPacket.__ge_at, ServerPacket.__ge_ad, ServerPacket.__ge_ap, ServerPacket.__ge_as, ServerPacket.__ge_am, ServerPacket.__ge_an, ServerPacket.__ge_az, ServerPacket.__ge_au, ServerPacket.__ge_ao, ServerPacket.__ge_aa, ServerPacket.__ge_ax, ServerPacket.__ge_af, ServerPacket.__ge_ai, ServerPacket.__ge_ba, ServerPacket.__ge_bb, ServerPacket.__ge_bs, ServerPacket.__ge_bq, ServerPacket.__ge_bn, ServerPacket.__ge_bk, ServerPacket.__ge_bd, ServerPacket.__ge_bc, ServerPacket.__ge_bo, ServerPacket.__ge_bx, ServerPacket.__ge_by, ServerPacket.__ge_bu, ServerPacket.__ge_bm, ServerPacket.__ge_bl, ServerPacket.__ge_br, ServerPacket.__ge_bj, ServerPacket.__ge_bi, ServerPacket.__ge_bz, ServerPacket.__ge_bg, ServerPacket.__ge_bt, ServerPacket.__ge_bp, ServerPacket.__ge_bf, ServerPacket.__ge_bh, ServerPacket.__ge_be, ServerPacket.__ge_bv, ServerPacket.__ge_bw, ServerPacket.__ge_cr, ServerPacket.__ge_cv, ServerPacket.__ge_ce, ServerPacket.__ge_cy, ServerPacket.__ge_cs, ServerPacket.__ge_cm, ServerPacket.__ge_cj};
+      return new ServerPacket[]{ServerPacket.field789, ServerPacket.field790, ServerPacket.field791, ServerPacket.field792, ServerPacket.field793, ServerPacket.field794, ServerPacket.field795, ServerPacket.field796, ServerPacket.field797, ServerPacket.field798, ServerPacket.field799, ServerPacket.field800, ServerPacket.field801, ServerPacket.field802, ServerPacket.field803, ServerPacket.field804, ServerPacket.field805, ServerPacket.field806, ServerPacket.field807, ServerPacket.field808, ServerPacket.field809, ServerPacket.field810, ServerPacket.field811, ServerPacket.field812, ServerPacket.field813, ServerPacket.field814, ServerPacket.field815, ServerPacket.field816, ServerPacket.field817, ServerPacket.field818, ServerPacket.field819, ServerPacket.field820, ServerPacket.field821, ServerPacket.field822, ServerPacket.field823, ServerPacket.field824, ServerPacket.field825, ServerPacket.field826, ServerPacket.field827, ServerPacket.field828, ServerPacket.field829, ServerPacket.field830, ServerPacket.field831, ServerPacket.field832, ServerPacket.field833, ServerPacket.field834, ServerPacket.field835, ServerPacket.field836, ServerPacket.field837, ServerPacket.field838, ServerPacket.field839, ServerPacket.field840, ServerPacket.field841, ServerPacket.field842, ServerPacket.field843, ServerPacket.field844, ServerPacket.field845, ServerPacket.field846, ServerPacket.field847, ServerPacket.field848, ServerPacket.field849, ServerPacket.field850, ServerPacket.field851, ServerPacket.field852, ServerPacket.field853, ServerPacket.field854, ServerPacket.field855, ServerPacket.field856, ServerPacket.field857, ServerPacket.field858, ServerPacket.field859, ServerPacket.field860, ServerPacket.field861, ServerPacket.field862, ServerPacket.field863, ServerPacket.field864, ServerPacket.field865, ServerPacket.field866, ServerPacket.field867, ServerPacket.field868, ServerPacket.field869, ServerPacket.field870, ServerPacket.field871, ServerPacket.field872, ServerPacket.field873};
    }
 
    @ObfuscatedName("m")
@@ -60,10 +60,8 @@ public final class class27 {
          PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2);
          var5.grabPixels();
          return new Sprite(var4, var2, var3);
-      } catch (IOException var7) {
-         ;
-      } catch (InterruptedException var8) {
-         ;
+      } catch (IOException var6) {
+      } catch (InterruptedException var7) {
       }
 
       return new Sprite(0, 0);
diff --git a/runescape-client/src/main/java/class277.java b/runescape-client/src/main/java/class277.java
index 4842816eaa..561600be0e 100644
--- a/runescape-client/src/main/java/class277.java
+++ b/runescape-client/src/main/java/class277.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
@@ -8,16 +7,16 @@ public class class277 {
    @ObfuscatedSignature(
       signature = "Llq;"
    )
-   static IndexedSprite __jn_by;
+   static IndexedSprite field1144;
 
    @ObfuscatedName("m")
    public static final int method5355(double var0, double var2, double var4) {
       double var6 = var4;
       double var8 = var4;
       double var10 = var4;
-      if(0.0D != var2) {
+      if (0.0D != var2) {
          double var12;
-         if(var4 < 0.5D) {
+         if (var4 < 0.5D) {
             var12 = var4 * (var2 + 1.0D);
          } else {
             var12 = var4 + var2 - var2 * var4;
@@ -25,50 +24,50 @@ public class class277 {
 
          double var14 = var4 * 2.0D - var12;
          double var16 = var0 + 0.3333333333333333D;
-         if(var16 > 1.0D) {
+         if (var16 > 1.0D) {
             --var16;
          }
 
-         double var20 = var0 - 0.3333333333333333D;
-         if(var20 < 0.0D) {
-            ++var20;
+         double var18 = var0 - 0.3333333333333333D;
+         if (var18 < 0.0D) {
+            ++var18;
          }
 
-         if(6.0D * var16 < 1.0D) {
+         if (6.0D * var16 < 1.0D) {
             var6 = var16 * (var12 - var14) * 6.0D + var14;
-         } else if(var16 * 2.0D < 1.0D) {
+         } else if (var16 * 2.0D < 1.0D) {
             var6 = var12;
-         } else if(var16 * 3.0D < 2.0D) {
+         } else if (var16 * 3.0D < 2.0D) {
             var6 = var14 + (var12 - var14) * (0.6666666666666666D - var16) * 6.0D;
          } else {
             var6 = var14;
          }
 
-         if(var0 * 6.0D < 1.0D) {
+         if (var0 * 6.0D < 1.0D) {
             var8 = var14 + (var12 - var14) * 6.0D * var0;
-         } else if(var0 * 2.0D < 1.0D) {
+         } else if (var0 * 2.0D < 1.0D) {
             var8 = var12;
-         } else if(var0 * 3.0D < 2.0D) {
+         } else if (var0 * 3.0D < 2.0D) {
             var8 = 6.0D * (0.6666666666666666D - var0) * (var12 - var14) + var14;
          } else {
             var8 = var14;
          }
 
-         if(var20 * 6.0D < 1.0D) {
-            var10 = var20 * 6.0D * (var12 - var14) + var14;
-         } else if(2.0D * var20 < 1.0D) {
+         if (var18 * 6.0D < 1.0D) {
+            var10 = var18 * 6.0D * (var12 - var14) + var14;
+         } else if (2.0D * var18 < 1.0D) {
             var10 = var12;
-         } else if(var20 * 3.0D < 2.0D) {
-            var10 = var14 + 6.0D * (0.6666666666666666D - var20) * (var12 - var14);
+         } else if (var18 * 3.0D < 2.0D) {
+            var10 = var14 + 6.0D * (0.6666666666666666D - var18) * (var12 - var14);
          } else {
             var10 = var14;
          }
       }
 
-      int var22 = (int)(256.0D * var6);
+      int var20 = (int)(256.0D * var6);
       int var13 = (int)(var8 * 256.0D);
-      int var23 = (int)(var10 * 256.0D);
-      int var15 = var23 + (var13 << 8) + (var22 << 16);
+      int var21 = (int)(var10 * 256.0D);
+      int var15 = var21 + (var13 << 8) + (var20 << 16);
       return var15;
    }
 
@@ -78,18 +77,18 @@ public class class277 {
       garbageValue = "1648987580"
    )
    public static String method5356(CharSequence[] var0, int var1, int var2) {
-      if(var2 == 0) {
+      if (var2 == 0) {
          return "";
-      } else if(var2 == 1) {
-         CharSequence var3 = var0[var1];
-         return var3 == null?"null":var3.toString();
+      } else if (var2 == 1) {
+         CharSequence var8 = var0[var1];
+         return var8 == null ? "null" : var8.toString();
       } else {
-         int var8 = var2 + var1;
+         int var3 = var2 + var1;
          int var4 = 0;
 
-         for(int var5 = var1; var5 < var8; ++var5) {
+         for (int var5 = var1; var5 < var3; ++var5) {
             CharSequence var6 = var0[var5];
-            if(var6 == null) {
+            if (var6 == null) {
                var4 += 4;
             } else {
                var4 += var6.length();
@@ -98,9 +97,9 @@ public class class277 {
 
          StringBuilder var9 = new StringBuilder(var4);
 
-         for(int var10 = var1; var10 < var8; ++var10) {
+         for (int var10 = var1; var10 < var3; ++var10) {
             CharSequence var7 = var0[var10];
-            if(var7 == null) {
+            if (var7 == null) {
                var9.append("null");
             } else {
                var9.append(var7);
diff --git a/runescape-client/src/main/java/class279.java b/runescape-client/src/main/java/class279.java
index d04cc4cf14..f133883da7 100644
--- a/runescape-client/src/main/java/class279.java
+++ b/runescape-client/src/main/java/class279.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
@@ -8,7 +7,7 @@ public class class279 {
    @ObfuscatedSignature(
       signature = "[Lho;"
    )
-   static Widget[] __jx_ne;
+   static Widget[] field1145;
 
    @ObfuscatedName("e")
    @ObfuscatedSignature(
@@ -19,7 +18,7 @@ public class class279 {
       int var1 = var0.length();
       int var2 = 0;
 
-      for(int var3 = 0; var3 < var1; ++var3) {
+      for (int var3 = 0; var3 < var1; ++var3) {
          var2 = (var2 << 5) - var2 + var0.charAt(var3);
       }
 
diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java
index 897fa6c136..85d54a219a 100644
--- a/runescape-client/src/main/java/class3.java
+++ b/runescape-client/src/main/java/class3.java
@@ -9,7 +9,7 @@ public class class3 implements Enumerated {
    @ObfuscatedGetter(
       intValue = 1608439891
    )
-   static int __w_qs;
+   static int field1146;
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lw;"
@@ -34,7 +34,7 @@ public class class3 implements Enumerated {
    @ObfuscatedGetter(
       intValue = -393250053
    )
-   public final int id;
+   public final int field1147;
    @ObfuscatedName("u")
    public final Class field18;
    @ObfuscatedName("g")
@@ -43,18 +43,12 @@ public class class3 implements Enumerated {
    )
    public final class0 field19;
 
-   static {
-      field20 = new class3(2, 0, Integer.class, new class1());
-      field14 = new class3(0, 1, Long.class, new class2());
-      field15 = new class3(1, 2, String.class, new class4());
-   }
-
    @ObfuscatedSignature(
       signature = "(IILjava/lang/Class;Lm;)V"
    )
    class3(int var1, int var2, Class var3, class0 var4) {
       this.field13 = var1;
-      this.id = var2;
+      this.field1147 = var2;
       this.field18 = var3;
       this.field19 = var4;
    }
@@ -66,7 +60,7 @@ public class class3 implements Enumerated {
    )
    @Export("rsOrdinal")
    public int rsOrdinal() {
-      return this.id;
+      return this.field1147;
    }
 
    @ObfuscatedName("q")
@@ -102,18 +96,18 @@ public class class3 implements Enumerated {
       garbageValue = "729662922"
    )
    public static void method41() {
-      while(true) {
-         NodeDeque var1 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
-         IndexStoreAction var0;
+      while (true) {
+         NodeDeque var0 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
+         IndexStoreAction var1;
          synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) {
-            var0 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_responseQueue.removeLast();
+            var1 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_responseQueue.removeLast();
          }
 
-         if(var0 == null) {
+         if (var1 == null) {
             return;
          }
 
-         var0.indexCache.load(var0.indexStore, (int)var0.key, var0.data, false);
+         var1.indexCache.load(var1.indexStore, (int)var1.key, var1.data, false);
       }
    }
 
@@ -123,35 +117,35 @@ public class class3 implements Enumerated {
       garbageValue = "653716649"
    )
    static void method42(int var0, int var1, int var2, boolean var3, int var4, boolean var5) {
-      if(var0 < var1) {
+      if (var0 < var1) {
          int var6 = (var0 + var1) / 2;
          int var7 = var0;
          World var8 = ItemContainer.worlds[var6];
          ItemContainer.worlds[var6] = ItemContainer.worlds[var1];
          ItemContainer.worlds[var1] = var8;
 
-         for(int var9 = var0; var9 < var1; ++var9) {
-            World var11 = ItemContainer.worlds[var9];
-            int var12 = WorldMapLabel.compareWorlds(var11, var8, var2, var3);
-            int var10;
-            if(var12 != 0) {
-               if(var3) {
-                  var10 = -var12;
+         for (int var9 = var0; var9 < var1; ++var9) {
+            World var10 = ItemContainer.worlds[var9];
+            int var11 = WorldMapLabel.compareWorlds(var10, var8, var2, var3);
+            int var12;
+            if (var11 != 0) {
+               if (var3) {
+                  var12 = -var11;
                } else {
-                  var10 = var12;
+                  var12 = var11;
                }
-            } else if(var4 == -1) {
-               var10 = 0;
+            } else if (var4 == -1) {
+               var12 = 0;
             } else {
-               int var13 = WorldMapLabel.compareWorlds(var11, var8, var4, var5);
-               if(var5) {
-                  var10 = -var13;
+               int var13 = WorldMapLabel.compareWorlds(var10, var8, var4, var5);
+               if (var5) {
+                  var12 = -var13;
                } else {
-                  var10 = var13;
+                  var12 = var13;
                }
             }
 
-            if(var10 <= 0) {
+            if (var12 <= 0) {
                World var14 = ItemContainer.worlds[var9];
                ItemContainer.worlds[var9] = ItemContainer.worlds[var7];
                ItemContainer.worlds[var7++] = var14;
@@ -173,158 +167,164 @@ public class class3 implements Enumerated {
    )
    @Export("updateNpcs")
    static final void updateNpcs(boolean var0, PacketBuffer var1) {
-      Client.__client_ky = 0;
-      Client.__client_fw = 0;
+      Client.field211 = 0;
+      Client.field173 = 0;
       PacketBuffer var2 = Client.packetWriter.packetBuffer;
       var2.importIndex();
       int var3 = var2.readBits(8);
       int var4;
-      if(var3 < Client.npcCount) {
-         for(var4 = var3; var4 < Client.npcCount; ++var4) {
-            Client.__client_kd[++Client.__client_ky - 1] = Client.npcIndices[var4];
+      if (var3 < Client.npcCount) {
+         for (var4 = var3; var4 < Client.npcCount; ++var4) {
+            Client.field212[++Client.field211 - 1] = Client.npcIndices[var4];
          }
       }
 
-      if(var3 > Client.npcCount) {
+      if (var3 > Client.npcCount) {
          throw new RuntimeException("");
       } else {
          Client.npcCount = 0;
 
          int var5;
+         int var6;
          int var7;
          int var8;
-         int var9;
-         for(var4 = 0; var4 < var3; ++var4) {
+         for (var4 = 0; var4 < var3; ++var4) {
             var5 = Client.npcIndices[var4];
-            Npc var6 = Client.npcs[var5];
-            var7 = var2.readBits(1);
-            if(var7 == 0) {
+            NPC var9 = Client.npcs[var5];
+            var6 = var2.readBits(1);
+            if (var6 == 0) {
                Client.npcIndices[++Client.npcCount - 1] = var5;
-               var6.npcCycle = Client.cycle;
+               var9.npcCycle = Client.cycle;
             } else {
-               var8 = var2.readBits(2);
-               if(var8 == 0) {
+               var7 = var2.readBits(2);
+               if (var7 == 0) {
                   Client.npcIndices[++Client.npcCount - 1] = var5;
-                  var6.npcCycle = Client.cycle;
-                  Client.__client_fg[++Client.__client_fw - 1] = var5;
+                  var9.npcCycle = Client.cycle;
+                  Client.field174[++Client.field173 - 1] = var5;
                } else {
                   int var10;
-                  if(var8 == 1) {
+                  if (var7 == 1) {
                      Client.npcIndices[++Client.npcCount - 1] = var5;
-                     var6.npcCycle = Client.cycle;
-                     var9 = var2.readBits(3);
-                     var6.__m_162(var9, (byte)1);
+                     var9.npcCycle = Client.cycle;
+                     var8 = var2.readBits(3);
+                     var9.method227(var8, (byte)1);
                      var10 = var2.readBits(1);
-                     if(var10 == 1) {
-                        Client.__client_fg[++Client.__client_fw - 1] = var5;
+                     if (var10 == 1) {
+                        Client.field174[++Client.field173 - 1] = var5;
                      }
-                  } else if(var8 == 2) {
+                  } else if (var7 == 2) {
                      Client.npcIndices[++Client.npcCount - 1] = var5;
-                     var6.npcCycle = Client.cycle;
-                     var9 = var2.readBits(3);
-                     var6.__m_162(var9, (byte)2);
+                     var9.npcCycle = Client.cycle;
+                     var8 = var2.readBits(3);
+                     var9.method227(var8, (byte)2);
                      var10 = var2.readBits(3);
-                     var6.__m_162(var10, (byte)2);
+                     var9.method227(var10, (byte)2);
                      int var11 = var2.readBits(1);
-                     if(var11 == 1) {
-                        Client.__client_fg[++Client.__client_fw - 1] = var5;
+                     if (var11 == 1) {
+                        Client.field174[++Client.field173 - 1] = var5;
                      }
-                  } else if(var8 == 3) {
-                     Client.__client_kd[++Client.__client_ky - 1] = var5;
+                  } else if (var7 == 3) {
+                     Client.field212[++Client.field211 - 1] = var5;
                   }
                }
             }
          }
 
-         int var12;
-         while(var1.bitsRemaining(Client.packetWriter.serverPacket0Length) >= 27) {
-            var12 = var1.readBits(15);
-            if(var12 == 32767) {
+         int var13;
+         while (var1.bitsRemaining(Client.packetWriter.serverPacket0Length) >= 27) {
+            var13 = var1.readBits(15);
+            if (var13 == 32767) {
                break;
             }
 
-            boolean var15 = false;
-            if(Client.npcs[var12] == null) {
-               Client.npcs[var12] = new Npc();
-               var15 = true;
+            boolean var14 = false;
+            if (Client.npcs[var13] == null) {
+               Client.npcs[var13] = new NPC();
+               var14 = true;
             }
 
-            Npc var13 = Client.npcs[var12];
-            Client.npcIndices[++Client.npcCount - 1] = var12;
-            var13.npcCycle = Client.cycle;
-            if(var0) {
+            NPC var15 = Client.npcs[var13];
+            Client.npcIndices[++Client.npcCount - 1] = var13;
+            var15.npcCycle = Client.cycle;
+            if (var0) {
                var5 = var1.readBits(8);
-               if(var5 > 127) {
+               if (var5 > 127) {
                   var5 -= 256;
                }
             } else {
                var5 = var1.readBits(5);
-               if(var5 > 15) {
+               if (var5 > 15) {
                   var5 -= 32;
                }
             }
 
-            int var14 = var1.readBits(1);
-            var7 = Client.__client_kn[var1.readBits(3)];
-            if(var15) {
-               var13.orientation = var13.__ac = var7;
+            int var12 = var1.readBits(1);
+            var6 = Client.field213[var1.readBits(3)];
+            if (var14) {
+               var15.orientation = var15.field9 = var6;
             }
 
-            var8 = var1.readBits(1);
-            if(var8 == 1) {
-               Client.__client_fg[++Client.__client_fw - 1] = var12;
+            var7 = var1.readBits(1);
+            if (var7 == 1) {
+               Client.field174[++Client.field173 - 1] = var13;
             }
 
-            if(var0) {
-               var9 = var1.readBits(8);
-               if(var9 > 127) {
-                  var9 -= 256;
+            if (var0) {
+               var8 = var1.readBits(8);
+               if (var8 > 127) {
+                  var8 -= 256;
                }
             } else {
-               var9 = var1.readBits(5);
-               if(var9 > 15) {
-                  var9 -= 32;
+               var8 = var1.readBits(5);
+               if (var8 > 15) {
+                  var8 -= 32;
                }
             }
 
-            var13.definition = ObjectDefinition.getNpcDefinition(var1.readBits(14));
-            var13.size = var13.definition.size;
-            var13.__cj = var13.definition.__av;
-            if(var13.__cj == 0) {
-               var13.__ac = 0;
+            var15.definition = ObjectDefinition.getNpcDefinition(var1.readBits(14));
+            var15.size = var15.definition.size;
+            var15.field23 = var15.definition.field639;
+            if (var15.field23 == 0) {
+               var15.field9 = 0;
             }
 
-            var13.walkSequence = var13.definition.walkSequence;
-            var13.walkTurnSequence = var13.definition.walkTurnSequence;
-            var13.walkTurnLeftSequence = var13.definition.walkTurnLeftSequence;
-            var13.walkTurnRightSequence = var13.definition.walkTurnRightSequence;
-            var13.idleSequence = var13.definition.idleSequence;
-            var13.turnLeftSequence = var13.definition.turnLeftSequence;
-            var13.turnRightSequence = var13.definition.turnRightSequence;
-            var13.__f_163(Canvas.localPlayer.pathX[0] + var5, Canvas.localPlayer.pathY[0] + var9, var14 == 1);
+            var15.walkSequence = var15.definition.walkSequence;
+            var15.walkTurnSequence = var15.definition.walkTurnSequence;
+            var15.walkTurnLeftSequence = var15.definition.walkTurnLeftSequence;
+            var15.walkTurnRightSequence = var15.definition.walkTurnRightSequence;
+            var15.idleSequence = var15.definition.idleSequence;
+            var15.turnLeftSequence = var15.definition.turnLeftSequence;
+            var15.turnRightSequence = var15.definition.turnRightSequence;
+            var15.method228(Canvas.localPlayer.pathX[0] + var5, Canvas.localPlayer.pathY[0] + var8, var12 == 1);
          }
 
          var1.exportIndex();
          WorldComparator.method67(var1);
 
-         for(var12 = 0; var12 < Client.__client_ky; ++var12) {
-            var3 = Client.__client_kd[var12];
-            if(Client.npcs[var3].npcCycle != Client.cycle) {
+         for (var13 = 0; var13 < Client.field211; ++var13) {
+            var3 = Client.field212[var13];
+            if (Client.npcs[var3].npcCycle != Client.cycle) {
                Client.npcs[var3].definition = null;
                Client.npcs[var3] = null;
             }
          }
 
-         if(var1.index != Client.packetWriter.serverPacket0Length) {
+         if (var1.index != Client.packetWriter.serverPacket0Length) {
             throw new RuntimeException(var1.index + "," + Client.packetWriter.serverPacket0Length);
          } else {
-            for(var12 = 0; var12 < Client.npcCount; ++var12) {
-               if(Client.npcs[Client.npcIndices[var12]] == null) {
-                  throw new RuntimeException(var12 + "," + Client.npcCount);
+            for (var13 = 0; var13 < Client.npcCount; ++var13) {
+               if (Client.npcs[Client.npcIndices[var13]] == null) {
+                  throw new RuntimeException(var13 + "," + Client.npcCount);
                }
             }
 
          }
       }
    }
+
+   static {
+      field20 = new class3(2, 0, Integer.class, new class1());
+      field14 = new class3(0, 1, Long.class, new class2());
+      field15 = new class3(1, 2, String.class, new class4());
+   }
 }
diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java
index 77772fbde5..0fe6164fd8 100644
--- a/runescape-client/src/main/java/class30.java
+++ b/runescape-client/src/main/java/class30.java
@@ -9,7 +9,7 @@ public class class30 {
    @ObfuscatedGetter(
       intValue = -1555836449
    )
-   static int __ar_qw;
+   static int field1148;
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lar;"
@@ -41,11 +41,6 @@ public class class30 {
    )
    final int field248;
 
-   static {
-      field246 = new class30(0);
-      field247 = new class30(1);
-   }
-
    class30(int var1) {
       this.field248 = var1;
    }
@@ -56,7 +51,7 @@ public class class30 {
       garbageValue = "2127022463"
    )
    static int method571(int var0) {
-      return (int)((Math.log((double)var0) / Interpreter.__bv_r - 7.0D) * 256.0D);
+      return (int)((Math.log((double)var0) / Interpreter.field426 - 7.0D) * 256.0D);
    }
 
    @ObfuscatedName("hp")
@@ -81,43 +76,48 @@ public class class30 {
       garbageValue = "-1070833742"
    )
    static final void method570(Widget[] var0, int var1) {
-      for(int var2 = 0; var2 < var0.length; ++var2) {
+      for (int var2 = 0; var2 < var0.length; ++var2) {
          Widget var3 = var0[var2];
-         if(var3 != null) {
-            if(var3.type == 0) {
-               if(var3.children != null) {
+         if (var3 != null) {
+            if (var3.type == 0) {
+               if (var3.children != null) {
                   method570(var3.children, var1);
                }
 
                WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id);
-               if(var4 != null) {
+               if (var4 != null) {
                   GrandExchangeEvents.method74(var4.group, var1);
                }
             }
 
-            ScriptEvent var5;
-            if(var1 == 0 && var3.onDialogAbortListener != null) {
-               var5 = new ScriptEvent();
-               var5.widget = var3;
-               var5.args0 = var3.onDialogAbortListener;
-               AbstractIndexCache.runScript(var5);
+            ScriptEvent var6;
+            if (var1 == 0 && var3.onDialogAbortListener != null) {
+               var6 = new ScriptEvent();
+               var6.widget = var3;
+               var6.args0 = var3.onDialogAbortListener;
+               AbstractIndexCache.runScript(var6);
             }
 
-            if(var1 == 1 && var3.__ei != null) {
-               if(var3.childIndex >= 0) {
-                  Widget var6 = Huffman.getWidget(var3.id);
-                  if(var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) {
+            if (var1 == 1 && var3.field974 != null) {
+               if (var3.childIndex >= 0) {
+                  Widget var5 = Huffman.getWidget(var3.id);
+                  if (var5 == null || var5.children == null || var3.childIndex >= var5.children.length || var3 != var5.children[var3.childIndex]) {
                      continue;
                   }
                }
 
-               var5 = new ScriptEvent();
-               var5.widget = var3;
-               var5.args0 = var3.__ei;
-               AbstractIndexCache.runScript(var5);
+               var6 = new ScriptEvent();
+               var6.widget = var3;
+               var6.args0 = var3.field974;
+               AbstractIndexCache.runScript(var6);
             }
          }
       }
 
    }
+
+   static {
+      field246 = new class30(0);
+      field247 = new class30(1);
+   }
 }
diff --git a/runescape-client/src/main/java/class305.java b/runescape-client/src/main/java/class305.java
index c3c1e965b5..063e617d05 100644
--- a/runescape-client/src/main/java/class305.java
+++ b/runescape-client/src/main/java/class305.java
@@ -1,15 +1,14 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("kb")
 public class class305 {
    @ObfuscatedName("q")
-   static final char[] __kb_q;
+   static final char[] field1149;
    @ObfuscatedName("w")
-   static final char[] __kb_w;
+   static final char[] field1150;
 
    static {
-      __kb_q = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'};
-      __kb_w = new char[]{'[', ']', '#'};
+      field1149 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'};
+      field1150 = new char[]{'[', ']', '#'};
    }
 }
diff --git a/runescape-client/src/main/java/class306.java b/runescape-client/src/main/java/class306.java
index 86c014ae84..8d43fd8015 100644
--- a/runescape-client/src/main/java/class306.java
+++ b/runescape-client/src/main/java/class306.java
@@ -9,10 +9,6 @@ public final class class306 {
    @Export("base37Table")
    public static final char[] base37Table;
 
-   static {
-      base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
-   }
-
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;",
@@ -22,23 +18,23 @@ public final class class306 {
       int var1 = var0.length();
       StringBuilder var2 = new StringBuilder(var1);
 
-      for(int var3 = 0; var3 < var1; ++var3) {
+      for (int var3 = 0; var3 < var1; ++var3) {
          char var4 = var0.charAt(var3);
-         if((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') {
-            if(var4 == ' ') {
+         if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') {
+            if (var4 == ' ') {
                var2.append('+');
             } else {
                byte var5 = HealthBar.charToByteCp1252(var4);
                var2.append('%');
                int var6 = var5 >> 4 & 15;
-               if(var6 >= 10) {
+               if (var6 >= 10) {
                   var2.append((char)(var6 + 55));
                } else {
                   var2.append((char)(var6 + 48));
                }
 
                var6 = var5 & 15;
-               if(var6 >= 10) {
+               if (var6 >= 10) {
                   var2.append((char)(var6 + 55));
                } else {
                   var2.append((char)(var6 + 48));
@@ -65,27 +61,29 @@ public final class class306 {
          var0 = LoginPacket.getPreferencesFile("", class22.studioGame.name, false);
          byte[] var2 = new byte[(int)var0.length()];
 
-         int var4;
-         for(int var3 = 0; var3 < var2.length; var3 += var4) {
-            var4 = var0.read(var2, var3, var2.length - var3);
-            if(var4 == -1) {
+         int var3;
+         for (int var4 = 0; var4 < var2.length; var4 += var3) {
+            var3 = var0.read(var2, var4, var2.length - var4);
+            if (var3 == -1) {
                throw new IOException();
             }
          }
 
          var1 = new ClientPreferences(new Buffer(var2));
       } catch (Exception var6) {
-         ;
       }
 
       try {
-         if(var0 != null) {
+         if (var0 != null) {
             var0.close();
          }
       } catch (Exception var5) {
-         ;
       }
 
       return var1;
    }
+
+   static {
+      base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
+   }
 }
diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java
index dd819cd054..a7d579e6b4 100644
--- a/runescape-client/src/main/java/class307.java
+++ b/runescape-client/src/main/java/class307.java
@@ -5,15 +5,15 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("kc")
 public class class307 {
    @ObfuscatedName("m")
-   public static char[] __kc_m;
+   public static char[] field1151;
    @ObfuscatedName("f")
-   static char[] __kc_f;
+   static char[] field1152;
    @ObfuscatedName("q")
-   static char[] __kc_q;
+   static char[] field1153;
    @ObfuscatedName("w")
-   static int[] __kc_w;
+   static int[] field1154;
    @ObfuscatedName("g")
-   static byte[][][] __kc_g;
+   static byte[][][] field1155;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Ldt;"
@@ -22,78 +22,78 @@ public class class307 {
    public static SoundCache soundCache;
 
    static {
-      __kc_m = new char[64];
+      field1151 = new char[64];
 
       int var0;
-      for(var0 = 0; var0 < 26; ++var0) {
-         __kc_m[var0] = (char)(var0 + 65);
+      for (var0 = 0; var0 < 26; ++var0) {
+         field1151[var0] = (char)(var0 + 65);
       }
 
-      for(var0 = 26; var0 < 52; ++var0) {
-         __kc_m[var0] = (char)(var0 + 97 - 26);
+      for (var0 = 26; var0 < 52; ++var0) {
+         field1151[var0] = (char)(var0 + 97 - 26);
       }
 
-      for(var0 = 52; var0 < 62; ++var0) {
-         __kc_m[var0] = (char)(var0 + 48 - 52);
+      for (var0 = 52; var0 < 62; ++var0) {
+         field1151[var0] = (char)(var0 + 48 - 52);
       }
 
-      __kc_m[62] = '+';
-      __kc_m[63] = '/';
-      __kc_f = new char[64];
+      field1151[62] = '+';
+      field1151[63] = '/';
+      field1152 = new char[64];
 
-      for(var0 = 0; var0 < 26; ++var0) {
-         __kc_f[var0] = (char)(var0 + 65);
+      for (var0 = 0; var0 < 26; ++var0) {
+         field1152[var0] = (char)(var0 + 65);
       }
 
-      for(var0 = 26; var0 < 52; ++var0) {
-         __kc_f[var0] = (char)(var0 + 97 - 26);
+      for (var0 = 26; var0 < 52; ++var0) {
+         field1152[var0] = (char)(var0 + 97 - 26);
       }
 
-      for(var0 = 52; var0 < 62; ++var0) {
-         __kc_f[var0] = (char)(var0 + 48 - 52);
+      for (var0 = 52; var0 < 62; ++var0) {
+         field1152[var0] = (char)(var0 + 48 - 52);
       }
 
-      __kc_f[62] = '*';
-      __kc_f[63] = '-';
-      __kc_q = new char[64];
+      field1152[62] = '*';
+      field1152[63] = '-';
+      field1153 = new char[64];
 
-      for(var0 = 0; var0 < 26; ++var0) {
-         __kc_q[var0] = (char)(var0 + 65);
+      for (var0 = 0; var0 < 26; ++var0) {
+         field1153[var0] = (char)(var0 + 65);
       }
 
-      for(var0 = 26; var0 < 52; ++var0) {
-         __kc_q[var0] = (char)(var0 + 97 - 26);
+      for (var0 = 26; var0 < 52; ++var0) {
+         field1153[var0] = (char)(var0 + 97 - 26);
       }
 
-      for(var0 = 52; var0 < 62; ++var0) {
-         __kc_q[var0] = (char)(var0 + 48 - 52);
+      for (var0 = 52; var0 < 62; ++var0) {
+         field1153[var0] = (char)(var0 + 48 - 52);
       }
 
-      __kc_q[62] = '-';
-      __kc_q[63] = '_';
-      __kc_w = new int[128];
+      field1153[62] = '-';
+      field1153[63] = '_';
+      field1154 = new int[128];
 
-      for(var0 = 0; var0 < __kc_w.length; ++var0) {
-         __kc_w[var0] = -1;
+      for (var0 = 0; var0 < field1154.length; ++var0) {
+         field1154[var0] = -1;
       }
 
-      for(var0 = 65; var0 <= 90; ++var0) {
-         __kc_w[var0] = var0 - 65;
+      for (var0 = 65; var0 <= 90; ++var0) {
+         field1154[var0] = var0 - 65;
       }
 
-      for(var0 = 97; var0 <= 122; ++var0) {
-         __kc_w[var0] = var0 - 97 + 26;
+      for (var0 = 97; var0 <= 122; ++var0) {
+         field1154[var0] = var0 - 97 + 26;
       }
 
-      for(var0 = 48; var0 <= 57; ++var0) {
-         __kc_w[var0] = var0 - 48 + 52;
+      for (var0 = 48; var0 <= 57; ++var0) {
+         field1154[var0] = var0 - 48 + 52;
       }
 
-      int[] var2 = __kc_w;
-      __kc_w[43] = 62;
-      var2[42] = 62;
-      int[] var1 = __kc_w;
-      __kc_w[47] = 63;
-      var1[45] = 63;
+      int[] var1 = field1154;
+      field1154[43] = 62;
+      var1[42] = 62;
+      int[] var2 = field1154;
+      field1154[47] = 63;
+      var2[45] = 63;
    }
 }
diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java
index ac2e2a8f2f..e985580e29 100644
--- a/runescape-client/src/main/java/class31.java
+++ b/runescape-client/src/main/java/class31.java
@@ -21,11 +21,6 @@ public class class31 {
    )
    final int field255;
 
-   static {
-      field259 = new class31(0);
-      field254 = new class31(1);
-   }
-
    class31(int var1) {
       this.field255 = var1;
    }
@@ -37,10 +32,10 @@ public class class31 {
    )
    @Export("changeWorld")
    static void changeWorld(World var0) {
-      if(var0.isMembersOnly() != Client.isMembersWorld) {
+      if (var0.isMembersOnly() != Client.isMembersWorld) {
          Client.isMembersWorld = var0.isMembersOnly();
          boolean var1 = var0.isMembersOnly();
-         if(var1 != class30.inMembersWorld) {
+         if (var1 != class30.inMembersWorld) {
             LoginScreenAnimation.method1780();
             class30.inMembersWorld = var1;
          }
@@ -49,8 +44,8 @@ public class class31 {
       class50.worldHost = var0.host;
       Client.worldId = var0.id;
       Client.worldProperties = var0.properties;
-      class2.port1 = Client.gameBuild == 0?43594:var0.id + 40000;
-      WorldMapArea.port2 = Client.gameBuild == 0?443:var0.id + 50000;
+      class2.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000;
+      WorldMapArea.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000;
       class203.port3 = class2.port1;
    }
 
@@ -60,14 +55,14 @@ public class class31 {
       garbageValue = "130306081"
    )
    static int method573(int var0, Script var1, boolean var2) {
-      if(var0 == 6500) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ClientParameter.loadWorlds()?1:0;
+      if (var0 == 6500) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ClientParameter.loadWorlds() ? 1 : 0;
          return 1;
       } else {
          World var3;
-         if(var0 == 6501) {
+         if (var0 == 6501) {
             var3 = class190.method3672();
-            if(var3 != null) {
+            if (var3 != null) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id;
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.properties;
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity;
@@ -84,9 +79,9 @@ public class class31 {
             }
 
             return 1;
-         } else if(var0 == 6502) {
+         } else if (var0 == 6502) {
             var3 = Fonts.method5647();
-            if(var3 != null) {
+            if (var3 != null) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id;
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.properties;
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity;
@@ -106,19 +101,19 @@ public class class31 {
          } else {
             World var4;
             int var5;
-            int var7;
-            if(var0 == 6506) {
-               var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            int var6;
+            if (var0 == 6506) {
+               var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                var4 = null;
 
-               for(var5 = 0; var5 < World.worldsCount; ++var5) {
-                  if(var7 == ItemContainer.worlds[var5].id) {
+               for (var5 = 0; var5 < World.worldsCount; ++var5) {
+                  if (var6 == ItemContainer.worlds[var5].id) {
                      var4 = ItemContainer.worlds[var5];
                      break;
                   }
                }
 
-               if(var4 != null) {
+               if (var4 != null) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.id;
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.properties;
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity;
@@ -135,94 +130,94 @@ public class class31 {
                }
 
                return 1;
-            } else if(var0 == 6507) {
+            } else if (var0 == 6507) {
                RouteStrategy.Interpreter_intStackSize -= 4;
-               var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-               boolean var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
+               var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+               boolean var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
                var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-               boolean var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3] == 1;
-               WorldMapSectionType.method248(var7, var10, var5, var6);
+               boolean var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3] == 1;
+               WorldMapSectionType.method248(var6, var9, var5, var10);
                return 1;
-            } else if(var0 != 6511) {
-               if(var0 == 6512) {
+            } else if (var0 != 6511) {
+               if (var0 == 6512) {
                   Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                   return 1;
                } else {
-                  int var8;
-                  ParamKeyDefinition var9;
-                  if(var0 == 6513) {
+                  int var7;
+                  ParamKeyDefinition var8;
+                  if (var0 == 6513) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                     var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                     var9 = class229.getParamKeyDefinition(var8);
-                     if(var9.isString()) {
-                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var7).getStringParam(var8, var9.keyString);
+                     var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                     var8 = class229.getParamKeyDefinition(var7);
+                     if (var8.isString()) {
+                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getStringParam(var7, var8.keyString);
                      } else {
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var7).getIntParam(var8, var9.keyInt);
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getIntParam(var7, var8.keyInt);
                      }
 
                      return 1;
-                  } else if(var0 == 6514) {
+                  } else if (var0 == 6514) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                     var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                     var9 = class229.getParamKeyDefinition(var8);
-                     if(var9.isString()) {
-                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var7).getStringParam(var8, var9.keyString);
+                     var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                     var8 = class229.getParamKeyDefinition(var7);
+                     if (var8.isString()) {
+                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var6).getStringParam(var7, var8.keyString);
                      } else {
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var7).getIntParam(var8, var9.keyInt);
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var6).getIntParam(var7, var8.keyInt);
                      }
 
                      return 1;
-                  } else if(var0 == 6515) {
+                  } else if (var0 == 6515) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                     var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                     var9 = class229.getParamKeyDefinition(var8);
-                     if(var9.isString()) {
-                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var7).getStringParam(var8, var9.keyString);
+                     var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                     var8 = class229.getParamKeyDefinition(var7);
+                     if (var8.isString()) {
+                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var6).getStringParam(var7, var8.keyString);
                      } else {
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var7).getIntParam(var8, var9.keyInt);
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var6).getIntParam(var7, var8.keyInt);
                      }
 
                      return 1;
-                  } else if(var0 == 6516) {
+                  } else if (var0 == 6516) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                     var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                     var9 = class229.getParamKeyDefinition(var8);
-                     if(var9.isString()) {
-                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var7).getStringParam(var8, var9.keyString);
+                     var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                     var8 = class229.getParamKeyDefinition(var7);
+                     if (var8.isString()) {
+                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var6).getStringParam(var7, var8.keyString);
                      } else {
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var7).getIntParam(var8, var9.keyInt);
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var6).getIntParam(var7, var8.keyInt);
                      }
 
                      return 1;
-                  } else if(var0 == 6518) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_bl?1:0;
+                  } else if (var0 == 6518) {
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field162 ? 1 : 0;
                      return 1;
-                  } else if(var0 == 6519) {
+                  } else if (var0 == 6519) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.clientType & 3;
                      return 1;
-                  } else if(var0 == 6520) {
+                  } else if (var0 == 6520) {
                      return 1;
-                  } else if(var0 == 6521) {
+                  } else if (var0 == 6521) {
                      return 1;
-                  } else if(var0 == 6522) {
+                  } else if (var0 == 6522) {
                      --Interpreter.Interpreter_stringStackSize;
                      --RouteStrategy.Interpreter_intStackSize;
                      return 1;
-                  } else if(var0 == 6523) {
+                  } else if (var0 == 6523) {
                      --Interpreter.Interpreter_stringStackSize;
                      --RouteStrategy.Interpreter_intStackSize;
                      return 1;
-                  } else if(var0 == 6524) {
+                  } else if (var0 == 6524) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                      return 1;
-                  } else if(var0 == 6525) {
+                  } else if (var0 == 6525) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
                      return 1;
-                  } else if(var0 == 6526) {
+                  } else if (var0 == 6526) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
                      return 1;
                   } else {
@@ -230,9 +225,9 @@ public class class31 {
                   }
                }
             } else {
-               var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(var7 >= 0 && var7 < World.worldsCount) {
-                  var4 = ItemContainer.worlds[var7];
+               var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               if (var6 >= 0 && var6 < World.worldsCount) {
+                  var4 = ItemContainer.worlds[var6];
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.id;
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.properties;
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity;
@@ -260,11 +255,17 @@ public class class31 {
       garbageValue = "-110"
    )
    static final void method574(String var0) {
-      if(!var0.equals("")) {
-         PacketBufferNode var1 = Interpreter.method1915(ClientPacket.__gs_cr, Client.packetWriter.isaacCipher);
+      if (!var0.equals("")) {
+         PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field300, Client.packetWriter.isaacCipher);
          var1.packetBuffer.writeByte(WorldMapRegion.method550(var0));
          var1.packetBuffer.writeStringCp1252NullTerminated(var0);
-         Client.packetWriter.__q_167(var1);
+         Client.packetWriter.method241(var1);
       }
+
+   }
+
+   static {
+      field259 = new class31(0);
+      field254 = new class31(1);
    }
 }
diff --git a/runescape-client/src/main/java/class310.java b/runescape-client/src/main/java/class310.java
index 49b9df7811..d853fd44c9 100644
--- a/runescape-client/src/main/java/class310.java
+++ b/runescape-client/src/main/java/class310.java
@@ -25,13 +25,13 @@ public class class310 {
    )
    public final int field3804;
 
+   class310(int var1) {
+      this.field3804 = var1;
+   }
+
    static {
       field3806 = new class310(0);
       field3805 = new class310(1);
       field3807 = new class310(2);
    }
-
-   class310(int var1) {
-      this.field3804 = var1;
-   }
 }
diff --git a/runescape-client/src/main/java/class311.java b/runescape-client/src/main/java/class311.java
index e5f27d2836..df7d2a1fa4 100644
--- a/runescape-client/src/main/java/class311.java
+++ b/runescape-client/src/main/java/class311.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
@@ -14,17 +13,13 @@ public class class311 {
    @ObfuscatedGetter(
       intValue = -2077113503
    )
-   static int __ka_e;
+   static int field1156;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = -800980069
    )
    final int field3809;
 
-   static {
-      field3810 = new class311(3);
-   }
-
    class311(int var1) {
       this.field3809 = var1;
    }
@@ -35,6 +30,10 @@ public class class311 {
       garbageValue = "-2017595575"
    )
    public static RectangleMode[] method5822() {
-      return new RectangleMode[]{RectangleMode.__lj_f, RectangleMode.__lj_m, RectangleMode.__lj_q};
+      return new RectangleMode[]{RectangleMode.field758, RectangleMode.field757, RectangleMode.field759};
+   }
+
+   static {
+      field3810 = new class311(3);
    }
 }
diff --git a/runescape-client/src/main/java/class313.java b/runescape-client/src/main/java/class313.java
index 1b7fea7a37..9e6b6af821 100644
--- a/runescape-client/src/main/java/class313.java
+++ b/runescape-client/src/main/java/class313.java
@@ -62,7 +62,7 @@ public enum class313 implements Enumerated {
    )
    final int field3827;
 
-   class313(int var3, int var4) {
+   private class313(int var3, int var4) {
       this.field3833 = var3;
       this.field3827 = var4;
    }
diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java
index 95bd7cf314..d77052c7ea 100644
--- a/runescape-client/src/main/java/class32.java
+++ b/runescape-client/src/main/java/class32.java
@@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("ay")
 public class class32 {
    @ObfuscatedName("u")
-   static byte[][][] __ay_u;
+   static byte[][][] field1157;
    @ObfuscatedName("gj")
    @ObfuscatedSignature(
       signature = "[Llq;"
@@ -20,20 +20,20 @@ public class class32 {
    )
    static int method576(int var0, Script var1, boolean var2) {
       Widget var3;
-      if(var0 >= 2000) {
+      if (var0 >= 2000) {
          var0 -= 1000;
          var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
       } else {
-         var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
+         var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
       }
 
       class22.method295(var3);
-      if(var0 != 1200 && var0 != 1205 && var0 != 1212) {
-         if(var0 == 1201) {
+      if (var0 != 1200 && var0 != 1205 && var0 != 1212) {
+         if (var0 == 1201) {
             var3.modelType = 2;
             var3.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             return 1;
-         } else if(var0 == 1202) {
+         } else if (var0 == 1202) {
             var3.modelType = 3;
             var3.modelId = Canvas.localPlayer.appearance.getChatHeadId();
             return 1;
@@ -53,17 +53,17 @@ public class class32 {
          var3.modelOffsetX = var6.offsetX2d;
          var3.modelOffsetY = var6.offsetY2d;
          var3.modelZoom = var6.zoom2d;
-         if(var0 == 1205) {
+         if (var0 == 1205) {
             var3.itemQuantityMode = 0;
-         } else if(var0 == 1212 | 1 == var6.isStackable) {
+         } else if (var0 == 1212 | 1 == var6.isStackable) {
             var3.itemQuantityMode = 1;
          } else {
             var3.itemQuantityMode = 2;
          }
 
-         if(var3.__bf > 0) {
-            var3.modelZoom = var3.modelZoom * 32 / var3.__bf;
-         } else if(var3.rawWidth > 0) {
+         if (var3.field962 > 0) {
+            var3.modelZoom = var3.modelZoom * 32 / var3.field962;
+         } else if (var3.rawWidth > 0) {
             var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth;
          }
 
@@ -78,7 +78,7 @@ public class class32 {
    )
    static void method578(int var0) {
       Login.loginIndex = 12;
-      Login.__cu_aj = var0;
+      Login.field466 = var0;
    }
 
    @ObfuscatedName("gu")
@@ -90,9 +90,9 @@ public class class32 {
    static final int getTileHeight(int var0, int var1, int var2) {
       int var3 = var0 >> 7;
       int var4 = var1 >> 7;
-      if(var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) {
+      if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) {
          int var5 = var2;
-         if(var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) {
+         if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) {
             var5 = var2 + 1;
          }
 
diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java
index b73ed654bb..cd12bd2e00 100644
--- a/runescape-client/src/main/java/class322.java
+++ b/runescape-client/src/main/java/class322.java
@@ -11,10 +11,6 @@ public class class322 {
    @Export("reflectionChecks")
    public static IterableNodeDeque reflectionChecks;
 
-   static {
-      reflectionChecks = new IterableNodeDeque();
-   }
-
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Lir;III)Lln;",
@@ -22,6 +18,10 @@ public class class322 {
    )
    @Export("readSprite")
    public static Sprite readSprite(AbstractIndexCache var0, int var1, int var2) {
-      return !SpriteMask.loadSprite(var0, var1, var2)?null:class258.method4900();
+      return !SpriteMask.loadSprite(var0, var1, var2) ? null : class258.method4900();
+   }
+
+   static {
+      reflectionChecks = new IterableNodeDeque();
    }
 }
diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java
index 98926a8e6f..629a66f2d6 100644
--- a/runescape-client/src/main/java/class39.java
+++ b/runescape-client/src/main/java/class39.java
@@ -39,21 +39,21 @@ public class class39 extends class21 {
    )
    void method714(Buffer var1) {
       int var2 = var1.readUnsignedByte();
-      if(var2 != class31.field254.field255) {
+      if (var2 != class31.field254.field255) {
          throw new IllegalStateException("");
       } else {
          super.field148 = var1.readUnsignedByte();
          super.field156 = var1.readUnsignedByte();
-         super.field149 = var1.__ag_302();
-         super.field146 = var1.__ag_302();
+         super.field149 = var1.method43();
+         super.field146 = var1.method43();
          this.field318 = var1.readUnsignedByte();
          this.field319 = var1.readUnsignedByte();
-         super.field159 = var1.__ag_302();
-         super.field147 = var1.__ag_302();
+         super.field159 = var1.method43();
+         super.field147 = var1.method43();
          this.field321 = var1.readUnsignedByte();
          this.field323 = var1.readUnsignedByte();
-         super.field150 = var1.__ap_310();
-         super.field152 = var1.__ap_310();
+         super.field150 = var1.method51();
+         super.field152 = var1.method51();
       }
    }
 
@@ -70,16 +70,16 @@ public class class39 extends class21 {
       super.field155 = new byte[super.field156][64][64];
       super.field144 = new class25[super.field156][64][64][];
       int var2 = var1.readUnsignedByte();
-      if(var2 != class30.field247.field248) {
+      if (var2 != class30.field247.field248) {
          throw new IllegalStateException("");
       } else {
          int var3 = var1.readUnsignedByte();
          int var4 = var1.readUnsignedByte();
          int var5 = var1.readUnsignedByte();
          int var6 = var1.readUnsignedByte();
-         if(var3 == super.field159 && var4 == super.field147 && var5 == this.field321 && var6 == this.field323) {
-            for(int var7 = 0; var7 < 8; ++var7) {
-               for(int var8 = 0; var8 < 8; ++var8) {
+         if (var3 == super.field159 && var4 == super.field147 && var5 == this.field321 && var6 == this.field323) {
+            for (int var7 = 0; var7 < 8; ++var7) {
+               for (int var8 = 0; var8 < 8; ++var8) {
                   this.method259(var7 + this.field321 * 8, var8 + this.field323 * 8, var1);
                }
             }
@@ -131,11 +131,11 @@ public class class39 extends class21 {
    }
 
    public boolean equals(Object var1) {
-      if(!(var1 instanceof class39)) {
+      if (!(var1 instanceof class39)) {
          return false;
       } else {
          class39 var2 = (class39)var1;
-         return var2.field159 == super.field159 && var2.field147 == super.field147?this.field321 == var2.field321 && var2.field323 == this.field323:false;
+         return var2.field159 == super.field159 && var2.field147 == super.field147 ? this.field321 == var2.field321 && var2.field323 == this.field323 : false;
       }
    }
 
@@ -146,205 +146,205 @@ public class class39 extends class21 {
    )
    @Export("drawActor2d")
    static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) {
-      if(var0 != null && var0.isVisible()) {
-         if(var0 instanceof Npc) {
-            NpcDefinition var6 = ((Npc)var0).definition;
-            if(var6.transforms != null) {
+      if (var0 != null && var0.isVisible()) {
+         if (var0 instanceof NPC) {
+            NPCDefinition var6 = ((NPC)var0).definition;
+            if (var6.transforms != null) {
                var6 = var6.transform();
             }
 
-            if(var6 == null) {
+            if (var6 == null) {
                return;
             }
          }
 
-         int var75 = Players.Players_count;
+         int var77 = Players.Players_count;
          int[] var7 = Players.Players_indices;
          byte var8 = 0;
-         Player var10;
-         if(var1 < var75 && var0.playerCycle == Client.cycle) {
-            var10 = (Player)var0;
-            boolean var9;
-            if(Client.__client_ke == 0) {
-               var9 = false;
-            } else if(var10 != Canvas.localPlayer) {
-               boolean var77 = (Client.__client_ke & 4) != 0;
-               boolean var78 = var77;
+         Player var9;
+         if (var1 < var77 && var0.playerCycle == Client.cycle) {
+            var9 = (Player)var0;
+            boolean var10;
+            if (Client.field210 == 0) {
+               var10 = false;
+            } else if (var9 != Canvas.localPlayer) {
+               boolean var11 = (Client.field210 & 4) != 0;
+               boolean var12 = var11;
                boolean var13;
-               if(!var77) {
-                  var13 = (Client.__client_ke & 1) != 0;
-                  var78 = var13 && var10.isFriend();
+               if (!var11) {
+                  var13 = (Client.field210 & 1) != 0;
+                  var12 = var13 && var9.isFriend();
                }
 
-               var13 = var78;
-               if(!var78) {
-                  boolean var79 = (Client.__client_ke & 2) != 0;
-                  var13 = var79 && var10.isClanMember();
+               var13 = var12;
+               if (!var12) {
+                  boolean var14 = (Client.field210 & 2) != 0;
+                  var13 = var14 && var9.isClanMember();
                }
 
-               var9 = var13;
+               var10 = var13;
             } else {
-               var9 = class14.method169();
+               var10 = class14.method169();
             }
 
-            if(var9) {
-               Player var11 = (Player)var0;
-               if(var1 < var75) {
+            if (var10) {
+               Player var79 = (Player)var0;
+               if (var1 < var77) {
                   DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
-                  AbstractFont var12 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12);
-                  byte var92 = 9;
-                  var12.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var92, 16777215, 0);
+                  AbstractFont var81 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12);
+                  byte var84 = 9;
+                  var81.drawCentered(var79.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var84, 16777215, 0);
                   var8 = 18;
                }
             }
          }
 
-         int var87 = -2;
-         int var15;
-         int var22;
-         int var23;
-         if(!var0.healthBars.isEmpty()) {
+         int var78 = -2;
+         int var24;
+         int var25;
+         int var80;
+         int var82;
+         int var85;
+         if (!var0.healthBars.isEmpty()) {
             DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
 
-            for(HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) {
-               HealthBarUpdate var89 = var88.get(Client.cycle);
-               if(var89 == null) {
-                  if(var88.isEmpty()) {
-                     var88.remove();
+            for (HealthBar var83 = (HealthBar)var0.healthBars.last(); var83 != null; var83 = (HealthBar)var0.healthBars.previous()) {
+               HealthBarUpdate var15 = var83.get(Client.cycle);
+               if (var15 == null) {
+                  if (var83.isEmpty()) {
+                     var83.remove();
                   }
                } else {
-                  HealthBarDefinition var91 = var88.definition;
-                  Sprite var76 = var91.getSprite2();
-                  Sprite var14 = var91.getSprite1();
-                  int var16 = 0;
-                  if(var76 != null && var14 != null) {
-                     if(var91.widthPadding * 2 < var14.subWidth) {
-                        var16 = var91.widthPadding;
+                  HealthBarDefinition var16 = var83.definition;
+                  Sprite var17 = var16.getSprite2();
+                  Sprite var18 = var16.getSprite1();
+                  int var19 = 0;
+                  if (var17 != null && var18 != null) {
+                     if (var16.widthPadding * 2 < var18.subWidth) {
+                        var19 = var16.widthPadding;
                      }
 
-                     var15 = var14.subWidth - var16 * 2;
+                     var80 = var18.subWidth - var19 * 2;
                   } else {
-                     var15 = var91.width;
+                     var80 = var16.width;
                   }
 
-                  int var17 = 255;
-                  boolean var18 = true;
-                  int var19 = Client.cycle - var89.cycle;
-                  int var20 = var15 * var89.health2 / var91.width;
-                  int var21;
-                  int var93;
-                  if(var89.cycleOffset > var19) {
-                     var21 = var91.int4 == 0?0:var91.int4 * (var19 / var91.int4);
-                     var22 = var15 * var89.health / var91.width;
-                     var93 = var21 * (var20 - var22) / var89.cycleOffset + var22;
+                  int var20 = 255;
+                  boolean var21 = true;
+                  int var22 = Client.cycle - var15.cycle;
+                  int var23 = var80 * var15.health2 / var16.width;
+                  if (var15.cycleOffset > var22) {
+                     var24 = var16.int4 == 0 ? 0 : var16.int4 * (var22 / var16.int4);
+                     var82 = var80 * var15.health / var16.width;
+                     var25 = var24 * (var23 - var82) / var15.cycleOffset + var82;
                   } else {
-                     var93 = var20;
-                     var21 = var89.cycleOffset + var91.int5 - var19;
-                     if(var91.int3 >= 0) {
-                        var17 = (var21 << 8) / (var91.int5 - var91.int3);
+                     var25 = var23;
+                     var24 = var15.cycleOffset + var16.int5 - var22;
+                     if (var16.int3 >= 0) {
+                        var20 = (var24 << 8) / (var16.int5 - var16.int3);
                      }
                   }
 
-                  if(var89.health2 > 0 && var93 < 1) {
-                     var93 = 1;
+                  if (var15.health2 > 0 && var25 < 1) {
+                     var25 = 1;
                   }
 
-                  if(var76 != null && var14 != null) {
-                     if(var15 == var93) {
-                        var93 += var16 * 2;
+                  if (var17 != null && var18 != null) {
+                     if (var80 == var25) {
+                        var25 += var19 * 2;
                      } else {
-                        var93 += var16;
+                        var25 += var19;
                      }
 
-                     var21 = var76.subHeight;
-                     var87 += var21;
-                     var22 = var2 + Client.viewportTempX - (var15 >> 1);
-                     var23 = var3 + Client.viewportTempY - var87;
-                     var22 -= var16;
-                     if(var17 >= 0 && var17 < 255) {
-                        var76.__h_508(var22, var23, var17);
-                        Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var93, var23 + var21);
-                        var14.__h_508(var22, var23, var17);
+                     var24 = var17.subHeight;
+                     var78 += var24;
+                     var82 = var2 + Client.viewportTempX - (var80 >> 1);
+                     var85 = var3 + Client.viewportTempY - var78;
+                     var82 -= var19;
+                     if (var20 >= 0 && var20 < 255) {
+                        var17.method310(var82, var85, var20);
+                        Rasterizer2D.Rasterizer2D_expandClip(var82, var85, var82 + var25, var85 + var24);
+                        var18.method310(var82, var85, var20);
                      } else {
-                        var76.drawAt2(var22, var23);
-                        Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var93 + var22, var21 + var23);
-                        var14.drawAt2(var22, var23);
+                        var17.drawAt2(var82, var85);
+                        Rasterizer2D.Rasterizer2D_expandClip(var82, var85, var25 + var82, var24 + var85);
+                        var18.drawAt2(var82, var85);
                      }
 
                      Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5);
-                     var87 += 2;
+                     var78 += 2;
                   } else {
-                     var87 += 5;
-                     if(Client.viewportTempX > -1) {
-                        var21 = var2 + Client.viewportTempX - (var15 >> 1);
-                        var22 = var3 + Client.viewportTempY - var87;
-                        Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var93, 5, 0xff00);
-                        Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var93, var22, var15 - var93, 5, 0xff0000);
+                     var78 += 5;
+                     if (Client.viewportTempX > -1) {
+                        var24 = var2 + Client.viewportTempX - (var80 >> 1);
+                        var82 = var3 + Client.viewportTempY - var78;
+                        Rasterizer2D.Rasterizer2D_fillRectangle(var24, var82, var25, 5, 65280);
+                        Rasterizer2D.Rasterizer2D_fillRectangle(var24 + var25, var82, var80 - var25, 5, 16711680);
                      }
 
-                     var87 += 2;
+                     var78 += 2;
                   }
                }
             }
          }
 
-         if(var87 == -2) {
-            var87 += 7;
+         if (var78 == -2) {
+            var78 += 7;
          }
 
-         var87 += var8;
-         if(var1 < var75) {
-            var10 = (Player)var0;
-            if(var10.isHidden) {
+         var78 += var8;
+         if (var1 < var77) {
+            var9 = (Player)var0;
+            if (var9.isHidden) {
                return;
             }
 
-            if(var10.headIconPk != -1 || var10.headIconPrayer != -1) {
+            if (var9.headIconPk != -1 || var9.headIconPrayer != -1) {
                DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
-               if(Client.viewportTempX > -1) {
-                  if(var10.headIconPk != -1) {
-                     var87 += 25;
-                     class15.headIconPkSprites[var10.headIconPk].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
+               if (Client.viewportTempX > -1) {
+                  if (var9.headIconPk != -1) {
+                     var78 += 25;
+                     class15.headIconPkSprites[var9.headIconPk].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var78);
                   }
 
-                  if(var10.headIconPrayer != -1) {
-                     var87 += 25;
-                     ClientPreferences.headIconPrayerSprites[var10.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
+                  if (var9.headIconPrayer != -1) {
+                     var78 += 25;
+                     ClientPreferences.headIconPrayerSprites[var9.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var78);
                   }
                }
             }
 
-            if(var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) {
+            if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) {
                DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
-               if(Client.viewportTempX > -1) {
-                  var87 += Player.headIconHintSprites[1].subHeight;
-                  Player.headIconHintSprites[1].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
+               if (Client.viewportTempX > -1) {
+                  var78 += Player.headIconHintSprites[1].subHeight;
+                  Player.headIconHintSprites[1].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var78);
                }
             }
          } else {
-            NpcDefinition var90 = ((Npc)var0).definition;
-            if(var90.transforms != null) {
-               var90 = var90.transform();
+            NPCDefinition var86 = ((NPC)var0).definition;
+            if (var86.transforms != null) {
+               var86 = var86.transform();
             }
 
-            if(var90.headIconPrayer >= 0 && var90.headIconPrayer < ClientPreferences.headIconPrayerSprites.length) {
+            if (var86.headIconPrayer >= 0 && var86.headIconPrayer < ClientPreferences.headIconPrayerSprites.length) {
                DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
-               if(Client.viewportTempX > -1) {
-                  ClientPreferences.headIconPrayerSprites[var90.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30);
+               if (Client.viewportTempX > -1) {
+                  ClientPreferences.headIconPrayerSprites[var86.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30);
                }
             }
 
-            if(Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) {
+            if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var77] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) {
                DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
-               if(Client.viewportTempX > -1) {
+               if (Client.viewportTempX > -1) {
                   Player.headIconHintSprites[0].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28);
                }
             }
          }
 
-         if(var0.overheadText != null && (var1 >= var75 || !var0.__az && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) {
+         if (var0.overheadText != null && (var1 >= var77 || !var0.field11 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) {
             DevicePcmPlayerProvider.method840(var0, var0.defaultHeight);
-            if(Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) {
+            if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) {
                Client.overheadTextXOffsets[Client.overheadTextCount] = class2.fontBold12.stringWidth(var0.overheadText) / 2;
                Client.overheadTextAscents[Client.overheadTextCount] = class2.fontBold12.ascent;
                Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX;
@@ -357,66 +357,66 @@ public class class39 extends class21 {
             }
          }
 
-         for(int var80 = 0; var80 < 4; ++var80) {
-            int var96 = var0.hitSplatCycles[var80];
-            int var97 = var0.hitSplatTypes[var80];
-            HitSplatDefinition var95 = null;
-            int var98 = 0;
-            if(var97 >= 0) {
-               if(var96 <= Client.cycle) {
+         for (int var88 = 0; var88 < 4; ++var88) {
+            int var87 = var0.hitSplatCycles[var88];
+            int var89 = var0.hitSplatTypes[var88];
+            HitSplatDefinition var90 = null;
+            int var91 = 0;
+            if (var89 >= 0) {
+               if (var87 <= Client.cycle) {
                   continue;
                }
 
-               var95 = LoginScreenAnimation.getHitSplatDefinition(var0.hitSplatTypes[var80]);
-               var98 = var95.__i;
-               if(var95 != null && var95.transforms != null) {
-                  var95 = var95.transform();
-                  if(var95 == null) {
-                     var0.hitSplatCycles[var80] = -1;
+               var90 = LoginScreenAnimation.getHitSplatDefinition(var0.hitSplatTypes[var88]);
+               var91 = var90.field387;
+               if (var90 != null && var90.transforms != null) {
+                  var90 = var90.transform();
+                  if (var90 == null) {
+                     var0.hitSplatCycles[var88] = -1;
                      continue;
                   }
                }
-            } else if(var96 < 0) {
+            } else if (var87 < 0) {
                continue;
             }
 
-            var15 = var0.hitSplatTypes2[var80];
-            HitSplatDefinition var81 = null;
-            if(var15 >= 0) {
-               var81 = LoginScreenAnimation.getHitSplatDefinition(var15);
-               if(var81 != null && var81.transforms != null) {
-                  var81 = var81.transform();
+            var80 = var0.hitSplatTypes2[var88];
+            HitSplatDefinition var92 = null;
+            if (var80 >= 0) {
+               var92 = LoginScreenAnimation.getHitSplatDefinition(var80);
+               if (var92 != null && var92.transforms != null) {
+                  var92 = var92.transform();
                }
             }
 
-            if(var96 - var98 <= Client.cycle) {
-               if(var95 == null) {
-                  var0.hitSplatCycles[var80] = -1;
+            if (var87 - var91 <= Client.cycle) {
+               if (var90 == null) {
+                  var0.hitSplatCycles[var88] = -1;
                } else {
                   DevicePcmPlayerProvider.method840(var0, var0.defaultHeight / 2);
-                  if(Client.viewportTempX > -1) {
-                     if(var80 == 1) {
+                  if (Client.viewportTempX > -1) {
+                     if (var88 == 1) {
                         Client.viewportTempY -= 20;
                      }
 
-                     if(var80 == 2) {
+                     if (var88 == 2) {
                         Client.viewportTempX -= 15;
                         Client.viewportTempY -= 10;
                      }
 
-                     if(var80 == 3) {
+                     if (var88 == 3) {
                         Client.viewportTempX += 15;
                         Client.viewportTempY -= 10;
                      }
 
-                     Sprite var82 = null;
-                     Sprite var83 = null;
-                     Sprite var84 = null;
-                     Sprite var85 = null;
-                     var22 = 0;
-                     var23 = 0;
-                     int var24 = 0;
-                     int var25 = 0;
+                     Sprite var93 = null;
+                     Sprite var94 = null;
+                     Sprite var95 = null;
+                     Sprite var96 = null;
+                     var82 = 0;
+                     var85 = 0;
+                     var24 = 0;
+                     var25 = 0;
                      int var26 = 0;
                      int var27 = 0;
                      int var28 = 0;
@@ -434,90 +434,90 @@ public class class39 extends class21 {
                      int var40 = 0;
                      int var41 = 0;
                      int var42 = 0;
-                     var82 = var95.__g_417();
+                     var93 = var90.method123();
                      int var43;
-                     if(var82 != null) {
-                        var22 = var82.subWidth;
-                        var43 = var82.subHeight;
-                        if(var43 > var42) {
+                     if (var93 != null) {
+                        var82 = var93.subWidth;
+                        var43 = var93.subHeight;
+                        if (var43 > var42) {
                            var42 = var43;
                         }
 
-                        var26 = var82.yOffset;
+                        var26 = var93.yOffset;
                      }
 
-                     var83 = var95.__l_418();
-                     if(var83 != null) {
-                        var23 = var83.subWidth;
-                        var43 = var83.subHeight;
-                        if(var43 > var42) {
+                     var94 = var90.method124();
+                     if (var94 != null) {
+                        var85 = var94.subWidth;
+                        var43 = var94.subHeight;
+                        if (var43 > var42) {
                            var42 = var43;
                         }
 
-                        var27 = var83.yOffset;
+                        var27 = var94.yOffset;
                      }
 
-                     var84 = var95.__e_419();
-                     if(var84 != null) {
-                        var24 = var84.subWidth;
-                        var43 = var84.subHeight;
-                        if(var43 > var42) {
+                     var95 = var90.method125();
+                     if (var95 != null) {
+                        var24 = var95.subWidth;
+                        var43 = var95.subHeight;
+                        if (var43 > var42) {
                            var42 = var43;
                         }
 
-                        var28 = var84.yOffset;
+                        var28 = var95.yOffset;
                      }
 
-                     var85 = var95.__x_420();
-                     if(var85 != null) {
-                        var25 = var85.subWidth;
-                        var43 = var85.subHeight;
-                        if(var43 > var42) {
+                     var96 = var90.method126();
+                     if (var96 != null) {
+                        var25 = var96.subWidth;
+                        var43 = var96.subHeight;
+                        if (var43 > var42) {
                            var42 = var43;
                         }
 
-                        var29 = var85.yOffset;
+                        var29 = var96.yOffset;
                      }
 
-                     if(var81 != null) {
-                        var30 = var81.__g_417();
-                        if(var30 != null) {
+                     if (var92 != null) {
+                        var30 = var92.method123();
+                        if (var30 != null) {
                            var34 = var30.subWidth;
                            var43 = var30.subHeight;
-                           if(var43 > var42) {
+                           if (var43 > var42) {
                               var42 = var43;
                            }
 
                            var38 = var30.yOffset;
                         }
 
-                        var31 = var81.__l_418();
-                        if(var31 != null) {
+                        var31 = var92.method124();
+                        if (var31 != null) {
                            var35 = var31.subWidth;
                            var43 = var31.subHeight;
-                           if(var43 > var42) {
+                           if (var43 > var42) {
                               var42 = var43;
                            }
 
                            var39 = var31.yOffset;
                         }
 
-                        var32 = var81.__e_419();
-                        if(var32 != null) {
+                        var32 = var92.method125();
+                        if (var32 != null) {
                            var36 = var32.subWidth;
                            var43 = var32.subHeight;
-                           if(var43 > var42) {
+                           if (var43 > var42) {
                               var42 = var43;
                            }
 
                            var40 = var32.yOffset;
                         }
 
-                        var33 = var81.__x_420();
-                        if(var33 != null) {
+                        var33 = var92.method126();
+                        if (var33 != null) {
                            var37 = var33.subWidth;
                            var43 = var33.subHeight;
-                           if(var43 > var42) {
+                           if (var43 > var42) {
                               var42 = var43;
                            }
 
@@ -525,241 +525,239 @@ public class class39 extends class21 {
                         }
                      }
 
-                     Font var86 = var95.getFont();
-                     if(var86 == null) {
-                        var86 = ScriptEvent.fontPlain11;
-                     }
-
-                     Font var44;
-                     if(var81 != null) {
-                        var44 = var81.getFont();
-                        if(var44 == null) {
-                           var44 = ScriptEvent.fontPlain11;
-                        }
-                     } else {
+                     Font var44 = var90.getFont();
+                     if (var44 == null) {
                         var44 = ScriptEvent.fontPlain11;
                      }
 
-                     String var45 = null;
+                     Font var45;
+                     if (var92 != null) {
+                        var45 = var92.getFont();
+                        if (var45 == null) {
+                           var45 = ScriptEvent.fontPlain11;
+                        }
+                     } else {
+                        var45 = ScriptEvent.fontPlain11;
+                     }
+
                      String var46 = null;
-                     boolean var47 = false;
-                     int var48 = 0;
-                     var45 = var95.getString(var0.hitSplatValues[var80]);
-                     int var94 = var86.stringWidth(var45);
-                     if(var81 != null) {
-                        var46 = var81.getString(var0.hitSplatValues2[var80]);
-                        var48 = var44.stringWidth(var46);
-                     }
-
+                     String var47 = null;
+                     boolean var48 = false;
                      int var49 = 0;
-                     int var50 = 0;
-                     if(var23 > 0) {
-                        if(var84 == null && var85 == null) {
-                           var49 = 1;
-                        } else {
-                           var49 = var94 / var23 + 1;
-                        }
-                     }
-
-                     if(var81 != null && var35 > 0) {
-                        if(var32 == null && var33 == null) {
-                           var50 = 1;
-                        } else {
-                           var50 = var48 / var35 + 1;
-                        }
+                     var46 = var90.getString(var0.hitSplatValues[var88]);
+                     int var50 = var44.stringWidth(var46);
+                     if (var92 != null) {
+                        var47 = var92.getString(var0.hitSplatValues2[var88]);
+                        var49 = var45.stringWidth(var47);
                      }
 
                      int var51 = 0;
-                     int var52 = var51;
-                     if(var22 > 0) {
-                        var51 += var22;
+                     int var52 = 0;
+                     if (var85 > 0) {
+                        if (var95 == null && var96 == null) {
+                           var51 = 1;
+                        } else {
+                           var51 = var50 / var85 + 1;
+                        }
                      }
 
-                     var51 += 2;
-                     int var53 = var51;
-                     if(var24 > 0) {
-                        var51 += var24;
+                     if (var92 != null && var35 > 0) {
+                        if (var32 == null && var33 == null) {
+                           var52 = 1;
+                        } else {
+                           var52 = var49 / var35 + 1;
+                        }
                      }
 
-                     int var54 = var51;
-                     int var55 = var51;
-                     int var56;
-                     if(var23 > 0) {
-                        var56 = var23 * var49;
-                        var51 += var56;
-                        var55 += (var56 - var94) / 2;
+                     int var53 = 0;
+                     int var54 = var53;
+                     if (var82 > 0) {
+                        var53 += var82;
+                     }
+
+                     var53 += 2;
+                     int var55 = var53;
+                     if (var24 > 0) {
+                        var53 += var24;
+                     }
+
+                     int var56 = var53;
+                     int var57 = var53;
+                     int var58;
+                     if (var85 > 0) {
+                        var58 = var85 * var51;
+                        var53 += var58;
+                        var57 += (var58 - var50) / 2;
                      } else {
-                        var51 += var94;
+                        var53 += var50;
                      }
 
-                     var56 = var51;
-                     if(var25 > 0) {
-                        var51 += var25;
+                     var58 = var53;
+                     if (var25 > 0) {
+                        var53 += var25;
                      }
 
-                     int var57 = 0;
-                     int var58 = 0;
                      int var59 = 0;
                      int var60 = 0;
                      int var61 = 0;
-                     int var62;
-                     if(var81 != null) {
-                        var51 += 2;
-                        var57 = var51;
-                        if(var34 > 0) {
-                           var51 += var34;
+                     int var62 = 0;
+                     int var63 = 0;
+                     int var64;
+                     if (var92 != null) {
+                        var53 += 2;
+                        var59 = var53;
+                        if (var34 > 0) {
+                           var53 += var34;
                         }
 
-                        var51 += 2;
-                        var58 = var51;
-                        if(var36 > 0) {
-                           var51 += var36;
+                        var53 += 2;
+                        var60 = var53;
+                        if (var36 > 0) {
+                           var53 += var36;
                         }
 
-                        var59 = var51;
-                        var61 = var51;
-                        if(var35 > 0) {
-                           var62 = var35 * var50;
-                           var51 += var62;
-                           var61 += (var62 - var48) / 2;
+                        var61 = var53;
+                        var63 = var53;
+                        if (var35 > 0) {
+                           var64 = var35 * var52;
+                           var53 += var64;
+                           var63 += (var64 - var49) / 2;
                         } else {
-                           var51 += var48;
+                           var53 += var49;
                         }
 
-                        var60 = var51;
-                        if(var37 > 0) {
-                           var51 += var37;
+                        var62 = var53;
+                        if (var37 > 0) {
+                           var53 += var37;
                         }
                      }
 
-                     var62 = var0.hitSplatCycles[var80] - Client.cycle;
-                     int var63 = var95.__t - var62 * var95.__t / var95.__i;
-                     int var64 = var62 * var95.__y / var95.__i + -var95.__y;
-                     int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1));
-                     int var66 = var64 + (var3 + Client.viewportTempY - 12);
-                     int var67 = var66;
-                     int var68 = var42 + var66;
-                     int var69 = var66 + var95.__r + 15;
-                     int var70 = var69 - var86.maxAscent;
-                     int var71 = var69 + var86.maxDescent;
-                     if(var70 < var66) {
-                        var67 = var70;
+                     var64 = var0.hitSplatCycles[var88] - Client.cycle;
+                     int var65 = var90.field392 - var64 * var90.field392 / var90.field387;
+                     int var66 = var64 * var90.field393 / var90.field387 + -var90.field393;
+                     int var67 = var65 + (var2 + Client.viewportTempX - (var53 >> 1));
+                     int var68 = var66 + (var3 + Client.viewportTempY - 12);
+                     int var69 = var68;
+                     int var70 = var42 + var68;
+                     int var71 = var68 + var90.field397 + 15;
+                     int var72 = var71 - var44.maxAscent;
+                     int var73 = var71 + var44.maxDescent;
+                     if (var72 < var68) {
+                        var69 = var72;
                      }
 
-                     if(var71 > var68) {
-                        var68 = var71;
+                     if (var73 > var70) {
+                        var70 = var73;
                      }
 
-                     int var72 = 0;
-                     int var73;
-                     int var74;
-                     if(var81 != null) {
-                        var72 = var66 + var81.__r + 15;
-                        var73 = var72 - var44.maxAscent;
-                        var74 = var72 + var44.maxDescent;
-                        if(var73 < var67) {
-                           ;
+                     int var74 = 0;
+                     int var75;
+                     int var76;
+                     if (var92 != null) {
+                        var74 = var68 + var92.field397 + 15;
+                        var75 = var74 - var45.maxAscent;
+                        var76 = var74 + var45.maxDescent;
+                        if (var75 < var69) {
                         }
 
-                        if(var74 > var68) {
-                           ;
+                        if (var76 > var70) {
                         }
                      }
 
-                     var73 = 255;
-                     if(var95.__h >= 0) {
-                        var73 = (var62 << 8) / (var95.__i - var95.__h);
+                     var75 = 255;
+                     if (var90.field394 >= 0) {
+                        var75 = (var64 << 8) / (var90.field387 - var90.field394);
                      }
 
-                     if(var73 >= 0 && var73 < 255) {
-                        if(var82 != null) {
-                           var82.__h_508(var52 + var65 - var26, var66, var73);
+                     if (var75 >= 0 && var75 < 255) {
+                        if (var93 != null) {
+                           var93.method310(var54 + var67 - var26, var68, var75);
                         }
 
-                        if(var84 != null) {
-                           var84.__h_508(var65 + var53 - var28, var66, var73);
+                        if (var95 != null) {
+                           var95.method310(var67 + var55 - var28, var68, var75);
                         }
 
-                        if(var83 != null) {
-                           for(var74 = 0; var74 < var49; ++var74) {
-                              var83.__h_508(var23 * var74 + (var65 + var54 - var27), var66, var73);
+                        if (var94 != null) {
+                           for (var76 = 0; var76 < var51; ++var76) {
+                              var94.method310(var85 * var76 + (var67 + var56 - var27), var68, var75);
                            }
                         }
 
-                        if(var85 != null) {
-                           var85.__h_508(var56 + var65 - var29, var66, var73);
+                        if (var96 != null) {
+                           var96.method310(var58 + var67 - var29, var68, var75);
                         }
 
-                        var86.drawAlpha(var45, var55 + var65, var69, var95.__n, 0, var73);
-                        if(var81 != null) {
-                           if(var30 != null) {
-                              var30.__h_508(var65 + var57 - var38, var66, var73);
+                        var44.drawAlpha(var46, var57 + var67, var71, var90.field386, 0, var75);
+                        if (var92 != null) {
+                           if (var30 != null) {
+                              var30.method310(var67 + var59 - var38, var68, var75);
                            }
 
-                           if(var32 != null) {
-                              var32.__h_508(var65 + var58 - var40, var66, var73);
+                           if (var32 != null) {
+                              var32.method310(var67 + var60 - var40, var68, var75);
                            }
 
-                           if(var31 != null) {
-                              for(var74 = 0; var74 < var50; ++var74) {
-                                 var31.__h_508(var74 * var35 + (var59 + var65 - var39), var66, var73);
+                           if (var31 != null) {
+                              for (var76 = 0; var76 < var52; ++var76) {
+                                 var31.method310(var76 * var35 + (var61 + var67 - var39), var68, var75);
                               }
                            }
 
-                           if(var33 != null) {
-                              var33.__h_508(var60 + var65 - var41, var66, var73);
+                           if (var33 != null) {
+                              var33.method310(var62 + var67 - var41, var68, var75);
                            }
 
-                           var44.drawAlpha(var46, var61 + var65, var72, var81.__n, 0, var73);
+                           var45.drawAlpha(var47, var63 + var67, var74, var92.field386, 0, var75);
                         }
                      } else {
-                        if(var82 != null) {
-                           var82.drawAt2(var52 + var65 - var26, var66);
+                        if (var93 != null) {
+                           var93.drawAt2(var54 + var67 - var26, var68);
                         }
 
-                        if(var84 != null) {
-                           var84.drawAt2(var65 + var53 - var28, var66);
+                        if (var95 != null) {
+                           var95.drawAt2(var67 + var55 - var28, var68);
                         }
 
-                        if(var83 != null) {
-                           for(var74 = 0; var74 < var49; ++var74) {
-                              var83.drawAt2(var23 * var74 + (var54 + var65 - var27), var66);
+                        if (var94 != null) {
+                           for (var76 = 0; var76 < var51; ++var76) {
+                              var94.drawAt2(var85 * var76 + (var56 + var67 - var27), var68);
                            }
                         }
 
-                        if(var85 != null) {
-                           var85.drawAt2(var56 + var65 - var29, var66);
+                        if (var96 != null) {
+                           var96.drawAt2(var58 + var67 - var29, var68);
                         }
 
-                        var86.draw(var45, var55 + var65, var69, var95.__n | -16777216, 0);
-                        if(var81 != null) {
-                           if(var30 != null) {
-                              var30.drawAt2(var65 + var57 - var38, var66);
+                        var44.draw(var46, var57 + var67, var71, var90.field386 | -16777216, 0);
+                        if (var92 != null) {
+                           if (var30 != null) {
+                              var30.drawAt2(var67 + var59 - var38, var68);
                            }
 
-                           if(var32 != null) {
-                              var32.drawAt2(var58 + var65 - var40, var66);
+                           if (var32 != null) {
+                              var32.drawAt2(var60 + var67 - var40, var68);
                            }
 
-                           if(var31 != null) {
-                              for(var74 = 0; var74 < var50; ++var74) {
-                                 var31.drawAt2(var74 * var35 + (var65 + var59 - var39), var66);
+                           if (var31 != null) {
+                              for (var76 = 0; var76 < var52; ++var76) {
+                                 var31.drawAt2(var76 * var35 + (var67 + var61 - var39), var68);
                               }
                            }
 
-                           if(var33 != null) {
-                              var33.drawAt2(var60 + var65 - var41, var66);
+                           if (var33 != null) {
+                              var33.drawAt2(var62 + var67 - var41, var68);
                            }
 
-                           var44.draw(var46, var61 + var65, var72, var81.__n | -16777216, 0);
+                           var45.draw(var47, var63 + var67, var74, var92.field386 | -16777216, 0);
                         }
                      }
                   }
                }
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("hv")
@@ -769,34 +767,33 @@ public class class39 extends class21 {
    )
    @Export("drawMenuActionTextAt")
    static final void drawMenuActionTextAt(int var0, int var1) {
-      if(Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) {
-         if(Client.showMouseOverText) {
-            int var2 = Client.menuOptionsCount - 1;
+      if ((Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) && Client.showMouseOverText) {
+         int var2 = Client.menuOptionsCount - 1;
+         String var3;
+         if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) {
+            var3 = "Use " + Client.selectedItemName + " ->";
+         } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) {
+            var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " ->";
+         } else {
             String var4;
-            if(Client.isItemSelected == 1 && Client.menuOptionsCount < 2) {
-               var4 = "Use" + " " + Client.selectedItemName + " " + "->";
-            } else if(Client.isSpellSelected && Client.menuOptionsCount < 2) {
-               var4 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->";
+            if (var2 < 0) {
+               var4 = "";
+            } else if (Client.menuTargetNames[var2].length() > 0) {
+               var4 = Client.menuActions[var2] + " " + Client.menuTargetNames[var2];
             } else {
-               String var5;
-               if(var2 < 0) {
-                  var5 = "";
-               } else if(Client.menuTargetNames[var2].length() > 0) {
-                  var5 = Client.menuActions[var2] + " " + Client.menuTargetNames[var2];
-               } else {
-                  var5 = Client.menuActions[var2];
-               }
-
-               var4 = var5;
+               var4 = Client.menuActions[var2];
             }
 
-            if(Client.menuOptionsCount > 2) {
-               var4 = var4 + BufferedFile.colorStartTag(0xffffff) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
-            }
-
-            class2.fontBold12.drawRandomAlphaAndSpacing(var4, var0 + 4, var1 + 15, 0xffffff, 0, Client.cycle / 1000);
+            var3 = var4;
          }
+
+         if (Client.menuOptionsCount > 2) {
+            var3 = var3 + BufferedFile.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
+         }
+
+         class2.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000);
       }
+
    }
 
    @ObfuscatedName("ib")
@@ -806,23 +803,22 @@ public class class39 extends class21 {
    )
    @Export("revalidateWidgetScroll")
    static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) {
-      int var3 = var1.scrollWidth != 0?var1.scrollWidth:var1.width;
-      int var4 = var1.scrollHeight != 0?var1.scrollHeight:var1.height;
+      int var3 = var1.scrollWidth != 0 ? var1.scrollWidth : var1.width;
+      int var4 = var1.scrollHeight != 0 ? var1.scrollHeight : var1.height;
       WorldMapRegion.notRevalidateWidgetScroll(var0, var1.id, var3, var4, var2);
-      if(var1.children != null) {
+      if (var1.children != null) {
          WorldMapRegion.notRevalidateWidgetScroll(var1.children, var1.id, var3, var4, var2);
       }
 
       WidgetGroupParent var5 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var1.id);
-      if(var5 != null) {
+      if (var5 != null) {
          int var6 = var5.group;
-         if(GroundItemPile.loadWidgetGroup(var6)) {
+         if (GroundItemPile.loadWidgetGroup(var6)) {
             WorldMapRegion.notRevalidateWidgetScroll(Widget.widgets[var6], -1, var3, var4, var2);
          }
       }
 
-      if(var1.contentType == 1337) {
-         ;
+      if (var1.contentType == 1337) {
       }
 
    }
diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java
index bdc7d67388..5aae33d902 100644
--- a/runescape-client/src/main/java/class4.java
+++ b/runescape-client/src/main/java/class4.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
@@ -8,7 +7,7 @@ final class class4 implements class0 {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __o_m;
+   public static AbstractIndexCache field1158;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -43,7 +42,7 @@ final class class4 implements class0 {
       garbageValue = "253581236"
    )
    public static ClientParameter[] method47() {
-      return new ClientParameter[]{ClientParameter.__ji_e, ClientParameter.__ji_m, ClientParameter.__ji_g, ClientParameter.__ji_d, ClientParameter.__ji_u, ClientParameter.__ji_o, ClientParameter.__ji_k, ClientParameter.__ji_j, ClientParameter.__ji_q, ClientParameter.__ji_z, ClientParameter.__ji_n, ClientParameter.__ji_a, ClientParameter.__ji_t, ClientParameter.__ji_w, ClientParameter.__ji_i, ClientParameter.__ji_s, ClientParameter.__ji_x, ClientParameter.__ji_f, ClientParameter.__ji_l};
+      return new ClientParameter[]{ClientParameter.field330, ClientParameter.field322, ClientParameter.field328, ClientParameter.field332, ClientParameter.field327, ClientParameter.field326, ClientParameter.field333, ClientParameter.field338, ClientParameter.field324, ClientParameter.field337, ClientParameter.field334, ClientParameter.field336, ClientParameter.field340, ClientParameter.field325, ClientParameter.field335, ClientParameter.field339, ClientParameter.field331, ClientParameter.field323, ClientParameter.field329};
    }
 
    @ObfuscatedName("u")
@@ -52,7 +51,7 @@ final class class4 implements class0 {
       garbageValue = "-843046456"
    )
    public static void method55() {
-      OverlayDefinition.__jf_f.clear();
+      OverlayDefinition.field664.clear();
    }
 
    @ObfuscatedName("v")
@@ -62,266 +61,264 @@ final class class4 implements class0 {
    )
    static int method54(int var0, Script var1, boolean var2) {
       String var3;
-      if(var0 == 3100) {
+      if (var0 == 3100) {
          var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
          WorldMapIcon1.method219(0, "", var3);
          return 1;
-      } else if(var0 == 3101) {
+      } else if (var0 == 3101) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          class234.method4534(Canvas.localPlayer, Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
          return 1;
-      } else if(var0 == 3103) {
-         if(!Interpreter.__bv_t) {
-            Interpreter.__bv_s = true;
+      } else if (var0 == 3103) {
+         if (!Interpreter.field424) {
+            Interpreter.field423 = true;
          }
 
          return 1;
       } else {
-         int var10;
-         if(var0 == 3104) {
+         int var4;
+         PacketBufferNode var5;
+         if (var0 == 3104) {
             var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-            var10 = 0;
-            if(UserComparator4.method3336(var3)) {
-               var10 = MouseHandler.method1085(var3);
+            var4 = 0;
+            if (UserComparator4.method3336(var3)) {
+               var4 = MouseHandler.method1085(var3);
             }
 
-            PacketBufferNode var12 = Interpreter.method1915(ClientPacket.__gs_s, Client.packetWriter.isaacCipher);
-            var12.packetBuffer.writeInt(var10);
-            Client.packetWriter.__q_167(var12);
+            var5 = Interpreter.method1915(ClientPacket.field239, Client.packetWriter.isaacCipher);
+            var5.packetBuffer.writeInt(var4);
+            Client.packetWriter.method241(var5);
+            return 1;
+         } else if (var0 == 3105) {
+            var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+            var5 = Interpreter.method1915(ClientPacket.field317, Client.packetWriter.isaacCipher);
+            var5.packetBuffer.writeByte(var3.length() + 1);
+            var5.packetBuffer.writeStringCp1252NullTerminated(var3);
+            Client.packetWriter.method241(var5);
+            return 1;
+         } else if (var0 == 3106) {
+            var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+            var5 = Interpreter.method1915(ClientPacket.field230, Client.packetWriter.isaacCipher);
+            var5.packetBuffer.writeByte(var3.length() + 1);
+            var5.packetBuffer.writeStringCp1252NullTerminated(var3);
+            Client.packetWriter.method241(var5);
             return 1;
          } else {
-            PacketBufferNode var14;
-            if(var0 == 3105) {
-               var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               var14 = Interpreter.method1915(ClientPacket.__gs_cl, Client.packetWriter.isaacCipher);
-               var14.packetBuffer.writeByte(var3.length() + 1);
-               var14.packetBuffer.writeStringCp1252NullTerminated(var3);
-               Client.packetWriter.__q_167(var14);
+            String var6;
+            int var7;
+            if (var0 == 3107) {
+               var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               var6 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               WorldMapSection2.method583(var7, var6);
                return 1;
-            } else if(var0 == 3106) {
-               var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               var14 = Interpreter.method1915(ClientPacket.__gs_e, Client.packetWriter.isaacCipher);
-               var14.packetBuffer.writeByte(var3.length() + 1);
-               var14.packetBuffer.writeStringCp1252NullTerminated(var3);
-               Client.packetWriter.__q_167(var14);
+            } else if (var0 == 3108) {
+               RouteStrategy.Interpreter_intStackSize -= 3;
+               var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+               var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+               int var13 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+               Widget var11 = Huffman.getWidget(var13);
+               Players.clickWidget(var11, var7, var4);
+               return 1;
+            } else if (var0 == 3109) {
+               RouteStrategy.Interpreter_intStackSize -= 2;
+               var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+               var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+               Widget var12 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+               Players.clickWidget(var12, var7, var4);
+               return 1;
+            } else if (var0 == 3110) {
+               AbstractRasterProvider.mouseCam = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               return 1;
+            } else if (var0 == 3111) {
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.roofsHidden ? 1 : 0;
+               return 1;
+            } else if (var0 == 3112) {
+               ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               WorldMapSection0.savePreferences();
                return 1;
             } else {
-               String var7;
-               int var15;
-               if(var0 == 3107) {
-                  var15 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-                  WorldMapSection2.method583(var15, var7);
-                  return 1;
-               } else if(var0 == 3108) {
-                  RouteStrategy.Interpreter_intStackSize -= 3;
-                  var15 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                  var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                  int var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-                  Widget var13 = Huffman.getWidget(var9);
-                  Players.clickWidget(var13, var15, var10);
-                  return 1;
-               } else if(var0 == 3109) {
-                  RouteStrategy.Interpreter_intStackSize -= 2;
-                  var15 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                  var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                  Widget var11 = var2?WorldMapIcon1.__t_i:class12.__n_n;
-                  Players.clickWidget(var11, var15, var10);
-                  return 1;
-               } else if(var0 == 3110) {
-                  AbstractRasterProvider.mouseCam = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                  return 1;
-               } else if(var0 == 3111) {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.roofsHidden?1:0;
-                  return 1;
-               } else if(var0 == 3112) {
-                  ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                  WorldMapSection0.savePreferences();
-                  return 1;
-               } else if(var0 == 3113) {
+               boolean var8;
+               if (var0 == 3113) {
                   var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-                  boolean var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                  WorldMapCacheName.method635(var3, var4, false);
+                  var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                  WorldMapCacheName.method635(var3, var8, false);
                   return 1;
-               } else if(var0 == 3115) {
-                  var15 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var14 = Interpreter.method1915(ClientPacket.__gs_as, Client.packetWriter.isaacCipher);
-                  var14.packetBuffer.writeShort(var15);
-                  Client.packetWriter.__q_167(var14);
+               } else if (var0 == 3115) {
+                  var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                  var5 = Interpreter.method1915(ClientPacket.field264, Client.packetWriter.isaacCipher);
+                  var5.packetBuffer.writeShort(var7);
+                  Client.packetWriter.method241(var5);
                   return 1;
-               } else if(var0 == 3116) {
-                  var15 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               } else if (var0 == 3116) {
+                  var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                   Interpreter.Interpreter_stringStackSize -= 2;
-                  var7 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-                  String var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-                  if(var7.length() > 500) {
+                  var6 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
+                  String var10 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+                  if (var6.length() > 500) {
                      return 1;
-                  } else if(var5.length() > 500) {
+                  } else if (var10.length() > 500) {
                      return 1;
                   } else {
-                     PacketBufferNode var6 = Interpreter.method1915(ClientPacket.__gs_j, Client.packetWriter.isaacCipher);
-                     var6.packetBuffer.writeShort(1 + WorldMapRegion.method550(var7) + WorldMapRegion.method550(var5));
-                     var6.packetBuffer.writeStringCp1252NullTerminated(var7);
-                     var6.packetBuffer.writeByte(var15);
-                     var6.packetBuffer.writeStringCp1252NullTerminated(var5);
-                     Client.packetWriter.__q_167(var6);
+                     PacketBufferNode var9 = Interpreter.method1915(ClientPacket.field238, Client.packetWriter.isaacCipher);
+                     var9.packetBuffer.writeShort(1 + WorldMapRegion.method550(var6) + WorldMapRegion.method550(var10));
+                     var9.packetBuffer.writeStringCp1252NullTerminated(var6);
+                     var9.packetBuffer.writeByte(var7);
+                     var9.packetBuffer.writeStringCp1252NullTerminated(var10);
+                     Client.packetWriter.method241(var9);
                      return 1;
                   }
-               } else if(var0 == 3117) {
+               } else if (var0 == 3117) {
                   Client.shiftClickDrop = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                   return 1;
-               } else if(var0 == 3118) {
+               } else if (var0 == 3118) {
                   Client.showMouseOverText = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                   return 1;
-               } else if(var0 == 3119) {
+               } else if (var0 == 3119) {
                   Client.renderSelf = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                   return 1;
-               } else if(var0 == 3120) {
-                  if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
-                     Client.__client_ke |= 1;
+               } else if (var0 == 3120) {
+                  if (Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
+                     Client.field210 |= 1;
                   } else {
-                     Client.__client_ke &= -2;
+                     Client.field210 &= -2;
                   }
 
                   return 1;
-               } else if(var0 == 3121) {
-                  if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
-                     Client.__client_ke |= 2;
+               } else if (var0 == 3121) {
+                  if (Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
+                     Client.field210 |= 2;
                   } else {
-                     Client.__client_ke &= -3;
+                     Client.field210 &= -3;
                   }
 
                   return 1;
-               } else if(var0 == 3122) {
-                  if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
-                     Client.__client_ke |= 4;
+               } else if (var0 == 3122) {
+                  if (Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
+                     Client.field210 |= 4;
                   } else {
-                     Client.__client_ke &= -5;
+                     Client.field210 &= -5;
                   }
 
                   return 1;
-               } else if(var0 == 3123) {
-                  if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
-                     Client.__client_ke |= 8;
+               } else if (var0 == 3123) {
+                  if (Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
+                     Client.field210 |= 8;
                   } else {
-                     Client.__client_ke &= -9;
+                     Client.field210 &= -9;
                   }
 
                   return 1;
-               } else if(var0 == 3124) {
-                  Client.__client_ke = 0;
+               } else if (var0 == 3124) {
+                  Client.field210 = 0;
                   return 1;
-               } else if(var0 == 3125) {
+               } else if (var0 == 3125) {
                   Client.showMouseCross = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                   return 1;
-               } else if(var0 == 3126) {
+               } else if (var0 == 3126) {
                   Client.showLoadingMessages = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                   return 1;
-               } else if(var0 == 3127) {
+               } else if (var0 == 3127) {
                   WorldMapAreaData.method705(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1);
                   return 1;
-               } else if(var0 == 3128) {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.method4028()?1:0;
+               } else if (var0 == 3128) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.method4028() ? 1 : 0;
                   return 1;
-               } else if(var0 == 3129) {
+               } else if (var0 == 3129) {
                   RouteStrategy.Interpreter_intStackSize -= 2;
                   Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                  Client.__client_in = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                  Client.field197 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
                   return 1;
-               } else if(var0 == 3130) {
+               } else if (var0 == 3130) {
                   RouteStrategy.Interpreter_intStackSize -= 2;
                   return 1;
-               } else if(var0 == 3131) {
+               } else if (var0 == 3131) {
                   --RouteStrategy.Interpreter_intStackSize;
                   return 1;
-               } else if(var0 == 3132) {
+               } else if (var0 == 3132) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SoundCache.canvasWidth;
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Huffman.canvasHeight;
                   return 1;
-               } else if(var0 == 3133) {
+               } else if (var0 == 3133) {
                   --RouteStrategy.Interpreter_intStackSize;
                   return 1;
-               } else if(var0 == 3134) {
+               } else if (var0 == 3134) {
                   return 1;
-               } else if(var0 == 3135) {
+               } else if (var0 == 3135) {
                   RouteStrategy.Interpreter_intStackSize -= 2;
                   return 1;
-               } else if(var0 == 3136) {
-                  Client.__client_mf = 3;
-                  Client.__client_ms = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               } else if (var0 == 3136) {
+                  Client.field151 = 3;
+                  Client.field153 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                   return 1;
-               } else if(var0 == 3137) {
-                  Client.__client_mf = 2;
-                  Client.__client_ms = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               } else if (var0 == 3137) {
+                  Client.field151 = 2;
+                  Client.field153 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                   return 1;
-               } else if(var0 == 3138) {
-                  Client.__client_mf = 0;
+               } else if (var0 == 3138) {
+                  Client.field151 = 0;
                   return 1;
-               } else if(var0 == 3139) {
-                  Client.__client_mf = 1;
+               } else if (var0 == 3139) {
+                  Client.field151 = 1;
                   return 1;
-               } else if(var0 == 3140) {
-                  Client.__client_mf = 3;
-                  Client.__client_ms = var2?WorldMapIcon1.__t_i.id:class12.__n_n.id;
+               } else if (var0 == 3140) {
+                  Client.field151 = 3;
+                  Client.field153 = var2 ? WorldMapIcon1.field1030.id : class12.field1111.id;
+                  return 1;
+               } else if (var0 == 3141) {
+                  var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                  ReflectionCheck.clientPreferences.hideUsername = var8;
+                  WorldMapSection0.savePreferences();
+                  return 1;
+               } else if (var0 == 3142) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername ? 1 : 0;
+                  return 1;
+               } else if (var0 == 3143) {
+                  var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                  Client.Login_isUsernameRemembered = var8;
+                  if (!var8) {
+                     ReflectionCheck.clientPreferences.rememberedUsername = "";
+                     WorldMapSection0.savePreferences();
+                  }
+
+                  return 1;
+               } else if (var0 == 3144) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0;
+                  return 1;
+               } else if (var0 == 3145) {
+                  return 1;
+               } else if (var0 == 3146) {
+                  var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                  if (var8 == ReflectionCheck.clientPreferences.titleMusicDisabled) {
+                     ReflectionCheck.clientPreferences.titleMusicDisabled = !var8;
+                     WorldMapSection0.savePreferences();
+                  }
+
+                  return 1;
+               } else if (var0 == 3147) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.titleMusicDisabled ? 0 : 1;
+                  return 1;
+               } else if (var0 == 3148) {
+                  return 1;
+               } else if (var0 == 3149) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
+                  return 1;
+               } else if (var0 == 3150) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
+                  return 1;
+               } else if (var0 == 3151) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
+                  return 1;
+               } else if (var0 == 3152) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
+                  return 1;
+               } else if (var0 == 3153) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Login.Login_loadingPercent;
+                  return 1;
+               } else if (var0 == 3154) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GrandExchangeOffer.method101();
                   return 1;
                } else {
-                  boolean var8;
-                  if(var0 == 3141) {
-                     var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     ReflectionCheck.clientPreferences.hideUsername = var8;
-                     WorldMapSection0.savePreferences();
-                     return 1;
-                  } else if(var0 == 3142) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername?1:0;
-                     return 1;
-                  } else if(var0 == 3143) {
-                     var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     Client.Login_isUsernameRemembered = var8;
-                     if(!var8) {
-                        ReflectionCheck.clientPreferences.rememberedUsername = "";
-                        WorldMapSection0.savePreferences();
-                     }
-
-                     return 1;
-                  } else if(var0 == 3144) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered?1:0;
-                     return 1;
-                  } else if(var0 == 3145) {
-                     return 1;
-                  } else if(var0 == 3146) {
-                     var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(var8 == ReflectionCheck.clientPreferences.titleMusicDisabled) {
-                        ReflectionCheck.clientPreferences.titleMusicDisabled = !var8;
-                        WorldMapSection0.savePreferences();
-                     }
-
-                     return 1;
-                  } else if(var0 == 3147) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.titleMusicDisabled?0:1;
-                     return 1;
-                  } else if(var0 == 3148) {
-                     return 1;
-                  } else if(var0 == 3149) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
-                     return 1;
-                  } else if(var0 == 3150) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
-                     return 1;
-                  } else if(var0 == 3151) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
-                     return 1;
-                  } else if(var0 == 3152) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
-                     return 1;
-                  } else if(var0 == 3153) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Login.Login_loadingPercent;
-                     return 1;
-                  } else if(var0 == 3154) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GrandExchangeOffer.method101();
-                     return 1;
-                  } else {
-                     return 2;
-                  }
+                  return 2;
                }
             }
          }
diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java
index ad1e35f2a5..7cd4ebd5af 100644
--- a/runescape-client/src/main/java/class40.java
+++ b/runescape-client/src/main/java/class40.java
@@ -32,11 +32,12 @@ public class class40 {
       garbageValue = "125"
    )
    void method743(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-      if(var7 != 0 && this.field326 != 0 && this.field329 != null) {
+      if (var7 != 0 && this.field326 != 0 && this.field329 != null) {
          var8 = this.method744(var8, var7);
          var7 = this.method774(var7);
          Rasterizer2D.raster2d7(var1, var2, var5, var6, var3, var4, this.field329[var7 - 1][var8], this.field326);
       }
+
    }
 
    @ObfuscatedName("f")
@@ -45,15 +46,15 @@ public class class40 {
       garbageValue = "-203451964"
    )
    int method744(int var1, int var2) {
-      if(var2 == 9) {
+      if (var2 == 9) {
          var1 = var1 + 1 & 3;
       }
 
-      if(var2 == 10) {
+      if (var2 == 10) {
          var1 = var1 + 3 & 3;
       }
 
-      if(var2 == 11) {
+      if (var2 == 11) {
          var1 = var1 + 3 & 3;
       }
 
@@ -66,7 +67,7 @@ public class class40 {
       garbageValue = "-63"
    )
    int method774(int var1) {
-      return var1 != 9 && var1 != 10?(var1 == 11?8:var1):1;
+      return var1 != 9 && var1 != 10 ? (var1 == 11 ? 8 : var1) : 1;
    }
 
    @ObfuscatedName("w")
@@ -75,7 +76,7 @@ public class class40 {
       garbageValue = "1551779144"
    )
    void method763() {
-      if(this.field329 == null) {
+      if (this.field329 == null) {
          this.field329 = new byte[8][4][];
          this.method745();
          this.method748();
@@ -86,6 +87,7 @@ public class class40 {
          this.method753();
          this.method754();
       }
+
    }
 
    @ObfuscatedName("o")
@@ -99,9 +101,9 @@ public class class40 {
 
       int var3;
       int var4;
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 <= var3) {
                var1[var2] = -1;
             }
 
@@ -113,9 +115,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 <= var3) {
                var1[var2] = -1;
             }
 
@@ -127,9 +129,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= var3) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 >= var3) {
                var1[var2] = -1;
             }
 
@@ -141,9 +143,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= var3) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 >= var3) {
                var1[var2] = -1;
             }
 
@@ -165,9 +167,9 @@ public class class40 {
 
       int var3;
       int var4;
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3 >> 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 <= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -179,10 +181,10 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var2 >= 0 && var2 < var1.length) {
-               if(var4 >= var3 << 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var2 >= 0 && var2 < var1.length) {
+               if (var4 >= var3 << 1) {
                   var1[var2] = -1;
                }
 
@@ -197,9 +199,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 <= var3 >> 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 <= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -211,9 +213,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 >= var3 << 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 >= var3 << 1) {
                var1[var2] = -1;
             }
 
@@ -235,9 +237,9 @@ public class class40 {
 
       int var3;
       int var4;
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 <= var3 >> 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 <= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -249,9 +251,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= var3 << 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 >= var3 << 1) {
                var1[var2] = -1;
             }
 
@@ -263,9 +265,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3 >> 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 <= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -277,9 +279,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 >= var3 << 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 >= var3 << 1) {
                var1[var2] = -1;
             }
 
@@ -301,9 +303,9 @@ public class class40 {
 
       int var3;
       int var4;
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= var3 >> 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 >= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -315,9 +317,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3 << 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 <= var3 << 1) {
                var1[var2] = -1;
             }
 
@@ -329,9 +331,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 >= var3 >> 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 >= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -343,9 +345,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 <= var3 << 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 <= var3 << 1) {
                var1[var2] = -1;
             }
 
@@ -367,9 +369,9 @@ public class class40 {
 
       int var3;
       int var4;
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 >= var3 >> 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 >= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -381,9 +383,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3 << 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 <= var3 << 1) {
                var1[var2] = -1;
             }
 
@@ -395,9 +397,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= var3 >> 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 >= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -409,9 +411,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 <= var3 << 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 <= var3 << 1) {
                var1[var2] = -1;
             }
 
@@ -431,59 +433,59 @@ public class class40 {
       byte[] var1 = new byte[this.field326 * this.field326];
       boolean var2 = false;
       var1 = new byte[this.field326 * this.field326];
-      int var5 = 0;
+      int var3 = 0;
 
-      int var3;
       int var4;
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= this.field326 / 2) {
-               var1[var5] = -1;
+      int var5;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var5 <= this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[5][0] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var3 <= this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var4 <= this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[5][1] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var5 >= this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[5][2] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var3 >= this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var4 >= this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
@@ -499,59 +501,59 @@ public class class40 {
       byte[] var1 = new byte[this.field326 * this.field326];
       boolean var2 = false;
       var1 = new byte[this.field326 * this.field326];
-      int var5 = 0;
+      int var3 = 0;
 
-      int var3;
       int var4;
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      int var5;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var5 <= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[6][0] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var5 <= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[6][1] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 <= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+         for (var5 = this.field326 - 1; var5 >= 0; --var5) {
+            if (var5 <= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[6][2] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 <= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = this.field326 - 1; var5 >= 0; --var5) {
+            if (var5 <= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
@@ -567,59 +569,59 @@ public class class40 {
       byte[] var1 = new byte[this.field326 * this.field326];
       boolean var2 = false;
       var1 = new byte[this.field326 * this.field326];
-      int var5 = 0;
+      int var3 = 0;
 
-      int var3;
       int var4;
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      int var5;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var5 >= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[7][0] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var5 >= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[7][1] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 >= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+         for (var5 = this.field326 - 1; var5 >= 0; --var5) {
+            if (var5 >= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[7][2] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 >= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = this.field326 - 1; var5 >= 0; --var5) {
+            if (var5 >= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
@@ -642,58 +644,58 @@ public class class40 {
       int[] var5 = Players.Players_indices;
 
       int var6;
-      for(var6 = 0; var6 < var4; ++var6) {
-         if(var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) {
+      for (var6 = 0; var6 < var4; ++var6) {
+         if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) {
             WorldMapCacheName.addPlayerToScene(Client.players[var5[var6]], true);
          }
       }
 
       BufferedSource.method3423(false);
 
-      for(Projectile var20 = (Projectile)Client.projectiles.last(); var20 != null; var20 = (Projectile)Client.projectiles.previous()) {
-         if(var20.plane == SoundSystem.plane && Client.cycle <= var20.cycleEnd) {
-            if(Client.cycle >= var20.cycleStart) {
-               if(var20.targetIndex > 0) {
-                  Npc var22 = Client.npcs[var20.targetIndex - 1];
-                  if(var22 != null && var22.x >= 0 && var22.x < 13312 && var22.y >= 0 && var22.y < 13312) {
-                     var20.setDestination(var22.x, var22.y, class32.getTileHeight(var22.x, var22.y, var20.plane) - var20.endHeight, Client.cycle);
+      for (Projectile var7 = (Projectile)Client.projectiles.last(); var7 != null; var7 = (Projectile)Client.projectiles.previous()) {
+         if (var7.plane == SoundSystem.plane && Client.cycle <= var7.cycleEnd) {
+            if (Client.cycle >= var7.cycleStart) {
+               if (var7.targetIndex > 0) {
+                  NPC var8 = Client.npcs[var7.targetIndex - 1];
+                  if (var8 != null && var8.x >= 0 && var8.x < 13312 && var8.y >= 0 && var8.y < 13312) {
+                     var7.setDestination(var8.x, var8.y, class32.getTileHeight(var8.x, var8.y, var7.plane) - var7.endHeight, Client.cycle);
                   }
                }
 
-               if(var20.targetIndex < 0) {
-                  var6 = -var20.targetIndex - 1;
+               if (var7.targetIndex < 0) {
+                  var6 = -var7.targetIndex - 1;
                   Player var23;
-                  if(var6 == Client.localPlayerIndex) {
+                  if (var6 == Client.localPlayerIndex) {
                      var23 = Canvas.localPlayer;
                   } else {
                      var23 = Client.players[var6];
                   }
 
-                  if(var23 != null && var23.x >= 0 && var23.x < 13312 && var23.y >= 0 && var23.y < 13312) {
-                     var20.setDestination(var23.x, var23.y, class32.getTileHeight(var23.x, var23.y, var20.plane) - var20.endHeight, Client.cycle);
+                  if (var23 != null && var23.x >= 0 && var23.x < 13312 && var23.y >= 0 && var23.y < 13312) {
+                     var7.setDestination(var23.x, var23.y, class32.getTileHeight(var23.x, var23.y, var7.plane) - var7.endHeight, Client.cycle);
                   }
                }
 
-               var20.advance(Client.__client_gy);
-               class65.scene.__a_239(SoundSystem.plane, (int)var20.x, (int)var20.y, (int)var20.z, 60, var20, var20.yaw, -1L, false);
+               var7.advance(Client.field183);
+               class65.scene.method285(SoundSystem.plane, (int)var7.x, (int)var7.y, (int)var7.z, 60, var7, var7.yaw, -1L, false);
             }
          } else {
-            var20.remove();
+            var7.remove();
          }
       }
 
-      for(GraphicsObject var25 = (GraphicsObject)Client.graphicsObjects.last(); var25 != null; var25 = (GraphicsObject)Client.graphicsObjects.previous()) {
-         if(var25.plane == SoundSystem.plane && !var25.isFinished) {
-            if(Client.cycle >= var25.cycleStart) {
-               var25.advance(Client.__client_gy);
-               if(var25.isFinished) {
-                  var25.remove();
+      for (GraphicsObject var21 = (GraphicsObject)Client.graphicsObjects.last(); var21 != null; var21 = (GraphicsObject)Client.graphicsObjects.previous()) {
+         if (var21.plane == SoundSystem.plane && !var21.isFinished) {
+            if (Client.cycle >= var21.cycleStart) {
+               var21.advance(Client.field183);
+               if (var21.isFinished) {
+                  var21.remove();
                } else {
-                  class65.scene.__a_239(var25.plane, var25.x, var25.y, var25.height, 60, var25, 0, -1L, false);
+                  class65.scene.method285(var21.plane, var21.x, var21.y, var21.height, 60, var21, 0, -1L, false);
                }
             }
          } else {
-            var25.remove();
+            var21.remove();
          }
       }
 
@@ -704,111 +706,111 @@ public class class40 {
       var3 = Client.viewportHeight;
       Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1);
       Rasterizer3D.Rasterizer3D_method1();
-      int var7;
-      int var8;
       int var9;
       int var10;
       int var11;
       int var12;
       int var13;
       int var14;
-      int var21;
-      if(!Client.isCameraLocked) {
+      int var15;
+      int var22;
+      int var24;
+      if (!Client.isCameraLocked) {
          var4 = Client.cameraPitchTarget;
-         if(Client.__client_ik / 256 > var4) {
-            var4 = Client.__client_ik / 256;
+         if (Client.field202 / 256 > var4) {
+            var4 = Client.field202 / 256;
          }
 
-         if(Client.__client_rh[4] && Client.__client_rl[4] + 128 > var4) {
-            var4 = Client.__client_rl[4] + 128;
+         if (Client.field139[4] && Client.field142[4] + 128 > var4) {
+            var4 = Client.field142[4] + 128;
          }
 
-         var21 = Client.minimapOrientation & 2047;
+         var15 = Client.minimapOrientation & 2047;
          var6 = MouseHandler.oculusOrbFocalPointX;
-         var7 = MouseRecorder.__bu_hy;
-         var8 = ScriptEvent.oculusOrbFocalPointY;
+         var22 = MouseRecorder.field566;
+         var24 = ScriptEvent.oculusOrbFocalPointY;
          var9 = var4 * 3 + 600;
          var10 = ScriptEvent.method1176(var9, var3);
          var11 = 2048 - var4 & 2047;
-         var12 = 2048 - var21 & 2047;
+         var12 = 2048 - var15 & 2047;
          var13 = 0;
          var14 = 0;
-         int var15 = var10;
-         int var16;
+         int var16 = var10;
          int var17;
          int var18;
-         if(var11 != 0) {
-            var16 = Rasterizer3D.Rasterizer3D_sine[var11];
-            var17 = Rasterizer3D.Rasterizer3D_cosine[var11];
-            var18 = var14 * var17 - var16 * var10 >> 16;
-            var15 = var17 * var10 + var16 * var14 >> 16;
-            var14 = var18;
+         int var19;
+         if (var11 != 0) {
+            var17 = Rasterizer3D.Rasterizer3D_sine[var11];
+            var18 = Rasterizer3D.Rasterizer3D_cosine[var11];
+            var19 = var14 * var18 - var17 * var10 >> 16;
+            var16 = var18 * var10 + var17 * var14 >> 16;
+            var14 = var19;
          }
 
-         if(var12 != 0) {
-            var16 = Rasterizer3D.Rasterizer3D_sine[var12];
-            var17 = Rasterizer3D.Rasterizer3D_cosine[var12];
-            var18 = var15 * var16 + var17 * var13 >> 16;
-            var15 = var15 * var17 - var16 * var13 >> 16;
-            var13 = var18;
+         if (var12 != 0) {
+            var17 = Rasterizer3D.Rasterizer3D_sine[var12];
+            var18 = Rasterizer3D.Rasterizer3D_cosine[var12];
+            var19 = var16 * var17 + var18 * var13 >> 16;
+            var16 = var16 * var18 - var17 * var13 >> 16;
+            var13 = var19;
          }
 
          WorldMapSection1.cameraX = var6 - var13;
-         GrandExchangeEvents.cameraY = var7 - var14;
-         class11.cameraZ = var8 - var15;
+         GrandExchangeEvents.cameraY = var22 - var14;
+         class11.cameraZ = var24 - var16;
          WorldMapIcon1.cameraPitch = var4;
-         MusicPatchNode.cameraYaw = var21;
-         if(Client.oculusOrbState == 1 && Client.rights >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Canvas.localPlayer.x >> 7 || ScriptEvent.oculusOrbFocalPointY >> 7 != Canvas.localPlayer.y >> 7)) {
-            var16 = Canvas.localPlayer.plane;
-            var17 = (MouseHandler.oculusOrbFocalPointX >> 7) + class50.baseX;
-            var18 = (ScriptEvent.oculusOrbFocalPointY >> 7) + GraphicsObject.baseY;
-            PacketBufferNode var19 = Interpreter.method1915(ClientPacket.__gs_bx, Client.packetWriter.isaacCipher);
-            var19.packetBuffer.writeIntME(Client.__client_il);
-            var19.packetBuffer.writeShortLE(var18);
-            var19.packetBuffer.__ai_315(var16);
-            var19.packetBuffer.writeShort(var17);
-            Client.packetWriter.__q_167(var19);
+         MusicPatchNode.cameraYaw = var15;
+         if (Client.oculusOrbState == 1 && Client.rights >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Canvas.localPlayer.x >> 7 || ScriptEvent.oculusOrbFocalPointY >> 7 != Canvas.localPlayer.y >> 7)) {
+            var17 = Canvas.localPlayer.plane;
+            var18 = (MouseHandler.oculusOrbFocalPointX >> 7) + class50.baseX;
+            var19 = (ScriptEvent.oculusOrbFocalPointY >> 7) + GraphicsObject.baseY;
+            PacketBufferNode var20 = Interpreter.method1915(ClientPacket.field283, Client.packetWriter.isaacCipher);
+            var20.packetBuffer.writeIntME(Client.field198);
+            var20.packetBuffer.writeShortLE(var19);
+            var20.packetBuffer.method56(var17);
+            var20.packetBuffer.writeShort(var18);
+            Client.packetWriter.method241(var20);
          }
       }
 
-      if(!Client.isCameraLocked) {
+      if (!Client.isCameraLocked) {
          var4 = UnitPriceComparator.method131();
       } else {
          var4 = Login.method2061();
       }
 
-      var21 = WorldMapSection1.cameraX;
+      var15 = WorldMapSection1.cameraX;
       var6 = GrandExchangeEvents.cameraY;
-      var7 = class11.cameraZ;
-      var8 = WorldMapIcon1.cameraPitch;
+      var22 = class11.cameraZ;
+      var24 = WorldMapIcon1.cameraPitch;
       var9 = MusicPatchNode.cameraYaw;
 
-      for(var10 = 0; var10 < 5; ++var10) {
-         if(Client.__client_rh[var10]) {
-            var11 = (int)(Math.random() * (double)(Client.__client_rd[var10] * 2 + 1) - (double)Client.__client_rd[var10] + Math.sin((double)Client.__client_rk[var10] * ((double)Client.__client_rj[var10] / 100.0D)) * (double)Client.__client_rl[var10]);
-            if(var10 == 0) {
+      for (var10 = 0; var10 < 5; ++var10) {
+         if (Client.field139[var10]) {
+            var11 = (int)(Math.random() * (double)(Client.field141[var10] * 2 + 1) - (double)Client.field141[var10] + Math.sin((double)Client.field144[var10] * ((double)Client.field143[var10] / 100.0D)) * (double)Client.field142[var10]);
+            if (var10 == 0) {
                WorldMapSection1.cameraX += var11;
             }
 
-            if(var10 == 1) {
+            if (var10 == 1) {
                GrandExchangeEvents.cameraY += var11;
             }
 
-            if(var10 == 2) {
+            if (var10 == 2) {
                class11.cameraZ += var11;
             }
 
-            if(var10 == 3) {
+            if (var10 == 3) {
                MusicPatchNode.cameraYaw = var11 + MusicPatchNode.cameraYaw & 2047;
             }
 
-            if(var10 == 4) {
+            if (var10 == 4) {
                WorldMapIcon1.cameraPitch += var11;
-               if(WorldMapIcon1.cameraPitch < 128) {
+               if (WorldMapIcon1.cameraPitch < 128) {
                   WorldMapIcon1.cameraPitch = 128;
                }
 
-               if(WorldMapIcon1.cameraPitch > 383) {
+               if (WorldMapIcon1.cameraPitch > 383) {
                   WorldMapIcon1.cameraPitch = 383;
                }
             }
@@ -817,12 +819,12 @@ public class class40 {
 
       var10 = MouseHandler.MouseHandler_x;
       var11 = MouseHandler.MouseHandler_y;
-      if(MouseHandler.MouseHandler_lastButton != 0) {
+      if (MouseHandler.MouseHandler_lastButton != 0) {
          var10 = MouseHandler.MouseHandler_lastPressedX;
          var11 = MouseHandler.MouseHandler_lastPressedY;
       }
 
-      if(var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) {
+      if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) {
          var12 = var10 - var0;
          var13 = var11 - var1;
          ViewportMouse.ViewportMouse_x = var12;
@@ -846,36 +848,36 @@ public class class40 {
       class65.scene.clearTempGameObjects();
       UrlRequester.method3258(var0, var1, var2, var3);
       UnitPriceComparator.method136(var0, var1);
-      ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.__client_gy);
-      Client.__client_jc = 0;
+      ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field183);
+      Client.field208 = 0;
       var13 = (Canvas.localPlayer.x >> 7) + class50.baseX;
       var14 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
-      if(var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) {
-         Client.__client_jc = 1;
+      if (var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) {
+         Client.field208 = 1;
       }
 
-      if(var13 >= 3072 && var13 <= 3118 && var14 >= 9492 && var14 <= 9535) {
-         Client.__client_jc = 1;
+      if (var13 >= 3072 && var13 <= 3118 && var14 >= 9492 && var14 <= 9535) {
+         Client.field208 = 1;
       }
 
-      if(Client.__client_jc == 1 && var13 >= 3139 && var13 <= 3199 && var14 >= 3008 && var14 <= 3062) {
-         Client.__client_jc = 0;
+      if (Client.field208 == 1 && var13 >= 3139 && var13 <= 3199 && var14 >= 3008 && var14 <= 3062) {
+         Client.field208 = 0;
       }
 
-      WorldMapSection1.cameraX = var21;
+      WorldMapSection1.cameraX = var15;
       GrandExchangeEvents.cameraY = var6;
-      class11.cameraZ = var7;
-      WorldMapIcon1.cameraPitch = var8;
+      class11.cameraZ = var22;
+      WorldMapIcon1.cameraPitch = var24;
       MusicPatchNode.cameraYaw = var9;
-      if(Client.isLoading) {
-         byte var24 = 0;
-         var14 = var24 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount;
-         if(var14 == 0) {
+      if (Client.isLoading) {
+         byte var25 = 0;
+         var14 = var25 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount;
+         if (var14 == 0) {
             Client.isLoading = false;
          }
       }
 
-      if(Client.isLoading) {
+      if (Client.isLoading) {
          Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0);
          class68.drawLoadingMessage("Loading - please wait.", false);
       }
diff --git a/runescape-client/src/main/java/class48.java b/runescape-client/src/main/java/class48.java
index fbbac8a5e6..802a80da79 100644
--- a/runescape-client/src/main/java/class48.java
+++ b/runescape-client/src/main/java/class48.java
@@ -4,10 +4,6 @@ import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("aa")
 public class class48 {
-   static {
-      ImageIO.setUseCache(false);
-   }
-
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(I)[Lij;",
@@ -23,14 +19,15 @@ public class class48 {
       garbageValue = "643714573"
    )
    static final void method868() {
-      if(Client.__client_fd > 0) {
+      if (Client.field175 > 0) {
          TextureProvider.method2773();
       } else {
-         Client.timer.__f_454();
+         Client.timer.method330();
          GameShell.updateGameState(40);
-         ClientParameter.__ji_fp = Client.packetWriter.getSocket();
+         ClientParameter.field341 = Client.packetWriter.getSocket();
          Client.packetWriter.removeSocket();
       }
+
    }
 
    @ObfuscatedName("je")
@@ -39,35 +36,34 @@ public class class48 {
       garbageValue = "-1926681563"
    )
    static Widget method869(Widget var0) {
-      Widget var2 = var0;
-      int var3 = WorldMapRegion.method568(class1.getWidgetClickMask(var0));
-      Widget var1;
-      if(var3 == 0) {
-         var1 = null;
+      Widget var1 = var0;
+      int var2 = WorldMapRegion.method568(class1.getWidgetClickMask(var0));
+      Widget var3;
+      if (var2 == 0) {
+         var3 = null;
       } else {
-         int var4 = 0;
-
-         while(true) {
-            if(var4 >= var3) {
-               var1 = var2;
-               break;
+         label29: {
+            for (int var4 = 0; var4 < var2; ++var4) {
+               var1 = Huffman.getWidget(var1.parentId);
+               if (var1 == null) {
+                  var3 = null;
+                  break label29;
+               }
             }
 
-            var2 = Huffman.getWidget(var2.parentId);
-            if(var2 == null) {
-               var1 = null;
-               break;
-            }
-
-            ++var4;
+            var3 = var1;
          }
       }
 
-      Widget var5 = var1;
-      if(var1 == null) {
+      Widget var5 = var3;
+      if (var3 == null) {
          var5 = var0.parent;
       }
 
       return var5;
    }
+
+   static {
+      ImageIO.setUseCache(false);
+   }
 }
diff --git a/runescape-client/src/main/java/class50.java b/runescape-client/src/main/java/class50.java
index b88da2916a..8b2c6cf343 100644
--- a/runescape-client/src/main/java/class50.java
+++ b/runescape-client/src/main/java/class50.java
@@ -7,9 +7,9 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("af")
 public class class50 {
    @ObfuscatedName("m")
-   public static Applet __af_m;
+   public static Applet field1159;
    @ObfuscatedName("f")
-   public static String __af_f;
+   public static String field1160;
    @ObfuscatedName("ei")
    @Export("worldHost")
    static String worldHost;
@@ -20,11 +20,6 @@ public class class50 {
    @Export("baseX")
    static int baseX;
 
-   static {
-      __af_m = null;
-      __af_f = "";
-   }
-
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(IB)Lio;",
@@ -33,13 +28,13 @@ public class class50 {
    @Export("getSpotAnimationDefinition")
    public static SpotAnimationDefinition getSpotAnimationDefinition(int var0) {
       SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
          byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_indexCache.takeRecord(13, var0);
          var1 = new SpotAnimationDefinition();
          var1.id = var0;
-         if(var2 != null) {
+         if (var2 != null) {
             var1.read(new Buffer(var2));
          }
 
@@ -56,18 +51,18 @@ public class class50 {
    @Export("getObjectDefinition")
    public static ObjectDefinition getObjectDefinition(int var0) {
       ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
          byte[] var2 = ObjectDefinition.ObjectDefinition_indexCache.takeRecord(6, var0);
          var1 = new ObjectDefinition();
          var1.id = var0;
-         if(var2 != null) {
+         if (var2 != null) {
             var1.read(new Buffer(var2));
          }
 
          var1.init();
-         if(var1.isSolid) {
+         if (var1.isSolid) {
             var1.interactType = 0;
             var1.boolean1 = false;
          }
@@ -87,18 +82,77 @@ public class class50 {
       Client.isInInstance = var0;
       int var2;
       int var3;
+      int var4;
       int var5;
       int var6;
       int var7;
-      int var8;
-      if(!Client.isInInstance) {
-         var2 = var1.__bm_326();
-         var3 = var1.__bu_325();
-         int var4 = var1.__ag_302();
+      if (!Client.isInInstance) {
+         var2 = var1.method67();
+         var3 = var1.method66();
+         int var8 = var1.method43();
+         class190.xteaKeys = new int[var8][4];
+
+         for (var4 = 0; var4 < var8; ++var4) {
+            for (var5 = 0; var5 < 4; ++var5) {
+               class190.xteaKeys[var4][var5] = var1.readInt();
+            }
+         }
+
+         class308.regions = new int[var8];
+         IndexCacheLoader.regionMapArchiveIds = new int[var8];
+         MouseHandler.regionLandArchiveIds = new int[var8];
+         class40.regionLandArchives = new byte[var8][];
+         HealthBarUpdate.regionMapArchives = new byte[var8][];
+         boolean var9 = false;
+         if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) {
+            var9 = true;
+         }
+
+         if (var3 / 8 == 48 && var2 / 8 == 148) {
+            var9 = true;
+         }
+
+         var8 = 0;
+
+         for (var5 = (var3 - 6) / 8; var5 <= (var3 + 6) / 8; ++var5) {
+            for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) {
+               var7 = var6 + (var5 << 8);
+               if (!var9 || var6 != 49 && var6 != 149 && var6 != 147 && var5 != 50 && (var5 != 49 || var6 != 47)) {
+                  class308.regions[var8] = var7;
+                  IndexCacheLoader.regionMapArchiveIds[var8] = SecureRandomFuture.indexCache5.getArchiveId("m" + var5 + "_" + var6);
+                  MouseHandler.regionLandArchiveIds[var8] = SecureRandomFuture.indexCache5.getArchiveId("l" + var5 + "_" + var6);
+                  ++var8;
+               }
+            }
+         }
+
+         DynamicObject.method2224(var3, var2, true);
+      } else {
+         var2 = var1.method66();
+         var3 = var1.method67();
+         boolean var15 = var1.readUnsignedByte() == 1;
+         var4 = var1.method43();
+         var1.importIndex();
+
+         int var16;
+         for (var5 = 0; var5 < 4; ++var5) {
+            for (var6 = 0; var6 < 13; ++var6) {
+               for (var7 = 0; var7 < 13; ++var7) {
+                  var16 = var1.readBits(1);
+                  if (var16 == 1) {
+                     Client.instanceChunkTemplates[var5][var6][var7] = var1.readBits(26);
+                  } else {
+                     Client.instanceChunkTemplates[var5][var6][var7] = -1;
+                  }
+               }
+            }
+         }
+
+         var1.exportIndex();
          class190.xteaKeys = new int[var4][4];
 
-         for(var5 = 0; var5 < var4; ++var5) {
-            for(var6 = 0; var6 < 4; ++var6) {
+         for (var5 = 0; var5 < var4; ++var5) {
+            for (var6 = 0; var6 < 4; ++var6) {
                class190.xteaKeys[var5][var6] = var1.readInt();
             }
          }
@@ -108,91 +162,32 @@ public class class50 {
          MouseHandler.regionLandArchiveIds = new int[var4];
          class40.regionLandArchives = new byte[var4][];
          HealthBarUpdate.regionMapArchives = new byte[var4][];
-         boolean var16 = false;
-         if((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) {
-            var16 = true;
-         }
-
-         if(var3 / 8 == 48 && var2 / 8 == 148) {
-            var16 = true;
-         }
-
          var4 = 0;
 
-         for(var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) {
-            for(var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) {
-               var8 = var7 + (var6 << 8);
-               if(!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) {
-                  class308.regions[var4] = var8;
-                  IndexCacheLoader.regionMapArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("m" + var6 + "_" + var7);
-                  MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("l" + var6 + "_" + var7);
-                  ++var4;
-               }
-            }
-         }
-
-         DynamicObject.method2224(var3, var2, true);
-      } else {
-         var2 = var1.__bu_325();
-         var3 = var1.__bm_326();
-         boolean var15 = var1.readUnsignedByte() == 1;
-         var5 = var1.__ag_302();
-         var1.importIndex();
-
-         int var9;
-         for(var6 = 0; var6 < 4; ++var6) {
-            for(var7 = 0; var7 < 13; ++var7) {
-               for(var8 = 0; var8 < 13; ++var8) {
-                  var9 = var1.readBits(1);
-                  if(var9 == 1) {
-                     Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26);
-                  } else {
-                     Client.instanceChunkTemplates[var6][var7][var8] = -1;
-                  }
-               }
-            }
-         }
-
-         var1.exportIndex();
-         class190.xteaKeys = new int[var5][4];
-
-         for(var6 = 0; var6 < var5; ++var6) {
-            for(var7 = 0; var7 < 4; ++var7) {
-               class190.xteaKeys[var6][var7] = var1.readInt();
-            }
-         }
-
-         class308.regions = new int[var5];
-         IndexCacheLoader.regionMapArchiveIds = new int[var5];
-         MouseHandler.regionLandArchiveIds = new int[var5];
-         class40.regionLandArchives = new byte[var5][];
-         HealthBarUpdate.regionMapArchives = new byte[var5][];
-         var5 = 0;
-
-         for(var6 = 0; var6 < 4; ++var6) {
-            for(var7 = 0; var7 < 13; ++var7) {
-               for(var8 = 0; var8 < 13; ++var8) {
-                  var9 = Client.instanceChunkTemplates[var6][var7][var8];
-                  if(var9 != -1) {
-                     int var10 = var9 >> 14 & 1023;
-                     int var11 = var9 >> 3 & 2047;
+         for (var5 = 0; var5 < 4; ++var5) {
+            for (var6 = 0; var6 < 13; ++var6) {
+               for (var7 = 0; var7 < 13; ++var7) {
+                  var16 = Client.instanceChunkTemplates[var5][var6][var7];
+                  if (var16 != -1) {
+                     int var10 = var16 >> 14 & 1023;
+                     int var11 = var16 >> 3 & 2047;
                      int var12 = (var10 / 8 << 8) + var11 / 8;
 
                      int var13;
-                     for(var13 = 0; var13 < var5; ++var13) {
-                        if(class308.regions[var13] == var12) {
+                     for (var13 = 0; var13 < var4; ++var13) {
+                        if (class308.regions[var13] == var12) {
                            var12 = -1;
                            break;
                         }
                      }
 
-                     if(var12 != -1) {
-                        class308.regions[var5] = var12;
+                     if (var12 != -1) {
+                        class308.regions[var4] = var12;
                         var13 = var12 >> 8 & 255;
                         int var14 = var12 & 255;
-                        IndexCacheLoader.regionMapArchiveIds[var5] = SecureRandomFuture.indexCache5.getArchiveId("m" + var13 + "_" + var14);
-                        MouseHandler.regionLandArchiveIds[var5] = SecureRandomFuture.indexCache5.getArchiveId("l" + var13 + "_" + var14);
-                        ++var5;
+                        IndexCacheLoader.regionMapArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("m" + var13 + "_" + var14);
+                        MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("l" + var13 + "_" + var14);
+                        ++var4;
                      }
                   }
                }
@@ -214,19 +209,19 @@ public class class50 {
       short[] var2 = new short[16];
       int var3 = 0;
 
-      for(int var4 = 0; var4 < class83.__cm_e; ++var4) {
+      for (int var4 = 0; var4 < class83.field1167; ++var4) {
          ItemDefinition var5 = Skills.getItemDefinition(var4);
-         if((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) {
-            if(var3 >= 250) {
-               WorldMapSection0.__y_sn = -1;
-               AttackOption.__cj_sp = null;
+         if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) {
+            if (var3 >= 250) {
+               WorldMapSection0.field1055 = -1;
+               AttackOption.field30 = null;
                return;
             }
 
-            if(var3 >= var2.length) {
+            if (var3 >= var2.length) {
                short[] var6 = new short[var2.length * 2];
 
-               for(int var7 = 0; var7 < var3; ++var7) {
+               for (int var7 = 0; var7 < var3; ++var7) {
                   var6[var7] = var2[var7];
                }
 
@@ -237,16 +232,16 @@ public class class50 {
          }
       }
 
-      AttackOption.__cj_sp = var2;
-      class231.__hb_sg = 0;
-      WorldMapSection0.__y_sn = var3;
-      String[] var8 = new String[WorldMapSection0.__y_sn];
+      AttackOption.field30 = var2;
+      class231.field1139 = 0;
+      WorldMapSection0.field1055 = var3;
+      String[] var8 = new String[WorldMapSection0.field1055];
 
-      for(int var9 = 0; var9 < WorldMapSection0.__y_sn; ++var9) {
+      for (int var9 = 0; var9 < WorldMapSection0.field1055; ++var9) {
          var8[var9] = Skills.getItemDefinition(var2[var9]).name;
       }
 
-      Huffman.method3695(var8, AttackOption.__cj_sp);
+      Huffman.method3695(var8, AttackOption.field30);
    }
 
    @ObfuscatedName("kk")
@@ -255,10 +250,15 @@ public class class50 {
       garbageValue = "-522943529"
    )
    static void method902(byte[] var0, int var1) {
-      if(Client.__client_ev == null) {
-         Client.__client_ev = new byte[24];
+      if (Client.field172 == null) {
+         Client.field172 = new byte[24];
       }
 
-      class212.method4109(var0, var1, Client.__client_ev, 0, 24);
+      class212.method4109(var0, var1, Client.field172, 0, 24);
+   }
+
+   static {
+      field1159 = null;
+      field1160 = "";
    }
 }
diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java
index 75a8e68f79..e4f0932858 100644
--- a/runescape-client/src/main/java/class54.java
+++ b/runescape-client/src/main/java/class54.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
@@ -9,7 +8,7 @@ public final class class54 {
    @ObfuscatedGetter(
       intValue = -1247107945
    )
-   static int __bs_nb;
+   static int field1161;
 
    @ObfuscatedName("q")
    @ObfuscatedSignature(
@@ -18,7 +17,7 @@ public final class class54 {
    )
    static int method1086(int var0, int var1) {
       long var2 = (long)((var0 << 16) + var1);
-      return ModelData0.NetCache_currentResponse != null && var2 == ModelData0.NetCache_currentResponse.key?class22.NetCache_responseArchiveBuffer.index * 99 / (class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding) + 1:0;
+      return ModelData0.NetCache_currentResponse != null && var2 == ModelData0.NetCache_currentResponse.key ? class22.NetCache_responseArchiveBuffer.index * 99 / (class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding) + 1 : 0;
    }
 
    @ObfuscatedName("q")
@@ -36,129 +35,43 @@ public final class class54 {
       garbageValue = "-603753561"
    )
    static void method1092(GameShell var0) {
-      int var3;
-      int var15;
-      if(Login.worldSelectOpen) {
-         while(true) {
-            if(!Decimator.method2490()) {
-               if(MouseHandler.MouseHandler_lastButton != 1 && (AbstractRasterProvider.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) {
-                  break;
-               }
-
-               int var1 = Login.xPadding + 280;
-               if(MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(0, 0);
-                  break;
-               }
-
-               if(MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(0, 1);
-                  break;
-               }
-
-               int var2 = Login.xPadding + 390;
-               if(MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(1, 0);
-                  break;
-               }
-
-               if(MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(1, 1);
-                  break;
-               }
-
-               var3 = Login.xPadding + 500;
-               if(MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(2, 0);
-                  break;
-               }
-
-               if(MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(2, 1);
-                  break;
-               }
-
-               var15 = Login.xPadding + 610;
-               if(MouseHandler.MouseHandler_lastPressedX >= var15 && MouseHandler.MouseHandler_lastPressedX <= var15 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(3, 0);
-                  break;
-               }
-
-               if(MouseHandler.MouseHandler_lastPressedX >= var15 + 15 && MouseHandler.MouseHandler_lastPressedX <= var15 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(3, 1);
-                  break;
-               }
-
-               if(MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) {
-                  FontName.closeWorldSelect();
-                  break;
-               }
-
-               if(Login.hoveredWorldIndex != -1) {
-                  World var13 = ItemContainer.worlds[Login.hoveredWorldIndex];
-                  class31.changeWorld(var13);
-                  FontName.closeWorldSelect();
-               } else {
-                  if(Login.worldSelectPage > 0 && SecureRandomFuture.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= SecureRandomFuture.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) {
-                     --Login.worldSelectPage;
-                  }
-
-                  if(Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= SoundCache.canvasWidth - NetSocket.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= SoundCache.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) {
-                     ++Login.worldSelectPage;
-                  }
-               }
-               break;
-            }
-
-            if(IndexStoreAction.__ik_cn == 13) {
-               FontName.closeWorldSelect();
-               break;
-            }
-
-            if(IndexStoreAction.__ik_cn == 96) {
-               if(Login.worldSelectPage > 0 && SecureRandomFuture.worldSelectLeftSprite != null) {
-                  --Login.worldSelectPage;
-               }
-            } else if(IndexStoreAction.__ik_cn == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null) {
-               ++Login.worldSelectPage;
-            }
-         }
-
-      } else {
-         if((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) {
+      int var1;
+      int var2;
+      if (!Login.worldSelectOpen) {
+         if ((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) {
             ReflectionCheck.clientPreferences.titleMusicDisabled = !ReflectionCheck.clientPreferences.titleMusicDisabled;
             WorldMapSection0.savePreferences();
-            if(!ReflectionCheck.clientPreferences.titleMusicDisabled) {
+            if (!ReflectionCheck.clientPreferences.titleMusicDisabled) {
                class204.method4011(UserComparator3.indexCache6, "scape main", "", 255, false);
             } else {
                class214.midiPcmStream.clear();
-               class214.__hf_o = 1;
-               class214.__hf_u = null;
+               class214.field1129 = 1;
+               class214.field1130 = null;
             }
          }
 
-         if(Client.gameState != 5) {
-            if(-1L == Login.__cu_bi) {
-               Login.__cu_bi = class203.currentTimeMs() + 1000L;
+         if (Client.gameState != 5) {
+            if (-1L == Login.field471) {
+               Login.field471 = class203.currentTimeMs() + 1000L;
             }
 
-            long var11 = class203.currentTimeMs();
-            if(AbstractIndexCache.method4585() && -1L == Login.__cu_bz) {
-               Login.__cu_bz = var11;
-               if(Login.__cu_bz > Login.__cu_bi) {
-                  Login.__cu_bi = Login.__cu_bz;
+            long var15 = class203.currentTimeMs();
+            if (AbstractIndexCache.method4585() && -1L == Login.field472) {
+               Login.field472 = var15;
+               if (Login.field472 > Login.field471) {
+                  Login.field471 = Login.field472;
                }
             }
 
-            if(Client.gameState == 10 || Client.gameState == 11) {
-               if(Client.language == 0) {
-                  if(MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) {
-                     var3 = Login.xPadding + 5;
-                     short var4 = 463;
-                     byte var5 = 100;
-                     byte var6 = 35;
-                     if(MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + var5 && MouseHandler.MouseHandler_lastPressedY >= var4 && MouseHandler.MouseHandler_lastPressedY <= var6 + var4) {
-                        if(ClientParameter.loadWorlds()) {
+            if (Client.gameState == 10 || Client.gameState == 11) {
+               if (Client.language == 0) {
+                  if (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) {
+                     var1 = Login.xPadding + 5;
+                     short var16 = 463;
+                     byte var6 = 100;
+                     byte var7 = 35;
+                     if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + var6 && MouseHandler.MouseHandler_lastPressedY >= var16 && MouseHandler.MouseHandler_lastPressedY <= var7 + var16) {
+                        if (ClientParameter.loadWorlds()) {
                            Login.worldSelectOpen = true;
                            Login.worldSelectPage = 0;
                            Login.worldSelectPagesCount = 0;
@@ -168,56 +81,56 @@ public final class class54 {
                      }
                   }
 
-                  if(FriendLoginUpdate.__kn_x != null && ClientParameter.loadWorlds()) {
+                  if (FriendLoginUpdate.field356 != null && ClientParameter.loadWorlds()) {
                      Login.worldSelectOpen = true;
                      Login.worldSelectPage = 0;
                      Login.worldSelectPagesCount = 0;
                   }
                }
 
-               var3 = MouseHandler.MouseHandler_lastButton;
-               var15 = MouseHandler.MouseHandler_lastPressedX;
-               int var16 = MouseHandler.MouseHandler_lastPressedY;
-               if(var3 == 0) {
-                  var15 = MouseHandler.MouseHandler_x;
-                  var16 = MouseHandler.MouseHandler_y;
+               var1 = MouseHandler.MouseHandler_lastButton;
+               var2 = MouseHandler.MouseHandler_lastPressedX;
+               int var17 = MouseHandler.MouseHandler_lastPressedY;
+               if (var1 == 0) {
+                  var2 = MouseHandler.MouseHandler_x;
+                  var17 = MouseHandler.MouseHandler_y;
                }
 
-               if(!AbstractRasterProvider.mouseCam && var3 == 4) {
-                  var3 = 1;
+               if (!AbstractRasterProvider.mouseCam && var1 == 4) {
+                  var1 = 1;
                }
 
-               int var7;
-               short var8;
-               if(Login.loginIndex == 0) {
-                  boolean var17 = false;
+               int var18;
+               short var19;
+               if (Login.loginIndex == 0) {
+                  boolean var8 = false;
 
-                  while(Decimator.method2490()) {
-                     if(IndexStoreAction.__ik_cn == 84) {
-                        var17 = true;
+                  while (Decimator.method2490()) {
+                     if (IndexStoreAction.field411 == 84) {
+                        var8 = true;
                      }
                   }
 
-                  var7 = Varps.loginBoxCenter - 80;
-                  var8 = 291;
-                  if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
+                  var18 = Varps.loginBoxCenter - 80;
+                  var19 = 291;
+                  if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) {
                      WorldMapCacheName.method635(Message.method1227("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false);
                   }
 
-                  var7 = Varps.loginBoxCenter + 80;
-                  if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20 || var17) {
-                     if((Client.worldProperties & 0x2000000) != 0) {
+                  var18 = Varps.loginBoxCenter + 80;
+                  if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20 || var8) {
+                     if ((Client.worldProperties & 33554432) != 0) {
                         Login.Login_response0 = "";
                         Login.Login_response1 = "This is a <col=00ffff>Beta<col=ffffff> world.";
                         Login.Login_response2 = "Your normal account will not be affected.";
                         Login.Login_response3 = "";
                         Login.loginIndex = 1;
                         class196.method3740();
-                     } else if((Client.worldProperties & 4) != 0) {
-                        if((Client.worldProperties & 1024) != 0) {
+                     } else if ((Client.worldProperties & 4) != 0) {
+                        if ((Client.worldProperties & 1024) != 0) {
                            Login.Login_response1 = "This is a <col=ffff00>High Risk <col=ff0000>PvP<col=ffffff> world.";
                            Login.Login_response2 = "Players can attack each other almost everywhere";
-                           Login.Login_response3 = "and the Protect Item prayer won\'t work.";
+                           Login.Login_response3 = "and the Protect Item prayer won't work.";
                         } else {
                            Login.Login_response1 = "This is a <col=ff0000>PvP<col=ffffff> world.";
                            Login.Login_response2 = "Players can attack each other";
@@ -227,7 +140,7 @@ public final class class54 {
                         Login.Login_response0 = "Warning!";
                         Login.loginIndex = 1;
                         class196.method3740();
-                     } else if((Client.worldProperties & 1024) != 0) {
+                     } else if ((Client.worldProperties & 1024) != 0) {
                         Login.Login_response1 = "This is a <col=ffff00>High Risk<col=ffffff> world.";
                         Login.Login_response2 = "The Protect Item prayer will";
                         Login.Login_response3 = "not work on this world.";
@@ -239,30 +152,30 @@ public final class class54 {
                      }
                   }
                } else {
-                  int var18;
-                  short var20;
-                  if(Login.loginIndex != 1) {
-                     boolean var9;
-                     int var10;
-                     short var19;
-                     if(Login.loginIndex == 2) {
-                        var19 = 201;
-                        var18 = var19 + 52;
-                        if(var3 == 1 && var16 >= var18 - 12 && var16 < var18 + 2) {
+                  short var9;
+                  int var20;
+                  if (Login.loginIndex != 1) {
+                     boolean var10;
+                     int var11;
+                     short var12;
+                     if (Login.loginIndex == 2) {
+                        var12 = 201;
+                        var20 = var12 + 52;
+                        if (var1 == 1 && var17 >= var20 - 12 && var17 < var20 + 2) {
                            Login.currentLoginField = 0;
                         }
 
-                        var18 += 15;
-                        if(var3 == 1 && var16 >= var18 - 12 && var16 < var18 + 2) {
+                        var20 += 15;
+                        if (var1 == 1 && var17 >= var20 - 12 && var17 < var20 + 2) {
                            Login.currentLoginField = 1;
                         }
 
-                        var18 += 15;
-                        var19 = 361;
-                        if(TilePaint.__eb_ah != null) {
-                           var7 = TilePaint.__eb_ah.__q / 2;
-                           if(var3 == 1 && var15 >= TilePaint.__eb_ah.__m - var7 && var15 <= var7 + TilePaint.__eb_ah.__m && var16 >= var19 - 15 && var16 < var19) {
-                              switch(Login.__cu_ac) {
+                        var20 += 15;
+                        var12 = 361;
+                        if (TilePaint.field907 != null) {
+                           var18 = TilePaint.field907.field43 / 2;
+                           if (var1 == 1 && var2 >= TilePaint.field907.field41 - var18 && var2 <= var18 + TilePaint.field907.field41 && var17 >= var12 - 15 && var17 < var12) {
+                              switch(Login.field467) {
                               case 1:
                                  method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
                                  Login.loginIndex = 5;
@@ -273,16 +186,16 @@ public final class class54 {
                            }
                         }
 
-                        var7 = Varps.loginBoxCenter - 80;
-                        var8 = 321;
-                        if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
+                        var18 = Varps.loginBoxCenter - 80;
+                        var19 = 321;
+                        if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) {
                            Login.Login_username = Login.Login_username.trim();
-                           if(Login.Login_username.length() == 0) {
+                           if (Login.Login_username.length() == 0) {
                               method1089("", "Please enter your username/email address.", "");
                               return;
                            }
 
-                           if(Login.Login_password.length() == 0) {
+                           if (Login.Login_password.length() == 0) {
                               method1089("", "Please enter your password.", "");
                               return;
                            }
@@ -293,33 +206,33 @@ public final class class54 {
                            return;
                         }
 
-                        var7 = Login.loginBoxX + 180 + 80;
-                        if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
+                        var18 = Login.loginBoxX + 180 + 80;
+                        if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) {
                            Login.loginIndex = 0;
                            Login.Login_username = "";
                            Login.Login_password = "";
                            class13.otpInt = 0;
                            Login.otp = "";
-                           Login.__cu_ba = true;
+                           Login.field470 = true;
                         }
 
-                        var7 = Varps.loginBoxCenter + -117;
-                        var8 = 277;
-                        Login.__cu_aa = var15 >= var7 && var15 < var7 + class168.optionButtonSpriteSubWidth && var16 >= var8 && var16 < var8 + GroundItemPile.optionButtonSpriteSubHeight;
-                        if(var3 == 1 && Login.__cu_aa) {
+                        var18 = Varps.loginBoxCenter + -117;
+                        var19 = 277;
+                        Login.field468 = var2 >= var18 && var2 < var18 + class168.optionButtonSpriteSubWidth && var17 >= var19 && var17 < var19 + GroundItemPile.optionButtonSpriteSubHeight;
+                        if (var1 == 1 && Login.field468) {
                            Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered;
-                           if(!Client.Login_isUsernameRemembered && ReflectionCheck.clientPreferences.rememberedUsername != null) {
+                           if (!Client.Login_isUsernameRemembered && ReflectionCheck.clientPreferences.rememberedUsername != null) {
                               ReflectionCheck.clientPreferences.rememberedUsername = null;
                               WorldMapSection0.savePreferences();
                            }
                         }
 
-                        var7 = Varps.loginBoxCenter + 24;
-                        var8 = 277;
-                        Login.__cu_ax = var15 >= var7 && var15 < var7 + class168.optionButtonSpriteSubWidth && var16 >= var8 && var16 < var8 + GroundItemPile.optionButtonSpriteSubHeight;
-                        if(var3 == 1 && Login.__cu_ax) {
+                        var18 = Varps.loginBoxCenter + 24;
+                        var19 = 277;
+                        Login.field469 = var2 >= var18 && var2 < var18 + class168.optionButtonSpriteSubWidth && var17 >= var19 && var17 < var19 + GroundItemPile.optionButtonSpriteSubHeight;
+                        if (var1 == 1 && Login.field469) {
                            ReflectionCheck.clientPreferences.hideUsername = !ReflectionCheck.clientPreferences.hideUsername;
-                           if(!ReflectionCheck.clientPreferences.hideUsername) {
+                           if (!ReflectionCheck.clientPreferences.hideUsername) {
                               Login.Login_username = "";
                               ReflectionCheck.clientPreferences.rememberedUsername = null;
                               class196.method3740();
@@ -328,53 +241,53 @@ public final class class54 {
                            WorldMapSection0.savePreferences();
                         }
 
-                        while(true) {
-                           while(Decimator.method2490()) {
-                              var9 = false;
+                        while (true) {
+                           while (Decimator.method2490()) {
+                              var10 = false;
 
-                              for(var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".length(); ++var10) {
-                                 if(GzipDecompressor.__go_ck == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".charAt(var10)) {
-                                    var9 = true;
+                              for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) {
+                                 if (GzipDecompressor.field378 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) {
+                                    var10 = true;
                                     break;
                                  }
                               }
 
-                              if(IndexStoreAction.__ik_cn == 13) {
+                              if (IndexStoreAction.field411 == 13) {
                                  Login.loginIndex = 0;
                                  Login.Login_username = "";
                                  Login.Login_password = "";
                                  class13.otpInt = 0;
                                  Login.otp = "";
-                                 Login.__cu_ba = true;
-                              } else if(Login.currentLoginField == 0) {
-                                 if(IndexStoreAction.__ik_cn == 85 && Login.Login_username.length() > 0) {
+                                 Login.field470 = true;
+                              } else if (Login.currentLoginField == 0) {
+                                 if (IndexStoreAction.field411 == 85 && Login.Login_username.length() > 0) {
                                     Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
                                  }
 
-                                 if(IndexStoreAction.__ik_cn == 84 || IndexStoreAction.__ik_cn == 80) {
+                                 if (IndexStoreAction.field411 == 84 || IndexStoreAction.field411 == 80) {
                                     Login.currentLoginField = 1;
                                  }
 
-                                 if(var9 && Login.Login_username.length() < 320) {
-                                    Login.Login_username = Login.Login_username + GzipDecompressor.__go_ck;
+                                 if (var10 && Login.Login_username.length() < 320) {
+                                    Login.Login_username = Login.Login_username + GzipDecompressor.field378;
                                  }
-                              } else if(Login.currentLoginField == 1) {
-                                 if(IndexStoreAction.__ik_cn == 85 && Login.Login_password.length() > 0) {
+                              } else if (Login.currentLoginField == 1) {
+                                 if (IndexStoreAction.field411 == 85 && Login.Login_password.length() > 0) {
                                     Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1);
                                  }
 
-                                 if(IndexStoreAction.__ik_cn == 84 || IndexStoreAction.__ik_cn == 80) {
+                                 if (IndexStoreAction.field411 == 84 || IndexStoreAction.field411 == 80) {
                                     Login.currentLoginField = 0;
                                  }
 
-                                 if(IndexStoreAction.__ik_cn == 84) {
+                                 if (IndexStoreAction.field411 == 84) {
                                     Login.Login_username = Login.Login_username.trim();
-                                    if(Login.Login_username.length() == 0) {
+                                    if (Login.Login_username.length() == 0) {
                                        method1089("", "Please enter your username/email address.", "");
                                        return;
                                     }
 
-                                    if(Login.Login_password.length() == 0) {
+                                    if (Login.Login_password.length() == 0) {
                                        method1089("", "Please enter your password.", "");
                                        return;
                                     }
@@ -385,36 +298,38 @@ public final class class54 {
                                     return;
                                  }
 
-                                 if(var9 && Login.Login_password.length() < 20) {
-                                    Login.Login_password = Login.Login_password + GzipDecompressor.__go_ck;
+                                 if (var10 && Login.Login_password.length() < 20) {
+                                    Login.Login_password = Login.Login_password + GzipDecompressor.field378;
                                  }
                               }
                            }
 
                            return;
                         }
-                     } else if(Login.loginIndex == 3) {
-                        var18 = Login.loginBoxX + 180;
-                        var20 = 276;
-                        if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+                     }
+
+                     if (Login.loginIndex == 3) {
+                        var20 = Login.loginBoxX + 180;
+                        var9 = 276;
+                        if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
                            MouseHandler.method1084(false);
                         }
 
-                        var18 = Login.loginBoxX + 180;
-                        var20 = 326;
-                        if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+                        var20 = Login.loginBoxX + 180;
+                        var9 = 326;
+                        if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
                            method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
                            Login.loginIndex = 5;
                            return;
                         }
                      } else {
-                        int var22;
-                        if(Login.loginIndex == 4) {
-                           var18 = Login.loginBoxX + 180 - 80;
-                           var20 = 321;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+                        int var13;
+                        if (Login.loginIndex == 4) {
+                           var20 = Login.loginBoxX + 180 - 80;
+                           var9 = 321;
+                           if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
                               Login.otp.trim();
-                              if(Login.otp.length() != 6) {
+                              if (Login.otp.length() != 6) {
                                  method1089("", "Please enter a 6-digit PIN.", "");
                                  return;
                               }
@@ -427,16 +342,16 @@ public final class class54 {
                               return;
                            }
 
-                           if(var3 == 1 && var15 >= Login.loginBoxX + 180 - 9 && var15 <= Login.loginBoxX + 180 + 130 && var16 >= 263 && var16 <= 296) {
-                              Login.__cu_ba = !Login.__cu_ba;
+                           if (var1 == 1 && var2 >= Login.loginBoxX + 180 - 9 && var2 <= Login.loginBoxX + 180 + 130 && var17 >= 263 && var17 <= 296) {
+                              Login.field470 = !Login.field470;
                            }
 
-                           if(var3 == 1 && var15 >= Login.loginBoxX + 180 - 34 && var15 <= Login.loginBoxX + 34 + 180 && var16 >= 351 && var16 <= 363) {
+                           if (var1 == 1 && var2 >= Login.loginBoxX + 180 - 34 && var2 <= Login.loginBoxX + 34 + 180 && var17 >= 351 && var17 <= 363) {
                               WorldMapCacheName.method635(Message.method1227("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false);
                            }
 
-                           var18 = Login.loginBoxX + 180 + 80;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+                           var20 = Login.loginBoxX + 180 + 80;
+                           if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
                               Login.loginIndex = 0;
                               Login.Login_username = "";
                               Login.Login_password = "";
@@ -444,30 +359,30 @@ public final class class54 {
                               Login.otp = "";
                            }
 
-                           while(Decimator.method2490()) {
-                              boolean var21 = false;
+                           while (Decimator.method2490()) {
+                              boolean var14 = false;
 
-                              for(var22 = 0; var22 < "1234567890".length(); ++var22) {
-                                 if(GzipDecompressor.__go_ck == "1234567890".charAt(var22)) {
-                                    var21 = true;
+                              for (var13 = 0; var13 < "1234567890".length(); ++var13) {
+                                 if (GzipDecompressor.field378 == "1234567890".charAt(var13)) {
+                                    var14 = true;
                                     break;
                                  }
                               }
 
-                              if(IndexStoreAction.__ik_cn == 13) {
+                              if (IndexStoreAction.field411 == 13) {
                                  Login.loginIndex = 0;
                                  Login.Login_username = "";
                                  Login.Login_password = "";
                                  class13.otpInt = 0;
                                  Login.otp = "";
                               } else {
-                                 if(IndexStoreAction.__ik_cn == 85 && Login.otp.length() > 0) {
+                                 if (IndexStoreAction.field411 == 85 && Login.otp.length() > 0) {
                                     Login.otp = Login.otp.substring(0, Login.otp.length() - 1);
                                  }
 
-                                 if(IndexStoreAction.__ik_cn == 84) {
+                                 if (IndexStoreAction.field411 == 84) {
                                     Login.otp.trim();
-                                    if(Login.otp.length() != 6) {
+                                    if (Login.otp.length() != 6) {
                                        method1089("", "Please enter a 6-digit PIN.", "");
                                        return;
                                     }
@@ -480,156 +395,222 @@ public final class class54 {
                                     return;
                                  }
 
-                                 if(var21 && Login.otp.length() < 6) {
-                                    Login.otp = Login.otp + GzipDecompressor.__go_ck;
+                                 if (var14 && Login.otp.length() < 6) {
+                                    Login.otp = Login.otp + GzipDecompressor.field378;
                                  }
                               }
                            }
-                        } else if(Login.loginIndex == 5) {
-                           var18 = Login.loginBoxX + 180 - 80;
-                           var20 = 321;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
-                              NpcDefinition.method5162();
+                        } else if (Login.loginIndex == 5) {
+                           var20 = Login.loginBoxX + 180 - 80;
+                           var9 = 321;
+                           if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
+                              NPCDefinition.method5162();
                               return;
                            }
 
-                           var18 = Login.loginBoxX + 180 + 80;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+                           var20 = Login.loginBoxX + 180 + 80;
+                           if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
                               MouseHandler.method1084(true);
                            }
 
-                           var8 = 361;
-                           if(UrlRequester.__eo_ak != null) {
-                              var22 = UrlRequester.__eo_ak.__q / 2;
-                              if(var3 == 1 && var15 >= UrlRequester.__eo_ak.__m - var22 && var15 <= var22 + UrlRequester.__eo_ak.__m && var16 >= var8 - 15 && var16 < var8) {
+                           var19 = 361;
+                           if (UrlRequester.field930 != null) {
+                              var13 = UrlRequester.field930.field43 / 2;
+                              if (var1 == 1 && var2 >= UrlRequester.field930.field41 - var13 && var2 <= var13 + UrlRequester.field930.field41 && var17 >= var19 - 15 && var17 < var19) {
                                  WorldMapCacheName.method635(Message.method1227("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false);
                               }
                            }
 
-                           while(Decimator.method2490()) {
-                              var9 = false;
+                           while (Decimator.method2490()) {
+                              var10 = false;
 
-                              for(var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".length(); ++var10) {
-                                 if(GzipDecompressor.__go_ck == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".charAt(var10)) {
-                                    var9 = true;
+                              for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) {
+                                 if (GzipDecompressor.field378 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) {
+                                    var10 = true;
                                     break;
                                  }
                               }
 
-                              if(IndexStoreAction.__ik_cn == 13) {
+                              if (IndexStoreAction.field411 == 13) {
                                  MouseHandler.method1084(true);
                               } else {
-                                 if(IndexStoreAction.__ik_cn == 85 && Login.Login_username.length() > 0) {
+                                 if (IndexStoreAction.field411 == 85 && Login.Login_username.length() > 0) {
                                     Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
                                  }
 
-                                 if(IndexStoreAction.__ik_cn == 84) {
-                                    NpcDefinition.method5162();
+                                 if (IndexStoreAction.field411 == 84) {
+                                    NPCDefinition.method5162();
                                     return;
                                  }
 
-                                 if(var9 && Login.Login_username.length() < 320) {
-                                    Login.Login_username = Login.Login_username + GzipDecompressor.__go_ck;
+                                 if (var10 && Login.Login_username.length() < 320) {
+                                    Login.Login_username = Login.Login_username + GzipDecompressor.field378;
                                  }
                               }
                            }
-                        } else if(Login.loginIndex == 6) {
-                           while(true) {
-                              do {
-                                 if(!Decimator.method2490()) {
-                                    var19 = 321;
-                                    if(var3 == 1 && var16 >= var19 - 20 && var16 <= var19 + 20) {
-                                       MouseHandler.method1084(true);
+                        } else {
+                           if (Login.loginIndex == 6) {
+                              while (true) {
+                                 do {
+                                    if (!Decimator.method2490()) {
+                                       var12 = 321;
+                                       if (var1 == 1 && var17 >= var12 - 20 && var17 <= var12 + 20) {
+                                          MouseHandler.method1084(true);
+                                       }
+
+                                       return;
                                     }
+                                 } while(IndexStoreAction.field411 != 84 && IndexStoreAction.field411 != 13);
 
-                                    return;
-                                 }
-                              } while(IndexStoreAction.__ik_cn != 84 && IndexStoreAction.__ik_cn != 13);
-
-                              MouseHandler.method1084(true);
-                           }
-                        } else if(Login.loginIndex == 7) {
-                           var18 = Login.loginBoxX + 180 - 80;
-                           var20 = 321;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
-                              WorldMapCacheName.method635(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false);
-                              method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
-                              Login.loginIndex = 6;
-                              return;
+                                 MouseHandler.method1084(true);
+                              }
                            }
 
-                           var18 = Login.loginBoxX + 180 + 80;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
-                              MouseHandler.method1084(true);
-                           }
-                        } else if(Login.loginIndex == 8) {
-                           var18 = Login.loginBoxX + 180 - 80;
-                           var20 = 321;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
-                              WorldMapCacheName.method635("https://www.jagex.com/terms/privacy/#eight", true, false);
-                              method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
-                              Login.loginIndex = 6;
-                              return;
-                           }
+                           if (Login.loginIndex == 7) {
+                              var20 = Login.loginBoxX + 180 - 80;
+                              var9 = 321;
+                              if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
+                                 WorldMapCacheName.method635(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false);
+                                 method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
+                                 Login.loginIndex = 6;
+                                 return;
+                              }
 
-                           var18 = Login.loginBoxX + 180 + 80;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
-                              MouseHandler.method1084(true);
-                           }
-                        } else if(Login.loginIndex == 12) {
-                           String var14 = "";
-                           switch(Login.__cu_aj) {
-                           case 0:
-                              var14 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans";
-                              break;
-                           case 1:
-                              var14 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked";
-                              break;
-                           default:
-                              MouseHandler.method1084(false);
-                           }
+                              var20 = Login.loginBoxX + 180 + 80;
+                              if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
+                                 MouseHandler.method1084(true);
+                              }
+                           } else if (Login.loginIndex == 8) {
+                              var20 = Login.loginBoxX + 180 - 80;
+                              var9 = 321;
+                              if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
+                                 WorldMapCacheName.method635("https://www.jagex.com/terms/privacy/#eight", true, false);
+                                 method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
+                                 Login.loginIndex = 6;
+                                 return;
+                              }
 
-                           var7 = Login.loginBoxX + 180;
-                           var8 = 276;
-                           if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
-                              WorldMapCacheName.method635(var14, true, false);
-                              method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
-                              Login.loginIndex = 6;
-                              return;
-                           }
+                              var20 = Login.loginBoxX + 180 + 80;
+                              if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
+                                 MouseHandler.method1084(true);
+                              }
+                           } else if (Login.loginIndex == 12) {
+                              String var21 = "";
+                              switch(Login.field466) {
+                              case 0:
+                                 var21 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans";
+                                 break;
+                              case 1:
+                                 var21 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked";
+                                 break;
+                              default:
+                                 MouseHandler.method1084(false);
+                              }
 
-                           var7 = Login.loginBoxX + 180;
-                           var8 = 326;
-                           if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
-                              MouseHandler.method1084(false);
+                              var18 = Login.loginBoxX + 180;
+                              var19 = 276;
+                              if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) {
+                                 WorldMapCacheName.method635(var21, true, false);
+                                 method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
+                                 Login.loginIndex = 6;
+                                 return;
+                              }
+
+                              var18 = Login.loginBoxX + 180;
+                              var19 = 326;
+                              if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) {
+                                 MouseHandler.method1084(false);
+                              }
                            }
                         }
                      }
                   } else {
-                     while(Decimator.method2490()) {
-                        if(IndexStoreAction.__ik_cn == 84) {
+                     while (Decimator.method2490()) {
+                        if (IndexStoreAction.field411 == 84) {
                            MouseHandler.method1084(false);
-                        } else if(IndexStoreAction.__ik_cn == 13) {
+                        } else if (IndexStoreAction.field411 == 13) {
                            Login.loginIndex = 0;
                         }
                      }
 
-                     var18 = Varps.loginBoxCenter - 80;
-                     var20 = 321;
-                     if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+                     var20 = Varps.loginBoxCenter - 80;
+                     var9 = 321;
+                     if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
                         MouseHandler.method1084(false);
                      }
 
-                     var18 = Varps.loginBoxCenter + 80;
-                     if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+                     var20 = Varps.loginBoxCenter + 80;
+                     if (var1 == 1 && var2 >= var20 - 75 && var2 <= var20 + 75 && var17 >= var9 - 20 && var17 <= var9 + 20) {
                         Login.loginIndex = 0;
                      }
                   }
                }
+            }
+         }
+      } else {
+         while (true) {
+            if (!Decimator.method2490()) {
+               if (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) {
+                  int var3 = Login.xPadding + 280;
+                  if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                     Interpreter.changeWorldSelectSorting(0, 0);
+                  } else if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                     Interpreter.changeWorldSelectSorting(0, 1);
+                  } else {
+                     int var4 = Login.xPadding + 390;
+                     if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                        Interpreter.changeWorldSelectSorting(1, 0);
+                     } else if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                        Interpreter.changeWorldSelectSorting(1, 1);
+                     } else {
+                        var1 = Login.xPadding + 500;
+                        if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                           Interpreter.changeWorldSelectSorting(2, 0);
+                        } else if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                           Interpreter.changeWorldSelectSorting(2, 1);
+                        } else {
+                           var2 = Login.xPadding + 610;
+                           if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                              Interpreter.changeWorldSelectSorting(3, 0);
+                           } else if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                              Interpreter.changeWorldSelectSorting(3, 1);
+                           } else if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) {
+                              FontName.closeWorldSelect();
+                           } else if (Login.hoveredWorldIndex != -1) {
+                              World var5 = ItemContainer.worlds[Login.hoveredWorldIndex];
+                              class31.changeWorld(var5);
+                              FontName.closeWorldSelect();
+                           } else {
+                              if (Login.worldSelectPage > 0 && SecureRandomFuture.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= SecureRandomFuture.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) {
+                                 --Login.worldSelectPage;
+                              }
 
+                              if (Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= SoundCache.canvasWidth - NetSocket.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= SoundCache.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) {
+                                 ++Login.worldSelectPage;
+                              }
+                           }
+                        }
+                     }
+                  }
+               }
+               break;
+            }
+
+            if (IndexStoreAction.field411 == 13) {
+               FontName.closeWorldSelect();
+               break;
+            }
+
+            if (IndexStoreAction.field411 == 96) {
+               if (Login.worldSelectPage > 0 && SecureRandomFuture.worldSelectLeftSprite != null) {
+                  --Login.worldSelectPage;
+               }
+            } else if (IndexStoreAction.field411 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null) {
+               ++Login.worldSelectPage;
             }
          }
       }
+
    }
 
    @ObfuscatedName("d")
@@ -650,155 +631,155 @@ public final class class54 {
    )
    static int method1093(int var0, Script var1, boolean var2) {
       int var3;
-      if(var0 == 6600) {
+      if (var0 == 6600) {
          var3 = SoundSystem.plane;
-         int var9 = (Canvas.localPlayer.x >> 7) + class50.baseX;
-         int var5 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
-         BufferedFile.worldMap().__a_525(var3, var9, var5, true);
+         int var13 = (Canvas.localPlayer.x >> 7) + class50.baseX;
+         int var16 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
+         BufferedFile.worldMap().method366(var3, var13, var16, true);
          return 1;
       } else {
-         WorldMapArea var11;
-         if(var0 == 6601) {
+         WorldMapArea var4;
+         if (var0 == 6601) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            String var16 = "";
-            var11 = BufferedFile.worldMap().getMapArea(var3);
-            if(var11 != null) {
-               var16 = var11.name();
+            String var14 = "";
+            var4 = BufferedFile.worldMap().getMapArea(var3);
+            if (var4 != null) {
+               var14 = var4.name();
             }
 
-            Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16;
+            Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var14;
             return 1;
-         } else if(var0 == 6602) {
+         } else if (var0 == 6602) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             BufferedFile.worldMap().setCurrentMapAreaId(var3);
             return 1;
-         } else if(var0 == 6603) {
+         } else if (var0 == 6603) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getZoomLevel();
             return 1;
-         } else if(var0 == 6604) {
+         } else if (var0 == 6604) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             BufferedFile.worldMap().setZoomLevel(var3);
             return 1;
-         } else if(var0 == 6605) {
-            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCacheLoaded()?1:0;
+         } else if (var0 == 6605) {
+            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCacheLoaded() ? 1 : 0;
             return 1;
          } else {
-            TileLocation var15;
-            if(var0 == 6606) {
-               var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-               BufferedFile.worldMap().setWorldMapPositionTarget(var15.x, var15.y);
+            TileLocation var5;
+            if (var0 == 6606) {
+               var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+               BufferedFile.worldMap().setWorldMapPositionTarget(var5.x, var5.y);
                return 1;
-            } else if(var0 == 6607) {
-               var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-               BufferedFile.worldMap().__aw_531(var15.x, var15.y);
+            } else if (var0 == 6607) {
+               var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+               BufferedFile.worldMap().method371(var5.x, var5.y);
                return 1;
-            } else if(var0 == 6608) {
-               var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-               BufferedFile.worldMap().__al_532(var15.plane, var15.x, var15.y);
+            } else if (var0 == 6608) {
+               var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+               BufferedFile.worldMap().method372(var5.plane, var5.x, var5.y);
                return 1;
-            } else if(var0 == 6609) {
-               var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-               BufferedFile.worldMap().__ab_533(var15.plane, var15.x, var15.y);
+            } else if (var0 == 6609) {
+               var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+               BufferedFile.worldMap().method373(var5.plane, var5.x, var5.y);
                return 1;
-            } else if(var0 == 6610) {
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__ae_534();
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__at_535();
+            } else if (var0 == 6610) {
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method374();
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method375();
                return 1;
             } else {
-               WorldMapArea var13;
-               if(var0 == 6611) {
+               WorldMapArea var6;
+               if (var0 == 6611) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var13 = BufferedFile.worldMap().getMapArea(var3);
-                  if(var13 == null) {
+                  var6 = BufferedFile.worldMap().getMapArea(var3);
+                  if (var6 == null) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                   } else {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.origin().packed();
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.origin().packed();
                   }
 
                   return 1;
-               } else if(var0 == 6612) {
+               } else if (var0 == 6612) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var13 = BufferedFile.worldMap().getMapArea(var3);
-                  if(var13 == null) {
+                  var6 = BufferedFile.worldMap().getMapArea(var3);
+                  if (var6 == null) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                   } else {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var13.maxX() - var13.minX() + 1) * 64;
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var13.maxY() - var13.minY() + 1) * 64;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var6.maxX() - var6.minX() + 1) * 64;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var6.maxY() - var6.minY() + 1) * 64;
                   }
 
                   return 1;
-               } else if(var0 == 6613) {
+               } else if (var0 == 6613) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var13 = BufferedFile.worldMap().getMapArea(var3);
-                  if(var13 == null) {
+                  var6 = BufferedFile.worldMap().getMapArea(var3);
+                  if (var6 == null) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                   } else {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.minX() * 64;
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.minY() * 64;
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.maxX() * 64 + 64 - 1;
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.maxY() * 64 + 64 - 1;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.minX() * 64;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.minY() * 64;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.maxX() * 64 + 64 - 1;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.maxY() * 64 + 64 - 1;
                   }
 
                   return 1;
-               } else if(var0 == 6614) {
+               } else if (var0 == 6614) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var13 = BufferedFile.worldMap().getMapArea(var3);
-                  if(var13 == null) {
+                  var6 = BufferedFile.worldMap().getMapArea(var3);
+                  if (var6 == null) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                   } else {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.zoom();
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.zoom();
                   }
 
                   return 1;
-               } else if(var0 == 6615) {
-                  var15 = BufferedFile.worldMap().__ad_536();
-                  if(var15 == null) {
+               } else if (var0 == 6615) {
+                  var5 = BufferedFile.worldMap().method376();
+                  if (var5 == null) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                   } else {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.x;
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.y;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var5.x;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var5.y;
                   }
 
                   return 1;
-               } else if(var0 == 6616) {
+               } else if (var0 == 6616) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().currentMapAreaId();
                   return 1;
-               } else if(var0 == 6617) {
-                  var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-                  var13 = BufferedFile.worldMap().getCurrentMapArea();
-                  if(var13 == null) {
+               } else if (var0 == 6617) {
+                  var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+                  var6 = BufferedFile.worldMap().getCurrentMapArea();
+                  if (var6 == null) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                      return 1;
                   } else {
-                     int[] var14 = var13.position(var15.plane, var15.x, var15.y);
-                     if(var14 == null) {
+                     int[] var15 = var6.position(var5.plane, var5.x, var5.y);
+                     if (var15 == null) {
                         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                      } else {
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var14[0];
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var14[1];
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15[0];
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15[1];
                      }
 
                      return 1;
                   }
                } else {
                   TileLocation var7;
-                  if(var0 == 6618) {
-                     var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-                     var13 = BufferedFile.worldMap().getCurrentMapArea();
-                     if(var13 == null) {
+                  if (var0 == 6618) {
+                     var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+                     var6 = BufferedFile.worldMap().getCurrentMapArea();
+                     if (var6 == null) {
                         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                         return 1;
                      } else {
-                        var7 = var13.coord(var15.x, var15.y);
-                        if(var7 == null) {
+                        var7 = var6.coord(var5.x, var5.y);
+                        if (var7 == null) {
                            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                         } else {
                            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.packed();
@@ -807,109 +788,109 @@ public final class class54 {
                         return 1;
                      }
                   } else {
-                     TileLocation var12;
-                     if(var0 == 6619) {
+                     TileLocation var8;
+                     if (var0 == 6619) {
                         RouteStrategy.Interpreter_intStackSize -= 2;
                         var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                        var12 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
-                        TotalQuantityComparator.method96(var3, var12, false);
+                        var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
+                        TotalQuantityComparator.method96(var3, var8, false);
                         return 1;
-                     } else if(var0 == 6620) {
+                     } else if (var0 == 6620) {
                         RouteStrategy.Interpreter_intStackSize -= 2;
                         var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                        var12 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
-                        TotalQuantityComparator.method96(var3, var12, true);
+                        var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
+                        TotalQuantityComparator.method96(var3, var8, true);
                         return 1;
-                     } else if(var0 == 6621) {
+                     } else if (var0 == 6621) {
                         RouteStrategy.Interpreter_intStackSize -= 2;
                         var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                        var12 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
-                        var11 = BufferedFile.worldMap().getMapArea(var3);
-                        if(var11 == null) {
+                        var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
+                        var4 = BufferedFile.worldMap().getMapArea(var3);
+                        if (var4 == null) {
                            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                            return 1;
                         } else {
-                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y)?1:0;
+                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.containsCoord(var8.plane, var8.x, var8.y) ? 1 : 0;
                            return 1;
                         }
-                     } else if(var0 == 6622) {
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__ap_537();
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__as_538();
+                     } else if (var0 == 6622) {
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method377();
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method378();
                         return 1;
-                     } else if(var0 == 6623) {
-                        var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-                        var13 = BufferedFile.worldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y);
-                        if(var13 == null) {
+                     } else if (var0 == 6623) {
+                        var5 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+                        var6 = BufferedFile.worldMap().mapAreaAtCoord(var5.plane, var5.x, var5.y);
+                        if (var6 == null) {
                            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                         } else {
-                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.id();
+                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.id();
                         }
 
                         return 1;
-                     } else if(var0 == 6624) {
-                        BufferedFile.worldMap().__am_539(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+                     } else if (var0 == 6624) {
+                        BufferedFile.worldMap().method379(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
                         return 1;
-                     } else if(var0 == 6625) {
-                        BufferedFile.worldMap().__an_540();
+                     } else if (var0 == 6625) {
+                        BufferedFile.worldMap().method380();
                         return 1;
-                     } else if(var0 == 6626) {
-                        BufferedFile.worldMap().__az_541(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+                     } else if (var0 == 6626) {
+                        BufferedFile.worldMap().method381(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
                         return 1;
-                     } else if(var0 == 6627) {
-                        BufferedFile.worldMap().__au_542();
+                     } else if (var0 == 6627) {
+                        BufferedFile.worldMap().method382();
                         return 1;
                      } else {
-                        boolean var10;
-                        if(var0 == 6628) {
-                           var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                           BufferedFile.worldMap().perpetualFlash(var10);
+                        boolean var9;
+                        if (var0 == 6628) {
+                           var9 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                           BufferedFile.worldMap().perpetualFlash(var9);
                            return 1;
-                        } else if(var0 == 6629) {
+                        } else if (var0 == 6629) {
                            var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                            BufferedFile.worldMap().flashElement(var3);
                            return 1;
-                        } else if(var0 == 6630) {
+                        } else if (var0 == 6630) {
                            var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                            BufferedFile.worldMap().flashCategory(var3);
                            return 1;
-                        } else if(var0 == 6631) {
+                        } else if (var0 == 6631) {
                            BufferedFile.worldMap().stopCurrentFlashes();
                            return 1;
-                        } else if(var0 == 6632) {
-                           var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                           BufferedFile.worldMap().setElementsEnabled(var10);
+                        } else if (var0 == 6632) {
+                           var9 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                           BufferedFile.worldMap().setElementsEnabled(var9);
                            return 1;
                         } else {
-                           boolean var4;
-                           if(var0 == 6633) {
+                           boolean var10;
+                           if (var0 == 6633) {
                               RouteStrategy.Interpreter_intStackSize -= 2;
                               var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                              var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
-                              BufferedFile.worldMap().disableElement(var3, var4);
+                              var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
+                              BufferedFile.worldMap().disableElement(var3, var10);
                               return 1;
-                           } else if(var0 == 6634) {
+                           } else if (var0 == 6634) {
                               RouteStrategy.Interpreter_intStackSize -= 2;
                               var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                              var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
-                              BufferedFile.worldMap().disableCategory(var3, var4);
+                              var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
+                              BufferedFile.worldMap().disableCategory(var3, var10);
                               return 1;
-                           } else if(var0 == 6635) {
-                              Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getElementsEnabled()?1:0;
+                           } else if (var0 == 6635) {
+                              Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getElementsEnabled() ? 1 : 0;
                               return 1;
-                           } else if(var0 == 6636) {
+                           } else if (var0 == 6636) {
                               var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                              Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isElementDisabled(var3)?1:0;
+                              Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isElementDisabled(var3) ? 1 : 0;
                               return 1;
-                           } else if(var0 == 6637) {
+                           } else if (var0 == 6637) {
                               var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                              Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCategoryDisabled(var3)?1:0;
+                              Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCategoryDisabled(var3) ? 1 : 0;
                               return 1;
-                           } else if(var0 == 6638) {
+                           } else if (var0 == 6638) {
                               RouteStrategy.Interpreter_intStackSize -= 2;
                               var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                              var12 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
-                              var7 = BufferedFile.worldMap().__bc_545(var3, var12);
-                              if(var7 == null) {
+                              var8 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
+                              var7 = BufferedFile.worldMap().method385(var3, var8);
+                              if (var7 == null) {
                                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                               } else {
                                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.packed();
@@ -917,73 +898,73 @@ public final class class54 {
 
                               return 1;
                            } else {
-                              AbstractWorldMapIcon var8;
-                              if(var0 == 6639) {
-                                 var8 = BufferedFile.worldMap().iconStart();
-                                 if(var8 == null) {
+                              AbstractWorldMapIcon var11;
+                              if (var0 == 6639) {
+                                 var11 = BufferedFile.worldMap().iconStart();
+                                 if (var11 == null) {
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                  } else {
-                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.__m_15();
-                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.coord2.packed();
+                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.vmethod395();
+                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.coord2.packed();
                                  }
 
                                  return 1;
-                              } else if(var0 == 6640) {
-                                 var8 = BufferedFile.worldMap().iconNext();
-                                 if(var8 == null) {
+                              } else if (var0 == 6640) {
+                                 var11 = BufferedFile.worldMap().iconNext();
+                                 if (var11 == null) {
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                  } else {
-                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.__m_15();
-                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.coord2.packed();
+                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.vmethod395();
+                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.coord2.packed();
                                  }
 
                                  return 1;
                               } else {
-                                 WorldMapElement var6;
-                                 if(var0 == 6693) {
+                                 WorldMapElement var12;
+                                 if (var0 == 6693) {
                                     var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                                    var6 = ViewportMouse.getWorldMapElement(var3);
-                                    if(var6.__l == null) {
+                                    var12 = ViewportMouse.getWorldMapElement(var3);
+                                    if (var12.field1021 == null) {
                                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                                     } else {
-                                       Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.__l;
+                                       Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12.field1021;
                                     }
 
                                     return 1;
-                                 } else if(var0 == 6694) {
+                                 } else if (var0 == 6694) {
                                     var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                                    var6 = ViewportMouse.getWorldMapElement(var3);
-                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.textSize;
+                                    var12 = ViewportMouse.getWorldMapElement(var3);
+                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12.textSize;
                                     return 1;
-                                 } else if(var0 == 6695) {
+                                 } else if (var0 == 6695) {
                                     var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                                    var6 = ViewportMouse.getWorldMapElement(var3);
-                                    if(var6 == null) {
+                                    var12 = ViewportMouse.getWorldMapElement(var3);
+                                    if (var12 == null) {
                                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                     } else {
-                                       Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.category;
+                                       Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12.category;
                                     }
 
                                     return 1;
-                                 } else if(var0 == 6696) {
+                                 } else if (var0 == 6696) {
                                     var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                                    var6 = ViewportMouse.getWorldMapElement(var3);
-                                    if(var6 == null) {
+                                    var12 = ViewportMouse.getWorldMapElement(var3);
+                                    if (var12 == null) {
                                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                     } else {
-                                       Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.sprite1;
+                                       Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12.sprite1;
                                     }
 
                                     return 1;
-                                 } else if(var0 == 6697) {
+                                 } else if (var0 == 6697) {
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class15.worldMapEvent.mapElement;
                                     return 1;
-                                 } else if(var0 == 6698) {
+                                 } else if (var0 == 6698) {
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class15.worldMapEvent.coord1.packed();
                                     return 1;
-                                 } else if(var0 == 6699) {
+                                 } else if (var0 == 6699) {
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class15.worldMapEvent.coord2.packed();
                                     return 1;
                                  } else {
@@ -1012,19 +993,19 @@ public final class class54 {
       int var3;
       int var4;
       int var5;
-      if(Client.oculusOrbState == 0) {
+      if (Client.oculusOrbState == 0) {
          var0 = Canvas.localPlayer.x;
          var1 = Canvas.localPlayer.y;
-         if(MouseHandler.oculusOrbFocalPointX - var0 < -500 || MouseHandler.oculusOrbFocalPointX - var0 > 500 || ScriptEvent.oculusOrbFocalPointY - var1 < -500 || ScriptEvent.oculusOrbFocalPointY - var1 > 500) {
+         if (MouseHandler.oculusOrbFocalPointX - var0 < -500 || MouseHandler.oculusOrbFocalPointX - var0 > 500 || ScriptEvent.oculusOrbFocalPointY - var1 < -500 || ScriptEvent.oculusOrbFocalPointY - var1 > 500) {
             MouseHandler.oculusOrbFocalPointX = var0;
             ScriptEvent.oculusOrbFocalPointY = var1;
          }
 
-         if(var0 != MouseHandler.oculusOrbFocalPointX) {
+         if (var0 != MouseHandler.oculusOrbFocalPointX) {
             MouseHandler.oculusOrbFocalPointX += (var0 - MouseHandler.oculusOrbFocalPointX) / 16;
          }
 
-         if(var1 != ScriptEvent.oculusOrbFocalPointY) {
+         if (var1 != ScriptEvent.oculusOrbFocalPointY) {
             ScriptEvent.oculusOrbFocalPointY += (var1 - ScriptEvent.oculusOrbFocalPointY) / 16;
          }
 
@@ -1033,16 +1014,16 @@ public final class class54 {
          var4 = class32.getTileHeight(MouseHandler.oculusOrbFocalPointX, ScriptEvent.oculusOrbFocalPointY, SoundSystem.plane);
          var5 = 0;
          int var6;
-         if(var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) {
-            for(var6 = var2 - 4; var6 <= var2 + 4; ++var6) {
-               for(int var7 = var3 - 4; var7 <= var3 + 4; ++var7) {
+         if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) {
+            for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) {
+               for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) {
                   int var8 = SoundSystem.plane;
-                  if(var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) {
+                  if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) {
                      ++var8;
                   }
 
                   int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7];
-                  if(var9 > var5) {
+                  if (var9 > var5) {
                      var5 = var9;
                   }
                }
@@ -1050,148 +1031,148 @@ public final class class54 {
          }
 
          var6 = var5 * 192;
-         if(var6 > 98048) {
+         if (var6 > 98048) {
             var6 = 98048;
          }
 
-         if(var6 < 32768) {
+         if (var6 < 32768) {
             var6 = 32768;
          }
 
-         if(var6 > Client.__client_ik) {
-            Client.__client_ik += (var6 - Client.__client_ik) / 24;
-         } else if(var6 < Client.__client_ik) {
-            Client.__client_ik += (var6 - Client.__client_ik) / 80;
+         if (var6 > Client.field202) {
+            Client.field202 += (var6 - Client.field202) / 24;
+         } else if (var6 < Client.field202) {
+            Client.field202 += (var6 - Client.field202) / 80;
          }
 
-         MouseRecorder.__bu_hy = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.cameraFollowHeight;
-      } else if(Client.oculusOrbState == 1) {
-         if(Client.__client_ij && Canvas.localPlayer != null) {
+         MouseRecorder.field566 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.cameraFollowHeight;
+      } else if (Client.oculusOrbState == 1) {
+         if (Client.field199 && Canvas.localPlayer != null) {
             var0 = Canvas.localPlayer.pathX[0];
             var1 = Canvas.localPlayer.pathY[0];
-            if(var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) {
+            if (var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) {
                MouseHandler.oculusOrbFocalPointX = Canvas.localPlayer.x;
                var2 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.cameraFollowHeight;
-               if(var2 < MouseRecorder.__bu_hy) {
-                  MouseRecorder.__bu_hy = var2;
+               if (var2 < MouseRecorder.field566) {
+                  MouseRecorder.field566 = var2;
                }
 
                ScriptEvent.oculusOrbFocalPointY = Canvas.localPlayer.y;
-               Client.__client_ij = false;
+               Client.field199 = false;
             }
          }
 
-         short var10 = -1;
-         if(KeyHandler.KeyHandler_pressedKeys[33]) {
-            var10 = 0;
-         } else if(KeyHandler.KeyHandler_pressedKeys[49]) {
-            var10 = 1024;
+         short var11 = -1;
+         if (KeyHandler.KeyHandler_pressedKeys[33]) {
+            var11 = 0;
+         } else if (KeyHandler.KeyHandler_pressedKeys[49]) {
+            var11 = 1024;
          }
 
-         if(KeyHandler.KeyHandler_pressedKeys[48]) {
-            if(var10 == 0) {
-               var10 = 1792;
-            } else if(var10 == 1024) {
-               var10 = 1280;
+         if (KeyHandler.KeyHandler_pressedKeys[48]) {
+            if (var11 == 0) {
+               var11 = 1792;
+            } else if (var11 == 1024) {
+               var11 = 1280;
             } else {
-               var10 = 1536;
+               var11 = 1536;
             }
-         } else if(KeyHandler.KeyHandler_pressedKeys[50]) {
-            if(var10 == 0) {
-               var10 = 256;
-            } else if(var10 == 1024) {
-               var10 = 768;
+         } else if (KeyHandler.KeyHandler_pressedKeys[50]) {
+            if (var11 == 0) {
+               var11 = 256;
+            } else if (var11 == 1024) {
+               var11 = 768;
             } else {
-               var10 = 512;
+               var11 = 512;
             }
          }
 
-         byte var11 = 0;
-         if(KeyHandler.KeyHandler_pressedKeys[35]) {
-            var11 = -1;
-         } else if(KeyHandler.KeyHandler_pressedKeys[51]) {
-            var11 = 1;
+         byte var10 = 0;
+         if (KeyHandler.KeyHandler_pressedKeys[35]) {
+            var10 = -1;
+         } else if (KeyHandler.KeyHandler_pressedKeys[51]) {
+            var10 = 1;
          }
 
          var2 = 0;
-         if(var10 >= 0 || var11 != 0) {
-            var2 = KeyHandler.KeyHandler_pressedKeys[81]?Client.__client_in:Client.oculusOrbNormalSpeed;
+         if (var11 >= 0 || var10 != 0) {
+            var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.field197 : Client.oculusOrbNormalSpeed;
             var2 *= 16;
-            Client.__client_hk = var10;
-            Client.__client_if = var11;
+            Client.field195 = var11;
+            Client.field196 = var10;
          }
 
-         if(Client.__client_hc < var2) {
-            Client.__client_hc += var2 / 8;
-            if(Client.__client_hc > var2) {
-               Client.__client_hc = var2;
+         if (Client.field194 < var2) {
+            Client.field194 += var2 / 8;
+            if (Client.field194 > var2) {
+               Client.field194 = var2;
             }
-         } else if(Client.__client_hc > var2) {
-            Client.__client_hc = Client.__client_hc * 9 / 10;
+         } else if (Client.field194 > var2) {
+            Client.field194 = Client.field194 * 9 / 10;
          }
 
-         if(Client.__client_hc > 0) {
-            var3 = Client.__client_hc / 16;
-            if(Client.__client_hk >= 0) {
-               var0 = Client.__client_hk - MusicPatchNode.cameraYaw & 2047;
+         if (Client.field194 > 0) {
+            var3 = Client.field194 / 16;
+            if (Client.field195 >= 0) {
+               var0 = Client.field195 - MusicPatchNode.cameraYaw & 2047;
                var4 = Rasterizer3D.Rasterizer3D_sine[var0];
                var5 = Rasterizer3D.Rasterizer3D_cosine[var0];
                MouseHandler.oculusOrbFocalPointX += var3 * var4 / 65536;
                ScriptEvent.oculusOrbFocalPointY += var3 * var5 / 65536;
             }
 
-            if(Client.__client_if != 0) {
-               MouseRecorder.__bu_hy += var3 * Client.__client_if;
-               if(MouseRecorder.__bu_hy > 0) {
-                  MouseRecorder.__bu_hy = 0;
+            if (Client.field196 != 0) {
+               MouseRecorder.field566 += var3 * Client.field196;
+               if (MouseRecorder.field566 > 0) {
+                  MouseRecorder.field566 = 0;
                }
             }
          } else {
-            Client.__client_hk = -1;
-            Client.__client_if = -1;
+            Client.field195 = -1;
+            Client.field196 = -1;
          }
 
-         if(KeyHandler.KeyHandler_pressedKeys[13]) {
-            Client.packetWriter.__q_167(Interpreter.method1915(ClientPacket.__gs_ab, Client.packetWriter.isaacCipher));
+         if (KeyHandler.KeyHandler_pressedKeys[13]) {
+            Client.packetWriter.method241(Interpreter.method1915(ClientPacket.field259, Client.packetWriter.isaacCipher));
             Client.oculusOrbState = 0;
          }
       }
 
-      if(MouseHandler.MouseHandler_currentButton == 4 && AbstractRasterProvider.mouseCam) {
-         var0 = MouseHandler.MouseHandler_y - Client.__client_ht;
-         Client.__client_hu = var0 * 2;
-         Client.__client_ht = var0 != -1 && var0 != 1?(MouseHandler.MouseHandler_y + Client.__client_ht) / 2:MouseHandler.MouseHandler_y;
-         var1 = Client.__client_hi - MouseHandler.MouseHandler_x;
-         Client.__client_hv = var1 * 2;
-         Client.__client_hi = var1 != -1 && var1 != 1?(Client.__client_hi + MouseHandler.MouseHandler_x) / 2:MouseHandler.MouseHandler_x;
+      if (MouseHandler.MouseHandler_currentButton == 4 && AbstractRasterProvider.mouseCam) {
+         var0 = MouseHandler.MouseHandler_y - Client.field193;
+         Client.field191 = var0 * 2;
+         Client.field193 = var0 != -1 && var0 != 1 ? (MouseHandler.MouseHandler_y + Client.field193) / 2 : MouseHandler.MouseHandler_y;
+         var1 = Client.field192 - MouseHandler.MouseHandler_x;
+         Client.field190 = var1 * 2;
+         Client.field192 = var1 != -1 && var1 != 1 ? (Client.field192 + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x;
       } else {
-         if(KeyHandler.KeyHandler_pressedKeys[96]) {
-            Client.__client_hv += (-24 - Client.__client_hv) / 2;
-         } else if(KeyHandler.KeyHandler_pressedKeys[97]) {
-            Client.__client_hv += (24 - Client.__client_hv) / 2;
+         if (KeyHandler.KeyHandler_pressedKeys[96]) {
+            Client.field190 += (-24 - Client.field190) / 2;
+         } else if (KeyHandler.KeyHandler_pressedKeys[97]) {
+            Client.field190 += (24 - Client.field190) / 2;
          } else {
-            Client.__client_hv /= 2;
+            Client.field190 /= 2;
          }
 
-         if(KeyHandler.KeyHandler_pressedKeys[98]) {
-            Client.__client_hu += (12 - Client.__client_hu) / 2;
-         } else if(KeyHandler.KeyHandler_pressedKeys[99]) {
-            Client.__client_hu += (-12 - Client.__client_hu) / 2;
+         if (KeyHandler.KeyHandler_pressedKeys[98]) {
+            Client.field191 += (12 - Client.field191) / 2;
+         } else if (KeyHandler.KeyHandler_pressedKeys[99]) {
+            Client.field191 += (-12 - Client.field191) / 2;
          } else {
-            Client.__client_hu /= 2;
+            Client.field191 /= 2;
          }
 
-         Client.__client_ht = MouseHandler.MouseHandler_y;
-         Client.__client_hi = MouseHandler.MouseHandler_x;
+         Client.field193 = MouseHandler.MouseHandler_y;
+         Client.field192 = MouseHandler.MouseHandler_x;
       }
 
-      Client.minimapOrientation = Client.__client_hv / 2 + Client.minimapOrientation & 2047;
-      Client.cameraPitchTarget += Client.__client_hu / 2;
-      if(Client.cameraPitchTarget < 128) {
+      Client.minimapOrientation = Client.field190 / 2 + Client.minimapOrientation & 2047;
+      Client.cameraPitchTarget += Client.field191 / 2;
+      if (Client.cameraPitchTarget < 128) {
          Client.cameraPitchTarget = 128;
       }
 
-      if(Client.cameraPitchTarget > 383) {
+      if (Client.cameraPitchTarget > 383) {
          Client.cameraPitchTarget = 383;
       }
 
diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java
index 9eeaa4ca44..1fe5e4fdba 100644
--- a/runescape-client/src/main/java/class60.java
+++ b/runescape-client/src/main/java/class60.java
@@ -12,7 +12,7 @@ public class class60 {
    @Export("worldMap0")
    static WorldMap worldMap0;
    @ObfuscatedName("ar")
-   static FontMetrics __bo_ar;
+   static FontMetrics field1162;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -20,8 +20,8 @@ public class class60 {
       garbageValue = "1583108922"
    )
    public static void method1172(AbstractIndexCache var0, AbstractIndexCache var1, AbstractIndexCache var2) {
-      HitSplatDefinition.__jm_m = var0;
-      HitSplatDefinition.__jm_f = var1;
-      HitSplatDefinition.__jm_q = var2;
+      HitSplatDefinition.field382 = var0;
+      HitSplatDefinition.field383 = var1;
+      HitSplatDefinition.field384 = var2;
    }
 }
diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java
index 9f33160c98..9d498f0f79 100644
--- a/runescape-client/src/main/java/class65.java
+++ b/runescape-client/src/main/java/class65.java
@@ -3,8 +3,7 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("bl")
-public class class65 extends RouteStrategy
-{
+public class class65 extends RouteStrategy {
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lcz;"
@@ -32,180 +31,180 @@ public class class65 extends RouteStrategy
       signature = "(Lbz;II)V",
       garbageValue = "406386718"
    )
-   static final void method1232(Actor actor, int var1) {
-      if(actor.__bw > Client.cycle) {
-         SpriteIds.method5828(actor);
+   static final void method1232(Actor var0, int var1) {
+      if (var0.field19 > Client.cycle) {
+         SpriteIds.method5828(var0);
       } else {
          int var2;
          int var3;
          int var4;
          int var5;
-         int var7;
-         if(actor.__cr >= Client.cycle) {
-            if(actor.__cr == Client.cycle || actor.sequence == -1 || actor.sequenceDelay != 0 || actor.sequenceFrameCycle + 1 > WorldMapAreaData.getSequenceDefinition(actor.sequence).frameLengths[actor.sequenceFrame]) {
-               var2 = actor.__cr - actor.__bw;
-               var3 = Client.cycle - actor.__bw;
-               var4 = actor.__bf * 128 + actor.size * 64;
-               var5 = actor.__be * 128 + actor.size * 64;
-               int var6 = actor.__bh * 128 + actor.size * 64;
-               var7 = actor.__bv * 128 + actor.size * 64;
-               actor.x = (var3 * var6 + var4 * (var2 - var3)) / var2;
-               actor.y = (var3 * var7 + var5 * (var2 - var3)) / var2;
+         int var6;
+         if (var0.field20 >= Client.cycle) {
+            if (var0.field20 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > WorldMapAreaData.getSequenceDefinition(var0.sequence).frameLengths[var0.sequenceFrame]) {
+               var2 = var0.field20 - var0.field19;
+               var3 = Client.cycle - var0.field19;
+               var4 = var0.field15 * 128 + var0.size * 64;
+               var5 = var0.field17 * 128 + var0.size * 64;
+               int var7 = var0.field16 * 128 + var0.size * 64;
+               var6 = var0.field18 * 128 + var0.size * 64;
+               var0.x = (var3 * var7 + var4 * (var2 - var3)) / var2;
+               var0.y = (var3 * var6 + var5 * (var2 - var3)) / var2;
             }
 
-            actor.__cq = 0;
-            actor.orientation = actor.__cv;
-            actor.__ac = actor.orientation;
+            var0.field24 = 0;
+            var0.orientation = var0.field21;
+            var0.field9 = var0.orientation;
          } else {
-            actor.movementSequence = actor.idleSequence;
-            if(actor.pathLength == 0) {
-               actor.__cq = 0;
+            var0.movementSequence = var0.idleSequence;
+            if (var0.pathLength == 0) {
+               var0.field24 = 0;
             } else {
-               label310: {
-                  if(actor.sequence != -1 && actor.sequenceDelay == 0) {
-                     SequenceDefinition var11 = WorldMapAreaData.getSequenceDefinition(actor.sequence);
-                     if(actor.__ch > 0 && var11.__j == 0) {
-                        ++actor.__cq;
-                        break label310;
+               label225: {
+                  if (var0.sequence != -1 && var0.sequenceDelay == 0) {
+                     SequenceDefinition var11 = WorldMapAreaData.getSequenceDefinition(var0.sequence);
+                     if (var0.field25 > 0 && var11.field781 == 0) {
+                        ++var0.field24;
+                        break label225;
                      }
 
-                     if(actor.__ch <= 0 && var11.__s == 0) {
-                        ++actor.__cq;
-                        break label310;
+                     if (var0.field25 <= 0 && var11.field782 == 0) {
+                        ++var0.field24;
+                        break label225;
                      }
                   }
 
-                  var2 = actor.x;
-                  var3 = actor.y;
-                  var4 = actor.pathX[actor.pathLength - 1] * 128 + actor.size * 64;
-                  var5 = actor.pathY[actor.pathLength - 1] * 128 + actor.size * 64;
-                  if(var2 < var4) {
-                     if(var3 < var5) {
-                        actor.orientation = 1280;
-                     } else if(var3 > var5) {
-                        actor.orientation = 1792;
+                  var2 = var0.x;
+                  var3 = var0.y;
+                  var4 = var0.pathX[var0.pathLength - 1] * 128 + var0.size * 64;
+                  var5 = var0.pathY[var0.pathLength - 1] * 128 + var0.size * 64;
+                  if (var2 < var4) {
+                     if (var3 < var5) {
+                        var0.orientation = 1280;
+                     } else if (var3 > var5) {
+                        var0.orientation = 1792;
                      } else {
-                        actor.orientation = 1536;
+                        var0.orientation = 1536;
                      }
-                  } else if(var2 > var4) {
-                     if(var3 < var5) {
-                        actor.orientation = 768;
-                     } else if(var3 > var5) {
-                        actor.orientation = 256;
+                  } else if (var2 > var4) {
+                     if (var3 < var5) {
+                        var0.orientation = 768;
+                     } else if (var3 > var5) {
+                        var0.orientation = 256;
                      } else {
-                        actor.orientation = 512;
+                        var0.orientation = 512;
                      }
-                  } else if(var3 < var5) {
-                     actor.orientation = 1024;
-                  } else if(var3 > var5) {
-                     actor.orientation = 0;
+                  } else if (var3 < var5) {
+                     var0.orientation = 1024;
+                  } else if (var3 > var5) {
+                     var0.orientation = 0;
                   }
 
-                  byte var12 = actor.pathTraversed[actor.pathLength - 1];
-                  if(var4 - var2 <= 256 && var4 - var2 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) {
-                     var7 = actor.orientation - actor.__ac & 2047;
-                     if(var7 > 1024) {
-                        var7 -= 2048;
+                  byte var12 = var0.pathTraversed[var0.pathLength - 1];
+                  if (var4 - var2 <= 256 && var4 - var2 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) {
+                     var6 = var0.orientation - var0.field9 & 2047;
+                     if (var6 > 1024) {
+                        var6 -= 2048;
                      }
 
-                     int var8 = actor.walkTurnSequence;
-                     if(var7 >= -256 && var7 <= 256) {
-                        var8 = actor.walkSequence;
-                     } else if(var7 >= 256 && var7 < 768) {
-                        var8 = actor.walkTurnRightSequence;
-                     } else if(var7 >= -768 && var7 <= -256) {
-                        var8 = actor.walkTurnLeftSequence;
+                     int var8 = var0.walkTurnSequence;
+                     if (var6 >= -256 && var6 <= 256) {
+                        var8 = var0.walkSequence;
+                     } else if (var6 >= 256 && var6 < 768) {
+                        var8 = var0.walkTurnRightSequence;
+                     } else if (var6 >= -768 && var6 <= -256) {
+                        var8 = var0.walkTurnLeftSequence;
                      }
 
-                     if(var8 == -1) {
-                        var8 = actor.walkSequence;
+                     if (var8 == -1) {
+                        var8 = var0.walkSequence;
                      }
 
-                     actor.movementSequence = var8;
+                     var0.movementSequence = var8;
                      int var9 = 4;
                      boolean var10 = true;
-                     if(actor instanceof Npc) {
-                        var10 = ((Npc)actor).definition.isClickable;
+                     if (var0 instanceof NPC) {
+                        var10 = ((NPC)var0).definition.isClickable;
                      }
 
-                     if(var10) {
-                        if(actor.__ac != actor.orientation && actor.targetIndex == -1 && actor.__cj != 0) {
+                     if (var10) {
+                        if (var0.field9 != var0.orientation && var0.targetIndex == -1 && var0.field23 != 0) {
                            var9 = 2;
                         }
 
-                        if(actor.pathLength > 2) {
+                        if (var0.pathLength > 2) {
                            var9 = 6;
                         }
 
-                        if(actor.pathLength > 3) {
+                        if (var0.pathLength > 3) {
                            var9 = 8;
                         }
 
-                        if(actor.__cq > 0 && actor.pathLength > 1) {
+                        if (var0.field24 > 0 && var0.pathLength > 1) {
                            var9 = 8;
-                           --actor.__cq;
+                           --var0.field24;
                         }
                      } else {
-                        if(actor.pathLength > 1) {
+                        if (var0.pathLength > 1) {
                            var9 = 6;
                         }
 
-                        if(actor.pathLength > 2) {
+                        if (var0.pathLength > 2) {
                            var9 = 8;
                         }
 
-                        if(actor.__cq > 0 && actor.pathLength > 1) {
+                        if (var0.field24 > 0 && var0.pathLength > 1) {
                            var9 = 8;
-                           --actor.__cq;
+                           --var0.field24;
                         }
                      }
 
-                     if(var12 == 2) {
+                     if (var12 == 2) {
                         var9 <<= 1;
                      }
 
-                     if(var9 >= 8 && actor.movementSequence == actor.walkSequence && actor.runSequence != -1) {
-                        actor.movementSequence = actor.runSequence;
+                     if (var9 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) {
+                        var0.movementSequence = var0.runSequence;
                      }
 
-                     if(var2 != var4 || var5 != var3) {
-                        if(var2 < var4) {
-                           actor.x += var9;
-                           if(actor.x > var4) {
-                              actor.x = var4;
+                     if (var2 != var4 || var5 != var3) {
+                        if (var2 < var4) {
+                           var0.x += var9;
+                           if (var0.x > var4) {
+                              var0.x = var4;
                            }
-                        } else if(var2 > var4) {
-                           actor.x -= var9;
-                           if(actor.x < var4) {
-                              actor.x = var4;
+                        } else if (var2 > var4) {
+                           var0.x -= var9;
+                           if (var0.x < var4) {
+                              var0.x = var4;
                            }
                         }
 
-                        if(var3 < var5) {
-                           actor.y += var9;
-                           if(actor.y > var5) {
-                              actor.y = var5;
+                        if (var3 < var5) {
+                           var0.y += var9;
+                           if (var0.y > var5) {
+                              var0.y = var5;
                            }
-                        } else if(var3 > var5) {
-                           actor.y -= var9;
-                           if(actor.y < var5) {
-                              actor.y = var5;
+                        } else if (var3 > var5) {
+                           var0.y -= var9;
+                           if (var0.y < var5) {
+                              var0.y = var5;
                            }
                         }
                      }
 
-                     if(var4 == actor.x && var5 == actor.y) {
-                        --actor.pathLength;
-                        if(actor.__ch > 0) {
-                           --actor.__ch;
+                     if (var4 == var0.x && var5 == var0.y) {
+                        --var0.pathLength;
+                        if (var0.field25 > 0) {
+                           --var0.field25;
                         }
                      }
                   } else {
-                     actor.x = var4;
-                     actor.y = var5;
-                     --actor.pathLength;
-                     if(actor.__ch > 0) {
-                        --actor.__ch;
+                     var0.x = var4;
+                     var0.y = var5;
+                     --var0.pathLength;
+                     if (var0.field25 > 0) {
+                        --var0.field25;
                      }
                   }
                }
@@ -213,27 +212,27 @@ public class class65 extends RouteStrategy
          }
       }
 
-      if(actor.x < 128 || actor.y < 128 || actor.x >= 13184 || actor.y >= 13184) {
-         actor.sequence = -1;
-         actor.spotAnimation = -1;
-         actor.__bw = 0;
-         actor.__cr = 0;
-         actor.x = actor.pathX[0] * 128 + actor.size * 64;
-         actor.y = actor.pathY[0] * 128 + actor.size * 64;
-         actor.__bb_143();
+      if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) {
+         var0.sequence = -1;
+         var0.spotAnimation = -1;
+         var0.field19 = 0;
+         var0.field20 = 0;
+         var0.x = var0.pathX[0] * 128 + var0.size * 64;
+         var0.y = var0.pathY[0] * 128 + var0.size * 64;
+         var0.method23();
       }
 
-      if(Canvas.localPlayer == actor && (actor.x < 1536 || actor.y < 1536 || actor.x >= 11776 || actor.y >= 11776)) {
-         actor.sequence = -1;
-         actor.spotAnimation = -1;
-         actor.__bw = 0;
-         actor.__cr = 0;
-         actor.x = actor.pathX[0] * 128 + actor.size * 64;
-         actor.y = actor.pathY[0] * 128 + actor.size * 64;
-         actor.__bb_143();
+      if (Canvas.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) {
+         var0.sequence = -1;
+         var0.spotAnimation = -1;
+         var0.field19 = 0;
+         var0.field20 = 0;
+         var0.x = var0.pathX[0] * 128 + var0.size * 64;
+         var0.y = var0.pathY[0] * 128 + var0.size * 64;
+         var0.method23();
       }
 
-      IndexStoreAction.method4553(actor);
-      ChatChannel.method2225(actor);
+      IndexStoreAction.method4553(var0);
+      ChatChannel.method2225(var0);
    }
 }
diff --git a/runescape-client/src/main/java/class68.java b/runescape-client/src/main/java/class68.java
index b72668100c..6d86c0cc52 100644
--- a/runescape-client/src/main/java/class68.java
+++ b/runescape-client/src/main/java/class68.java
@@ -91,7 +91,7 @@ public final class class68 extends Node {
       int var4 = var2.lowBit;
       int var5 = var2.highBit;
       int var6 = Varps.Varps_masks[var5 - var4];
-      if(var1 < 0 || var1 > var6) {
+      if (var1 < 0 || var1 > var6) {
          var1 = 0;
       }
 
@@ -106,7 +106,7 @@ public final class class68 extends Node {
    )
    @Export("drawLoadingMessage")
    static final void drawLoadingMessage(String var0, boolean var1) {
-      if(Client.showLoadingMessages) {
+      if (Client.showLoadingMessages) {
          byte var2 = 4;
          int var3 = var2 + 6;
          int var4 = var2 + 6;
@@ -116,7 +116,7 @@ public final class class68 extends Node {
          Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6, 16777215);
          DevicePcmPlayerProvider.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0);
          Players.method2112(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2);
-         if(var1) {
+         if (var1) {
             class197.rasterProvider.drawFull(0, 0);
          } else {
             int var7 = var3;
@@ -124,13 +124,13 @@ public final class class68 extends Node {
             int var9 = var5;
             int var10 = var6;
 
-            for(int var11 = 0; var11 < Client.rootWidgetCount; ++var11) {
-               if(Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) {
-                  Client.__client_ot[var11] = true;
+            for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) {
+               if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) {
+                  Client.field102[var11] = true;
                }
             }
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java
index 3c671e174b..c98f5a904b 100644
--- a/runescape-client/src/main/java/class80.java
+++ b/runescape-client/src/main/java/class80.java
@@ -1,19 +1,13 @@
 import java.math.BigInteger;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("ce")
 public class class80 {
    @ObfuscatedName("o")
-   static final BigInteger __ce_o;
+   static final BigInteger field1163;
    @ObfuscatedName("u")
-   static final BigInteger __ce_u;
-
-   static {
-      __ce_o = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049");
-      __ce_u = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683");
-   }
+   static final BigInteger field1164;
 
    @ObfuscatedName("o")
    @ObfuscatedSignature(
@@ -21,7 +15,7 @@ public class class80 {
       garbageValue = "1844169387"
    )
    static void method2015() {
-      if(Login.__cu_f) {
+      if (Login.field465) {
          Login.titleboxSprite = null;
          IndexCacheLoader.titlebuttonSprite = null;
          WorldMapEvent.runesSprite = null;
@@ -35,11 +29,17 @@ public class class80 {
          Frames.worldSelectFlagSprites = null;
          AttackOption.worldSelectArrows = null;
          UrlRequest.worldSelectStars = null;
-         class277.__jn_by = null;
+         class277.field1144 = null;
          class16.loginScreenRunesAnimation.method1762();
          AbstractSocket.method3488(2);
          UserComparator9.method3343(true);
-         Login.__cu_f = false;
+         Login.field465 = false;
       }
+
+   }
+
+   static {
+      field1163 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049");
+      field1164 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683");
    }
 }
diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java
index e9198a0915..89a1da6b66 100644
--- a/runescape-client/src/main/java/class83.java
+++ b/runescape-client/src/main/java/class83.java
@@ -1,7 +1,6 @@
 import java.math.BigInteger;
 import java.net.MalformedURLException;
 import java.net.URL;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
@@ -9,19 +8,14 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("cm")
 public class class83 {
    @ObfuscatedName("m")
-   static final BigInteger __cm_m;
+   static final BigInteger field1165;
    @ObfuscatedName("f")
-   static final BigInteger __cm_f;
+   static final BigInteger field1166;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = 533653621
    )
-   public static int __cm_e;
-
-   static {
-      __cm_m = new BigInteger("10001", 16);
-      __cm_f = new BigInteger("83ff79a3e258b99ead1a70e1049883e78e513c4cdec538d8da9483879a9f81689c0c7d146d7b82b52d05cf26132b1cda5930eeef894e4ccf3d41eebc3aabe54598c4ca48eb5a31d736bfeea17875a35558b9e3fcd4aebe2a9cc970312a477771b36e173dc2ece6001ab895c553e2770de40073ea278026f36961c94428d8d7db", 16);
-   }
+   public static int field1167;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -30,7 +24,7 @@ public class class83 {
    )
    static int method2027(int var0, int var1) {
       ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-      return var2 == null?-1:(var1 >= 0 && var1 < var2.ids.length?var2.ids[var1]:-1);
+      return var2 == null ? -1 : (var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1);
    }
 
    @ObfuscatedName("f")
@@ -39,7 +33,7 @@ public class class83 {
       garbageValue = "-1468699107"
    )
    static boolean method2026(String var0) {
-      if(var0 == null) {
+      if (var0 == null) {
          return false;
       } else {
          try {
@@ -57,6 +51,11 @@ public class class83 {
       garbageValue = "1413048059"
    )
    public static IndexedSprite method2028(AbstractIndexCache var0, int var1) {
-      return !RouteStrategy.loadSpriteFlat(var0, var1)?null:ServerPacket.createIndexedSprite();
+      return !RouteStrategy.loadSpriteFlat(var0, var1) ? null : ServerPacket.createIndexedSprite();
+   }
+
+   static {
+      field1165 = new BigInteger("10001", 16);
+      field1166 = new BigInteger("83ff79a3e258b99ead1a70e1049883e78e513c4cdec538d8da9483879a9f81689c0c7d146d7b82b52d05cf26132b1cda5930eeef894e4ccf3d41eebc3aabe54598c4ca48eb5a31d736bfeea17875a35558b9e3fcd4aebe2a9cc970312a477771b36e173dc2ece6001ab895c553e2770de40073ea278026f36961c94428d8d7db", 16);
    }
 }
diff --git a/runescape-client/src/main/java/class98.java b/runescape-client/src/main/java/class98.java
index 2e7e07fc24..f770d715d3 100644
--- a/runescape-client/src/main/java/class98.java
+++ b/runescape-client/src/main/java/class98.java
@@ -23,22 +23,22 @@ public class class98 {
       boolean var1 = MusicSample.method2338() != 0;
       int var2;
       int var3;
-      int var5;
-      if(var1) {
+      int var4;
+      if (var1) {
          var2 = 0;
 
-         for(var3 = MusicSample.method2352(5) + 1; var2 < this.field1303; ++var3) {
-            int var4 = MusicSample.method2352(WorldMapCacheName.method634(this.field1303 - var2));
+         for (var3 = MusicSample.method2352(5) + 1; var2 < this.field1303; ++var3) {
+            int var5 = MusicSample.method2352(WorldMapCacheName.method634(this.field1303 - var2));
 
-            for(var5 = 0; var5 < var4; ++var5) {
+            for (var4 = 0; var4 < var5; ++var4) {
                this.field1304[var2++] = var3;
             }
          }
       } else {
-         boolean var14 = MusicSample.method2338() != 0;
+         boolean var15 = MusicSample.method2338() != 0;
 
-         for(var3 = 0; var3 < this.field1303; ++var3) {
-            if(var14 && MusicSample.method2338() == 0) {
+         for (var3 = 0; var3 < this.field1303; ++var3) {
+            if (var15 && MusicSample.method2338() == 0) {
                this.field1304[var3] = 0;
             } else {
                this.field1304[var3] = MusicSample.method2352(5) + 1;
@@ -48,58 +48,58 @@ public class class98 {
 
       this.method2311();
       var2 = MusicSample.method2352(4);
-      if(var2 > 0) {
-         float var15 = MusicSample.method2357(MusicSample.method2352(32));
+      if (var2 > 0) {
          float var16 = MusicSample.method2357(MusicSample.method2352(32));
-         var5 = MusicSample.method2352(4) + 1;
-         boolean var6 = MusicSample.method2338() != 0;
-         int var7;
-         if(var2 == 1) {
-            var7 = method2310(this.field1303, this.field1306);
+         float var6 = MusicSample.method2357(MusicSample.method2352(32));
+         var4 = MusicSample.method2352(4) + 1;
+         boolean var7 = MusicSample.method2338() != 0;
+         int var8;
+         if (var2 == 1) {
+            var8 = method2310(this.field1303, this.field1306);
          } else {
-            var7 = this.field1303 * this.field1306;
+            var8 = this.field1303 * this.field1306;
          }
 
-         this.field1305 = new int[var7];
+         this.field1305 = new int[var8];
 
-         int var8;
-         for(var8 = 0; var8 < var7; ++var8) {
-            this.field1305[var8] = MusicSample.method2352(var5);
+         int var9;
+         for (var9 = 0; var9 < var8; ++var9) {
+            this.field1305[var9] = MusicSample.method2352(var4);
          }
 
          this.field1302 = new float[this.field1303][this.field1306];
-         float var9;
-         int var10;
+         float var10;
          int var11;
-         if(var2 == 1) {
-            for(var8 = 0; var8 < this.field1303; ++var8) {
-               var9 = 0.0F;
-               var10 = 1;
+         int var12;
+         if (var2 == 1) {
+            for (var9 = 0; var9 < this.field1303; ++var9) {
+               var10 = 0.0F;
+               var11 = 1;
 
-               for(var11 = 0; var11 < this.field1306; ++var11) {
-                  int var12 = var8 / var10 % var7;
-                  float var13 = (float)this.field1305[var12] * var16 + var15 + var9;
-                  this.field1302[var8][var11] = var13;
-                  if(var6) {
-                     var9 = var13;
+               for (var12 = 0; var12 < this.field1306; ++var12) {
+                  int var13 = var9 / var11 % var8;
+                  float var14 = (float)this.field1305[var13] * var6 + var16 + var10;
+                  this.field1302[var9][var12] = var14;
+                  if (var7) {
+                     var10 = var14;
                   }
 
-                  var10 *= var7;
+                  var11 *= var8;
                }
             }
          } else {
-            for(var8 = 0; var8 < this.field1303; ++var8) {
-               var9 = 0.0F;
-               var10 = var8 * this.field1306;
+            for (var9 = 0; var9 < this.field1303; ++var9) {
+               var10 = 0.0F;
+               var11 = var9 * this.field1306;
 
-               for(var11 = 0; var11 < this.field1306; ++var11) {
-                  float var17 = (float)this.field1305[var10] * var16 + var15 + var9;
-                  this.field1302[var8][var11] = var17;
-                  if(var6) {
-                     var9 = var17;
+               for (var12 = 0; var12 < this.field1306; ++var12) {
+                  float var17 = (float)this.field1305[var11] * var6 + var16 + var10;
+                  this.field1302[var9][var12] = var17;
+                  if (var7) {
+                     var10 = var17;
                   }
 
-                  ++var10;
+                  ++var11;
                }
             }
          }
@@ -118,40 +118,40 @@ public class class98 {
       int var6;
       int var7;
       int var8;
+      int var9;
       int var10;
-      for(var3 = 0; var3 < this.field1303; ++var3) {
+      for (var3 = 0; var3 < this.field1303; ++var3) {
          var4 = this.field1304[var3];
-         if(var4 != 0) {
+         if (var4 != 0) {
             var5 = 1 << 32 - var4;
             var6 = var2[var4];
             var1[var3] = var6;
-            int var12;
-            if((var6 & var5) != 0) {
+            if ((var6 & var5) != 0) {
                var7 = var2[var4 - 1];
             } else {
                var7 = var6 | var5;
 
-               for(var8 = var4 - 1; var8 >= 1; --var8) {
-                  var12 = var2[var8];
-                  if(var12 != var6) {
+               for (var8 = var4 - 1; var8 >= 1; --var8) {
+                  var10 = var2[var8];
+                  if (var10 != var6) {
                      break;
                   }
 
-                  var10 = 1 << 32 - var8;
-                  if((var12 & var10) != 0) {
+                  var9 = 1 << 32 - var8;
+                  if ((var10 & var9) != 0) {
                      var2[var8] = var2[var8 - 1];
                      break;
                   }
 
-                  var2[var8] = var12 | var10;
+                  var2[var8] = var10 | var9;
                }
             }
 
             var2[var4] = var7;
 
-            for(var8 = var4 + 1; var8 <= 32; ++var8) {
-               var12 = var2[var8];
-               if(var12 == var6) {
+            for (var8 = var4 + 1; var8 <= 32; ++var8) {
+               var10 = var2[var8];
+               if (var10 == var6) {
                   var2[var8] = var7;
                }
             }
@@ -159,19 +159,19 @@ public class class98 {
       }
 
       this.field1307 = new int[8];
-      int var11 = 0;
+      var10 = 0;
 
-      for(var3 = 0; var3 < this.field1303; ++var3) {
+      for (var3 = 0; var3 < this.field1303; ++var3) {
          var4 = this.field1304[var3];
-         if(var4 != 0) {
+         if (var4 != 0) {
             var5 = var1[var3];
             var6 = 0;
 
-            for(var7 = 0; var7 < var4; ++var7) {
+            for (var7 = 0; var7 < var4; ++var7) {
                var8 = Integer.MIN_VALUE >>> var7;
-               if((var5 & var8) != 0) {
-                  if(this.field1307[var6] == 0) {
-                     this.field1307[var6] = var11;
+               if ((var5 & var8) != 0) {
+                  if (this.field1307[var6] == 0) {
+                     this.field1307[var6] = var10;
                   }
 
                   var6 = this.field1307[var6];
@@ -179,22 +179,22 @@ public class class98 {
                   ++var6;
                }
 
-               if(var6 >= this.field1307.length) {
-                  int[] var9 = new int[this.field1307.length * 2];
+               if (var6 >= this.field1307.length) {
+                  int[] var11 = new int[this.field1307.length * 2];
 
-                  for(var10 = 0; var10 < this.field1307.length; ++var10) {
-                     var9[var10] = this.field1307[var10];
+                  for (var9 = 0; var9 < this.field1307.length; ++var9) {
+                     var11[var9] = this.field1307[var9];
                   }
 
-                  this.field1307 = var9;
+                  this.field1307 = var11;
                }
 
                var8 >>>= 1;
             }
 
             this.field1307[var6] = ~var3;
-            if(var6 >= var11) {
-               var11 = var6 + 1;
+            if (var6 >= var10) {
+               var10 = var6 + 1;
             }
          }
       }
@@ -204,8 +204,7 @@ public class class98 {
    @ObfuscatedName("q")
    int method2306() {
       int var1;
-      for(var1 = 0; this.field1307[var1] >= 0; var1 = MusicSample.method2338() != 0?this.field1307[var1]:var1 + 1) {
-         ;
+      for (var1 = 0; this.field1307[var1] >= 0; var1 = MusicSample.method2338() != 0 ? this.field1307[var1] : var1 + 1) {
       }
 
       return ~this.field1307[var1];
@@ -219,8 +218,7 @@ public class class98 {
    @ObfuscatedName("m")
    static int method2310(int var0, int var1) {
       int var2;
-      for(var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; RouteStrategy.method3642(var2, var1) > var0; --var2) {
-         ;
+      for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; RouteStrategy.method3642(var2, var1) > var0; --var2) {
       }
 
       return var2;