mirror of
https://github.com/dscalzi/HeliosLauncher.git
synced 2024-12-22 11:42:14 -08:00
Merge 6f9a5c65cc
into 9b898cc033
This commit is contained in:
commit
8bdc8fc33c
@ -841,6 +841,13 @@ class ProcessBuilder {
|
||||
libs = {...libs, ...res}
|
||||
}
|
||||
}
|
||||
} else if(type === Type.Forge){
|
||||
// Forge installer generated libraries
|
||||
const forgeLibs = []
|
||||
for (const library of this.forgeData.libraries) {
|
||||
forgeLibs.push(path.join(ConfigManager.getCommonDirectory(), 'libraries', library.downloads.artifact.path))
|
||||
}
|
||||
libs = {...libs, ...forgeLibs}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3,6 +3,7 @@
|
||||
*/
|
||||
// Requirements
|
||||
const { URL } = require('url')
|
||||
const { join } = require('path')
|
||||
const {
|
||||
MojangRestAPI,
|
||||
getServerStatus
|
||||
@ -548,6 +549,33 @@ async function dlAsync(login = true) {
|
||||
serv.rawServer.id
|
||||
)
|
||||
|
||||
// Install Forge
|
||||
let wrapperPath
|
||||
if(isDev) {
|
||||
wrapperPath = join(process.cwd(), 'libraries', 'java', 'ForgeInstallerCLI.jar')
|
||||
} else {
|
||||
const exePath = remote.app.getPath('exe')
|
||||
if(process.platform === 'darwin'){
|
||||
wrapperPath = join(exePath, '..', '..', 'Resources', 'libraries', 'java', 'ForgeInstallerCLI.jar')
|
||||
} else {
|
||||
wrapperPath = join(exePath, '..', 'resources', 'libraries', 'java', 'ForgeInstallerCLI.jar')
|
||||
}
|
||||
}
|
||||
|
||||
// Launch Forge Installer
|
||||
loggerLaunchSuite.info('Installing Forge.')
|
||||
setLaunchDetails('Installing Forge..')
|
||||
setLaunchPercentage(0)
|
||||
const jExe = ConfigManager.getJavaExecutable(ConfigManager.getSelectedServer())
|
||||
await distributionIndexProcessor.installForge(jExe, wrapperPath, percent => {
|
||||
setDownloadPercentage(percent)
|
||||
})
|
||||
setDownloadPercentage(100)
|
||||
|
||||
// Remove download bar.
|
||||
remote.getCurrentWindow().setProgressBar(-1)
|
||||
|
||||
// After Forge installed, we can get the Forge version data.
|
||||
const forgeData = await distributionIndexProcessor.loadForgeVersionJson(serv)
|
||||
const versionData = await mojangIndexProcessor.getVersionJson()
|
||||
|
||||
|
BIN
libraries/java/ForgeInstallerCLI.jar
Normal file
BIN
libraries/java/ForgeInstallerCLI.jar
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user