Revert Purpur remove Timings

patches/api/0007-Purpur-Remove-Timings.patch

@@ -1,154 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Fri, 1 Jul 2022 04:03:26 -0500
-Subject: [PATCH] Purpur: Remove Timings
-
-Original license: MIT
-Original project: https://github.com/PurpurMC/Purpur
-
-diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
-index 34e43e56ccc663e05b9cae36643e8df5eee5cb17..2c15b67149d014fdce2dd74a550013d83b6e44c8 100644
---- a/src/main/java/co/aikar/timings/TimedEventExecutor.java
-+++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
-@@ -76,9 +76,9 @@ public class TimedEventExecutor implements EventExecutor {
-             executor.execute(listener, event);
-             return;
-         }
--        try (Timing ignored = timings.startTiming()){
-+        //try (Timing ignored = timings.startTiming()){ // Purpur
-             executor.execute(listener, event);
--        }
-+        //} // Purpur
-     }
- 
-     @Override
-diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java
-index a21e5ead5024fd0058c5e3302d8201dd249d32bc..505908e987a032a801ae03d7fb020dfb662bf81b 100644
---- a/src/main/java/co/aikar/timings/Timing.java
-+++ b/src/main/java/co/aikar/timings/Timing.java
-@@ -36,6 +36,7 @@ public interface Timing extends AutoCloseable {
-      * @return Timing
-      */
-     @NotNull
-+    @io.papermc.paper.annotation.DoNotUse // Purpur
-     Timing startTiming();
- 
-     /**
-@@ -43,6 +44,7 @@ public interface Timing extends AutoCloseable {
-      *
-      * Will automatically be called when this Timing is used with try-with-resources
-      */
-+    @io.papermc.paper.annotation.DoNotUse // Purpur
-     void stopTiming();
- 
-     /**
-@@ -53,6 +55,7 @@ public interface Timing extends AutoCloseable {
-      * @return Timing
-      */
-     @NotNull
-+    @io.papermc.paper.annotation.DoNotUse // Purpur
-     Timing startTimingIfSync();
- 
-     /**
-@@ -62,12 +65,14 @@ public interface Timing extends AutoCloseable {
-      *
-      * But only if we are on the primary thread.
-      */
-+    @io.papermc.paper.annotation.DoNotUse // Purpur
-     void stopTimingIfSync();
- 
-     /**
-      * @deprecated Doesn't do anything - Removed
-      */
-     @Deprecated
-+    @io.papermc.paper.annotation.DoNotUse // Purpur
-     void abort();
- 
-     /**
-@@ -79,5 +84,6 @@ public interface Timing extends AutoCloseable {
-     TimingHandler getTimingHandler();
- 
-     @Override
-+    @io.papermc.paper.annotation.DoNotUse // Purpur
-     void close();
- }
-diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
-index dd72a34eaa4bedd9ea0b92eaa79091b00eb4dd09..759e9cbcedb50894821dcb6dcc602af4f0c3453e 100644
---- a/src/main/java/co/aikar/timings/Timings.java
-+++ b/src/main/java/co/aikar/timings/Timings.java
-@@ -114,7 +114,7 @@ public final class Timings {
-     @NotNull
-     public static Timing ofStart(@NotNull Plugin plugin, @NotNull String name, @Nullable Timing groupHandler) {
-         Timing timing = of(plugin, name, groupHandler);
--        timing.startTiming();
-+        //timing.startTiming(); // Purpur
-         return timing;
-     }
- 
-diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
-index 3132dc98d26c54c5e46162e53aaed195d7335c8d..b461b5c50f97f11cb9ef68abc520271bb72440fa 100644
---- a/src/main/java/co/aikar/timings/TimingsCommand.java
-+++ b/src/main/java/co/aikar/timings/TimingsCommand.java
-@@ -44,7 +44,7 @@ public class TimingsCommand extends BukkitCommand {
-     public TimingsCommand(@NotNull String name) {
-         super(name);
-         this.description = "Manages Spigot Timings data to see performance of the server.";
--        this.usageMessage = "/timings <reset|report|on|off|verbon|verboff>";
-+        this.usageMessage = "/timings";// <reset|report|on|off|verbon|verboff>"; // Purpur
-         this.setPermission("bukkit.command.timings");
-     }
- 
-@@ -53,6 +53,13 @@ public class TimingsCommand extends BukkitCommand {
-         if (!testPermission(sender)) {
-             return true;
-         }
-+        if (true) {
-+            net.kyori.adventure.text.minimessage.MiniMessage mm = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage();
-+            sender.sendMessage(mm.deserialize("<gold>Purpur has removed timings to save your performance. Please use <click:suggest_command:'/spark'><grey>/spark</grey></click> instead"));
-+            sender.sendMessage(mm.deserialize("<gold>For more information, view its documentation at"));
-+            sender.sendMessage(mm.deserialize("<gold><click:open_url:'https://spark.lucko.me/docs/Command-Usage'>https://spark.lucko.me/docs/Command-Usage</click>"));
-+            return true;
-+        }
-         if (args.length < 1) {
-             sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED));
-             return true;
-@@ -111,7 +118,7 @@ public class TimingsCommand extends BukkitCommand {
-         Preconditions.checkNotNull(args, "Arguments cannot be null");
-         Preconditions.checkNotNull(alias, "Alias cannot be null");
- 
--        if (args.length == 1) {
-+        if (false && args.length == 1) { // Purpur
-             return StringUtil.copyPartialMatches(args[0], TIMINGS_SUBCOMMANDS,
-                 new ArrayList<String>(TIMINGS_SUBCOMMANDS.size()));
-         }
-diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index b8623575b1c1b565560c2dd6438190716845a652..a9ffc32583ff701d8d163c1b41e0b06f764e2043 100644
---- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
-+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -150,10 +150,10 @@ public class SimpleCommandMap implements CommandMap {
-         // Paper end
- 
-         try {
--            try (co.aikar.timings.Timing ignored = target.timings.startTiming()) { // Paper - use try with resources
-+            //try (co.aikar.timings.Timing ignored = target.timings.startTiming()) { // Paper - use try with resources // Purpur
-             // Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false)
-             target.execute(sender, sentCommandLabel, Arrays.copyOfRange(args, 1, args.length));
--            } // target.timings.stopTiming(); // Spigot // Paper
-+            //} // target.timings.stopTiming(); // Spigot // Paper // Purpur
-         } catch (CommandException ex) {
-             server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
-             //target.timings.stopTiming(); // Spigot // Paper
-diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
-index 123647bb10fc89508437d7a0bd3fd31d58ee7c82..ce209668dd7f11b284bd7f5688191a0b3ae86a09 100644
---- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
-+++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
-@@ -61,7 +61,7 @@ public final class CustomTimingsHandler {
-         handler = timing;
-     }
- 
--    public void startTiming() { handler.startTiming(); }
--    public void stopTiming() { handler.stopTiming(); }
-+    public void startTiming() { /*handler.startTiming();*/ } // Purpur
-+    public void stopTiming() { /*handler.stopTiming();*/ } // Purpur
- 
- }

patches/api/0010-Pufferfish-Sentry.patch

@@ -7,7 +7,7 @@ Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3075ae381824f8b46d17f40022f23d58f9e50c12..ba12ba4240adea32aa8a58ddfef8a949d8f2b8e8 100644
+index 97a482d26bab77fc027f78665bbbedcbb15bae39..9dadc97e6e7c3e9669d08b976ed3c5a901718144 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -41,6 +41,7 @@ dependencies {