From e207529dac06a00efc9b8b831bdba36a659fa624 Mon Sep 17 00:00:00 2001 From: Pierce Date: Fri, 26 Apr 2019 13:03:39 -0400 Subject: [PATCH] Change required args from 9 to 5. New event Event allows you to see the launch arguments for debugging. --- README.md | 1 + components/handler.js | 2 +- components/launcher.js | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8c56750..0b97cfa 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,7 @@ If you are loading up a client outside of vanilla Minecraft and Forge (Optifine | Event Name | Type | Description | |-------------------|---------|---------------------------------------------------------------------------------------| +| `arguments` | Object | Emitted when launch arguments are set for the Minecraft Jar. | | `data` | Buffer | Emitted when information is returned from the Minecraft Process | | `close` | Integer | Code number that is returned by the Minecraft Process | | `error` | String | Emitted when the Minecraft Process errors | diff --git a/components/handler.js b/components/handler.js index 2b56027..fcef2ab 100644 --- a/components/handler.js +++ b/components/handler.js @@ -262,7 +262,7 @@ module.exports.getLaunchOptions = function (version, modification, options) { let arguments = type.minecraftArguments ? type.minecraftArguments.split(' ') : type.arguments.game; const assetPath = version.assets === "legacy" || version.assets === "pre-1.6" ? path.join(options.root, 'assets', 'legacy') : path.join(options.root, 'assets'); - if(arguments.length < 9) arguments = arguments.concat(version.minecraftArguments ? version.minecraftArguments.split(' ') : version.arguments.game); + if(arguments.length < 5) arguments = arguments.concat(version.minecraftArguments ? version.minecraftArguments.split(' ') : version.arguments.game); const fields = { '${auth_access_token}': options.authorization.access_token, diff --git a/components/launcher.js b/components/launcher.js index a152fd9..aec4080 100644 --- a/components/launcher.js +++ b/components/launcher.js @@ -61,6 +61,7 @@ module.exports = async function (options) { const launchOptions = await handler.getLaunchOptions(versionFile, modification, options); const launchArguments = args.concat(jvm, classPaths, launchOptions); + event.emit('arguments', launchArguments); const minecraft = child.spawn(options.javaPath ? options.javaPath : 'java', launchArguments); minecraft.stdout.on('data', (data) => event.emit('data', data));