From 7e13fd3d38cf1909669ad00b2c83ced41ec81643 Mon Sep 17 00:00:00 2001
From: dima_dencep <dima_dencep@constructlegacy.ru>
Date: Sun, 2 Jul 2023 13:47:07 +0700
Subject: [PATCH] RemovedJLineCommandHandler

---
 .../gravit/launcher/server/ServerWrapper.java | 22 ++-----------------
 .../server/ServerWrapperGsonManager.java      | 17 ++++++++++++++
 2 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperGsonManager.java

diff --git a/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java
index 35b4cc69..f6c64ab0 100644
--- a/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java
+++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java
@@ -23,7 +23,6 @@
 import pro.gravit.launcher.server.launch.SimpleLaunch;
 import pro.gravit.utils.command.Command;
 import pro.gravit.utils.command.CommandHandler;
-import pro.gravit.utils.command.JLineCommandHandler;
 import pro.gravit.utils.command.StdCommandHandler;
 import pro.gravit.utils.command.basic.HelpCommand;
 import pro.gravit.utils.helper.IOHelper;
@@ -50,13 +49,7 @@ public static void main(String... args) throws Throwable {
         LogHelper.printVersion("ServerWrapper");
         LogHelper.printLicense("ServerWrapper");
 
-        Launcher.gsonManager = new GsonManager() {
-            @Override
-            public void registerAdapters(GsonBuilder builder) {
-                super.registerAdapters(builder);
-                ClientWebSocketService.appendTypeAdapters(builder);
-            }
-        };
+        Launcher.gsonManager = new ServerWrapperGsonManager();
         Launcher.gsonManager.initGson();
 
         new ServerWrapper(args);
@@ -79,22 +72,11 @@ public ServerWrapper(String[] args) throws Exception {
         OptionalTrigger.registerProviders();
 
         if (args.length > 0 && !disableSetup) {
-            try {
-                Class.forName("org.jline.terminal.Terminal");
-
-                this.commandHandler = new JLineCommandHandler();
-                LogHelper.debug("JLine2 terminal enabled");
-            } catch (ClassNotFoundException ignored) {
-                this.commandHandler = new StdCommandHandler(true);
-                LogHelper.debug("JLine2 isn't in classpath, using std");
-            }
-
+            this.commandHandler = new StdCommandHandler(true);
             this.commandHandler.registerCommand("help", new HelpCommand(this.commandHandler));
             this.commandHandler.registerCommand("setup", new SetupCommand(this));
             this.commandHandler.registerCommand("installauthlib", new InstallAuthLib());
-        }
 
-        if (this.commandHandler != null) {
             Command command = this.commandHandler.findCommand(args[0].toLowerCase());
 
             if (command != null) {
diff --git a/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperGsonManager.java b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperGsonManager.java
new file mode 100644
index 00000000..bb19fc5f
--- /dev/null
+++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperGsonManager.java
@@ -0,0 +1,17 @@
+package pro.gravit.launcher.server;
+
+import com.google.gson.GsonBuilder;
+import pro.gravit.launcher.managers.GsonManager;
+import pro.gravit.launcher.request.websockets.ClientWebSocketService;
+
+public class ServerWrapperGsonManager extends GsonManager {
+
+    public ServerWrapperGsonManager() {
+    }
+
+    @Override
+    public void registerAdapters(GsonBuilder builder) {
+        super.registerAdapters(builder);
+        ClientWebSocketService.appendTypeAdapters(builder);
+    }
+}