refactor: non-static UpdateServer

Author: Jameskmonger

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

@@ -542,7 +542,7 @@ public static void renderLoginScreen(Component arg0, CacheArchive huffmanCacheAr
                 MusicSystem.method412(false, CacheArchive.musicCacheArchive, 0, Native.titleSong, 10, "", MusicSystem.musicVolume);
             else
                 MusicSystem.method405(10);
-            UpdateServer.resetUpdateServerRequests(false);
+            Game.updateServer.resetUpdateServerRequests(false);
             MovedStatics.clearScreen = true;
             MovedStatics.aBoolean512 = true;
         }

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

@@ -76,6 +76,11 @@ public class Game {
      */
     public static final CutsceneCamera cutsceneCamera = new CutsceneCamera();
 
+    /**
+     * TODO use interface
+     */
+    public static final UpdateServer updateServer = new UpdateServer();
+
     public static FriendList friendList;
 
     public static final SocialList ignoreList = new SocialList(100);
@@ -871,7 +876,7 @@ public static void method353() {
         }
 
 
-        if(aBoolean519 && UpdateServer.getActiveCount(false, true) == 0) {
+        if(aBoolean519 && updateServer.getActiveCount(false, true) == 0) {
             aBoolean519 = false;
         }
         if(aBoolean519) {
@@ -2189,7 +2194,7 @@ public void processGameLoop() {
 
     public void handleUpdateServer() {
         if (gameStatusCode != 1000) {
-            boolean bool = UpdateServer.processUpdateServerResponse();
+            boolean bool = updateServer.processUpdateServerResponse();
             if (!bool)
                 connectUpdateServer();
         }
@@ -2238,13 +2243,13 @@ else if (gameStatusCode == 5) {
     }
 
     public void connectUpdateServer() {
-        if (UpdateServer.crcMismatches >= 4) {
+        if (updateServer.crcMismatches >= 4) {
             this.openErrorPage("js5crc");
             gameStatusCode = 1000;
         } else {
-            if (UpdateServer.ioExceptions >= 4) {
+            if (updateServer.ioExceptions >= 4) {
                 if (gameStatusCode > 5) {
-                    UpdateServer.ioExceptions = 3;
+                    updateServer.ioExceptions = 3;
                     anInt509 = 3000;
                 } else {
                     this.openErrorPage("js5io");
@@ -2294,7 +2299,7 @@ public void connectUpdateServer() {
                         if (connectionStage != 4)
                             break;
 
-                        UpdateServer.handleUpdateServerConnection(updateServerSocket, gameStatusCode > 20);
+                        updateServer.handleUpdateServerConnection(updateServerSocket, gameStatusCode > 20);
 
                         updateServerSignlinkNode = null;
                         connectionStage = 0;
@@ -2335,7 +2340,7 @@ public void close() {
         method249();
         MusicSystem.syncedStop(false);
         SoundSystem.stop();
-        UpdateServer.killUpdateServerSocket();
+        updateServer.killUpdateServerSocket();
         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);
-            UpdateServer.resetUpdateServerRequests(true);
+            Game.updateServer.resetUpdateServerRequests(true);
             aBoolean512 = false;
         }
     }

src/main/java/org/runejs/client/cache/CacheArchive.java

@@ -60,7 +60,7 @@ public CacheArchive(CacheIndex dataIndex, CacheIndex metaIndex, int cacheIndexId
         aBoolean1811 = arg5;
         this.metaIndex = metaIndex;
         this.cacheIndexId = cacheIndexId;
-        UpdateServer.getArchiveChecksum(this, this.cacheIndexId);
+        Game.updateServer.getArchiveChecksum(this, this.cacheIndexId);
     }
 
     public static CacheArchive loadArchive(int cacheIndexId, boolean arg1, boolean arg2, boolean arg4) {
@@ -164,7 +164,7 @@ public int getPercentLoaded() {
             return 100;
         if(aByteArrayArray212 != null)
             return 99;
-        int i = UpdateServer.calculateDataLoaded(255, cacheIndexId);
+        int i = Game.updateServer.calculateDataLoaded(255, cacheIndexId);
         if(i >= 100)
             i = 99;
         return i;
@@ -176,15 +176,15 @@ public void method198(boolean arg1, byte[] arg2, int arg3, CacheIndex arg4) {
             if(aBoolean1800)
                 throw new RuntimeException();
             if(arg2 == null) {
-                UpdateServer.method327(true, this, 255, cacheIndexId, (byte) 0,
+                Game.updateServer.method327(true, this, 255, cacheIndexId, (byte) 0,
                         archiveCrcValue);
                 return;
             }
             crc32.reset();
             crc32.update(arg2, 0, arg2.length);
             int i = (int) crc32.getValue();
             if(i != archiveCrcValue) {
-                UpdateServer.method327(true, this, 255, cacheIndexId, (byte) 0,
+                Game.updateServer.method327(true, this, 255, cacheIndexId, (byte) 0,
                         archiveCrcValue);
                 return;
             }
@@ -197,7 +197,7 @@ public void method198(boolean arg1, byte[] arg2, int arg3, CacheIndex arg4) {
             if(arg2 == null || arg2.length <= 2) {
                 aBooleanArray1796[arg3] = false;
                 if(aBoolean1811 || arg1)
-                    UpdateServer.method327(arg1, this, cacheIndexId, arg3, (byte) 2, anIntArray252[arg3]);
+                    Game.updateServer.method327(arg1, this, cacheIndexId, arg3, (byte) 2, anIntArray252[arg3]);
                 return;
             }
             crc32.reset();
@@ -207,7 +207,7 @@ public void method198(boolean arg1, byte[] arg2, int arg3, CacheIndex arg4) {
             if(i != anIntArray252[arg3] || i_0_ != anIntArray224[arg3]) {
                 aBooleanArray1796[arg3] = false;
                 if(aBoolean1811 || arg1)
-                    UpdateServer.method327(arg1, this, cacheIndexId, arg3, (byte) 2, anIntArray252[arg3]);
+                    Game.updateServer.method327(arg1, this, cacheIndexId, arg3, (byte) 2, anIntArray252[arg3]);
                 return;
             }
             aBooleanArray1796[arg3] = true;
@@ -220,11 +220,11 @@ public void method177(int arg1) {
         if(dataIndex != null && aBooleanArray1796 != null && aBooleanArray1796[arg1])
             method602(this, arg1, dataIndex);
         else
-            UpdateServer.method327(true, this, cacheIndexId, arg1, (byte) 2, anIntArray252[arg1]);
+            Game.updateServer.method327(true, this, cacheIndexId, arg1, (byte) 2, anIntArray252[arg1]);
     }
 
     public void method174(int arg0) {
-        UpdateServer.method399(cacheIndexId, arg0);
+        Game.updateServer.method399(cacheIndexId, arg0);
     }
 
     public void method199() {
@@ -249,7 +249,7 @@ public void method199() {
     public void requestLatestVersion(int crcValue) {
         archiveCrcValue = crcValue;
         if(metaIndex == null)
-            UpdateServer.method327(true, this, 255, cacheIndexId, (byte) 0, archiveCrcValue);
+            Game.updateServer.method327(true, this, 255, cacheIndexId, (byte) 0, archiveCrcValue);
         else
             method602(this, cacheIndexId, metaIndex);
     }
@@ -259,7 +259,7 @@ public int method201(int arg0) {
             return 100;
         if(aBooleanArray1796[arg0])
             return 100;
-        return UpdateServer.calculateDataLoaded(cacheIndexId, arg0);
+        return Game.updateServer.calculateDataLoaded(cacheIndexId, arg0);
     }
 
     public int method202() {