Merge classes

client/src/main/java/com/soulfiremc/client/SoulFireClientBootstrap.java

@@ -17,8 +17,11 @@
  */
 package com.soulfiremc.client;
 
+import com.soulfiremc.client.cli.CLIManager;
+import com.soulfiremc.client.grpc.RPCClient;
 import com.soulfiremc.client.gui.GUIManager;
 import com.soulfiremc.launcher.SoulFireAbstractBootstrap;
+import com.soulfiremc.server.SoulFireServer;
 import java.awt.GraphicsEnvironment;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +37,26 @@ public static void bootstrap(String[] args, List<ClassLoader> classLoaders) {
     new SoulFireClientBootstrap().internalBootstrap(args, classLoaders);
   }
 
+  private static void runHeadless(String host, int port, String[] args) {
+    var soulFire =
+        new SoulFireServer(
+            host, port, SoulFireClientBootstrap.PLUGIN_MANAGER, SoulFireClientBootstrap.START_TIME);
+
+    var rpcClient = new RPCClient(host, port, soulFire.generateLocalCliJWT());
+    var cliManager = new CLIManager(rpcClient, SoulFireClientBootstrap.PLUGIN_MANAGER);
+    cliManager.initCLI(args);
+  }
+
+  private static void runGUI(String host, int port) {
+    var soulFire =
+        new SoulFireServer(
+            host, port, SoulFireClientBootstrap.PLUGIN_MANAGER, SoulFireClientBootstrap.START_TIME);
+
+    var rpcClient = new RPCClient(host, port, soulFire.generateAdminJWT());
+    var guiManager = new GUIManager(rpcClient, SoulFireClientBootstrap.PLUGIN_MANAGER);
+    guiManager.initGUI();
+  }
+
   @Override
   protected void postMixinMain(String[] args) {
     var host = getRPCHost();
@@ -44,13 +67,13 @@ protected void postMixinMain(String[] args) {
 
     if (runServer) {
       log.info("Starting server on {}:{}", host, port);
-      SoulFireClientLoader.runHeadless(host, port, args);
+      runHeadless(host, port, args);
     } else {
       log.info("Starting GUI and server on {}:{}", host, port);
       GUIManager.injectTheme();
       GUIManager.loadGUIProperties();
 
-      SoulFireClientLoader.runGUI(host, port);
+      runGUI(host, port);
     }
   }
 }

dedicated/src/main/java/com/soulfiremc/dedicated/SoulFireDedicatedBootstrap.java

@@ -17,7 +17,10 @@
  */
 package com.soulfiremc.dedicated;
 
+import com.soulfiremc.brigadier.GenericTerminalConsole;
 import com.soulfiremc.launcher.SoulFireAbstractBootstrap;
+import com.soulfiremc.server.ServerCommandManager;
+import com.soulfiremc.server.SoulFireServer;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 
@@ -32,12 +35,30 @@ public static void bootstrap(String[] args, List<ClassLoader> classLoaders) {
     new SoulFireDedicatedBootstrap().internalBootstrap(args, classLoaders);
   }
 
+  private static void runDedicated(String host, int port) {
+    GenericTerminalConsole.setupStreams();
+
+    var soulFire =
+        new SoulFireServer(
+            host,
+            port,
+            SoulFireDedicatedBootstrap.PLUGIN_MANAGER,
+            SoulFireDedicatedBootstrap.START_TIME);
+
+    new GenericTerminalConsole(
+            soulFire.shutdownManager(),
+            soulFire.injector().getSingleton(ServerCommandManager.class))
+        .start();
+
+    soulFire.shutdownManager().awaitShutdown();
+  }
+
   @Override
   protected void postMixinMain(String[] args) {
     var host = getRPCHost();
     var port = getRPCPort();
 
     log.info("Starting server on {}:{}", host, port);
-    SoulFireDedicatedLoader.runDedicated(host, port);
+    runDedicated(host, port);
   }
 }