diff options
Diffstat (limited to 'patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch')
| -rw-r--r-- | patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch index 2d91782dbb..97e1f14851 100644 --- a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -25,10 +25,10 @@ Other changes: Co-Authored-By: Emilia Kond <[email protected]> diff --git a/build.gradle.kts b/build.gradle.kts -index 94dfc105b197c9eda481cbe90bb48b71c845e702..86d62bc710d8794adebb60c82d82406a9cf54cb5 100644 +index 94dfc105b197c9eda481cbe90bb48b71c845e702..e5a897eaea50252b92fba674daf5d43c9c11d196 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -5,9 +5,30 @@ plugins { +@@ -5,9 +5,35 @@ plugins { `maven-publish` } @@ -42,8 +42,13 @@ index 94dfc105b197c9eda481cbe90bb48b71c845e702..86d62bc710d8794adebb60c82d82406a implementation(project(":paper-api")) - implementation("jline:jline:2.12.1") + // Paper start -+ //implementation("org.jline:jline-terminal-ffm:3.26.1") TODO: Investigate if this is broken with java 21 -+ implementation("org.jline:jline-terminal-jni:3.26.1") ++ // TODO: Look into these ++ //implementation("org.jline:jline-terminal-ffm:3.26.1") // Investigate if this is broken with java 21 ++ //implementation("org.jline:jline-terminal-jni:3.26.1") // check behavior of this in windows... ++ implementation("org.jline:jline-terminal-jansi:3.21.0") { ++ exclude("org.fusesource.jansi", "jansi") // J21 already bundles and even sometimes installs its own jansi ++ } ++ + implementation("net.minecrell:terminalconsoleappender:1.3.0") + implementation("net.kyori:adventure-text-serializer-ansi:4.17.0") // Keep in sync with adventureVersion from Paper-API build file + /* @@ -60,7 +65,7 @@ index 94dfc105b197c9eda481cbe90bb48b71c845e702..86d62bc710d8794adebb60c82d82406a implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion implementation("org.ow2.asm:asm-commons:9.7") implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files -@@ -78,6 +99,19 @@ tasks.check { +@@ -78,6 +104,19 @@ tasks.check { dependsOn(scanJar) } // Paper end |