Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2d3a1385 [ci/skip] Refine recipe management API documentation. (#12287)
PaperMC/Paper@aaaeb4e1 [ci/skip] Make compilation logs actually readable (#12276)
PaperMC/Paper@bb1beda6 feat: add event to wind charge explode (#12248)
PaperMC/Paper@9f004614 Update a whole lot of deprecated annotations
PaperMC/Paper@72f13f8b [ci/skip] Mention API Checks for CONTRIBUTING.md (#12315)
PaperMC/Paper@7cc6cb50 Check for trailing input in ItemFactory#createItemStack (#12312)
PaperMC/Paper@f49d18df Add get/set customName to Skull block (#12302)
PaperMC/Paper@894631f0 Make advancement ordering predictable (#12292)

Author: granny

gradle.properties

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.4-R0.1-SNAPSHOT
 
 mcVersion = 1.21.4
-paperCommit = 6ea42025a49f232f47861c6ca943b0fc66b7effe
+paperCommit = 894631f0d091a3de52aed4b6ec0c4f6c7584d697
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true

purpur-api/paper-patches/files/src/main/java/org/bukkit/Bukkit.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2995,4 +_,133 @@
+@@ -2996,4 +_,133 @@
      public static void restart() {
          server.restart();
      }

purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4278,6 +_,86 @@
+@@ -4277,6 +_,86 @@
      @Nullable
      public DragonBattle getEnderDragonBattle();
 

purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Endermite.java.patch

@@ -13,7 +13,7 @@
       * @return player spawned status
 -     * @deprecated this functionality no longer exists
       */
--    @Deprecated(since = "1.17")
+-    @Deprecated(since = "1.17", forRemoval = true)
      boolean isPlayerSpawned();
 
      /**
@@ -26,7 +26,7 @@
       * @param playerSpawned player spawned status
 -     * @deprecated this functionality no longer exists
       */
--    @Deprecated(since = "1.17")
+-    @Deprecated(since = "1.17", forRemoval = true)
      void setPlayerSpawned(boolean playerSpawned);
      // Paper start
      /**

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch

@@ -106,7 +106,7 @@
      @Override
      public List<Recipe> getRecipesFor(ItemStack result) {
          Preconditions.checkArgument(result != null, "ItemStack cannot be null");
-@@ -3052,6 +_,18 @@
+@@ -3047,6 +_,18 @@
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
 
@@ -125,15 +125,15 @@
          @Override
          public void restart() {
              CraftServer.this.restart();
-@@ -3086,6 +_,7 @@
+@@ -3081,6 +_,7 @@
      @Override
      public double[] getTPS() {
          return new double[] {
 +            net.minecraft.server.MinecraftServer.getServer().tps5s.getAverage(), // Purpur - Add 5 second tps average in /tps
              net.minecraft.server.MinecraftServer.getServer().tps1.getAverage(),
              net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
              net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
-@@ -3296,4 +_,18 @@
+@@ -3291,4 +_,18 @@
          this.console.addPluginAllowingSleep(plugin.getName(), value);
      }
      // Paper end - API to check if the server is sleeping