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

VersionJar is not needed. (#26)

Browse Source
This commit is contained in:
Daniel Scalzi 2019-03-06 22:47:45 -05:00
parent 90818245f3
commit 448440a604
No known key found for this signature in database
GPG Key ID: D18EA3FB4B142A57
7 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/distribution.json
View File

@ -1335,16 +1335,6 @@
"url": "" "url": ""
} }
}, },
{
"id": "1.13.2-forge-25.0.63",
"name": "Minecraft Forge (version.jar)",
"type": "VersionJar",
"artifact": {
"size": 16089640,
"MD5": "0d20673fc03f9c6a60279146ee1b1a14",
"url": ""
}
},
{ {
"id": "1.13.2-forge-25.0.63", "id": "1.13.2-forge-25.0.63",
"name": "Minecraft Forge (version.json)", "name": "Minecraft Forge (version.json)",

BIN
app/assets/images/SealCircle.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB

BIN
app/assets/images/WesterosSealSquare_old.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 94 KiB

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

@ -1407,10 +1407,10 @@ class AssetGuard extends EventEmitter {
const type = ob.getType() const type = ob.getType()
if(type === DistroManager.Types.ForgeHosted || type === DistroManager.Types.Forge){ if(type === DistroManager.Types.ForgeHosted || type === DistroManager.Types.Forge){
if(Util.mcVersionAtLeast('1.13', server.getMinecraftVersion())){ if(Util.mcVersionAtLeast('1.13', server.getMinecraftVersion())){
// Read Manifest
for(let sub of ob.getSubModules()){ for(let sub of ob.getSubModules()){
if(sub.getType() === DistroManager.Types.VersionManifest){ if(sub.getType() === DistroManager.Types.VersionManifest){
const versionFile = path.join(self.commonPath, 'versions', sub.getIdentifier(), `${sub.getIdentifier()}.json`) resolve(JSON.parse(fs.readFileSync(sub.getArtifact().getPath(), 'utf-8')))
resolve(JSON.parse(fs.readFileSync(versionFile, 'utf-8')))
return return
} }
} }

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

@ -190,9 +190,6 @@ class Module {
case exports.Types.VersionManifest: case exports.Types.VersionManifest:
this.artifact.path = path.join(ConfigManager.getCommonDirectory(), 'versions', this.getIdentifier(), `${this.getIdentifier()}.json`) this.artifact.path = path.join(ConfigManager.getCommonDirectory(), 'versions', this.getIdentifier(), `${this.getIdentifier()}.json`)
break break
case exports.Types.VersionJar:
this.artifact.path = path.join(ConfigManager.getCommonDirectory(), 'versions', this.getIdentifier(), `${this.getIdentifier()}.jar`)
break
case exports.Types.File: case exports.Types.File:
default: default:
this.artifact.path = path.join(ConfigManager.getInstanceDirectory(), serverid, pth) this.artifact.path = path.join(ConfigManager.getInstanceDirectory(), serverid, pth)

26
package-lock.json generated
View File

@ -31,9 +31,9 @@
} }
}, },
"@types/node": { "@types/node": {
"version": "10.12.27", "version": "10.12.30",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.27.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz",
"integrity": "sha512-e9wgeY6gaY21on3ve0xAjgBVjGDWq/xUteK0ujsE53bUoxycMkqfnkUgMt6ffZtykZ5X12Mg3T7Pw4TRCObDKg==", "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==",
"dev": true "dev": true
}, },
"acorn": { "acorn": {
@ -806,9 +806,9 @@
} }
}, },
"electron": { "electron": {
"version": "4.0.6", "version": "4.0.7",
"resolved": "https://registry.npmjs.org/electron/-/electron-4.0.6.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.7.tgz",
"integrity": "sha512-r2ow/EmDibjoCNJp35mB1CcPs2xBF9fp2eoWuUOJmpVQyzdba6EnqsSD1BxwXzF9vQ5WkQ2UbfXBIvpomrdioQ==", "integrity": "sha512-KYQ9SJZFWNKqoq6XjKW1bLFHjmAGeSC3XNuhHK/Sd2MK5H5sO3iKjvZU/YhiBUtkB/cBSkOdQTVEaLcMwU8l3A==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "^10.12.18", "@types/node": "^10.12.18",
@ -995,9 +995,9 @@
"dev": true "dev": true
}, },
"eslint": { "eslint": {
"version": "5.14.1", "version": "5.15.1",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-5.14.1.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.15.1.tgz",
"integrity": "sha512-CyUMbmsjxedx8B0mr79mNOqetvkbij/zrXnFeK2zc3pGRn3/tibjiNAv/3UxFEyfMDjh+ZqTrJrEGBFiGfD5Og==", "integrity": "sha512-NTcm6vQ+PTgN3UBsALw5BMhgO6i5EpIjQF/Xb5tIh3sk9QhrFafujUOczGz4J24JBlzWclSB9Vmx8d+9Z6bFCg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "^7.0.0", "@babel/code-frame": "^7.0.0",
@ -1006,7 +1006,7 @@
"cross-spawn": "^6.0.5", "cross-spawn": "^6.0.5",
"debug": "^4.0.1", "debug": "^4.0.1",
"doctrine": "^3.0.0", "doctrine": "^3.0.0",
"eslint-scope": "^4.0.0", "eslint-scope": "^4.0.2",
"eslint-utils": "^1.3.1", "eslint-utils": "^1.3.1",
"eslint-visitor-keys": "^1.0.0", "eslint-visitor-keys": "^1.0.0",
"espree": "^5.0.1", "espree": "^5.0.1",
@ -1056,9 +1056,9 @@
} }
}, },
"eslint-scope": { "eslint-scope": {
"version": "4.0.0", "version": "4.0.2",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.2.tgz",
"integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", "integrity": "sha512-5q1+B/ogmHl8+paxtOKx38Z8LtWkVGuNt3+GQNErqwLl6ViNp/gdJGMCjZNxZ8j/VYjDNZ2Fo+eQc1TAVPIzbg==",
"dev": true, "dev": true,
"requires": { "requires": {
"esrecurse": "^4.1.0", "esrecurse": "^4.1.0",

4
package.json
View File

@ -41,9 +41,9 @@
}, },
"devDependencies": { "devDependencies": {
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"electron": "^4.0.6", "electron": "^4.0.7",
"electron-builder": "^20.38.5", "electron-builder": "^20.38.5",
"eslint": "^5.14.1" "eslint": "^5.15.1"
}, },
"repository": { "repository": {
"type": "git", "type": "git",