Skip to content

Fixed checksum, log4j.xml, forge download paths #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LINQeee wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixed checksum, log4j.xml, forge download paths #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d59cb5
added checksum awaiting in downloadToDirectory() func
LINQeee Feb 26, 2026
367ed40
fixed redundant log4j.xml downloading in the vulnerability handling s…
LINQeee Feb 26, 2026
03e9d16
changed forge paths:
LINQeee Feb 26, 2026
c08e3cd
undefined path arg hotfix
LINQeee Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions components/handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ class Handler {
async getForgedWrapped () {
let json = null
let installerJson = null
const versionPath = path.join(this.options.root, 'forge', `${this.version.id}`, 'version.json')
const versionPath = path.join(this.options.overrides.directory || 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)) {
Expand Down Expand Up @@ -460,8 +460,8 @@ class Handler {
json.forgeWrapperVersion = this.options.overrides.fw.version

// Saving file for next run!
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 })
if (!fs.existsSync(path.join(this.options.overrides.directory || this.options.root, `forge-${this.version.id}`))) {
fs.mkdirSync(path.join(this.options.overrides.directory || this.options.root, `forge-${this.version.id}`), { recursive: true })
}
fs.writeFileSync(versionPath, JSON.stringify(json, null, 4))

Expand Down Expand Up @@ -501,7 +501,7 @@ class Handler {

if (!fs.existsSync(path.join(jarPath, name))) await downloadLibrary(library)
if (library.downloads && library.downloads.artifact) {
if (!this.checkSum(library.downloads.artifact.sha1, path.join(jarPath, name))) await downloadLibrary(library)
if (!await this.checkSum(library.downloads.artifact.sha1, path.join(jarPath, name))) await downloadLibrary(library)
}

counter++
Expand Down
14 changes: 9 additions & 5 deletions components/launcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class MCLCore extends EventEmitter {

const versionFile = await this.handler.getVersion()
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.overrides.directory || path.join(this.options.root, 'versions', this.options.version.custom), `${this.options.version.custom}.jar`)
: path.join(directory, `${this.options.version.number}.jar`))
this.options.mcPath = mcPath
const nativePath = await this.handler.getNatives()
Expand Down Expand Up @@ -93,12 +93,16 @@ class MCLCore extends EventEmitter {
const configPath = path.resolve(this.options.overrides.cwd || this.options.root)
const intVersion = parseInt(versionFile.id.split('.')[1])
if (intVersion >= 12) {
await this.handler.downloadAsync('https://launcher.mojang.com/v1/objects/02937d122c86ce73319ef9975b58896fc1b491d1/log4j2_112-116.xml',
configPath, 'log4j2_112-116.xml', true, 'log4j')
if (!fs.existsSync(path.join(configPath, 'log4j2_112-116.xml'))) {
await this.handler.downloadAsync('https://launcher.mojang.com/v1/objects/02937d122c86ce73319ef9975b58896fc1b491d1/log4j2_112-116.xml',
configPath, 'log4j2_112-116.xml', true, 'log4j')
}
jvm.push('-Dlog4j.configurationFile=log4j2_112-116.xml')
} else if (intVersion >= 7) {
await this.handler.downloadAsync('https://launcher.mojang.com/v1/objects/dd2b723346a8dcd48e7f4d245f6bf09e98db9696/log4j2_17-111.xml',
configPath, 'log4j2_17-111.xml', true, 'log4j')
if (!fs.existsSync(path.join(configPath, 'log4j2_17-111.xml'))) {
await this.handler.downloadAsync('https://launcher.mojang.com/v1/objects/dd2b723346a8dcd48e7f4d245f6bf09e98db9696/log4j2_17-111.xml',
configPath, 'log4j2_17-111.xml', true, 'log4j')
}
jvm.push('-Dlog4j.configurationFile=log4j2_17-111.xml')
}
}
Expand Down