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

Updating paths broken by refactoring, added temp debug button, updated production file index.

Browse Source
This commit is contained in:
Daniel Scalzi
2017-08-27 03:49:03 -04:00
parent 700a5c50cf
commit 455f199457
5 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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\\jre1.8.0_131\\bin\\javaw.exe', ['-jar', libPath, '-packxz', filePath])
const child = child_process.spawn('C:\\Program Files\\Java\\jdk1.8.0_144\\bin\\javaw.exe', ['-jar', libPath, '-packxz', filePath])
child.stdout.on('data', (data) => {
//console.log('PackXZExtract:', data.toString('utf8'))
})
@@ -414,6 +414,7 @@ function startAsyncProcess(identifier, limit = 5){
let acc = 0
const concurrentDlTracker = instance[identifier]
const concurrentDlQueue = concurrentDlTracker.dlqueue.slice(0)
console.log(concurrentDlQueue);
if(concurrentDlQueue.length === 0){
return false
} else {
@@ -741,7 +742,7 @@ function _chainValidateDistributionIndex(basePath){
const targetFile = path.join(basePath, 'westeroscraft.json')
//TEMP WORKAROUND TO TEST WHILE THIS IS NOT HOSTED
fs.readFile(path.join(basePath, '..', 'app', 'assets', 'westeroscraft.json'), 'utf-8', (err, data) => {
fs.readFile(path.join(__dirname, '..', 'westeroscraft.json'), 'utf-8', (err, data) => {
fulfill(JSON.parse(data))
})
})

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\\jre1.8.0_131\\bin\\javaw.exe', args)
const child = child_process.spawn('C:\\Program Files\\Java\\jdk1.8.0_144\\bin\\javaw.exe', args)
child.stdout.on('data', (data) => {
console.log('Minecraft:', data.toString('utf8'))
})

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

@@ -5,8 +5,6 @@ const path = require('path')
const os = require('os');
const ag = require(path.join(__dirname, 'assets', 'js', 'assetguard.js'))
console.log($);
$(document).on('ready', function(){
console.log('okay');
})
@@ -33,6 +31,11 @@ document.onreadystatechange = function () {
window.minimize()
})
document.getElementById("test_btn").addEventListener('click', function(e){
console.log('testing')
testdownloads()
})
}
}