Merge pull request #179 from runejs/refactor/move-game-init-to-game

Move game specific login to Game from Gameshell

Author: Jameskmonger

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

@@ -52,11 +52,11 @@ public class Game {
 
     /**
      * The codec currently in use to encode and decode packets.
-     * 
+     *
      * TODO (Jameskmonger) add a clear way to use different codecs
      */
     public static final MessagePacketCodec packetCodec = new RuneJS435PacketCodec();
-    
+
     /**
      * The registry that holds all the InboundMessage handlers.
      */
@@ -695,6 +695,78 @@ public static void setConfigToDefaults() {
         aBoolean519 = true;
     }
 
+    public Game(String[] args) {
+        Configuration.read();
+        Native.username = Configuration.getUsername();
+        Native.password = Configuration.getPassword();
+        String[] params = new String[]{"1", "live", "live", "highmem", "members"};
+        if (args.length != 0) {
+            params = args;
+        }
+        if (params.length != 5) {
+            Game.printHelp();
+        }
+
+        Player.worldId = Integer.parseInt(params[0]);
+
+        // Location argument (to set server IP based on JMod location?)
+        switch (params[1]) {
+            case "live":
+                Game.modewhere = 0;
+                break;
+            case "office":
+                Game.modewhere = 1;
+                break;
+            case "local":
+                Game.modewhere = 2;
+                break;
+            default:
+                Game.printHelp();
+                break;
+        }
+
+        switch (params[2]) {
+            case "live":
+                Game.modewhat = 0;
+                break;
+            case "rc":
+                Game.modewhat = 1;
+                break;
+            case "wip":
+                Game.modewhat = 2;
+                break;
+            default:
+                Game.printHelp();
+                break;
+        }
+        // Memory argument
+        switch (params[3]) {
+            case "lowmem":
+                Game.setLowMemory();
+                break;
+            case "highmem":
+                MovedStatics.setHighMemory();
+                break;
+            default:
+                Game.printHelp();
+                break;
+        }
+
+        // Memory argument
+        switch (params[4]) {
+            case "free":
+                MovedStatics.membersWorld = false;
+                break;
+            case "members":
+                MovedStatics.membersWorld = true;
+
+                break;
+            default:
+                Game.printHelp();
+                break;
+        }
+    }
+
     public static void method353() {
         MovedStatics.anInt2628++;
         renderPlayers(0, true);
@@ -1616,7 +1688,7 @@ public static void handleLoginScreenActions() {
 
                 // TODO (Jameskmonger) this allows the OutgoingPackets to access the ISAAC cipher. This is a hack and should be fixed.
                 OutgoingPackets.init(OutgoingPackets.buffer.outCipher);
-                
+
                 for (int i = 0; i < 4; i++) {
                     seeds[i] += 50;
                 }

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

@@ -41,63 +41,11 @@ public GameShell(Game game) {
     }
 
     public static void main(String[] args) {
-        Configuration.read();
-        Native.username = Configuration.getUsername();
-        Native.password = Configuration.getPassword();
-        String[] params = new String[]{"1", "live", "live", "highmem", "members"};
-        if(args.length != 0) {
-            params = args;
-        }
+        Game game = new Game(args);
+        GameShell shell = new GameShell(game);
+        game.setErrorHandler(shell);
         try {
-            if (params.length != 5)
-                Game.printHelp();
-
-            Player.worldId = Integer.parseInt(params[0]);
-
-            // Location argument (to set server IP based on JMod location?)
-            if (params[1].equals("live")) {
-                Game.modewhere = 0;
-            } else if (params[1].equals("office")) {
-                Game.modewhere = 1;
-            } else if (params[1].equals("local")) {
-                Game.modewhere = 2;
-            } else {
-                Game.printHelp();
-            }
-
-            if (params[2].equals("live"))
-                Game.modewhat = 0;
-            else if (!params[2].equals("rc")) {
-                if (params[2].equals("wip"))
-                    Game.modewhat = 2;
-                else
-                    Game.printHelp();
-            } else
-                Game.modewhat = 1;
-
-            // Memory argument
-            if (params[3].equals("lowmem")) {
-                Game.setLowMemory();
-            } else if (params[3].equals("highmem")) {
-                MovedStatics.setHighMemory();
-            } else {
-                Game.printHelp();
-            }
-
-            // Player membership argument
-            if (params[4].equals("free")) {
-                MovedStatics.membersWorld = false;
-            } else if (params[4].equals("members")) {
-                MovedStatics.membersWorld = true;
-            } else {
-                Game.printHelp();
-            }
-
-            Game game = new Game();
-            GameShell shell = new GameShell(game);
-            game.setErrorHandler(shell);
             shell.openClientApplet("client435", 13, 32 + Game.modewhat, InetAddress.getByName(Configuration.SERVER_ADDRESS), 435);
-
         } catch (Exception exception) {
             exception.printStackTrace();
         }