From 1942e478366e1896638b1e47ae8419b82312f098 Mon Sep 17 00:00:00 2001 From: Riley Park Date: Thu, 17 Jun 2021 18:42:17 -0700 Subject: [PATCH] Don't include log4j --- patches/server/Build-system-changes.patch | 1 - .../Use-TerminalConsoleAppender-for-console-improvements.patch | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/patches/server/Build-system-changes.patch b/patches/server/Build-system-changes.patch index 84fafdc16..898f8f635 100644 --- a/patches/server/Build-system-changes.patch +++ b/patches/server/Build-system-changes.patch @@ -17,7 +17,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - } + implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") // Paper + implementation("org.apache.logging.log4j:log4j-api:2.14.1") // Paper -+ implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.14.1") // Paper implementation("org.ow2.asm:asm:9.1") implementation("com.googlecode.json-simple:json-simple:1.1.1") { // This includes junit transitively for whatever reason diff --git a/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch index d60f00fc4..dbf473026 100644 --- a/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch @@ -40,7 +40,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") // Paper implementation("org.apache.logging.log4j:log4j-api:2.14.1") // Paper - implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.14.1") // Paper + implementation("org.ow2.asm:asm:9.1") diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java new file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000