From 8163266141599e749a7a4a06f1138d8882b781e7 Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Tue, 15 Jan 2019 14:14:36 +0300 Subject: [PATCH] =?UTF-8?q?[STYLE]=20=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BC?= =?UTF-8?q?=D0=BF=D0=BE=D1=80=D1=82=D1=8B=20+=20[ANY]=20=D0=9E=D0=B1=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BC=D0=BE=D0=B4=D1=83?= =?UTF-8?q?=D0=BB=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/ru/gravit/launchserver/LaunchServer.java | 1 - .../java/ru/gravit/launchserver/command/basic/TestCommand.java | 3 ++- .../main/java/ru/gravit/launcher/profiles/ClientProfile.java | 2 +- modules | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java index 376db65e..d5227ad2 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java @@ -38,7 +38,6 @@ import java.io.IOException; import java.lang.ProcessBuilder.Redirect; import java.net.InetSocketAddress; -import java.net.MalformedURLException; import java.net.SocketAddress; import java.nio.file.*; import java.nio.file.attribute.BasicFileAttributes; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java index 6e3b7723..e6849575 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java @@ -35,7 +35,8 @@ public void invoke(String... args) throws Exception { CommonHelper.newThread("Netty Server", true, handler).start(); } if (args[0].equals("profile")) { - ClientProfile profile = new ClientProfile("1.7.10", "asset1.7.10", 0, "Test1.7.10", "localhost", 25565, true, false, "net.minecraft.launchwrapper.Launch"); + ClientProfile profile = new ClientProfile("1.7.10", "asset1.7.10", 0, "Test1.7.10", "Test server.", "localhost", 25565, true, false, "net.minecraft.launchwrapper.Launch"); + try (Writer writer = IOHelper.newWriter(server.dir.resolve("profiles").resolve("Test.cfg"))) { LaunchServer.gson.toJson(profile, writer); } diff --git a/libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java b/libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java index ffbfb5bb..86b83378 100644 --- a/libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java +++ b/libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java @@ -10,7 +10,7 @@ import java.util.*; public final class ClientProfile implements Comparable { - public ClientProfile(String version, String assetIndex, int sortIndex, String title, String serverAddress, int serverPort, boolean updateFastCheck, boolean useWhitelist, String mainClass) { + public ClientProfile(String version, String assetIndex, int sortIndex, String title, String info, String serverAddress, int serverPort, boolean updateFastCheck, boolean useWhitelist, String mainClass) { this.version = version; this.assetIndex = assetIndex; this.sortIndex = sortIndex; diff --git a/modules b/modules index df8b9228..38e11640 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit df8b92281a93046b4959fc82c98c2eeab4fd5933 +Subproject commit 38e11640ce4a4ed3e9745718db02a888770a22bb