1.19.4 Bugfix

Author: FabiPunktExe

package.json

@@ -1,6 +1,6 @@
 {
   "name": "simplelauncher",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Launcher for SimpleClient",
   "main": "src/main.js",
   "scripts": {

src/auth.js

@@ -12,8 +12,6 @@ var accounts
 var window
 var success
 
-const loadAccounts = () => accounts = getAccounts()
-
 const openAuthWindow = statusCallback => {
     if (window) return
     statusCallback('starting')
@@ -275,4 +273,4 @@ const refreshTokens = async account => {
     return true
 }
 
-module.exports = {openAuthWindow, getAccounts, getAccount, addAccount, selectedAccount, refreshTokens, accounts, loadAccounts}
+module.exports = {openAuthWindow, getAccounts, getAccount, addAccount, selectedAccount, refreshTokens, accounts}

src/gui/gui.js

@@ -4,9 +4,11 @@ const { join, resolve } = require('path')
 const openWindow = () => {
     const window = new BrowserWindow({
         webPreferences: {
+            preload: resolve(join(__dirname, 'preload.js')),
             nodeIntegration: true,
-            preload: resolve(join('src', 'gui', 'preload.js')),
-            javascript: true
+            javascript: true,
+            contextIsolation: true,
+            sandbox: false
         },
         title: 'SimpleClient',
         icon: join(__dirname, 'logo.png')

src/main.js

@@ -5,7 +5,7 @@ const { exit } = require('process');
 const { autoUpdater } = require('electron-updater');
 const electronIsDev = require('electron-is-dev');
 const { getSimpleClientVersions, launch } = require('./minecraft');
-const { loadAccounts, openAuthWindow, getAccounts } = require('./auth');
+const { openAuthWindow, getAccounts } = require('./auth');
 
 if (!electronIsDev) {
     autoUpdater.allowPrerelease = true;
@@ -14,6 +14,7 @@ if (!electronIsDev) {
 }
 
 if (platform() == 'win32' || platform() == 'linux') {
+    app.disableHardwareAcceleration()
     app.whenReady().then(() => {
         const window = openWindow()
         window.on('ready-to-show', () => {

src/minecraft.js

@@ -227,11 +227,22 @@ const launch = async (version, account, statusCallback) => {
             return join(dir, 'mods', fileName)
         }).join(separator)
     ]
-    jvmArguments = jvmArguments.concat(meta.arguments.jvm.filter(arg => !arg.rules || arg.rules.every(checkRule)).map(arg => arg.value || arg))
+    meta.arguments.jvm.filter(arg => !arg.rules || arg.rules.every(checkRule)).forEach(arg => {
+        if (arg.value) {
+            if (Array.isArray(arg.value)) for (value of arg.value) jvmArguments.push(value)
+            else jvmArguments.push(arg.value)
+        } else jvmArguments.push(arg)
+    })
+    console.log(jvmArguments)
     var arguments = []
     arguments = arguments.concat(jvmArguments)
     arguments.push(meta.mainClass)
-    arguments = arguments.concat(meta.arguments.game.filter(arg => !arg.rules || arg.rules.every(checkRule)).map(arg => arg.value || arg))
+    meta.arguments.game.filter(arg => !arg.rules || arg.rules.every(checkRule)).forEach(arg => {
+        if (arg.value) {
+            if (Array.isArray(arg.value)) for (value of arg.value) jvmArguments.push(value)
+            else arguments.push(arg.value)
+        } else arguments.push(arg)
+    })
     spawn('java', insertValues(arguments, values), {
         cwd: getMinecraftDir(),
         env: {PATH: path}