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

Merge branch 'master' into v4.1.x

Browse source
This commit is contained in:
Gravit 2018-11-26 18:21:53 +07:00
commit 8597206e84
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
5 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Launcher/runtime/dialog/overlay/settings/settings.js
View file

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

9
Launcher/src/main/java/ru/gravit/launcher/DirBridge.java
View file

@ -1,7 +1,9 @@
package ru.gravit.launcher;
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;
}
}

1
Launcher/src/main/java/ru/gravit/launcher/LauncherSettings.java
View file

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

6
Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java
View file

@ -364,9 +364,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

10
libLauncher/src/main/java/ru/gravit/launcher/Launcher.java
View file

@ -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<LauncherConfig> 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