Java settings by instance

This commit is contained in:
Daniel Scalzi 2022-11-26 16:57:30 -05:00
parent 72cb45b271
commit 4636f7200c
No known key found for this signature in database
GPG Key ID: 9E3E2AFE45328AA5
9 changed files with 241 additions and 79 deletions

View File

@ -5,6 +5,7 @@ const child_process = require('child_process')
const crypto = require('crypto') const crypto = require('crypto')
const EventEmitter = require('events') const EventEmitter = require('events')
const fs = require('fs-extra') const fs = require('fs-extra')
const nodeDiskInfo = require('node-disk-info')
const StreamZip = require('node-stream-zip') const StreamZip = require('node-stream-zip')
const path = require('path') const path = require('path')
const Registry = require('winreg') const Registry = require('winreg')
@ -342,6 +343,9 @@ class JavaGuard extends EventEmitter {
* @returns {boolean} True if the path points to a Java executable, otherwise false. * @returns {boolean} True if the path points to a Java executable, otherwise false.
*/ */
static isJavaExecPath(pth){ static isJavaExecPath(pth){
if(pth == null) {
return false
}
if(process.platform === 'win32'){ if(process.platform === 'win32'){
return pth.endsWith(path.join('bin', 'javaw.exe')) return pth.endsWith(path.join('bin', 'javaw.exe'))
} else if(process.platform === 'darwin'){ } else if(process.platform === 'darwin'){
@ -459,8 +463,13 @@ class JavaGuard extends EventEmitter {
let verString = props[i].split('=')[1].trim() let verString = props[i].split('=')[1].trim()
console.log(props[i].trim()) console.log(props[i].trim())
const verOb = JavaGuard.parseJavaRuntimeVersion(verString) const verOb = JavaGuard.parseJavaRuntimeVersion(verString)
// TODO implement a support matrix eventually. Right now this is good enough
// 1.7-1.16 = Java 8
// 1.17+ = Java 17
// Actual support may vary, but we're going with this rule for simplicity.
if(verOb.major < 9){ if(verOb.major < 9){
// Java 8 // Java 8
if(!Util.mcVersionAtLeast('1.17', this.mcVersion)){
if(verOb.major === 8 && verOb.update > 52){ if(verOb.major === 8 && verOb.update > 52){
meta.version = verOb meta.version = verOb
++checksum ++checksum
@ -468,6 +477,7 @@ class JavaGuard extends EventEmitter {
break break
} }
} }
}
} else if(verOb.major >= 16) { } else if(verOb.major >= 16) {
// TODO Make this logic better. Make java 16 required. // TODO Make this logic better. Make java 16 required.
// Java 9+ // Java 9+
@ -804,15 +814,22 @@ class JavaGuard extends EventEmitter {
// Get possible paths from the registry. // Get possible paths from the registry.
let pathSet1 = await JavaGuard._scanRegistry() let pathSet1 = await JavaGuard._scanRegistry()
if(pathSet1.size === 0){ if(pathSet1.size === 0){
// Do a manual file system scan of program files. // Do a manual file system scan of program files.
// Check all drives
const driveMounts = nodeDiskInfo.getDiskInfoSync().map(({ mounted }) => mounted)
for(const mount of driveMounts) {
pathSet1 = new Set([ pathSet1 = new Set([
...pathSet1, ...pathSet1,
...(await JavaGuard._scanFileSystem('C:\\Program Files\\Java')), ...(await JavaGuard._scanFileSystem(`${mount}\\Program Files\\Java`)),
...(await JavaGuard._scanFileSystem('C:\\Program Files\\Eclipse Foundation')), ...(await JavaGuard._scanFileSystem(`${mount}\\Program Files\\Eclipse Adoptium`)),
...(await JavaGuard._scanFileSystem('C:\\Program Files\\AdoptOpenJDK')) ...(await JavaGuard._scanFileSystem(`${mount}\\Program Files\\Eclipse Foundation`)),
...(await JavaGuard._scanFileSystem(`${mount}\\Program Files\\AdoptOpenJDK`))
]) ])
} }
}
// Get possible paths from the data directory. // Get possible paths from the data directory.
const pathSet2 = await JavaGuard._scanFileSystem(path.join(dataDir, 'runtime', 'x64')) const pathSet2 = await JavaGuard._scanFileSystem(path.join(dataDir, 'runtime', 'x64'))

View File

@ -63,6 +63,27 @@ function resolveMinRAM(){
return resolveMaxRAM() return resolveMaxRAM()
} }
/**
* TODO Copy pasted, should be in a utility file.
*
* Returns true if the actual version is greater than
* or equal to the desired version.
*
* @param {string} desired The desired version.
* @param {string} actual The actual version.
*/
function mcVersionAtLeast(desired, actual){
const des = desired.split('.')
const act = actual.split('.')
for(let i=0; i<des.length; i++){
if(!(parseInt(act[i]) >= parseInt(des[i]))){
return false
}
}
return true
}
/** /**
* Three types of values: * Three types of values:
* Static = Explicitly declared. * Static = Explicitly declared.
@ -71,17 +92,6 @@ function resolveMinRAM(){
*/ */
const DEFAULT_CONFIG = { const DEFAULT_CONFIG = {
settings: { settings: {
java: {
minRAM: resolveMinRAM(),
maxRAM: resolveMaxRAM(), // Dynamic
executable: null,
jvmOptions: [
'-XX:+UseConcMarkSweepGC',
'-XX:+CMSIncrementalMode',
'-XX:-UseAdaptiveSizePolicy',
'-Xmn128M'
],
},
game: { game: {
resWidth: 1280, resWidth: 1280,
resHeight: 720, resHeight: 720,
@ -103,7 +113,8 @@ const DEFAULT_CONFIG = {
selectedServer: null, // Resolved selectedServer: null, // Resolved
selectedAccount: null, selectedAccount: null,
authenticationDatabase: {}, authenticationDatabase: {},
modConfigurations: [] modConfigurations: [],
javaConfig: {}
} }
let config = null let config = null
@ -177,7 +188,7 @@ function validateKeySet(srcObj, destObj){
if(srcObj == null){ if(srcObj == null){
srcObj = {} srcObj = {}
} }
const validationBlacklist = ['authenticationDatabase'] const validationBlacklist = ['authenticationDatabase', 'javaConfig']
const keys = Object.keys(srcObj) const keys = Object.keys(srcObj)
for(let i=0; i<keys.length; i++){ for(let i=0; i<keys.length; i++){
if(typeof destObj[keys[i]] === 'undefined'){ if(typeof destObj[keys[i]] === 'undefined'){
@ -511,16 +522,66 @@ exports.setModConfiguration = function(serverid, configuration){
// Java Settings // Java Settings
function defaultJavaConfig(mcVersion) {
if(mcVersionAtLeast('1.17', mcVersion)) {
return defaultJavaConfig117()
} else {
return defaultJavaConfigBelow117()
}
}
function defaultJavaConfigBelow117() {
return {
minRAM: resolveMinRAM(),
maxRAM: resolveMaxRAM(), // Dynamic
executable: null,
jvmOptions: [
'-XX:+UseConcMarkSweepGC',
'-XX:+CMSIncrementalMode',
'-XX:-UseAdaptiveSizePolicy',
'-Xmn128M'
],
}
}
function defaultJavaConfig117() {
return {
minRAM: resolveMinRAM(),
maxRAM: resolveMaxRAM(), // Dynamic
executable: null,
jvmOptions: [
'-XX:+UnlockExperimentalVMOptions',
'-XX:+UseG1GC',
'-XX:G1NewSizePercent=20',
'-XX:G1ReservePercent=20',
'-XX:MaxGCPauseMillis=50',
'-XX:G1HeapRegionSize=32M'
],
}
}
/**
* Ensure a java config property is set for the given server.
*
* @param {string} serverid The server id.
* @param {*} mcVersion The minecraft version of the server.
*/
exports.ensureJavaConfig = function(serverid, mcVersion) {
if(!Object.prototype.hasOwnProperty.call(config.javaConfig, serverid)) {
config.javaConfig[serverid] = defaultJavaConfig(mcVersion)
}
}
/** /**
* Retrieve the minimum amount of memory for JVM initialization. This value * Retrieve the minimum amount of memory for JVM initialization. This value
* contains the units of memory. For example, '5G' = 5 GigaBytes, '1024M' = * contains the units of memory. For example, '5G' = 5 GigaBytes, '1024M' =
* 1024 MegaBytes, etc. * 1024 MegaBytes, etc.
* *
* @param {boolean} def Optional. If true, the default value will be returned. * @param {string} serverid The server id.
* @returns {string} The minimum amount of memory for JVM initialization. * @returns {string} The minimum amount of memory for JVM initialization.
*/ */
exports.getMinRAM = function(def = false){ exports.getMinRAM = function(serverid){
return !def ? config.settings.java.minRAM : DEFAULT_CONFIG.settings.java.minRAM return config.javaConfig[serverid].minRAM
} }
/** /**
@ -528,10 +589,11 @@ exports.getMinRAM = function(def = false){
* contain the units of memory. For example, '5G' = 5 GigaBytes, '1024M' = * contain the units of memory. For example, '5G' = 5 GigaBytes, '1024M' =
* 1024 MegaBytes, etc. * 1024 MegaBytes, etc.
* *
* @param {string} serverid The server id.
* @param {string} minRAM The new minimum amount of memory for JVM initialization. * @param {string} minRAM The new minimum amount of memory for JVM initialization.
*/ */
exports.setMinRAM = function(minRAM){ exports.setMinRAM = function(serverid, minRAM){
config.settings.java.minRAM = minRAM config.javaConfig[serverid].minRAM = minRAM
} }
/** /**
@ -539,11 +601,11 @@ exports.setMinRAM = function(minRAM){
* contains the units of memory. For example, '5G' = 5 GigaBytes, '1024M' = * contains the units of memory. For example, '5G' = 5 GigaBytes, '1024M' =
* 1024 MegaBytes, etc. * 1024 MegaBytes, etc.
* *
* @param {boolean} def Optional. If true, the default value will be returned. * @param {string} serverid The server id.
* @returns {string} The maximum amount of memory for JVM initialization. * @returns {string} The maximum amount of memory for JVM initialization.
*/ */
exports.getMaxRAM = function(def = false){ exports.getMaxRAM = function(serverid){
return !def ? config.settings.java.maxRAM : resolveMaxRAM() return config.javaConfig[serverid].maxRAM
} }
/** /**
@ -551,10 +613,11 @@ exports.getMaxRAM = function(def = false){
* contain the units of memory. For example, '5G' = 5 GigaBytes, '1024M' = * contain the units of memory. For example, '5G' = 5 GigaBytes, '1024M' =
* 1024 MegaBytes, etc. * 1024 MegaBytes, etc.
* *
* @param {string} serverid The server id.
* @param {string} maxRAM The new maximum amount of memory for JVM initialization. * @param {string} maxRAM The new maximum amount of memory for JVM initialization.
*/ */
exports.setMaxRAM = function(maxRAM){ exports.setMaxRAM = function(serverid, maxRAM){
config.settings.java.maxRAM = maxRAM config.javaConfig[serverid].maxRAM = maxRAM
} }
/** /**
@ -562,19 +625,21 @@ exports.setMaxRAM = function(maxRAM){
* *
* This is a resolved configuration value and defaults to null until externally assigned. * This is a resolved configuration value and defaults to null until externally assigned.
* *
* @param {string} serverid The server id.
* @returns {string} The path of the Java Executable. * @returns {string} The path of the Java Executable.
*/ */
exports.getJavaExecutable = function(){ exports.getJavaExecutable = function(serverid){
return config.settings.java.executable return config.javaConfig[serverid].executable
} }
/** /**
* Set the path of the Java Executable. * Set the path of the Java Executable.
* *
* @param {string} serverid The server id.
* @param {string} executable The new path of the Java Executable. * @param {string} executable The new path of the Java Executable.
*/ */
exports.setJavaExecutable = function(executable){ exports.setJavaExecutable = function(serverid, executable){
config.settings.java.executable = executable config.javaConfig[serverid].executable = executable
} }
/** /**
@ -582,11 +647,11 @@ exports.setJavaExecutable = function(executable){
* such as memory allocation, will be dynamically resolved and will not be included * such as memory allocation, will be dynamically resolved and will not be included
* in this value. * in this value.
* *
* @param {boolean} def Optional. If true, the default value will be returned. * @param {string} serverid The server id.
* @returns {Array.<string>} An array of the additional arguments for JVM initialization. * @returns {Array.<string>} An array of the additional arguments for JVM initialization.
*/ */
exports.getJVMOptions = function(def = false){ exports.getJVMOptions = function(serverid){
return !def ? config.settings.java.jvmOptions : DEFAULT_CONFIG.settings.java.jvmOptions return config.javaConfig[serverid].jvmOptions
} }
/** /**
@ -594,11 +659,12 @@ exports.getJVMOptions = function(def = false){
* such as memory allocation, will be dynamically resolved and should not be * such as memory allocation, will be dynamically resolved and should not be
* included in this value. * included in this value.
* *
* @param {string} serverid The server id.
* @param {Array.<string>} jvmOptions An array of the new additional arguments for JVM * @param {Array.<string>} jvmOptions An array of the new additional arguments for JVM
* initialization. * initialization.
*/ */
exports.setJVMOptions = function(jvmOptions){ exports.setJVMOptions = function(serverid, jvmOptions){
config.settings.java.jvmOptions = jvmOptions config.javaConfig[serverid].jvmOptions = jvmOptions
} }
// Game Settings // Game Settings

View File

@ -61,7 +61,7 @@ class ProcessBuilder {
logger.log('Launch Arguments:', args) logger.log('Launch Arguments:', args)
const child = child_process.spawn(ConfigManager.getJavaExecutable(), args, { const child = child_process.spawn(ConfigManager.getJavaExecutable(this.server.getID()), args, {
cwd: this.gameDir, cwd: this.gameDir,
detached: ConfigManager.getLaunchDetached() detached: ConfigManager.getLaunchDetached()
}) })
@ -356,9 +356,9 @@ class ProcessBuilder {
args.push('-Xdock:name=HeliosLauncher') args.push('-Xdock:name=HeliosLauncher')
args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns'))
} }
args.push('-Xmx' + ConfigManager.getMaxRAM()) args.push('-Xmx' + ConfigManager.getMaxRAM(this.server.getID()))
args.push('-Xms' + ConfigManager.getMinRAM()) args.push('-Xms' + ConfigManager.getMinRAM(this.server.getID()))
args = args.concat(ConfigManager.getJVMOptions()) args = args.concat(ConfigManager.getJVMOptions(this.server.getID()))
args.push('-Djava.library.path=' + tempNativePath) args.push('-Djava.library.path=' + tempNativePath)
// Main Java Class // Main Java Class
@ -407,9 +407,9 @@ class ProcessBuilder {
args.push('-Xdock:name=HeliosLauncher') args.push('-Xdock:name=HeliosLauncher')
args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns'))
} }
args.push('-Xmx' + ConfigManager.getMaxRAM()) args.push('-Xmx' + ConfigManager.getMaxRAM(this.server.getID()))
args.push('-Xms' + ConfigManager.getMinRAM()) args.push('-Xms' + ConfigManager.getMinRAM(this.server.getID()))
args = args.concat(ConfigManager.getJVMOptions()) args = args.concat(ConfigManager.getJVMOptions(this.server.getID()))
// Main Java Class // Main Java Class
args.push(this.forgeData.mainClass) args.push(this.forgeData.mainClass)

View File

@ -87,7 +87,7 @@ function setLaunchEnabled(val){
document.getElementById('launch_button').addEventListener('click', function(e){ document.getElementById('launch_button').addEventListener('click', function(e){
loggerLanding.log('Launching game..') loggerLanding.log('Launching game..')
const mcVersion = DistroManager.getDistribution().getServer(ConfigManager.getSelectedServer()).getMinecraftVersion() const mcVersion = DistroManager.getDistribution().getServer(ConfigManager.getSelectedServer()).getMinecraftVersion()
const jExe = ConfigManager.getJavaExecutable() const jExe = ConfigManager.getJavaExecutable(ConfigManager.getSelectedServer())
if(jExe == null){ if(jExe == null){
asyncSystemScan(mcVersion) asyncSystemScan(mcVersion)
} else { } else {
@ -140,7 +140,7 @@ updateSelectedAccount(ConfigManager.getSelectedAccount())
// Bind selected server // Bind selected server
function updateSelectedServer(serv){ function updateSelectedServer(serv){
if(getCurrentView() === VIEWS.settings){ if(getCurrentView() === VIEWS.settings){
saveAllModConfigurations() fullSettingsSave()
} }
ConfigManager.setSelectedServer(serv != null ? serv.getID() : null) ConfigManager.setSelectedServer(serv != null ? serv.getID() : null)
ConfigManager.save() ConfigManager.save()
@ -332,7 +332,7 @@ function asyncSystemScan(mcVersion, launchAfter = true){
) )
setOverlayHandler(() => { setOverlayHandler(() => {
setLaunchDetails('Preparing Java Download..') setLaunchDetails('Preparing Java Download..')
sysAEx.send({task: 'changeContext', class: 'AssetGuard', args: [ConfigManager.getCommonDirectory(),ConfigManager.getJavaExecutable()]}) sysAEx.send({task: 'changeContext', class: 'AssetGuard', args: [ConfigManager.getCommonDirectory(),ConfigManager.getJavaExecutable(ConfigManager.getSelectedServer())]})
sysAEx.send({task: 'execute', function: '_enqueueOpenJDK', argsArr: [ConfigManager.getDataDirectory()]}) sysAEx.send({task: 'execute', function: '_enqueueOpenJDK', argsArr: [ConfigManager.getDataDirectory()]})
toggleOverlay(false) toggleOverlay(false)
}) })
@ -360,7 +360,7 @@ function asyncSystemScan(mcVersion, launchAfter = true){
} else { } else {
// Java installation found, use this to launch the game. // Java installation found, use this to launch the game.
ConfigManager.setJavaExecutable(m.result) ConfigManager.setJavaExecutable(ConfigManager.getSelectedServer(), m.result)
ConfigManager.save() ConfigManager.save()
// We need to make sure that the updated value is on the settings UI. // We need to make sure that the updated value is on the settings UI.
@ -434,7 +434,7 @@ function asyncSystemScan(mcVersion, launchAfter = true){
remote.getCurrentWindow().setProgressBar(-1) remote.getCurrentWindow().setProgressBar(-1)
// Extraction completed successfully. // Extraction completed successfully.
ConfigManager.setJavaExecutable(m.args[0]) ConfigManager.setJavaExecutable(ConfigManager.getSelectedServer(), m.args[0])
ConfigManager.save() ConfigManager.save()
if(extractListener != null){ if(extractListener != null){
@ -506,7 +506,7 @@ function dlAsync(login = true){
aEx = cp.fork(path.join(__dirname, 'assets', 'js', 'assetexec.js'), [ aEx = cp.fork(path.join(__dirname, 'assets', 'js', 'assetexec.js'), [
'AssetGuard', 'AssetGuard',
ConfigManager.getCommonDirectory(), ConfigManager.getCommonDirectory(),
ConfigManager.getJavaExecutable() ConfigManager.getJavaExecutable(ConfigManager.getSelectedServer())
], { ], {
env: forkEnv, env: forkEnv,
stdio: 'pipe' stdio: 'pipe'

View File

@ -2,7 +2,7 @@
const os = require('os') const os = require('os')
const semver = require('semver') const semver = require('semver')
const { JavaGuard } = require('./assets/js/assetguard') const { JavaGuard, Util } = require('./assets/js/assetguard')
const DropinModUtil = require('./assets/js/dropinmodutil') const DropinModUtil = require('./assets/js/dropinmodutil')
const { MSFT_OPCODE, MSFT_REPLY_TYPE, MSFT_ERROR } = require('./assets/js/ipcconstants') const { MSFT_OPCODE, MSFT_REPLY_TYPE, MSFT_ERROR } = require('./assets/js/ipcconstants')
@ -127,29 +127,34 @@ function initSettingsValues(){
const sEls = document.getElementById('settingsContainer').querySelectorAll('[cValue]') const sEls = document.getElementById('settingsContainer').querySelectorAll('[cValue]')
Array.from(sEls).map((v, index, arr) => { Array.from(sEls).map((v, index, arr) => {
const cVal = v.getAttribute('cValue') const cVal = v.getAttribute('cValue')
const serverDependent = v.hasAttribute('serverDependent') // Means the first argument is the server id.
const gFn = ConfigManager['get' + cVal] const gFn = ConfigManager['get' + cVal]
const gFnOpts = []
if(serverDependent) {
gFnOpts.push(ConfigManager.getSelectedServer())
}
if(typeof gFn === 'function'){ if(typeof gFn === 'function'){
if(v.tagName === 'INPUT'){ if(v.tagName === 'INPUT'){
if(v.type === 'number' || v.type === 'text'){ if(v.type === 'number' || v.type === 'text'){
// Special Conditions // Special Conditions
if(cVal === 'JavaExecutable'){ if(cVal === 'JavaExecutable'){
populateJavaExecDetails(v.value) populateJavaExecDetails(v.value)
v.value = gFn() v.value = gFn.apply(null, gFnOpts)
} else if (cVal === 'DataDirectory'){ } else if (cVal === 'DataDirectory'){
v.value = gFn() v.value = gFn.apply(null, gFnOpts)
} else if(cVal === 'JVMOptions'){ } else if(cVal === 'JVMOptions'){
v.value = gFn().join(' ') v.value = gFn.apply(null, gFnOpts).join(' ')
} else { } else {
v.value = gFn() v.value = gFn.apply(null, gFnOpts)
} }
} else if(v.type === 'checkbox'){ } else if(v.type === 'checkbox'){
v.checked = gFn() v.checked = gFn.apply(null, gFnOpts)
} }
} else if(v.tagName === 'DIV'){ } else if(v.tagName === 'DIV'){
if(v.classList.contains('rangeSlider')){ if(v.classList.contains('rangeSlider')){
// Special Conditions // Special Conditions
if(cVal === 'MinRAM' || cVal === 'MaxRAM'){ if(cVal === 'MinRAM' || cVal === 'MaxRAM'){
let val = gFn() let val = gFn.apply(null, gFnOpts)
if(val.endsWith('M')){ if(val.endsWith('M')){
val = Number(val.substring(0, val.length-1))/1000 val = Number(val.substring(0, val.length-1))/1000
} else { } else {
@ -158,7 +163,7 @@ function initSettingsValues(){
v.setAttribute('value', val) v.setAttribute('value', val)
} else { } else {
v.setAttribute('value', Number.parseFloat(gFn())) v.setAttribute('value', Number.parseFloat(gFn.apply(null, gFnOpts)))
} }
} }
} }
@ -174,22 +179,31 @@ function saveSettingsValues(){
const sEls = document.getElementById('settingsContainer').querySelectorAll('[cValue]') const sEls = document.getElementById('settingsContainer').querySelectorAll('[cValue]')
Array.from(sEls).map((v, index, arr) => { Array.from(sEls).map((v, index, arr) => {
const cVal = v.getAttribute('cValue') const cVal = v.getAttribute('cValue')
const serverDependent = v.hasAttribute('serverDependent') // Means the first argument is the server id.
const sFn = ConfigManager['set' + cVal] const sFn = ConfigManager['set' + cVal]
const sFnOpts = []
if(serverDependent) {
sFnOpts.push(ConfigManager.getSelectedServer())
}
if(typeof sFn === 'function'){ if(typeof sFn === 'function'){
if(v.tagName === 'INPUT'){ if(v.tagName === 'INPUT'){
if(v.type === 'number' || v.type === 'text'){ if(v.type === 'number' || v.type === 'text'){
// Special Conditions // Special Conditions
if(cVal === 'JVMOptions'){ if(cVal === 'JVMOptions'){
if(!v.value.trim()) { if(!v.value.trim()) {
sFn([]) sFnOpts.push([])
sFn.apply(null, sFnOpts)
} else { } else {
sFn(v.value.trim().split(/\s+/)) sFnOpts.push(v.value.trim().split(/\s+/))
sFn.apply(null, sFnOpts)
} }
} else { } else {
sFn(v.value) sFnOpts.push(v.value)
sFn.apply(null, sFnOpts)
} }
} else if(v.type === 'checkbox'){ } else if(v.type === 'checkbox'){
sFn(v.checked) sFnOpts.push(v.checked)
sFn.apply(null, sFnOpts)
// Special Conditions // Special Conditions
if(cVal === 'AllowPrerelease'){ if(cVal === 'AllowPrerelease'){
changeAllowPrerelease(v.checked) changeAllowPrerelease(v.checked)
@ -206,9 +220,11 @@ function saveSettingsValues(){
val = val + 'G' val = val + 'G'
} }
sFn(val) sFnOpts.push(val)
sFn.apply(null, sFnOpts)
} else { } else {
sFn(v.getAttribute('value')) sFnOpts.push(v.getAttribute('value'))
sFn.apply(null, sFnOpts)
} }
} }
} }
@ -305,13 +321,17 @@ function settingsSaveDisabled(v){
settingsNavDone.disabled = v settingsNavDone.disabled = v
} }
/* Closes the settings view and saves all data. */ function fullSettingsSave() {
settingsNavDone.onclick = () => {
saveSettingsValues() saveSettingsValues()
saveModConfiguration() saveModConfiguration()
ConfigManager.save() ConfigManager.save()
saveDropinModConfiguration() saveDropinModConfiguration()
saveShaderpackSettings() saveShaderpackSettings()
}
/* Closes the settings view and saves all data. */
settingsNavDone.onclick = () => {
fullSettingsSave()
switchView(getCurrentView(), VIEWS.landing) switchView(getCurrentView(), VIEWS.landing)
} }
@ -1135,6 +1155,7 @@ const settingsMinRAMLabel = document.getElementById('settingsMinRAMLabel')
const settingsMemoryTotal = document.getElementById('settingsMemoryTotal') const settingsMemoryTotal = document.getElementById('settingsMemoryTotal')
const settingsMemoryAvail = document.getElementById('settingsMemoryAvail') const settingsMemoryAvail = document.getElementById('settingsMemoryAvail')
const settingsJavaExecDetails = document.getElementById('settingsJavaExecDetails') const settingsJavaExecDetails = document.getElementById('settingsJavaExecDetails')
const settingsJavaReqDesc = document.getElementById('settingsJavaReqDesc')
// Store maximum memory values. // Store maximum memory values.
const SETTINGS_MAX_MEMORY = ConfigManager.getAbsoluteMaxRAM() const SETTINGS_MAX_MEMORY = ConfigManager.getAbsoluteMaxRAM()
@ -1342,12 +1363,24 @@ function populateJavaExecDetails(execPath){
}) })
} }
function populateJavaReqDesc() {
const mcVer = DistroManager.getDistribution().getServer(ConfigManager.getSelectedServer()).getMinecraftVersion()
if(Util.mcVersionAtLeast('1.17', mcVer)) {
settingsJavaReqDesc.innerHTML = 'Requires Java 17 x64.'
} else {
settingsJavaReqDesc.innerHTML = 'Requires Java 8 x64.'
}
}
/** /**
* Prepare the Java tab for display. * Prepare the Java tab for display.
*/ */
function prepareJavaTab(){ function prepareJavaTab(){
bindRangeSlider() bindRangeSlider()
populateMemoryStatus() populateMemoryStatus()
populateJavaReqDesc()
populateJavaExecDetails()
} }
/** /**

View File

@ -137,6 +137,7 @@ function onDistroRefresh(data){
refreshServerStatus() refreshServerStatus()
initNews() initNews()
syncModConfigurations(data) syncModConfigurations(data)
ensureJavaSettings(data)
} }
/** /**
@ -223,6 +224,21 @@ function syncModConfigurations(data){
ConfigManager.save() ConfigManager.save()
} }
/**
* Ensure java configurations are present for the available servers.
*
* @param {Object} data The distro index object.
*/
function ensureJavaSettings(data) {
// Nothing too fancy for now.
for(const serv of data.getServers()){
ConfigManager.ensureJavaConfig(serv.getID(), serv.getMinecraftVersion())
}
ConfigManager.save()
}
/** /**
* Recursively scan for optional sub modules. If none are found, * Recursively scan for optional sub modules. If none are found,
* this function returns a boolean. If optional sub modules do exist, * this function returns a boolean. If optional sub modules do exist,
@ -434,6 +450,7 @@ ipcRenderer.on('distributionIndexDone', (event, res) => {
if(res) { if(res) {
const data = DistroManager.getDistribution() const data = DistroManager.getDistribution()
syncModConfigurations(data) syncModConfigurations(data)
ensureJavaSettings(data)
if(document.readyState === 'interactive' || document.readyState === 'complete'){ if(document.readyState === 'interactive' || document.readyState === 'complete'){
showMainUI(data) showMainUI(data)
} else { } else {
@ -448,3 +465,13 @@ ipcRenderer.on('distributionIndexDone', (event, res) => {
} }
} }
}) })
// Util for development
function devModeToggle() {
DistroManager.setDevMode(true)
DistroManager.pullLocal().then((data) => {
ensureJavaSettings(data)
updateSelectedServer(data.getServers()[0])
syncModConfigurations(data)
})
}

View File

@ -189,7 +189,7 @@
<div class="settingsMemoryContentItem"> <div class="settingsMemoryContentItem">
<span class="settingsMemoryHeader">Maximum RAM</span> <span class="settingsMemoryHeader">Maximum RAM</span>
<div class="settingsMemoryActionContainer"> <div class="settingsMemoryActionContainer">
<div id="settingsMaxRAMRange" class="rangeSlider" cValue="MaxRAM" min="3" max="8" value="3" step="0.5"> <div id="settingsMaxRAMRange" class="rangeSlider" cValue="MaxRAM" serverDependent min="3" max="8" value="3" step="0.5">
<div class="rangeSliderBar"></div> <div class="rangeSliderBar"></div>
<div class="rangeSliderTrack"></div> <div class="rangeSliderTrack"></div>
</div> </div>
@ -199,7 +199,7 @@
<div class="settingsMemoryContentItem"> <div class="settingsMemoryContentItem">
<span class="settingsMemoryHeader">Minimum RAM</span> <span class="settingsMemoryHeader">Minimum RAM</span>
<div class="settingsMemoryActionContainer"> <div class="settingsMemoryActionContainer">
<div id="settingsMinRAMRange" class="rangeSlider" cValue="MinRAM" min="3" max="8" value="3" step="0.5"> <div id="settingsMinRAMRange" class="rangeSlider" cValue="MinRAM" serverDependent min="3" max="8" value="3" step="0.5">
<div class="rangeSliderBar"></div> <div class="rangeSliderBar"></div>
<div class="rangeSliderTrack"></div> <div class="rangeSliderTrack"></div>
</div> </div>
@ -241,11 +241,11 @@
</g> </g>
</svg> </svg>
</div> </div>
<input class="settingsFileSelVal" id="settingsJavaExecVal" type="text" value="null" cValue="JavaExecutable" disabled> <input class="settingsFileSelVal" id="settingsJavaExecVal" type="text" value="null" cValue="JavaExecutable" serverDependent disabled>
<button class="settingsFileSelButton" id="settingsJavaExecSel" dialogTitle="Select Java Executable" dialogDirectory="false">Choose File</button> <button class="settingsFileSelButton" id="settingsJavaExecSel" dialogTitle="Select Java Executable" dialogDirectory="false">Choose File</button>
</div> </div>
</div> </div>
<div class="settingsFileSelDesc">The Java executable is validated before game launch. <strong>Requires Java 8 x64.</strong><br>The path should end with <strong>bin<%= process.platform === 'win32' ? '\\javaw.exe' : '/java' %></strong>.</div> <div class="settingsFileSelDesc">The Java executable is validated before game launch. <strong id="settingsJavaReqDesc">Requires Java 8 x64.</strong><br>The path should end with <strong>bin<%= process.platform === 'win32' ? '\\javaw.exe' : '/java' %></strong>.</div>
</div> </div>
<div id="settingsJVMOptsContainer"> <div id="settingsJVMOptsContainer">
<div id="settingsJVMOptsTitle">Additional JVM Options</div> <div id="settingsJVMOptsTitle">Additional JVM Options</div>
@ -264,7 +264,7 @@
</g> </g>
</svg> </svg>
</div> </div>
<input id="settingsJVMOptsVal" cValue="JVMOptions" type="text"> <input id="settingsJVMOptsVal" cValue="JVMOptions" serverDependent type="text">
</div> </div>
<div id="settingsJVMOptsDesc">Options to be provided to the JVM at runtime. <em>-Xms</em> and <em>-Xmx</em> should not be included.<br><a href="https://docs.oracle.com/javase/8/docs/technotes/tools/<%= process.platform === 'win32' ? 'windows' : 'unix' %>/java.html">Available Options for Java 8</a>.</div> <div id="settingsJVMOptsDesc">Options to be provided to the JVM at runtime. <em>-Xms</em> and <em>-Xmx</em> should not be included.<br><a href="https://docs.oracle.com/javase/8/docs/technotes/tools/<%= process.platform === 'win32' ? 'windows' : 'unix' %>/java.html">Available Options for Java 8</a>.</div>
</div> </div>

22
package-lock.json generated
View File

@ -21,6 +21,7 @@
"got": "^11.8.5", "got": "^11.8.5",
"helios-core": "~0.1.2", "helios-core": "~0.1.2",
"jquery": "^3.6.1", "jquery": "^3.6.1",
"node-disk-info": "^1.3.0",
"node-stream-zip": "^1.15.0", "node-stream-zip": "^1.15.0",
"request": "^2.88.2", "request": "^2.88.2",
"semver": "^7.3.8", "semver": "^7.3.8",
@ -2439,7 +2440,6 @@
"version": "0.6.3", "version": "0.6.3",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
"dev": true,
"dependencies": { "dependencies": {
"safer-buffer": ">= 2.1.2 < 3.0.0" "safer-buffer": ">= 2.1.2 < 3.0.0"
}, },
@ -2973,6 +2973,17 @@
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"node_modules/node-disk-info": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/node-disk-info/-/node-disk-info-1.3.0.tgz",
"integrity": "sha512-NEx858vJZ0AoBtmD/ChBIHLjFTF28xCsDIgmFl4jtGKsvlUx9DU/OrMDjvj3qp/E4hzLN0HvTg7eJx5XFQvbeg==",
"dependencies": {
"iconv-lite": "^0.6.2"
},
"engines": {
"node": ">= 12"
}
},
"node_modules/node-fetch": { "node_modules/node-fetch": {
"version": "2.6.7", "version": "2.6.7",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
@ -6107,7 +6118,6 @@
"version": "0.6.3", "version": "0.6.3",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
"dev": true,
"requires": { "requires": {
"safer-buffer": ">= 2.1.2 < 3.0.0" "safer-buffer": ">= 2.1.2 < 3.0.0"
} }
@ -6510,6 +6520,14 @@
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"node-disk-info": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/node-disk-info/-/node-disk-info-1.3.0.tgz",
"integrity": "sha512-NEx858vJZ0AoBtmD/ChBIHLjFTF28xCsDIgmFl4jtGKsvlUx9DU/OrMDjvj3qp/E4hzLN0HvTg7eJx5XFQvbeg==",
"requires": {
"iconv-lite": "^0.6.2"
}
},
"node-fetch": { "node-fetch": {
"version": "2.6.7", "version": "2.6.7",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",

View File

@ -35,6 +35,7 @@
"got": "^11.8.5", "got": "^11.8.5",
"helios-core": "~0.1.2", "helios-core": "~0.1.2",
"jquery": "^3.6.1", "jquery": "^3.6.1",
"node-disk-info": "^1.3.0",
"node-stream-zip": "^1.15.0", "node-stream-zip": "^1.15.0",
"request": "^2.88.2", "request": "^2.88.2",
"semver": "^7.3.8", "semver": "^7.3.8",