refactor: rename/move mouse/keyboard inactivity

Author: Jameskmonger

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

@@ -13,10 +13,6 @@ public class Class17 {
     public static ProducingGraphicsBuffer aProducingGraphicsBuffer_463;
     public static int[] anIntArray466 = new int[256];
 
-    public static int method274() {
-        return Class49.anInt1147++;
-    }
-
     public static void animatePlayers(int playerIndex) {
         for(int currentPlayerIndex = playerIndex; Player.localPlayerCount > currentPlayerIndex; currentPlayerIndex++) {
             int actualIndex;

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

@@ -1,14 +1,8 @@
 package org.runejs.client;
 
 import org.runejs.client.cache.CacheArchive;
-import org.runejs.client.input.MouseHandler;
-import org.runejs.client.media.renderable.Model;
-import org.runejs.client.media.renderable.actor.Player;
-import org.runejs.client.scene.SceneCamera;
-import org.runejs.client.scene.SceneCluster;
 
 public class Class49 {
-    public static volatile int anInt1147 = 0;
     public static CacheArchive definitionCache;
     public static int anInt1154;
 

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

@@ -1550,8 +1550,8 @@ else if(ChatBox.dialogueId != -1)
                         for(int i_19_ = 0; i_19_ < 5; i_19_++)
                             SceneCamera.customCameraTimer[i_19_]++;
                         GameInterface.manageTextInputs();
-                        int i_20_ = Npc.method400(-1);
-                        int i_21_ = Class17.method274();
+                        int i_20_ = MouseHandler.resetFramesSinceMouseInput();
+                        int i_21_ = KeyFocusListener.resetFramesSinceKeyboardInput();
                         if(i_20_ > 4500 && i_21_ > 4500) {
                             SceneCluster.idleLogout = 250;
                             MovedStatics.method650(4000);

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

@@ -17,7 +17,6 @@ public class LinkedList {
     public static int selectedInventorySlot;
     public static LinkedList aLinkedList_1064 = new LinkedList();
     public static int[] terrainDataIds;
-    public static volatile int anInt1073 = 0;
     public static int crossType = 0;
 
     /**

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

@@ -1024,7 +1024,7 @@ public static ProducingGraphicsBuffer createGraphicsBuffer(int width, int height
     }
 
     public static void method650(int arg1) {
-        LinkedList.anInt1073 = arg1;
+        MouseHandler.framesSinceMouseInput = arg1;
     }
 
     public static void method652() {

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

@@ -19,6 +19,7 @@ public class KeyFocusListener implements KeyListener, FocusListener {
     public static LinkedList aLinkedList_1278 = new LinkedList();
     public static int[] crc8LookupTable = new int[256];
     public static ProducingGraphicsBuffer aProducingGraphicsBuffer_1285;
+    public static volatile int framesSinceKeyboardInput = 0;
 
     static {
         for (int divident = 0; divident < 256; divident++) {
@@ -119,6 +120,10 @@ public static void removeListeners(Component arg1) {
 	    arg1.removeFocusListener(Class59.keyFocusListener);
 	}
 
+    public static int resetFramesSinceKeyboardInput() {
+        return framesSinceKeyboardInput++;
+    }
+
     public void keyTyped(KeyEvent arg0) {
         arg0.consume();
     }
@@ -134,7 +139,7 @@ public synchronized void focusLost(FocusEvent arg0) {
 
     public synchronized void keyPressed(KeyEvent keyEvent) {
         if (Class59.keyFocusListener != null) {
-            Class49.anInt1147 = 0;
+            framesSinceKeyboardInput = 0;
             int obfuscatedKeyCode = keyEvent.getKeyCode();
             int eventKeyCode = keyEvent.getKeyCode();
             if (obfuscatedKeyCode >= 0 && MovedStatics.anIntArray1564.length > obfuscatedKeyCode) {
@@ -179,7 +184,7 @@ public synchronized void keyPressed(KeyEvent keyEvent) {
 
     public synchronized void keyReleased(KeyEvent arg0) {
         if (Class59.keyFocusListener != null) {
-            Class49.anInt1147 = 0;
+            framesSinceKeyboardInput = 0;
             int i = arg0.getKeyCode();
 
             if (i < 0 || MovedStatics.anIntArray1564.length <= i) {

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

@@ -35,6 +35,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
     public static int cursorY;
     public static int cursorX;
     public static boolean gameScreenClickable;
+    public static volatile int framesSinceMouseInput = 0;
     private static volatile int eventClickX = 0;
     private static volatile long lastClick = 0L;
     public boolean mouseWheelDown;
@@ -177,17 +178,21 @@ public static void addListeners(Component arg0) {
         arg0.addMouseWheelListener(GameObject.frame);
     }
 
+    public static int resetFramesSinceMouseInput() {
+        return framesSinceMouseInput++;
+    }
+
     public synchronized void mouseEntered(MouseEvent arg0) {
         if(GameObject.frame != null) {
-            LinkedList.anInt1073 = 0;
+            framesSinceMouseInput = 0;
             eventMouseX = arg0.getX();
             eventMouseY = arg0.getY();
         }
     }
 
     public synchronized void mouseExited(MouseEvent arg0) {
         if(GameObject.frame != null) {
-            LinkedList.anInt1073 = 0;
+            framesSinceMouseInput = 0;
             eventMouseX = -1;
             eventMouseY = -1;
         }
@@ -202,7 +207,7 @@ public synchronized void mouseDragged(MouseEvent mouseEvent) {
         int mouseX = mouseEvent.getX();
         int mouseY = mouseEvent.getY();
         if(GameObject.frame != null) {
-            LinkedList.anInt1073 = 0;
+            framesSinceMouseInput = 0;
         }
         if(mouseWheelDown) {
             mouseY = mouseWheelX - mouseEvent.getX();
@@ -217,7 +222,7 @@ public synchronized void mouseDragged(MouseEvent mouseEvent) {
     }
 
     private void mouseWheelDragged(int i, int j) {
-        LinkedList.anInt1073 = 0;
+        framesSinceMouseInput = 0;
 
         if(!mouseWheelDown)
             return;
@@ -232,7 +237,7 @@ public synchronized void mousePressed(MouseEvent event) {
         if(GameObject.frame != null) {
             int mouseX = event.getX();
             int mouseY = event.getY();
-            LinkedList.anInt1073 = 0;
+            framesSinceMouseInput = 0;
             eventClickX = mouseX;
             MovedStatics.eventClickY = mouseY;
             lastClick = System.currentTimeMillis();
@@ -256,7 +261,7 @@ public synchronized void mousePressed(MouseEvent event) {
 
     public void mouseWheelMoved(MouseWheelEvent event) {
         int rotation = event.getWheelRotation();
-        LinkedList.anInt1073 = 0;
+        framesSinceMouseInput = 0;
 
         if(!handleInterfaceScrolling(event)) {
             int currentZoom = Game.playerCamera.getZoom();
@@ -382,15 +387,15 @@ public boolean handleInterfaceScrolling(MouseWheelEvent event) {
 
     public synchronized void mouseMoved(MouseEvent arg0) {
         if(GameObject.frame != null) {
-            LinkedList.anInt1073 = 0;
+            framesSinceMouseInput = 0;
             eventMouseX = arg0.getX();
             eventMouseY = arg0.getY();
         }
     }
 
     public synchronized void mouseReleased(MouseEvent arg0) {
         if(GameObject.frame != null) {
-            LinkedList.anInt1073 = 0;
+            framesSinceMouseInput = 0;
             mouseButtonPressed = 0;
             mouseWheelDown = false;
         }

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

@@ -7,7 +7,6 @@
 import org.runejs.client.media.renderable.Model;
 import org.runejs.client.net.PacketBuffer;
 import org.runejs.client.scene.Scene;
-import org.runejs.client.scene.SceneCluster;
 
 public class Npc extends Actor {
     public static int anInt3294 = 0;
@@ -102,13 +101,6 @@ public static void parseNpcUpdateMasks(PacketBuffer buffer) {
         }
     }
 
-    public static int method400(int arg0) {
-        if(arg0 != -1)
-            SceneCluster.packetBuffer = null;
-        return LinkedList.anInt1073++;
-
-    }
-
     public Model getRotatedModel() {
         if(actorDefinition == null)
             return null;