Merge pull request #194 from rheimus/master

Add extra command line arguments

Author: rheimus

build.gradle

@@ -14,6 +14,8 @@ repositories {
     jcenter()
 }
 
+
+
 group = "com.superzanti.serversync"
 version = ssversion
 
@@ -29,7 +31,11 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
 
     implementation fileTree(dir: 'libs', include: '*.jar')
+
+    annotationProcessor 'info.picocli:picocli-codegen:4.3.2'
+
     shadow group: 'com.eclipsesource.minimal-json', name: 'minimal-json', version: '0.9.5'
+    shadow group: 'info.picocli', name: 'picocli', version: '4.3.2'
 }
 
 application {

gradle.properties

@@ -1,4 +1,4 @@
-ssversion = 3.5.1
+ssversion = 3.6.0
 ssname = serversync
 mainclass = 'com.superzanti.serversync.ServerSync'
 org.gradle.warning.mode=all

src/main/java/com/superzanti/serversync/RefStrings.java

@@ -3,7 +3,7 @@
 public class RefStrings {
     public static final String MODID = "com.superzanti.serversync";
     public static final String NAME = "ServerSync";
-    public static final String VERSION = "3.5.1";
+    public static final String VERSION = "3.6.0";
 
     public static final String ERROR_TOKEN = "<E>";
     public static final String DELETE_TOKEN = "<D>";

src/main/java/com/superzanti/serversync/ServerSync.java

@@ -5,14 +5,17 @@
 import com.superzanti.serversync.gui.GUI_Client_Mock;
 import com.superzanti.serversync.server.ServerSetup;
 import com.superzanti.serversync.util.Logger;
-import com.superzanti.serversync.util.ProgramArguments;
 import com.superzanti.serversync.util.enums.EServerMode;
+import picocli.CommandLine;
+import picocli.CommandLine.*;
 
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
+import java.util.concurrent.Callable;
 
-public class ServerSync {
+@Command(name = "ServerSync", mixinStandardHelpOptions = true, version = "3.6.0", description = "A utility for synchronizing a server<->client style game.")
+public class ServerSync implements Callable<Integer> {
 
     /* AWT EVENT DISPATCHER THREAD */
 
@@ -21,23 +24,45 @@ public class ServerSync {
     public static EServerMode MODE;
 
     public static GUI_Client clientGUI;
-
     public static ResourceBundle strings;
 
-    public static ProgramArguments arguments;
+    @Option(names = {"-o", "--progress", "progress-only"}, description = "Only show progress indication. Ignored if '-s', '--server' is specified.")
+    private boolean modeProgressOnly = false;
+    @Option(names = {"-q", "--quiet", "silent"}, description = "Remove all GUI interaction. Ignored if '-s', '--server' is specified.")
+    private boolean modeQuiet = false;
+    @Option(names = {"-s", "--server", "server"}, description = "Run the program in server mode.")
+    private boolean modeServer = false;
+    @Option(names = {"-a", "--address"}, description = "The address of the server you wish to connect to.")
+    private String serverAddress;
+    @Option(names = {"-p", "--port"}, description = "The port the server is running on.")
+    private int serverPort = -1;
 
     public static void main(String[] args) {
-        arguments = new ProgramArguments(args);
+        int exitCode = new CommandLine(new ServerSync()).execute(args);
+        if (exitCode != 0) {
+            System.exit(exitCode);
+        }
+    }
 
-        if (arguments.isServer) {
+    @Override
+    public Integer call() {
+        if (modeServer) {
             runInServerMode();
         } else {
             runInClientMode();
         }
+        return 0;
     }
 
-    private static void commonInit() {
+    private void commonInit() {
         Locale locale = SyncConfig.getConfig().LOCALE;
+        if (serverAddress != null) {
+            SyncConfig.getConfig().SERVER_IP = serverAddress;
+        }
+        if (serverPort > 0) {
+            SyncConfig.getConfig().SERVER_PORT = serverPort;
+        }
+
         try {
             Logger.log("Loading language file: " + locale);
             strings = ResourceBundle.getBundle("assets.serversync.lang.MessagesBundle", locale);
@@ -47,7 +72,7 @@ private static void commonInit() {
         }
     }
 
-    private static void runInServerMode() {
+    private void runInServerMode() {
         ServerSync.MODE = EServerMode.SERVER;
         new Logger("server");
         Logger.setSystemOutput(true);
@@ -58,17 +83,17 @@ private static void runInServerMode() {
         serverThread.start();
     }
 
-    private static void runInClientMode() {
+    private void runInClientMode() {
         ServerSync.MODE = EServerMode.CLIENT;
         new Logger("client");
         SyncConfig config = SyncConfig.getConfig();
         commonInit();
 
         Thread clientThread;
-        if (arguments.syncSilent) {
+        if (modeQuiet) {
             clientGUI = new GUI_Client_Mock();
             new Thread(new ClientWorker()).start();
-        } else if (arguments.syncProgressOnly) {
+        } else if (modeProgressOnly) {
             // TODO setup a progress only version of the GUI
             clientGUI = new GUI_Client();
             clientGUI.setIPAddress(config.SERVER_IP);