From 4b26d6cfa212120c5a741be078e63101f1abfaec Mon Sep 17 00:00:00 2001
From: Pierce <spammermuch@gmail.com>
Date: Mon, 13 Dec 2021 12:44:09 -0500
Subject: [PATCH] ForgeWrapper 1.5.4 & Log4j Fix

---
 README.md              |  5 +++--
 components/launcher.js | 26 +++++++++++++++++++++++---
 package.json           |  2 +-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 7f5a3a3..92e457b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 ##### 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)
 [![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.16.9-blue)
+![version](https://img.shields.io/badge/stable_version-3.16.10-blue)
 ![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.
@@ -118,7 +118,8 @@ let opts = {
         version: '1.5.1',
         sh1: '90104e9aaa8fbedf6c3d1f6d0b90cabce080b5a9',
         size: 29892,
-      }
+      },
+      logj4ConfigurationFile: ''
    }
 }
 ```
diff --git a/components/launcher.js b/components/launcher.js
index 82e549e..e3429b3 100644
--- a/components/launcher.js
+++ b/components/launcher.js
@@ -23,9 +23,9 @@ class MCLCore extends EventEmitter {
       },
       fw: {
         baseUrl: 'https://github.com/ZekerZhayard/ForgeWrapper/releases/download/',
-        version: '1.5.3',
-        sh1: '2b0e06937349a209dbb90dca6381258daa456ad7',
-        size: 30486,
+        version: '1.5.4',
+        sh1: 'e97805af76d4c1cebb753132eadbabd92e67a17b',
+        size: 34299,
         ...this.options.overrides
           ? this.options.overrides.fw
           : undefined
@@ -88,6 +88,26 @@ class MCLCore extends EventEmitter {
     } else jvm.push(await this.handler.getJVM())
 
     if (this.options.customArgs) jvm = jvm.concat(this.options.customArgs)
+    if (this.options.overrides.logj4ConfigurationFile) {
+      jvm.push(`-Dlog4j.configurationFile=${path.resolve(this.options.overrides.logj4ConfigurationFile)}`)
+    }
+    // https://help.minecraft.net/hc/en-us/articles/4416199399693-Security-Vulnerability-in-Minecraft-Java-Edition
+    if (parseInt(versionFile.id.split('.')[1]) === 17) jvm.push('-Dlog4j2.formatMsgNoLookups=true')
+    if (parseInt(versionFile.id.split('.')[1]) < 17) {
+      if (!jvm.find(arg => arg.includes('Dlog4j.configurationFile'))) {
+        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')
+          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')
+          jvm.push('-Dlog4j.configurationFile=log4j2_17-111.xml')
+        }
+      }
+    }
 
     const classes = this.options.overrides.classes || this.handler.cleanUp(await this.handler.getClasses(modifyJson))
     const classPaths = ['-cp']
diff --git a/package.json b/package.json
index dfc466c..eb347b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "minecraft-launcher-core",
-  "version": "3.16.9",
+  "version": "3.16.10",
   "description": "Lightweight module that downloads and runs Minecraft using javascript / NodeJS",
   "main": "index.js",
   "dependencies": {