Use newer version of fernflower and remove __xx names

2019-07-04 23:51:52 +02:00
parent 1f2a9b21d6
commit a8d801d830
294 changed files with 27369 additions and 27322 deletions
--- 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;
   }
 }