refactor: rename Main -> Game

Author: Jameskmonger

build.gradle

@@ -14,7 +14,7 @@ repositories {
 }
 
 application {
-    mainClassName 'org.runejs.client.Main'
+    mainClassName 'org.runejs.client.Game'
 }
 
 jar {

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

@@ -86,9 +86,9 @@ public static synchronized byte[] method246(int arg1) {
             GroundItemTile.aByteArrayArray1377[anInt356] = null;
             return is;
         }
-        if(arg1 == 5000 && Main.anInt1764 > 0) {
-            byte[] is = Class44.aByteArrayArray1039[--Main.anInt1764];
-            Class44.aByteArrayArray1039[Main.anInt1764] = null;
+        if(arg1 == 5000 && Game.anInt1764 > 0) {
+            byte[] is = Class44.aByteArrayArray1039[--Game.anInt1764];
+            Class44.aByteArrayArray1039[Game.anInt1764] = null;
             return is;
         }
         if(arg1 == 30000 && MovedStatics.anInt2359 > 0) {

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

@@ -11,7 +11,7 @@ public class Class37 {
     public static ImageRGB[] cursorCross;
 
     static {
-        Main.anInt874 = 0;
+        Game.anInt874 = 0;
     }
 
     public static void method434() {

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

@@ -111,7 +111,7 @@ public static void startup() {
             }
         } else if (MovedStatics.loadingPercent == 45) {
             MusicSystem.initialiseMusic(0);
-            SoundSystem.initialiseSound(Main.signlink);
+            SoundSystem.initialiseSound(Game.signlink);
             MovedStatics.loadingPercent = 50;
             Native.currentLoadingText = English.preparedSoundEngine;
             MovedStatics.anInt1607 = 35;
@@ -156,7 +156,7 @@ public static void startup() {
                 UnderlayDefinition.initializeUnderlayDefinitionCache(CacheArchive.gameDefinitionsCacheArchive);
                 initializeIdentityKitDefinitionCache(CacheArchive.gameDefinitionsCacheArchive, CacheArchive.modelCacheArchive);
                 initializeGameObjectDefinitionCache(CacheArchive.modelCacheArchive, VertexNormal.lowMemory, CacheArchive.gameDefinitionsCacheArchive);
-                Main.method357(CacheArchive.modelCacheArchive, CacheArchive.gameDefinitionsCacheArchive);
+                Game.method357(CacheArchive.modelCacheArchive, CacheArchive.gameDefinitionsCacheArchive);
                 MovedStatics.initializeItemDefinitionCache(CacheArchive.gameDefinitionsCacheArchive, MovedStatics.membersWorld, CacheArchive.modelCacheArchive);
                 MovedStatics.initializeAnimationCaches(CacheArchive.skinDefinitionCacheArchive, CacheArchive.gameDefinitionsCacheArchive, CacheArchive.skeletonCacheArchive);
                 Class55.method966(CacheArchive.modelCacheArchive, CacheArchive.gameDefinitionsCacheArchive);
@@ -268,8 +268,8 @@ public static void startup() {
                 MovedStatics.anInt1607 = 90;
             }
         } else if (MovedStatics.loadingPercent == 110) {
-            Main.mouseCapturer = new Class39();
-            Main.signlink.createThreadNode(10, Main.mouseCapturer);
+            Game.mouseCapturer = new Class39();
+            Game.signlink.createThreadNode(10, Game.mouseCapturer);
             Native.currentLoadingText = English.loadedInputHandler;
             MovedStatics.loadingPercent = 120;
             MovedStatics.anInt1607 = 94;

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

@@ -44,7 +44,7 @@ public static boolean method840(byte[] arg1, int arg2, int arg3) {
                             bool_2_ = true;
                             if(!gameObjectDefinition.method612()) {
                                 bool = false;
-                                Main.anInt2591++;
+                                Game.anInt2591++;
                             }
                         }
                     }

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

@@ -36,11 +36,11 @@ public static void drawTabArea() {
         MovedStatics.showSidePanelRedrawnText = true;
         MovedStatics.method996();
         if(GameInterface.tabAreaInterfaceId != -1) {
-            boolean bool = Main.drawParentInterface(1, 0, 0, 190, 261, GameInterface.tabAreaInterfaceId);
+            boolean bool = Game.drawParentInterface(1, 0, 0, 190, 261, GameInterface.tabAreaInterfaceId);
             if(!bool)
                 GameInterface.redrawTabArea = true;
         } else if(Player.tabWidgetIds[Player.currentTabId] != -1) {
-            boolean bool = Main.drawParentInterface(1, 0, 0, 190, 261, Player.tabWidgetIds[Player.currentTabId]);
+            boolean bool = Game.drawParentInterface(1, 0, 0, 190, 261, Player.tabWidgetIds[Player.currentTabId]);
             if(!bool)
                 GameInterface.redrawTabArea = true;
         }
@@ -164,7 +164,7 @@ public static void method398() {
             if(i > 190)
                 i = 190;
             int i_1_ = CollisionMap.menuHeight;
-            int i_2_ = Main.menuOffsetY;
+            int i_2_ = Game.menuOffsetY;
             if(i_0_ < 0)
                 i_0_ = 0;
             int i_3_ = 6116423;

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

@@ -78,7 +78,7 @@ public static void determineMenuSize() {
                     y = 334 - height;
                 if(y < 0)
                     y = 0;
-                Main.menuOffsetY = y;
+                Game.menuOffsetY = y;
             }
             if(MouseHandler.clickX > 553 && MouseHandler.clickY > 205 && MouseHandler.clickX < 743 && MouseHandler.clickY < 466) {
                 CollisionMap.menuHeight = 22 + 15 * MovedStatics.menuActionRow;
@@ -97,7 +97,7 @@ else if(width + x > 190)
                 } else
                     y = 0;
                 VertexNormal.menuWidth = width;
-                Main.menuOffsetY = y;
+                Game.menuOffsetY = y;
             }
             if(MouseHandler.clickX > 17 && MouseHandler.clickY > 357 && MouseHandler.clickX < 496 && MouseHandler.clickY < 453) {
                 VertexNormal.menuWidth = width;
@@ -111,7 +111,7 @@ else if(width + x > 190)
                     y = 0;
                 int x = -(width / 2) + -17 + MouseHandler.clickX;
                 MovedStatics.menuOpen = true;
-                Main.menuOffsetY = y;
+                Game.menuOffsetY = y;
                 if(x < 0)
                     x = 0;
                 else if(x + width > 479)
@@ -137,7 +137,7 @@ else if(x + width > 479)
                 x = ScreenController.drawWidth - width;
             MovedStatics.menuOpen = true;
             InteractiveObject.menuOffsetX = x;
-            Main.menuOffsetY = y;
+            Game.menuOffsetY = y;
             VertexNormal.menuWidth = width;
             CollisionMap.menuHeight = MovedStatics.menuActionRow * 15 + 22;
         }
@@ -158,7 +158,7 @@ else if(x + width > 479)
 //            } else
 //                y = 0;
 //            VertexNormal.menuWidth = width;
-//            Main.menuOffsetY = y;
+//            Game.menuOffsetY = y;
 //        }
 //        if(Class57.clickX > 17 && RSString.clickY > 357 && Class57.clickX < 496 && RSString.clickY < 453) {
 //            VertexNormal.menuWidth = width;
@@ -172,7 +172,7 @@ else if(x + width > 479)
 //                y = 0;
 //            int x = -(width / 2) + -17 + Class57.clickX;
 //            Class4.menuOpen = true;
-//            Main.menuOffsetY = y;
+//            Game.menuOffsetY = y;
 //            if(x < 0)
 //                x = 0;
 //            else if(x + width > 479)
@@ -423,7 +423,7 @@ public static void drawLoadingScreen(TypeFace fontBold, TypeFace fontSmall) {
             Rasterizer.drawDiagonalLine(0,0, 42,42, 0xFF0000);
         }
 
-        Main.renderFlames();
+        Game.renderFlames();
 
         try {
             int offsetX = 0;
@@ -601,8 +601,8 @@ public static void renderLoginScreen(Component arg0, CacheArchive huffmanCacheAr
 
             logo.drawImage(-128 + 382 + -(logo.imageWidth / 2), 18);
 
-            Class40_Sub5_Sub15.loginScreenBox = Main.method359(Native.titleBox, "", gameImageCacheArchive);
-            Class59.imgLoginScreenButton = Main.method359(Native.titleButton, "", gameImageCacheArchive);
+            Class40_Sub5_Sub15.loginScreenBox = Game.method359(Native.titleBox, "", gameImageCacheArchive);
+            Class59.imgLoginScreenButton = Game.method359(Native.titleButton, "", gameImageCacheArchive);
             MovedStatics.aClass40_Sub5_Sub14_Sub2Array535 = IndexedImage.getMultipleIndexedImages(gameImageCacheArchive, Native.runes, "");
 
             Class39.aClass40_Sub5_Sub14_Sub4_918 = new ImageRGB(128, 265);

src/main/java/org/runejs/client/Main.java renamed to src/main/java/org/runejs/client/Game.java

@@ -52,7 +52,7 @@
 import java.net.InetAddress;
 import java.net.Socket;
 
-public class Main extends GameShell {
+public class Game extends GameShell {
 
     /**
      * The codec currently in use to encode and decode packets.
@@ -726,8 +726,8 @@ else if (!params[2].equals("rc")) {
                 printHelp();
             }
 
-            Main main = new Main();
-            main.openClientApplet("client435", 13, 32 + modewhat, InetAddress.getByName(Configuration.SERVER_ADDRESS), 435);
+            Game game = new Game();
+            game.openClientApplet("client435", 13, 32 + modewhat, InetAddress.getByName(Configuration.SERVER_ADDRESS), 435);
 
         } catch (Exception exception) {
             exception.printStackTrace();
@@ -764,7 +764,7 @@ public static void setConfigToDefaults() {
         SoundSystem.reset();
         widgetSelected = 0;
         // TODO is this necessary? or should it be removed alongside other randomisation
-        Main.playerCamera.setYaw(0x7ff & -10 + (int) (20.0 * Math.random()));
+        Game.playerCamera.setYaw(0x7ff & -10 + (int) (20.0 * Math.random()));
         Minimap.minimapState = 0;
         Player.localPlayerCount = 0;
         Class55.destinationY = 0;
@@ -825,7 +825,7 @@ public static void method353() {
         MovedStatics.renderProjectiles();
         MovedStatics.renderSpotAnims();
         if(!Player.cutsceneActive) {
-            int pitch = Main.playerCamera.getPitch();
+            int pitch = Game.playerCamera.getPitch();
             if(SceneCamera.cameraTerrainMinScaledPitch / 256 > pitch) {
                 pitch = SceneCamera.cameraTerrainMinScaledPitch / 256;
             }
@@ -834,7 +834,7 @@ public static void method353() {
                 pitch = 128 + SceneCamera.customCameraAmplitude[4];
             }
 
-            Main.playerCamera.setPitch(pitch);
+            Game.playerCamera.setPitch(pitch);
         }
 
         int i;
@@ -916,7 +916,7 @@ public static void method353() {
      * Get the currently active camera.
      */
     public static Camera getActiveCamera() {
-        return Player.cutsceneActive ? Main.cutsceneCamera : Main.playerCamera;
+        return Player.cutsceneActive ? Game.cutsceneCamera : Game.playerCamera;
     }
 
     public static void method357(CacheArchive arg0, CacheArchive arg2) {
@@ -1209,7 +1209,7 @@ public static void method164() {
 
     public static void moveTowardsTarget() {
         // TODO (James) this moves the cutscene camera towards its target, we should move this into the CutsceneCamera class
-        CutsceneCamera camera = Main.cutsceneCamera;
+        CutsceneCamera camera = Game.cutsceneCamera;
 
         int i = camera.getMoveTo().y;
         int i_3_ = camera.getMoveTo().x;
@@ -1428,8 +1428,8 @@ else if(x > 764)
                     InteractiveObject.anInt487 = 20;
                     MovedStatics.aBoolean565 = false;
                     SceneCluster.packetBuffer.putPacket(58);
-                    SceneCluster.packetBuffer.putShortBE(Main.playerCamera.getYaw());
-                    SceneCluster.packetBuffer.putShortBE(Main.playerCamera.getPitch());
+                    SceneCluster.packetBuffer.putShortBE(Game.playerCamera.getYaw());
+                    SceneCluster.packetBuffer.putShortBE(Game.playerCamera.getPitch());
                 }
                 if(MovedStatics.aBoolean571 && !aBoolean1735) {
                     aBoolean1735 = true;

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

@@ -48,11 +48,11 @@ public void run() {
                 Class40_Sub3.anInt2024 = 5;
             }
         }
-        if (Main.signlink.gameShell != null) {
+        if (Game.signlink.gameShell != null) {
             Method method = Signlink.aMethod724;
             if (method != null) {
                 try {
-                    method.invoke(Main.signlink.gameShell, Boolean.TRUE);
+                    method.invoke(Game.signlink.gameShell, Boolean.TRUE);
                 } catch (Throwable throwable) {
                 }
             }
@@ -110,9 +110,9 @@ public synchronized void closeGameShell() {
                     /* empty */
                 }
             }
-            if (Main.signlink != null) {
+            if (Game.signlink != null) {
                 try {
-                    Main.signlink.killSignlinkThread();
+                    Game.signlink.killSignlinkThread();
                 } catch (Exception exception) {
                     /* empty */
                 }
@@ -211,14 +211,14 @@ public void displayClientFrame(int clientVersion, int width, int height, int fil
         Class39.anInt901 = clientVersion;
         MovedStatics.height = width;
         currentGameShell = this;
-        if (Main.signlink == null) {
+        if (Game.signlink == null) {
             try {
-                Actor.signlink = Main.signlink = new Signlink(false, this, InetAddress.getByName(getCodeBase().getHost()), fileStoreId, null, 0);
+                Actor.signlink = Game.signlink = new Signlink(false, this, InetAddress.getByName(getCodeBase().getHost()), fileStoreId, null, 0);
             } catch (IOException e) {
                 e.printStackTrace();
             }
         }
-        Main.signlink.createThreadNode(1, this);
+        Game.signlink.createThreadNode(1, this);
         windowActivated(null);
     }
 
@@ -286,8 +286,8 @@ 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);
 //            Class35.aFrame1732.setLocationRelativeTo(null);
-            Actor.signlink = Main.signlink = new Signlink(true, null, inetAddress, fileStoreId, cacheFolder, cacheIndexes);
-            Main.signlink.createThreadNode(1, this);
+            Actor.signlink = Game.signlink = new Signlink(true, null, inetAddress, fileStoreId, cacheFolder, cacheIndexes);
+            Game.signlink.createThreadNode(1, this);
         } catch (Exception exception) {
             MovedStatics.printException(null, exception);
         }

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

@@ -52,28 +52,28 @@ public class Landscape {
     public static int[][][] constructMapTiles = new int[4][13][13];
 
     public static void loadRegion() {
-        Main.method364(false);
-        Main.anInt874 = 0;
+        Game.method364(false);
+        Game.anInt874 = 0;
         boolean bool = true;
         for(int i = 0; i < RSString.terrainData.length; i++) {
             if(LinkedList.terrainDataIds[i] != -1 && RSString.terrainData[i] == null) {
                 RSString.terrainData[i] = CacheArchive.gameWorldMapCacheArchive.getFile(LinkedList.terrainDataIds[i], 0);
                 if(RSString.terrainData[i] == null) {
-                    Main.anInt874++;
+                    Game.anInt874++;
                     bool = false;
                 }
             }
             if(Class13.objectDataIds[i] != -1 && objectData[i] == null) {
                 objectData[i] = CacheArchive.gameWorldMapCacheArchive.method176(Class13.objectDataIds[i], 0, Class44.xteaKeys[i]);
                 if(objectData[i] == null) {
-                    Main.anInt874++;
+                    Game.anInt874++;
                     bool = false;
                 }
             }
         }
         if(bool) {
             bool = true;
-            Main.anInt2591 = 0;
+            Game.anInt2591 = 0;
             for(int i = 0; RSString.terrainData.length > i; i++) {
                 byte[] is = objectData[i];
                 if(is != null) {
@@ -103,7 +103,7 @@ public static void loadRegion() {
                 method1020();
                 int dataLength = RSString.terrainData.length;
                 SoundSystem.clearObjectSounds();
-                Main.method364(true);
+                Game.method364(true);
                 if(!GroundItemTile.loadGeneratedMap) {
                     for(int pointer = 0; dataLength > pointer; pointer++) {
                         int offsetY = -Class26.baseY + (0xff & mapCoordinates[pointer]) * 64;
@@ -123,7 +123,7 @@ public static void loadRegion() {
                         if(data == null && Class17.regionY < 800)
                             MovedStatics.initiateVertexHeights(offsetY, 64, 64, offsetX);
                     }
-                    Main.method364(true);
+                    Game.method364(true);
                     for(int region = 0; dataLength > region; region++) {
                         //                        System.out.println("Requesting map: "+Class13.anIntArray421[i_12_]);
                         // load maps in here
@@ -180,7 +180,7 @@ public static void loadRegion() {
                                 MovedStatics.initiateVertexHeights(y * 8, 8, 8, 8 * x);
                         }
                     }
-                    Main.method364(true);
+                    Game.method364(true);
                     for(int z = 0; z < 4; z++) {
                         for(int x = 0; x < 13; x++) {
                             for(int y = 0; y < 13; y++) {
@@ -202,10 +202,10 @@ public static void loadRegion() {
                         }
                     }
                 }
-                Main.method364(true);
+                Game.method364(true);
                 RSCanvas.clearCaches();
                 createRegion(Npc.currentScene, currentCollisionMap);
-                Main.method364(true);
+                Game.method364(true);
                 int z = MovedStatics.lowestPlane;
                 if(Player.worldLevel < z)
                     z = Player.worldLevel;
@@ -703,7 +703,7 @@ else if(s > 255)
 
     private static void method285(byte arg0) {
         if(arg0 != 118)
-            Main.aBoolean519 = true;
+            Game.aBoolean519 = true;
         for(Class40_Sub3 class40_sub3 = (Class40_Sub3) LinkedList.aLinkedList_1064.peekFirst(); class40_sub3 != null; class40_sub3 = (Class40_Sub3) LinkedList.aLinkedList_1064.pollFirst()) {
             if(class40_sub3.anInt2031 == -1) {
                 class40_sub3.anInt2033 = 0;