From 3ef5fabb35855623ff1ebf15fe1c094c643bcce7 Mon Sep 17 00:00:00 2001
From: Daniel Scalzi <d_scalzi@yahoo.com>
Date: Sat, 18 Mar 2023 19:01:22 -0400
Subject: [PATCH] bugfixes.

---
 app/assets/js/processbuilder.js   | 12 ++++++------
 app/assets/js/scripts/uibinder.js |  4 ++--
 package-lock.json                 |  8 ++++----
 package.json                      |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/assets/js/processbuilder.js b/app/assets/js/processbuilder.js
index 50ea172..b86698c 100644
--- a/app/assets/js/processbuilder.js
+++ b/app/assets/js/processbuilder.js
@@ -174,11 +174,11 @@ class ProcessBuilder {
                         const v = this.resolveModConfiguration(modCfg[mdl.getVersionlessMavenIdentifier()].mods, mdl.subModules)
                         fMods = fMods.concat(v.fMods)
                         lMods = lMods.concat(v.lMods)
-                        if(mdl.type === Type.LiteLoader){
+                        if(type === Type.LiteLoader){
                             continue
                         }
                     }
-                    if(mdl.type === Type.ForgeMod){
+                    if(type === Type.ForgeMod){
                         fMods.push(mdl)
                     } else {
                         lMods.push(mdl)
@@ -241,11 +241,11 @@ class ProcessBuilder {
         const ids = []
         if(type === 'forge'){
             for(let mod of mods){
-                ids.push(mod.getExtensionlessID())
+                ids.push(mod.getExtensionlessMavenIdentifier())
             }
         } else {
             for(let mod of mods){
-                ids.push(mod.getExtensionlessID() + '@' + mod.getExtension())
+                ids.push(mod.getMavenIdentifier())
             }
         }
         modList.modRef = ids
@@ -265,7 +265,7 @@ class ProcessBuilder {
     //  */
     // constructModArguments(mods){
     //     const argStr = mods.map(mod => {
-    //         return mod.getExtensionlessID()
+    //         return mod.getExtensionlessMavenIdentifier()
     //     }).join(',')
 
     //     if(argStr){
@@ -288,7 +288,7 @@ class ProcessBuilder {
      */
     constructModList(mods) {
         const writeBuffer = mods.map(mod => {
-            return mod.getExtensionlessID()
+            return mod.getExtensionlessMavenIdentifier()
         }).join('\n')
 
         if(writeBuffer) {
diff --git a/app/assets/js/scripts/uibinder.js b/app/assets/js/scripts/uibinder.js
index dd25b2f..71b6067 100644
--- a/app/assets/js/scripts/uibinder.js
+++ b/app/assets/js/scripts/uibinder.js
@@ -458,8 +458,8 @@ ipcRenderer.on('distributionIndexDone', async (event, res) => {
 // Util for development
 async function devModeToggle() {
     DistroAPI.toggleDevMode(true)
-    const data = await DistroAPI.getDistributionLocalLoadOnly()
+    const data = await DistroAPI.refreshDistributionOrFallback()
     ensureJavaSettings(data)
-    updateSelectedServer(data.getServers()[0])
+    updateSelectedServer(data.servers[0])
     syncModConfigurations(data)
 }
diff --git a/package-lock.json b/package-lock.json
index 3584203..2f946c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "fs-extra": "^11.1.0",
         "github-syntax-dark": "^0.5.0",
         "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",
         "jquery": "^3.6.1",
         "semver": "^7.3.8"
@@ -2180,9 +2180,9 @@
       }
     },
     "node_modules/helios-core": {
-      "version": "0.2.0-pre.1",
-      "resolved": "https://registry.npmjs.org/helios-core/-/helios-core-0.2.0-pre.1.tgz",
-      "integrity": "sha512-hH5AtEZMVRR8/Wstq/8xOrL773p8+wrXZoqTbeqTGcLn1bv9+vmh9ifIAuAQUNaWxXgE/t/Nrw0ph0QJQ/NA6g==",
+      "version": "0.2.0-pre.2",
+      "resolved": "https://registry.npmjs.org/helios-core/-/helios-core-0.2.0-pre.2.tgz",
+      "integrity": "sha512-rS9xa2CfQBa+2uINOhIYFSR/nDZQJp8DJrbHXxKFSRckGvdPWwandEwwFoN+bwm3bPSdVhCe2xiSESbMK86UOA==",
       "dependencies": {
         "fastq": "^1.15.0",
         "fs-extra": "^10.1.0",
diff --git a/package.json b/package.json
index a0838d3..613ed05 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "fs-extra": "^11.1.0",
     "github-syntax-dark": "^0.5.0",
     "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",
     "jquery": "^3.6.1",
     "semver": "^7.3.8"