Update to Minecraft 1.20.5

By: md_5 <git@md-5.net>
2024-04-24 01:15:00 +10:00
parent 4deda9501f
commit 65bc2541a3
524 changed files with 7788 additions and 6181 deletions
--- a/paper-server/nms-patches/net/minecraft/core/cauldron/CauldronInteraction.patch
+++ b/paper-server/nms-patches/net/minecraft/core/cauldron/CauldronInteraction.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/core/cauldron/CauldronInteraction.java
 +++ b/net/minecraft/core/cauldron/CauldronInteraction.java
-@@ -33,9 +33,15 @@
+@@ -34,9 +34,15 @@
 import net.minecraft.world.level.block.state.IBlockData;
 import net.minecraft.world.level.gameevent.GameEvent;
 
@@ -16,7 +16,7 @@
     Codec<CauldronInteraction.a> CODEC;
     CauldronInteraction.a EMPTY;
     CauldronInteraction.a WATER;
-@@ -47,6 +53,8 @@
+@@ -48,6 +54,8 @@
     CauldronInteraction SHULKER_BOX;
     CauldronInteraction BANNER;
     CauldronInteraction DYED_ITEM;
@@ -25,13 +25,13 @@
 
     static CauldronInteraction.a newInteractionMap(String s) {
         Object2ObjectOpenHashMap<Item, CauldronInteraction> object2objectopenhashmap = new Object2ObjectOpenHashMap();
-@@ -71,12 +79,17 @@
-                 return EnumInteractionResult.PASS;
-             } else {
+@@ -72,12 +80,17 @@
+ 
+             if (potioncontents != null && potioncontents.is(Potions.WATER)) {
                 if (!world.isClientSide) {
 +                    // CraftBukkit start
 +                    if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, Blocks.WATER_CAULDRON.defaultBlockState(), entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_EMPTY)) {
-+                        return EnumInteractionResult.SUCCESS;
+                        return ItemInteractionResult.SUCCESS;
 +                    }
 +                    // CraftBukkit end
                     Item item = itemstack.getItem();
@@ -42,51 +42,51 @@
 -                    world.setBlockAndUpdate(blockposition, Blocks.WATER_CAULDRON.defaultBlockState());
 +                    // world.setBlockAndUpdate(blockposition, Blocks.WATER_CAULDRON.defaultBlockState()); // CraftBukkit
                     world.playSound((EntityHuman) null, blockposition, SoundEffects.BOTTLE_EMPTY, SoundCategory.BLOCKS, 1.0F, 1.0F);
-                     world.gameEvent((Entity) null, GameEvent.FLUID_PLACE, blockposition);
+                     world.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PLACE, blockposition);
                 }
-@@ -94,12 +107,17 @@
+@@ -97,12 +110,17 @@
         });
         map1.put(Items.GLASS_BOTTLE, (iblockdata, world, blockposition, entityhuman, enumhand, itemstack) -> {
             if (!world.isClientSide) {
 +                // CraftBukkit start
 +                if (!LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition, entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_FILL)) {
-+                    return EnumInteractionResult.SUCCESS;
+                    return ItemInteractionResult.SUCCESS;
 +                }
 +                // CraftBukkit end
                 Item item = itemstack.getItem();
 
-                 entityhuman.setItemInHand(enumhand, ItemLiquidUtil.createFilledResult(itemstack, entityhuman, PotionUtil.setPotion(new ItemStack(Items.POTION), Potions.WATER)));
+                 entityhuman.setItemInHand(enumhand, ItemLiquidUtil.createFilledResult(itemstack, entityhuman, PotionContents.createItemStack(Items.POTION, Potions.WATER)));
                 entityhuman.awardStat(StatisticList.USE_CAULDRON);
                 entityhuman.awardStat(StatisticList.ITEM_USED.get(item));
 -                LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition);
 +                // LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition); // CraftBukkit
                 world.playSound((EntityHuman) null, blockposition, SoundEffects.BOTTLE_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F);
-                 world.gameEvent((Entity) null, GameEvent.FLUID_PICKUP, blockposition);
+                 world.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PICKUP, blockposition);
             }
-@@ -109,10 +127,15 @@
-         map1.put(Items.POTION, (iblockdata, world, blockposition, entityhuman, enumhand, itemstack) -> {
-             if ((Integer) iblockdata.getValue(LayeredCauldronBlock.LEVEL) != 3 && PotionUtil.getPotion(itemstack) == Potions.WATER) {
-                 if (!world.isClientSide) {
-+                    // CraftBukkit start
-+                    if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, iblockdata.cycle(LayeredCauldronBlock.LEVEL), entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_EMPTY)) {
-+                        return EnumInteractionResult.SUCCESS;
-+                    }
-+                    // CraftBukkit end
-                     entityhuman.setItemInHand(enumhand, ItemLiquidUtil.createFilledResult(itemstack, entityhuman, new ItemStack(Items.GLASS_BOTTLE)));
-                     entityhuman.awardStat(StatisticList.USE_CAULDRON);
-                     entityhuman.awardStat(StatisticList.ITEM_USED.get(itemstack.getItem()));
-                    world.setBlockAndUpdate(blockposition, (IBlockData) iblockdata.cycle(LayeredCauldronBlock.LEVEL));
-+                    // world.setBlockAndUpdate(blockposition, (IBlockData) iblockdata.cycle(LayeredCauldronBlock.LEVEL)); // CraftBukkit
-                     world.playSound((EntityHuman) null, blockposition, SoundEffects.BOTTLE_EMPTY, SoundCategory.BLOCKS, 1.0F, 1.0F);
-                     world.gameEvent((Entity) null, GameEvent.FLUID_PLACE, blockposition);
-                 }
-@@ -188,12 +211,17 @@
-             return EnumInteractionResult.PASS;
+@@ -117,10 +135,15 @@
+ 
+                 if (potioncontents != null && potioncontents.is(Potions.WATER)) {
+                     if (!world.isClientSide) {
+                        // CraftBukkit start
+                        if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, iblockdata.cycle(LayeredCauldronBlock.LEVEL), entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_EMPTY)) {
+                            return ItemInteractionResult.SUCCESS;
+                        }
+                        // CraftBukkit end
+                         entityhuman.setItemInHand(enumhand, ItemLiquidUtil.createFilledResult(itemstack, entityhuman, new ItemStack(Items.GLASS_BOTTLE)));
+                         entityhuman.awardStat(StatisticList.USE_CAULDRON);
+                         entityhuman.awardStat(StatisticList.ITEM_USED.get(itemstack.getItem()));
+-                        world.setBlockAndUpdate(blockposition, (IBlockData) iblockdata.cycle(LayeredCauldronBlock.LEVEL));
+                        // world.setBlockAndUpdate(blockposition, (IBlockData) iblockdata.cycle(LayeredCauldronBlock.LEVEL)); // CraftBukkit
+                         world.playSound((EntityHuman) null, blockposition, SoundEffects.BOTTLE_EMPTY, SoundCategory.BLOCKS, 1.0F, 1.0F);
+                         world.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PLACE, blockposition);
+                     }
+@@ -198,12 +221,17 @@
+             return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
         } else {
             if (!world.isClientSide) {
 +                // CraftBukkit start
 +                if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, Blocks.CAULDRON.defaultBlockState(), entityhuman, CauldronLevelChangeEvent.ChangeReason.BUCKET_FILL)) {
-+                    return EnumInteractionResult.SUCCESS;
+                    return ItemInteractionResult.SUCCESS;
 +                }
 +                // CraftBukkit end
                 Item item = itemstack.getItem();
@@ -97,15 +97,15 @@
 -                world.setBlockAndUpdate(blockposition, Blocks.CAULDRON.defaultBlockState());
 +                // world.setBlockAndUpdate(blockposition, Blocks.CAULDRON.defaultBlockState()); // CraftBukkit
                 world.playSound((EntityHuman) null, blockposition, soundeffect, SoundCategory.BLOCKS, 1.0F, 1.0F);
-                 world.gameEvent((Entity) null, GameEvent.FLUID_PICKUP, blockposition);
+                 world.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PICKUP, blockposition);
             }
-@@ -204,12 +232,17 @@
+@@ -214,12 +242,17 @@
 
-     static EnumInteractionResult emptyBucket(World world, BlockPosition blockposition, EntityHuman entityhuman, EnumHand enumhand, ItemStack itemstack, IBlockData iblockdata, SoundEffect soundeffect) {
+     static ItemInteractionResult emptyBucket(World world, BlockPosition blockposition, EntityHuman entityhuman, EnumHand enumhand, ItemStack itemstack, IBlockData iblockdata, SoundEffect soundeffect) {
         if (!world.isClientSide) {
 +            // CraftBukkit start
 +            if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, iblockdata, entityhuman, CauldronLevelChangeEvent.ChangeReason.BUCKET_EMPTY)) {
-+                return EnumInteractionResult.SUCCESS;
+                return ItemInteractionResult.SUCCESS;
 +            }
 +            // CraftBukkit end
             Item item = itemstack.getItem();
@@ -116,10 +116,10 @@
 -            world.setBlockAndUpdate(blockposition, iblockdata);
 +            // world.setBlockAndUpdate(blockposition, iblockdata); // CraftBukkit
             world.playSound((EntityHuman) null, blockposition, soundeffect, SoundCategory.BLOCKS, 1.0F, 1.0F);
-             world.gameEvent((Entity) null, GameEvent.FLUID_PLACE, blockposition);
+             world.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PLACE, blockposition);
         }
-@@ -217,32 +250,35 @@
-         return EnumInteractionResult.sidedSuccess(world.isClientSide);
+@@ -227,47 +260,55 @@
+         return ItemInteractionResult.sidedSuccess(world.isClientSide);
     }
 
 -    static {
@@ -127,7 +127,7 @@
 -        Map map = CauldronInteraction.INTERACTIONS;
 -
 -        Objects.requireNonNull(map);
-        CODEC = ExtraCodecs.stringResolverCodec(function, map::get);
+-        CODEC = Codec.stringResolver(function, map::get);
 -        EMPTY = newInteractionMap("empty");
 -        WATER = newInteractionMap("water");
 -        LAVA = newInteractionMap("lava");
@@ -135,7 +135,7 @@
 -        FILL_WATER = (iblockdata, world, blockposition, entityhuman, enumhand, itemstack) -> {
 +    // CraftBukkit start - decompile errors
 +    // static {
-+        Codec<CauldronInteraction.a> CODEC = ExtraCodecs.stringResolverCodec(CauldronInteraction.a::name, CauldronInteraction.INTERACTIONS::get);
+        Codec<CauldronInteraction.a> CODEC = Codec.stringResolver(CauldronInteraction.a::name, CauldronInteraction.INTERACTIONS::get);
 +        CauldronInteraction.a EMPTY = newInteractionMap("empty");
 +        CauldronInteraction.a WATER = newInteractionMap("water");
 +        CauldronInteraction.a LAVA = newInteractionMap("lava");
@@ -157,43 +157,40 @@
             Block block = Block.byItem(itemstack.getItem());
 
             if (!(block instanceof BlockShulkerBox)) {
-                 return EnumInteractionResult.PASS;
+                 return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
             } else {
                 if (!world.isClientSide) {
 +                    // CraftBukkit start
 +                    if (!LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition, entityhuman, CauldronLevelChangeEvent.ChangeReason.SHULKER_WASH)) {
-+                        return EnumInteractionResult.SUCCESS;
+                        return ItemInteractionResult.SUCCESS;
 +                    }
 +                    // CraftBukkit end
-                     ItemStack itemstack1 = new ItemStack(Blocks.SHULKER_BOX);
- 
-                     if (itemstack.hasTag()) {
-@@ -251,17 +287,22 @@
- 
-                     entityhuman.setItemInHand(enumhand, itemstack1);
+                     entityhuman.setItemInHand(enumhand, itemstack.transmuteCopy(Blocks.SHULKER_BOX, 1));
                     entityhuman.awardStat(StatisticList.CLEAN_SHULKER_BOX);
 -                    LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition);
 +                    // LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition); // CraftBukkit
                 }
 
-                 return EnumInteractionResult.sidedSuccess(world.isClientSide);
+                 return ItemInteractionResult.sidedSuccess(world.isClientSide);
             }
         };
 -        BANNER = (iblockdata, world, blockposition, entityhuman, enumhand, itemstack) -> {
 +        CauldronInteraction BANNER = (iblockdata, world, blockposition, entityhuman, enumhand, itemstack) -> { // CraftBukkit - decompile error
-             if (TileEntityBanner.getPatternCount(itemstack) <= 0) {
-                 return EnumInteractionResult.PASS;
+             BannerPatternLayers bannerpatternlayers = (BannerPatternLayers) itemstack.getOrDefault(DataComponents.BANNER_PATTERNS, BannerPatternLayers.EMPTY);
+ 
+             if (bannerpatternlayers.layers().isEmpty()) {
+                 return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
             } else {
                 if (!world.isClientSide) {
 +                    // CraftBukkit start
 +                    if (!LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition, entityhuman, CauldronLevelChangeEvent.ChangeReason.BANNER_WASH)) {
-+                        return EnumInteractionResult.SUCCESS;
+                        return ItemInteractionResult.SUCCESS;
 +                    }
 +                    // CraftBukkit end
                     ItemStack itemstack1 = itemstack.copyWithCount(1);
 
-                     TileEntityBanner.removeLastPattern(itemstack1);
-@@ -278,13 +319,13 @@
+                     itemstack1.set(DataComponents.BANNER_PATTERNS, bannerpatternlayers.removeLast());
+@@ -281,28 +322,33 @@
                     }
 
                     entityhuman.awardStat(StatisticList.CLEAN_BANNER);
@@ -201,31 +198,29 @@
 +                    // LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition); // CraftBukkit
                 }
 
-                 return EnumInteractionResult.sidedSuccess(world.isClientSide);
+                 return ItemInteractionResult.sidedSuccess(world.isClientSide);
             }
         };
 -        DYED_ITEM = (iblockdata, world, blockposition, entityhuman, enumhand, itemstack) -> {
 +        CauldronInteraction DYED_ITEM = (iblockdata, world, blockposition, entityhuman, enumhand, itemstack) -> { // CraftBukkit - decompile error
-             Item item = itemstack.getItem();
- 
-             if (!(item instanceof IDyeable)) {
-@@ -296,16 +337,21 @@
-                     return EnumInteractionResult.PASS;
-                 } else {
-                     if (!world.isClientSide) {
-+                        // CraftBukkit start
-+                        if (!LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition, entityhuman, CauldronLevelChangeEvent.ChangeReason.ARMOR_WASH)) {
-+                            return EnumInteractionResult.SUCCESS;
-+                        }
-+                        // CraftBukkit end
-                         idyeable.clearColor(itemstack);
-                         entityhuman.awardStat(StatisticList.CLEAN_ARMOR);
-                        LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition);
-+                        // LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition); // CraftBukkit
-                     }
- 
-                     return EnumInteractionResult.sidedSuccess(world.isClientSide);
+             if (!itemstack.is(TagsItem.DYEABLE)) {
+                 return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
+             } else if (!itemstack.has(DataComponents.DYED_COLOR)) {
+                 return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
+             } else {
+                 if (!world.isClientSide) {
+                    // CraftBukkit start
+                    if (!LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition, entityhuman, CauldronLevelChangeEvent.ChangeReason.ARMOR_WASH)) {
+                        return ItemInteractionResult.SUCCESS;
+                    }
+                    // CraftBukkit end
+                     itemstack.remove(DataComponents.DYED_COLOR);
+                     entityhuman.awardStat(StatisticList.CLEAN_ARMOR);
+-                    LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition);
+                    // LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition); // CraftBukkit
                 }
+ 
+                 return ItemInteractionResult.sidedSuccess(world.isClientSide);
             }
         };
 -    }
--- a/paper-server/nms-patches/net/minecraft/core/component/DataComponentPatch.patch
+++ b/paper-server/nms-patches/net/minecraft/core/component/DataComponentPatch.patch
@@ -0,0 +1,59 @@
+--- a/net/minecraft/core/component/DataComponentPatch.java
+++ b/net/minecraft/core/component/DataComponentPatch.java
+@@ -61,7 +61,7 @@
+             }
+         }
+ 
+-        return reference2objectmap;
+        return (Reference2ObjectMap) reference2objectmap; // CraftBukkit - decompile error
+     });
+     public static final StreamCodec<RegistryFriendlyByteBuf, DataComponentPatch> STREAM_CODEC = new StreamCodec<RegistryFriendlyByteBuf, DataComponentPatch>() {
+         public DataComponentPatch decode(RegistryFriendlyByteBuf registryfriendlybytebuf) {
+@@ -143,7 +143,7 @@
+         }
+ 
+         private static <T> void encodeComponent(RegistryFriendlyByteBuf registryfriendlybytebuf, DataComponentType<T> datacomponenttype, Object object) {
+-            datacomponenttype.streamCodec().encode(registryfriendlybytebuf, object);
+            datacomponenttype.streamCodec().encode(registryfriendlybytebuf, (T) object); // CraftBukkit - decompile error
+         }
+     };
+     private static final String REMOVED_PREFIX = "!";
+@@ -270,6 +270,38 @@
+ 
+         a() {}
+ 
+        // CraftBukkit start
+        public void copy(DataComponentPatch orig) {
+            this.map.putAll(orig.map);
+        }
+
+        public void clear(DataComponentType<?> type) {
+            this.map.remove(type);
+        }
+
+        public boolean isEmpty() {
+            return this.map.isEmpty();
+        }
+
+        @Override
+        public boolean equals(Object object) {
+            if (this == object) {
+                return true;
+            }
+
+            if (object instanceof DataComponentPatch.a patch) {
+                return this.map.equals(patch.map);
+            }
+
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return this.map.hashCode();
+        }
+        // CraftBukkit end
+
+         public <T> DataComponentPatch.a set(DataComponentType<T> datacomponenttype, T t0) {
+             this.map.put(datacomponenttype, Optional.of(t0));
+             return this;
--- a/paper-server/nms-patches/net/minecraft/core/dispenser/DispenseBehaviorProjectile.patch
+++ b/paper-server/nms-patches/net/minecraft/core/dispenser/DispenseBehaviorProjectile.patch
@@ -1,7 +1,7 @@
 --- a/net/minecraft/core/dispenser/DispenseBehaviorProjectile.java
 +++ b/net/minecraft/core/dispenser/DispenseBehaviorProjectile.java
-@@ -8,6 +8,13 @@
- import net.minecraft.world.level.World;
+@@ -9,6 +9,13 @@
+ import net.minecraft.world.item.ProjectileItem;
 import net.minecraft.world.level.block.BlockDispenser;
 
 +// CraftBukkit start
@@ -11,21 +11,21 @@
 +import org.bukkit.event.block.BlockDispenseEvent;
 +// CraftBukkit end
 +
- public abstract class DispenseBehaviorProjectile extends DispenseBehaviorItem {
+ public class DispenseBehaviorProjectile extends DispenseBehaviorItem {
 
-     public DispenseBehaviorProjectile() {}
-@@ -19,9 +26,38 @@
-         EnumDirection enumdirection = (EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING);
-         IProjectile iprojectile = this.getProjectile(worldserver, iposition, itemstack);
+     private final ProjectileItem projectileItem;
+@@ -32,9 +39,38 @@
+         IPosition iposition = this.dispenseConfig.positionFunction().getDispensePosition(sourceblock, enumdirection);
+         IProjectile iprojectile = this.projectileItem.asProjectile(worldserver, iposition, itemstack, enumdirection);
 
-        iprojectile.shoot((double) enumdirection.getStepX(), (double) ((float) enumdirection.getStepY() + 0.1F), (double) enumdirection.getStepZ(), this.getPower(), this.getUncertainty());
+-        this.projectileItem.shoot(iprojectile, (double) enumdirection.getStepX(), (double) enumdirection.getStepY(), (double) enumdirection.getStepZ(), this.dispenseConfig.power(), this.dispenseConfig.uncertainty());
 +        // CraftBukkit start
-+        // iprojectile.shoot((double) enumdirection.getStepX(), (double) ((float) enumdirection.getStepY() + 0.1F), (double) enumdirection.getStepZ(), this.getPower(), this.getUncertainty());
+        // this.projectileItem.shoot(iprojectile, (double) enumdirection.getStepX(), (double) enumdirection.getStepY(), (double) enumdirection.getStepZ(), this.dispenseConfig.power(), this.dispenseConfig.uncertainty());
 +        ItemStack itemstack1 = itemstack.split(1);
 +        org.bukkit.block.Block block = CraftBlock.at(worldserver, sourceblock.pos());
 +        CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
 +
-+        BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector((double) enumdirection.getStepX(), (double) ((float) enumdirection.getStepY() + 0.1F), (double) enumdirection.getStepZ()));
+        BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector((double) enumdirection.getStepX(), (double) enumdirection.getStepY(), (double) enumdirection.getStepZ()));
 +        if (!BlockDispenser.eventFired) {
 +            worldserver.getCraftServer().getPluginManager().callEvent(event);
 +        }
@@ -46,7 +46,7 @@
 +            }
 +        }
 +
-+        iprojectile.shoot(event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), this.getPower(), this.getUncertainty());
+        this.projectileItem.shoot(iprojectile, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), this.dispenseConfig.power(), this.dispenseConfig.uncertainty());
 +        ((Entity) iprojectile).projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource(sourceblock.blockEntity());
 +        // CraftBukkit end
         worldserver.addFreshEntity(iprojectile);
--- a/paper-server/nms-patches/net/minecraft/core/dispenser/DispenseBehaviorShears.patch
+++ b/paper-server/nms-patches/net/minecraft/core/dispenser/DispenseBehaviorShears.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/core/dispenser/DispenseBehaviorShears.java
 +++ b/net/minecraft/core/dispenser/DispenseBehaviorShears.java
-@@ -22,6 +22,13 @@
+@@ -23,6 +23,13 @@
 import net.minecraft.world.level.gameevent.GameEvent;
 import net.minecraft.world.phys.AxisAlignedBB;
 
@@ -14,7 +14,7 @@
 public class DispenseBehaviorShears extends DispenseBehaviorMaybe {
 
     public DispenseBehaviorShears() {}
-@@ -29,11 +36,34 @@
+@@ -30,11 +37,34 @@
     @Override
     protected ItemStack execute(SourceBlock sourceblock, ItemStack itemstack) {
         WorldServer worldserver = sourceblock.level();
@@ -47,10 +47,10 @@
 
 -            this.setSuccess(tryShearBeehive(worldserver, blockposition) || tryShearLivingEntity(worldserver, blockposition));
 +            this.setSuccess(tryShearBeehive(worldserver, blockposition) || tryShearLivingEntity(worldserver, blockposition, bukkitBlock, craftItem)); // CraftBukkit
-             if (this.isSuccess() && itemstack.hurt(1, worldserver.getRandom(), (EntityPlayer) null)) {
-                 itemstack.setCount(0);
-             }
-@@ -62,7 +92,7 @@
+             if (this.isSuccess()) {
+                 itemstack.hurtAndBreak(1, worldserver.getRandom(), (EntityPlayer) null, () -> {
+                     itemstack.setCount(0);
+@@ -65,7 +95,7 @@
         return false;
     }
 
@@ -59,9 +59,9 @@
         List<EntityLiving> list = worldserver.getEntitiesOfClass(EntityLiving.class, new AxisAlignedBB(blockposition), IEntitySelector.NO_SPECTATORS);
         Iterator iterator = list.iterator();
 
-@@ -73,6 +103,11 @@
-                 IShearable ishearable = (IShearable) entityliving;
+@@ -74,6 +104,11 @@
 
+             if (entityliving instanceof IShearable ishearable) {
                 if (ishearable.readyForShearing()) {
 +                    // CraftBukkit start
 +                    if (CraftEventFactory.callBlockShearEntityEvent(entityliving, bukkitBlock, craftItem).isCancelled()) {
@@ -69,5 +69,5 @@
 +                    }
 +                    // CraftBukkit end
                     ishearable.shear(SoundCategory.BLOCKS);
-                     worldserver.gameEvent((Entity) null, GameEvent.SHEAR, blockposition);
+                     worldserver.gameEvent((Entity) null, (Holder) GameEvent.SHEAR, blockposition);
                     return true;
--- a/paper-server/nms-patches/net/minecraft/core/dispenser/IDispenseBehavior.patch
+++ b/paper-server/nms-patches/net/minecraft/core/dispenser/IDispenseBehavior.patch
@@ -1,7 +1,7 @@
 --- a/net/minecraft/core/dispenser/IDispenseBehavior.java
 +++ b/net/minecraft/core/dispenser/IDispenseBehavior.java
-@@ -77,6 +77,22 @@
- import net.minecraft.world.phys.Vec3D;
+@@ -66,6 +66,22 @@
+ import net.minecraft.world.phys.MovingObjectPositionBlock;
 import org.slf4j.Logger;
 
 +// CraftBukkit start
@@ -23,9 +23,9 @@
 public interface IDispenseBehavior {
 
     Logger LOGGER = LogUtils.getLogger();
-@@ -201,14 +217,42 @@
+@@ -93,14 +109,42 @@
                 EnumDirection enumdirection = (EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING);
-                 EntityTypes entitytypes = ((ItemMonsterEgg) itemstack.getItem()).getType(itemstack.getTag());
+                 EntityTypes<?> entitytypes = ((ItemMonsterEgg) itemstack.getItem()).getType(itemstack);
 
 +                // CraftBukkit start
 +                WorldServer worldserver = sourceblock.level();
@@ -65,10 +65,10 @@
 -                itemstack.shrink(1);
 +                // itemstack.shrink(1); // Handled during event processing
 +                // CraftBukkit end
-                 sourceblock.level().gameEvent((Entity) null, GameEvent.ENTITY_PLACE, sourceblock.pos());
+                 sourceblock.level().gameEvent((Entity) null, (Holder) GameEvent.ENTITY_PLACE, sourceblock.pos());
                 return itemstack;
             }
-@@ -227,13 +271,41 @@
+@@ -119,13 +163,41 @@
                 EnumDirection enumdirection = (EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING);
                 BlockPosition blockposition = sourceblock.pos().relative(enumdirection);
                 WorldServer worldserver = sourceblock.level();
@@ -103,7 +103,7 @@
                 Consumer<EntityArmorStand> consumer = EntityTypes.appendDefaultStackConfig((entityarmorstand) -> {
                     entityarmorstand.setYRot(enumdirection.toYRot());
                 }, worldserver, itemstack, (EntityHuman) null);
-                 EntityArmorStand entityarmorstand = (EntityArmorStand) EntityTypes.ARMOR_STAND.spawn(worldserver, itemstack.getTag(), consumer, blockposition, EnumMobSpawn.DISPENSER, false, false);
+                 EntityArmorStand entityarmorstand = (EntityArmorStand) EntityTypes.ARMOR_STAND.spawn(worldserver, consumer, blockposition, EnumMobSpawn.DISPENSER, false, false);
 
                 if (entityarmorstand != null) {
 -                    itemstack.shrink(1);
@@ -111,13 +111,13 @@
                 }
 
                 return itemstack;
-@@ -254,8 +326,35 @@
+@@ -144,8 +216,35 @@
                 });
 
                 if (!list.isEmpty()) {
 +                    // CraftBukkit start
 +                    ItemStack itemstack1 = itemstack.split(1);
-+                    World world = sourceblock.level();
+                    WorldServer world = sourceblock.level();
 +                    org.bukkit.block.Block block = CraftBlock.at(world, sourceblock.pos());
 +                    CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
 +
@@ -148,14 +148,14 @@
                     this.setSuccess(true);
                     return itemstack;
                 } else {
-@@ -282,7 +381,35 @@
+@@ -172,7 +271,35 @@
                     entityhorseabstract = (EntityHorseAbstract) iterator1.next();
-                 } while (!entityhorseabstract.isArmor(itemstack) || entityhorseabstract.isWearingArmor() || !entityhorseabstract.isTamed());
+                 } while (!entityhorseabstract.isBodyArmorItem(itemstack) || entityhorseabstract.isWearingBodyArmor() || !entityhorseabstract.isTamed());
 
-                entityhorseabstract.getSlot(401).set(itemstack.split(1));
+-                entityhorseabstract.setBodyArmorItem(itemstack.split(1));
 +                // CraftBukkit start
 +                ItemStack itemstack1 = itemstack.split(1);
-+                World world = sourceblock.level();
+                WorldServer world = sourceblock.level();
 +                org.bukkit.block.Block block = CraftBlock.at(world, sourceblock.pos());
 +                CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
 +
@@ -180,12 +180,12 @@
 +                    }
 +                }
 +
-+                entityhorseabstract.getSlot(401).set(CraftItemStack.asNMSCopy(event.getItem()));
+                entityhorseabstract.setBodyArmorItem(CraftItemStack.asNMSCopy(event.getItem()));
 +                // CraftBukkit end
                 this.setSuccess(true);
                 return itemstack;
             }
-@@ -325,9 +452,35 @@
+@@ -215,9 +342,35 @@
                     }
 
                     entityhorsechestedabstract = (EntityHorseChestedAbstract) iterator1.next();
@@ -193,7 +193,7 @@
 +                    // CraftBukkit start
 +                } while (!entityhorsechestedabstract.isTamed());
 +                ItemStack itemstack1 = itemstack.split(1);
-+                World world = sourceblock.level();
+                WorldServer world = sourceblock.level();
 +                org.bukkit.block.Block block = CraftBlock.at(world, sourceblock.pos());
 +                CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
 
@@ -223,96 +223,7 @@
                 this.setSuccess(true);
                 return itemstack;
             }
-@@ -336,12 +489,41 @@
-             @Override
-             public ItemStack execute(SourceBlock sourceblock, ItemStack itemstack) {
-                 EnumDirection enumdirection = (EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING);
-+                // CraftBukkit start
-+                WorldServer worldserver = sourceblock.level();
-+                ItemStack itemstack1 = itemstack.split(1);
-+                org.bukkit.block.Block block = CraftBlock.at(worldserver, sourceblock.pos());
-+                CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
-+
-+                BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(enumdirection.getStepX(), enumdirection.getStepY(), enumdirection.getStepZ()));
-+                if (!BlockDispenser.eventFired) {
-+                    worldserver.getCraftServer().getPluginManager().callEvent(event);
-+                }
-+
-+                if (event.isCancelled()) {
-+                    itemstack.grow(1);
-+                    return itemstack;
-+                }
-+
-+                if (!event.getItem().equals(craftItem)) {
-+                    itemstack.grow(1);
-+                    // Chain to handler for new item
-+                    ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                    IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                    if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                        idispensebehavior.dispense(sourceblock, eventStack);
-+                        return itemstack;
-+                    }
-+                }
-+
-+                itemstack1 = CraftItemStack.asNMSCopy(event.getItem());
-                 Vec3D vec3d = IDispenseBehavior.getEntityPokingOutOfBlockPos(sourceblock, EntityTypes.FIREWORK_ROCKET, enumdirection);
-                 EntityFireworks entityfireworks = new EntityFireworks(sourceblock.level(), itemstack, vec3d.x(), vec3d.y(), vec3d.z(), true);
- 
-                 entityfireworks.shoot((double) enumdirection.getStepX(), (double) enumdirection.getStepY(), (double) enumdirection.getStepZ(), 0.5F, 1.0F);
-                 sourceblock.level().addFreshEntity(entityfireworks);
-                itemstack.shrink(1);
-+                // itemstack.shrink(1); // Handled during event processing
-+                // CraftBukkit end
-                 return itemstack;
-             }
- 
-@@ -363,12 +545,40 @@
-                 double d3 = randomsource.triangle((double) enumdirection.getStepX(), 0.11485000000000001D);
-                 double d4 = randomsource.triangle((double) enumdirection.getStepY(), 0.11485000000000001D);
-                 double d5 = randomsource.triangle((double) enumdirection.getStepZ(), 0.11485000000000001D);
-                EntitySmallFireball entitysmallfireball = new EntitySmallFireball(worldserver, d0, d1, d2, d3, d4, d5);
- 
-                worldserver.addFreshEntity((Entity) SystemUtils.make(entitysmallfireball, (entitysmallfireball1) -> {
-                    entitysmallfireball1.setItem(itemstack);
-                }));
-                itemstack.shrink(1);
-+                // CraftBukkit start
-+                ItemStack itemstack1 = itemstack.split(1);
-+                org.bukkit.block.Block block = CraftBlock.at(worldserver, sourceblock.pos());
-+                CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
-+
-+                BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(d3, d4, d5));
-+                if (!BlockDispenser.eventFired) {
-+                    worldserver.getCraftServer().getPluginManager().callEvent(event);
-+                }
-+
-+                if (event.isCancelled()) {
-+                    itemstack.grow(1);
-+                    return itemstack;
-+                }
-+
-+                if (!event.getItem().equals(craftItem)) {
-+                    itemstack.grow(1);
-+                    // Chain to handler for new item
-+                    ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                    IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                    if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                        idispensebehavior.dispense(sourceblock, eventStack);
-+                        return itemstack;
-+                    }
-+                }
-+
-+                EntitySmallFireball entitysmallfireball = new EntitySmallFireball(worldserver, d0, d1, d2, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ());
-+                entitysmallfireball.setItem(itemstack1);
-+                entitysmallfireball.projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource(sourceblock.blockEntity());
-+
-+                worldserver.addFreshEntity(entitysmallfireball);
-+                // itemstack.shrink(1); // Handled during event processing
-+                // CraftBukkit end
-                 return itemstack;
-             }
- 
-@@ -404,9 +614,51 @@
+@@ -249,9 +402,51 @@
                 BlockPosition blockposition = sourceblock.pos().relative((EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING));
                 WorldServer worldserver = sourceblock.level();
 
@@ -365,17 +276,17 @@
                 } else {
                     return this.defaultDispenseItemBehavior.dispense(sourceblock, itemstack);
                 }
-@@ -434,7 +686,7 @@
+@@ -278,7 +473,7 @@
+                 Block block = iblockdata.getBlock();
 
-                 if (block instanceof IFluidSource) {
-                     IFluidSource ifluidsource = (IFluidSource) block;
+                 if (block instanceof IFluidSource ifluidsource) {
 -                    ItemStack itemstack1 = ifluidsource.pickupBlock((EntityHuman) null, worldserver, blockposition, iblockdata);
 +                    ItemStack itemstack1 = ifluidsource.pickupBlock((EntityHuman) null, DummyGeneratorAccess.INSTANCE, blockposition, iblockdata); // CraftBukkit
 
                     if (itemstack1.isEmpty()) {
                         return super.execute(sourceblock, itemstack);
-@@ -442,6 +694,32 @@
-                         worldserver.gameEvent((Entity) null, GameEvent.FLUID_PICKUP, blockposition);
+@@ -286,6 +481,32 @@
+                         worldserver.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PICKUP, blockposition);
                         Item item = itemstack1.getItem();
 
 +                        // CraftBukkit start
@@ -407,7 +318,7 @@
                         itemstack.shrink(1);
                         if (itemstack.isEmpty()) {
                             return new ItemStack(item);
-@@ -463,16 +741,44 @@
+@@ -307,16 +528,44 @@
             protected ItemStack execute(SourceBlock sourceblock, ItemStack itemstack) {
                 WorldServer worldserver = sourceblock.level();
 
@@ -442,11 +353,11 @@
 
                 if (BlockFireAbstract.canBePlacedAt(worldserver, blockposition, enumdirection)) {
 -                    worldserver.setBlockAndUpdate(blockposition, BlockFireAbstract.getState(worldserver, blockposition));
-                    worldserver.gameEvent((Entity) null, GameEvent.BLOCK_PLACE, blockposition);
+-                    worldserver.gameEvent((Entity) null, (Holder) GameEvent.BLOCK_PLACE, blockposition);
 +                    // CraftBukkit start - Ignition by dispensing flint and steel
 +                    if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(worldserver, blockposition, sourceblock.pos()).isCancelled()) {
 +                        worldserver.setBlockAndUpdate(blockposition, BlockFireAbstract.getState(worldserver, blockposition));
-+                        worldserver.gameEvent((Entity) null, GameEvent.BLOCK_PLACE, blockposition);
+                        worldserver.gameEvent((Entity) null, (Holder) GameEvent.BLOCK_PLACE, blockposition);
 +                    }
 +                    // CraftBukkit end
                 } else if (!BlockCampfire.canLight(iblockdata) && !CandleBlock.canLight(iblockdata) && !CandleCakeBlock.canLight(iblockdata)) {
@@ -455,7 +366,7 @@
                         BlockTNT.explode(worldserver, blockposition);
                         worldserver.removeBlock(blockposition, false);
                     } else {
-@@ -496,12 +802,62 @@
+@@ -342,12 +591,62 @@
                 this.setSuccess(true);
                 WorldServer worldserver = sourceblock.level();
                 BlockPosition blockposition = sourceblock.pos().relative((EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING));
@@ -488,7 +399,7 @@
                 if (!ItemBoneMeal.growCrop(itemstack, worldserver, blockposition) && !ItemBoneMeal.growWaterPlant(itemstack, worldserver, blockposition, (EnumDirection) null)) {
                     this.setSuccess(false);
                 } else if (!worldserver.isClientSide) {
-                     worldserver.levelEvent(1505, blockposition, 0);
+                     worldserver.levelEvent(1505, blockposition, 15);
                 }
 +                // CraftBukkit start
 +                worldserver.captureTreeGeneration = false;
@@ -518,7 +429,7 @@
 
                 return itemstack;
             }
-@@ -511,12 +867,41 @@
+@@ -357,12 +656,41 @@
             protected ItemStack execute(SourceBlock sourceblock, ItemStack itemstack) {
                 WorldServer worldserver = sourceblock.level();
                 BlockPosition blockposition = sourceblock.pos().relative((EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING));
@@ -556,13 +467,13 @@
 
                 worldserver.addFreshEntity(entitytntprimed);
                 worldserver.playSound((EntityHuman) null, entitytntprimed.getX(), entitytntprimed.getY(), entitytntprimed.getZ(), SoundEffects.TNT_PRIMED, SoundCategory.BLOCKS, 1.0F, 1.0F);
-                 worldserver.gameEvent((Entity) null, GameEvent.ENTITY_PLACE, blockposition);
+                 worldserver.gameEvent((Entity) null, (Holder) GameEvent.ENTITY_PLACE, blockposition);
 -                itemstack.shrink(1);
 +                // itemstack.shrink(1); // CraftBukkit - handled above
                 return itemstack;
             }
         });
-@@ -541,6 +926,30 @@
+@@ -387,6 +715,30 @@
                 EnumDirection enumdirection = (EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING);
                 BlockPosition blockposition = sourceblock.pos().relative(enumdirection);
 
@@ -592,8 +503,8 @@
 +
                 if (worldserver.isEmptyBlock(blockposition) && BlockWitherSkull.canSpawnMob(worldserver, blockposition, itemstack)) {
                     worldserver.setBlock(blockposition, (IBlockData) Blocks.WITHER_SKELETON_SKULL.defaultBlockState().setValue(BlockSkull.ROTATION, RotationSegment.convertToSegment(enumdirection)), 3);
-                     worldserver.gameEvent((Entity) null, GameEvent.BLOCK_PLACE, blockposition);
-@@ -566,6 +975,30 @@
+                     worldserver.gameEvent((Entity) null, (Holder) GameEvent.BLOCK_PLACE, blockposition);
+@@ -412,6 +764,30 @@
                 BlockPosition blockposition = sourceblock.pos().relative((EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING));
                 BlockPumpkinCarved blockpumpkincarved = (BlockPumpkinCarved) Blocks.CARVED_PUMPKIN;
 
@@ -624,7 +535,7 @@
                 if (worldserver.isEmptyBlock(blockposition) && blockpumpkincarved.canSpawnGolem(worldserver, blockposition)) {
                     if (!worldserver.isClientSide) {
                         worldserver.setBlock(blockposition, blockpumpkincarved.defaultBlockState(), 3);
-@@ -615,6 +1048,30 @@
+@@ -461,6 +837,30 @@
                 BlockPosition blockposition = sourceblock.pos().relative((EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING));
                 IBlockData iblockdata = worldserver.getBlockState(blockposition);
 
@@ -655,3 +566,35 @@
                 if (iblockdata.is(TagsBlock.BEEHIVES, (blockbase_blockdata) -> {
                     return blockbase_blockdata.hasProperty(BlockBeehive.HONEY_LEVEL) && blockbase_blockdata.getBlock() instanceof BlockBeehive;
                 }) && (Integer) iblockdata.getValue(BlockBeehive.HONEY_LEVEL) >= 5) {
+@@ -510,6 +910,31 @@
+                     this.setSuccess(false);
+                     return itemstack;
+                 } else {
+                    // CraftBukkit start
+                    ItemStack itemstack1 = itemstack;
+                    WorldServer world = sourceblock.level();
+                    org.bukkit.block.Block block = CraftBlock.at(world, sourceblock.pos());
+                    CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
+
+                    BlockDispenseEvent event = new BlockDispenseArmorEvent(block, craftItem.clone(), (org.bukkit.craftbukkit.entity.CraftLivingEntity) list.get(0).getBukkitEntity());
+                    if (!BlockDispenser.eventFired) {
+                        world.getCraftServer().getPluginManager().callEvent(event);
+                    }
+
+                    if (event.isCancelled()) {
+                        return itemstack;
+                    }
+
+                    if (!event.getItem().equals(craftItem)) {
+                        // Chain to handler for new item
+                        ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
+                        IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
+                        if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != ItemArmor.DISPENSE_ITEM_BEHAVIOR) {
+                            idispensebehavior.dispense(sourceblock, eventStack);
+                            return itemstack;
+                        }
+                    }
+                    // CraftBukkit end
+                     Iterator iterator1 = list.iterator();
+ 
+                     Armadillo armadillo;