Compare commits

..

4 Commits

Author SHA1 Message Date
c1d8dbed47 merge 2024-01-13 20:59:43 +03:00
f2840be1a6 debug urls 2024-01-13 20:58:56 +03:00
496841a776 version branding 2024-01-13 20:58:50 +03:00
80e3c1cc6a add custom auth server args 2024-01-13 20:58:28 +03:00
4 changed files with 16 additions and 9 deletions

View File

@ -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://skirda-nebula.brzezinski.ru/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://gregbrzezinski:8080/distribution/manifest'
// exports.REMOTE_DISTRO_URL = 'http://localhost:8080/distribution/files/files/distribution.json'

View File

@ -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) {

View File

@ -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)
})

8
package-lock.json generated
View File

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