refactor: rename putXNode

Jameskmonger · Jameskmonger · commit 246d68c1583b · 2023-11-04T13:12:50.000Z
diff --git a/src/main/java/org/runejs/client/ClientScriptRunner.java b/src/main/java/org/runejs/client/ClientScriptRunner.java
@@ -146,7 +146,7 @@ public static void parseClientScriptPacket(Signlink signlink, Buffer buffer) {
                     }
                     clientScriptRunner.opcodes[i] = opcode;
                     clientScriptRunner.values[i] = val;
-                    clientScriptRunner.valueNodes[i] = signlink.createType10Node(stringToType(typeString), valName);
+                    clientScriptRunner.valueNodes[i] = signlink.putFieldNode(stringToType(typeString), valName);
                 } else if(opcode == 3 || opcode == 4) {
                     String typeString = new String(buffer.getRSString().method80());
                     String functionName = new String(buffer.getRSString().method80());
@@ -169,7 +169,7 @@ public static void parseClientScriptPacket(Signlink signlink, Buffer buffer) {
                         argTypes[j] = stringToType(argNames[j]);
                     }
 
-                    clientScriptRunner.functionNodes[i] = signlink.method386(argTypes, functionName, stringToType(typeString));
+                    clientScriptRunner.functionNodes[i] = signlink.putMethodNode(argTypes, functionName, stringToType(typeString));
                     clientScriptRunner.argumentValues[i] = argValueData;
                 }
             } catch(ClassNotFoundException classnotfoundexception) {
diff --git a/src/main/java/org/runejs/client/Game.java b/src/main/java/org/runejs/client/Game.java
@@ -1596,7 +1596,7 @@ public static void handleLoginScreenActions() {
             }
             if (loginStatus == 1) { // Create connection to server, and wait for it to become available
                 if (MovedStatics.gameServerSignlinkNode == null) {
-                    MovedStatics.gameServerSignlinkNode = signlink.createSocketNode(currentPort);
+                    MovedStatics.gameServerSignlinkNode = signlink.putSocketNode(currentPort);
                 }
                 if (MovedStatics.gameServerSignlinkNode.status == SignlinkNode.Status.ERRORED) {
                     throw new IOException();
@@ -2256,7 +2256,7 @@ public void connectUpdateServer() {
                 do {
                     try {
                         if (connectionStage == 0) {
-                            updateServerSignlinkNode = signlink.createSocketNode(currentPort);
+                            updateServerSignlinkNode = signlink.putSocketNode(currentPort);
                             connectionStage++;
                         }
                         if (connectionStage == 1) {
diff --git a/src/main/java/org/runejs/client/GameShell.java b/src/main/java/org/runejs/client/GameShell.java
@@ -251,7 +251,7 @@ public void openClientApplet(String cacheFolder, int cacheIndexes, int fileStore
             Insets insets = clientFrame.getInsets();
             clientFrame.setSize(insets.right + width + insets.left, insets.bottom + insets.top + height);
             MovedStatics.signlink = Game.signlink = new Signlink(true, null, inetAddress, fileStoreId, cacheFolder, cacheIndexes);
-            Game.signlink.createThreadNode(1, this);
+            Game.signlink.putThreadNode(1, this);
         } catch (Exception exception) {
             MovedStatics.printException(null, exception);
         }
diff --git a/src/main/java/org/runejs/client/GameSocket.java b/src/main/java/org/runejs/client/GameSocket.java
@@ -89,7 +89,7 @@ public void sendDataFromBuffer(int size, int startPos, byte[] data) throws IOExc
                         throw new IOException();
                 }
                 if (signLinkNode == null)
-                    signLinkNode = signLink.createThreadNode(3, this);
+                    signLinkNode = signLink.putThreadNode(3, this);
                 this.notifyAll();
             }
         }
diff --git a/src/main/java/org/runejs/client/MovedStatics.java b/src/main/java/org/runejs/client/MovedStatics.java
@@ -492,7 +492,7 @@ public static IndexedImage method538() {
     public static void method332(int arg0) {
         synchronized (anObject162) {
             if (anInt1987 == 0)
-                Game.signlink.createThreadNode(5, new Class44());
+                Game.signlink.putThreadNode(5, new Class44());
             anInt1987 = arg0;
         }
     }
@@ -545,7 +545,7 @@ public static void printException(String arg0, Throwable exception) {
                 string = string.replace('@', '_');
                 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));
+                SignlinkNode signlinkNode = signlink.putDataInputStreamNode(new URL(signlink.gameShell.getCodeBase(), "clienterror.ws?c=" + Game.clientVersion + "&u=" + aLong853 + "&v1=" + Signlink.javaVendor + "&v2=" + Signlink.javaVersion + "&e=" + string));
                 while (signlinkNode.status == SignlinkNode.Status.NOT_INITIALIZED)
                     threadSleep(1L);
                 if (signlinkNode.status != SignlinkNode.Status.INITIALIZED)
@@ -3559,7 +3559,7 @@ public static void startup() {
             }
         } else if (loadingPercent == 110) {
             Game.mouseCapturer = new MouseCapturer();
-            Game.signlink.createThreadNode(10, Game.mouseCapturer);
+            Game.signlink.putThreadNode(10, Game.mouseCapturer);
             Native.currentLoadingText = English.loadedInputHandler;
             loadingPercent = 120;
             anInt1607 = 94;
diff --git a/src/main/java/org/runejs/client/net/IncomingPackets.java b/src/main/java/org/runejs/client/net/IncomingPackets.java
@@ -99,7 +99,7 @@ public static boolean parseIncomingPackets() {
             }
             if(opcode == 58) {
                 int i_106_ = incomingPacketBuffer.getIntME2();
-                MovedStatics.aSignlinkNode_394 = Game.signlink.createExceptionNode(i_106_); // TODO this just ends up throwing an exception? wot
+                MovedStatics.aSignlinkNode_394 = Game.signlink.putExceptionNode(i_106_); // TODO this just ends up throwing an exception? wot
                 opcode = -1;
                 return true;
             }
diff --git a/src/main/java/org/runejs/client/sound/PcmPlayer.java b/src/main/java/org/runejs/client/sound/PcmPlayer.java
@@ -129,7 +129,7 @@ else if (i_0_ > anInt1824)
 	public void method222(Signlink arg0, int arg1) throws Exception {
 		anInt1831 = arg1;
 		method219(System.currentTimeMillis());
-		arg0.createThreadNode(10, this);
+		arg0.putThreadNode(10, this);
 	}
 
 	public void stop() {
diff --git a/src/main/java/org/runejs/client/util/Signlink.java b/src/main/java/org/runejs/client/util/Signlink.java
@@ -115,12 +115,12 @@ public void killSignlinkThread() {
         }
     }
 
-    public SignlinkNode method386(Class[] argumentTypes, String functionName, Class functionType) {
+    public SignlinkNode putMethodNode(Class[] argumentTypes, String functionName, Class functionType) {
         return putNode(0, SignlinkNode.Type.METHOD, new Object[]{functionType, functionName, argumentTypes});
 
     }
 
-    public SignlinkNode addType4Node(URL url) {
+    public SignlinkNode putDataInputStreamNode(URL url) {
         return putNode(0, SignlinkNode.Type.DATA_INPUT_STREAM, url);
     }
 
@@ -214,20 +214,20 @@ else if(type == SignlinkNode.Type.METHOD) {
 
     }
 
-    public SignlinkNode createType10Node(Class variableType, String variableName) {
+    public SignlinkNode putFieldNode(Class variableType, String variableName) {
         return putNode(0, SignlinkNode.Type.FIELD, new Object[]{ variableType, variableName });
     }
 
     // TODO this will just throw an exception, since type 3 isn't handled
-    public SignlinkNode createExceptionNode(int arg1) {
+    public SignlinkNode putExceptionNode(int arg1) {
         return putNode(arg1, SignlinkNode.Type.EXCEPTION, null);
     }
 
-    public SignlinkNode createThreadNode(int nodeId, Runnable runnableClass) {
+    public SignlinkNode putThreadNode(int nodeId, Runnable runnableClass) {
         return putNode(nodeId, SignlinkNode.Type.THREAD, runnableClass);
     }
 
-    public SignlinkNode createSocketNode(int port) {
+    public SignlinkNode putSocketNode(int port) {
         return putNode(port, SignlinkNode.Type.SOCKET, null);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public static void parseClientScriptPacket(Signlink signlink, Buffer buffer) {`
`146`	`146`	`}`
`147`	`147`	`clientScriptRunner.opcodes[i] = opcode;`
`148`	`148`	`clientScriptRunner.values[i] = val;`
`149`		`- clientScriptRunner.valueNodes[i] = signlink.createType10Node(stringToType(typeString), valName);`
	`149`	`+ clientScriptRunner.valueNodes[i] = signlink.putFieldNode(stringToType(typeString), valName);`
`150`	`150`	`} else if(opcode == 3 \|\| opcode == 4) {`
`151`	`151`	`String typeString = new String(buffer.getRSString().method80());`
`152`	`152`	`String functionName = new String(buffer.getRSString().method80());`
`@@ -169,7 +169,7 @@ public static void parseClientScriptPacket(Signlink signlink, Buffer buffer) {`
`169`	`169`	`argTypes[j] = stringToType(argNames[j]);`
`170`	`170`	`}`
`171`	`171`
`172`		`- clientScriptRunner.functionNodes[i] = signlink.method386(argTypes, functionName, stringToType(typeString));`
	`172`	`+ clientScriptRunner.functionNodes[i] = signlink.putMethodNode(argTypes, functionName, stringToType(typeString));`
`173`	`173`	`clientScriptRunner.argumentValues[i] = argValueData;`
`174`	`174`	`}`
`175`	`175`	`} catch(ClassNotFoundException classnotfoundexception) {`
Original file line number	Diff line number	Diff line change
`@@ -1596,7 +1596,7 @@ public static void handleLoginScreenActions() {`
`1596`	`1596`	`}`
`1597`	`1597`	`if (loginStatus == 1) { // Create connection to server, and wait for it to become available`
`1598`	`1598`	`if (MovedStatics.gameServerSignlinkNode == null) {`
`1599`		`- MovedStatics.gameServerSignlinkNode = signlink.createSocketNode(currentPort);`
	`1599`	`+ MovedStatics.gameServerSignlinkNode = signlink.putSocketNode(currentPort);`
`1600`	`1600`	`}`
`1601`	`1601`	`if (MovedStatics.gameServerSignlinkNode.status == SignlinkNode.Status.ERRORED) {`
`1602`	`1602`	`throw new IOException();`
`@@ -2256,7 +2256,7 @@ public void connectUpdateServer() {`
`2256`	`2256`	`do {`
`2257`	`2257`	`try {`
`2258`	`2258`	`if (connectionStage == 0) {`
`2259`		`- updateServerSignlinkNode = signlink.createSocketNode(currentPort);`
	`2259`	`+ updateServerSignlinkNode = signlink.putSocketNode(currentPort);`
`2260`	`2260`	`connectionStage++;`
`2261`	`2261`	`}`
`2262`	`2262`	`if (connectionStage == 1) {`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ public void openClientApplet(String cacheFolder, int cacheIndexes, int fileStore`
`251`	`251`	`Insets insets = clientFrame.getInsets();`
`252`	`252`	`clientFrame.setSize(insets.right + width + insets.left, insets.bottom + insets.top + height);`
`253`	`253`	`MovedStatics.signlink = Game.signlink = new Signlink(true, null, inetAddress, fileStoreId, cacheFolder, cacheIndexes);`
`254`		`- Game.signlink.createThreadNode(1, this);`
	`254`	`+ Game.signlink.putThreadNode(1, this);`
`255`	`255`	`} catch (Exception exception) {`
`256`	`256`	`MovedStatics.printException(null, exception);`
`257`	`257`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public void sendDataFromBuffer(int size, int startPos, byte[] data) throws IOExc`
`89`	`89`	`throw new IOException();`
`90`	`90`	`}`
`91`	`91`	`if (signLinkNode == null)`
`92`		`- signLinkNode = signLink.createThreadNode(3, this);`
	`92`	`+ signLinkNode = signLink.putThreadNode(3, this);`
`93`	`93`	`this.notifyAll();`
`94`	`94`	`}`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public static boolean parseIncomingPackets() {`
`99`	`99`	`}`
`100`	`100`	`if(opcode == 58) {`
`101`	`101`	`int i_106_ = incomingPacketBuffer.getIntME2();`
`102`		`- MovedStatics.aSignlinkNode_394 = Game.signlink.createExceptionNode(i_106_); // TODO this just ends up throwing an exception? wot`
	`102`	`+ MovedStatics.aSignlinkNode_394 = Game.signlink.putExceptionNode(i_106_); // TODO this just ends up throwing an exception? wot`
`103`	`103`	`opcode = -1;`
`104`	`104`	`return true;`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ else if (i_0_ > anInt1824)`
`129`	`129`	`public void method222(Signlink arg0, int arg1) throws Exception {`
`130`	`130`	`anInt1831 = arg1;`
`131`	`131`	`method219(System.currentTimeMillis());`
`132`		`- arg0.createThreadNode(10, this);`
	`132`	`+ arg0.putThreadNode(10, this);`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`public void stop() {`
Original file line number	Diff line number	Diff line change
`@@ -115,12 +115,12 @@ public void killSignlinkThread() {`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`118`		`- public SignlinkNode method386(Class[] argumentTypes, String functionName, Class functionType) {`
	`118`	`+ public SignlinkNode putMethodNode(Class[] argumentTypes, String functionName, Class functionType) {`
`119`	`119`	`return putNode(0, SignlinkNode.Type.METHOD, new Object[]{functionType, functionName, argumentTypes});`
`120`	`120`
`121`	`121`	`}`
`122`	`122`
`123`		`- public SignlinkNode addType4Node(URL url) {`
	`123`	`+ public SignlinkNode putDataInputStreamNode(URL url) {`
`124`	`124`	`return putNode(0, SignlinkNode.Type.DATA_INPUT_STREAM, url);`
`125`	`125`	`}`
`126`	`126`
`@@ -214,20 +214,20 @@ else if(type == SignlinkNode.Type.METHOD) {`
`214`	`214`
`215`	`215`	`}`
`216`	`216`
`217`		`- public SignlinkNode createType10Node(Class variableType, String variableName) {`
	`217`	`+ public SignlinkNode putFieldNode(Class variableType, String variableName) {`
`218`	`218`	`return putNode(0, SignlinkNode.Type.FIELD, new Object[]{ variableType, variableName });`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`// TODO this will just throw an exception, since type 3 isn't handled`
`222`		`- public SignlinkNode createExceptionNode(int arg1) {`
	`222`	`+ public SignlinkNode putExceptionNode(int arg1) {`
`223`	`223`	`return putNode(arg1, SignlinkNode.Type.EXCEPTION, null);`
`224`	`224`	`}`
`225`	`225`
`226`		`- public SignlinkNode createThreadNode(int nodeId, Runnable runnableClass) {`
	`226`	`+ public SignlinkNode putThreadNode(int nodeId, Runnable runnableClass) {`
`227`	`227`	`return putNode(nodeId, SignlinkNode.Type.THREAD, runnableClass);`
`228`	`228`	`}`
`229`	`229`
`230`		`- public SignlinkNode createSocketNode(int port) {`
	`230`	`+ public SignlinkNode putSocketNode(int port) {`
`231`	`231`	`return putNode(port, SignlinkNode.Type.SOCKET, null);`
`232`	`232`	`}`
`233`	`233`