From fea17bb28ecc43e5daf77dc58bdbc4f785ac8f69 Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <khanhduytran0@users.noreply.github.com>
Date: Wed, 15 Dec 2021 05:49:46 +0700
Subject: [PATCH 1/4] Log4J RCE patch config: disable XML format output

This applies for Minecraft 1.12+
Disable XML formatting for now until we have a log viewer.
---
 .../java/net/kdt/pojavlaunch/PLaunchApp.java  | 10 +++++++--
 Natives/resources/log4j-rce-patch-1.12.xml    | 21 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 Natives/resources/log4j-rce-patch-1.12.xml

diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java
index 607d079f..a0c62a1d 100644
--- a/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java
+++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java
@@ -44,6 +44,13 @@ public class PLaunchApp {
     public static void launchMinecraft() {
         System.out.println("Launching Minecraft " + mVersion.id);
         try {
+            String configPath;
+            if (mVersion.logging.client.file.id.equals("client-1.12.xml")) {
+                configPath = Tools.DIR_BUNDLE + "/log4j-rce-patch-1.12.xml";
+            } else {
+                configPath = Tools.DIR_GAME_NEW + "/" + mVersion.logging.client.file.id;
+            }
+            System.setProperty("log4j.configurationFile", configPath);
             Tools.launchMinecraft(AccountJNI.CURRENT_ACCOUNT, mVersion);
         } catch (Throwable th) {
             Tools.showError(th);
@@ -116,11 +123,10 @@ public class PLaunchApp {
                     e.printStackTrace();
                 }
 
-                if (mVersion.logging != null) {
+                if (mVersion.logging != null && !mVersion.logging.client.file.id.equals("client-1.12.xml")) {
                     UIKit.updateProgressSafe(0, "Downloading " + mVersion.logging.client.file.id);
                     String configPath = Tools.DIR_GAME_NEW + "/" + mVersion.logging.client.file.id;
                     Tools.downloadFile(mVersion.logging.client.file.url, configPath);
-                    System.setProperty("log4j.configurationFile", configPath);
                 }
 
                 maxProgress = mVersion.libraries.length + 1 + (assets == null ? 0 : assets.objects.size());
diff --git a/Natives/resources/log4j-rce-patch-1.12.xml b/Natives/resources/log4j-rce-patch-1.12.xml
new file mode 100644
index 00000000..7b69954e
--- /dev/null
+++ b/Natives/resources/log4j-rce-patch-1.12.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+    <Appenders>
+        <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" />
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+                <OnStartupTriggeringPolicy />
+            </Policies>
+        </RollingRandomAccessFile>
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <filters>
+                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
+            </filters>
+            <AppenderRef ref="SysOut"/>
+            <AppenderRef ref="File"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file

From f80fbfc19ca4ab15e1e7f592302a1d57117b9b1b Mon Sep 17 00:00:00 2001
From: Adam Tunnic <tunnic.adam@gmail.com>
Date: Wed, 15 Dec 2021 11:10:39 -0500
Subject: [PATCH 2/4] Create newsfeed.html

---
 newsfeed.html | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 newsfeed.html

diff --git a/newsfeed.html b/newsfeed.html
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/newsfeed.html
@@ -0,0 +1 @@
+

From ea831802609d80775bbd8cda06d2b12dc84dcb1d Mon Sep 17 00:00:00 2001
From: Adam Tunnic <tunnic.adam@gmail.com>
Date: Wed, 15 Dec 2021 12:05:15 -0500
Subject: [PATCH 3/4] Update newsfeed.html

---
 newsfeed.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newsfeed.html b/newsfeed.html
index 8b137891..a4d67dad 100644
--- a/newsfeed.html
+++ b/newsfeed.html
@@ -1 +1 @@
-
+<h1>PojavLauncher</h1>

From 12fb81f3ce048498d9dac7f19b7ca122e34dba2b Mon Sep 17 00:00:00 2001
From: Adam Tunnic <tunnic.adam@gmail.com>
Date: Wed, 15 Dec 2021 12:40:30 -0500
Subject: [PATCH 4/4] Delete newsfeed.html

---
 newsfeed.html | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 newsfeed.html

diff --git a/newsfeed.html b/newsfeed.html
deleted file mode 100644
index a4d67dad..00000000
--- a/newsfeed.html
+++ /dev/null
@@ -1 +0,0 @@
-<h1>PojavLauncher</h1>