Jonttu
/
HeliosLauncher
mirror of https://github.com/dscalzi/HeliosLauncher
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

v1.0.0-beta.2 

Fixed bug which prevented mods with declared extensions in their identifiers from being loaded.
Synced distribution.json with remote.
Updated electron-builder.
Updated readme to include information on beta testing.
pull/19/head v1.0.0-beta.2
Daniel Scalzi 2018-08-15 09:17:59 -04:00
parent d581a2896a
commit 50317c3fc2
No known key found for this signature in database
GPG Key ID: 5CA2F145B63535F9
6 changed files with 66 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -30,9 +30,10 @@
This is not an exhaustive list. Download and install the launcher to gauge all it can do!
## Alpha Tests
## Beta Tests
The launcher is currently in alpha. It's very usable, however we are still putting in a lot of work. A lot can change, at this point. For more information and instructions on how to **officially** sign up, check out the [Alpha Thread](https://westeroscraft.com/threads/new-launcher-alpha-tests.1113/).
The launcher is currently available for beta testing.
For information on beta, and download instructions, please see the [Beta Thread](https://westeroscraft.com/threads/official-new-launcher-beta.1371/).
## Downloads

22
app/assets/distribution.json
View File

@ -15,7 +15,7 @@
"name": "WesterosCraft Production Server",
"description": "Main WesterosCraft server. Connect to enter the Realm.",
"icon": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/server-prod.png",
"version": "3.8.0",
"version": "3.9.0",
"address": "mc.westeroscraft.com",
"minecraftVersion": "1.11.2",
"discord": {
@ -219,22 +219,22 @@
]
},
{
"id": "com.westeroscraft:westerosblocks:3.1.0-alpha-2-135",
"id": "com.westeroscraft:westerosblocks:3.1.0-alpha-2-138",
"name": "WesterosBlocks",
"type": "ForgeMod",
"artifact": {
"size": 16854431,
"MD5": "ed5b2349d1ce2496895a5e8839b77f74",
"size": 17352677,
"MD5": "b5409aa925a47f67158c8141e71f723f",
"url": "http://mc.westeroscraft.com/WesterosCraftLauncher/prod-1.11.2/mods/WesterosBlocks.jar"
}
},
{
"id": "com.westeroscraft:westeroscraftrp:2018-05-05",
"id": "com.westeroscraft:westeroscraftrp:2018-07-21",
"name": "WesterosCraft Resource Pack",
"type": "File",
"artifact": {
"size": 46067606,
"MD5": "0e08b0bcf44c9d266bfe067d865ffc1e",
"size": 46942221,
"MD5": "26e3e63a5778691eb3a9db11f449fdf1",
"path": "resourcepacks/WesterosCraft.zip",
"url": "http://mc.westeroscraft.com/WesterosCraftLauncher/prod-1.11.2/resourcepacks/WesterosCraft.zip"
}
@ -430,7 +430,7 @@
"name": "WesterosCraft Test Server",
"description": "Main testing server. Experimental changes are live here.",
"icon": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/server-test.png",
"version": "3.8.1",
"version": "3.8.3",
"address": "mc.westeroscraft.com:4444",
"minecraftVersion": "1.11.2",
"discord": {
@ -634,12 +634,12 @@
]
},
{
"id": "com.westeroscraft:westerosblocks:3.1.0-alpha-2-136",
"id": "com.westeroscraft:westerosblocks:3.1.0-alpha-2-138",
"name": "WesterosBlocks",
"type": "ForgeMod",
"artifact": {
"size": 17352679,
"MD5": "7a26b3f4f89bfe48f34c4fc95fc6437f",
"size": 17352677,
"MD5": "b5409aa925a47f67158c8141e71f723f",
"url": "http://mc.westeroscraft.com/WesterosCraftLauncher/test-1.11.2/mods/WesterosBlocks.jar"
}
},

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

@ -245,10 +245,20 @@ class Module {
return this.artifactGroup
}
/**
* @returns {string} The identifier without he version or extension.
*/
getVersionlessID(){
return this.getGroup() + ':' + this.getID()
}
/**
* @returns {string} The identifier without the extension.
*/
getExtensionlessID(){
return this.getIdentifier().split('@')[0]
}
/**
* @returns {string} The version of this module's artifact.
*/

4
app/assets/js/processbuilder.js
View File

@ -184,11 +184,11 @@ class ProcessBuilder {
const ids = []
if(type === 'forge'){
for(let mod of mods){
ids.push(mod.getIdentifier())
ids.push(mod.getExtensionlessID())
}
} else {
for(let mod of mods){
ids.push(mod.getIdentifier() + '@' + mod.getExtension())
ids.push(mod.getExtensionlessID() + '@' + mod.getExtension())
}
}
modList.modRef = ids

76
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "westeroscraftlauncher",
"version": "1.0.0-beta.1",
"version": "1.0.0-beta.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -99,28 +99,28 @@
"dev": true
},
"app-builder-bin": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.1.1.tgz",
"integrity": "sha512-ye0fQcG/msVKJcHBOZOfXf8kIkHoY+1ZYpWyFH/jyeNRwlsdBQCmg0A+pbbTyvjiet9XQzPVA7s21oyRhUixRQ==",
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.1.2.tgz",
"integrity": "sha512-PZJspzAqB0+z60OalXChP9I05BzODd/ffDz6RvTmDG3qclr7YrnpqzvPF+T7vGVtk2nN7syuveTQROJfXcB8xA==",
"dev": true
},
"app-builder-lib": {
"version": "20.27.1",
"resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.27.1.tgz",
"integrity": "sha512-nuGl5s6dGp0lbLfM3Ef/tst3ZAeKznBb+SB0zNjHR8chbU7338451y7TfDXkcLQVkvMivfhwIRlUCyN/sH5KKA==",
"version": "20.28.1",
"resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.28.1.tgz",
"integrity": "sha512-OjPTarC27/P3312dNu8N6k2X1r6QGr/q243+bM+DnXddZ6qZQQDsxJz5ONW8b1chRErTUZDRaKQ8RdAYjUIbxw==",
"dev": true,
"requires": {
"7zip-bin": "~4.0.2",
"app-builder-bin": "2.1.1",
"app-builder-bin": "2.1.2",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.5",
"builder-util": "6.0.0",
"builder-util": "6.1.1",
"builder-util-runtime": "4.4.1",
"chromium-pickle-js": "^0.2.0",
"debug": "^3.1.0",
"ejs": "^2.6.1",
"electron-osx-sign": "0.4.10",
"electron-publish": "20.27.0",
"electron-publish": "20.28.0",
"fs-extra-p": "^4.6.1",
"hosted-git-info": "^2.7.1",
"is-ci": "^1.1.0",
@ -130,7 +130,7 @@
"minimatch": "^3.0.4",
"normalize-package-data": "^2.4.0",
"plist": "^3.0.1",
"read-config-file": "3.1.0",
"read-config-file": "3.1.2",
"sanitize-filename": "^1.6.1",
"semver": "^5.5.0",
"temp-file": "^3.1.3"
@ -405,13 +405,13 @@
"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
},
"builder-util": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/builder-util/-/builder-util-6.0.0.tgz",
"integrity": "sha512-PPwBEQa8zNcgd0ht2IozdD9QDdrADSl/TkceGcErkT7By1v8LLcomBAThm+t+0Ebm7q6JJbdL2SShM6wbXRCUg==",
"version": "6.1.1",
"resolved": "https://registry.npmjs.org/builder-util/-/builder-util-6.1.1.tgz",
"integrity": "sha512-n+ah8X8H+DU1YPQHCW9ayLb2g8+KENtRfPtIei0UiqP7p+pURKzL3/sMsxmu4S7mbGQBHV8R6PMu/axBjxy+Ow==",
"dev": true,
"requires": {
"7zip-bin": "~4.0.2",
"app-builder-bin": "2.1.1",
"app-builder-bin": "2.1.2",
"bluebird-lst": "^1.0.5",
"builder-util-runtime": "^4.4.1",
"chalk": "^2.4.1",
@ -421,7 +421,7 @@
"js-yaml": "^3.12.0",
"lazy-val": "^1.0.3",
"semver": "^5.5.0",
"source-map-support": "^0.5.6",
"source-map-support": "^0.5.8",
"stat-mode": "^0.2.2",
"temp-file": "^3.1.3"
},
@ -555,9 +555,9 @@
"dev": true
},
"ci-info": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz",
"integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==",
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.3.0.tgz",
"integrity": "sha512-mPdvoljUhH3Feai3dakD3bwYl/8I0tSo16Ge2W+tY88yfYDKGVnXV2vFxZC8VGME01CYp+DaAZnE93VHYVapnA==",
"dev": true
},
"circular-json": {
@ -842,14 +842,14 @@
}
},
"dmg-builder": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-5.2.0.tgz",
"integrity": "sha512-0doOlH/Lew4St3X5UwEyuj763sDa4GIJPBDr/0hDywPn06atclRO36Bf6oEy9BEp7YaNV5aoaOfH3l8SBBacYQ==",
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-5.3.0.tgz",
"integrity": "sha512-vzjrc7UmPQ+rb4tH8wbQdMq6Fu9M5chFndzhK2831xIpRsRlNlGEIWMiFRZ/MlboVL0vWxG0/2JCd2YMAevEpA==",
"dev": true,
"requires": {
"app-builder-lib": "~20.27.0",
"app-builder-lib": "~20.28.0",
"bluebird-lst": "^1.0.5",
"builder-util": "~6.0.0",
"builder-util": "~6.1.0",
"fs-extra-p": "^4.6.1",
"iconv-lite": "^0.4.23",
"js-yaml": "^3.12.0",
@ -928,21 +928,21 @@
}
},
"electron-builder": {
"version": "20.27.1",
"resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.27.1.tgz",
"integrity": "sha512-jsrUX2t8Yx8n5lVzIZ7AOMGlSYSb2iZhD+BX1DQ9H0O2FNDhWBNRfQQyj0mM2slNsk+5RWpK8FpOOsn5Z8BIqw==",
"version": "20.28.1",
"resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.28.1.tgz",
"integrity": "sha512-OKj107B2fV0ftOFOjQLyuKl6n+R8KJOGgGUrHaW4EI8bwqycTq67bgCc0xwPruHBWDX/Kg3tMYBRLbjUNw+6Qw==",
"dev": true,
"requires": {
"app-builder-lib": "20.27.1",
"app-builder-lib": "20.28.1",
"bluebird-lst": "^1.0.5",
"builder-util": "6.0.0",
"builder-util": "6.1.1",
"builder-util-runtime": "4.4.1",
"chalk": "^2.4.1",
"dmg-builder": "5.2.0",
"dmg-builder": "5.3.0",
"fs-extra-p": "^4.6.1",
"is-ci": "^1.1.0",
"lazy-val": "^1.0.3",
"read-config-file": "3.1.0",
"read-config-file": "3.1.2",
"sanitize-filename": "^1.6.1",
"update-notifier": "^2.5.0",
"yargs": "^12.0.1"
@ -998,13 +998,13 @@
}
},
"electron-publish": {
"version": "20.27.0",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.27.0.tgz",
"integrity": "sha512-bmyA9PbXeYDoh2S3Q5Rcs/AT3XUKxPnx0aChfy/qbsPBc/DtZirKuHh8B9SVjo8nK9wqm531rempyEOh3LAkDw==",
"version": "20.28.0",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.28.0.tgz",
"integrity": "sha512-ZGwzXyWuEGIvaCCGD0tebhjYGf7lxjdmkFAW3oFjRXOBXsBl91elOzOwfRSs/7zUE9mvvE0MnyJeBlqO7SAUvA==",
"dev": true,
"requires": {
"bluebird-lst": "^1.0.5",
"builder-util": "~6.0.0",
"builder-util": "~6.1.0",
"builder-util-runtime": "^4.4.1",
"chalk": "^2.4.1",
"fs-extra-p": "^4.6.1",
@ -2560,9 +2560,9 @@
}
},
"read-config-file": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.1.0.tgz",
"integrity": "sha512-z3VTrR9fgFu+Ll6MhTdtxbPFBKNGKgzYYnRjOcZvQeE/zwJTjPYVrps0ATgaSWU2/BnucUg3knP+Oz4zo9vEoA==",
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.1.2.tgz",
"integrity": "sha512-QCATYzlYHvmWps/W/eP7rcKuhYRYZg5XKeXFxSJRIXvn+KSw1+Ntz2et1aBz5TrEpawGrxWZ7zBipj+/v0xwWQ==",
"dev": true,
"requires": {
"ajv": "^6.5.2",

4
package.json
View File

@ -1,6 +1,6 @@
{
"name": "westeroscraftlauncher",
"version": "1.0.0-beta.1",
"version": "1.0.0-beta.2",
"description": "Custom modded launcher for Westeroscraft",
"productName": "WesterosCraft Launcher",
"main": "index.js",
@ -50,7 +50,7 @@
},
"devDependencies": {
"electron": "^2.0.7",
"electron-builder": "^20.27.1",
"electron-builder": "^20.28.1",
"eslint": "^5.3.0"
},
"build": {