refactor: SignlinkNode.Status

Author: Jameskmonger

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

@@ -199,15 +199,15 @@ public static void createClientScriptCheckPacket(int packetId, PacketBuffer buff
 
             for(int i = 0; clientScriptRunner.scriptCount > i; i++) {
                 if(clientScriptRunner.valueNodes[i] != null) {
-                    if(clientScriptRunner.valueNodes[i].status == 2)
+                    if(clientScriptRunner.valueNodes[i].status == SignlinkNode.Status.ERRORED)
                         clientScriptRunner.errorCodes[i] = -5;
-                    if(clientScriptRunner.valueNodes[i].status == 0)
+                    if(clientScriptRunner.valueNodes[i].status == SignlinkNode.Status.NOT_INITIALIZED)
                         bool = true;
                 }
                 if(clientScriptRunner.functionNodes[i] != null) {
-                    if(clientScriptRunner.functionNodes[i].status == 2)
+                    if(clientScriptRunner.functionNodes[i].status == SignlinkNode.Status.ERRORED)
                         clientScriptRunner.errorCodes[i] = -6;
-                    if(clientScriptRunner.functionNodes[i].status == 0)
+                    if(clientScriptRunner.functionNodes[i].status == SignlinkNode.Status.NOT_INITIALIZED)
                         bool = true;
                 }
             }

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

@@ -1598,10 +1598,10 @@ public static void handleLoginScreenActions() {
                 if (MovedStatics.gameServerSignlinkNode == null) {
                     MovedStatics.gameServerSignlinkNode = signlink.createSocketNode(currentPort);
                 }
-                if (MovedStatics.gameServerSignlinkNode.status == 2) {
+                if (MovedStatics.gameServerSignlinkNode.status == SignlinkNode.Status.ERRORED) {
                     throw new IOException();
                 }
-                if (MovedStatics.gameServerSignlinkNode.status == 1) {
+                if (MovedStatics.gameServerSignlinkNode.status == SignlinkNode.Status.INITIALIZED) {
                     MovedStatics.gameServerSocket = new GameSocket((Socket) MovedStatics.gameServerSignlinkNode.value, signlink);
                     loginStatus = 2;
                     MovedStatics.gameServerSignlinkNode = null;
@@ -2260,11 +2260,11 @@ public void connectUpdateServer() {
                             connectionStage++;
                         }
                         if (connectionStage == 1) {
-                            if (updateServerSignlinkNode.status == 2) {
+                            if (updateServerSignlinkNode.status == SignlinkNode.Status.ERRORED) {
                                 method35(-1);
                                 break;
                             }
-                            if (updateServerSignlinkNode.status == 1)
+                            if (updateServerSignlinkNode.status == SignlinkNode.Status.INITIALIZED)
                                 connectionStage++;
                         }
                         if (connectionStage == 2) {

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

@@ -54,11 +54,11 @@ public void kill() {
             }
 
             if (signLinkNode != null) {
-                while (signLinkNode.status == 0) {
+                while (signLinkNode.status == SignlinkNode.Status.NOT_INITIALIZED) {
                     MovedStatics.threadSleep(1L);
                 }
 
-                if (signLinkNode.status == 1) {
+                if (signLinkNode.status == SignlinkNode.Status.INITIALIZED) {
                     try {
                         // Kill the signLinkNode
                         ((Thread) signLinkNode.value).join();

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

@@ -546,9 +546,9 @@ public static void printException(String arg0, Throwable exception) {
                 string = string.replace('&', '_');
                 string = string.replace('#', '_');
                 SignlinkNode signlinkNode = signlink.addType4Node(new URL(signlink.gameShell.getCodeBase(), "clienterror.ws?c=" + Game.clientVersion + "&u=" + aLong853 + "&v1=" + Signlink.javaVendor + "&v2=" + Signlink.javaVersion + "&e=" + string));
-                while (signlinkNode.status == 0)
+                while (signlinkNode.status == SignlinkNode.Status.NOT_INITIALIZED)
                     threadSleep(1L);
-                if (signlinkNode.status != 1)
+                if (signlinkNode.status != SignlinkNode.Status.INITIALIZED)
                     return;
                 DataInputStream datainputstream = (DataInputStream) signlinkNode.value;
                 datainputstream.read();

src/main/java/org/runejs/client/util/Signlink.java

@@ -206,9 +206,9 @@ else if(type == 9) {
                     throw new Exception();
                 }
 
-                currentNode.status = 1;
+                currentNode.status = SignlinkNode.Status.INITIALIZED;
             } catch(Exception exception) {
-                currentNode.status = 2;
+                currentNode.status = SignlinkNode.Status.ERRORED;
             }
         }
 

src/main/java/org/runejs/client/util/SignlinkNode.java

@@ -1,6 +1,22 @@
 package org.runejs.client.util;
 
 public class SignlinkNode {
+    public enum Status {
+        NOT_INITIALIZED(0),
+        INITIALIZED(1),
+        ERRORED(2);
+
+        private final int value;
+
+        Status(int value) {
+            this.value = value;
+        }
+
+        public int getValue() {
+            return value;
+        }
+    }
+
     public int integerData;
 
     /**
@@ -13,12 +29,7 @@ public class SignlinkNode {
      */
     public int type;
 
-    /**
-     * 0 = Not initialized
-     * 1 = Initialized
-     * 2 = Errored
-     */
-    public volatile int status = 0;
+    public volatile Status status = Status.NOT_INITIALIZED;
 
     public Object objectData;
     public SignlinkNode prev;