Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
6ecbe5776 Rename leftover resource->datapack (#5662)
ec90a7859 I give up on trying to teach people to avoid the incorrect ways.

patches/api/0001-Tuinity-API-Changes.patch

@@ -198,7 +198,7 @@ index 73fbd5d5a591871a3a386fb5c455cd96a3992e7a..6fd6066b16d4dbf8695be16ec8b2d135
  
      <properties>
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 5f2b9a91b03a3e8b2dc5ce7743e31bea882500e4..82c3dfe78b3f99f16cac390a4bd7f4e054e67d33 100644
+index 35ec8a060c2a2d2d48477b1bb940db51d18bf38e..d1a9322cf54f57f0d213145aa50c219f0eb2a90b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1595,6 +1595,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

patches/api/0003-Purpur-config-files.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 82c3dfe78b3f99f16cac390a4bd7f4e054e67d33..f14acae6712495c7e5dac0b98b42f14edaa83fb1 100644
+index d1a9322cf54f57f0d213145aa50c219f0eb2a90b..1a319e2842f4b99951f1cddce8b2b4be9f5373a0 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1603,6 +1603,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

patches/api/0009-Bring-back-server-name.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index bd834cd9b1d05327da195b76719e90ac14943dbb..6d9003e1f97d638a50b48620edb6ab096cc0d808 100644
+index 33f04d57b7df3a6f9743246ba9af6d67f4fa4b54..45c64a9e4f20428a9a448194f22697a17dfb8e1f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1951,4 +1951,15 @@ public final class Bukkit {
@@ -25,12 +25,12 @@ index bd834cd9b1d05327da195b76719e90ac14943dbb..6d9003e1f97d638a50b48620edb6ab09
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f14acae6712495c7e5dac0b98b42f14edaa83fb1..53f7ab9245fdcb45a7e55778d1941233a46a3005 100644
+index 1a319e2842f4b99951f1cddce8b2b4be9f5373a0..91641c358b10219d4098f40b53ea56f1cfa5defc 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1725,4 +1725,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
-     io.papermc.paper.resource.DatapackManager getDatapackManager();
+     io.papermc.paper.datapack.DatapackManager getDatapackManager();
      // Paper end
 +
 +    // Purpur start

patches/api/0012-Lagging-threshold.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6d9003e1f97d638a50b48620edb6ab096cc0d808..aab8a4edc172f23773464e17da77c623088b55a8 100644
+index 45c64a9e4f20428a9a448194f22697a17dfb8e1f..b3cd3e5288bdcdd928efb8cba97f504d8e3ec58e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1961,5 +1961,14 @@ public final class Bukkit {
@@ -24,7 +24,7 @@ index 6d9003e1f97d638a50b48620edb6ab096cc0d808..aab8a4edc172f23773464e17da77c623
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 53f7ab9245fdcb45a7e55778d1941233a46a3005..6bb74e60705e6ea91c0ea06c6ea3f5348718a9ce 100644
+index 91641c358b10219d4098f40b53ea56f1cfa5defc..f546e3422539d91f1fcb98c94a722c4b17ef0170 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1733,5 +1733,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch

@@ -520,7 +520,7 @@ index 3afd5f5c0208a4ee93b5dbfc2aab2b9d2e8a7544..7838731e0e16bdccfb79e74ceb64148f
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6bb74e60705e6ea91c0ea06c6ea3f5348718a9ce..f2d0bfdbe6b64d0176ded222eead6c4898e74944 100644
+index f546e3422539d91f1fcb98c94a722c4b17ef0170..a126581c74da8fae4c86fde2f28a850150c408cd 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1568,6 +1568,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

patches/api/0039-Conflict-on-change-for-adventure-deprecations.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Conflict on change for adventure deprecations
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index aab8a4edc172f23773464e17da77c623088b55a8..582f4fd769cdb58441d13422a409fd6190f0a384 100644
+index b3cd3e5288bdcdd928efb8cba97f504d8e3ec58e..8036c66af0bc6b11ffd0f716138901bcfea007e1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -303,7 +303,7 @@ public final class Bukkit {
@@ -72,7 +72,7 @@ index aab8a4edc172f23773464e17da77c623088b55a8..582f4fd769cdb58441d13422a409fd61
          return server.getShutdownMessage();
      }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f2d0bfdbe6b64d0176ded222eead6c4898e74944..29cc63f0504d3ba98f2b346b6a01e62d1483738a 100644
+index a126581c74da8fae4c86fde2f28a850150c408cd..0f66655541dbb0dbb05a13a3612bb46cfb2b538a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -250,7 +250,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi