--- a/net/minecraft/world/item/ItemStack.java +++ b/net/minecraft/world/item/ItemStack.java @@ -23,6 +23,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; import net.minecraft.core.Holder; import net.minecraft.core.HolderLookup; import net.minecraft.core.HolderSet; @@ -46,10 +47,12 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket; import net.minecraft.resources.RegistryOps; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundSource; import net.minecraft.stats.Stats; import net.minecraft.tags.TagKey; import net.minecraft.util.ExtraCodecs; @@ -70,7 +73,6 @@ import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.decoration.ItemFrame; import net.minecraft.world.entity.item.ItemEntity; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.flag.FeatureFlagSet; import net.minecraft.world.inventory.ClickAction; import net.minecraft.world.inventory.Slot; @@ -88,26 +90,53 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.ItemEnchantments; import net.minecraft.world.item.enchantment.Repairable; -import net.minecraft.world.level.ItemLike; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.pattern.BlockInWorld; import net.minecraft.world.level.saveddata.maps.MapId; import org.apache.commons.lang3.mutable.MutableBoolean; import org.slf4j.Logger; +// CraftBukkit start +import java.util.Map; +import java.util.Objects; +import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.BaseEntityBlock; +import net.minecraft.world.level.block.BedBlock; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.SaplingBlock; +import net.minecraft.world.level.block.SignBlock; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.WitherSkullBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.entity.SkullBlockEntity; +import net.minecraft.world.level.block.state.pattern.BlockInWorld; +import net.minecraft.world.level.gameevent.GameEvent; +import org.bukkit.Location; +import org.bukkit.TreeType; +import org.bukkit.block.BlockState; +import org.bukkit.craftbukkit.block.CapturedBlockState; +import org.bukkit.craftbukkit.block.CraftBlock; +import org.bukkit.craftbukkit.block.CraftBlockState; +import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.craftbukkit.util.CraftLocation; +import org.bukkit.entity.Player; +import org.bukkit.event.block.BlockFertilizeEvent; +import org.bukkit.event.player.PlayerItemDamageEvent; +import org.bukkit.event.world.StructureGrowEvent; +// CraftBukkit end + public final class ItemStack implements DataComponentHolder { private static final List OP_NBT_WARNING = List.of(Component.translatable("item.op_warning.line1").withStyle(ChatFormatting.RED, ChatFormatting.BOLD), Component.translatable("item.op_warning.line2").withStyle(ChatFormatting.RED), Component.translatable("item.op_warning.line3").withStyle(ChatFormatting.RED)); public static final Codec CODEC = Codec.lazyInitialized(() -> { - return RecordCodecBuilder.create((instance) -> { + return RecordCodecBuilder.create((instance) -> { // CraftBukkit - decompile error return instance.group(Item.CODEC.fieldOf("id").forGetter(ItemStack::getItemHolder), ExtraCodecs.intRange(1, 99).fieldOf("count").orElse(1).forGetter(ItemStack::getCount), DataComponentPatch.CODEC.optionalFieldOf("components", DataComponentPatch.EMPTY).forGetter((itemstack) -> { return itemstack.components.asPatch(); })).apply(instance, ItemStack::new); }); }); public static final Codec SINGLE_ITEM_CODEC = Codec.lazyInitialized(() -> { - return RecordCodecBuilder.create((instance) -> { + return RecordCodecBuilder.create((instance) -> { // CraftBukkit - decompile error return instance.group(Item.CODEC.fieldOf("id").forGetter(ItemStack::getItemHolder), DataComponentPatch.CODEC.optionalFieldOf("components", DataComponentPatch.EMPTY).forGetter((itemstack) -> { return itemstack.components.asPatch(); })).apply(instance, (holder, datacomponentpatch) -> { @@ -132,20 +161,38 @@ if (i <= 0) { return ItemStack.EMPTY; } else { - Holder holder = (Holder) null.ITEM_STREAM_CODEC.decode(registryfriendlybytebuf); + Holder holder = (Holder) ITEM_STREAM_CODEC.decode(registryfriendlybytebuf); // CraftBukkit - decompile error DataComponentPatch datacomponentpatch = (DataComponentPatch) DataComponentPatch.STREAM_CODEC.decode(registryfriendlybytebuf); - return new ItemStack(holder, i, datacomponentpatch); + // CraftBukkit start + ItemStack itemstack = new ItemStack(holder, i, datacomponentpatch); + if (false && !datacomponentpatch.isEmpty()) { // Paper - This is no longer needed with raw NBT being handled in metadata + CraftItemStack.setItemMeta(itemstack, CraftItemStack.getItemMeta(itemstack)); + } + return itemstack; + // CraftBukkit end } } public void encode(RegistryFriendlyByteBuf registryfriendlybytebuf, ItemStack itemstack) { - if (itemstack.isEmpty()) { + if (itemstack.isEmpty() || itemstack.getItem() == null) { // CraftBukkit - NPE fix itemstack.getItem() registryfriendlybytebuf.writeVarInt(0); } else { registryfriendlybytebuf.writeVarInt(itemstack.getCount()); - null.ITEM_STREAM_CODEC.encode(registryfriendlybytebuf, itemstack.getItemHolder()); + // Spigot start - filter + // itemstack = itemstack.copy(); + // CraftItemStack.setItemMeta(itemstack, CraftItemStack.getItemMeta(itemstack)); // Paper - This is no longer with raw NBT being handled in metadata + // Spigot end + ITEM_STREAM_CODEC.encode(registryfriendlybytebuf, itemstack.getItemHolder()); // CraftBukkit - decompile error + // Paper start - adventure; conditionally render translatable components + boolean prev = net.minecraft.network.chat.ComponentSerialization.DONT_RENDER_TRANSLATABLES.get(); + try { + net.minecraft.network.chat.ComponentSerialization.DONT_RENDER_TRANSLATABLES.set(true); DataComponentPatch.STREAM_CODEC.encode(registryfriendlybytebuf, itemstack.components.asPatch()); + } finally { + net.minecraft.network.chat.ComponentSerialization.DONT_RENDER_TRANSLATABLES.set(prev); + } + // Paper end - adventure; conditionally render translatable components } } }; @@ -187,7 +234,7 @@ return dataresult.isError() ? dataresult.map((unit) -> { return stack; - }) : (stack.getCount() > stack.getMaxStackSize() ? DataResult.error(() -> { + }) : (stack.getCount() > stack.getMaxStackSize() ? DataResult.error(() -> { // CraftBukkit - decompile error int i = stack.getCount(); return "Item stack with stack size of " + i + " was larger than maximum: " + stack.getMaxStackSize(); @@ -294,8 +341,9 @@ j = itemstack.getMaxStackSize(); } while (i <= j); + int finalI = i, finalJ = j; // CraftBukkit - decompile error return DataResult.error(() -> { - return "Item stack with count of " + i + " was larger than maximum: " + j; + return "Item stack with count of " + finalI + " was larger than maximum: " + finalJ; // CraftBukkit - decompile error }); } } @@ -370,32 +418,196 @@ } public InteractionResult useOn(UseOnContext context) { - Player entityhuman = context.getPlayer(); + net.minecraft.world.entity.player.Player entityhuman = context.getPlayer(); BlockPos blockposition = context.getClickedPos(); if (entityhuman != null && !entityhuman.getAbilities().mayBuild && !this.canPlaceOnBlockInAdventureMode(new BlockInWorld(context.getLevel(), blockposition, false))) { return InteractionResult.PASS; } else { Item item = this.getItem(); - InteractionResult enuminteractionresult = item.useOn(context); + // CraftBukkit start - handle all block place event logic here + DataComponentPatch oldData = this.components.asPatch(); + int oldCount = this.getCount(); + ServerLevel world = (ServerLevel) context.getLevel(); + + if (!(item instanceof BucketItem/* || item instanceof SolidBucketItem*/)) { // if not bucket // Paper - Fix cancelled powdered snow bucket placement + world.captureBlockStates = true; + // special case bonemeal + if (item == Items.BONE_MEAL) { + world.captureTreeGeneration = true; + } + } + InteractionResult enuminteractionresult; + try { + enuminteractionresult = item.useOn(context); + } finally { + world.captureBlockStates = false; + } + DataComponentPatch newData = this.components.asPatch(); + int newCount = this.getCount(); + this.setCount(oldCount); + this.restorePatch(oldData); + if (enuminteractionresult.consumesAction() && world.captureTreeGeneration && world.capturedBlockStates.size() > 0) { + world.captureTreeGeneration = false; + Location location = CraftLocation.toBukkit(blockposition, world.getWorld()); + TreeType treeType = SaplingBlock.treeType; + SaplingBlock.treeType = null; + List blocks = new java.util.ArrayList<>(world.capturedBlockStates.values()); + world.capturedBlockStates.clear(); + StructureGrowEvent structureEvent = null; + if (treeType != null) { + boolean isBonemeal = this.getItem() == Items.BONE_MEAL; + structureEvent = new StructureGrowEvent(location, treeType, isBonemeal, (Player) entityhuman.getBukkitEntity(), (List< BlockState>) (List) blocks); + org.bukkit.Bukkit.getPluginManager().callEvent(structureEvent); + } + BlockFertilizeEvent fertilizeEvent = new BlockFertilizeEvent(CraftBlock.at(world, blockposition), (Player) entityhuman.getBukkitEntity(), (List< BlockState>) (List) blocks); + fertilizeEvent.setCancelled(structureEvent != null && structureEvent.isCancelled()); + org.bukkit.Bukkit.getPluginManager().callEvent(fertilizeEvent); + + if (!fertilizeEvent.isCancelled()) { + // Change the stack to its new contents if it hasn't been tampered with. + if (this.getCount() == oldCount && Objects.equals(this.components.asPatch(), oldData)) { + this.restorePatch(newData); + this.setCount(newCount); + } + for (CraftBlockState blockstate : blocks) { + // SPIGOT-7572 - Move fix for SPIGOT-7248 to CapturedBlockState, to allow bees in bee nest + CapturedBlockState.setBlockState(blockstate); + world.checkCapturedTreeStateForObserverNotify(blockposition, blockstate); // Paper - notify observers even if grow failed + } + entityhuman.awardStat(Stats.ITEM_USED.get(item)); // SPIGOT-7236 - award stat + } + + SignItem.openSign = null; // SPIGOT-6758 - Reset on early return + return enuminteractionresult; + } + world.captureTreeGeneration = false; + if (entityhuman != null && enuminteractionresult instanceof InteractionResult.Success) { InteractionResult.Success enuminteractionresult_d = (InteractionResult.Success) enuminteractionresult; if (enuminteractionresult_d.wasItemInteraction()) { - entityhuman.awardStat(Stats.ITEM_USED.get(item)); + InteractionHand enumhand = context.getHand(); + org.bukkit.event.block.BlockPlaceEvent placeEvent = null; + List blocks = new java.util.ArrayList<>(world.capturedBlockStates.values()); + world.capturedBlockStates.clear(); + if (blocks.size() > 1) { + placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockMultiPlaceEvent(world, entityhuman, enumhand, blocks, blockposition.getX(), blockposition.getY(), blockposition.getZ()); + } else if (blocks.size() == 1 && item != Items.POWDER_SNOW_BUCKET) { // Paper - Fix cancelled powdered snow bucket placement + placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPlaceEvent(world, entityhuman, enumhand, blocks.get(0), blockposition.getX(), blockposition.getY(), blockposition.getZ()); + } + + if (placeEvent != null && (placeEvent.isCancelled() || !placeEvent.canBuild())) { + enuminteractionresult = InteractionResult.FAIL; // cancel placement + // PAIL: Remove this when MC-99075 fixed + placeEvent.getPlayer().updateInventory(); + world.capturedTileEntities.clear(); // Paper - Allow chests to be placed with NBT data; clear out block entities as chests and such will pop loot + // revert back all captured blocks + world.preventPoiUpdated = true; // CraftBukkit - SPIGOT-5710 + for (BlockState blockstate : blocks) { + blockstate.update(true, false); + } + world.preventPoiUpdated = false; + + // Brute force all possible updates + BlockPos placedPos = ((CraftBlock) placeEvent.getBlock()).getPosition(); + for (Direction dir : Direction.values()) { + ((ServerPlayer) entityhuman).connection.send(new ClientboundBlockUpdatePacket(world, placedPos.relative(dir))); + } + SignItem.openSign = null; // SPIGOT-6758 - Reset on early return + } else { + // Change the stack to its new contents if it hasn't been tampered with. + if (this.getCount() == oldCount && Objects.equals(this.components.asPatch(), oldData)) { + this.restorePatch(newData); + this.setCount(newCount); + } + + for (Map.Entry e : world.capturedTileEntities.entrySet()) { + world.setBlockEntity(e.getValue()); + } + + for (BlockState blockstate : blocks) { + int updateFlag = ((CraftBlockState) blockstate).getFlag(); + net.minecraft.world.level.block.state.BlockState oldBlock = ((CraftBlockState) blockstate).getHandle(); + BlockPos newblockposition = ((CraftBlockState) blockstate).getPosition(); + net.minecraft.world.level.block.state.BlockState block = world.getBlockState(newblockposition); + + if (!(block.getBlock() instanceof BaseEntityBlock)) { // Containers get placed automatically + block.onPlace(world, newblockposition, oldBlock, true, context); + } + + world.notifyAndUpdatePhysics(newblockposition, null, oldBlock, block, world.getBlockState(newblockposition), updateFlag, 512); // send null chunk as chunk.k() returns false by this point + } + + if (this.item == Items.WITHER_SKELETON_SKULL) { // Special case skulls to allow wither spawns to be cancelled + BlockPos bp = blockposition; + if (!world.getBlockState(blockposition).canBeReplaced()) { + if (!world.getBlockState(blockposition).isSolid()) { + bp = null; + } else { + bp = bp.relative(context.getClickedFace()); + } + } + if (bp != null) { + BlockEntity te = world.getBlockEntity(bp); + if (te instanceof SkullBlockEntity) { + WitherSkullBlock.checkSpawn(world, bp, (SkullBlockEntity) te); + } + } + } + + // SPIGOT-4678 + if (this.item instanceof SignItem && SignItem.openSign != null) { + try { + if (world.getBlockEntity(SignItem.openSign) instanceof SignBlockEntity tileentitysign) { + if (world.getBlockState(SignItem.openSign).getBlock() instanceof SignBlock blocksign) { + blocksign.openTextEdit(entityhuman, tileentitysign, true, io.papermc.paper.event.player.PlayerOpenSignEvent.Cause.PLACE); // Craftbukkit // Paper - Add PlayerOpenSignEvent + } + } + } finally { + SignItem.openSign = null; + } + } + + // SPIGOT-7315: Moved from BlockBed#setPlacedBy + if (placeEvent != null && this.item instanceof BedItem) { + BlockPos position = ((CraftBlock) placeEvent.getBlock()).getPosition(); + net.minecraft.world.level.block.state.BlockState blockData = world.getBlockState(position); + + if (blockData.getBlock() instanceof BedBlock) { + world.blockUpdated(position, Blocks.AIR); + blockData.updateNeighbourShapes(world, position, 3); + } + } + + // SPIGOT-1288 - play sound stripped from ItemBlock + if (this.item instanceof BlockItem) { + // Paper start - Fix spigot sound playing for BlockItem ItemStacks + BlockPos position = new net.minecraft.world.item.context.BlockPlaceContext(context).getClickedPos(); + net.minecraft.world.level.block.state.BlockState blockData = world.getBlockState(position); + SoundType soundeffecttype = blockData.getSoundType(); + // Paper end - Fix spigot sound playing for BlockItem ItemStacks + world.playSound(entityhuman, blockposition, soundeffecttype.getPlaceSound(), SoundSource.BLOCKS, (soundeffecttype.getVolume() + 1.0F) / 2.0F, soundeffecttype.getPitch() * 0.8F); + } + + entityhuman.awardStat(Stats.ITEM_USED.get(item)); + } } } + world.capturedTileEntities.clear(); + world.capturedBlockStates.clear(); + // CraftBukkit end return enuminteractionresult; } } - public float getDestroySpeed(BlockState state) { + public float getDestroySpeed(net.minecraft.world.level.block.state.BlockState state) { return this.getItem().getDestroySpeed(this, state); } - public InteractionResult use(Level world, Player user, InteractionHand hand) { + public InteractionResult use(Level world, net.minecraft.world.entity.player.Player user, InteractionHand hand) { ItemStack itemstack = this.copy(); boolean flag = this.getUseDuration(user) <= 0; InteractionResult enuminteractionresult = this.getItem().use(world, user, hand); @@ -490,8 +702,37 @@ return this.isDamageableItem() && this.getDamageValue() >= this.getMaxDamage() - 1; } - public void hurtAndBreak(int amount, ServerLevel world, @Nullable ServerPlayer player, Consumer breakCallback) { - int j = this.processDurabilityChange(amount, world, player); + public void hurtAndBreak(int amount, ServerLevel world, @Nullable LivingEntity player, Consumer breakCallback) { // Paper - Add EntityDamageItemEvent + // Paper start - add force boolean overload + this.hurtAndBreak(amount, world, player, breakCallback, false); + } + public void hurtAndBreak(int amount, ServerLevel world, @Nullable LivingEntity player, Consumer breakCallback, boolean force) { // Paper - Add EntityDamageItemEvent + // Paper end + int originalDamage = amount; // Paper - Expand PlayerItemDamageEvent + int j = this.processDurabilityChange(amount, world, player, force); // Paper + // CraftBukkit start + if (player instanceof final ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent + PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), j, originalDamage); // Paper - Add EntityDamageItemEvent + event.getPlayer().getServer().getPluginManager().callEvent(event); + + if (j != event.getDamage() || event.isCancelled()) { + event.getPlayer().updateInventory(); + } + if (event.isCancelled()) { + return; + } + + j = event.getDamage(); + // Paper start - Add EntityDamageItemEvent + } else if (player != null) { + io.papermc.paper.event.entity.EntityDamageItemEvent event = new io.papermc.paper.event.entity.EntityDamageItemEvent(player.getBukkitLivingEntity(), CraftItemStack.asCraftMirror(this), amount); + if (!event.callEvent()) { + return; + } + j = event.getDamage(); + // Paper end - Add EntityDamageItemEvent + } + // CraftBukkit end if (j != 0) { this.applyDamage(this.getDamageValue() + j, player, breakCallback); @@ -499,18 +740,28 @@ } - private int processDurabilityChange(int baseDamage, ServerLevel world, @Nullable ServerPlayer player) { - return !this.isDamageableItem() ? 0 : (player != null && player.hasInfiniteMaterials() ? 0 : (baseDamage > 0 ? EnchantmentHelper.processDurabilityChange(world, this, baseDamage) : baseDamage)); + private int processDurabilityChange(int baseDamage, ServerLevel world, @Nullable LivingEntity player) { // Paper - Add EntityDamageItemEvent + // Paper start - itemstack damage api + return processDurabilityChange(baseDamage, world, player, false); } + private int processDurabilityChange(int baseDamage, ServerLevel world, @Nullable LivingEntity player, boolean force) { + return !this.isDamageableItem() ? 0 : (player instanceof ServerPlayer && player.hasInfiniteMaterials() && !force ? 0 : (baseDamage > 0 ? EnchantmentHelper.processDurabilityChange(world, this, baseDamage) : baseDamage)); // Paper - Add EntityDamageItemEvent + // Paper end - itemstack damage api + } - private void applyDamage(int damage, @Nullable ServerPlayer player, Consumer breakCallback) { - if (player != null) { - CriteriaTriggers.ITEM_DURABILITY_CHANGED.trigger(player, this, damage); + private void applyDamage(int damage, @Nullable LivingEntity player, Consumer breakCallback) { // Paper - Add EntityDamageItemEvent + if (player instanceof final ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent + CriteriaTriggers.ITEM_DURABILITY_CHANGED.trigger(serverPlayer, this, damage); // Paper - Add EntityDamageItemEvent } this.setDamageValue(damage); if (this.isBroken()) { Item item = this.getItem(); + // CraftBukkit start - Check for item breaking + if (this.count == 1 && player instanceof final ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent + org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent(serverPlayer, this); // Paper - Add EntityDamageItemEvent + } + // CraftBukkit end this.shrink(1); breakCallback.accept(item); @@ -518,7 +769,7 @@ } - public void hurtWithoutBreaking(int amount, Player player) { + public void hurtWithoutBreaking(int amount, net.minecraft.world.entity.player.Player player) { if (player instanceof ServerPlayer entityplayer) { int j = this.processDurabilityChange(amount, entityplayer.serverLevel(), entityplayer); @@ -535,6 +786,11 @@ } public void hurtAndBreak(int amount, LivingEntity entity, EquipmentSlot slot) { + // Paper start - add param to skip infinite mats check + this.hurtAndBreak(amount, entity, slot, false); + } + public void hurtAndBreak(int amount, LivingEntity entity, EquipmentSlot slot, boolean force) { + // Paper end - add param to skip infinite mats check Level world = entity.level(); if (world instanceof ServerLevel worldserver) { @@ -546,9 +802,9 @@ entityplayer = null; } - this.hurtAndBreak(amount, worldserver, entityplayer, (item) -> { - entity.onEquippedItemBroken(item, slot); - }); + this.hurtAndBreak(amount, worldserver, entity, (item) -> { // Paper - Add EntityDamageItemEvent + if (slot != null) entity.onEquippedItemBroken(item, slot); // Paper - itemstack damage API - do not process entity related callbacks when damaging from API + }, force); // Paper - itemstack damage API } } @@ -580,11 +836,11 @@ return this.getItem().getBarColor(this); } - public boolean overrideStackedOnOther(Slot slot, ClickAction clickType, Player player) { + public boolean overrideStackedOnOther(Slot slot, ClickAction clickType, net.minecraft.world.entity.player.Player player) { return this.getItem().overrideStackedOnOther(this, slot, clickType, player); } - public boolean overrideOtherStackedOnMe(ItemStack stack, Slot slot, ClickAction clickType, Player player, SlotAccess cursorStackReference) { + public boolean overrideOtherStackedOnMe(ItemStack stack, Slot slot, ClickAction clickType, net.minecraft.world.entity.player.Player player, SlotAccess cursorStackReference) { return this.getItem().overrideOtherStackedOnMe(this, stack, slot, clickType, player, cursorStackReference); } @@ -592,8 +848,8 @@ Item item = this.getItem(); if (item.hurtEnemy(this, target, user)) { - if (user instanceof Player) { - Player entityhuman = (Player) user; + if (user instanceof net.minecraft.world.entity.player.Player) { + net.minecraft.world.entity.player.Player entityhuman = (net.minecraft.world.entity.player.Player) user; entityhuman.awardStat(Stats.ITEM_USED.get(item)); } @@ -608,7 +864,7 @@ this.getItem().postHurtEnemy(this, target, user); } - public void mineBlock(Level world, BlockState state, BlockPos pos, Player miner) { + public void mineBlock(Level world, net.minecraft.world.level.block.state.BlockState state, BlockPos pos, net.minecraft.world.entity.player.Player miner) { Item item = this.getItem(); if (item.mineBlock(this, world, state, pos, miner)) { @@ -617,11 +873,11 @@ } - public boolean isCorrectToolForDrops(BlockState state) { + public boolean isCorrectToolForDrops(net.minecraft.world.level.block.state.BlockState state) { return this.getItem().isCorrectToolForDrops(this, state); } - public InteractionResult interactLivingEntity(Player user, LivingEntity entity, InteractionHand hand) { + public InteractionResult interactLivingEntity(net.minecraft.world.entity.player.Player user, LivingEntity entity, InteractionHand hand) { return this.getItem().interactLivingEntity(this, user, entity, hand); } @@ -736,7 +992,7 @@ } - public void onCraftedBy(Level world, Player player, int amount) { + public void onCraftedBy(Level world, net.minecraft.world.entity.player.Player player, int amount) { player.awardStat(Stats.ITEM_CRAFTED.get(this.getItem()), amount); this.getItem().onCraftedBy(this, world, player); } @@ -770,6 +1026,12 @@ return this.getItem().useOnRelease(this); } + // CraftBukkit start + public void restorePatch(DataComponentPatch datacomponentpatch) { + this.components.restorePatch(datacomponentpatch); + } + // CraftBukkit end + @Nullable public T set(DataComponentType type, @Nullable T value) { return this.components.set(type, value); @@ -806,6 +1068,25 @@ } } + // Paper start - (this is just a good no conflict location) + public org.bukkit.inventory.ItemStack asBukkitMirror() { + return CraftItemStack.asCraftMirror(this); + } + public org.bukkit.inventory.ItemStack asBukkitCopy() { + return CraftItemStack.asCraftMirror(this.copy()); + } + public static ItemStack fromBukkitCopy(org.bukkit.inventory.ItemStack itemstack) { + return CraftItemStack.asNMSCopy(itemstack); + } + private org.bukkit.craftbukkit.inventory.CraftItemStack bukkitStack; + public org.bukkit.inventory.ItemStack getBukkitStack() { + if (bukkitStack == null || bukkitStack.handle != this) { + bukkitStack = org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(this); + } + return bukkitStack; + } + // Paper end + public void applyComponents(DataComponentPatch changes) { this.components.applyPatch(changes); this.getItem().verifyComponentsAfterLoad(this); @@ -858,7 +1139,7 @@ } private void addToTooltip(DataComponentType componentType, Item.TooltipContext context, Consumer textConsumer, TooltipFlag type) { - T t0 = (TooltipProvider) this.get(componentType); + T t0 = (T) this.get(componentType); // CraftBukkit - decompile error if (t0 != null) { t0.addToTooltip(context, textConsumer, type); @@ -866,7 +1147,7 @@ } - public List getTooltipLines(Item.TooltipContext context, @Nullable Player player, TooltipFlag type) { + public List getTooltipLines(Item.TooltipContext context, @Nullable net.minecraft.world.entity.player.Player player, TooltipFlag type) { boolean flag = this.getItem().shouldPrintOpWarning(this, player); if (!type.isCreative() && this.has(DataComponents.HIDE_TOOLTIP)) { @@ -941,7 +1222,7 @@ } } - private void addAttributeTooltips(Consumer textConsumer, @Nullable Player player) { + private void addAttributeTooltips(Consumer textConsumer, @Nullable net.minecraft.world.entity.player.Player player) { ItemAttributeModifiers itemattributemodifiers = (ItemAttributeModifiers) this.getOrDefault(DataComponents.ATTRIBUTE_MODIFIERS, ItemAttributeModifiers.EMPTY); if (itemattributemodifiers.showInTooltip()) { @@ -966,7 +1247,7 @@ } } - private void addModifierTooltip(Consumer textConsumer, @Nullable Player player, Holder attribute, AttributeModifier modifier) { + private void addModifierTooltip(Consumer textConsumer, @Nullable net.minecraft.world.entity.player.Player player, Holder attribute, AttributeModifier modifier) { double d0 = modifier.amount(); boolean flag = false; @@ -1091,6 +1372,14 @@ EnchantmentHelper.forEachModifier(this, slot, attributeModifierConsumer); } + // CraftBukkit start + @Deprecated + public void setItem(Item item) { + this.bukkitStack = null; // Paper + this.item = item; + } + // CraftBukkit end + public Component getDisplayName() { MutableComponent ichatmutablecomponent = Component.empty().append(this.getHoverName()); @@ -1153,7 +1442,7 @@ } public void consume(int amount, @Nullable LivingEntity entity) { - if (entity == null || !entity.hasInfiniteMaterials()) { + if ((entity == null || !entity.hasInfiniteMaterials()) && this != ItemStack.EMPTY) { // CraftBukkit this.shrink(amount); }