Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 11:39:11 +03:00
Code Issues Projects Releases Packages Wiki Activity

Добавление своей jvm в runtime (#302)

Browse source 
* Signed-off-by: LoomeL <kotgeorgy01@gmail.com>

* Загрузка своей JVM

* Поправка настройки по умолчанию
This commit is contained in:
LoomeL 2019-07-03 19:31:35 +06:00 committed by Gravit
parent 493fbf8f2b
commit 67662dfdac
3 changed files with 61 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Launcher/runtime/config.js
View file

@ -16,6 +16,12 @@ var config = {
autoEnterDefault: false, // Should autoEnter be enabled by default? autoEnterDefault: false, // Should autoEnter be enabled by default?
fullScreenDefault: false, // Should fullScreen be enabled by default? fullScreenDefault: false, // Should fullScreen be enabled by default?
ramDefault: 1024, // Default RAM amount (0 for auto) ramDefault: 1024, // Default RAM amount (0 for auto)
jvm: {
enable: false,
jvmMustdie32Dir: "jre-8u202-win32",
jvmMustdie64Dir: "jre-8u202-win64",
}
}; };
DirBridge.dir = DirBridge.getLauncherDir(config.dir); DirBridge.dir = DirBridge.getLauncherDir(config.dir);

61
Launcher/runtime/dialog/dialog.js
View file

@ -305,26 +305,51 @@ function doAuth(login, rsaPassword, auth_type) {
function doUpdate(profile, pp, accessToken) { function doUpdate(profile, pp, accessToken) {
var digest = profile.isUpdateFastCheck(); var digest = profile.isUpdateFastCheck();
overlay.swap(0, update.overlay, function(event) { overlay.swap(0, update.overlay, function(event) {
if (config.jvm.enable) {
update.resetOverlay("Обновление файлов ресурсов"); makeSetProfileRequest(profile, function() {
var assetDirName = profile.getAssetDir(); ClientLauncher.setProfile(profile);
var assetDir = settings.updatesDir.resolve(assetDirName); var jvmDir = settings.updatesDir.resolve(jvmDirName);
var assetMatcher = profile.getAssetUpdateMatcher(); update.resetOverlay("Обновление файлов JVM");
makeSetProfileRequest(profile, function() { makeUpdateRequest(jvmDirName, jvmDir, null, digest, function(jvmHDir) {
ClientLauncher.setProfile(profile); ClientLauncher.setJavaBinPath(jvmDir);
makeUpdateRequest(assetDirName, assetDir, assetMatcher, digest, function(assetHDir) { update.resetOverlay("Обновление файлов ресурсов");
settings.putHDir(assetDirName, assetDir, assetHDir.hdir); var assetDirName = profile.getAssetDir();
var assetDir = settings.updatesDir.resolve(assetDirName);
update.resetOverlay("Обновление файлов клиента"); var assetMatcher = profile.getAssetUpdateMatcher();
var clientDirName = profile.getDir(); makeUpdateRequest(assetDirName, assetDir, assetMatcher, digest, function(assetHDir) {
var clientDir = settings.updatesDir.resolve(clientDirName); settings.putHDir(assetDirName, assetDir, assetHDir.hdir);
var clientMatcher = profile.getClientUpdateMatcher(); update.resetOverlay("Обновление файлов клиента");
makeUpdateRequest(clientDirName, clientDir, clientMatcher, digest, function(clientHDir) { var clientDirName = profile.getDir();
settings.putHDir(clientDirName, clientDir, clientHDir.hdir); var clientDir = settings.updatesDir.resolve(clientDirName);
doLaunchClient(assetDir, assetHDir.hdir, clientDir, clientHDir.hdir, profile, pp, accessToken); var clientMatcher = profile.getClientUpdateMatcher();
makeUpdateRequest(clientDirName, clientDir, clientMatcher, digest, function(clientHDir) {
settings.putHDir(clientDirName, clientDir, clientHDir.hdir);
doLaunchClient(assetDir, assetHDir.hdir, clientDir, clientHDir.hdir, profile, pp, accessToken);
});
});
}); });
}); });
}); } else {
update.resetOverlay("Обновление файлов ресурсов");
var assetDirName = profile.getAssetDir();
var assetDir = settings.updatesDir.resolve(assetDirName);
var assetMatcher = profile.getAssetUpdateMatcher();
makeSetProfileRequest(profile, function() {
ClientLauncher.setProfile(profile);
makeUpdateRequest(assetDirName, assetDir, assetMatcher, digest, function(assetHDir) {
settings.putHDir(assetDirName, assetDir, assetHDir.hdir);
update.resetOverlay("Обновление файлов клиента");
var clientDirName = profile.getDir();
var clientDir = settings.updatesDir.resolve(clientDirName);
var clientMatcher = profile.getClientUpdateMatcher();
makeUpdateRequest(clientDirName, clientDir, clientMatcher, digest, function(clientHDir) {
settings.putHDir(clientDirName, clientDir, clientHDir.hdir);
doLaunchClient(assetDir, assetHDir.hdir, clientDir, clientHDir.hdir, profile, pp, accessToken);
});
});
});
}
}); });
} }

12
Launcher/runtime/init.js
View file

@ -79,6 +79,18 @@ function setRootParent(parent) {
function start(args) { function start(args) {
if (config.jvm.enable) {
switch (JVMHelper.OS_TYPE) {
case JVMHelperOS.MUSTDIE:
jvmDirName = JVMHelper.OS_BITS === 32 ? config.jvm.jvmMustdie32Dir :
jvmDirName = JVMHelper.OS_BITS === 64 ? config.jvm.jvmMustdie64Dir : config.jvm.enable = false;
break;
default:
config.jvm.enable = false;
break;
}
}
LogHelper.debug("Setting FX properties"); LogHelper.debug("Setting FX properties");
java.lang.System.setProperty("prism.lcdtext", "false"); java.lang.System.setProperty("prism.lcdtext", "false");