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/server/0001-Tuinity-Server-Changes.patch

@@ -20718,7 +20718,7 @@ index e50731723d266ba65b2163df2e935afb8b013a93..a6736d15282715d920bab85eb92074cd
                  }
                  value.append("},");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 554d13d65952af1b98db074ebc4a2d90474029f6..1d07fa90736b0c4995b5d7dc0cafe9303fa30c84 100644
+index edeb3e542c2e32379a5fb4229b389ad4a4987dbb..5178a8b65c18bf099cad544ea7088d2eb6e1985d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -233,7 +233,7 @@ import javax.annotation.Nullable; // Paper
@@ -20937,7 +20937,7 @@ index 3b3eda95c0ff8b129adedbae6561bba2d01c2f3a..02807cc1fe14e747a7c18edf0fcdc386
      // Spigot start
      private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 6cae7454f3cf5b246300bac489b38ea65e2185c9..969beec6ceaf43282337cf02af94033764c95bcc 100644
+index 68229f7679f9e974dc7af6c34d6f1d3f8db49353..86c7b5de4cc9f02365f0986a0e9b381f5edf395b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -146,6 +146,13 @@ public class Main {

patches/server/0002-Airplane-Server-Changes.patch

@@ -3251,7 +3251,7 @@ index dcb3e4b0cf34699ed77208f8122710bbdfa3d063..a51b47892c726f4b4b10d870991e9b85
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1d07fa90736b0c4995b5d7dc0cafe9303fa30c84..df4f58c42aef8e4dd3a2d640c8d14f8c81d5f2e2 100644
+index 5178a8b65c18bf099cad544ea7088d2eb6e1985d..8255e88e18080028966e084b1fd896c084398aad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -233,7 +233,7 @@ import javax.annotation.Nullable; // Paper

patches/server/0003-Rebrand.patch

@@ -249,7 +249,7 @@ index 0000000000000000000000000000000000000000..cabfcebf9f944f7a2a2a1cffc7401435
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index df4f58c42aef8e4dd3a2d640c8d14f8c81d5f2e2..9c158c2f988364bed79cb45dbeb29fd08c63bf6f 100644
+index 8255e88e18080028966e084b1fd896c084398aad..8aa8a6b869b2bfc2bcfb52a50df3436050f20dac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -233,7 +233,7 @@ import javax.annotation.Nullable; // Paper

patches/server/0004-Purpur-config-files.patch

@@ -357,7 +357,7 @@ index 0000000000000000000000000000000000000000..536955124afaec5c8a070249c7432cb9
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9c158c2f988364bed79cb45dbeb29fd08c63bf6f..9b4edf52d0e1883edad06be296512a9f7c6cdd29 100644
+index 8aa8a6b869b2bfc2bcfb52a50df3436050f20dac..77b20b418d74af25116c4a0182a96b23dce35d13 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -868,6 +868,7 @@ public final class CraftServer implements Server {
@@ -404,7 +404,7 @@ index 9c158c2f988364bed79cb45dbeb29fd08c63bf6f..9b4edf52d0e1883edad06be296512a9f
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 969beec6ceaf43282337cf02af94033764c95bcc..e91e4e0e2f251fabeea9a3b734a6286337cda212 100644
+index 86c7b5de4cc9f02365f0986a0e9b381f5edf395b..7d393684bb7301c619e0135186568135102d5ddb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -154,6 +154,14 @@ public class Main {

patches/server/0010-Bring-back-server-name.patch

@@ -17,7 +17,7 @@ index 1fab9b9c7d41a0d2a551096c2c15f741a887fa2d..f33309f4c1ad92960d0634f3f5b8105c
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9b4edf52d0e1883edad06be296512a9f7c6cdd29..f3e2a6ec37045fae48166682d6cabe513d581833 100644
+index 77b20b418d74af25116c4a0182a96b23dce35d13..e927ebb58e8dfc5333e3ea3ab74242bac9570593 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2541,4 +2541,11 @@ public final class CraftServer implements Server {

patches/server/0013-Lagging-threshold.patch

@@ -41,7 +41,7 @@ index 7eadf925c4e4429fa63fb02af9e87bf2ed68efa6..60ef024891e78e18c64435b7ee811807
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f3e2a6ec37045fae48166682d6cabe513d581833..78599a8b9a6b9876435982ef4c11b84d41a227c8 100644
+index e927ebb58e8dfc5333e3ea3ab74242bac9570593..5da39845f3ba82b40a3483333c41b57a2a0c10ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2547,5 +2547,10 @@ public final class CraftServer implements Server {

patches/server/0025-Disable-outdated-build-check.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable outdated build check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index e91e4e0e2f251fabeea9a3b734a6286337cda212..e0075a74c9aaa3bc039950a78370d40dba60338d 100644
+index 7d393684bb7301c619e0135186568135102d5ddb..9ad2fe39dfd9f2b81c4aca4f56763443e514e433 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -266,7 +266,7 @@ public class Main {

patches/server/0074-Add-5-second-tps-average-in-tps.patch

@@ -69,7 +69,7 @@ index 9fbec9f98bd0dd727ef58d7f3f18a8a8ab9910e2..0cea9db58772d8c69b5cfdd4a2987593
                          lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 78599a8b9a6b9876435982ef4c11b84d41a227c8..3f98b998f0eeeea875d465ada39317b564cbb43f 100644
+index 5da39845f3ba82b40a3483333c41b57a2a0c10ac..7cfa041d646f602221cbb0d8899ff682db7ca9ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2321,6 +2321,7 @@ public final class CraftServer implements Server {