Upgrade TPSBar

2026-02-17 16:37:43 +01:00 · 2021-07-14 19:11:04 -05:00
parent 4626edf67b
commit 9d553d3327
37 changed files with 287 additions and 174 deletions
--- a/patches/server/0003-Purpur-config-files.patch
+++ b/patches/server/0003-Purpur-config-files.patch
@@ -29,7 +29,7 @@ index 3918b24c98faa5232c7ffd733ba8000562132785..4d8740678049aa749b42618470e9cc83
                 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                     Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 98b71384508447adc80c2175f8e35e5d86b0c378..4f49a0b2bb22b95503c3f6a0b304f287ee9048ae 100644
+index f101302892a7f95ffa0e6d63cb69d8a3ddbd67a7..a8d99549afbfbb0cbb45dd9dc278315e5ae5ea9d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -118,6 +118,11 @@ public class PaperConfig {
@@ -123,19 +123,21 @@ index 61a4dea715689b0ce9247040db5dd2080ee2e167..ffe76b8afd2a2c3153751c73ee7bbf4c
         this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..fcf5f32c32eb17f7580b3c8c9190e36725f793ad
+index 0000000000000000000000000000000000000000..d0d87fcca78ea5c7853d693bc617c2bd6cfed487
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -0,0 +1,157 @@
+@@ -0,0 +1,159 @@
 +package net.pl3x.purpur;
 +
 +import co.aikar.timings.TimingsManager;
 +import com.google.common.base.Throwables;
 +import com.google.common.collect.ImmutableMap;
+import net.kyori.adventure.bossbar.BossBar;
 +import net.minecraft.server.MinecraftServer;
 +import net.minecraft.world.entity.EntityDimensions;
 +import net.minecraft.world.entity.EntityType;
 +import net.pl3x.purpur.command.PurpurCommand;
+import net.pl3x.purpur.task.TPSBarTask;
 +import org.bukkit.Bukkit;
 +import org.bukkit.command.Command;
 +import org.bukkit.configuration.ConfigurationSection;
@@ -456,7 +458,7 @@ index 0000000000000000000000000000000000000000..6e7f56fe2b78d7a09d5d130f2c88338f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ce46da5d75049ad2ec2db677569e35f13960dafa..5a9e6b904893be6782a50b89582e6a8e7e3ef7e7 100644
+index a173b6b0e49bec5d0b0d15384526cb261000bf33..b018082b7703b07285a0ba4717f25da9c57cfbfc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -876,6 +876,7 @@ public final class CraftServer implements Server {
@@ -503,7 +505,7 @@ index ce46da5d75049ad2ec2db677569e35f13960dafa..5a9e6b904893be6782a50b89582e6a8e
         public void restart() {
             org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index c59deadcfbfd5afbf951a167979a4eceb0c63579..a335d1689ebf01e0e96a45c640188dc024610e2c 100644
+index b153a8c9e7fdf5560148f02ba2f52c37ad3b5ace..0242b57665fd93644366d1cb00ea008b00c54503 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -154,6 +154,14 @@ public class Main {
--- a/patches/server/0005-Ridables.patch
+++ b/patches/server/0005-Ridables.patch
@@ -4526,10 +4526,10 @@ index 37356b36f0ae12d55150f399318581fa77c30cee..4e667be589fd95eb61e57a99448939a9
 
     Projectile(EntityType<? extends Projectile> type, Level world) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index fcf5f32c32eb17f7580b3c8c9190e36725f793ad..d92812cb334b590b728afb828dae61da483d8d56 100644
+index d0d87fcca78ea5c7853d693bc617c2bd6cfed487..773e42ff93e01b9f2db41dc4e8273525c5c162dc 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -154,4 +154,9 @@ public class PurpurConfig {
+@@ -156,4 +156,9 @@ public class PurpurConfig {
         }
         return builder.build();
     }
--- a/patches/server/0007-Timings-stuff.patch
+++ b/patches/server/0007-Timings-stuff.patch
@@ -55,10 +55,10 @@ index 9d920565ff65a84b1b9a2a4777fd8bc8f07e0153..69d85e5a0a5ab9ffb682d8565aa08a4a
             String hostName = "BrokenHost";
             try {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d92812cb334b590b728afb828dae61da483d8d56..e381ff1767b1ef2275ed112c27c491a3671b5039 100644
+index 773e42ff93e01b9f2db41dc4e8273525c5c162dc..9949089f700a402ba5a6e79bf1a9a637d69444e9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -159,4 +159,10 @@ public class PurpurConfig {
+@@ -161,4 +161,10 @@ public class PurpurConfig {
     private static void messages() {
         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
     }
--- a/patches/server/0008-Barrels-and-enderchests-6-rows.patch
+++ b/patches/server/0008-Barrels-and-enderchests-6-rows.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Barrels and enderchests 6 rows


 diff --git a/src/main/java/net/minecraft/world/inventory/ChestMenu.java b/src/main/java/net/minecraft/world/inventory/ChestMenu.java
-index 5d0ed6fb993253672b937c286f493515f2315bd6..0f2e099da820b51e41d7b2e0a4129aca8580aafc 100644
+index e9d9245f7efaaeefc8f107b8016a462ce173816a..56dcc1b6ceaad998be62e3b8c125e8f5e833e4c0 100644
 --- a/src/main/java/net/minecraft/world/inventory/ChestMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/ChestMenu.java
@@ -67,10 +67,30 @@ public class ChestMenu extends AbstractContainerMenu {
@@ -142,10 +142,10 @@ index f494063ead9c6303fb3ca880aba2a877ae8d83ab..3b027111ed933856ae86ad5f62aac744
     }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d2d602eda6f2899f809c31aa1082540e1c7855b9..727d33bd76a3d10f2bbfb07c18fe74860a34f2f7 100644
+index 9949089f700a402ba5a6e79bf1a9a637d69444e9..b0180b1a8ecfd14cb5b95de0145f88dc7354928b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -165,4 +165,23 @@ public class PurpurConfig {
+@@ -167,4 +167,23 @@ public class PurpurConfig {
         timingsUrl = getString("settings.timings.url", timingsUrl);
         if (!co.aikar.timings.TimingsManager.hiddenConfigs.contains("server-ip")) co.aikar.timings.TimingsManager.hiddenConfigs.add("server-ip");
     }
--- a/patches/server/0011-AFK-API.patch
+++ b/patches/server/0011-AFK-API.patch
@@ -177,10 +177,10 @@ index 6a4e44dd8935018d1b5283761dfb8e855be62987..afe70b0d5bd98d05bbb7afc756108f09
                 if (range < 0.0D || d < range * range) {
                     return true;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 0373f3fb256d796c090a3eddcf6e2be0ce25ec16..d35285b58b7141f2e9f438331faf566dc293cc63 100644
+index b0180b1a8ecfd14cb5b95de0145f88dc7354928b..b36ea5fc2259d0d8a5302b9f60172cfea7b89e11 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -156,8 +156,16 @@ public class PurpurConfig {
+@@ -158,8 +158,16 @@ public class PurpurConfig {
     }
 
     public static String cannotRideMob = "<red>You cannot mount that mob";
--- a/patches/server/0013-Configurable-server-mod-name.patch
+++ b/patches/server/0013-Configurable-server-mod-name.patch
@@ -18,10 +18,10 @@ index 2ede76a55c72840d915ed282609b1ca14f549929..7d1c39fec406aca69705db055b6d8f85
 
     public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d35285b58b7141f2e9f438331faf566dc293cc63..b21554baf77e9ac1edf2e91ecaf1d5c089939e90 100644
+index b36ea5fc2259d0d8a5302b9f60172cfea7b89e11..96e4e31cc3718ded522006b8dd8e9e36b6b2e74d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -168,6 +168,11 @@ public class PurpurConfig {
+@@ -170,6 +170,11 @@ public class PurpurConfig {
         afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix);
     }
 
--- a/patches/server/0015-Lagging-threshold.patch
+++ b/patches/server/0015-Lagging-threshold.patch
@@ -25,10 +25,10 @@ index 7d1c39fec406aca69705db055b6d8f859142c986..53d429eec63448f5e30ffb7026d49579
                     }
                     // Tuinity - replace logic
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index b21554baf77e9ac1edf2e91ecaf1d5c089939e90..2697188c7e18cf5ae11e6e96a3dab95192470ac1 100644
+index 96e4e31cc3718ded522006b8dd8e9e36b6b2e74d..e027b5a2d0cc094c0cac2c1ca16e3d9693374384 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -179,6 +179,11 @@ public class PurpurConfig {
+@@ -181,6 +181,11 @@ public class PurpurConfig {
         if (!co.aikar.timings.TimingsManager.hiddenConfigs.contains("server-ip")) co.aikar.timings.TimingsManager.hiddenConfigs.add("server-ip");
     }
 
@@ -41,7 +41,7 @@ index b21554baf77e9ac1edf2e91ecaf1d5c089939e90..2697188c7e18cf5ae11e6e96a3dab951
     public static boolean enderChestSixRows = false;
     public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 641269f5e2a9e4a254449818e99eae9cf6ae866d..0c63bb38dd3e088fd4e5d232713c86649f77e9c9 100644
+index 1751003e4181d29dd2fdda250964c085f5172967..cbf3817adb3c4a0dd818898f886d21e74d662a47 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2559,5 +2559,10 @@ public final class CraftServer implements Server {
--- a/patches/server/0022-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0022-Alternative-Keepalive-Handling.patch
@@ -56,10 +56,10 @@ index 77a0ad0ab7291f50e8d3bf864595a0f52a4114bf..f4e4ca801a585b8c0335cc3c59f1278d
         if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
             int i = (int) (Util.getMillis() - this.keepAliveTime);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 2697188c7e18cf5ae11e6e96a3dab95192470ac1..32520a38274224361a24c3b2fdc92af65a0164da 100644
+index e027b5a2d0cc094c0cac2c1ca16e3d9693374384..403c996c44b9afbc4236966940f39ca51a476e3d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -184,6 +184,11 @@ public class PurpurConfig {
+@@ -186,6 +186,11 @@ public class PurpurConfig {
         laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
     }
 
--- a/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch
+++ b/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch
@@ -17,10 +17,10 @@ index 7d6dc0a8ee35274052b122bbc446bc54750de0a6..c46df052a5a39d92688f51377ee1f7b5
                             }
                             // CraftBukkit end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 772fe2509cf2e421b2e9279e6b159e95cf8fc4ae..e425f660e93db4186a9d0ef3f43137667d5ecd4f 100644
+index 403c996c44b9afbc4236966940f39ca51a476e3d..0f94bcb6e728f4ad365ed5a51d7562182ad1031d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -207,4 +207,11 @@ public class PurpurConfig {
+@@ -209,4 +209,11 @@ public class PurpurConfig {
         org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
     }
--- a/patches/server/0033-Dont-send-useless-entity-packets.patch
+++ b/patches/server/0033-Dont-send-useless-entity-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont send useless entity packets


 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 2f3e69ad809199ffc2661d524bb627ec8dbc2e80..dc821e0565be38171922546208423613b7682de8 100644
+index 0fcd6a9162f5bddb3c4fc42b3a64efde7c7d9a9b..b7116c40b22c4c614ba74232a18c216da8cba94c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -188,6 +188,7 @@ public class ServerEntity {
@@ -40,10 +40,10 @@ index 2f3e69ad809199ffc2661d524bb627ec8dbc2e80..dc821e0565be38171922546208423613
         this.entity.stopSeenByPlayer(player);
         player.connection.send(new ClientboundRemoveEntitiesPacket(new int[]{this.entity.getId()}));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index be5f68ac35d364b07eddb549bc43a14137258d40..297c3d4427cfff2355f7ec5b276b4273584a56ac 100644
+index 0f94bcb6e728f4ad365ed5a51d7562182ad1031d..f01f3628894a9491ef03c662feee49ccdf871519 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -208,6 +208,11 @@ public class PurpurConfig {
+@@ -210,6 +210,11 @@ public class PurpurConfig {
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
     }
 
--- a/patches/server/0056-Configurable-TPS-Catchup.patch
+++ b/patches/server/0056-Configurable-TPS-Catchup.patch
@@ -24,10 +24,10 @@ index 53d429eec63448f5e30ffb7026d49579264bd705..c96feac8afa0e0ea05513692d1e937ae
                     this.profiler.pop();
                     this.endMetricsRecordingTick();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 297c3d4427cfff2355f7ec5b276b4273584a56ac..0ae18dfbd6ea05737cd456762da32efe3a51aef8 100644
+index f01f3628894a9491ef03c662feee49ccdf871519..66745b2c1c38391779abb496933c74466379aef2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -219,4 +219,9 @@ public class PurpurConfig {
+@@ -221,4 +221,9 @@ public class PurpurConfig {
         loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError);
         loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
     }
--- a/patches/server/0073-Add-ping-command.patch
+++ b/patches/server/0073-Add-ping-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ping command


 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index d478627dcd2b6e3d3d95b3fa224a25d44e6bbafb..158fc5748f175708a0c3415a2217663f77271bc7 100644
+index 59881c845cc88508736cc3d2a61860512d28964d..3a1e1ff3c9154db6b1b23d1898c8e6ec198f103f 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -198,6 +198,7 @@ public class Commands {
@@ -17,10 +17,10 @@ index d478627dcd2b6e3d3d95b3fa224a25d44e6bbafb..158fc5748f175708a0c3415a2217663f
 
         if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 0ae18dfbd6ea05737cd456762da32efe3a51aef8..a8c969b1a88df7f4c3cbee4df1d8f581ae2a549d 100644
+index 66745b2c1c38391779abb496933c74466379aef2..cf3d30f19a6184686ea224e976dd14dfab5db101 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -160,12 +160,14 @@ public class PurpurConfig {
+@@ -162,12 +162,14 @@ public class PurpurConfig {
     public static String afkBroadcastBack = "<yellow><italic>%s is no longer AFK";
     public static String afkTabListPrefix = "[AFK] ";
     public static String afkTabListSuffix = "";
--- a/patches/server/0074-Add-demo-command.patch
+++ b/patches/server/0074-Add-demo-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add demo command


 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 158fc5748f175708a0c3415a2217663f77271bc7..9cbaaf4cd138e6c1d2d51afcef24a81a3f2973c5 100644
+index 3a1e1ff3c9154db6b1b23d1898c8e6ec198f103f..880efd832a2029bdb7a404e27797b316cbbe5703 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -198,6 +198,7 @@ public class Commands {
@@ -17,10 +17,10 @@ index 158fc5748f175708a0c3415a2217663f77271bc7..9cbaaf4cd138e6c1d2d51afcef24a81a
         }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index a8c969b1a88df7f4c3cbee4df1d8f581ae2a549d..5bd68aed7f5d31bbdc057e4b63026b37061a7983 100644
+index cf3d30f19a6184686ea224e976dd14dfab5db101..2f5ee21b94c3f0fbe1febf0b8878b35aef88dae0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -160,6 +160,7 @@ public class PurpurConfig {
+@@ -162,6 +162,7 @@ public class PurpurConfig {
     public static String afkBroadcastBack = "<yellow><italic>%s is no longer AFK";
     public static String afkTabListPrefix = "[AFK] ";
     public static String afkTabListSuffix = "";
@@ -28,7 +28,7 @@ index a8c969b1a88df7f4c3cbee4df1d8f581ae2a549d..5bd68aed7f5d31bbdc057e4b63026b37
     public static String pingCommandOutput = "<green>%s's ping is %sms";
     private static void messages() {
         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
-@@ -167,6 +168,7 @@ public class PurpurConfig {
+@@ -169,6 +170,7 @@ public class PurpurConfig {
         afkBroadcastBack = getString("settings.messages.afk-broadcast-back", afkBroadcastBack);
         afkTabListPrefix = getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix);
         afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix);
--- a/patches/server/0075-Add-credits-command.patch
+++ b/patches/server/0075-Add-credits-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add credits command


 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 9cbaaf4cd138e6c1d2d51afcef24a81a3f2973c5..f164106a957c24bdb71bde85d82948a64613fd91 100644
+index 880efd832a2029bdb7a404e27797b316cbbe5703..a5712108fbbe5ddc61cdfd390f667ab013ba609d 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -198,6 +198,7 @@ public class Commands {
@@ -17,10 +17,10 @@ index 9cbaaf4cd138e6c1d2d51afcef24a81a3f2973c5..f164106a957c24bdb71bde85d82948a6
             net.pl3x.purpur.command.PingCommand.register(this.dispatcher); // Purpur
         }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 5bd68aed7f5d31bbdc057e4b63026b37061a7983..d7f43f4be2e38febb9ff7b67a319316c40929416 100644
+index 2f5ee21b94c3f0fbe1febf0b8878b35aef88dae0..4950ade071fb401326aeb4075f5a2a5ab65d4d52 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -160,6 +160,7 @@ public class PurpurConfig {
+@@ -162,6 +162,7 @@ public class PurpurConfig {
     public static String afkBroadcastBack = "<yellow><italic>%s is no longer AFK";
     public static String afkTabListPrefix = "[AFK] ";
     public static String afkTabListSuffix = "";
@@ -28,7 +28,7 @@ index 5bd68aed7f5d31bbdc057e4b63026b37061a7983..d7f43f4be2e38febb9ff7b67a319316c
     public static String demoCommandOutput = "<green>%s has been shown the demo screen";
     public static String pingCommandOutput = "<green>%s's ping is %sms";
     private static void messages() {
-@@ -168,6 +169,7 @@ public class PurpurConfig {
+@@ -170,6 +171,7 @@ public class PurpurConfig {
         afkBroadcastBack = getString("settings.messages.afk-broadcast-back", afkBroadcastBack);
         afkTabListPrefix = getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix);
         afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix);
--- a/patches/server/0081-Add-allow-water-in-end-world-option.patch
+++ b/patches/server/0081-Add-allow-water-in-end-world-option.patch
@@ -68,10 +68,10 @@ index df4f2c729f09d5229553308e4876f29de648543f..f2b0278679fa649bbc2904660e0dc9ab
         } else {
             world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState());
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d7f43f4be2e38febb9ff7b67a319316c40929416..3836bde09be67c0ee8678937bed99fbb881773e9 100644
+index 4950ade071fb401326aeb4075f5a2a5ab65d4d52..86f4f92ee15fa2320da0a75bb515e711315aa3a9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -219,6 +219,11 @@ public class PurpurConfig {
+@@ -221,6 +221,11 @@ public class PurpurConfig {
         dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
     }
 
--- a/patches/server/0086-Configurable-feature-seed-settings.patch
+++ b/patches/server/0086-Configurable-feature-seed-settings.patch
@@ -835,10 +835,10 @@ index ed3944a60d09495eb424dd11d00e8c3585177d51..fcf25cc905ece0213a0eb6365a0a5756
             return false;
         } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 3836bde09be67c0ee8678937bed99fbb881773e9..4e928dd1efdd7e1f71a5c5adb3a287eb0463e077 100644
+index 86f4f92ee15fa2320da0a75bb515e711315aa3a9..85f323b2b1be900ee1d7416b5dd9877bbb282460 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -174,6 +174,128 @@ public class PurpurConfig {
+@@ -176,6 +176,128 @@ public class PurpurConfig {
         pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
     }
 
--- a/patches/server/0092-Add-option-to-disable-certain-block-updates.patch
+++ b/patches/server/0092-Add-option-to-disable-certain-block-updates.patch
@@ -117,10 +117,10 @@ index f8e58d9f71703139a736d93e7f1996e027a29444..d3c8fd8399629efb8bcbaf7d9a0c4334
     }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 4e928dd1efdd7e1f71a5c5adb3a287eb0463e077..23d1352ae9d740ab02c5020802ef56a3a11cf832 100644
+index 85f323b2b1be900ee1d7416b5dd9877bbb282460..7e1b039569888c00125dd2a99c066556f3482329 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -346,6 +346,15 @@ public class PurpurConfig {
+@@ -348,6 +348,15 @@ public class PurpurConfig {
         allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
     }
 
--- a/patches/server/0097-Short-enderman-height.patch
+++ b/patches/server/0097-Short-enderman-height.patch
@@ -31,10 +31,10 @@ index 6e0b5fbf5b0d216b6b7c647d45ef37cd6b591717..5ebedd6a156b06e98aded57c817f6342
             if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
             for (int i = 0; i < 64; ++i) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 23d1352ae9d740ab02c5020802ef56a3a11cf832..f1b349454cb78e5e49061bf26fc2f801802a5526 100644
+index 7e1b039569888c00125dd2a99c066556f3482329..d762ef0e90a519528f3dd48b0587f57888deff64 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -336,6 +336,12 @@ public class PurpurConfig {
+@@ -338,6 +338,12 @@ public class PurpurConfig {
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
     }
 
--- a/patches/server/0100-Crying-obsidian-valid-for-portal-frames.patch
+++ b/patches/server/0100-Crying-obsidian-valid-for-portal-frames.patch
@@ -18,10 +18,10 @@ index c07b5d1f1ef8b5e6026c7555d476880c8802d6c5..068f1b184a3694603f564d49fa45d5ce
     private final LevelAccessor level;
     private final Direction.Axis axis;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f1b349454cb78e5e49061bf26fc2f801802a5526..ab10cade5e290fc479f7a6b5905a639bc24ef596 100644
+index d762ef0e90a519528f3dd48b0587f57888deff64..208324d9a197eb763f4f5d08e60f0ca23066a7e1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -320,6 +320,7 @@ public class PurpurConfig {
+@@ -322,6 +322,7 @@ public class PurpurConfig {
     public static boolean barrelSixRows = false;
     public static boolean enderChestSixRows = false;
     public static boolean enderChestPermissionRows = false;
@@ -29,7 +29,7 @@ index f1b349454cb78e5e49061bf26fc2f801802a5526..ab10cade5e290fc479f7a6b5905a639b
     private static void blockSettings() {
         if (version < 3) {
             boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -334,6 +335,7 @@ public class PurpurConfig {
+@@ -336,6 +337,7 @@ public class PurpurConfig {
         enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
         org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
--- a/patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch
+++ b/patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch
@@ -17,10 +17,10 @@ index 3aece8245060dd1ba269c08d226c84247a6f0a83..6763d0b96c83d1b462999f525bf1f31c
     }
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index ab10cade5e290fc479f7a6b5905a639bc24ef596..e17c0c2dd3dc2f21cd039a37302e2c103efba2e0 100644
+index 208324d9a197eb763f4f5d08e60f0ca23066a7e1..16d48e442396be56996ebf64fd8a299122b56544 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -338,6 +338,16 @@ public class PurpurConfig {
+@@ -340,6 +340,16 @@ public class PurpurConfig {
         cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
     }
 
--- a/patches/server/0133-EMC-Configurable-disable-give-dropping.patch
+++ b/patches/server/0133-EMC-Configurable-disable-give-dropping.patch
@@ -20,10 +20,10 @@ index a0dc380e90415de9068ea408d62a1605c82631df..60fd566f7e1499ecf2ad91216a667f12
                         itemStack.setCount(1);
                         ItemEntity itemEntity2 = serverPlayer.drop(itemStack, false, false, true); // Paper - Fix duplicating /give items on item drop cancel
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e17c0c2dd3dc2f21cd039a37302e2c103efba2e0..00a5c65439a30499156a10b1822760fe48ee7776 100644
+index 16d48e442396be56996ebf64fd8a299122b56544..e1701ab4bd6eccb9a525fa3eb8b35a1bf6f7ffcd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -317,6 +317,11 @@ public class PurpurConfig {
+@@ -319,6 +319,11 @@ public class PurpurConfig {
         useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
     }
 
--- a/patches/server/0142-Implement-TPSBar.patch
+++ b/patches/server/0142-Implement-TPSBar.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement TPSBar


 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index f164106a957c24bdb71bde85d82948a64613fd91..bef1f6ca54fc6c1741b54b8e071a90eb5e3a36f3 100644
+index a5712108fbbe5ddc61cdfd390f667ab013ba609d..73953ea69776bfe1dcb1504cd14a0f003f1b5766 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -201,6 +201,7 @@ public class Commands {
@@ -54,6 +54,38 @@ index 29043f9354b29f7766f1d6d8e793e2ea23883fa0..5141185821c798cb20f7936d7927d225
         ServerLevel worldserver = entityplayer.getLevel();
 
         entityplayer.awardStat(Stats.LEAVE_GAME);
+diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
+index e1701ab4bd6eccb9a525fa3eb8b35a1bf6f7ffcd..e66c05541ff1f25346af60255d17542305cc3a9f 100644
+--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
+@@ -324,6 +324,27 @@ public class PurpurConfig {
+         disableGiveCommandDrops = getBoolean("settings.disable-give-dropping", disableGiveCommandDrops);
+     }
+ 
+    public static String commandTPSBarTitle = "<gray>TPS<white>:</white> <tps> MSPT<white>:</white> <mspt> Ping<white>:</white> <ping><white>ms</white>";
+    public static BossBar.Overlay commandTPSBarProgressOverlay = BossBar.Overlay.NOTCHED_20;
+    public static TPSBarTask.FillMode commandTPSBarProgressFillMode = TPSBarTask.FillMode.MSPT;
+    public static BossBar.Color commandTPSBarProgressColorGood = BossBar.Color.GREEN;
+    public static BossBar.Color commandTPSBarProgressColorMedium = BossBar.Color.YELLOW;
+    public static BossBar.Color commandTPSBarProgressColorLow = BossBar.Color.RED;
+    public static String commandTPSBarTextColorGood = "<gradient:#55ff55:#00aa00><text></gradient>";
+    public static String commandTPSBarTextColorMedium = "<gradient:#ffff55:#ffaa00><text></gradient>";
+    public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
+    private static void commandSettings() {
+        commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
+        commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
+        commandTPSBarProgressFillMode = TPSBarTask.FillMode.valueOf(getString("settings.command.tpsbar.fill-mode", commandTPSBarProgressFillMode.name()));
+        commandTPSBarProgressColorGood = BossBar.Color.valueOf(getString("settings.command.tpsbar.progress-color.good", commandTPSBarProgressColorGood.name()));
+        commandTPSBarProgressColorMedium = BossBar.Color.valueOf(getString("settings.command.tpsbar.progress-color.medium", commandTPSBarProgressColorMedium.name()));
+        commandTPSBarProgressColorLow = BossBar.Color.valueOf(getString("settings.command.tpsbar.progress-color.low", commandTPSBarProgressColorLow.name()));
+        commandTPSBarTextColorGood = getString("settings.command.tpsbar.text-color.good", commandTPSBarTextColorGood);
+        commandTPSBarTextColorMedium = getString("settings.command.tpsbar.text-color.medium", commandTPSBarTextColorMedium);
+        commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
+    }
+
+     public static boolean barrelSixRows = false;
+     public static boolean enderChestSixRows = false;
+     public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/net/pl3x/purpur/command/TPSBarCommand.java b/src/main/java/net/pl3x/purpur/command/TPSBarCommand.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..2803a1b95121fbff3066fd2d1abaf8723386781f
@@ -86,30 +118,32 @@ index 0000000000000000000000000000000000000000..2803a1b95121fbff3066fd2d1abaf872
 +}
 diff --git a/src/main/java/net/pl3x/purpur/task/TPSBarTask.java b/src/main/java/net/pl3x/purpur/task/TPSBarTask.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..a9d71d2b769b8e4e0f5039e997fc5ebc1cc9bfbb
+index 0000000000000000000000000000000000000000..12ba7e8a31de9610ca2468a59a28d3f963c5b8f3
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/task/TPSBarTask.java
-@@ -0,0 +1,116 @@
+@@ -0,0 +1,183 @@
 +package net.pl3x.purpur.task;
 +
+import net.kyori.adventure.bossbar.BossBar;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.Template;
+import net.pl3x.purpur.PurpurConfig;
 +import org.bukkit.Bukkit;
-+import org.bukkit.ChatColor;
-+import org.bukkit.NamespacedKey;
-+import org.bukkit.boss.BarColor;
-+import org.bukkit.boss.BarStyle;
-+import org.bukkit.boss.BossBar;
 +import org.bukkit.craftbukkit.scheduler.MinecraftInternalPlugin;
 +import org.bukkit.entity.Player;
 +import org.bukkit.scheduler.BukkitRunnable;
 +
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+
 +public class TPSBarTask extends BukkitRunnable {
 +    private static TPSBarTask instance;
-+    private final NamespacedKey key;
-+    private BossBar bossbar;
-+
-+    private TPSBarTask() {
-+        this.key = new NamespacedKey("purpur", "tpsbar");
-+    }
+    private final Map<UUID, BossBar> bossbars = new HashMap<>();
+    private double tps = 20.0D;
+    private double mspt = 0.0D;
 +
 +    private static TPSBarTask instance() {
 +        if (instance == null) {
@@ -118,80 +152,141 @@ index 0000000000000000000000000000000000000000..a9d71d2b769b8e4e0f5039e997fc5ebc
 +        return instance;
 +    }
 +
-+    private BossBar bossbar() {
-+        if (bossbar == null) {
-+            bossbar = Bukkit.getBossBar(key);
-+            if (bossbar == null) {
-+                bossbar = Bukkit.createBossBar(key, "TPS: 20.0", BarColor.RED, BarStyle.SEGMENTED_20);
-+            }
-+            bossbar.setVisible(true);
-+            bossbar.setProgress(1.0D);
-+        }
-+        return bossbar;
-+    }
-+
 +    @Override
 +    public void run() {
-+        BossBar bossbar = bossbar();
-+        if (bossbar.getPlayers().isEmpty()) {
-+            return;
+        this.tps = Math.max(Math.min(Bukkit.getTPS()[0], 20.0D), 0.0D);
+        this.mspt = Bukkit.getAverageTickTime();
+
+        Iterator<Map.Entry<UUID, BossBar>> iter = bossbars.entrySet().iterator();
+        while (iter.hasNext()) {
+            Map.Entry<UUID, BossBar> entry = iter.next();
+            Player player = Bukkit.getPlayer(entry.getKey());
+            if (player == null) {
+                iter.remove();
+                continue;
+            }
+            updateBossBar(entry.getValue(), player);
 +        }
+    }
 +
-+        double tps = Bukkit.getTPS()[0];
-+        if (tps > 20.0D) {
-+            tps = 20.0D;
-+        } else if (tps < 0.0D) {
-+            tps = 0.0D;
-+        }
+    private void updateBossBar(BossBar bossbar, Player player) {
+        bossbar.progress(getBossBarProgress());
+        bossbar.color(getBossBarColor());
+        bossbar.name(MiniMessage.get().parse(PurpurConfig.commandTPSBarTitle,
+                Template.of("tps", getTPSColor()),
+                Template.of("mspt", getMSPTColor()),
+                Template.of("ping", getPingColor(player.getPing()))
+        ));
+    }
 +
-+        bossbar.setVisible(true);
-+        bossbar.setProgress(Math.max(Math.min(tps / 20.0D, 1.0D), 0.0D));
-+
-+        String tpsColor;
-+        if (tps >= 18) {
-+            tpsColor = "&2";
-+            bossbar.setColor(BarColor.GREEN);
-+        } else if (tps >= 15) {
-+            tpsColor = "&e";
-+            bossbar.setColor(BarColor.YELLOW);
+    private float getBossBarProgress() {
+        if (PurpurConfig.commandTPSBarProgressFillMode == FillMode.MSPT) {
+            return Math.max(Math.min((float) mspt / 50.0F, 1.0F), 0.0F);
 +        } else {
-+            tpsColor = "&4";
-+            bossbar.setColor(BarColor.RED);
+            return Math.max(Math.min((float) tps / 20.0F, 1.0F), 0.0F);
 +        }
+    }
 +
-+        double mspt = Bukkit.getAverageTickTime();
-+        String msptColor;
-+        if (mspt < 40) {
-+            msptColor = "&2";
-+        } else if (mspt < 50) {
-+            msptColor = "&e";
+    private BossBar.Color getBossBarColor() {
+        if (isGood(PurpurConfig.commandTPSBarProgressFillMode)) {
+            return PurpurConfig.commandTPSBarProgressColorGood;
+        } else if (isMedium(PurpurConfig.commandTPSBarProgressFillMode)) {
+            return PurpurConfig.commandTPSBarProgressColorMedium;
 +        } else {
-+            msptColor = "&4";
+            return PurpurConfig.commandTPSBarProgressColorLow;
 +        }
+    }
 +
-+        bossbar.setTitle(ChatColor.translateAlternateColorCodes('&', "&eTPS&3: " + tpsColor + String.format("%.2f", tps) + " &eMSPT&3: " + msptColor + String.format("%.3f", mspt)));
+    private boolean isGood(FillMode mode) {
+        return isGood(mode, 0);
+    }
+
+    private boolean isGood(FillMode mode, int ping) {
+        if (mode == FillMode.MSPT) {
+            return mspt < 40;
+        } else if (mode == FillMode.TPS) {
+            return tps >= 19;
+        } else if (mode == FillMode.PING) {
+            return ping < 100;
+        } else {
+            return false;
+        }
+    }
+
+    private boolean isMedium(FillMode mode) {
+        return isMedium(mode, 0);
+    }
+
+    private boolean isMedium(FillMode mode, int ping) {
+        if (mode == FillMode.MSPT) {
+            return mspt < 50;
+        } else if (mode == FillMode.TPS) {
+            return tps >= 15;
+        } else if (mode == FillMode.PING) {
+            return ping < 200;
+        } else {
+            return false;
+        }
+    }
+
+    private Component getTPSColor() {
+        String color;
+        if (isGood(FillMode.TPS)) {
+            color = PurpurConfig.commandTPSBarTextColorGood;
+        } else if (isMedium(FillMode.TPS)) {
+            color = PurpurConfig.commandTPSBarTextColorMedium;
+        } else {
+            color = PurpurConfig.commandTPSBarTextColorLow;
+        }
+        return MiniMessage.get().parse(color, Template.of("text", String.format("%.2f", tps)));
+    }
+
+    private Component getMSPTColor() {
+        String color;
+        if (isGood(FillMode.MSPT)) {
+            color = PurpurConfig.commandTPSBarTextColorGood;
+        } else if (isMedium(FillMode.MSPT)) {
+            color = PurpurConfig.commandTPSBarTextColorMedium;
+        } else {
+            color = PurpurConfig.commandTPSBarTextColorLow;
+        }
+        return MiniMessage.get().parse(color, Template.of("text", String.format("%.2f", mspt)));
+    }
+
+    private Component getPingColor(int ping) {
+        String color;
+        if (isGood(FillMode.PING, ping)) {
+            color = PurpurConfig.commandTPSBarTextColorGood;
+        } else if (isMedium(FillMode.PING, ping)) {
+            color = PurpurConfig.commandTPSBarTextColorMedium;
+        } else {
+            color = PurpurConfig.commandTPSBarTextColorLow;
+        }
+        return MiniMessage.get().parse(color, Template.of("text", String.format("%s", ping)));
 +    }
 +
 +    @Override
 +    public void cancel() {
 +        super.cancel();
-+        BossBar bossbar = bossbar();
-+        bossbar.setVisible(false);
-+        bossbar.removeAll();
-+        Bukkit.removeBossBar(key);
+        this.bossbars.clear();
 +    }
 +
 +    public static void removePlayer(Player player) {
-+        instance().bossbar().removePlayer(player);
+        BossBar bossbar = instance().bossbars.remove(player.getUniqueId());
+        if (bossbar != null) {
+            player.hideBossBar(bossbar);
+        }
 +    }
 +
 +    public static void togglePlayer(Player player) {
-+        BossBar bossbar = instance().bossbar();
-+        if (bossbar.getPlayers().contains(player)) {
-+            bossbar.removePlayer(player);
+        BossBar bossbar = instance().bossbars.remove(player.getUniqueId());
+        if (bossbar != null) {
+            player.hideBossBar(bossbar);
 +        } else {
-+            bossbar.addPlayer(player);
-+            instance.run();
+            bossbar = BossBar.bossBar(Component.text(""), 0.0F, instance().getBossBarColor(), PurpurConfig.commandTPSBarProgressOverlay);
+            instance().bossbars.put(player.getUniqueId(), bossbar);
+            instance().updateBossBar(bossbar, player);
+            player.showBossBar(bossbar);
 +        }
 +    }
 +
@@ -205,4 +300,8 @@ index 0000000000000000000000000000000000000000..a9d71d2b769b8e4e0f5039e997fc5ebc
 +            instance.cancel();
 +        }
 +    }
+
+    public enum FillMode {
+        TPS, MSPT, PING
+    }
 +}
--- a/patches/server/0160-Dont-run-with-scissors.patch
+++ b/patches/server/0160-Dont-run-with-scissors.patch
@@ -23,10 +23,10 @@ index 76c6b0c9b585879d63a232f6633ffd7c72656d0a..600950663c20a096e0923341dbd733ba
                                 this.lastGoodX = this.player.getX();
                                 this.lastGoodY = this.player.getY();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 00a5c65439a30499156a10b1822760fe48ee7776..3b68981645eb70df8828d437411564e88ed88ee0 100644
+index e66c05541ff1f25346af60255d17542305cc3a9f..206d04cae6d94ae8ab816e5ae661dd5133be1996 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -163,6 +163,7 @@ public class PurpurConfig {
+@@ -165,6 +165,7 @@ public class PurpurConfig {
     public static String creditsCommandOutput = "<green>%s has been shown the end credits";
     public static String demoCommandOutput = "<green>%s has been shown the demo screen";
     public static String pingCommandOutput = "<green>%s's ping is %sms";
@@ -34,7 +34,7 @@ index 00a5c65439a30499156a10b1822760fe48ee7776..3b68981645eb70df8828d437411564e8
     private static void messages() {
         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
         afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
-@@ -172,6 +173,7 @@ public class PurpurConfig {
+@@ -174,6 +175,7 @@ public class PurpurConfig {
         creditsCommandOutput = getString("settings.messages.credits-command-output", creditsCommandOutput);
         demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
         pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
--- a/patches/server/0175-Allow-infinity-on-crossbows.patch
+++ b/patches/server/0175-Allow-infinity-on-crossbows.patch
@@ -59,10 +59,10 @@ index 6f6106ca4d74d50a7b74b086adc96c58c7906cb6..d6417c1e77ac8823e18a179dc9f61757
 
     public abstract boolean canEnchant(Item item);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 3b68981645eb70df8828d437411564e88ed88ee0..205c63aa343d814914a34df6b082de28405a9728 100644
+index 206d04cae6d94ae8ab816e5ae661dd5133be1996..dde79e3f066985a9e6c82b2e562c102b06319bd6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -346,6 +346,7 @@ public class PurpurConfig {
+@@ -369,6 +369,7 @@ public class PurpurConfig {
     }
 
     public static boolean allowInfinityMending = false;
@@ -70,7 +70,7 @@ index 3b68981645eb70df8828d437411564e88ed88ee0..205c63aa343d814914a34df6b082de28
     private static void enchantmentSettings() {
         if (version < 5) {
             boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
-@@ -353,6 +354,7 @@ public class PurpurConfig {
+@@ -376,6 +377,7 @@ public class PurpurConfig {
             set("settings.enchantment.allow-infinite-and-mending-together", null);
         }
         allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
--- a/patches/server/0181-Config-to-allow-for-unsafe-enchants.patch
+++ b/patches/server/0181-Config-to-allow-for-unsafe-enchants.patch
@@ -75,10 +75,10 @@ index 18da9a82fb2ca4b9b8d80e37df29c76c8214c37f..e61be8f9a9b26a9daa3f70ec028ed689
         this.getOrCreateTag().put(key, tag);
     }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 205c63aa343d814914a34df6b082de28405a9728..1fc3f6b22fcde88b36759b587e5cf7d2b28ebd30 100644
+index dde79e3f066985a9e6c82b2e562c102b06319bd6..cb81e7a819e64779361e8d325463cab55d57aab4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -347,6 +347,7 @@ public class PurpurConfig {
+@@ -370,6 +370,7 @@ public class PurpurConfig {
 
     public static boolean allowInfinityMending = false;
     public static boolean allowCrossbowInfinity = false;
@@ -86,7 +86,7 @@ index 205c63aa343d814914a34df6b082de28405a9728..1fc3f6b22fcde88b36759b587e5cf7d2
     private static void enchantmentSettings() {
         if (version < 5) {
             boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
-@@ -355,6 +356,7 @@ public class PurpurConfig {
+@@ -378,6 +379,7 @@ public class PurpurConfig {
         }
         allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
         allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity);
--- a/patches/server/0186-Config-to-change-max-number-of-bees.patch
+++ b/patches/server/0186-Config-to-change-max-number-of-bees.patch
@@ -18,10 +18,10 @@ index 8484e80a70129fb0358d56efab6fd54798b54e6e..ffacc4b8cc3ab8285c4131aec58e48ff
     public BeehiveBlockEntity(BlockPos pos, BlockState state) {
         super(BlockEntityType.BEEHIVE, pos, state);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 1fc3f6b22fcde88b36759b587e5cf7d2b28ebd30..71d252353662e6af2d05dad4e093b7930f86c163 100644
+index cb81e7a819e64779361e8d325463cab55d57aab4..56ef4b6f0af80fd0bf10077e7e9c8314bea5a681 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -328,6 +328,7 @@ public class PurpurConfig {
+@@ -351,6 +351,7 @@ public class PurpurConfig {
     public static boolean enderChestSixRows = false;
     public static boolean enderChestPermissionRows = false;
     public static boolean cryingObsidianValidForPortalFrame = false;
@@ -29,7 +29,7 @@ index 1fc3f6b22fcde88b36759b587e5cf7d2b28ebd30..71d252353662e6af2d05dad4e093b793
     private static void blockSettings() {
         if (version < 3) {
             boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -343,6 +344,7 @@ public class PurpurConfig {
+@@ -366,6 +367,7 @@ public class PurpurConfig {
         org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
         cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
--- a/patches/server/0189-Gamemode-extra-permissions.patch
+++ b/patches/server/0189-Gamemode-extra-permissions.patch
@@ -54,21 +54,25 @@ index 79f6089b934124c3309c6bee2e48b36b937252e0..dff8ef0a1a2e52792070d93685c29002
 
         for(ServerPlayer serverPlayer : targets) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 71d252353662e6af2d05dad4e093b7930f86c163..2d01b22bce83431904869b714e77c783aa394533 100644
+index 56ef4b6f0af80fd0bf10077e7e9c8314bea5a681..f0d23f3331ff8ef2797e1cd542d3601f816d3974 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -324,6 +324,11 @@ public class PurpurConfig {
-         disableGiveCommandDrops = getBoolean("settings.disable-give-dropping", disableGiveCommandDrops);
+@@ -335,6 +335,7 @@ public class PurpurConfig {
+     public static String commandTPSBarTextColorGood = "<gradient:#55ff55:#00aa00><text></gradient>";
+     public static String commandTPSBarTextColorMedium = "<gradient:#ffff55:#ffaa00><text></gradient>";
+     public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
+    public static boolean commandGamemodeRequiresPermission = false;
+     private static void commandSettings() {
+         commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
+         commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
+@@ -345,6 +346,7 @@ public class PurpurConfig {
+         commandTPSBarTextColorGood = getString("settings.command.tpsbar.text-color.good", commandTPSBarTextColorGood);
+         commandTPSBarTextColorMedium = getString("settings.command.tpsbar.text-color.medium", commandTPSBarTextColorMedium);
+         commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
+        commandGamemodeRequiresPermission = getBoolean("settings.command.gamemode.requires-specific-permission", commandGamemodeRequiresPermission);
     }
 
-+    public static boolean commandGamemodeRequiresPermission = false;
-+    private static void commandSettings() {
-+        commandGamemodeRequiresPermission = getBoolean("settings.command.gamemode.requires-specific-permission", commandGamemodeRequiresPermission);
-+    }
-+
     public static boolean barrelSixRows = false;
-     public static boolean enderChestSixRows = false;
-     public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
 index 6cc517b394bafefce50d877761e5b2eee8e14c78..46ca899a7abddea108f6ff1b4ca14ca5cd3112ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
--- a/patches/server/0192-Configurable-broadcast-settings.patch
+++ b/patches/server/0192-Configurable-broadcast-settings.patch
@@ -29,10 +29,10 @@ index 19b60f312e5e843964e9549b67109d1b285908ad..6103b81f34e7f2c82a7f4be492888cc7
                 if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
                     this.server.getPlayerList().broadcastToTeam((Player) this, ichatbasecomponent);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 2d01b22bce83431904869b714e77c783aa394533..c558668ba8bfd49b17a9faabe74f62d6972251d5 100644
+index f0d23f3331ff8ef2797e1cd542d3601f816d3974..915a7ef9eb67413ed9db37d91b9c6f5f9f0e2b33 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -176,6 +176,18 @@ public class PurpurConfig {
+@@ -178,6 +178,18 @@ public class PurpurConfig {
         dontRunWithScissors = getString("settings.messages.dont-run-with-scissors", dontRunWithScissors);
     }
 
--- a/patches/server/0195-Hide-hidden-players-from-entity-selector.patch
+++ b/patches/server/0195-Hide-hidden-players-from-entity-selector.patch
@@ -59,15 +59,20 @@ index 0fb8f32427843f4bfd90ab88ecb3ab3e4a4fda31..f99f1ba7f912a2fd503e12c446b342a8
 +    // Purpur end
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index c558668ba8bfd49b17a9faabe74f62d6972251d5..f03bc3f08c2618f4eb3222f8663a3b961dcf56b5 100644
+index 915a7ef9eb67413ed9db37d91b9c6f5f9f0e2b33..b2e3e6fee5268cd25d6ac70c03c1bb60a8c840de 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -337,8 +337,10 @@ public class PurpurConfig {
-     }
- 
+@@ -348,6 +348,7 @@ public class PurpurConfig {
+     public static String commandTPSBarTextColorMedium = "<gradient:#ffff55:#ffaa00><text></gradient>";
+     public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
     public static boolean commandGamemodeRequiresPermission = false;
 +    public static boolean hideHiddenPlayersFromEntitySelector = false;
     private static void commandSettings() {
+         commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
+         commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
+@@ -359,6 +360,7 @@ public class PurpurConfig {
+         commandTPSBarTextColorMedium = getString("settings.command.tpsbar.text-color.medium", commandTPSBarTextColorMedium);
+         commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
         commandGamemodeRequiresPermission = getBoolean("settings.command.gamemode.requires-specific-permission", commandGamemodeRequiresPermission);
 +        hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
     }
--- a/patches/server/0202-Config-for-unverified-username-message.patch
+++ b/patches/server/0202-Config-for-unverified-username-message.patch
@@ -18,10 +18,10 @@ index 45e77d96f673ce68cf15ce3d45fd1eeffed4d8d8..811b48e0b91e2af30a122b72803591e4
                     }
                 } catch (AuthenticationUnavailableException authenticationunavailableexception) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f03bc3f08c2618f4eb3222f8663a3b961dcf56b5..98db9a917c0dc464c1c0efffa4059369208a930d 100644
+index b2e3e6fee5268cd25d6ac70c03c1bb60a8c840de..13b07388f0e24c419a45ec98087572fb358f9d36 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -164,6 +164,7 @@ public class PurpurConfig {
+@@ -166,6 +166,7 @@ public class PurpurConfig {
     public static String demoCommandOutput = "<green>%s has been shown the demo screen";
     public static String pingCommandOutput = "<green>%s's ping is %sms";
     public static String dontRunWithScissors = "<red><italic>Don't run with scissors!";
@@ -29,7 +29,7 @@ index f03bc3f08c2618f4eb3222f8663a3b961dcf56b5..98db9a917c0dc464c1c0efffa4059369
     private static void messages() {
         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
         afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
-@@ -174,6 +175,7 @@ public class PurpurConfig {
+@@ -176,6 +177,7 @@ public class PurpurConfig {
         demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
         pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
         dontRunWithScissors = getString("settings.messages.dont-run-with-scissors", dontRunWithScissors);
--- a/patches/server/0203-Make-anvil-cumulative-cost-configurable.patch
+++ b/patches/server/0203-Make-anvil-cumulative-cost-configurable.patch
@@ -18,10 +18,10 @@ index f380659b261253e327f018ce9b54b15195ad65d7..080449cf3aa0394bd179e26fda8d7248
 
     public void setItemName(String newItemName) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 98db9a917c0dc464c1c0efffa4059369208a930d..c96df4d7ccb61accec8374c8dc820ddacafb3113 100644
+index 13b07388f0e24c419a45ec98087572fb358f9d36..d007b6aa17e62f5716b8a1cbe5096ed493fa3067 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -350,6 +350,7 @@ public class PurpurConfig {
+@@ -370,6 +370,7 @@ public class PurpurConfig {
     public static boolean enderChestPermissionRows = false;
     public static boolean cryingObsidianValidForPortalFrame = false;
     public static int beeInsideBeeHive = 3;
@@ -29,7 +29,7 @@ index 98db9a917c0dc464c1c0efffa4059369208a930d..c96df4d7ccb61accec8374c8dc820dda
     private static void blockSettings() {
         if (version < 3) {
             boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -366,6 +367,7 @@ public class PurpurConfig {
+@@ -386,6 +387,7 @@ public class PurpurConfig {
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
         cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
         beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
--- a/patches/server/0212-Flying-Fall-Damage-API.patch
+++ b/patches/server/0212-Flying-Fall-Damage-API.patch
@@ -26,15 +26,14 @@ index b60e38add38ac58d01f419dcb1b07a9b79bf1cb8..e2b2ee49f9b8220c2de3f26389e78b63
         } else {
             if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c6926c5b521fdfc2913d0f130752aca8ccd5fa63..25aeee5e87094def26bca5710cc355ea11a525a9 100644
+index c6926c5b521fdfc2913d0f130752aca8ccd5fa63..f423b72b11012325f3dd2702eda44bed8aef795f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2590,5 +2590,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2590,5 +2590,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
         getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
     }
 +
-+    @Override
 +    public void setFlyingFallDamage(boolean flyingFallDamage) {
 +        getHandle().flyingFallDamage = flyingFallDamage;
 +    }
--- a/patches/server/0213-Make-lightning-rod-range-configurable.patch
+++ b/patches/server/0213-Make-lightning-rod-range-configurable.patch
@@ -18,10 +18,10 @@ index d682f0b69757b0f4e3120066e25170264ba1f289..cee1f74edf069da54d15b7fc7d10c437
         return optional.map((blockposition1) -> {
             return blockposition1.above(1);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index c96df4d7ccb61accec8374c8dc820ddacafb3113..0b0ed9e5a6625fc270d90fb8fdd0b93897d1507d 100644
+index d007b6aa17e62f5716b8a1cbe5096ed493fa3067..d6725c05968f1e119209d7fd6e3e5503caecb951 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -351,6 +351,7 @@ public class PurpurConfig {
+@@ -371,6 +371,7 @@ public class PurpurConfig {
     public static boolean cryingObsidianValidForPortalFrame = false;
     public static int beeInsideBeeHive = 3;
     public static boolean anvilCumulativeCost = true;
@@ -29,7 +29,7 @@ index c96df4d7ccb61accec8374c8dc820ddacafb3113..0b0ed9e5a6625fc270d90fb8fdd0b938
     private static void blockSettings() {
         if (version < 3) {
             boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -368,6 +369,7 @@ public class PurpurConfig {
+@@ -388,6 +389,7 @@ public class PurpurConfig {
         cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
         beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
         anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
--- a/patches/server/0224-Add-uptime-command.patch
+++ b/patches/server/0224-Add-uptime-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add uptime command


 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index bef1f6ca54fc6c1741b54b8e071a90eb5e3a36f3..84c970ed188509127cd5b4d268a5fa1f9e7eda0b 100644
+index 73953ea69776bfe1dcb1504cd14a0f003f1b5766..528fd87ae1c1c01e13885d88fc8056b0f932fb61 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -201,6 +201,7 @@ public class Commands {
@@ -29,10 +29,10 @@ index 652e596c37bf8d865c954b31ad7d2562b9e95c46..e74ddf6b72dbd335f8a06f05341d5a4d
     public int autosavePeriod;
     public boolean serverAutoSave = false; // Paper
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 0b0ed9e5a6625fc270d90fb8fdd0b93897d1507d..64a719cce811d63f84d5ba5c67549c8caba6ede1 100644
+index d6725c05968f1e119209d7fd6e3e5503caecb951..ae27ecf02b799634bf5d756d2b02ea102d25b249 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -164,6 +164,7 @@ public class PurpurConfig {
+@@ -166,6 +166,7 @@ public class PurpurConfig {
     public static String demoCommandOutput = "<green>%s has been shown the demo screen";
     public static String pingCommandOutput = "<green>%s's ping is %sms";
     public static String dontRunWithScissors = "<red><italic>Don't run with scissors!";
@@ -40,7 +40,7 @@ index 0b0ed9e5a6625fc270d90fb8fdd0b93897d1507d..64a719cce811d63f84d5ba5c67549c8c
     public static String unverifiedUsername = "default";
     private static void messages() {
         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
-@@ -175,6 +176,7 @@ public class PurpurConfig {
+@@ -177,6 +178,7 @@ public class PurpurConfig {
         demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
         pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
         dontRunWithScissors = getString("settings.messages.dont-run-with-scissors", dontRunWithScissors);
@@ -48,8 +48,8 @@ index 0b0ed9e5a6625fc270d90fb8fdd0b93897d1507d..64a719cce811d63f84d5ba5c67549c8c
         unverifiedUsername = getString("settings.messages.unverified-username", unverifiedUsername);
     }
 
-@@ -340,9 +342,27 @@ public class PurpurConfig {
- 
+@@ -351,6 +353,15 @@ public class PurpurConfig {
+     public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
     public static boolean commandGamemodeRequiresPermission = false;
     public static boolean hideHiddenPlayersFromEntitySelector = false;
 +    public static String uptimeFormat = "<days><hours><minutes><seconds>";
@@ -62,6 +62,10 @@ index 0b0ed9e5a6625fc270d90fb8fdd0b93897d1507d..64a719cce811d63f84d5ba5c67549c8c
 +    public static String uptimeSecond = "%02d second";
 +    public static String uptimeSeconds = "%02d seconds";
     private static void commandSettings() {
+         commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
+         commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
+@@ -363,6 +374,15 @@ public class PurpurConfig {
+         commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
         commandGamemodeRequiresPermission = getBoolean("settings.command.gamemode.requires-specific-permission", commandGamemodeRequiresPermission);
         hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
 +        uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
--- a/patches/server/0225-Structure-seed-options.patch
+++ b/patches/server/0225-Structure-seed-options.patch
@@ -27,10 +27,10 @@ index f71cc1f5e5d594e82a4e6132d438bae74b9370a7..77948e19dd99b6f30bf294c9d5308228
 
                 updated.put(entry.getKey(), new StructureFeatureConfiguration(feature.spacing(), feature.separation(), seed));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 64a719cce811d63f84d5ba5c67549c8caba6ede1..a9675c496dd5f1abc695370a822b8a3e025f8f83 100644
+index ae27ecf02b799634bf5d756d2b02ea102d25b249..bbdb4e20f01effd77cf6de5626bb5d5b0c7d3f4d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -245,6 +245,9 @@ public class PurpurConfig {
+@@ -247,6 +247,9 @@ public class PurpurConfig {
     public static int seedFeatureVegetationPatch = -1;
     public static int seedFeatureWaterloggedVegetationPatch = -1;
     public static int seedFeatureWeepingVines = -1;
@@ -40,7 +40,7 @@ index 64a719cce811d63f84d5ba5c67549c8caba6ede1..a9675c496dd5f1abc695370a822b8a3e
     private static void seedSettings() {
         if (version < 14) {
             int oldValue = getInt("settings.seed.dungeon", -1);
-@@ -310,6 +313,9 @@ public class PurpurConfig {
+@@ -312,6 +315,9 @@ public class PurpurConfig {
         seedFeatureVegetationPatch = getInt("settings.seed.feature.vegetation_patch", seedFeatureVegetationPatch);
         seedFeatureWaterloggedVegetationPatch = getInt("settings.seed.feature.waterlogged_vegetation_patch", seedFeatureWaterloggedVegetationPatch);
         seedFeatureWeepingVines = getInt("settings.seed.feature.weeping_vines", seedFeatureWeepingVines);
--- a/patches/server/0227-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
+++ b/patches/server/0227-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
@@ -17,10 +17,10 @@ index 5fdbdc2d3deb09da018d0db1b495d9fb52e39b44..b984f3fdadd5d44e8e2c1fa12a531a26
             }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index a9675c496dd5f1abc695370a822b8a3e025f8f83..0d77130d4fbd12dbed5cce84a041a41db41351dd 100644
+index bbdb4e20f01effd77cf6de5626bb5d5b0c7d3f4d..e59b8ab1ba5d47663ff174752b1a9a81bf0780e7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -378,6 +378,7 @@ public class PurpurConfig {
+@@ -398,6 +398,7 @@ public class PurpurConfig {
     public static int beeInsideBeeHive = 3;
     public static boolean anvilCumulativeCost = true;
     public static int lightningRodRange = 128;
@@ -28,7 +28,7 @@ index a9675c496dd5f1abc695370a822b8a3e025f8f83..0d77130d4fbd12dbed5cce84a041a41d
     private static void blockSettings() {
         if (version < 3) {
             boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -396,6 +397,7 @@ public class PurpurConfig {
+@@ -416,6 +417,7 @@ public class PurpurConfig {
         beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
         anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
         lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange);
--- a/patches/server/0230-Customizable-sleeping-actionbar-messages.patch
+++ b/patches/server/0230-Customizable-sleeping-actionbar-messages.patch
@@ -40,10 +40,10 @@ index cee1f74edf069da54d15b7fc7d10c437afa47b2a..92b1709b96fe1e8d71e4de675e4c11f5
                 }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 0d77130d4fbd12dbed5cce84a041a41db41351dd..f90256ef0806a61c434a0d062318267184177283 100644
+index e59b8ab1ba5d47663ff174752b1a9a81bf0780e7..cc1f549b8a3825dcf9f0fcdac1260e156663cdfd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -166,6 +166,8 @@ public class PurpurConfig {
+@@ -168,6 +168,8 @@ public class PurpurConfig {
     public static String dontRunWithScissors = "<red><italic>Don't run with scissors!";
     public static String uptimeCommandOutput = "<green>Server uptime is <uptime>";
     public static String unverifiedUsername = "default";
@@ -52,7 +52,7 @@ index 0d77130d4fbd12dbed5cce84a041a41db41351dd..f90256ef0806a61c434a0d0623182671
     private static void messages() {
         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
         afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
-@@ -178,6 +180,8 @@ public class PurpurConfig {
+@@ -180,6 +182,8 @@ public class PurpurConfig {
         dontRunWithScissors = getString("settings.messages.dont-run-with-scissors", dontRunWithScissors);
         uptimeCommandOutput = getString("settings.messages.uptime-command-output", uptimeCommandOutput);
         unverifiedUsername = getString("settings.messages.unverified-username", unverifiedUsername);