From e9f0af36c8ac2fed241a0ae28f57f1c95adb3ec2 Mon Sep 17 00:00:00 2001 From: Gravit Date: Tue, 20 Nov 2018 22:26:56 +0700 Subject: [PATCH 1/3] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BE=D1=88?= =?UTF-8?q?=D0=B8=D0=B1=D0=BA=D0=B8=20=D0=BF=D1=80=D0=B5=D0=B4=D0=B2=D0=B4?= =?UTF-8?q?=D1=83=D1=89=D0=B5=D0=B3=D0=BE=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8?= =?UTF-8?q?=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/ru/gravit/launcher/client/ClientLauncher.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java b/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java index 038347a4..2aeb3672 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java +++ b/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java @@ -366,9 +366,13 @@ else if (isDownloadJava) { Collections.addAll(args, profile.object.getJvmArgs()); Collections.addAll(args, "-Djava.library.path=".concat(params.clientDir.resolve(NATIVES_DIR).toString())); // Add Native Path Collections.addAll(args, "-javaagent:".concat(pathLauncher)); - Collections.addAll(args, "-classpath", pathLauncher); if(wrapper) Collections.addAll(args, "-Djava.class.path=".concat(pathLauncher)); // Add Class Path + else + { + Collections.addAll(args, "-cp"); + Collections.addAll(args, pathLauncher); + } Collections.addAll(args, ClientLauncher.class.getName()); // Print commandline debug message From 1e54e661f58b1f78dfd3ed3900f53c65295aab0e Mon Sep 17 00:00:00 2001 From: Gravit Date: Mon, 26 Nov 2018 18:09:22 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20dirUpdates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Launcher/runtime/dialog/overlay/settings/settings.js | 6 ++++-- .../main/java/ru/gravit/launcher/client/DirBridge.java | 9 ++++++++- .../java/ru/gravit/launcher/client/LauncherSettings.java | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Launcher/runtime/dialog/overlay/settings/settings.js b/Launcher/runtime/dialog/overlay/settings/settings.js index 2f6b234c..1ec553fe 100644 --- a/Launcher/runtime/dialog/overlay/settings/settings.js +++ b/Launcher/runtime/dialog/overlay/settings/settings.js @@ -70,8 +70,9 @@ var settingsOverlay = { // Set new result var newDir = chooser.showDialog(stage); if (newDir !== null) { - settingsOverlay.transferCatalogDialog(); + settingsOverlay.transferCatalogDialog(newDir.toPath()); settings.updatesDir = newDir.toPath(); + DirBridge.dirUpdates = settings.updatesDir; settingsOverlay.updateDirLabel(); } }); @@ -137,11 +138,12 @@ var settingsOverlay = { holder.lookup("#apply").setOnAction(function(event) overlay.hide(0, null)); }, - transferCatalogDialog: function() { + transferCatalogDialog: function(newDir) { settingsOverlay.transferDialog.setVisible(true); settingsOverlay.transferDialog.lookup("#cancelTransfer").setOnAction(function(event) settingsOverlay.transferDialog.setVisible(false)); settingsOverlay.transferDialog.lookup("#applyTransfer").setOnAction(function(event) { //Здесь могла быть ваша реклама, либо DirBridge.move(); + DirBridge.move(newDir); settingsOverlay.transferDialog.setVisible(false); }); }, diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/DirBridge.java b/Launcher/src/main/java/ru/gravit/launcher/client/DirBridge.java index 27be737e..e7b4e35c 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/DirBridge.java +++ b/Launcher/src/main/java/ru/gravit/launcher/client/DirBridge.java @@ -1,7 +1,9 @@ package ru.gravit.launcher.client; import ru.gravit.launcher.LauncherAPI; +import ru.gravit.utils.helper.IOHelper; +import java.io.IOException; import java.nio.file.Path; public class DirBridge { @@ -11,5 +13,10 @@ public class DirBridge { public static Path dirUpdates; @LauncherAPI public static Path defaultUpdatesDir; - + @LauncherAPI + public static void move(Path newDir) throws IOException + { + IOHelper.move(dirUpdates,newDir); + dirUpdates = newDir; + } } diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/LauncherSettings.java b/Launcher/src/main/java/ru/gravit/launcher/client/LauncherSettings.java index a3a9ec0e..b63197c6 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/LauncherSettings.java +++ b/Launcher/src/main/java/ru/gravit/launcher/client/LauncherSettings.java @@ -97,6 +97,7 @@ public void read(HInput input) throws IOException, SignatureException { // Client settings updatesDir = IOHelper.toPath(input.readString(0)); + DirBridge.dirUpdates = updatesDir; autoEnter = input.readBoolean(); fullScreen = input.readBoolean(); setRAM(input.readLength(JVMHelper.RAM)); From 1e35e89d1c150a1c8f792a22a9387cf5e5a17af5 Mon Sep 17 00:00:00 2001 From: Gravit Date: Mon, 26 Nov 2018 18:15:16 +0700 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=B0=D0=B7=20=D0=BE?= =?UTF-8?q?=D1=82=20buildnumber=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/ru/gravit/launcher/Launcher.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libLauncher/src/main/java/ru/gravit/launcher/Launcher.java b/libLauncher/src/main/java/ru/gravit/launcher/Launcher.java index 7a46bc2f..ecee73f7 100644 --- a/libLauncher/src/main/java/ru/gravit/launcher/Launcher.java +++ b/libLauncher/src/main/java/ru/gravit/launcher/Launcher.java @@ -32,14 +32,6 @@ public final class Launcher { // Used to determine from clientside is launched from launcher public static final AtomicBoolean LAUNCHED = new AtomicBoolean(false); - static int readBuildNumber() { - try { - return Integer.valueOf(IOHelper.request(IOHelper.getResourceURL("buildnumber"))); - } catch (IOException ignored) { - return 0; // Maybe dev env? - } - } - private static final AtomicReference CONFIG = new AtomicReference<>(); @LauncherAPI public static ModulesManagerInterface modulesManager = null; @@ -67,7 +59,7 @@ static int readBuildNumber() { public static int MAJOR = 4; public static int MINOR = 0; public static int PATCH = 8; - public static int BUILD = readBuildNumber(); + public static int BUILD = 0; public static Version.Type RELEASE = Version.Type.STABLE; @LauncherAPI