ForgeWrapper 1.4.2

This commit is contained in:
Pierce 2020-11-26 19:22:41 -05:00
parent 53403b158e
commit f947379727
4 changed files with 83 additions and 17 deletions

Binary file not shown.

View file

@ -374,22 +374,86 @@ class Handler {
getForgedWrapped () { getForgedWrapped () {
return new Promise(resolve => { return new Promise(resolve => {
const libraryDirectory = path.resolve(this.options.overrides.libraryRoot || path.join(this.options.root, 'libraries')) const forgeWrapperAgrs = [
const launchArgs = `"${this.options.javaPath ? this.options.javaPath : 'java'}" -jar "${path.resolve(this.options.forgeWrapper.jar)}"` + `-Dforgewrapper.librariesDir=${path.resolve(this.options.overrides.libraryRoot || path.join(this.options.root, 'libraries'))}`,
` --installer="${this.options.forge}" --instance="${this.options.root}" ` + `-Dforgewrapper.installer=${this.options.forge}`,
`--saveTo="${path.join(libraryDirectory, 'io', 'github', 'zekerzhayard', 'ForgeWrapper', this.options.forgeWrapper.version)}"` `-Dforgewrapper.minecraft=${this.options.mcPath}`
]
this.options.customArgs
? this.options.customArgs = this.options.customArgs.concat(forgeWrapperAgrs)
: this.options.customArgs = forgeWrapperAgrs
const fw = child.exec(launchArgs) let json = null
const forgeJson = path.join(this.options.root, 'forge', this.version.id, 'version.json') const versionPath = path.join(this.options.root, 'forge', `${this.version.id}`, 'version.json')
// Since we're building a proper "custom" JSON that will work nativly with MCLC, the version JSON will not
// be re-generated on the next run.
if (fs.existsSync(versionPath)) {
try {
json = JSON.parse(fs.readFileSync(versionPath))
if (!json.forgeWrapperVersion || !(json.forgeWrapperVersion === this.fw.version)) {
this.client.emit('debug', '[MCLC]: Old ForgeWrapper has generated this version JSON, re-generating')
} else {
return resolve(json)
}
} catch (e) {
this.client.emit('debug', '[MCLC]: Failed to parse Forge version JSON, re-generating')
}
}
fw.on('close', (e) => { this.client.emit('debug', '[MCLC]: Generating a proper version json, this might take a bit')
if (!fs.existsSync(forgeJson)) { const zipFile = new Zip(this.options.forge)
this.client.emit('debug', '[MCLC]: ForgeWrapper did not produce a version file, using Vanilla') json = zipFile.readAsText('version.json')
resolve(null) let installerJson = zipFile.readAsText('install_profile.json')
} else {
resolve(JSON.parse(fs.readFileSync(forgeJson, { encoding: 'utf8' }))) try {
json = JSON.parse(json)
installerJson = JSON.parse(installerJson)
} catch (e) {
this.client.emit('debug', '[MCLC]: Failed to load json files for ForgeWrapper, using Vanilla instead')
return resolve(null)
}
// So we know when to re-generate the file when there's a new ForgeWrapper version.
json.forgeWrapperVersion = this.options.fw.version
// Adding the installer libraries as mavenFiles so MCLC downloads them but doesn't add them to the class paths.
json.mavenFiles
? json.mavenFiles = json.mavenFiles.concat(installerJson.libraries)
: json.mavenFiles = installerJson.libraries
// Modifying inital forge entry to include launcher so ForgeWrapper can work properly
json.libraries[0].name = json.libraries[0].name + ':launcher'
json.libraries[0].downloads.artifact.path = json.libraries[0].downloads.artifact.path.replace('.jar', '-launcher.jar')
json.libraries[0].downloads.artifact.url = 'https://files.minecraftforge.net/maven/' + json.libraries[0].downloads.artifact.path
// Providing a download URL to the universal jar library so it can be downloaded properly.
for (const library of json.mavenFiles) {
const lib = library.name.split(':')
if (lib[0] === 'net.minecraftforge' && lib[1].includes('forge')) {
library.downloads.artifact.url = 'https://files.minecraftforge.net/maven/' + library.downloads.artifact.path
break
}
}
const fwName = `ForgeWrapper-${this.options.fw.version}.jar`
const fwPathArr = ['io', 'github', 'zekerzhayard', 'ForgeWrapper', this.options.fw.version]
// Adding ForgeWrapper to the libraries list so MCLC includes it in the classpaths.
json.libraries.push({
name: fwPathArr.join(':'),
downloads: {
artifact: {
path: [...fwPathArr, fwName].join('/'),
url: `${this.options.fw.baseUrl}${this.options.fw.version}/${fwName}`,
sha1: this.options.fw.sh1,
size: this.options.fw.size
}
} }
}) })
json.mainClass = 'io.github.zekerzhayard.forgewrapper.installer.Main'
if (!fs.existsSync(path.join(this.options.root, 'forge', this.version.id))) {
fs.mkdirSync(path.join(this.options.root, 'forge', this.version.id), { recursive: true })
}
fs.writeFileSync(versionPath, JSON.stringify(json, null, 4))
return resolve(json)
}) })
} }

View file

@ -22,10 +22,11 @@ class MCLCore extends EventEmitter {
: undefined : undefined
} }
} }
// ForgeWrapper fork that is maintained on a side repo (https://github.com/Pierce01/ForgeWrapper) this.options.fw = {
this.options.forgeWrapper = { baseUrl: 'https://github.com/ZekerZhayard/ForgeWrapper/releases/download/',
jar: path.join(__dirname, 'fw.jar'), version: '1.4.2',
version: '1.4.1-mclc' sh1: '79ff9c1530e8743450c5c3ebc6e07b535437aa6e',
size: 22346
} }
this.handler = new Handler(this) this.handler = new Handler(this)
@ -71,6 +72,7 @@ class MCLCore extends EventEmitter {
const mcPath = this.options.overrides.minecraftJar || (this.options.version.custom const mcPath = this.options.overrides.minecraftJar || (this.options.version.custom
? path.join(this.options.root, 'versions', this.options.version.custom, `${this.options.version.custom}.jar`) ? path.join(this.options.root, 'versions', this.options.version.custom, `${this.options.version.custom}.jar`)
: path.join(directory, `${this.options.version.number}.jar`)) : path.join(directory, `${this.options.version.number}.jar`))
this.options.mcPath = mcPath
const nativePath = await this.handler.getNatives() const nativePath = await this.handler.getNatives()
if (!fs.existsSync(mcPath)) { if (!fs.existsSync(mcPath)) {

View file

@ -1,6 +1,6 @@
{ {
"name": "minecraft-launcher-core", "name": "minecraft-launcher-core",
"version": "3.15.1", "version": "3.15.6",
"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": {