Skirda/SkirdaElectronLauncher
4
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge remote-tracking branch 'origin/offline-mode' into offline-mode

Browse Source
This commit is contained in:
MrSandMan 2024-01-09 21:55:36 +03:00
commit aca9136137
6 changed files with 81 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/js/distromanager.js
View File

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

21
app/assets/js/scripts/loginSkirdaDiscord.js
View File

@ -1,7 +1,8 @@
// const http = require('http') // const http = require('http')
// const fs = require('fs') // const fs = require('fs')
// const {addSkirdaAccount} = require('configmanager') // 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{ class SkirdaDiscordAuth{
/** /**
@ -103,23 +104,7 @@ loginSkirdaDiscordButton.addEventListener('click', async () =>{
AuthManager.addSkirdaAccount(account.uuid, account.token, account.username, account.displayName) AuthManager.addSkirdaAccount(account.uuid, account.token, account.username, account.displayName)
setTimeout(() => { setTimeout(() => {
switchView(VIEWS.landing, VIEWS.landing, 500, 500, async () => { switchView(VIEWS.loginSkirdaDiscord, VIEWS.landing, 500, 500)
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)
})
}, 1000) }, 1000)
}) })

2
app/assets/js/scripts/settings.js
View File

@ -1501,7 +1501,7 @@ function populateAboutVersionInformation(){
*/ */
function populateReleaseNotes(){ function populateReleaseNotes(){
$.ajax({ $.ajax({
url: 'https://github.com/dscalzi/HeliosLauncher/releases.atom', url: 'https://git.brzezinski.ru/Skirda/SkirdaElectronLauncher/releases.atom',
success: (data) => { success: (data) => {
const version = 'v' + remote.app.getVersion() const version = 'v' + remote.app.getVersion()
const entries = $(data).find('entry') const entries = $(data).find('entry')

10
electron-builder.yml
View File

@ -1,5 +1,5 @@
appId: 'helioslauncher' appId: 'skirdalauncher'
productName: 'Helios Launcher' productName: 'Skirda Launcher'
artifactName: '${productName}-setup-${version}.${ext}' artifactName: '${productName}-setup-${version}.${ext}'
copyright: 'Copyright © 2018-2022 Daniel Scalzi' copyright: 'Copyright © 2018-2022 Daniel Scalzi'
@ -39,9 +39,9 @@ mac:
# Linux Configuration # Linux Configuration
linux: linux:
target: 'AppImage' target: 'AppImage'
maintainer: 'Daniel Scalzi' maintainer: 'Greg Brzezinski'
vendor: 'Daniel Scalzi' vendor: 'Greg Brzezinski'
synopsis: 'Modded Minecraft Launcher' synopsis: 'Minecraft Launcher for Skirda Servers'
description: 'Custom launcher which allows users to join modded servers. All mods, configurations, and updates are handled automatically.' description: 'Custom launcher which allows users to join modded servers. All mods, configurations, and updates are handled automatically.'
category: 'Game' category: 'Game'

36
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "helioslauncher", "name": "helioslauncher",
"version": "2.1.0", "version": "2.1.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "helioslauncher", "name": "helioslauncher",
"version": "2.1.0", "version": "2.1.1",
"license": "UNLICENSED", "license": "UNLICENSED",
"dependencies": { "dependencies": {
"@electron/remote": "^2.1.0", "@electron/remote": "^2.1.0",
@ -18,7 +18,7 @@
"fs-extra": "^11.1.1", "fs-extra": "^11.1.1",
"github-syntax-dark": "^0.5.0", "github-syntax-dark": "^0.5.0",
"got": "^11.8.5", "got": "^11.8.5",
"helios-core": "~2.1.0", "helios-core": "~2.1.1",
"helios-distribution-types": "^1.3.0", "helios-distribution-types": "^1.3.0",
"jquery": "^3.7.1", "jquery": "^3.7.1",
"lodash.merge": "^4.6.2", "lodash.merge": "^4.6.2",
@ -29,7 +29,7 @@
"devDependencies": { "devDependencies": {
"electron": "^27.1.3", "electron": "^27.1.3",
"electron-builder": "^24.9.1", "electron-builder": "^24.9.1",
"eslint": "^8.55.0" "eslint": "^8.56.0"
}, },
"engines": { "engines": {
"node": "18.x.x" "node": "18.x.x"
@ -384,9 +384,9 @@
} }
}, },
"node_modules/@eslint/js": { "node_modules/@eslint/js": {
"version": "8.55.0", "version": "8.56.0",
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
"integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0" "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@ -1731,15 +1731,15 @@
} }
}, },
"node_modules/eslint": { "node_modules/eslint": {
"version": "8.55.0", "version": "8.56.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
"integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/eslint-utils": "^4.2.0",
"@eslint-community/regexpp": "^4.6.1", "@eslint-community/regexpp": "^4.6.1",
"@eslint/eslintrc": "^2.1.4", "@eslint/eslintrc": "^2.1.4",
"@eslint/js": "8.55.0", "@eslint/js": "8.56.0",
"@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/config-array": "^0.11.13",
"@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/module-importer": "^1.0.1",
"@nodelib/fs.walk": "^1.2.8", "@nodelib/fs.walk": "^1.2.8",
@ -1947,9 +1947,9 @@
"dev": true "dev": true
}, },
"node_modules/fastq": { "node_modules/fastq": {
"version": "1.15.0", "version": "1.16.0",
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
"integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==",
"dependencies": { "dependencies": {
"reusify": "^1.0.4" "reusify": "^1.0.4"
} }
@ -2342,11 +2342,11 @@
} }
}, },
"node_modules/helios-core": { "node_modules/helios-core": {
"version": "2.1.0", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/helios-core/-/helios-core-2.1.0.tgz", "resolved": "https://registry.npmjs.org/helios-core/-/helios-core-2.1.1.tgz",
"integrity": "sha512-3RvGMJ0RDzgdZF3e0o2VtBz/NCeucDVIopz9p3GA9tjy2cl7ll8HVHSXiLG5YE1JiINU5Akacv5L6MT1g6xZuA==", "integrity": "sha512-un9QtEofI3jR8I1aoXodJhwoQyjUvJ34/Rc8PFsvNgMyWv25F4/i4AWgRX/pZKHpy8rtyS2SwgoBSKHV1WA1DA==",
"dependencies": { "dependencies": {
"fastq": "^1.15.0", "fastq": "^1.16.0",
"fs-extra": "^11.2.0", "fs-extra": "^11.2.0",
"got": "^11.8.6", "got": "^11.8.6",
"luxon": "^3.4.4", "luxon": "^3.4.4",

104
package.json
View File

@ -1,52 +1,52 @@
{ {
"name": "helioslauncher", "name": "skirdalauncher",
"version": "2.1.0", "version": "2.1.1-skirda",
"productName": "Helios Launcher", "productName": "Skirda Launcher",
"description": "Modded Minecraft Launcher", "description": "Launcher for Skirda Minecraft servers",
"author": "Daniel Scalzi (https://github.com/dscalzi/)", "author": "Daniel Scalzi (https://github.com/dscalzi/)",
"license": "UNLICENSED", "license": "UNLICENSED",
"homepage": "https://github.com/dscalzi/HeliosLauncher", "homepage": "https://github.com/dscalzi/HeliosLauncher",
"bugs": { "bugs": {
"url": "https://github.com/dscalzi/HeliosLauncher/issues" "url": "https://github.com/dscalzi/HeliosLauncher/issues"
}, },
"private": true, "private": true,
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"start": "electron .", "start": "electron .",
"dist": "electron-builder build", "dist": "electron-builder build",
"dist:win": "npm run dist -- -w", "dist:win": "npm run dist -- -w",
"dist:mac": "npm run dist -- -m", "dist:mac": "npm run dist -- -m",
"dist:linux": "npm run dist -- -l", "dist:linux": "npm run dist -- -l",
"lint": "eslint --config .eslintrc.json ." "lint": "eslint --config .eslintrc.json ."
}, },
"engines": { "engines": {
"node": "18.x.x" "node": "18.x.x"
}, },
"dependencies": { "dependencies": {
"@electron/remote": "^2.1.0", "@electron/remote": "^2.1.0",
"adm-zip": "^0.5.9", "adm-zip": "^0.5.9",
"discord-rpc-patch": "^4.0.1", "discord-rpc-patch": "^4.0.1",
"ejs": "^3.1.9", "ejs": "^3.1.9",
"ejs-electron": "^2.1.1", "ejs-electron": "^2.1.1",
"electron-updater": "^6.1.7", "electron-updater": "^6.1.7",
"fs-extra": "^11.1.1", "fs-extra": "^11.1.1",
"github-syntax-dark": "^0.5.0", "github-syntax-dark": "^0.5.0",
"got": "^11.8.5", "got": "^11.8.5",
"helios-core": "~2.1.0", "helios-core": "~2.1.1",
"helios-distribution-types": "^1.3.0", "helios-distribution-types": "^1.3.0",
"jquery": "^3.7.1", "jquery": "^3.7.1",
"lodash.merge": "^4.6.2", "lodash.merge": "^4.6.2",
"rest-client-sdk": "^7.0.0-rc.10", "rest-client-sdk": "^7.0.0-rc.10",
"semver": "^7.5.4", "semver": "^7.5.4",
"toml": "^3.0.0" "toml": "^3.0.0"
}, },
"devDependencies": { "devDependencies": {
"electron": "^27.1.3", "electron": "^27.1.3",
"electron-builder": "^24.9.1", "electron-builder": "^24.9.1",
"eslint": "^8.55.0" "eslint": "^8.56.0"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/dscalzi/HeliosLauncher.git" "url": "git+https://github.com/dscalzi/HeliosLauncher.git"
} }
} }