From c41f74f478885a12e8cb00e558a1b8ad4d0957d6 Mon Sep 17 00:00:00 2001
From: Daniel Scalzi <d_scalzi@yahoo.com>
Date: Sun, 30 Apr 2017 18:28:43 -0400
Subject: [PATCH] Added more dynamic values for game launch, hotfix for
 electron installation bug.

---
 app/assets/js/launchprocess.js | 17 ++++++++---------
 package.json                   |  3 ++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/assets/js/launchprocess.js b/app/assets/js/launchprocess.js
index 863d9a87..467e52db 100644
--- a/app/assets/js/launchprocess.js
+++ b/app/assets/js/launchprocess.js
@@ -8,13 +8,14 @@ const unzip = require('unzip')
 const mkpath = require('mkdirp');
 
 exports.launchMinecraft = function(versionData, basePath){
-    const authPromise = mojang.auth('EMAIL', 'PASS', uuidV4(), {
+    const authPromise = mojang.auth('nytrocraft@live.com', 'applesrgood123', uuidV4(), {
         name: 'Minecraft',
         version: 1
     })
     authPromise.then(function(data){
         const hardcodedargs = ''
         const args = finalizeArguments(versionData, data, basePath)
+        //console.log(data)
         //console.log(args)
         //TODO make this dynamic
         const child = child_process.spawn('C:\\Program Files\\Java\\jre1.8.0_131\\bin\\javaw.exe', args)
@@ -23,6 +24,8 @@ exports.launchMinecraft = function(versionData, basePath){
 
 finalizeArguments = function(versionData, authData, basePath){
     const mcArgs = versionData['minecraftArguments']
+    console.log(authData)
+    const gameProfile = authData['selectedProfile']
     const regex = new RegExp('\\${*(.*)}')
     const argArr = mcArgs.split(' ')
     argArr.unshift('net.minecraft.client.main.Main')
@@ -37,12 +40,10 @@ finalizeArguments = function(versionData, authData, basePath){
     for(let i=0; i<argArr.length; i++){
         if(regex.test(argArr[i])){
             const identifier = argArr[i].match(regex)[1]
-            //console.log(argArr[i].match(regex)[1])
             let newVal = argArr[i]
             switch(identifier){
                 case 'auth_player_name':
-                    //TODO make this DYNAMIC
-                    newVal = 'iPepsiHD'
+                    newVal = gameProfile['name']
                     break
                 case 'version_name':
                     newVal = versionData['id']
@@ -57,14 +58,12 @@ finalizeArguments = function(versionData, authData, basePath){
                     newVal = versionData['assets']
                     break
                 case 'auth_uuid':
-                    //TODO make this DYNAMIC
-                    newVal = '48f0a3d02ae14ca4aa0011bb8bc4f39e'
+                    newVal = gameProfile['id']
                     break
                 case 'auth_access_token':
                     newVal = authData['accessToken']
                     break
                 case 'user_type':
-                    //TODO make this DYNAMIC
                     newVal = 'MOJANG'
                     break
                 case 'version_type':
@@ -82,8 +81,8 @@ classpathArg = function(versionData, basePath){
     const libArr = versionData['libraries']
     const libPath = path.join(basePath, 'libraries')
     const nativePath = path.join(basePath, 'natives')
-    //TODO make this dynamic
-    const cpArgs = ['C:\\Users\\Asus\\Desktop\\LauncherElectron\\mcfiles\\versions\\1.11.2\\1.11.2.jar']
+    const version = versionData['id']
+    const cpArgs = [path.join(basePath, 'versions', version, version + '.jar')]
     libArr.forEach(function(lib){
         if(library.validateRules(lib['rules'])){
             if(lib['natives'] == null){
diff --git a/package.json b/package.json
index a05bc9ad..52ce7236 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,8 @@
   "devDependencies": {
     "async": "^2.3.0",
     "electron": "^1.6.5",
-    "mojang": "^0.4.0",
+    "extract-zip": "=1.6.0",
+    "mojang": "^0.4.1",
     "promise": "^7.1.1",
     "unzip": "^0.1.11",
     "uuid": "^3.0.1"