mirror of
https://github.com/dscalzi/HeliosLauncher.git
synced 2024-12-22 03:32:12 -08:00
Compare commits
No commits in common. "afb461dbc3f2a3ba22d895c111944ff59e1b0317" and "092f36afeb424c06293ae554352ea273322334ec" have entirely different histories.
afb461dbc3
...
092f36afeb
@ -839,7 +839,9 @@ class ProcessBuilder {
|
|||||||
libs[mdl.getVersionlessMavenIdentifier()] = mdl.getPath()
|
libs[mdl.getVersionlessMavenIdentifier()] = mdl.getPath()
|
||||||
if(mdl.subModules.length > 0){
|
if(mdl.subModules.length > 0){
|
||||||
const res = this._resolveModuleLibraries(mdl)
|
const res = this._resolveModuleLibraries(mdl)
|
||||||
libs = {...libs, ...res}
|
if(res.length > 0){
|
||||||
|
libs = {...libs, ...res}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -848,7 +850,9 @@ class ProcessBuilder {
|
|||||||
for(let i=0; i<mods.length; i++){
|
for(let i=0; i<mods.length; i++){
|
||||||
if(mods.sub_modules != null){
|
if(mods.sub_modules != null){
|
||||||
const res = this._resolveModuleLibraries(mods[i])
|
const res = this._resolveModuleLibraries(mods[i])
|
||||||
libs = {...libs, ...res}
|
if(res.length > 0){
|
||||||
|
libs = {...libs, ...res}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -859,25 +863,27 @@ class ProcessBuilder {
|
|||||||
* Recursively resolve the path of each library required by this module.
|
* Recursively resolve the path of each library required by this module.
|
||||||
*
|
*
|
||||||
* @param {Object} mdl A module object from the server distro index.
|
* @param {Object} mdl A module object from the server distro index.
|
||||||
* @returns {{[id: string]: string}} An object containing the paths of each library this module requires.
|
* @returns {Array.<string>} An array containing the paths of each library this module requires.
|
||||||
*/
|
*/
|
||||||
_resolveModuleLibraries(mdl){
|
_resolveModuleLibraries(mdl){
|
||||||
if(!mdl.subModules.length > 0){
|
if(!mdl.subModules.length > 0){
|
||||||
return {}
|
return []
|
||||||
}
|
}
|
||||||
let libs = {}
|
let libs = []
|
||||||
for(let sm of mdl.subModules){
|
for(let sm of mdl.subModules){
|
||||||
if(sm.rawModule.type === Type.Library){
|
if(sm.rawModule.type === Type.Library){
|
||||||
|
|
||||||
if(sm.rawModule.classpath ?? true) {
|
if(sm.rawModule.classpath ?? true) {
|
||||||
libs[sm.getVersionlessMavenIdentifier()] = sm.getPath()
|
libs.push(sm.getPath())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// If this module has submodules, we need to resolve the libraries for those.
|
// If this module has submodules, we need to resolve the libraries for those.
|
||||||
// To avoid unnecessary recursive calls, base case is checked here.
|
// To avoid unnecessary recursive calls, base case is checked here.
|
||||||
if(mdl.subModules.length > 0){
|
if(mdl.subModules.length > 0){
|
||||||
const res = this._resolveModuleLibraries(sm)
|
const res = this._resolveModuleLibraries(sm)
|
||||||
libs = {...libs, ...res}
|
if(res.length > 0){
|
||||||
|
libs = libs.concat(res)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return libs
|
return libs
|
||||||
|
Loading…
Reference in New Issue
Block a user