This commit is contained in:
Artemy 2023-06-19 17:13:23 +03:00
commit 4a6c340180
2 changed files with 37 additions and 62 deletions

View file

@ -4,7 +4,7 @@
[![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.17.0-blue) ![version](https://img.shields.io/badge/stable_version-3.17.1-blue)
![badge](https://img.shields.io/badge/ncurses-not_supported-purple) ![badge](https://img.shields.io/badge/ncurses-not_supported-purple)
PiMi (Minecraft Launcher Core) is a NodeJS solution for launching modded and vanilla Minecraft without having to download and format everything yourself. PiMi (Minecraft Launcher Core) is a NodeJS solution for launching modded and vanilla Minecraft without having to download and format everything yourself.

View file

@ -698,73 +698,48 @@ class Handler {
} }
async downloadToDirectory (directory, libraries, eventName) { async downloadToDirectory (directory, libraries, eventName) {
const libs = []; const libs = []
await Promise.all( await Promise.all(libraries.map(async library => {
libraries.map(async (library) => { if (!library) return
if (!library) return; if (this.parseRule(library)) return
if (this.parseRule(library)) return; const lib = library.name.split(':')
const lib = library.name.split(":");
let jarPath; let jarPath
let name; let name
if ( if (library.downloads && library.downloads.artifact && library.downloads.artifact.path) {
library.downloads && name = library.downloads.artifact.path.split('/')[library.downloads.artifact.path.split('/').length - 1]
library.downloads.artifact && jarPath = path.join(directory, this.popString(library.downloads.artifact.path))
library.downloads.artifact.path
) {
name =
library.downloads.artifact.path.split("/")[
library.downloads.artifact.path.split("/").length - 1
];
jarPath = path.join(
directory,
this.popString(library.downloads.artifact.path)
);
} else { } else {
name = `${lib[1]}-${lib[2]}${lib[3] ? "-" + lib[3] : ""}.jar`; name = `${lib[1]}-${lib[2]}${lib[3] ? '-' + lib[3] : ''}.jar`
jarPath = path.join( jarPath = path.join(directory, `${lib[0].replace(/\./g, '/')}/${lib[1]}/${lib[2]}`)
directory,
`${lib[0].replace(/\./g, "/")}/${lib[1]}/${lib[2]}`
);
} }
if ( const downloadLibrary = async library => {
!fs.existsSync(path.join(jarPath, name)) ||
!this.checkSum(
library.downloads.artifact.sha1,
path.join(jarPath, name)
)
) {
// Simple lib support, forgot which addon needed this but here you go, Mr special.
if (library.url) { if (library.url) {
const url = `${library.url}${lib[0].replace(/\./g, "/")}/${ const url = `${library.url}${lib[0].replace(/\./g, '/')}/${lib[1]}/${lib[2]}/${name}`
lib[1] await this.downloadAsync(url, jarPath, name, true, eventName)
}/${lib[2]}/${name}`;
await this.downloadAsync(url, jarPath, name, true, eventName);
} else if (library.downloads && library.downloads.artifact) { } else if (library.downloads && library.downloads.artifact) {
await this.downloadAsync( await this.downloadAsync(library.downloads.artifact.url, jarPath, name, true, eventName)
library.downloads.artifact.url,
jarPath,
name,
true,
eventName
);
} }
} }
counter++; if (!fs.existsSync(path.join(jarPath, name))) downloadLibrary(library)
this.client.emit("progress", { else if (library.downloads && library.downloads.artifact) {
if (!this.checkSum(library.downloads.artifact.sha1, path.join(jarPath, name))) downloadLibrary(library)
}
counter++
this.client.emit('progress', {
type: eventName, type: eventName,
task: counter, task: counter,
total: libraries.length, total: libraries.length
});
libs.push(`${jarPath}${path.sep}${name}`);
}) })
); libs.push(`${jarPath}${path.sep}${name}`)
counter = 0; }))
counter = 0
return libs; return libs
} }
async getClasses(classJson) { async getClasses(classJson) {