Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-01 22:14:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

RemovedJLineCommandHandler

Browse source
This commit is contained in:
dima_dencep 2023-07-02 13:47:07 +07:00
parent ac4086856b
commit 7e13fd3d38
No known key found for this signature in database
GPG key ID: ED87FE0D1750A12D
2 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java
View file

@ -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.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) {

17
ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperGsonManager.java Normal file
View file

@ -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);
}
}