Updated Upstream (Pufferfish) (#1575)

Upstream has released updates that appear to apply and compile correctly

Pufferfish Changes:
pufferfish-gg/Pufferfish@c9f4e20 Final 1.20.4 Update
pufferfish-gg/Pufferfish@1f3ad02 Final 1.20.4 update, for realzies
pufferfish-gg/Pufferfish@b1ab664 Enable SIMD on java 21
pufferfish-gg/Pufferfish@0674c2b 1.21 compiles
pufferfish-gg/Pufferfish@98ea973 Fix 1.21 version checkers
pufferfish-gg/Pufferfish@68f859c Fix lambda/tick guard patch
pufferfish-gg/Pufferfish@eaa18d5 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@1d72eea Updated Upstream (Paper)
pufferfish-gg/Pufferfish@1d3c743 Update pufferfish version detector stuff
pufferfish-gg/Pufferfish@5e30963 Fix crash bug
pufferfish-gg/Pufferfish@12571eb Use mojmapped paperclip jar instead (CI only)
pufferfish-gg/Pufferfish@4d16ae0 Drop a patch - moonrise includes it
pufferfish-gg/Pufferfish@52c2d05 Revert "Drop a patch - moonrise includes it"
pufferfish-gg/Pufferfish@bdb56f1 Fix entity interactions with fluids
pufferfish-gg/Pufferfish@469e5c1 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@d75961f 1.21.1 Update (Updated Upstream (Paper))

patches/api/0035-Remove-Timings.patch

@@ -1,168 +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] Remove Timings
-
-
-diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
-index 157617933a772451f6c073d97afaf305769b4d40..438a9c76381ea3f5b774e2232ff56c5dc6f82586 100644
---- a/src/main/java/co/aikar/timings/TimedEventExecutor.java
-+++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
-@@ -80,9 +80,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 4195efcfe044618052bb03dea34a4fb2ca7c44f0..8709c955bac34bc546a8e022cfac808bc61ee793 100644
---- a/src/main/java/co/aikar/timings/Timing.java
-+++ b/src/main/java/co/aikar/timings/Timing.java
-@@ -39,6 +39,7 @@ public interface Timing extends AutoCloseable {
-      * @return Timing
-      */
-     @NotNull
-+    @io.papermc.paper.annotation.DoNotUse // Purpur
-     Timing startTiming();
- 
-     /**
-@@ -46,6 +47,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();
- 
-     /**
-@@ -56,6 +58,7 @@ public interface Timing extends AutoCloseable {
-      * @return Timing
-      */
-     @NotNull
-+    @io.papermc.paper.annotation.DoNotUse // Purpur
-     Timing startTimingIfSync();
- 
-     /**
-@@ -65,12 +68,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();
- 
-     /**
-@@ -82,5 +87,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 e81d0bc309de877ed2b5da6122f55c162e9b5f10..3d663104c8e3089abdb9dc4d7309f873ac182e98 100644
---- a/src/main/java/co/aikar/timings/Timings.java
-+++ b/src/main/java/co/aikar/timings/Timings.java
-@@ -124,7 +124,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;
-     }
- 
-@@ -145,9 +145,11 @@ public final class Timings {
-      * @param enabled Should timings be reported
-      */
-     public static void setTimingsEnabled(boolean enabled) {
--        timingsEnabled = enabled;
--        warnAboutDeprecationOnEnable();
--        reset();
-+        // Purpur start - we don't do that here...
-+        timingsEnabled = false;
-+        //warnAboutDeprecationOnEnable();
-+        //reset();
-+        // Purpur end
-     }
- 
-     private static void warnAboutDeprecationOnEnable() {
-diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
-index 95d87c9dbf2b237787294dfbe7fed87a36e6dedf..b831a23999c94cb1bdf7f5d2cd719d0b846242ad 100644
---- a/src/main/java/co/aikar/timings/TimingsCommand.java
-+++ b/src/main/java/co/aikar/timings/TimingsCommand.java
-@@ -47,7 +47,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");
-     }
- 
-@@ -56,8 +56,12 @@ public class TimingsCommand extends BukkitCommand {
-         if (!testPermission(sender)) {
-             return true;
-         }
--        if (false) {
--            sender.sendMessage(Timings.deprecationMessage());
-+        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));
-@@ -117,7 +121,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 a09b5458191eb5df4787859b72a37fa1fa2bffba..7740ad53796d08584bb0110f99af5639993e4d71 100644
---- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
-+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -173,10 +173,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, parsedArgs); // Purpur
--            } // 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 12946bd55fcf7c40d39081779a7fa30049ee6165..9c2d605c50cbf9aefa56ec209df9f6cea1392e89 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
- 
- }