oier/PatataLauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixed bug with hashless assets, updating distro index.

Browse Source
This commit is contained in:
Daniel Scalzi
2017-11-19 00:41:36 -05:00
parent 6c393f111f
commit abbfb52c1b
5 changed files with 344 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,11 +261,11 @@ function _parseChecksumsFile(content){
* @returns {Boolean} - true if the file exists and calculated hash matches the given hash, otherwise false.
*/
function _validateLocal(filePath, algo, hash){
//No hash provided, have to assume it's good.
if(hash == null){
return true
}
if(fs.existsSync(filePath)){
//No hash provided, have to assume it's good.
if(hash == null){
return true
}
let fileName = path.basename(filePath)
let buf = fs.readFileSync(filePath)
let calcdhash = _calculateHash(buf, algo)
@@ -349,7 +349,7 @@ function _extractPackXZ(filePaths){
return new Promise(function(fulfill, reject){
const libPath = path.join(__dirname, '..', 'libraries', 'java', 'PackXZExtract.jar')
const filePath = filePaths.join(',')
const child = child_process.spawn('C:\\Program Files\\Java\\jdk1.8.0_144\\bin\\javaw.exe', ['-jar', libPath, '-packxz', filePath])
const child = child_process.spawn('C:\\Program Files\\Java\\jdk1.8.0_152\\bin\\javaw.exe', ['-jar', libPath, '-packxz', filePath])
child.stdout.on('data', (data) => {
//console.log('PackXZExtract:', data.toString('utf8'))
})

2
app/assets/js/launchprocess.js
View File

@@ -19,7 +19,7 @@ function launchMinecraft(versionData, forgeData, basePath){
//args.push('-mods modstore\\chatbubbles\\chatbubbles\\1.0.1_for_1.11.2\\mod_chatBubbles-1.0.1_for_1.11.2.litemod,modstore\\com\\westeroscraft\\westerosblocks\\3.0.0-beta-71\\westerosblocks-3.0.0-beta-71.jar,modstore\\mezz\\jei\\1.11.2-4.3.5.277\\jei-1.11.2-4.3.5.277.jar,modstore\\net\\optifine\\optifine\\1.11.2_HD_U_B9\\optifine-1.11.2_HD_U_B9.jar')
//args.push('--modListFile absolute:C:\\Users\\Asus\\Desktop\\LauncherElectron\\app\\assets\\WesterosCraft-1.11.2.json')
//TODO make this dynamic
const child = child_process.spawn('C:\\Program Files\\Java\\jdk1.8.0_144\\bin\\javaw.exe', args)
const child = child_process.spawn('C:\\Program Files\\Java\\jdk1.8.0_152\\bin\\javaw.exe', args)
child.stdout.on('data', (data) => {
console.log('Minecraft:', data.toString('utf8'))
})

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

@@ -31,10 +31,10 @@ document.onreadystatechange = function () {
window.minimize()
})
/*document.getElementById("test_btn").addEventListener('click', function(e){
document.getElementById("menu_button").addEventListener('click', function(e){
console.log('testing')
testdownloads()
})*/
})
}
}