refactor: initial UpdateServer interface

Author: Jameskmonger

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

@@ -12,7 +12,6 @@
 import org.runejs.client.language.Native;
 import org.runejs.client.media.Rasterizer;
 import org.runejs.client.media.VertexNormal;
-import org.runejs.client.net.UpdateServer;
 import org.runejs.client.sound.MusicSystem;
 import org.runejs.Configuration;
 import org.runejs.client.util.BitUtils;
@@ -542,7 +541,7 @@ public static void renderLoginScreen(Component arg0, CacheArchive huffmanCacheAr
                 MusicSystem.method412(false, CacheArchive.musicCacheArchive, 0, Native.titleSong, 10, "", MusicSystem.musicVolume);
             else
                 MusicSystem.method405(10);
-            Game.updateServer.resetUpdateServerRequests(false);
+            Game.updateServer.resetRequests(false);
             MovedStatics.clearScreen = true;
             MovedStatics.aBoolean512 = true;
         }

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

@@ -2194,7 +2194,7 @@ public void processGameLoop() {
 
     public void handleUpdateServer() {
         if (gameStatusCode != 1000) {
-            boolean bool = updateServer.processUpdateServerResponse();
+            boolean bool = updateServer.poll();
             if (!bool)
                 connectUpdateServer();
         }
@@ -2299,7 +2299,7 @@ public void connectUpdateServer() {
                         if (connectionStage != 4)
                             break;
 
-                        updateServer.handleUpdateServerConnection(updateServerSocket, gameStatusCode > 20);
+                        updateServer.receiveConnection(updateServerSocket, gameStatusCode > 20);
 
                         updateServerSignlinkNode = null;
                         connectionStage = 0;
@@ -2340,7 +2340,7 @@ public void close() {
         method249();
         MusicSystem.syncedStop(false);
         SoundSystem.stop();
-        updateServer.killUpdateServerSocket();
+        updateServer.close();
         method947(-1);
         do {
             try {

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

@@ -387,7 +387,7 @@ public static void method440() {
             Class60.aProducingGraphicsBuffer_463 = null;
             Class60.anIntArray1013 = null;
             MusicSystem.method405(10);
-            Game.updateServer.resetUpdateServerRequests(true);
+            Game.updateServer.resetRequests(true);
             aBoolean512 = false;
         }
     }

src/main/java/org/runejs/client/net/IUpdateServer.java

@@ -0,0 +1,20 @@
+package org.runejs.client.net;
+
+import org.runejs.client.GameSocket;
+
+/**
+ * TODO rename , remove I prefix
+ */
+public interface IUpdateServer {
+    void receiveConnection(GameSocket socket, boolean isLoggedIn);
+
+    boolean poll();
+
+    void resetRequests(boolean isLoggedIn);
+
+    void close();
+
+    int calculateDataLoaded(int volume, int file);
+
+    int getActiveCount(boolean pending, boolean immediate);
+}

src/main/java/org/runejs/client/net/UpdateServer.java

@@ -9,8 +9,7 @@
 import java.io.IOException;
 import java.util.zip.CRC32;
 
-
-public class UpdateServer {
+public class UpdateServer implements IUpdateServer {
     public int ioExceptions = 0;
     public int crcMismatches = 0;
 
@@ -36,7 +35,9 @@ public class UpdateServer {
     private long lastUpdateInMillis;
     private CacheArchive[] cacheArchiveLoaders = new CacheArchive[256];
 
-    public void handleUpdateServerConnection(GameSocket socket, boolean arg2) {
+
+    @Override
+    public void receiveConnection(GameSocket socket, boolean isLoggedIn) {
         if(updateServerSocket != null) {
             try {
                 updateServerSocket.kill();
@@ -48,7 +49,7 @@ public void handleUpdateServerConnection(GameSocket socket, boolean arg2) {
         }
 
         updateServerSocket = socket;
-        resetUpdateServerRequests(arg2);
+        resetRequests(isLoggedIn);
         fileDataBuffer.currentPosition = 0;
         inboundFile = null;
         blockOffset = 0;
@@ -100,7 +101,9 @@ public void handleUpdateServerConnection(GameSocket socket, boolean arg2) {
         lastUpdateInMillis = System.currentTimeMillis();
     }
 
-    public boolean processUpdateServerResponse() {
+
+    @Override
+    public boolean poll() {
         long l = System.currentTimeMillis();
         int currentMsSinceLastUpdate = (int) (l - lastUpdateInMillis);
         lastUpdateInMillis = l;
@@ -348,12 +351,12 @@ public void method399(int arg0, int arg2) {
         }
     }
 
-    public void getArchiveChecksum(CacheArchive cacheArchive, int arg2) {
+    public void getArchiveChecksum(CacheArchive cacheArchive, int cacheIndexId) {
         if (crcTableBuffer == null) {
             method327(true, null, 255, 255, (byte) 0, 0);
-            cacheArchiveLoaders[arg2] = cacheArchive;
+            cacheArchiveLoaders[cacheIndexId] = cacheArchive;
         } else {
-            crcTableBuffer.currentPosition = 5 + arg2 * 4;
+            crcTableBuffer.currentPosition = 5 + cacheIndexId * 4;
             int i = crcTableBuffer.getIntBE();
             cacheArchive.requestLatestVersion(i);
         }
@@ -363,7 +366,9 @@ private static int xor(int arg0, int arg1) {
         return arg0 ^ arg1;
     }
 
-    public void resetUpdateServerRequests(boolean loggedIn) {
+
+    @Override
+    public void resetRequests(boolean loggedIn) {
         if (updateServerSocket != null) {
             try {
                 Buffer buffer = new Buffer(4);
@@ -385,19 +390,22 @@ public void resetUpdateServerRequests(boolean loggedIn) {
 
     }
 
-    public void killUpdateServerSocket() {
+    @Override
+    public void close() {
         if(updateServerSocket != null) {
             updateServerSocket.kill();
         }
     }
 
-    public int calculateDataLoaded(int arg1, int arg2) {
-        long l = (long) ((arg1 << 16) + arg2);
+    @Override
+    public int calculateDataLoaded(int volume, int file) {
+        long l = (long) ((volume << 16) + file);
         if (currentResponse == null || currentResponse.key != l)
             return 0;
         return 1 + inboundFile.currentPosition * 99 / (inboundFile.buffer.length + -currentResponse.padding);
     }
 
+    @Override
     public int getActiveCount(boolean pending, boolean immediate) {
         int total = 0;
         if (immediate) {