Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@cc0f25cb Apply more feature patches
PaperMC/Paper@e7b684ed fix
PaperMC/Paper@71ccae07 Revert "move block data/state impl"
PaperMC/Paper@7612b5d0 Add identifier comparator for Plugin tickets
PaperMC/Paper@35b466e3 Add support for getting data components from entities
PaperMC/Paper@9f50f858 patch
PaperMC/Paper@42623c4b no patch

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/AcquirePoi.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
 +++ b/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-@@ -85,7 +_,7 @@
-                                 }
+@@ -86,7 +_,7 @@
                              };
-                             Set<Pair<Holder<PoiType>, BlockPos>> set = poiManager.findAllClosestFirstWithType(
--                                    acquirablePois, predicate1, mob.blockPosition(), 48, PoiManager.Occupancy.HAS_SPACE
-+                                    acquirablePois, predicate1, mob.blockPosition(), level.purpurConfig.villagerAcquirePoiSearchRadius, PoiManager.Occupancy.HAS_SPACE // Purpur - Configurable villager search radius
-                                 )
-                                 .limit(5L)
-                                 .filter(pair1 -> predicate.test(level, pair1.getSecond()))
+                             // Paper start - optimise POI access
+                             final java.util.List<Pair<Holder<PoiType>, BlockPos>> poiposes = new java.util.ArrayList<>();
+-                            io.papermc.paper.util.PoiAccess.findNearestPoiPositions(poiManager, acquirablePois, predicate1, mob.blockPosition(), 48, 48*48, PoiManager.Occupancy.HAS_SPACE, false, 5, poiposes);
++                            io.papermc.paper.util.PoiAccess.findNearestPoiPositions(poiManager, acquirablePois, predicate1, mob.blockPosition(), level.purpurConfig.villagerAcquirePoiSearchRadius, level.purpurConfig.villagerAcquirePoiSearchRadius*level.purpurConfig.villagerAcquirePoiSearchRadius, PoiManager.Occupancy.HAS_SPACE, false, 5, poiposes); // Purpur - Configurable villager search radius
+                             final Set<Pair<Holder<PoiType>, BlockPos>> set = new java.util.HashSet<>(poiposes.size());
+                             for (final Pair<Holder<PoiType>, BlockPos> poiPose : poiposes) {
+                                 if (predicate.test(level, poiPose.getSecond())) {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
 +++ b/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
-@@ -54,7 +_,7 @@
-                 }
-             };
-             Set<Pair<Holder<PoiType>, BlockPos>> set = poiManager.findAllWithType(
--                    holder -> holder.is(PoiTypes.HOME), predicate, entity.blockPosition(), 48, PoiManager.Occupancy.ANY
-+                    holder -> holder.is(PoiTypes.HOME), predicate, entity.blockPosition(), level.purpurConfig.villagerNearestBedSensorSearchRadius, PoiManager.Occupancy.ANY  // Purpur - Configurable villager search radius
-                 )
-                 .collect(Collectors.toSet());
-             Path path = AcquirePoi.findPathToPois(entity, set);
+@@ -56,7 +_,7 @@
+             // Paper start - optimise POI access
+             java.util.List<Pair<Holder<PoiType>, BlockPos>> poiposes = new java.util.ArrayList<>();
+             // don't ask me why it's unbounded. ask mojang.
+-            io.papermc.paper.util.PoiAccess.findAnyPoiPositions(poiManager, type -> type.is(PoiTypes.HOME), predicate, entity.blockPosition(), 48, PoiManager.Occupancy.ANY, false, Integer.MAX_VALUE, poiposes);
++            io.papermc.paper.util.PoiAccess.findAnyPoiPositions(poiManager, type -> type.is(PoiTypes.HOME), predicate, entity.blockPosition(), level.purpurConfig.villagerNearestBedSensorSearchRadius, PoiManager.Occupancy.ANY, false, Integer.MAX_VALUE, poiposes); // Purpur - Configurable villager search radius
+             Path path = AcquirePoi.findPathToPois(entity, new java.util.HashSet<>(poiposes));
+             // Paper end - optimise POI access
+             if (path != null && path.canReach()) {

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.state.CraftBlockState) blockstate).revertPlace();
+                         ((org.bukkit.craftbukkit.block.CraftBlockState) blockstate).revertPlace();
 +                        ((org.bukkit.craftbukkit.block.CraftBlock) blockstate.getBlock()).getNMS().getBlock().forgetPlacer(); // Purpur - Store placer on Block when placed
                      }
  
@@ -43,7 +43,7 @@
      public int getDamageValue() {
          return Mth.clamp(this.getOrDefault(DataComponents.DAMAGE, 0), 0, this.getMaxDamage());
      }
-@@ -1274,6 +_,12 @@
+@@ -1280,6 +_,12 @@
      public boolean isEnchanted() {
          return !this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY).isEmpty();
      }

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

@@ -3,20 +3,20 @@
 @@ -36,6 +_,7 @@
      // CraftBukkit start
      @javax.annotation.Nullable
-     private java.util.List<ItemStack> itemStacks;
+     private java.util.Set<ItemStack> itemStacks; // Paper - Improve exact choice recipe ingredients
 +    public Predicate<org.bukkit.inventory.ItemStack> predicate; // Purpur - Add predicate to recipe's ExactChoice ingredient
  
      public boolean isExact() {
          return this.itemStacks != null;
-@@ -89,6 +_,11 @@
- 
-             return false;
+@@ -88,6 +_,11 @@
+             return this.itemStacks.contains(stack); // Paper - Improve exact choice recipe ingredients (hashing FTW!)
          }
+         // CraftBukkit end
 +        // Purpur start - Add predicate to recipe's ExactChoice ingredient
 +        if (predicate != null) {
 +            return predicate.test(stack.asBukkitCopy());
 +        }
 +        // Purpur end - Add predicate to recipe's ExactChoice ingredient
-         // CraftBukkit end
          return stack.is(this.values);
      }
+ 

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 @@
+@@ -160,11 +_,55 @@
      }
      // Paper end - add paper world config
  
@@ -56,7 +56,7 @@
      public CraftWorld getWorld() {
          return this.world;
      }
-@@ -839,6 +_,8 @@
+@@ -840,6 +_,8 @@
          // Paper end - getblock optimisations - cache world height/sections
          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);
  
-@@ -2115,4 +_,14 @@
+@@ -2127,4 +_,14 @@
              return this.id;
          }
      }

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/NaturalSpawner.java
 +++ b/net/minecraft/world/level/NaturalSpawner.java
-@@ -206,7 +_,7 @@
+@@ -261,7 +_,7 @@
                      mutableBlockPos.set(x, y, z);
                      double d = x + 0.5;
                      double d1 = z + 0.5;

purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BlockEntity.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -104,6 +_,10 @@
+@@ -105,6 +_,10 @@
              this.persistentDataContainer.putAll((CompoundTag) persistentDataTag);
          }
          // Paper end - read persistent data container
@@ -11,7 +11,7 @@
      }
  
      public final void loadWithComponents(CompoundTag tag, HolderLookup.Provider registries) {
-@@ -117,6 +_,12 @@
+@@ -118,6 +_,12 @@
      }
  
      protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
@@ -24,7 +24,7 @@
      }
  
      public final CompoundTag saveWithFullMetadata(HolderLookup.Provider registries) {
-@@ -377,4 +_,17 @@
+@@ -379,4 +_,17 @@
          private ComponentHelper() {
          }
      }

purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/EntityStorage.java.patch

@@ -1,8 +1,8 @@
 --- a/net/minecraft/world/level/chunk/storage/EntityStorage.java
 +++ b/net/minecraft/world/level/chunk/storage/EntityStorage.java
-@@ -89,6 +_,7 @@
-             ListTag listTag = new ListTag();
-             entities.getEntities().forEach(entity -> {
+@@ -100,6 +_,7 @@
+                 }
+                 // Paper end - Entity load/save limit per chunk
                  CompoundTag compoundTag1 = new CompoundTag();
 +                if (!entity.canSaveToDisk()) return; // Purpur - Add canSaveToDisk to Entity
                  if (entity.save(compoundTag1)) {

purpur-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/RegionFileStorage.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -238,7 +_,7 @@
+@@ -283,7 +_,7 @@
  
      // Paper start
      private static void printOversizedLog(String msg, Path file, int x, int z) {