Revert Purpur's Clean-up-version-command-output.patch & Makes output of plugins command better if no plugins

patches/api/0001-Rebrand.patch

@@ -22,3 +22,16 @@ index bdc8d830f54e4567ec0b03041221fdcd016ce76c..957f15a91f6aa1235c12b82079e32bb4
      /**
       * Gets the {@code ServerBuildInfo}.
       *
+diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+index fd5d9881abfd930bb883120f018f76dc78b62b14..dac207f2f5ae1838ca1b5092f7fe032adc038849 100644
+--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
++++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+@@ -214,7 +214,7 @@ public class VersionCommand extends BukkitCommand {
+         String version = Bukkit.getVersion();
+         // Paper start
+         if (version.startsWith("null")) { // running from ide?
+-            setVersionMessage(Component.text("Unknown version, custom build?", NamedTextColor.YELLOW));
++            setVersionMessage(Component.text("* Unknown version, custom build?", NamedTextColor.RED)); // Leaf - Purpur - Clean up version command output
+             return;
+         }
+         setVersionMessage(getVersionFetcher().getVersionMessage(version));

patches/api/0004-Purpur-API-Changes.patch

@@ -12,26 +12,10 @@ Patches below are removed in this patch:
 Pufferfish-API-Changes.patch
 Fix-pufferfish-issues.patch
 Build-System-Changes.patch
+Clean-up-version-command-output.patch
 Remove-Timings.patch
 Add-log-suppression-for-LibraryLoader.patch
 
-diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
-index a736d7bcdc5861a01b66ba36158db1c716339346..22fc165fd9c95f0f3ae1be7a0857e48cc50fad5b 100644
---- a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
-+++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
-@@ -26,6 +26,12 @@ public interface VersionFetcher {
-     @NotNull
-     Component getVersionMessage(@NotNull String serverVersion);
- 
-+    // Purpur start
-+    default int distance() {
-+        return 0;
-+    }
-+    // Purpur end
-+
-     class DummyVersionFetcher implements VersionFetcher {
- 
-         @Override
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
 index 957f15a91f6aa1235c12b82079e32bb42449c78d..9fa8d7fac5bf415b40c3a9a38108fa5476ed7619 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
@@ -709,34 +693,6 @@ index c3a9cf65db73ed534bf20996c7f05b5eb0aaebe1..83f84a76cbfdf5138ecccf3a886d3815
              } // target.timings.stopTiming(); // Spigot // Paper
          } catch (CommandException ex) {
              server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
-diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index fd5d9881abfd930bb883120f018f76dc78b62b14..d3dadad49df09e85c724c93e8cc88da2c985e9b4 100644
---- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -214,7 +214,7 @@ public class VersionCommand extends BukkitCommand {
-         String version = Bukkit.getVersion();
-         // Paper start
-         if (version.startsWith("null")) { // running from ide?
--            setVersionMessage(Component.text("Unknown version, custom build?", NamedTextColor.YELLOW));
-+            setVersionMessage(Component.text("* Unknown version, custom build?", NamedTextColor.RED)); // Purpur
-             return;
-         }
-         setVersionMessage(getVersionFetcher().getVersionMessage(version));
-@@ -255,9 +255,11 @@ public class VersionCommand extends BukkitCommand {
-     // Paper start
-     private void setVersionMessage(final @NotNull Component msg) {
-         lastCheck = System.currentTimeMillis();
--        final Component message = Component.textOfChildren(
--            Component.text(Bukkit.getVersionMessage(), NamedTextColor.WHITE),
--            Component.newline(),
-+        // Purpur start
-+        int distance = getVersionFetcher().distance();
-+        final Component message = Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()),
-+            ChatColor.parseMM("<grey>Current: %s%s*", distance == 0 ? "<green>" : distance > 0 ? "<yellow>" : "<red>", Bukkit.getVersion()),
-+            // Purpur end
-             msg
-         );
-         this.versionMessage = Component.text()
 diff --git a/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java b/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
 index 455ff52d90565838fe7640c3f045b27082a6c2f1..45f5493eebfecf56b7c0ef4659c078dfc62c0612 100644
 --- a/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java

patches/server/0012-Fix-Pufferfish-and-Purpur-patches.patch

@@ -4,6 +4,28 @@ Date: Mon, 29 Apr 2024 14:18:58 -0400
 Subject: [PATCH] Fix Pufferfish and Purpur patches
 
 
+diff --git a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
+index e94224ed280247ee69dfdff8dc960f2b8729be33..5b9725a9a81c0850dc2809c150529e5f67a88b66 100644
+--- a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
++++ b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
+@@ -241,6 +241,8 @@ public class PaperPluginsCommand extends BukkitCommand {
+ 
+         if (!paperPlugins.isEmpty()) {
+             sender.sendMessage(PAPER_HEADER.append(Component.text(" (%s):".formatted(paperPlugins.size())))); // Purpur
++        } else {
++            sender.sendMessage(PAPER_HEADER.append(Component.text(" (0):"))); // Leaf - Purpur - Makes plugins command better if no plugins
+         }
+ 
+         for (Component component : formatProviders(paperPlugins, sender)) { // Purpur
+@@ -249,6 +251,8 @@ public class PaperPluginsCommand extends BukkitCommand {
+ 
+         if (!spigotPlugins.isEmpty()) {
+             sender.sendMessage(BUKKIT_HEADER.append(Component.text(" (%s):".formatted(spigotPlugins.size())))); // Purpur
++        } else {
++            sender.sendMessage(BUKKIT_HEADER.append(Component.text(" (0):"))); // Leaf - Purpur - Makes plugins command better if no plugins
+         }
+         
+         for (Component component : formatProviders(spigotPlugins, sender)) { // Purpur
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
 index 1f4b3412396b1c5d142c0ad9123cacc2f225494b..561426280dff2af8015fec3108a8b8514d994679 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java