From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sun, 8 May 2022 13:35:45 -0700 Subject: [PATCH] ItemStack damage API Adds methods notify clients about item breaks and to simulate damage done to an itemstack and all the logic associated with damaging them == AT == public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index 1de9516fc3b6decca250b103abf85a4a8dcea6b2..80463de09f649c28bc5a96712b2ea370a62b8baa 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1033,6 +1033,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category"); } + @Override + public void broadcastSlotBreak(org.bukkit.inventory.EquipmentSlot slot) { + this.getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot)); + } + + @Override + public void broadcastSlotBreak(org.bukkit.inventory.EquipmentSlot slot, Collection players) { + if (players.isEmpty()) { + return; + } + final net.minecraft.network.protocol.game.ClientboundEntityEventPacket packet = new net.minecraft.network.protocol.game.ClientboundEntityEventPacket( + this.getHandle(), + net.minecraft.world.entity.LivingEntity.entityEventForEquipmentBreak(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot)) + ); + players.forEach(player -> ((CraftPlayer) player).getHandle().connection.send(packet)); + } + + @Override + public ItemStack damageItemStack(ItemStack stack, int amount) { + final net.minecraft.world.item.ItemStack nmsStack; + if (stack instanceof CraftItemStack craftItemStack) { + if (craftItemStack.handle == null || craftItemStack.handle.isEmpty()) { + return stack; + } + nmsStack = craftItemStack.handle; + } else { + nmsStack = CraftItemStack.asNMSCopy(stack); + stack = CraftItemStack.asCraftMirror(nmsStack); // mirror to capture changes in hurt logic & events + } + this.damageItemStack0(nmsStack, amount, null); + return stack; + } + + @Override + public void damageItemStack(org.bukkit.inventory.EquipmentSlot slot, int amount) { + final net.minecraft.world.entity.EquipmentSlot nmsSlot = org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot); + this.damageItemStack0(this.getHandle().getItemBySlot(nmsSlot), amount, nmsSlot); + } + + private void damageItemStack0(net.minecraft.world.item.ItemStack nmsStack, int amount, net.minecraft.world.entity.EquipmentSlot slot) { + nmsStack.hurtAndBreak(amount, this.getHandle(), livingEntity -> { + if (slot != null) { + livingEntity.broadcastBreakEvent(slot); + } + }); + } + @Override public void knockback(double strength, double directionX, double directionZ) { Preconditions.checkArgument(strength > 0, "Knockback strength must be > 0");