From 36b617c5be09f1bfddb772edd97a479e122956bf Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Tue, 31 Dec 2024 17:42:31 +0800 Subject: [PATCH] Fix patch conflict --- .../0053-Leaves-Fix-color-in-console.patch | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/patches/server/0053-Leaves-Fix-color-in-console.patch b/patches/server/0053-Leaves-Fix-color-in-console.patch index e9ddfdd..b3d1d96 100644 --- a/patches/server/0053-Leaves-Fix-color-in-console.patch +++ b/patches/server/0053-Leaves-Fix-color-in-console.patch @@ -1,15 +1,19 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: violetc <58360096+s-yh-china@users.noreply.github.com> -Date: Sat, 28 Dec 2024 02:44:49 +0800 +From: MrHua269 +Date: Tue, 31 Dec 2024 17:40:41 +0800 Subject: [PATCH] Leaves Fix color in console + diff --git a/build.gradle.kts b/build.gradle.kts -index f2eb3b2eb2ad6a3c41f6ad84497fc65f22823f32..b07ccf91b3f6d967c5617dba54b6d38823039e6d 100644 +index fbf51f738e98ac6e8358a7fa81b7fc545469a5a6..6e1a9ee0ebea5c313d568ac276db1f38476681e2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -30,7 +30,7 @@ dependencies { - implementation("org.jline:jline-terminal-ffm:3.27.1") - implementation("org.jline:jline-terminal-jni:3.27.1") +@@ -33,7 +33,7 @@ dependencies { + implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ + implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 implementation("net.minecrell:terminalconsoleappender:1.3.0") -- implementation("net.kyori:adventure-text-serializer-ansi:4.17.0") -+ implementation("net.kyori:adventure-text-serializer-ansi:4.18.0") +- implementation("net.kyori:adventure-text-serializer-ansi:4.17.0") // Keep in sync with adventureVersion from Paper-API build file ++ implementation("net.kyori:adventure-text-serializer-ansi:4.18.0") // Keep in sync with adventureVersion from Paper-API build file // Leaves - Fix color in console + /* + Required to add the missing Log4j2Plugins.dat file from log4j-core + which has been removed by Mojang. Without it, log4j has to classload