Use config file instead of command line args

Author: Lenni0451

src/main/java/net/lenni0451/multilaunch/JarLauncher.java

@@ -5,23 +5,34 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 public class JarLauncher {
 
-    private final String jarPath;
     private Thread watchDogThread;
     private Process process;
     private OutputStream outputStream;
 
-    public JarLauncher(final String jarPath) {
-        this.jarPath = jarPath;
-    }
-
     public void launch() throws IOException {
-        File serverJarFile = new File(this.jarPath);
+        File serverJarFile = new File(MultiLaunchConfig.serverJar);
+        if (!serverJarFile.exists()) {
+            Logger.LOGGER.info("---------- MultiLaunch ----------");
+            Logger.LOGGER.error("Server jar file does not exist!");
+            Logger.LOGGER.info("Please make sure you have set the correct path in the configuration file!");
+            Logger.LOGGER.info("If this is your first time using the plugin, please edit the configuration file and restart the server!");
+            System.exit(0);
+        }
 
-        ProcessBuilder pb = new ProcessBuilder(System.getProperty("java.home") + "/bin/java", "-jar", serverJarFile.getAbsolutePath());
+        List<String> arguments = new ArrayList<>();
+        arguments.add(System.getProperty("java.home") + "/bin/java");
+        arguments.addAll(MultiLaunchConfig.jvmArguments);
+        arguments.add("-jar");
+        arguments.add(serverJarFile.getAbsolutePath());
+        arguments.addAll(MultiLaunchConfig.serverArguments);
+
+        ProcessBuilder pb = new ProcessBuilder(arguments.toArray(new String[0]));
         pb.directory(serverJarFile.getParentFile());
         pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
         pb.redirectError(ProcessBuilder.Redirect.INHERIT);
@@ -35,21 +46,27 @@ public void launch() throws IOException {
                 return;
             }
             Logger.LOGGER.info("Server process stopped!");
-            System.exit(0);
+            if (MultiLaunchConfig.stopViaProxyOnServerStop) {
+                Logger.LOGGER.info("Stopping ViaProxy...");
+                System.exit(0);
+            }
         }, "ServerWatchDog");
         this.watchDogThread.setDaemon(true);
         this.watchDogThread.start();
     }
 
     public void stop() throws IOException {
         this.watchDogThread.interrupt();
-        Logger.LOGGER.info("Stopping server (force shutdown after 1 minute)...");
-        this.outputStream.write("stop\n".getBytes());
+        Logger.LOGGER.info("Stopping server (force shutdown after {} seconds)...", MultiLaunchConfig.shutdownTimeout);
+        this.outputStream.write(MultiLaunchConfig.stopCommand.getBytes());
+        this.outputStream.write('\n');
         this.outputStream.flush();
         try {
-            this.process.waitFor(1, TimeUnit.MINUTES);
+            if (!this.process.waitFor(MultiLaunchConfig.shutdownTimeout, TimeUnit.SECONDS)) {
+                throw new InterruptedException("Server did not stop in time!");
+            }
         } catch (InterruptedException e) {
-            Logger.LOGGER.warn("Server stop was interrupted after 1 minute!");
+            Logger.LOGGER.warn("Server stop was interrupted after {} seconds!", MultiLaunchConfig.shutdownTimeout);
             this.process.destroy();
         }
     }

src/main/java/net/lenni0451/multilaunch/Main.java

@@ -1,37 +1,29 @@
 package net.lenni0451.multilaunch;
 
-import joptsimple.OptionSpec;
 import net.lenni0451.lambdaevents.EventHandler;
 import net.raphimc.viaproxy.ViaProxy;
 import net.raphimc.viaproxy.plugins.ViaProxyPlugin;
 import net.raphimc.viaproxy.plugins.events.ConsoleCommandEvent;
-import net.raphimc.viaproxy.plugins.events.PostOptionsParseEvent;
-import net.raphimc.viaproxy.plugins.events.PreOptionsParseEvent;
+import net.raphimc.viaproxy.util.logging.Logger;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 
 public class Main extends ViaProxyPlugin {
 
-    private OptionSpec<String> serverjarArg;
     private JarLauncher launcher;
 
     @Override
     public void onEnable() {
+        MultiLaunchConfig.load();
         ViaProxy.EVENT_MANAGER.register(this);
+        this.launch();
     }
 
-    @EventHandler
-    public void onPreOptionsParse(PreOptionsParseEvent event) {
-        this.serverjarArg = event.getParser().accepts("serverjar", "The path to the server jar to launch").withRequiredArg().ofType(String.class).required();
-    }
-
-    @EventHandler
-    public void onPostOptionsParse(PostOptionsParseEvent event) {
-        String serverJar = event.getOptions().valueOf(this.serverjarArg);
+    private void launch() {
         try {
-            this.launcher = new JarLauncher(serverJar);
+            this.launcher = new JarLauncher();
             this.launcher.launch();
             Runtime.getRuntime().addShutdownHook(new Thread(() -> {
                 try {
@@ -41,22 +33,28 @@ public void onPostOptionsParse(PostOptionsParseEvent event) {
                 }
             }));
         } catch (Throwable t) {
-            t.printStackTrace();
+            Logger.LOGGER.error("Failed to launch the server jar!", t);
             System.exit(-1);
         }
     }
 
     @EventHandler
     public void onConsoleCommand(ConsoleCommandEvent event) throws IOException {
-        event.setCancelled(true);
-        OutputStream os = this.launcher.getOutputStream();
-        os.write(event.getCommand().getBytes(StandardCharsets.UTF_8));
-        if (event.getArgs().length != 0) {
-            os.write(' ');
-            os.write(String.join(" ", event.getArgs()).getBytes(StandardCharsets.UTF_8));
+        if (!MultiLaunchConfig.forwardConsole) return;
+
+        try {
+            OutputStream os = this.launcher.getOutputStream();
+            os.write(event.getCommand().getBytes(StandardCharsets.UTF_8));
+            if (event.getArgs().length != 0) {
+                os.write(' ');
+                os.write(String.join(" ", event.getArgs()).getBytes(StandardCharsets.UTF_8));
+            }
+            os.write('\n');
+            os.flush();
+            event.setCancelled(true);
+        } catch (Throwable ignored) {
+            //If the server is not running, the input will be handled by ViaProxy
         }
-        os.write('\n');
-        os.flush();
     }
 
 }

src/main/java/net/lenni0451/multilaunch/MultiLaunchConfig.java

@@ -0,0 +1,62 @@
+package net.lenni0451.multilaunch;
+
+import net.lenni0451.optconfig.ConfigLoader;
+import net.lenni0451.optconfig.annotations.Description;
+import net.lenni0451.optconfig.annotations.OptConfig;
+import net.lenni0451.optconfig.annotations.Option;
+import net.lenni0451.optconfig.provider.ConfigProvider;
+import net.raphimc.viaproxy.util.logging.Logger;
+
+import java.io.File;
+import java.util.List;
+
+@OptConfig(header = {
+        "Configuration for the MultiLaunch ViaProxy plugin.",
+        "Used to launch a server jar alongside ViaProxy.",
+        "Make sure the server jar is in a separate directory to avoid conflicts!",
+        "",
+        "Made by Lenni0451",
+        "Source: https://github.com/ViaVersionAddons/ViaProxyMultiLaunch"
+})
+public class MultiLaunchConfig {
+
+    @Option("ServerJar")
+    @Description("The path to the server jar to launch")
+    public static String serverJar = "other/server.jar";
+
+    @Option("JvmArguments")
+    @Description("The JVM arguments to use when launching the server")
+    public static List<String> jvmArguments = List.of("-DIReallyKnowWhatIAmDoingISwear");
+
+    @Option("ServerArguments")
+    @Description("The arguments to use when launching the server")
+    public static List<String> serverArguments = List.of("nogui");
+
+    @Option("ForwardConsole")
+    @Description({"If the console input should be forwarded to the server", "This also means that ViaProxy is not able to read the console input!", "If the server process is not running, the input will be handled by ViaProxy"})
+    public static boolean forwardConsole = true;
+
+    @Option("ShutdownTimeout")
+    @Description({"The time in seconds to wait for the server to shutdown before forcing it", "A force shutdown may cause data loss!"})
+    public static int shutdownTimeout = 60;
+
+    @Option("StopCommand")
+    @Description("The command to send to the server when stopping it")
+    public static String stopCommand = "stop";
+
+    @Option("StopViaProxyOnServerStop")
+    @Description("If ViaProxy should be stopped when the server stops")
+    public static boolean stopViaProxyOnServerStop = true;
+
+    public static void load() {
+        try {
+            ConfigLoader<MultiLaunchConfig> configLoader = new ConfigLoader<>(MultiLaunchConfig.class);
+            configLoader.getConfigOptions().setResetInvalidOptions(true); //Reset invalid options to their default value
+            configLoader.loadStatic(ConfigProvider.file(new File("multilaunch.yml")));
+        } catch (Throwable t) {
+            Logger.LOGGER.error("Failed to load the MultiLaunch configuration!", t);
+            System.exit(-1);
+        }
+    }
+
+}