refactor: move last statics from Class55

Author: Jameskmonger

src/main/java/org/runejs/client/Class55.java

@@ -90,6 +90,7 @@ public class Game {
     public static Class39 mouseCapturer;
     public static int anInt2591 = 0;
     public static int anInt874;
+    public static int destinationY = 0;
     private static int gameServerPort;
     private static int duplicateClickCount = 0;
     private static int lastClickY = 0;
@@ -708,7 +709,7 @@ public static void setConfigToDefaults() {
         Game.playerCamera.setYaw(0x7ff & -10 + (int) (20.0 * Math.random()));
         Minimap.minimapState = 0;
         Player.localPlayerCount = 0;
-        Class55.destinationY = 0;
+        destinationY = 0;
         for (int i = 0; i < 2048; i++) {
             Player.trackedPlayers[i] = null;
             Player.trackedPlayerAppearanceCache[i] = null;
@@ -1840,7 +1841,7 @@ private static void renderNPCs(boolean arg0) {
     }
 
     private static void renderPlayers(int arg0, boolean arg1) {
-        if(Player.localPlayer.worldX >> 7 == MovedStatics.destinationX && Player.localPlayer.worldY >> 7 == Class55.destinationY) {
+        if(Player.localPlayer.worldX >> 7 == MovedStatics.destinationX && Player.localPlayer.worldY >> 7 == destinationY) {
             MovedStatics.destinationX = 0;
 
             DebugTools.walkpathX = null;

src/main/java/org/runejs/client/Game.java

@@ -168,7 +168,7 @@ else if(isTeammate)
         }
         if(MovedStatics.destinationX != 0) {
             int flagX = 2 + MovedStatics.destinationX * 4 + -(Player.localPlayer.worldX / 32);
-            int flagY = 2 + 4 * Class55.destinationY + -(Player.localPlayer.worldY / 32);
+            int flagY = 2 + 4 * Game.destinationY + -(Player.localPlayer.worldY / 32);
             drawOnMinimap(flagY, flagX, minimapMarkers[0]);
         }
         Rasterizer.drawFilledRectangle(97, 78, 3, 3, 16777215);
@@ -363,7 +363,7 @@ else if(isTeammate)
         }
         if(MovedStatics.destinationX != 0) {
             int flagX = 2 + MovedStatics.destinationX * 4 + -(Player.localPlayer.worldX / 32);
-            int flagY = 2 + 4 * Class55.destinationY + -(Player.localPlayer.worldY / 32);
+            int flagY = 2 + 4 * Game.destinationY + -(Player.localPlayer.worldY / 32);
             drawOnResizableMinimap(flagX, flagY, minimapMarkers[0]);
         }
     }

src/main/java/org/runejs/client/frame/Minimap.java

@@ -35,6 +35,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
     public static int cursorY;
     public static int cursorX;
     public static boolean gameScreenClickable;
+    private static volatile int eventClickX = 0;
     private static volatile long lastClick = 0L;
     public boolean mouseWheelDown;
     public int mouseWheelX;
@@ -156,7 +157,7 @@ public static void method1015() {
             mouseX = eventMouseX;
             mouseY = eventMouseY;
             clickType = eventMouseButtonPressed;
-            clickX = Class55.eventClickX;
+            clickX = eventClickX;
             clickY = MovedStatics.eventClickY;
             aLong2561 = lastClick;
             eventMouseButtonPressed = 0;
@@ -232,7 +233,7 @@ public synchronized void mousePressed(MouseEvent event) {
             int mouseX = event.getX();
             int mouseY = event.getY();
             LinkedList.anInt1073 = 0;
-            Class55.eventClickX = mouseX;
+            eventClickX = mouseX;
             MovedStatics.eventClickY = mouseY;
             lastClick = System.currentTimeMillis();
             if(event.getButton() == MouseEvent.BUTTON2) {

src/main/java/org/runejs/client/input/MouseHandler.java

@@ -350,7 +350,7 @@ public static void method789(int chunkLocalX, int chunkY, int chunkX, int chunkL
             Buffer.anInt1985 = -1;
             if(MovedStatics.destinationX != 0) {
                 MovedStatics.destinationX -= i_34_;
-                Class55.destinationY -= i_35_;
+                Game.destinationY -= i_35_;
             }
             Player.cutsceneActive = false;
             SoundSystem.reset();

src/main/java/org/runejs/client/media/renderable/actor/Actor.java

@@ -298,7 +298,7 @@ else if(clickType == 2) {
             );
 
             MovedStatics.destinationX = walkingQueueX[0];
-            Class55.destinationY = walkingQueueY[0];
+            Game.destinationY = walkingQueueY[0];
 
             return true;
         }