diff --git a/app/assets/js/distromanager.js b/app/assets/js/distromanager.js index 3e16daa..aca4223 100644 --- a/app/assets/js/distromanager.js +++ b/app/assets/js/distromanager.js @@ -6,7 +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:8080/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' diff --git a/app/assets/js/scripts/loginSkirdaDiscord.js b/app/assets/js/scripts/loginSkirdaDiscord.js index 57c4060..3a13ba7 100644 --- a/app/assets/js/scripts/loginSkirdaDiscord.js +++ b/app/assets/js/scripts/loginSkirdaDiscord.js @@ -1,7 +1,8 @@ // const http = require('http') // const fs = require('fs') // const {addSkirdaAccount} = require('configmanager') -const auth_api_url = 'http://192.168.88.10:8083' +// const auth_api_url = 'http://192.168.88.10:8083' +const auth_api_url = 'http://skirda-auth.brzezinski.ru' class SkirdaDiscordAuth{ /** @@ -103,23 +104,7 @@ loginSkirdaDiscordButton.addEventListener('click', async () =>{ AuthManager.addSkirdaAccount(account.uuid, account.token, account.username, account.displayName) setTimeout(() => { - switchView(VIEWS.landing, VIEWS.landing, 500, 500, async () => { - console.log('kek') - // // Temporary workaround - // if(loginViewOnSuccess === VIEWS.settings){ - // await prepareSettings() - // } - // // loginViewOnSuccess = VIEWS.landing // Reset this for good measure. - // // loginCancelEnabled(false) // Reset this for good measure. - // // loginViewCancelHandler = null // Reset this for good measure. - // // loginUsername.value = '' - // // loginPassword.value = '' - // $('.circle-loader').toggleClass('load-complete') - // $('.checkmark').toggle() - // loginLoading(false) - // loginButton.innerHTML = loginButton.innerHTML.replace(Lang.queryJS('login.success'), Lang.queryJS('login.login')) - // formDisabled(false) - }) + switchView(VIEWS.loginSkirdaDiscord, VIEWS.landing, 500, 500) }, 1000) }) diff --git a/app/assets/js/scripts/settings.js b/app/assets/js/scripts/settings.js index 34d1f69..46a7b84 100644 --- a/app/assets/js/scripts/settings.js +++ b/app/assets/js/scripts/settings.js @@ -1501,7 +1501,7 @@ function populateAboutVersionInformation(){ */ function populateReleaseNotes(){ $.ajax({ - url: 'https://github.com/dscalzi/HeliosLauncher/releases.atom', + url: 'https://git.brzezinski.ru/Skirda/SkirdaElectronLauncher/releases.atom', success: (data) => { const version = 'v' + remote.app.getVersion() const entries = $(data).find('entry') diff --git a/electron-builder.yml b/electron-builder.yml index cd5d1ce..ecb92f7 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -1,5 +1,5 @@ -appId: 'helioslauncher' -productName: 'Helios Launcher' +appId: 'skirdalauncher' +productName: 'Skirda Launcher' artifactName: '${productName}-setup-${version}.${ext}' copyright: 'Copyright © 2018-2022 Daniel Scalzi' @@ -39,9 +39,9 @@ mac: # Linux Configuration linux: target: 'AppImage' - maintainer: 'Daniel Scalzi' - vendor: 'Daniel Scalzi' - synopsis: 'Modded Minecraft Launcher' + maintainer: 'Greg Brzezinski' + vendor: 'Greg Brzezinski' + synopsis: 'Minecraft Launcher for Skirda Servers' description: 'Custom launcher which allows users to join modded servers. All mods, configurations, and updates are handled automatically.' category: 'Game' diff --git a/package-lock.json b/package-lock.json index 048667e..f38943c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "helioslauncher", - "version": "2.1.0", + "version": "2.1.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "helioslauncher", - "version": "2.1.0", + "version": "2.1.1", "license": "UNLICENSED", "dependencies": { "@electron/remote": "^2.1.0", @@ -18,7 +18,7 @@ "fs-extra": "^11.1.1", "github-syntax-dark": "^0.5.0", "got": "^11.8.5", - "helios-core": "~2.1.0", + "helios-core": "~2.1.1", "helios-distribution-types": "^1.3.0", "jquery": "^3.7.1", "lodash.merge": "^4.6.2", @@ -29,7 +29,7 @@ "devDependencies": { "electron": "^27.1.3", "electron-builder": "^24.9.1", - "eslint": "^8.55.0" + "eslint": "^8.56.0" }, "engines": { "node": "18.x.x" @@ -384,9 +384,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.55.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", - "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", + "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1731,15 +1731,15 @@ } }, "node_modules/eslint": { - "version": "8.55.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", - "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", + "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.55.0", + "@eslint/js": "8.56.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -1947,9 +1947,9 @@ "dev": true }, "node_modules/fastq": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", - "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz", + "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==", "dependencies": { "reusify": "^1.0.4" } @@ -2342,11 +2342,11 @@ } }, "node_modules/helios-core": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/helios-core/-/helios-core-2.1.0.tgz", - "integrity": "sha512-3RvGMJ0RDzgdZF3e0o2VtBz/NCeucDVIopz9p3GA9tjy2cl7ll8HVHSXiLG5YE1JiINU5Akacv5L6MT1g6xZuA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/helios-core/-/helios-core-2.1.1.tgz", + "integrity": "sha512-un9QtEofI3jR8I1aoXodJhwoQyjUvJ34/Rc8PFsvNgMyWv25F4/i4AWgRX/pZKHpy8rtyS2SwgoBSKHV1WA1DA==", "dependencies": { - "fastq": "^1.15.0", + "fastq": "^1.16.0", "fs-extra": "^11.2.0", "got": "^11.8.6", "luxon": "^3.4.4", diff --git a/package.json b/package.json index 0804c2b..cf843b5 100644 --- a/package.json +++ b/package.json @@ -1,52 +1,52 @@ -{ - "name": "helioslauncher", - "version": "2.1.0", - "productName": "Helios Launcher", - "description": "Modded Minecraft Launcher", - "author": "Daniel Scalzi (https://github.com/dscalzi/)", - "license": "UNLICENSED", - "homepage": "https://github.com/dscalzi/HeliosLauncher", - "bugs": { - "url": "https://github.com/dscalzi/HeliosLauncher/issues" - }, - "private": true, - "main": "index.js", - "scripts": { - "start": "electron .", - "dist": "electron-builder build", - "dist:win": "npm run dist -- -w", - "dist:mac": "npm run dist -- -m", - "dist:linux": "npm run dist -- -l", - "lint": "eslint --config .eslintrc.json ." - }, - "engines": { - "node": "18.x.x" - }, - "dependencies": { - "@electron/remote": "^2.1.0", - "adm-zip": "^0.5.9", - "discord-rpc-patch": "^4.0.1", - "ejs": "^3.1.9", - "ejs-electron": "^2.1.1", - "electron-updater": "^6.1.7", - "fs-extra": "^11.1.1", - "github-syntax-dark": "^0.5.0", - "got": "^11.8.5", - "helios-core": "~2.1.0", - "helios-distribution-types": "^1.3.0", - "jquery": "^3.7.1", - "lodash.merge": "^4.6.2", - "rest-client-sdk": "^7.0.0-rc.10", - "semver": "^7.5.4", - "toml": "^3.0.0" - }, - "devDependencies": { - "electron": "^27.1.3", - "electron-builder": "^24.9.1", - "eslint": "^8.55.0" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/dscalzi/HeliosLauncher.git" - } -} +{ + "name": "skirdalauncher", + "version": "2.1.1-skirda", + "productName": "Skirda Launcher", + "description": "Launcher for Skirda Minecraft servers", + "author": "Daniel Scalzi (https://github.com/dscalzi/)", + "license": "UNLICENSED", + "homepage": "https://github.com/dscalzi/HeliosLauncher", + "bugs": { + "url": "https://github.com/dscalzi/HeliosLauncher/issues" + }, + "private": true, + "main": "index.js", + "scripts": { + "start": "electron .", + "dist": "electron-builder build", + "dist:win": "npm run dist -- -w", + "dist:mac": "npm run dist -- -m", + "dist:linux": "npm run dist -- -l", + "lint": "eslint --config .eslintrc.json ." + }, + "engines": { + "node": "18.x.x" + }, + "dependencies": { + "@electron/remote": "^2.1.0", + "adm-zip": "^0.5.9", + "discord-rpc-patch": "^4.0.1", + "ejs": "^3.1.9", + "ejs-electron": "^2.1.1", + "electron-updater": "^6.1.7", + "fs-extra": "^11.1.1", + "github-syntax-dark": "^0.5.0", + "got": "^11.8.5", + "helios-core": "~2.1.1", + "helios-distribution-types": "^1.3.0", + "jquery": "^3.7.1", + "lodash.merge": "^4.6.2", + "rest-client-sdk": "^7.0.0-rc.10", + "semver": "^7.5.4", + "toml": "^3.0.0" + }, + "devDependencies": { + "electron": "^27.1.3", + "electron-builder": "^24.9.1", + "eslint": "^8.56.0" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/dscalzi/HeliosLauncher.git" + } +} \ No newline at end of file