Merge db3a4998d9 into 9b898cc033

app/assets/js/processbuilder.js

@@ -12,23 +12,14 @@ const ConfigManager            = require('./configmanager')
 
 const logger = LoggerUtil.getLogger('ProcessBuilder')
 
-
-/**
- * Only forge and fabric are top level mod loaders.
- * 
- * Forge 1.13+ launch logic is similar to fabrics, for now using usingFabricLoader flag to
- * change minor details when needed.
- * 
- * Rewrite of this module may be needed in the future.
- */
 class ProcessBuilder {
 
-    constructor(distroServer, vanillaManifest, modManifest, authUser, launcherVersion){
+    constructor(distroServer, versionData, forgeData, authUser, launcherVersion){
         this.gameDir = path.join(ConfigManager.getInstanceDirectory(), distroServer.rawServer.id)
         this.commonDir = ConfigManager.getCommonDirectory()
         this.server = distroServer
-        this.vanillaManifest = vanillaManifest
+        this.versionData = versionData
-        this.modManifest = modManifest
+        this.forgeData = forgeData
         this.authUser = authUser
         this.launcherVersion = launcherVersion
         this.forgeModListFile = path.join(this.gameDir, 'forgeMods.list') // 1.13+
@@ -37,7 +28,6 @@ class ProcessBuilder {
         this.libPath = path.join(this.commonDir, 'libraries')
 
         this.usingLiteLoader = false
-        this.usingFabricLoader = false
         this.llPath = null
     }
     
@@ -50,12 +40,9 @@ class ProcessBuilder {
         process.throwDeprecation = true
         this.setupLiteLoader()
         logger.info('Using liteloader:', this.usingLiteLoader)
-        this.usingFabricLoader = this.server.modules.some(mdl => mdl.rawModule.type === Type.Fabric)
-        logger.info('Using fabric loader:', this.usingFabricLoader)
         const modObj = this.resolveModConfiguration(ConfigManager.getModConfiguration(this.server.rawServer.id).mods, this.server.modules)
         
         // Mod list below 1.13
-        // Fabric only supports 1.14+
         if(!mcVersionAtLeast('1.13', this.server.rawServer.minecraftVersion)){
             this.constructJSONModList('forge', modObj.fMods, true)
             if(this.usingLiteLoader){
@@ -179,7 +166,7 @@ class ProcessBuilder {
 
         for(let mdl of mdls){
             const type = mdl.rawModule.type
-            if(type === Type.ForgeMod || type === Type.LiteMod || type === Type.LiteLoader || type === Type.FabricMod){
+            if(type === Type.ForgeMod || type === Type.LiteMod || type === Type.LiteLoader){
                 const o = !mdl.getRequired().value
                 const e = ProcessBuilder.isModEnabled(modCfg[mdl.getVersionlessMavenIdentifier()], mdl.getRequired())
                 if(!o || (o && e)){
@@ -191,7 +178,7 @@ class ProcessBuilder {
                             continue
                         }
                     }
-                    if(type === Type.ForgeMod || type === Type.FabricMod){
+                    if(type === Type.ForgeMod){
                         fMods.push(mdl)
                     } else {
                         lMods.push(mdl)
@@ -207,7 +194,7 @@ class ProcessBuilder {
     }
 
     _lteMinorVersion(version) {
-        return Number(this.modManifest.id.split('-')[0].split('.')[1]) <= Number(version)
+        return Number(this.forgeData.id.split('-')[0].split('.')[1]) <= Number(version)
     }
 
     /**
@@ -219,7 +206,7 @@ class ProcessBuilder {
             if(this._lteMinorVersion(9)) {
                 return false
             }
-            const ver = this.modManifest.id.split('-')[2]
+            const ver = this.forgeData.id.split('-')[2]
             const pts = ver.split('.')
             const min = [14, 23, 3, 2655]
             for(let i=0; i<pts.length; i++){
@@ -295,21 +282,18 @@ class ProcessBuilder {
     // }
 
     /**
-     * Construct the mod argument list for forge 1.13 and Fabric
+     * Construct the mod argument list for forge 1.13
      * 
      * @param {Array.<Object>} mods An array of mods to add to the mod list.
      */
     constructModList(mods) {
         const writeBuffer = mods.map(mod => {
-            return this.usingFabricLoader ? mod.getPath() : mod.getExtensionlessMavenIdentifier()
+            return mod.getExtensionlessMavenIdentifier()
         }).join('\n')
 
         if(writeBuffer) {
             fs.writeFileSync(this.forgeModListFile, writeBuffer, 'UTF-8')
-            return this.usingFabricLoader ? [
+            return [
-                '--fabric.addMods',
-                `@${this.forgeModListFile}`
-            ] : [
                 '--fml.mavenRoots',
                 path.join('..', '..', 'common', 'modstore'),
                 '--fml.modLists',
@@ -377,7 +361,7 @@ class ProcessBuilder {
         args.push('-Djava.library.path=' + tempNativePath)
 
         // Main Java Class
-        args.push(this.modManifest.mainClass)
+        args.push(this.forgeData.mainClass)
 
         // Forge Arguments
         args = args.concat(this._resolveForgeArgs())
@@ -400,17 +384,17 @@ class ProcessBuilder {
         const argDiscovery = /\${*(.*)}/
 
         // JVM Arguments First
-        let args = this.vanillaManifest.arguments.jvm
+        let args = this.versionData.arguments.jvm
 
         // Debug securejarhandler
         // args.push('-Dbsl.debug=true')
 
-        if(this.modManifest.arguments.jvm != null) {
+        if(this.forgeData.arguments.jvm != null) {
-            for(const argStr of this.modManifest.arguments.jvm) {
+            for(const argStr of this.forgeData.arguments.jvm) {
                 args.push(argStr
                     .replaceAll('${library_directory}', this.libPath)
                     .replaceAll('${classpath_separator}', ProcessBuilder.getClasspathSeparator())
-                    .replaceAll('${version_name}', this.modManifest.id)
+                    .replaceAll('${version_name}', this.forgeData.id)
                 )
             }
         }
@@ -427,10 +411,10 @@ class ProcessBuilder {
         args = args.concat(ConfigManager.getJVMOptions(this.server.rawServer.id))
 
         // Main Java Class
-        args.push(this.modManifest.mainClass)
+        args.push(this.forgeData.mainClass)
 
         // Vanilla Arguments
-        args = args.concat(this.vanillaManifest.arguments.game)
+        args = args.concat(this.versionData.arguments.game)
 
         for(let i=0; i<args.length; i++){
             if(typeof args[i] === 'object' && args[i].rules != null){
@@ -487,7 +471,7 @@ class ProcessBuilder {
                             val = this.authUser.displayName.trim()
                             break
                         case 'version_name':
-                            //val = vanillaManifest.id
+                            //val = versionData.id
                             val = this.server.rawServer.id
                             break
                         case 'game_directory':
@@ -497,7 +481,7 @@ class ProcessBuilder {
                             val = path.join(this.commonDir, 'assets')
                             break
                         case 'assets_index_name':
-                            val = this.vanillaManifest.assets
+                            val = this.versionData.assets
                             break
                         case 'auth_uuid':
                             val = this.authUser.uuid.trim()
@@ -509,7 +493,7 @@ class ProcessBuilder {
                             val = this.authUser.type === 'microsoft' ? 'msa' : 'mojang'
                             break
                         case 'version_type':
-                            val = this.vanillaManifest.type
+                            val = this.versionData.type
                             break
                         case 'resolution_width':
                             val = ConfigManager.getGameWidth()
@@ -538,11 +522,25 @@ class ProcessBuilder {
         }
 
         // Autoconnect
-        this._processAutoConnectArg(args)
+        let isAutoconnectBroken
+        try {
+            isAutoconnectBroken = ProcessBuilder.isAutoconnectBroken(this.forgeData.id.split('-')[2])
+        } catch(err) {
+            logger.error(err)
+            logger.error('Forge version format changed.. assuming autoconnect works.')
+            logger.debug('Forge version:', this.forgeData.id)
+        }
+
+        if(isAutoconnectBroken) {
+            logger.error('Server autoconnect disabled on Forge 1.15.2 for builds earlier than 31.2.15 due to OpenGL Stack Overflow issue.')
+            logger.error('Please upgrade your Forge version to at least 31.2.15!')
+        } else {
+            this._processAutoConnectArg(args)
+        }
         
 
         // Forge Specific Arguments
-        args = args.concat(this.modManifest.arguments.game)
+        args = args.concat(this.forgeData.arguments.game)
 
         // Filter null values
         args = args.filter(arg => {
@@ -558,7 +556,7 @@ class ProcessBuilder {
      * @returns {Array.<string>} An array containing the arguments required by forge.
      */
     _resolveForgeArgs(){
-        const mcArgs = this.modManifest.minecraftArguments.split(' ')
+        const mcArgs = this.forgeData.minecraftArguments.split(' ')
         const argDiscovery = /\${*(.*)}/
 
         // Replace the declared variables with their proper values.
@@ -571,7 +569,7 @@ class ProcessBuilder {
                         val = this.authUser.displayName.trim()
                         break
                     case 'version_name':
-                        //val = vanillaManifest.id
+                        //val = versionData.id
                         val = this.server.rawServer.id
                         break
                     case 'game_directory':
@@ -581,7 +579,7 @@ class ProcessBuilder {
                         val = path.join(this.commonDir, 'assets')
                         break
                     case 'assets_index_name':
-                        val = this.vanillaManifest.assets
+                        val = this.versionData.assets
                         break
                     case 'auth_uuid':
                         val = this.authUser.uuid.trim()
@@ -596,7 +594,7 @@ class ProcessBuilder {
                         val = '{}'
                         break
                     case 'version_type':
-                        val = this.vanillaManifest.type
+                        val = this.versionData.type
                         break
                 }
                 if(val != null){
@@ -671,10 +669,10 @@ class ProcessBuilder {
     classpathArg(mods, tempNativePath){
         let cpArgs = []
 
-        if(!mcVersionAtLeast('1.17', this.server.rawServer.minecraftVersion) || this.usingFabricLoader) {
+        if(!mcVersionAtLeast('1.17', this.server.rawServer.minecraftVersion)) {
             // Add the version.jar to the classpath.
             // Must not be added to the classpath for Forge 1.17+.
-            const version = this.vanillaManifest.id
+            const version = this.versionData.id
             cpArgs.push(path.join(this.commonDir, 'versions', version, version + '.jar'))
         }
         
@@ -713,7 +711,7 @@ class ProcessBuilder {
         const nativesRegex = /.+:natives-([^-]+)(?:-(.+))?/
         const libs = {}
 
-        const libArr = this.vanillaManifest.libraries
+        const libArr = this.versionData.libraries
         fs.ensureDirSync(tempNativePath)
         for(let i=0; i<libArr.length; i++){
             const lib = libArr[i]
@@ -832,10 +830,10 @@ class ProcessBuilder {
         const mdls = this.server.modules
         let libs = {}
 
-        // Locate Forge/Fabric/Libraries
+        // Locate Forge/Libraries
         for(let mdl of mdls){
             const type = mdl.rawModule.type
-            if(type === Type.ForgeHosted || type === Type.Fabric || type === Type.Library){
+            if(type === Type.ForgeHosted || type === Type.Library){
                 libs[mdl.getVersionlessMavenIdentifier()] = mdl.getPath()
                 if(mdl.subModules.length > 0){
                     const res = this._resolveModuleLibraries(mdl)
@@ -889,6 +887,24 @@ class ProcessBuilder {
         return libs
     }
 
+    static isAutoconnectBroken(forgeVersion) {
+
+        const minWorking = [31, 2, 15]
+        const verSplit = forgeVersion.split('.').map(v => Number(v))
+
+        if(verSplit[0] === 31) {
+            for(let i=0; i<minWorking.length; i++) {
+                if(verSplit[i] > minWorking[i]) {
+                    return false
+                } else if(verSplit[i] < minWorking[i]) {
+                    return true
+                }
+            }
+        }
+
+        return false
+    }
+
 }
 
 module.exports = ProcessBuilder

app/assets/js/scripts/landing.js

@@ -442,7 +442,7 @@ let hasRPC = false
 // Joined server regex
 // Change this if your server uses something different.
 const GAME_JOINED_REGEX = /\[.+\]: Sound engine started/
-const GAME_LAUNCH_REGEX = /^\[.+\]: (?:MinecraftForge .+ Initialized|ModLauncher .+ starting: .+|Loading Minecraft .+ with Fabric Loader .+)$/
+const GAME_LAUNCH_REGEX = /^\[.+\]: (?:MinecraftForge .+ Initialized|ModLauncher .+ starting: .+)$/
 const MIN_LINGER = 5000
 
 async function dlAsync(login = true) {
@@ -548,13 +548,13 @@ async function dlAsync(login = true) {
         serv.rawServer.id
     )
 
-    const modLoaderData = await distributionIndexProcessor.loadModLoaderVersionJson(serv)
+    const forgeData = await distributionIndexProcessor.loadForgeVersionJson(serv)
     const versionData = await mojangIndexProcessor.getVersionJson()
 
     if(login) {
         const authUser = ConfigManager.getSelectedAccount()
         loggerLaunchSuite.info(`Sending selected account (${authUser.displayName}) to ProcessBuilder.`)
-        let pb = new ProcessBuilder(serv, versionData, modLoaderData, authUser, remote.app.getVersion())
+        let pb = new ProcessBuilder(serv, versionData, forgeData, authUser, remote.app.getVersion())
         setLaunchDetails(Lang.queryJS('landing.dlAsync.launchingGame'))
 
         // const SERVER_JOINED_REGEX = /\[.+\]: \[CHAT\] [a-zA-Z0-9_]{1,16} joined the game/

app/assets/js/scripts/settings.js

@@ -736,7 +736,7 @@ function parseModulesForUI(mdls, submodules, servConf){
 
     for(const mdl of mdls){
 
-        if(mdl.rawModule.type === Type.ForgeMod || mdl.rawModule.type === Type.LiteMod || mdl.rawModule.type === Type.LiteLoader || mdl.rawModule.type === Type.FabricMod){
+        if(mdl.rawModule.type === Type.ForgeMod || mdl.rawModule.type === Type.LiteMod || mdl.rawModule.type === Type.LiteLoader){
 
             if(mdl.getRequired().value){
 

app/assets/js/scripts/uibinder.js

@@ -163,7 +163,7 @@ function syncModConfigurations(data){
             for(let mdl of mdls){
                 const type = mdl.rawModule.type
 
-                if(type === Type.ForgeMod || type === Type.LiteMod || type === Type.LiteLoader || type === Type.FabricMod){
+                if(type === Type.ForgeMod || type === Type.LiteMod || type === Type.LiteLoader){
                     if(!mdl.getRequired().value){
                         const mdlID = mdl.getVersionlessMavenIdentifier()
                         if(modsOld[mdlID] == null){
@@ -198,7 +198,7 @@ function syncModConfigurations(data){
 
             for(let mdl of mdls){
                 const type = mdl.rawModule.type
-                if(type === Type.ForgeMod || type === Type.LiteMod || type === Type.LiteLoader || type === Type.FabricMod){
+                if(type === Type.ForgeMod || type === Type.LiteMod || type === Type.LiteLoader){
                     if(!mdl.getRequired().value){
                         mods[mdl.getVersionlessMavenIdentifier()] = scanOptionalSubModules(mdl.subModules, mdl)
                     } else {
@@ -253,7 +253,7 @@ function scanOptionalSubModules(mdls, origin){
         for(let mdl of mdls){
             const type = mdl.rawModule.type
             // Optional types.
-            if(type === Type.ForgeMod || type === Type.LiteMod || type === Type.LiteLoader || type === Type.FabricMod){
+            if(type === Type.ForgeMod || type === Type.LiteMod || type === Type.LiteLoader){
                 // It is optional.
                 if(!mdl.getRequired().value){
                     mods[mdl.getVersionlessMavenIdentifier()] = scanOptionalSubModules(mdl.subModules, mdl)

docs/distro.md

@@ -360,12 +360,10 @@ The resolved/provided paths are appended to a base path depending on the module'
 | Type | Path |
 | ---- | ---- |
 | `ForgeHosted` | ({`commonDirectory`}/libraries/{`path` OR resolved}) |
-| `Fabric` | ({`commonDirectory`}/libraries/{`path` OR resolved}) |
 | `LiteLoader` | ({`commonDirectory`}/libraries/{`path` OR resolved}) |
 | `Library` | ({`commonDirectory`}/libraries/{`path` OR resolved}) |
 | `ForgeMod` | ({`commonDirectory`}/modstore/{`path` OR resolved}) |
 | `LiteMod` | ({`commonDirectory`}/modstore/{`path` OR resolved}) |
-| `FabricMod` | ({`commonDirectory`}/mods/fabric/{`path` OR resolved}) |
 | `File` | ({`instanceDirectory`}/{`Server.id`}/{`path` OR resolved}) |
 
 The `commonDirectory` and `instanceDirectory` values are stored in the launcher's config.json.
@@ -410,7 +408,7 @@ If the module is enabled by default. Has no effect unless `Required.value` is fa
 
 ### ForgeHosted
 
-The module type `ForgeHosted` represents forge itself. Currently, the launcher only supports modded servers, as vanilla servers can be connected to via the mojang launcher. The `Hosted` part is key, this means that the forge module must declare its required libraries as submodules.
+The module type `ForgeHosted` represents forge itself. Currently, the launcher only supports forge servers, as vanilla servers can be connected to via the mojang launcher. The `Hosted` part is key, this means that the forge module must declare its required libraries as submodules.
 
 Ex.
 
@@ -445,40 +443,6 @@ There were plans to add a `Forge` type, in which the required libraries would be
 
 ---
 
-### Fabric
-
-The module type `Fabric` represents the fabric mod loader. Currently, the launcher only supports modded servers, as vanilla servers can be connected to via the mojang launcher.
-
-Ex.
-
-```json
-{
-    "id": "net.fabricmc:fabric-loader:0.15.0",
-    "name": "Fabric (fabric-loader)",
-    "type": "Fabric",
-    "artifact": {
-    "size": 1196222,
-    "MD5": "a43d5a142246801343b6cedef1c102c4",
-    "url": "http://localhost:8080/repo/lib/net/fabricmc/fabric-loader/0.15.0/fabric-loader-0.15.0.jar"
-    },
-    "subModules": [
-    {
-        "id": "1.20.1-fabric-0.15.0",
-        "name": "Fabric (version.json)",
-        "type": "VersionManifest",
-        "artifact": {
-        "size": 2847,
-        "MD5": "69a2bd43452325ba1bc882fa0904e054",
-        "url": "http://localhost:8080/repo/versions/1.20.1-fabric-0.15.0/1.20.1-fabric-0.15.0.json"
-        }
-    }
-}
-```
-
-Fabric works similarly to Forge 1.13+.
-
----
-
 ### LiteLoader
 
 The module type `LiteLoader` represents liteloader. It is handled as a library and added to the classpath at runtime. Special launch conditions are executed when liteloader is present and enabled. This module can be optional and toggled similarly to `ForgeMod` and `Litemod` modules.

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "helioslauncher",
-  "version": "2.1.0",
+  "version": "2.0.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "helioslauncher",
-      "version": "2.1.0",
+      "version": "2.0.6",
       "license": "UNLICENSED",
       "dependencies": {
         "@electron/remote": "^2.1.0",
@@ -18,17 +18,17 @@
         "fs-extra": "^11.1.1",
         "github-syntax-dark": "^0.5.0",
         "got": "^11.8.5",
-        "helios-core": "~2.1.0",
+        "helios-core": "~2.0.6",
-        "helios-distribution-types": "^1.3.0",
+        "helios-distribution-types": "^1.2.0",
         "jquery": "^3.7.1",
         "lodash.merge": "^4.6.2",
         "semver": "^7.5.4",
         "toml": "^3.0.0"
       },
       "devDependencies": {
-        "electron": "^27.1.3",
+        "electron": "^27.1.2",
         "electron-builder": "^24.9.1",
-        "eslint": "^8.55.0"
+        "eslint": "^8.54.0"
       },
       "engines": {
         "node": "18.x.x"
@@ -338,9 +338,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
+      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -383,9 +383,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.55.0",
+      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz",
-      "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==",
+      "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -613,9 +613,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "18.19.2",
+      "version": "18.18.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.13.tgz",
-      "integrity": "sha512-6wzfBdbWpe8QykUkXBjtmO3zITA0A3FIjoy+in0Y2K4KrCiRhNYJIdwAPDffZ3G6GnaKaSLSEa9ZuORLfEoiwg==",
+      "integrity": "sha512-vXYZGRrSCreZmq1rEjMRLXJhiy8MrIeVasx+PCVlP414N7CJLHnMf+juVvjdprHyH+XRy3zKZLHeNueOpJCn0g==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -1546,9 +1546,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "27.1.3",
+      "version": "27.1.2",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-27.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-27.1.2.tgz",
-      "integrity": "sha512-7eD8VMhhlL5J531OOawn00eMthUkX1e3qN5Nqd7eMK8bg5HxQBrn8bdPlvUEnCano9KhrVwaDnGeuzWoDOGpjQ==",
+      "integrity": "sha512-Dy6BUuGLiIJv+zfsXwr78TV2TNppi24rXF4PIIS+OjDblEKdkI9r1iM8JUd3/x3sbGUy5mdLMSPhvmu//IhkgA==",
       "hasInstallScript": true,
       "dependencies": {
         "@electron/get": "^2.0.0",
@@ -1720,15 +1720,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.55.0",
+      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz",
-      "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==",
+      "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/eslintrc": "^2.1.3",
-        "@eslint/js": "8.55.0",
+        "@eslint/js": "8.54.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -2032,9 +2032,9 @@
       }
     },
     "node_modules/fs-extra": {
-      "version": "11.2.0",
+      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -2331,12 +2331,12 @@
       }
     },
     "node_modules/helios-core": {
-      "version": "2.1.0",
+      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/helios-core/-/helios-core-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/helios-core/-/helios-core-2.0.6.tgz",
-      "integrity": "sha512-3RvGMJ0RDzgdZF3e0o2VtBz/NCeucDVIopz9p3GA9tjy2cl7ll8HVHSXiLG5YE1JiINU5Akacv5L6MT1g6xZuA==",
+      "integrity": "sha512-QxUP6BZ0HDCmJjKNi2262vM2Sh222Gl8Ro4/qAxBWkmCxkpyD2Car9hSk5VZV4vcECTr7xg3SS55FuT4HdMF3g==",
       "dependencies": {
         "fastq": "^1.15.0",
-        "fs-extra": "^11.2.0",
+        "fs-extra": "^11.1.1",
         "got": "^11.8.6",
         "luxon": "^3.4.4",
         "node-stream-zip": "^1.15.0",
@@ -2348,9 +2348,9 @@
       }
     },
     "node_modules/helios-distribution-types": {
-      "version": "1.3.0",
+      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/helios-distribution-types/-/helios-distribution-types-1.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/helios-distribution-types/-/helios-distribution-types-1.2.0.tgz",
-      "integrity": "sha512-MP66JRHvmuE9yDoZoKeFDh3stsHger0w/cRcJAlV7UYw5ztR3m/uLbWdbfFV68B1Yc0+hDIiuFsuJT/Ve9xuiw=="
+      "integrity": "sha512-C8mRJGK0zAc7rRnA06Sj0LYwVqhY445UYNTmXU876AmfBirRR2F+A3LsD3osdgTxRMzrgkxBXvYZ0QbYW6j+6Q=="
     },
     "node_modules/hosted-git-info": {
       "version": "4.1.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "helioslauncher",
-  "version": "2.1.0",
+  "version": "2.0.6",
   "productName": "Helios Launcher",
   "description": "Modded Minecraft Launcher",
   "author": "Daniel Scalzi (https://github.com/dscalzi/)",
@@ -32,17 +32,17 @@
     "fs-extra": "^11.1.1",
     "github-syntax-dark": "^0.5.0",
     "got": "^11.8.5",
-    "helios-core": "~2.1.0",
+    "helios-core": "~2.0.6",
-    "helios-distribution-types": "^1.3.0",
+    "helios-distribution-types": "^1.2.0",
     "jquery": "^3.7.1",
     "lodash.merge": "^4.6.2",
     "semver": "^7.5.4",
     "toml": "^3.0.0"
   },
   "devDependencies": {
-    "electron": "^27.1.3",
+    "electron": "^27.1.2",
     "electron-builder": "^24.9.1",
-    "eslint": "^8.55.0"
+    "eslint": "^8.54.0"
   },
   "repository": {
     "type": "git",