Merge pull request #215 from me4502/master

Add argument to configuration for auto-joining a server.
SKCraft · Nov 11, 2017 · 403f284 · 403f284
2 parents 768f7a5 + 21e6732
commit 403f284
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/launcher/src/main/java/com/skcraft/launcher/Configuration.java b/launcher/src/main/java/com/skcraft/launcher/Configuration.java
@@ -35,6 +35,9 @@ public class Configuration {
     private String proxyUsername;
     private String proxyPassword;
     private String gameKey;
+    private boolean serverEnabled = false;
+    private String serverHost;
+    private int serverPort = 25565;
 
     @Override
     public boolean equals(Object o) {

diff --git a/launcher/src/main/java/com/skcraft/launcher/launch/Runner.java b/launcher/src/main/java/com/skcraft/launcher/launch/Runner.java
@@ -136,6 +136,7 @@ public Process call() throws Exception {
         addLibraries();
         addJarArgs();
         addProxyArgs();
+        addServerArgs();
         addWindowArgs();
         addPlatformArgs();
         addLegacyArgs();
@@ -305,6 +306,25 @@ private void addProxyArgs() {
         }
     }
 
+    /**
+     * Add server arguments.
+     */
+    private void addServerArgs() {
+        List<String> args = builder.getArgs();
+
+        if (config.isServerEnabled()) {
+            String host = config.getServerHost();
+            int port = config.getServerPort();
+
+            if (!Strings.isNullOrEmpty(host) && port > 0 && port < 65535) {
+                args.add("--server");
+                args.add(host);
+                args.add("--port");
+                args.add(String.valueOf(port));
+            }
+        }
+    }
+
     /**
      * Add window arguments.
      */