Skip to content

Commit bc43f40

Browse files
Update jline and TCA (#6829)
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com> updates jline to 3.21.0, and TCA to 1.3.0
1 parent 3f043f7 commit bc43f40

3 files changed

+18
-11
lines changed

patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Other changes:
1919
configuration
2020

2121
diff --git a/build.gradle.kts b/build.gradle.kts
22-
index 1f4c0f2156c588fcbb3b0329a416dc20a4b355a8..9b70376813531718c02082633e9f8105f4879a63 100644
22+
index 1f4c0f2156c588fcbb3b0329a416dc20a4b355a8..ba7f0c199c60c062d399586e5c9a0d3da8ddb013 100644
2323
--- a/build.gradle.kts
2424
+++ b/build.gradle.kts
2525
@@ -16,7 +16,17 @@ repositories {
@@ -28,8 +28,8 @@ index 1f4c0f2156c588fcbb3b0329a416dc20a4b355a8..9b70376813531718c02082633e9f8105
2828
implementation(project(":Paper-API"))
2929
- implementation("jline:jline:2.12.1")
3030
+ // Paper start
31-
+ implementation("org.jline:jline-terminal-jansi:3.12.1")
32-
+ implementation("net.minecrell:terminalconsoleappender:1.2.0")
31+
+ implementation("org.jline:jline-terminal-jansi:3.21.0")
32+
+ implementation("net.minecrell:terminalconsoleappender:1.3.0")
3333
+ /*
3434
+ Required to add the missing Log4j2Plugins.dat file from log4j-core
3535
+ which has been removed by Mojang. Without it, log4j has to classload
@@ -230,7 +230,7 @@ index 7d834c1b1588851188372eebd9efad9313c610f7..967552df9d5ae7e58bb39127e1adb51b
230230
System.setOut(IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream());
231231
System.setErr(IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream());
232232
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
233-
index 24add1cd1f865012c5382548e415218d481ecefe..31dccb0b4ab60d6cedf236fc7d51a363c8367d71 100644
233+
index 71991aee0d60299f744c896075502d1b436b3e44..0eea43c994e76b466fdda8ecd145d0b1c9273cea 100644
234234
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
235235
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
236236
@@ -154,8 +154,7 @@ public abstract class PlayerList {

patches/server/0422-Implement-Brigadier-Mojang-API.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Adds CommandRegisteredEvent
1010
- Allows manipulating the CommandNode to add more children/metadata for the client
1111

1212
diff --git a/build.gradle.kts b/build.gradle.kts
13-
index c981944f4a5d40ec14ade9aaa22041887a317e1f..2c39461ce531cfa8fc0aa6928e0de819640b0553 100644
13+
index 24465fa59dd9eeff82ad620731fadcb19910aa4e..053e65679dd44f3d1c669ef560f07554af09086b 100644
1414
--- a/build.gradle.kts
1515
+++ b/build.gradle.kts
1616
@@ -16,6 +16,7 @@ repositories {
@@ -19,8 +19,8 @@ index c981944f4a5d40ec14ade9aaa22041887a317e1f..2c39461ce531cfa8fc0aa6928e0de819
1919
implementation(project(":Paper-API"))
2020
+ implementation(project(":Paper-MojangAPI"))
2121
// Paper start
22-
implementation("org.jline:jline-terminal-jansi:3.12.1")
23-
implementation("net.minecrell:terminalconsoleappender:1.2.0")
22+
implementation("org.jline:jline-terminal-jansi:3.21.0")
23+
implementation("net.minecrell:terminalconsoleappender:1.3.0")
2424
diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
2525
index 880fc9fea286384d002518137972935fdf1d2d72..a59d14e61fcbca7861a5593d0717b81262ccbdc5 100644
2626
--- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
@@ -81,7 +81,7 @@ index 07c4d909324c8aad3a8c5d27811e2c28fe7a91f3..96a33f63024c1f72ab018e1590450583
8181
event.getPlayer().getServer().getPluginManager().callEvent(event);
8282

8383
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
84-
index f585cd4f4682a9d2a6ebc2367a32995d8660d591..11d9e22c9ef64db62528da73066de8c118565054 100644
84+
index 9fc196ada8dc3b9b9a8f3f35ac6b07c949ce2339..3071053aa9c6a9abc2af50b3c370a408cddbac85 100644
8585
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8686
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8787
@@ -759,8 +759,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

patches/server/0649-Enhance-console-tab-completions-for-brigadier-comman.patch

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Enhance console tab completions for brigadier commands
55

66

77
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
8-
index 5af9d91e15b0c10da79fa935cc884cd2766edfae..6c4bb838792c779da7b2d84831f6e67779695993 100644
8+
index 4e824a87b463a417c204a9ee188450bdd9f4fbc2..ef1e6e898b3cb9d012b2cf24aedffea4afce8a38 100644
99
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
1010
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
1111
@@ -500,4 +500,11 @@ public class PaperConfig {
@@ -145,15 +145,16 @@ index 0000000000000000000000000000000000000000..d3f80b5dcd366c5b8a48cb885d825d24
145145
+}
146146
diff --git a/src/main/java/io/papermc/paper/console/BrigadierCommandHighlighter.java b/src/main/java/io/papermc/paper/console/BrigadierCommandHighlighter.java
147147
new file mode 100644
148-
index 0000000000000000000000000000000000000000..f33e9376bd166ebdb3d9f8c7467cd923ea0aadeb
148+
index 0000000000000000000000000000000000000000..5ab8365b806dd035800ba9b449c9bc9233772d13
149149
--- /dev/null
150150
+++ b/src/main/java/io/papermc/paper/console/BrigadierCommandHighlighter.java
151-
@@ -0,0 +1,57 @@
151+
@@ -0,0 +1,64 @@
152152
+package io.papermc.paper.console;
153153
+
154154
+import com.mojang.brigadier.ParseResults;
155155
+import com.mojang.brigadier.context.ParsedCommandNode;
156156
+import com.mojang.brigadier.tree.LiteralCommandNode;
157+
+import java.util.regex.Pattern;
157158
+import net.minecraft.commands.CommandSourceStack;
158159
+import net.minecraft.server.dedicated.DedicatedServer;
159160
+import org.checkerframework.checker.nullness.qual.NonNull;
@@ -205,6 +206,12 @@ index 0000000000000000000000000000000000000000..f33e9376bd166ebdb3d9f8c7467cd923
205206
+ }
206207
+ return builder.toAttributedString();
207208
+ }
209+
+
210+
+ @Override
211+
+ public void setErrorPattern(final Pattern errorPattern) {}
212+
+
213+
+ @Override
214+
+ public void setErrorIndex(final int errorIndex) {}
208215
+}
209216
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
210217
index 67afb97e6cb545d319202f3eca771015065089f6..0300390025c3f5461ef5f379c1710a58de164117 100644

0 commit comments

Comments
 (0)