mirror of
https://github.com/artegoser/pimi-launcher-core.git
synced 2024-11-22 12:16:21 +03:00
minArgs check for legacy & normal.
This commit is contained in:
parent
487bfa06fc
commit
4612107b3a
3 changed files with 4 additions and 5 deletions
|
@ -2,7 +2,7 @@
|
||||||
##### This project is complete for now.
|
##### This project is complete for now.
|
||||||
[![Build Status](https://travis-ci.com/Pierce01/MinecraftLauncher-core.svg?branch=master)](https://travis-ci.com/Pierce01/MinecraftLauncher-core)
|
[![Build Status](https://travis-ci.com/Pierce01/MinecraftLauncher-core.svg?branch=master)](https://travis-ci.com/Pierce01/MinecraftLauncher-core)
|
||||||
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
|
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
|
||||||
![version](https://img.shields.io/badge/stable_version-3.13.1-blue)
|
![version](https://img.shields.io/badge/stable_version-3.13.2-blue)
|
||||||
![badge](https://img.shields.io/badge/ncurses-not_supported-purple)
|
![badge](https://img.shields.io/badge/ncurses-not_supported-purple)
|
||||||
|
|
||||||
MCLC (Minecraft Launcher Core) is a NodeJS solution for launching modded and vanilla Minecraft without having to download and format everything yourself.
|
MCLC (Minecraft Launcher Core) is a NodeJS solution for launching modded and vanilla Minecraft without having to download and format everything yourself.
|
||||||
|
@ -33,7 +33,6 @@ let opts = {
|
||||||
// MCLC so you can handle auth based errors and validation!
|
// MCLC so you can handle auth based errors and validation!
|
||||||
authorization: Authenticator.getAuth("username", "password"),
|
authorization: Authenticator.getAuth("username", "password"),
|
||||||
root: "./minecraft",
|
root: "./minecraft",
|
||||||
os: "windows",
|
|
||||||
version: {
|
version: {
|
||||||
number: "1.14",
|
number: "1.14",
|
||||||
type: "release"
|
type: "release"
|
||||||
|
@ -198,3 +197,4 @@ These are the people that helped out that aren't listed [here](https://github.co
|
||||||
* [Khionu](https://github.com/khionu) - Research on how Minecraft's`natives` are handled.
|
* [Khionu](https://github.com/khionu) - Research on how Minecraft's`natives` are handled.
|
||||||
* [Coding-Kiwi](https://github.com/Coding-Kiwi) - Pointed out I didn't pass `clientToken` in initial authentication function.
|
* [Coding-Kiwi](https://github.com/Coding-Kiwi) - Pointed out I didn't pass `clientToken` in initial authentication function.
|
||||||
* maxbsoft - Pointed out that a certain JVM option causes OSX Minecraft to bug out.
|
* maxbsoft - Pointed out that a certain JVM option causes OSX Minecraft to bug out.
|
||||||
|
* [Noé](https://github.com/NoXeDev) - Pointed out launch args weren't being passed for Forge 1.13+.
|
||||||
|
|
|
@ -337,7 +337,6 @@ class Handler {
|
||||||
|
|
||||||
const downloadLink = `${url}${lib[0].replace(/\./g, '/')}/${lib[1]}/${lib[2]}/${name}`;
|
const downloadLink = `${url}${lib[0].replace(/\./g, '/')}/${lib[1]}/${lib[2]}/${name}`;
|
||||||
|
|
||||||
|
|
||||||
if(fs.existsSync(path.join(jarPath, name))) {
|
if(fs.existsSync(path.join(jarPath, name))) {
|
||||||
paths.push(`${jarPath}${path.sep}${name}`);
|
paths.push(`${jarPath}${path.sep}${name}`);
|
||||||
counter = counter + 1;
|
counter = counter + 1;
|
||||||
|
@ -475,7 +474,7 @@ class Handler {
|
||||||
const assetRoot = this.options.overrides.assetRoot || path.join(this.options.root, 'assets');
|
const assetRoot = this.options.overrides.assetRoot || path.join(this.options.root, 'assets');
|
||||||
const assetPath = this.version.assets === "legacy" || this.version.assets === "pre-1.6" ? path.join(assetRoot, 'legacy') : path.join(assetRoot);
|
const assetPath = this.version.assets === "legacy" || this.version.assets === "pre-1.6" ? path.join(assetRoot, 'legacy') : path.join(assetRoot);
|
||||||
|
|
||||||
const minArgs = this.options.overrides.minArgs || 5;
|
const minArgs = this.options.overrides.minArgs || this.version.assets === "legacy" ? 5 : 11;
|
||||||
if(args.length < minArgs) args = args.concat(this.version.minecraftArguments ? this.version.minecraftArguments.split(' ') : this.version.arguments.game);
|
if(args.length < minArgs) args = args.concat(this.version.minecraftArguments ? this.version.minecraftArguments.split(' ') : this.version.arguments.game);
|
||||||
|
|
||||||
this.options.authorization = await Promise.resolve(this.options.authorization);
|
this.options.authorization = await Promise.resolve(this.options.authorization);
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "minecraft-launcher-core",
|
"name": "minecraft-launcher-core",
|
||||||
"version": "3.13.1",
|
"version": "3.13.2",
|
||||||
"description": "Lightweight module that downloads and runs Minecraft using javascript / NodeJS",
|
"description": "Lightweight module that downloads and runs Minecraft using javascript / NodeJS",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
Loading…
Add table
Reference in a new issue