Исправления DownloadClientCommand и стандартных профилей 1.12.2 и 1.7.10

LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java

@@ -36,7 +36,7 @@ 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",25535,true,false,"net.minecraft.launchwrapper.Launch");
+            ClientProfile profile = new ClientProfile("1.7.10","asset1.7.10",0,"Test1.7.10","localhost",25565,true,false,"net.minecraft.launchwrapper.Launch");
             try(Writer writer = IOHelper.newWriter(LaunchServer.server.dir.resolve("profiles").resolve("Test.cfg")))
             {
                 Launcher.gson.toJson(profile,writer);

LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadClientCommand.java

@@ -56,6 +56,7 @@ public void invoke(String... args) throws IOException, CommandException {
             client = Launcher.gson.fromJson(reader,ClientProfile.class);
         }
         client.setTitle(dirName);
+        client.setDir(dirName);
         try (BufferedWriter writer = IOHelper.newWriter(IOHelper.resolveIncremental(server.profilesDir,
                 dirName, "cfg"))) {
             Launcher.gson.toJson(client,writer);

LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.12.2.cfg

@@ -1,50 +1,41 @@
-version: "1.12.2";
+{
-assetIndex: "1.12.2"; # 1.7.10+ only
+  "version": "1.12.2",
-
+  "assetIndex": "1.12.2",
-# Runtime-dependent params
+  "assetDir": "asset1.12",
-dir: "XXXXX";
+  "dir": "HiTech",
-assetDir: "asset1.12";
+  "sortIndex": 0,
-
+  "title": "xxxxxxxx",
-# Client params
+  "serverAddress": "localhost",
-sortIndex: 0;
+  "serverPort": 25565,
-title: "XXXXX";
+  "update": ["servers.dat"],
-serverAddress: "server.tld";
+  "updateExclusions": [
-serverPort: 25565;
+    "mods/OpenSecurity",
-
+    "mods/VoxelMods",
-# Updater and client watch service
+    "mods/railcraft"
-updateFastCheck: true;
+  ],
-update: [
+  "updateShared": [],
-    "servers.dat"
+  "updateVerify": [
-];
-updateVerify: [
    "libraries", "natives", "mods",
    "minecraft.jar", "forge.jar", "liteloader.jar"
-];
+  ],
-updateExclusions: [];
+  "updateOptional": [
-updateShared: [];
+  ],
-updateOptional: [];
+  "updateFastCheck": true,
-enabledOptional: [];
+  "useWhitelist": false,
-
+  "mainClass": "net.minecraft.launchwrapper.Launch",
-useWhitelist: false;
+  "jvmArgs": [
-whitelist: [];
-
-# Client launcher params
-mainClass: "net.minecraft.launchwrapper.Launch";
-classPath: [ "forge.jar", "liteloader.jar", "minecraft.jar", "libraries" ];
-jvmArgs: [
     "-Dfml.ignorePatchDiscrepancies=true",
     "-Dfml.ignoreInvalidMinecraftCertificates=true",
-
-    # Some options from Mojang's launcher
     "-XX:+UseConcMarkSweepGC",
     "-XX:+CMSIncrementalMode",
     "-XX:-UseAdaptiveSizePolicy",
     "-Xmn128M",
-
-    # JVM Attach protection
     "-XX:+DisableAttachMechanism"
-];
+  ],
-clientArgs: [
+  "classPath": ["forge.jar", "liteloader.jar", "minecraft.jar", "libraries"],
+  "clientArgs": [
     "--tweakClass", "net.minecraftforge.fml.common.launcher.FMLTweaker",
     "--tweakClass", "com.mumfrey.liteloader.launch.LiteLoaderTweaker"
-];
+  ],
+  "whitelist": []
+}

LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.10.cfg

@@ -1,54 +1,37 @@
-version: "1.7.10";
+{
-assetIndex: "1.7.10"; # 1.7.10+ only
+  "version": "1.7.10",
-
+  "assetIndex": "1.7.10",
-# Runtime-dependent params
+  "assetDir": "asset1.7.10",
-dir: "XXXXX";
+  "dir": "xxxxxxx",
-assetDir: "asset1.7.10";
+  "sortIndex": 0,
-
+  "title": "Test1.7.10",
-# Client params
+  "serverAddress": "localhost",
-sortIndex: 0;
+  "serverPort": 25565,
-title: "XXXXX";
+  "update": ["servers.dat"],
-serverAddress: "server.tld";
+  "updateExclusions": [],
-serverPort: 25565;
+  "updateShared": [],
-
+  "updateVerify": [
-# Updater and client watch service
-updateFastCheck: true;
-update: [
-    "servers.dat"
-];
-updateVerify: [
    "libraries", "natives", "mods",
    "minecraft.jar", "forge.jar", "liteloader.jar"
-];
+  ],
-updateExclusions: [
+  "updateOptional": [
-    # "mods/carpentersblocks",
+  ],
-    # "mods/ic2",
+  "updateFastCheck": true,
-    # "mods/railcraft"
+  "useWhitelist": false,
-];
+  "mainClass": "net.minecraft.launchwrapper.Launch",
-updateShared: [];
+  "jvmArgs": [
-updateOptional: [];
-enabledOptional: [];
-
-useWhitelist: false;
-whitelist: [];
-
-# Client launcher params
-mainClass: "net.minecraft.launchwrapper.Launch";
-classPath: [ "forge.jar", "liteloader.jar", "minecraft.jar", "libraries" ];
-jvmArgs: [
     "-Dfml.ignorePatchDiscrepancies=true",
     "-Dfml.ignoreInvalidMinecraftCertificates=true",
-
-    # Some options from Mojang's launcher
     "-XX:+UseConcMarkSweepGC",
     "-XX:+CMSIncrementalMode",
     "-XX:-UseAdaptiveSizePolicy",
     "-Xmn128M",
-
-    # JVM Attach protection
     "-XX:+DisableAttachMechanism"
-];
+  ],
-clientArgs: [
+  "classPath": ["forge.jar", "liteloader.jar", "minecraft.jar", "libraries"],
+  "clientArgs": [
     "--tweakClass", "cpw.mods.fml.common.launcher.FMLTweaker",
     "--tweakClass", "com.mumfrey.liteloader.launch.LiteLoaderTweaker"
-];
+  ],
+  "whitelist": []
+}

libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java

@@ -179,6 +179,10 @@ public String[] getClientArgs() {
     public String getDir() {
         return dir;
     }
+
+    public void setDir(String dir) {
+        this.dir = dir;
+    }
     @LauncherAPI
     public String getAssetDir() {
         return assetDir;