Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
9f5fadcc Remove extraneous space from host info log message
d60a10c9 Make the GUI graph fancier (#2928)
ecfaff52 Revert "Add root/admin user detection (#2432)"
555ca59a Add root/admin user detection (#2432)
This commit is contained in:
William Blake Galbreath
2020-02-20 14:21:00 -06:00
parent 4e5bf94149
commit 3128db0d14
4 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: e1f3b6d033...9f5fadcc7c

2
current-paper
View File

@@ -1 +1 @@
1.15.2--9b7af8fccbac13605f5fcc2c1c9a892ebf04a11a 1.15.2--6044fe49f38f1debb785226934d54904c9f20ea5

17
patches/server/0045-Make-the-GUI-better.patch
View File

@@ -1,11 +1,11 @@
From 173ce1c2cd411d405ca0553c9de78bff5106e163 Mon Sep 17 00:00:00 2001 From 43a61e65f5512ca6f1ce1cf2cf8f261f0572edf3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 16 Jan 2020 14:59:16 -0600 Date: Thu, 16 Jan 2020 14:59:16 -0600
Subject: [PATCH] Make the GUI better Subject: [PATCH] Make the GUI better
--- ---
.../net/minecraft/server/DedicatedServer.java | 6 +- .../net/minecraft/server/DedicatedServer.java | 6 +-
.../net/minecraft/server/MinecraftServer.java | 3 +- .../net/minecraft/server/MinecraftServer.java | 1 +
.../java/net/pl3x/purpur/gui/ServerGUI.java | 123 ++++++++++++++++ .../java/net/pl3x/purpur/gui/ServerGUI.java | 123 ++++++++++++++++
.../purpur/gui/console/JColorTextPane.java | 81 ++++++++++ .../purpur/gui/console/JColorTextPane.java | 81 ++++++++++
.../purpur/gui/console/JConsolePanel.java | 128 ++++++++++++++++ .../purpur/gui/console/JConsolePanel.java | 128 ++++++++++++++++
@@ -22,7 +22,7 @@ Subject: [PATCH] Make the GUI better
.../net/pl3x/purpur/gui/util/GUIColor.java | 54 +++++++ .../net/pl3x/purpur/gui/util/GUIColor.java | 54 +++++++
.../purpur/util/HighlightErrorConverter.java | 86 +++++++++++ .../purpur/util/HighlightErrorConverter.java | 86 +++++++++++
src/main/resources/log4j2.xml | 13 +- src/main/resources/log4j2.xml | 13 +-
18 files changed, 992 insertions(+), 6 deletions(-) 18 files changed, 991 insertions(+), 5 deletions(-)
create mode 100644 src/main/java/net/pl3x/purpur/gui/ServerGUI.java 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/JColorTextPane.java
create mode 100644 src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java create mode 100644 src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java
@@ -71,18 +71,9 @@ index d70c8cab2b..61ccb6079e 100644
} }
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index ac45dbf59b..cfe3157f08 100644 index b31a9ac78c..f939f56d96 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -105,7 +105,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
private String motd;
private int G;
private int H;
- public final long[] f = new long[100];
+ public final long[] f = new long[100]; public long[] getTickTimes() { return f; } // Purpur
@Nullable
private KeyPair I;
@Nullable
@@ -1291,6 +1291,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas @@ -1291,6 +1291,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
return true; return true;
} }

18
patches/server/0049-Add-tick-times-API.patch
View File

@@ -1,27 +1,13 @@
From 798b004067acc01d53ca9e280aaff55c30d65a09 Mon Sep 17 00:00:00 2001 From bf3abc994c3bb517ccdfeab7bb69fb25c39ff5e3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:24 -0600 Date: Thu, 30 Jan 2020 00:41:24 -0600
Subject: [PATCH] Add tick times API Subject: [PATCH] Add tick times API
--- ---
.../net/minecraft/server/MinecraftServer.java | 2 +-
.../org/bukkit/craftbukkit/CraftServer.java | 17 +++++++++++++++++ .../org/bukkit/craftbukkit/CraftServer.java | 17 +++++++++++++++++
.../org/spigotmc/TicksPerSecondCommand.java | 11 +++++++++++ .../org/spigotmc/TicksPerSecondCommand.java | 11 +++++++++++
3 files changed, 29 insertions(+), 1 deletion(-) 2 files changed, 28 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index cfe3157f08..7a0deeba70 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -105,7 +105,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
private String motd;
private int G;
private int H;
- public final long[] f = new long[100]; public long[] getTickTimes() { return f; } // Purpur
+ public final long[] f = new long[100]; public long[] getTickTimes() { return f; } // Purpur - OBFHELPER
@Nullable
private KeyPair I;
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index df4fb5947a..206fd848ad 100644 index df4fb5947a..206fd848ad 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java