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

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

Browse source
This commit is contained in:
LoomeL 2019-07-03 18:08:27 +06:00
parent 0e54469a52
commit ff91f14e54
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Launcher/runtime/config.js
View file

@ -18,24 +18,12 @@ var config = {
ramDefault: 1024, // Default RAM amount (0 for auto) ramDefault: 1024, // Default RAM amount (0 for auto)
jvm: { jvm: {
enable: false, enable: true,
jvmMustdie32Dir: "jre-8u202-win32", jvmMustdie32Dir: "jre-8u202-win32",
jvmMustdie64Dir: "jre-8u202-win64", jvmMustdie64Dir: "jre-8u202-win64",
} }
}; };
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;
}
}
DirBridge.dir = DirBridge.getLauncherDir(config.dir); DirBridge.dir = DirBridge.getLauncherDir(config.dir);
DirBridge.dirStore = DirBridge.getStoreDir(config.dir); DirBridge.dirStore = DirBridge.getStoreDir(config.dir);
DirBridge.dirProjectStore = DirBridge.getProjectStoreDir(config.dir); DirBridge.dirProjectStore = DirBridge.getProjectStoreDir(config.dir);

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

@ -302,7 +302,7 @@ 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) { if (config.jvm.enable) {
makeSetProfileRequest(profile, function() { makeSetProfileRequest(profile, function() {
ClientLauncher.setProfile(profile); ClientLauncher.setProfile(profile);
var jvmDir = settings.updatesDir.resolve(jvmDirName); var jvmDir = settings.updatesDir.resolve(jvmDirName);
@ -326,7 +326,7 @@ function doUpdate(profile, pp, accessToken) {
}); });
}); });
}); });
}else{ } else {
update.resetOverlay("Обновление файлов ресурсов"); update.resetOverlay("Обновление файлов ресурсов");
var assetDirName = profile.getAssetDir(); var assetDirName = profile.getAssetDir();
var assetDir = settings.updatesDir.resolve(assetDirName); var assetDir = settings.updatesDir.resolve(assetDirName);

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