refactor: rename and move mouse/key listener management

Author: Jameskmonger

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

@@ -1,7 +1,6 @@
 package org.runejs.client;
 
 import org.runejs.client.input.MouseHandler;
-import org.runejs.client.media.renderable.GameObject;
 
 import java.awt.*;
 import java.io.*;
@@ -70,12 +69,4 @@ public static void drawTabGraphics() {
         }
     }
 
-    public static void method965(int arg0, Component arg1) {
-        if(arg0 == 32) {
-            arg1.removeMouseListener(GameObject.frame);
-            arg1.removeMouseMotionListener(GameObject.frame);
-            arg1.removeFocusListener(GameObject.frame);
-        }
-    }
-
 }

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

@@ -5,6 +5,7 @@
 import org.runejs.client.cache.CacheFileChannel;
 import org.runejs.client.frame.*;
 import org.runejs.client.frame.console.Console;
+import org.runejs.client.input.KeyFocusListener;
 import org.runejs.client.input.MouseHandler;
 import org.runejs.client.io.Buffer;
 import org.runejs.client.language.English;
@@ -49,7 +50,6 @@
 
 import java.awt.*;
 import java.io.IOException;
-import java.net.InetAddress;
 import java.net.Socket;
 
 public class Game {
@@ -2000,11 +2000,11 @@ public void handleUpdateServer() {
      */
     public void updateStatusText() {
         if (MovedStatics.aBoolean1575) {
-            MovedStatics.method311(MouseHandler.gameCanvas);
-            Class55.method965(32, MouseHandler.gameCanvas);
+            KeyFocusListener.removeListeners(MouseHandler.gameCanvas);
+            MouseHandler.removeListeners(MouseHandler.gameCanvas);
 //            this.setCanvas();
-            GameInterface.method642(MouseHandler.gameCanvas);
-            RSRuntimeException.method1056(MouseHandler.gameCanvas);
+            KeyFocusListener.addListeners(MouseHandler.gameCanvas);
+            MouseHandler.addListeners(MouseHandler.gameCanvas);
         }
         if (Class51.gameStatusCode == 0)
             GameObject.drawLoadingText(MovedStatics.anInt1607, null, Native.currentLoadingText);
@@ -2165,8 +2165,8 @@ public void startup() {
         currentPort = gameServerPort;
 
         MovedStatics.method997();
-        GameInterface.method642(MouseHandler.gameCanvas);
-        RSRuntimeException.method1056(MouseHandler.gameCanvas);
+        KeyFocusListener.addListeners(MouseHandler.gameCanvas);
+        MouseHandler.addListeners(MouseHandler.gameCanvas);
         RSCanvas.anInt57 = Signlink.anInt737;
         try {
             if (signlink.cacheDataAccessFile != null) {

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

@@ -1550,11 +1550,6 @@ public static void method299(int arg1) {
 	public static boolean accountFlagged = false;
 	public static GameInterface aGameInterface_1887;
 
-    public static void method311(Component arg1) {
-	    arg1.removeKeyListener(Class59.keyFocusListener);
-	    arg1.removeFocusListener(Class59.keyFocusListener);
-	}
-
     /**
      * Draws the 2d yellow arrow hint icon in the world.
      */

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

@@ -1,10 +1,7 @@
 package org.runejs.client;
 
-import org.runejs.client.media.renderable.GameObject;
 import org.runejs.client.scene.SceneCluster;
 
-import java.awt.*;
-
 public class RSRuntimeException extends RuntimeException {
     public static int anInt1641 = 0;
     public static int lastActiveInvInterface = 0;
@@ -17,13 +14,6 @@ public RSRuntimeException(Throwable arg0, String arg1) {
         aThrowable1652 = arg0;
     }
 
-    public static void method1056(Component arg0) {
-        arg0.addMouseListener(GameObject.frame);
-        arg0.addMouseMotionListener(GameObject.frame);
-        arg0.addFocusListener(GameObject.frame);
-        arg0.addMouseWheelListener(GameObject.frame);
-    }
-
     public static void method1057(int arg0) {
         SceneCluster.gameTimer.reset();
         for(int i = 0; i < 32; i++)

src/main/java/org/runejs/client/cache/media/gameInterface/GameInterface.java

@@ -36,14 +36,10 @@
 import org.runejs.client.scene.InteractiveObject;
 import org.runejs.client.scene.SceneCluster;
 import org.runejs.client.scene.tile.WallDecoration;
-import org.runejs.client.util.Signlink;
 import org.runejs.client.util.TextUtils;
 import org.runejs.client.*;
 import org.runejs.Configuration;
 
-import java.awt.*;
-import java.lang.reflect.Method;
-
 public class GameInterface extends CachedNode {
     public static GameInterface[][] cachedInterfaces;
     public static int gameScreenInterfaceId = -1;
@@ -272,19 +268,6 @@ public static void method640() {
     }
 
 
-    public static void method642(Component arg0) {
-        Method method = Signlink.aMethod729;
-        if(method != null) {
-            try {
-                method.invoke(arg0, Boolean.FALSE);
-            } catch(Throwable throwable) {
-                /* empty */
-            }
-        }
-        arg0.addKeyListener(Class59.keyFocusListener);
-        arg0.addFocusListener(Class59.keyFocusListener);
-    }
-
     public static String getShortenedAmountText(int amount) {
         if(amount < 100000) {
             return "<col=ffff00>" + amount + "</col>";

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

@@ -6,11 +6,14 @@
 import org.runejs.client.language.Native;
 import org.runejs.client.*;
 import org.runejs.client.cache.def.GameObjectDefinition;
+import org.runejs.client.util.Signlink;
 
+import java.awt.*;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
+import java.lang.reflect.Method;
 
 public class KeyFocusListener implements KeyListener, FocusListener {
     public static LinkedList aLinkedList_1278 = new LinkedList();
@@ -98,6 +101,24 @@ public static String method956(Buffer arg1) {
         return MovedStatics.method307(arg1, -1, 32767);
     }
 
+    public static void addListeners(Component arg0) {
+        Method method = Signlink.aMethod729;
+        if(method != null) {
+            try {
+                method.invoke(arg0, Boolean.FALSE);
+            } catch(Throwable throwable) {
+                /* empty */
+            }
+        }
+        arg0.addKeyListener(Class59.keyFocusListener);
+        arg0.addFocusListener(Class59.keyFocusListener);
+    }
+
+    public static void removeListeners(Component arg1) {
+	    arg1.removeKeyListener(Class59.keyFocusListener);
+	    arg1.removeFocusListener(Class59.keyFocusListener);
+	}
+
     public void keyTyped(KeyEvent arg0) {
         arg0.consume();
     }

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

@@ -163,6 +163,19 @@ public static void method1015() {
         }
     }
 
+    public static void removeListeners(Component arg1) {
+        arg1.removeMouseListener(GameObject.frame);
+        arg1.removeMouseMotionListener(GameObject.frame);
+        arg1.removeFocusListener(GameObject.frame);
+    }
+
+    public static void addListeners(Component arg0) {
+        arg0.addMouseListener(GameObject.frame);
+        arg0.addMouseMotionListener(GameObject.frame);
+        arg0.addFocusListener(GameObject.frame);
+        arg0.addMouseWheelListener(GameObject.frame);
+    }
+
     public synchronized void mouseEntered(MouseEvent arg0) {
         if(GameObject.frame != null) {
             LinkedList.anInt1073 = 0;