Not sure how this worked when i tested this.. Fixed some dumb mistakes

This commit is contained in:
Pierce 2019-03-26 22:45:35 -04:00
parent f5e5482c5d
commit b95ef6f9a2
2 changed files with 4 additions and 4 deletions

View file

@ -106,7 +106,7 @@ module.exports.getAssets = function (directory, version) {
} }
// Seems taking it out of the initial download loop allows everything to be copied... // Seems taking it out of the initial download loop allows everything to be copied...
if(version.assets === "legacy") { if(version.assets === "legacy" || version.assets === "pre-1.6") {
for(const asset in index.objects) { for(const asset in index.objects) {
const hash = index.objects[asset].hash; const hash = index.objects[asset].hash;
const subhash = hash.substring(0,2); const subhash = hash.substring(0,2);
@ -119,7 +119,7 @@ module.exports.getAssets = function (directory, version) {
shelljs.mkdir('-p', path.join(directory, 'assets', 'legacy', legacyAsset.join('/'))); shelljs.mkdir('-p', path.join(directory, 'assets', 'legacy', legacyAsset.join('/')));
} }
if(!fs.existsSync(path.join(assetDirectory, hash), path.join(directory, 'assets', 'legacy', asset))) { if (!fs.existsSync(path.join(directory, 'assets', 'legacy', asset))) {
fs.copyFileSync(path.join(assetDirectory, hash), path.join(directory, 'assets', 'legacy', asset)) fs.copyFileSync(path.join(assetDirectory, hash), path.join(directory, 'assets', 'legacy', asset))
} }
} }
@ -244,7 +244,7 @@ module.exports.getLaunchOptions = function (version, forge, options) {
return new Promise(resolve => { return new Promise(resolve => {
const type = forge || version; const type = forge || version;
const arguments = type.minecraftArguments ? type.minecraftArguments.split(' ') : type.arguments.game; const arguments = type.minecraftArguments ? type.minecraftArguments.split(' ') : type.arguments.game;
const assetPath = version.assets === "legacy" ? path.join(options.root, 'assets', 'legacy') : path.join(options.root, 'assets'); const assetPath = version.assets === "legacy" || version.assets === "pre-1.6" ? path.join(options.root, 'assets', 'legacy') : path.join(options.root, 'assets');
const fields = { const fields = {
'${auth_access_token}': options.authorization.access_token, '${auth_access_token}': options.authorization.access_token,

View file

@ -1,6 +1,6 @@
{ {
"name": "minecraft-launcher-core", "name": "minecraft-launcher-core",
"version": "2.4.1", "version": "2.4.2",
"description": "Module that downloads Minecraft assets and runs Minecraft. Also Supports Forge", "description": "Module that downloads Minecraft assets and runs Minecraft. Also Supports Forge",
"main": "index.js", "main": "index.js",
"dependencies": { "dependencies": {