From c1846b3cb5f40fe08be8832824a02390811b37cc Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 13 Mar 2020 20:14:23 -0500 Subject: [PATCH] Add /mspt command --- patches/server/0047-Make-the-GUI-better.patch | 23 ++-- patches/server/0051-Add-tick-times-API.patch | 114 +++++++++++------- .../0053-Implement-lagging-threshold.patch | 16 +-- .../server/0059-Bring-back-server-name.patch | 6 +- ...0073-Add-5-second-tps-average-in-tps.patch | 20 +-- .../0095-UPnP-Port-Forwarding-Service.patch | 12 +- patches/server/0106-Add-mspt-command.patch | 103 ++++++++++++++++ 7 files changed, 212 insertions(+), 82 deletions(-) create mode 100644 patches/server/0106-Add-mspt-command.patch diff --git a/patches/server/0047-Make-the-GUI-better.patch b/patches/server/0047-Make-the-GUI-better.patch index f0ed69fef..2762b9b09 100644 --- a/patches/server/0047-Make-the-GUI-better.patch +++ b/patches/server/0047-Make-the-GUI-better.patch @@ -1,4 +1,4 @@ -From fe907eb13ca2c2ad64be766bf0579149385f1caa Mon Sep 17 00:00:00 2001 +From d9d93f9f020802a8d08bc42879814775142b39e1 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 @@ -11,7 +11,7 @@ Subject: [PATCH] Make the GUI better .../purpur/gui/console/JConsolePanel.java | 128 ++++++++++++++++ .../gui/info/DetailsListSelectionModel.java | 21 +++ .../net/pl3x/purpur/gui/info/JInfoPanel.java | 42 +++++ - .../net/pl3x/purpur/gui/info/RAMDetails.java | 54 +++++++ + .../net/pl3x/purpur/gui/info/RAMDetails.java | 59 +++++++ .../purpur/gui/info/graph/GraphColor.java | 44 ++++++ .../pl3x/purpur/gui/info/graph/GraphData.java | 47 ++++++ .../pl3x/purpur/gui/info/graph/RAMGraph.java | 144 ++++++++++++++++++ @@ -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, 997 insertions(+), 5 deletions(-) + 18 files changed, 1002 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/console/JColorTextPane.java create mode 100644 src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java @@ -461,7 +461,7 @@ index 0000000000..4e0b80fddb +} diff --git a/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java new file mode 100644 -index 0000000000..a4983863cb +index 0000000000..c4903c7db6 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java @@ -0,0 +1,42 @@ @@ -485,7 +485,7 @@ index 0000000000..a4983863cb + setOpaque(false); + + ramGraph = new RAMGraph(); -+ RAMDetails ramDetails = new RAMDetails(); ++ RAMDetails ramDetails = new RAMDetails(server); + + add(ramGraph, "North"); + add(ramDetails, "Center"); @@ -509,12 +509,13 @@ index 0000000000..a4983863cb +} diff --git a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java new file mode 100644 -index 0000000000..00f79e4336 +index 0000000000..1e049d575b --- /dev/null +++ b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java -@@ -0,0 +1,54 @@ +@@ -0,0 +1,59 @@ +package net.pl3x.purpur.gui.info; + ++import net.minecraft.server.MinecraftServer; +import net.minecraft.server.SystemUtils; +import net.pl3x.purpur.gui.info.graph.GraphData; +import net.pl3x.purpur.gui.info.graph.RAMGraph; @@ -533,7 +534,11 @@ index 0000000000..00f79e4336 + private static final DecimalFormat DECIMAL_FORMAT = SystemUtils.a(new DecimalFormat("########0.000"), (format) + -> format.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ROOT))); + -+ public RAMDetails() { ++ private final MinecraftServer server; ++ ++ public RAMDetails(MinecraftServer server) { ++ this.server = server; ++ + setBorder(new EmptyBorder(0, 10, 0, 0)); + setFixedCellHeight(20); + setOpaque(false); @@ -555,7 +560,7 @@ index 0000000000..00f79e4336 + Vector vector = new Vector<>(); + vector.add("Memory use: " + (data.getUsedMem() / 1024L / 1024L) + " mb (" + (data.getFree() * 100L / data.getMax()) + "% free)"); + vector.add("Heap: " + (data.getTotal() / 1024L / 1024L) + " / " + (data.getMax() / 1024L / 1024L) + " mb"); -+ vector.add("Avg tick: " + DECIMAL_FORMAT.format(Bukkit.getAverageTickTime()) + " ms"); ++ vector.add("Avg tick: " + DECIMAL_FORMAT.format(server.tickTimes5s.getAverage()) + " ms"); + setListData(vector); + } + diff --git a/patches/server/0051-Add-tick-times-API.patch b/patches/server/0051-Add-tick-times-API.patch index 1827e1ce9..e41635e78 100644 --- a/patches/server/0051-Add-tick-times-API.patch +++ b/patches/server/0051-Add-tick-times-API.patch @@ -1,18 +1,78 @@ -From 21ca478f39f276054b80bcdccb4ca5d3a893f2c4 Mon Sep 17 00:00:00 2001 +From c38297ba3c2cb464c63bce271ae3ab538915645c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 30 Jan 2020 00:41:24 -0600 Subject: [PATCH] Add tick times API --- - .../org/bukkit/craftbukkit/CraftServer.java | 17 +++++++++++++++++ - .../org/spigotmc/TicksPerSecondCommand.java | 11 +++++++++++ - 2 files changed, 28 insertions(+) + .../net/minecraft/server/MinecraftServer.java | 37 +++++++++++++++++++ + .../org/bukkit/craftbukkit/CraftServer.java | 12 ++++++ + 2 files changed, 49 insertions(+) +diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java +index f2a8af48df..0889cef15d 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -106,6 +106,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant= 50 ? ChatColor.RED : avg >= 40 ? ChatColor.YELLOW : ChatColor.GREEN).toString(); -+ } -+ // Purpur end -+ - private static String format(double tps) // Paper - Made static - { - return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString() -- 2.24.0 diff --git a/patches/server/0053-Implement-lagging-threshold.patch b/patches/server/0053-Implement-lagging-threshold.patch index ff5795140..30d7acddc 100644 --- a/patches/server/0053-Implement-lagging-threshold.patch +++ b/patches/server/0053-Implement-lagging-threshold.patch @@ -1,4 +1,4 @@ -From 10ce56cc3d93e77525baca1cca9803817f105a98 Mon Sep 17 00:00:00 2001 +From 001bc8e16f69116a1854b1aa9998899694d4cb6b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 23 Jul 2019 10:07:16 -0500 Subject: [PATCH] Implement lagging threshold @@ -10,10 +10,10 @@ Subject: [PATCH] Implement lagging threshold 3 files changed, 12 insertions(+) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f2a8af48df..625227f078 100644 +index 0889cef15d..2d7f1bae7a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -178,6 +178,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sun, 26 May 2019 15:19:14 -0500 Subject: [PATCH] Bring back server name @@ -21,7 +21,7 @@ index 0c3ec83570..309f5562b8 100644 public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true); public final boolean pvp = this.getBoolean("pvp", true); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index dc48cdbd05..017cd567d9 100644 +index 7104f58fb2..7a2dfb6bc9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2235,6 +2235,11 @@ public final class CraftServer implements Server { @@ -35,7 +35,7 @@ index dc48cdbd05..017cd567d9 100644 + @Override public long[] getTickTimes() { - return getServer().getTickTimes().clone(); + return getServer().tickTimes5s.getTimes(); -- 2.24.0 diff --git a/patches/server/0073-Add-5-second-tps-average-in-tps.patch b/patches/server/0073-Add-5-second-tps-average-in-tps.patch index ad606dd8a..f04b362d0 100644 --- a/patches/server/0073-Add-5-second-tps-average-in-tps.patch +++ b/patches/server/0073-Add-5-second-tps-average-in-tps.patch @@ -1,4 +1,4 @@ -From b0197dd760ea6e8a241c459b0806962de265026b Mon Sep 17 00:00:00 2001 +From 71472017de7ffbf0967cd33fa100d722f773778a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 28 Jul 2019 01:27:37 -0500 Subject: [PATCH] Add 5 second tps average in /tps @@ -10,10 +10,10 @@ Subject: [PATCH] Add 5 second tps average in /tps 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 625227f078..b98efe3268 100644 +index 2d7f1bae7a..ec6ddbb9cf 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -177,7 +177,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 22 Jan 2020 20:13:40 -0600 Subject: [PATCH] UPnP Port Forwarding Service @@ -78,10 +78,10 @@ index 5337c0be08..757f892e8f 100644 // this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up server.loadPlugins(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b98efe3268..9af75a8ae8 100644 +index ec6ddbb9cf..5d28185248 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -181,6 +181,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant +Date: Fri, 13 Mar 2020 22:23:44 -0500 +Subject: [PATCH] Add /mspt command + +--- + .../java/net/pl3x/purpur/PurpurConfig.java | 2 + + .../net/pl3x/purpur/command/MSPTCommand.java | 63 +++++++++++++++++++ + 2 files changed, 65 insertions(+) + create mode 100644 src/main/java/net/pl3x/purpur/command/MSPTCommand.java + +diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +index a18333ad6c..63a91e7b7a 100644 +--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java ++++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +@@ -2,6 +2,7 @@ package net.pl3x.purpur; + + import com.google.common.base.Throwables; + import net.minecraft.server.MinecraftServer; ++import net.pl3x.purpur.command.MSPTCommand; + import org.bukkit.Bukkit; + import org.bukkit.command.Command; + import org.bukkit.configuration.InvalidConfigurationException; +@@ -53,6 +54,7 @@ public class PurpurConfig { + + commands = new HashMap<>(); + commands.put("purpur", new PurpurCommand("purpur")); ++ commands.put("mspt", new MSPTCommand("mspt")); + + version = getInt("config-version", 4); + set("config-version", 4); +diff --git a/src/main/java/net/pl3x/purpur/command/MSPTCommand.java b/src/main/java/net/pl3x/purpur/command/MSPTCommand.java +new file mode 100644 +index 0000000000..941dbf0863 +--- /dev/null ++++ b/src/main/java/net/pl3x/purpur/command/MSPTCommand.java +@@ -0,0 +1,63 @@ ++package net.pl3x.purpur.command; ++ ++import com.google.common.collect.ImmutableList; ++import net.minecraft.server.MinecraftServer; ++import org.bukkit.ChatColor; ++import org.bukkit.command.CommandSender; ++import org.bukkit.command.defaults.BukkitCommand; ++ ++import java.util.List; ++ ++public class MSPTCommand extends BukkitCommand { ++ private static final java.text.DecimalFormat DF = new java.text.DecimalFormat("########0.0"); ++ ++ public MSPTCommand(String name) { ++ super(name); ++ ++ this.description = "Gets the average tick time (mspt)"; ++ this.usageMessage = "/mspt"; ++ this.setPermission("bukkit.command.mspt"); ++ } ++ ++ @Override ++ public List tabComplete(CommandSender sender, String alias, String[] args) { ++ return ImmutableList.of(); ++ } ++ ++ @Override ++ public boolean execute(CommandSender sender, String currentAlias, String[] args) { ++ if (!testPermission(sender)) { ++ return true; ++ } ++ ++ MinecraftServer server = MinecraftServer.getServer(); ++ ++ sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&6Server tick times &e(&7avg&e/&7min&e/&7max&e)&6 from last 5s&7,&6 10s&7,&6 1m&e:")); ++ sender.sendMessage(ChatColor.translateAlternateColorCodes('&', String.format("&6\u25F4 %s&e, %s&e, %s", ++ eval(server.tickTimes5s.getTimes()), ++ eval(server.tickTimes10s.getTimes()), ++ eval(server.tickTimes60s.getTimes())))); ++ return true; ++ } ++ ++ public static String eval(long[] times) { ++ long min = Integer.MAX_VALUE; ++ long max = 0L; ++ long total = 0L; ++ for (long value : times) { ++ if (value > 0L && value < min) min = value; ++ if (value > max) max = value; ++ total += value; ++ } ++ double avgD = ((double) total / (double) times.length) * 1.0E-6D; ++ double minD = ((double) min) * 1.0E-6D; ++ double maxD = ((double) max) * 1.0E-6D; ++ return getColor(avgD) + DF.format(avgD) + "&7/" + ++ getColor(minD) + DF.format(minD) + "&7/" + ++ getColor(maxD) + DF.format(maxD); ++ } ++ ++ private static String getColor(double avg) { ++ return avg >= 50 ? "&c" : avg >= 40 ? "&e" : "&a"; ++ } ++} +-- +2.24.0 +