Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@41a094cf move block data/state impl
PaperMC/Paper@6b26b219 remove hardcoded durability from material

Author: granny

gradle.properties

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.5-R0.1-SNAPSHOT
 
 mcVersion = 1.21.5
-paperCommit = a70f7745a81d43089944069d701d69ad811aa4f1
+paperCommit = 6b26b21940bda7e0947d80b9a18f208ee7d570d9
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true

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

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -3632,4 +_,40 @@
+@@ -3616,4 +_,40 @@
          return this.asItemType().getDefaultDataTypes();
      }
      // Paper end - data component API

purpur-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch

@@ -3,7 +3,7 @@
 @@ -458,6 +_,7 @@
                      // revert back all captured blocks
                      for (org.bukkit.block.BlockState blockstate : blocks) {
-                         ((org.bukkit.craftbukkit.block.CraftBlockState) blockstate).revertPlace();
+                         ((org.bukkit.craftbukkit.block.state.CraftBlockState) blockstate).revertPlace();
 +                        ((org.bukkit.craftbukkit.block.CraftBlock) blockstate.getBlock()).getNMS().getBlock().forgetPlacer(); // Purpur - Store placer on Block when placed
                      }
 

purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
-@@ -159,11 +_,55 @@
+@@ -158,11 +_,55 @@
      }
      // Paper end - add paper world config
 
@@ -56,7 +56,7 @@
      public CraftWorld getWorld() {
          return this.world;
      }
-@@ -207,6 +_,8 @@
+@@ -206,6 +_,8 @@
      ) {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) levelData).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
@@ -65,7 +65,7 @@
          this.generator = gen;
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 
-@@ -1413,4 +_,14 @@
+@@ -1412,4 +_,14 @@
              return this.id;
          }
      }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch renamed to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/state/CraftBeehive.java.patch

@@ -1,5 +1,5 @@
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
+--- a/src/main/java/org/bukkit/craftbukkit/block/state/CraftBeehive.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/state/CraftBeehive.java
 @@ -16,8 +_,15 @@
 
  public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> implements Beehive {

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch renamed to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/state/CraftConduit.java.patch

@@ -1,6 +1,6 @@
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java
-@@ -73,7 +_,7 @@
+--- a/src/main/java/org/bukkit/craftbukkit/block/state/CraftConduit.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/state/CraftConduit.java
+@@ -74,7 +_,7 @@
      public int getRange() {
          this.ensureNoWorldGeneration();
          ConduitBlockEntity conduit = (ConduitBlockEntity) this.getBlockEntityFromWorld();

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

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -276,6 +_,7 @@
+@@ -277,6 +_,7 @@
      @Override
      public void recalculatePermissions() {
          this.perm.recalculatePermissions();

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

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -481,7 +_,7 @@
+@@ -479,7 +_,7 @@
 
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {