More 1.14 work

Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index 51cefc0a1b..2b73ec28a1 100644
+index 099d7218c..108c8c05e 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -75,7 +75,7 @@ index 51cefc0a1b..2b73ec28a1 100644
                  <groupId>org.apache.maven.plugins</groupId>
 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 0000000000..688b4715eb
+index 000000000..688b4715e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -0,0 +0,0 @@
@@ -121,7 +121,7 @@ index 0000000000..688b4715eb
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 new file mode 100644
-index 0000000000..685deaa0e5
+index 000000000..685deaa0e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 @@ -0,0 +0,0 @@
@@ -143,7 +143,7 @@ index 0000000000..685deaa0e5
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 4e9ef43b45..5bb1ea880a 100644
+index 19e2df309..3d0cb874d 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -178,14 +178,14 @@ index 4e9ef43b45..5bb1ea880a 100644
 @@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
          }
  
-         new Thread(new org.bukkit.craftbukkit.util.TerminalConsoleWriterThread(System.out, this.reader)).start();
+         new org.bukkit.craftbukkit.util.TerminalConsoleWriterThread(System.out, this.reader).start();
 +        */
 +        // Paper end
  
          System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
          System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index db511c1fe8..c6ecdf6e8e 100644
+index 2d5e340ee..dc6d7b3a2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ import org.apache.commons.lang3.Validate;
@@ -193,20 +193,21 @@ index db511c1fe8..c6ecdf6e8e 100644
  import org.apache.logging.log4j.Logger;
  // CraftBukkit start
 -import jline.console.ConsoleReader;
- import joptsimple.OptionSet;
++import joptsimple.OptionSet;
  import org.bukkit.Bukkit;
  import org.bukkit.craftbukkit.CraftServer;
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
+ import org.bukkit.craftbukkit.Main;
+@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      public OptionSet options;
      public org.bukkit.command.ConsoleCommandSender console;
      public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
 -    public ConsoleReader reader;
 +    //public ConsoleReader reader; // Paper
      public static int currentTick = 0; // Paper - Further improve tick loop
-     public boolean serverAutoSave = false; // Paper
-     public final Thread primaryThread;
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
-         this.ac.a((IResourcePackListener) this.al);
+     public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
+     public int autosavePeriod;
+@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+         this.K = s;
          // CraftBukkit start
          this.options = options;
 +        // Paper start - Handled by TerminalConsoleAppender
@@ -215,16 +216,16 @@ index db511c1fe8..c6ecdf6e8e 100644
          if (System.console() == null && System.getProperty("jline.terminal") == null) {
              System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
              Main.useJline = false;
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
+@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  LOGGER.warn((String) null, ex);
              }
          }
 +        */
 +        // Paper end
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
- 
-         this.serverThread = primaryThread = new Thread(this, "Server thread"); // Moved from main
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
+     }
+     // CraftBukkit end
+@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              } finally {
                  // CraftBukkit start - Restore terminal to original settings
                  try {
@@ -233,23 +234,23 @@ index db511c1fe8..c6ecdf6e8e 100644
                  } catch (Exception ignored) {
                  }
                  // CraftBukkit end
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
-     }
+@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
+     @Override
      public void sendMessage(IChatBaseComponent ichatbasecomponent) {
 -        MinecraftServer.LOGGER.info(ichatbasecomponent.getString());
 +        MinecraftServer.LOGGER.info(org.bukkit.craftbukkit.util.CraftChatMessage.fromComponent(ichatbasecomponent, net.minecraft.server.EnumChatFormat.WHITE));// Paper - Log message with colors
      }
  
-     public KeyPair E() {
+     public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 9d44dcb3b2..8bb3fef21e 100644
+index 46a3f0751..52b2f4874 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
  
-     public PlayerList(MinecraftServer minecraftserver) {
-         this.cserver = minecraftserver.server = new CraftServer(minecraftserver, this);
+     public PlayerList(MinecraftServer minecraftserver, int i) {
+         this.cserver = minecraftserver.server = new CraftServer((DedicatedServer) minecraftserver, this);
 -        minecraftserver.console = org.bukkit.craftbukkit.command.ColouredConsoleSender.getInstance();
 -        minecraftserver.reader.addCompleter(new org.bukkit.craftbukkit.command.ConsoleCommandCompleter(minecraftserver.server));
 +        minecraftserver.console = new com.destroystokyo.paper.console.TerminalConsoleCommandSender(); // Paper
@@ -257,19 +258,17 @@ index 9d44dcb3b2..8bb3fef21e 100644
  
          this.k = new GameProfileBanList(PlayerList.a);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 962170cd3f..7e4f42b3f4 100644
+index b2aee24e5..2bdbc939e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -0,0 +0,0 @@ import java.nio.ByteBuffer;
- import java.nio.charset.StandardCharsets;
- import java.util.Base64;
- import java.util.HashMap;
+@@ -0,0 +0,0 @@ import java.util.function.Consumer;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+ import javax.imageio.ImageIO;
 -import jline.console.ConsoleReader;
- import org.bukkit.Keyed;
-+import org.apache.commons.lang.StringUtils;
- import org.bukkit.NamespacedKey;
- import org.bukkit.block.data.BlockData;
- import org.bukkit.craftbukkit.block.data.CraftBlockData;
+ import net.minecraft.server.Advancement;
+ import net.minecraft.server.ArgumentEntity;
+ import net.minecraft.server.Block;
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {
          return logger;
      }
@@ -285,7 +284,7 @@ index 962170cd3f..7e4f42b3f4 100644
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 472a8070e7..4102e19700 100644
+index 5203e781e..e3d163ac4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -0,0 +0,0 @@ import java.util.logging.Logger;
@@ -324,10 +323,10 @@ index 472a8070e7..4102e19700 100644
 +                    System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
                  }
  
-                 if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
+                 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 deleted file mode 100644
-index 26a2fb8942..0000000000
+index fdf2f075e..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 +++ /dev/null
 @@ -0,0 +0,0 @@
@@ -335,15 +334,13 @@ index 26a2fb8942..0000000000
 -
 -import java.util.EnumMap;
 -import java.util.Map;
--
--import org.fusesource.jansi.Ansi;
--import org.fusesource.jansi.Ansi.Attribute;
 -import jline.Terminal;
--
 -import org.bukkit.Bukkit;
 -import org.bukkit.ChatColor;
 -import org.bukkit.command.ConsoleCommandSender;
 -import org.bukkit.craftbukkit.CraftServer;
+-import org.fusesource.jansi.Ansi;
+-import org.fusesource.jansi.Ansi.Attribute;
 -
 -public class ColouredConsoleSender extends CraftConsoleCommandSender {
 -    private final Terminal terminal;
@@ -406,14 +403,17 @@ index 26a2fb8942..0000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 33e8ea02c4..1e3aae3b8f 100644
+index 48d4dc7e2..24f4a16a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-@@ -0,0 +0,0 @@ import java.util.logging.Level;
+@@ -0,0 +0,0 @@ import java.util.Collections;
+ import java.util.List;
+ import java.util.concurrent.ExecutionException;
+ import java.util.logging.Level;
+-import jline.console.completer.Completer;
  import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.craftbukkit.util.Waitable;
- 
--import jline.console.completer.Completer;
++
 +// Paper start - JLine update
 +import net.minecraft.server.DedicatedServer; // Paper
 +import org.jline.reader.Candidate;
@@ -452,9 +452,8 @@ index 33e8ea02c4..1e3aae3b8f 100644
              if (offers == null) {
 -                return cursor;
 +                return; // Paper - Method returns void
-             }
--            candidates.addAll(offers);
- 
++            }
++
 +            // Paper start - JLine update
 +            for (String completion : offers) {
 +                if (completion.isEmpty()) {
@@ -462,9 +461,10 @@ index 33e8ea02c4..1e3aae3b8f 100644
 +                }
 +
 +                candidates.add(new Candidate(completion));
-+            }
+             }
+-            candidates.addAll(offers);
 +            // Paper end
-+
+ 
 +            // Paper start - JLine handles cursor now
 +            /*
              final int lastSpace = buffer.lastIndexOf(' ');
@@ -485,11 +485,11 @@ index 33e8ea02c4..1e3aae3b8f 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 984df4083d..bbb5a84f36 100644
+index 70f8d4299..449e99d1b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -0,0 +0,0 @@ public class ServerShutdownThread extends Thread {
-             ex.printStackTrace();
+             server.close();
          } finally {
              try {
 -                server.reader.getTerminal().restore();
@@ -499,29 +499,31 @@ index 984df4083d..bbb5a84f36 100644
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 deleted file mode 100644
-index b640971130..0000000000
+index f239cd623..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
 @@ -0,0 +0,0 @@
 -package org.bukkit.craftbukkit.util;
 -
+-import com.mojang.util.QueueLogAppender;
 -import java.io.IOException;
 -import java.io.OutputStream;
 -import java.util.logging.Level;
 -import java.util.logging.Logger;
 -import jline.console.ConsoleReader;
--import com.mojang.util.QueueLogAppender;
 -import org.bukkit.craftbukkit.Main;
 -import org.fusesource.jansi.Ansi;
 -import org.fusesource.jansi.Ansi.Erase;
 -
--public class TerminalConsoleWriterThread implements Runnable {
--    final private ConsoleReader reader;
--    final private OutputStream output;
+-public class TerminalConsoleWriterThread extends Thread {
+-    private final ConsoleReader reader;
+-    private final OutputStream output;
 -
 -    public TerminalConsoleWriterThread(OutputStream output, ConsoleReader reader) {
 -        this.output = output;
 -        this.reader = reader;
+-
+-        this.setDaemon(true);
 -    }
 -
 -    public void run() {
@@ -558,7 +560,7 @@ index b640971130..0000000000
 -    }
 -}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 5cee8f00ef..08b6bb7f97 100644
+index 490a9acc7..08b6bb7f9 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -0,0 +0,0 @@
@@ -568,7 +570,7 @@ index 5cee8f00ef..08b6bb7f97 100644
      <Appenders>
 -        <Console name="WINDOWS_COMPAT" target="SYSTEM_OUT"></Console>
 -        <Queue name="TerminalConsole">
--            <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />
+-            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
 -        </Queue>
 +        <TerminalConsole name="TerminalConsole">
 +            <PatternLayout pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}" />