bugfixes.

pull/270/head
Daniel Scalzi 2023-03-18 19:01:22 -04:00
parent 12a84c1cce
commit 3ef5fabb35
No known key found for this signature in database
GPG Key ID: 9E3E2AFE45328AA5
4 changed files with 13 additions and 13 deletions

View File

@ -174,11 +174,11 @@ class ProcessBuilder {
const v = this.resolveModConfiguration(modCfg[mdl.getVersionlessMavenIdentifier()].mods, mdl.subModules) const v = this.resolveModConfiguration(modCfg[mdl.getVersionlessMavenIdentifier()].mods, mdl.subModules)
fMods = fMods.concat(v.fMods) fMods = fMods.concat(v.fMods)
lMods = lMods.concat(v.lMods) lMods = lMods.concat(v.lMods)
if(mdl.type === Type.LiteLoader){ if(type === Type.LiteLoader){
continue continue
} }
} }
if(mdl.type === Type.ForgeMod){ if(type === Type.ForgeMod){
fMods.push(mdl) fMods.push(mdl)
} else { } else {
lMods.push(mdl) lMods.push(mdl)
@ -241,11 +241,11 @@ class ProcessBuilder {
const ids = [] const ids = []
if(type === 'forge'){ if(type === 'forge'){
for(let mod of mods){ for(let mod of mods){
ids.push(mod.getExtensionlessID()) ids.push(mod.getExtensionlessMavenIdentifier())
} }
} else { } else {
for(let mod of mods){ for(let mod of mods){
ids.push(mod.getExtensionlessID() + '@' + mod.getExtension()) ids.push(mod.getMavenIdentifier())
} }
} }
modList.modRef = ids modList.modRef = ids
@ -265,7 +265,7 @@ class ProcessBuilder {
// */ // */
// constructModArguments(mods){ // constructModArguments(mods){
// const argStr = mods.map(mod => { // const argStr = mods.map(mod => {
// return mod.getExtensionlessID() // return mod.getExtensionlessMavenIdentifier()
// }).join(',') // }).join(',')
// if(argStr){ // if(argStr){
@ -288,7 +288,7 @@ class ProcessBuilder {
*/ */
constructModList(mods) { constructModList(mods) {
const writeBuffer = mods.map(mod => { const writeBuffer = mods.map(mod => {
return mod.getExtensionlessID() return mod.getExtensionlessMavenIdentifier()
}).join('\n') }).join('\n')
if(writeBuffer) { if(writeBuffer) {

View File

@ -458,8 +458,8 @@ ipcRenderer.on('distributionIndexDone', async (event, res) => {
// Util for development // Util for development
async function devModeToggle() { async function devModeToggle() {
DistroAPI.toggleDevMode(true) DistroAPI.toggleDevMode(true)
const data = await DistroAPI.getDistributionLocalLoadOnly() const data = await DistroAPI.refreshDistributionOrFallback()
ensureJavaSettings(data) ensureJavaSettings(data)
updateSelectedServer(data.getServers()[0]) updateSelectedServer(data.servers[0])
syncModConfigurations(data) syncModConfigurations(data)
} }

8
package-lock.json generated
View File

@ -19,7 +19,7 @@
"fs-extra": "^11.1.0", "fs-extra": "^11.1.0",
"github-syntax-dark": "^0.5.0", "github-syntax-dark": "^0.5.0",
"got": "^11.8.5", "got": "^11.8.5",
"helios-core": "~0.2.0-pre.1", "helios-core": "~0.2.0-pre.2",
"helios-distribution-types": "^1.2.0-pre.1", "helios-distribution-types": "^1.2.0-pre.1",
"jquery": "^3.6.1", "jquery": "^3.6.1",
"semver": "^7.3.8" "semver": "^7.3.8"
@ -2180,9 +2180,9 @@
} }
}, },
"node_modules/helios-core": { "node_modules/helios-core": {
"version": "0.2.0-pre.1", "version": "0.2.0-pre.2",
"resolved": "https://registry.npmjs.org/helios-core/-/helios-core-0.2.0-pre.1.tgz", "resolved": "https://registry.npmjs.org/helios-core/-/helios-core-0.2.0-pre.2.tgz",
"integrity": "sha512-hH5AtEZMVRR8/Wstq/8xOrL773p8+wrXZoqTbeqTGcLn1bv9+vmh9ifIAuAQUNaWxXgE/t/Nrw0ph0QJQ/NA6g==", "integrity": "sha512-rS9xa2CfQBa+2uINOhIYFSR/nDZQJp8DJrbHXxKFSRckGvdPWwandEwwFoN+bwm3bPSdVhCe2xiSESbMK86UOA==",
"dependencies": { "dependencies": {
"fastq": "^1.15.0", "fastq": "^1.15.0",
"fs-extra": "^10.1.0", "fs-extra": "^10.1.0",

View File

@ -33,7 +33,7 @@
"fs-extra": "^11.1.0", "fs-extra": "^11.1.0",
"github-syntax-dark": "^0.5.0", "github-syntax-dark": "^0.5.0",
"got": "^11.8.5", "got": "^11.8.5",
"helios-core": "~0.2.0-pre.1", "helios-core": "~0.2.0-pre.2",
"helios-distribution-types": "^1.2.0-pre.1", "helios-distribution-types": "^1.2.0-pre.1",
"jquery": "^3.6.1", "jquery": "^3.6.1",
"semver": "^7.3.8" "semver": "^7.3.8"