geforkt von Mirrors/Paper
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
Dieser Commit ist enthalten in:
Ursprung
32f6f4a8cd
Commit
edc8a389fc
@ -154,6 +154,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+import com.mojang.brigadier.ParseResults;
|
+import com.mojang.brigadier.ParseResults;
|
||||||
+import com.mojang.brigadier.context.ParsedCommandNode;
|
+import com.mojang.brigadier.context.ParsedCommandNode;
|
||||||
+import com.mojang.brigadier.tree.LiteralCommandNode;
|
+import com.mojang.brigadier.tree.LiteralCommandNode;
|
||||||
|
+import java.util.regex.Pattern;
|
||||||
+import net.minecraft.commands.CommandSourceStack;
|
+import net.minecraft.commands.CommandSourceStack;
|
||||||
+import net.minecraft.server.dedicated.DedicatedServer;
|
+import net.minecraft.server.dedicated.DedicatedServer;
|
||||||
+import org.checkerframework.checker.nullness.qual.NonNull;
|
+import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
@ -205,6 +206,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ }
|
+ }
|
||||||
+ return builder.toAttributedString();
|
+ return builder.toAttributedString();
|
||||||
+ }
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public void setErrorPattern(final Pattern errorPattern) {}
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public void setErrorIndex(final int errorIndex) {}
|
||||||
+}
|
+}
|
||||||
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
@ -19,8 +19,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
implementation(project(":Paper-API"))
|
implementation(project(":Paper-API"))
|
||||||
+ implementation(project(":Paper-MojangAPI"))
|
+ implementation(project(":Paper-MojangAPI"))
|
||||||
// Paper start
|
// Paper start
|
||||||
implementation("org.jline:jline-terminal-jansi:3.12.1")
|
implementation("org.jline:jline-terminal-jansi:3.21.0")
|
||||||
implementation("net.minecrell:terminalconsoleappender:1.2.0")
|
implementation("net.minecrell:terminalconsoleappender:1.3.0")
|
||||||
diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
|
diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
|
--- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
|
||||||
|
@ -28,8 +28,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
implementation(project(":Paper-API"))
|
implementation(project(":Paper-API"))
|
||||||
- implementation("jline:jline:2.12.1")
|
- implementation("jline:jline:2.12.1")
|
||||||
+ // Paper start
|
+ // Paper start
|
||||||
+ implementation("org.jline:jline-terminal-jansi:3.12.1")
|
+ implementation("org.jline:jline-terminal-jansi:3.21.0")
|
||||||
+ implementation("net.minecrell:terminalconsoleappender:1.2.0")
|
+ implementation("net.minecrell:terminalconsoleappender:1.3.0")
|
||||||
+ /*
|
+ /*
|
||||||
+ Required to add the missing Log4j2Plugins.dat file from log4j-core
|
+ Required to add the missing Log4j2Plugins.dat file from log4j-core
|
||||||
+ which has been removed by Mojang. Without it, log4j has to classload
|
+ which has been removed by Mojang. Without it, log4j has to classload
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren