merge

app/assets/js/distromanager.js

@@ -6,8 +6,8 @@ const ConfigManager = require('./configmanager')
 // exports.REMOTE_DISTRO_URL = 'http://mc.westeroscraft.com/WesterosCraftLauncher/distribution.json'
 // exports.REMOTE_DISTRO_URL = 'https://skirda-minecraft-distribution.brzezinski.ru/distribution.json'
 // exports.REMOTE_DISTRO_URL = 'https://helios-files.geekcorner.eu.org/distribution.json'
-// exports.REMOTE_DISTRO_URL = 'http://192.168.88.10:8080/distribution/manifest'
+exports.REMOTE_DISTRO_URL = 'http://192.168.88.10:8081/distribution/manifest'
-exports.REMOTE_DISTRO_URL = 'http://skirda-nebula.brzezinski.ru/distribution/manifest'
+// exports.REMOTE_DISTRO_URL = 'http://skirda-nebula.brzezinski.ru/distribution/manifest'
 // exports.REMOTE_DISTRO_URL = 'http://gregbrzezinski:8080/distribution/manifest'
 // exports.REMOTE_DISTRO_URL = 'http://localhost:8080/distribution/files/files/distribution.json'
 

app/assets/js/processbuilder.js

@@ -350,6 +350,10 @@ class ProcessBuilder {
         }
     }
 
+
+
+    
+
     /**
      * Construct the argument array that will be passed to the JVM process.
      * This function is for 1.12 and below.
@@ -359,9 +363,7 @@ class ProcessBuilder {
      * @returns {Array.<string>} An array containing the full JVM arguments for this process.
      */
     _constructJVMArguments112(mods, tempNativePath){
-
         let args = []
-
         // Classpath Argument
         args.push('-cp')
         args.push(this.classpathArg(mods, tempNativePath).join(ProcessBuilder.getClasspathSeparator()))
@@ -404,6 +406,10 @@ class ProcessBuilder {
 
         // Debug securejarhandler
         // args.push('-Dbsl.debug=true')
+        args.push('-Dminecraft.api.auth.host=http://localhost:8083/yggdrasil/auth')
+        args.push('-Dminecraft.api.account.host=http://localhost:8083/yggdrasil/account')
+        args.push('-Dminecraft.api.session.host=http://localhost:8083/yggdrasil')
+        args.push('-Dminecraft.api.services.host=http://localhost:8083/yggdrasil/services')
 
         if(this.modManifest.arguments.jvm != null) {
             for(const argStr of this.modManifest.arguments.jvm) {

app/assets/js/scripts/loginSkirdaDiscord.js

@@ -127,9 +127,10 @@ loginSkirdaDiscordButton.addEventListener('click', async () =>{
 
     AuthManager.addSkirdaAccount(yggAuthRes.profile.id, yggAuthRes.accessToken, skirdaAuth.skirdaUserId, yggAuthRes.profile.name, skirdaAuth.token)
 
+    // AuthManager.addSkirdaAccount(account.uuid, account.token, account.username, account.displayName)
+    AuthManager.addSkirdaAccount(account.uuid, account.token, account.username, account.displayName)
 
     setTimeout(() => {
         switchView(VIEWS.loginSkirdaDiscord, VIEWS.landing, 500, 500)
     }, 1000)
 })
-

package-lock.json

@@ -1,12 +1,12 @@
 {
-  "name": "helioslauncher",
+  "name": "skirdalauncher",
-  "version": "2.1.1",
+  "version": "2.1.1-skirda",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "helioslauncher",
+      "name": "skirdalauncher",
-      "version": "2.1.1",
+      "version": "2.1.1-skirda",
       "license": "UNLICENSED",
       "dependencies": {
         "@electron/remote": "^2.1.0",