From b5014175d02b5ef0d63497e2b14e9fda5024cff9 Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Fri, 3 May 2019 12:23:04 +0300 Subject: [PATCH] =?UTF-8?q?Revert=20"[FIX]=20=D0=A3=D0=B4=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BD=D0=B5=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D1=83=D0=B5=D0=BC=D1=8B=D0=B9=20=D0=BF=D0=B0=D1=80=D0=B0?= =?UTF-8?q?=D0=BC=D0=B5=D1=82=D1=80=20=D0=B8=D0=B7=20ServerWrapper."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 03a70c1d734a8807b6942a251778bc06609937dd. --- .../main/java/ru/gravit/launcher/server/ServerWrapper.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java b/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java index 84e30c5d..15710be1 100644 --- a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java +++ b/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java @@ -172,7 +172,7 @@ public void run(String... args) throws Throwable { auth(); }; } - LogHelper.info("ServerWrapper: LaunchServer address: %s. Title: %s", config.websocket.address, config.title); + LogHelper.info("ServerWrapper: Project %s, LaunchServer address: %s. Title: %s", config.projectname, config.websocket.address, config.title); LogHelper.info("Minecraft Version (for profile): %s", wrapper.profile == null ? "unknown" : wrapper.profile.getVersion().name); LogHelper.info("Start Minecraft Server"); LogHelper.debug("Invoke main method %s", mainClass.getName()); @@ -193,7 +193,7 @@ public void updateLauncherConfig() { LauncherConfig cfg = null; try { - cfg = new LauncherConfig(config.websocket.address, SecurityHelper.toPublicRSAKey(IOHelper.read(publicKeyFile)), new HashMap<>()); + cfg = new LauncherConfig(config.websocket.address, SecurityHelper.toPublicRSAKey(IOHelper.read(publicKeyFile)), new HashMap<>(), config.projectname); if(config.websocket != null && config.websocket.enabled) { cfg.isNettyEnabled = true; @@ -221,6 +221,7 @@ public Config getConfig() { public Config getDefaultConfig() { Config newConfig = new Config(); newConfig.title = "Your profile title"; + newConfig.projectname = "MineCraft"; newConfig.login = "login"; newConfig.password = "password"; newConfig.mainclass = ""; @@ -242,6 +243,7 @@ public void setConfig(Config config) { public static final class Config { public String title; + public String projectname; public WebSocketConf websocket; public int reconnectCount; public int reconnectSleep;