diff --git a/patches/server/0047-Make-the-GUI-better.patch b/patches/server/0047-Make-the-GUI-better.patch index 2762b9b09..9031122ec 100644 --- a/patches/server/0047-Make-the-GUI-better.patch +++ b/patches/server/0047-Make-the-GUI-better.patch @@ -1,10 +1,10 @@ -From d9d93f9f020802a8d08bc42879814775142b39e1 Mon Sep 17 00:00:00 2001 +From d226ac792c3774445ba8565c1a0a14ad789a84c9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 16 Jan 2020 14:59:16 -0600 Subject: [PATCH] Make the GUI better --- - .../net/minecraft/server/DedicatedServer.java | 6 +- + .../net/minecraft/server/DedicatedServer.java | 8 +- .../net/minecraft/server/MinecraftServer.java | 1 + .../java/net/pl3x/purpur/gui/ServerGUI.java | 123 +++++++++++++++ .../purpur/gui/console/JColorTextPane.java | 81 ++++++++++ @@ -22,7 +22,7 @@ Subject: [PATCH] Make the GUI better .../net/pl3x/purpur/gui/util/GUIColor.java | 54 +++++++ .../purpur/util/HighlightErrorConverter.java | 86 +++++++++++ src/main/resources/log4j2.xml | 13 +- - 18 files changed, 1002 insertions(+), 5 deletions(-) + 18 files changed, 1003 insertions(+), 6 deletions(-) create mode 100644 src/main/java/net/pl3x/purpur/gui/ServerGUI.java create mode 100644 src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java create mode 100644 src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java @@ -40,7 +40,7 @@ Subject: [PATCH] Make the GUI better create mode 100644 src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 8c7156bb52..5337c0be08 100644 +index 8c7156bb52..0d69c06c44 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -51,7 +51,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -52,6 +52,15 @@ index 8c7156bb52..5337c0be08 100644 // CraftBukkit start - Signature changed public DedicatedServer(joptsimple.OptionSet options, DedicatedServerSettings dedicatedserversettings, DataFixer datafixer, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory, String s) { +@@ -87,7 +87,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer + return; + } + // Paper start - Use TerminalConsoleAppender +- new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start(); ++ try { new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start(); } catch (Exception ignore) {} // Purpur + /* + jline.console.ConsoleReader bufferedreader = reader; + @@ -421,7 +421,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @Override public void exit() {