mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 19:49:35 +01:00
aca2bf97bb
By: DerFrZocker <derrieple@gmail.com>
339 lines
17 KiB
Diff
339 lines
17 KiB
Diff
--- a/net/minecraft/world/item/ItemStack.java
|
|
+++ b/net/minecraft/world/item/ItemStack.java
|
|
@@ -81,6 +81,44 @@
|
|
import net.minecraft.world.level.block.state.pattern.ShapeDetectorBlock;
|
|
import org.slf4j.Logger;
|
|
|
|
+// CraftBukkit start
|
|
+import com.mojang.serialization.Dynamic;
|
|
+import java.util.Map;
|
|
+import java.util.Objects;
|
|
+import net.minecraft.core.EnumDirection;
|
|
+import net.minecraft.nbt.DynamicOpsNBT;
|
|
+import net.minecraft.network.protocol.game.PacketPlayOutBlockChange;
|
|
+import net.minecraft.server.MinecraftServer;
|
|
+import net.minecraft.server.level.WorldServer;
|
|
+import net.minecraft.sounds.SoundCategory;
|
|
+import net.minecraft.util.datafix.fixes.DataConverterTypes;
|
|
+import net.minecraft.world.level.block.BlockBed;
|
|
+import net.minecraft.world.level.block.Blocks;
|
|
+import net.minecraft.world.level.block.BlockSapling;
|
|
+import net.minecraft.world.level.block.BlockSign;
|
|
+import net.minecraft.world.level.block.BlockTileEntity;
|
|
+import net.minecraft.world.level.block.BlockWitherSkull;
|
|
+import net.minecraft.world.level.block.SoundEffectType;
|
|
+import net.minecraft.world.level.block.entity.TileEntity;
|
|
+import net.minecraft.world.level.block.entity.TileEntityJukeBox;
|
|
+import net.minecraft.world.level.block.entity.TileEntitySign;
|
|
+import net.minecraft.world.level.block.entity.TileEntitySkull;
|
|
+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.craftbukkit.util.CraftMagicNumbers;
|
|
+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 {
|
|
|
|
public static final Codec<ItemStack> CODEC = RecordCodecBuilder.create((instance) -> {
|
|
@@ -175,7 +213,18 @@
|
|
this.item = null;
|
|
}
|
|
|
|
- private ItemStack(NBTTagCompound nbttagcompound) {
|
|
+ // Called to run this stack through the data converter to handle older storage methods and serialized items
|
|
+ public void convertStack(int version) {
|
|
+ if (0 < version && version < CraftMagicNumbers.INSTANCE.getDataVersion()) {
|
|
+ NBTTagCompound savedStack = new NBTTagCompound();
|
|
+ this.save(savedStack);
|
|
+ savedStack = (NBTTagCompound) MinecraftServer.getServer().fixerUpper.update(DataConverterTypes.ITEM_STACK, new Dynamic(DynamicOpsNBT.INSTANCE, savedStack), version, CraftMagicNumbers.INSTANCE.getDataVersion()).getValue();
|
|
+ this.load(savedStack);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ // CraftBukkit - break into own method
|
|
+ private void load(NBTTagCompound nbttagcompound) {
|
|
this.item = (Item) BuiltInRegistries.ITEM.get(new MinecraftKey(nbttagcompound.getString("id")));
|
|
this.count = nbttagcompound.getByte("Count");
|
|
if (nbttagcompound.contains("tag", 10)) {
|
|
@@ -189,6 +238,11 @@
|
|
|
|
}
|
|
|
|
+ private ItemStack(NBTTagCompound nbttagcompound) {
|
|
+ this.load(nbttagcompound);
|
|
+ // CraftBukkit end
|
|
+ }
|
|
+
|
|
public static ItemStack of(NBTTagCompound nbttagcompound) {
|
|
try {
|
|
return new ItemStack(nbttagcompound);
|
|
@@ -266,11 +320,191 @@
|
|
return EnumInteractionResult.PASS;
|
|
} else {
|
|
Item item = this.getItem();
|
|
- EnumInteractionResult enuminteractionresult = item.useOn(itemactioncontext);
|
|
+ // CraftBukkit start - handle all block place event logic here
|
|
+ NBTTagCompound oldData = this.getTagClone();
|
|
+ int oldCount = this.getCount();
|
|
+ WorldServer world = (WorldServer) itemactioncontext.getLevel();
|
|
+
|
|
+ if (!(item instanceof ItemBucket || item instanceof SolidBucketItem)) { // if not bucket
|
|
+ world.captureBlockStates = true;
|
|
+ // special case bonemeal
|
|
+ if (item == Items.BONE_MEAL) {
|
|
+ world.captureTreeGeneration = true;
|
|
+ }
|
|
+ }
|
|
+ EnumInteractionResult enuminteractionresult;
|
|
+ try {
|
|
+ enuminteractionresult = item.useOn(itemactioncontext);
|
|
+ } finally {
|
|
+ world.captureBlockStates = false;
|
|
+ }
|
|
+ NBTTagCompound newData = this.getTagClone();
|
|
+ int newCount = this.getCount();
|
|
+ this.setCount(oldCount);
|
|
+ this.setTagClone(oldData);
|
|
+ if (enuminteractionresult.consumesAction() && world.captureTreeGeneration && world.capturedBlockStates.size() > 0) {
|
|
+ world.captureTreeGeneration = false;
|
|
+ Location location = CraftLocation.toBukkit(blockposition, world.getWorld());
|
|
+ TreeType treeType = BlockSapling.treeType;
|
|
+ BlockSapling.treeType = null;
|
|
+ List<CraftBlockState> blocks = new java.util.ArrayList<>(world.capturedBlockStates.values());
|
|
+ world.capturedBlockStates.clear();
|
|
+ StructureGrowEvent structureEvent = null;
|
|
+ if (treeType != null) {
|
|
+ boolean isBonemeal = getItem() == Items.BONE_MEAL;
|
|
+ structureEvent = new StructureGrowEvent(location, treeType, isBonemeal, (Player) entityhuman.getBukkitEntity(), (List< BlockState>) (List<? extends BlockState>) blocks);
|
|
+ org.bukkit.Bukkit.getPluginManager().callEvent(structureEvent);
|
|
+ }
|
|
+
|
|
+ BlockFertilizeEvent fertilizeEvent = new BlockFertilizeEvent(CraftBlock.at(world, blockposition), (Player) entityhuman.getBukkitEntity(), (List< BlockState>) (List<? extends BlockState>) 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.tag, oldData)) {
|
|
+ this.setTag(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);
|
|
+ }
|
|
+ entityhuman.awardStat(StatisticList.ITEM_USED.get(item)); // SPIGOT-7236 - award stat
|
|
+ }
|
|
+
|
|
+ ItemSign.openSign = null; // SPIGOT-6758 - Reset on early return
|
|
+ return enuminteractionresult;
|
|
+ }
|
|
+ world.captureTreeGeneration = false;
|
|
|
|
if (entityhuman != null && enuminteractionresult.shouldAwardStats()) {
|
|
- entityhuman.awardStat(StatisticList.ITEM_USED.get(item));
|
|
+ EnumHand enumhand = itemactioncontext.getHand();
|
|
+ org.bukkit.event.block.BlockPlaceEvent placeEvent = null;
|
|
+ List<BlockState> 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) {
|
|
+ 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 = EnumInteractionResult.FAIL; // cancel placement
|
|
+ // PAIL: Remove this when MC-99075 fixed
|
|
+ placeEvent.getPlayer().updateInventory();
|
|
+ // 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
|
|
+ BlockPosition placedPos = ((CraftBlock) placeEvent.getBlock()).getPosition();
|
|
+ for (EnumDirection dir : EnumDirection.values()) {
|
|
+ ((EntityPlayer) entityhuman).connection.send(new PacketPlayOutBlockChange(world, placedPos.relative(dir)));
|
|
+ }
|
|
+ ItemSign.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.tag, oldData)) {
|
|
+ this.setTag(newData);
|
|
+ this.setCount(newCount);
|
|
+ }
|
|
+
|
|
+ for (Map.Entry<BlockPosition, TileEntity> e : world.capturedTileEntities.entrySet()) {
|
|
+ world.setBlockEntity(e.getValue());
|
|
+ }
|
|
+
|
|
+ for (BlockState blockstate : blocks) {
|
|
+ int updateFlag = ((CraftBlockState) blockstate).getFlag();
|
|
+ IBlockData oldBlock = ((CraftBlockState) blockstate).getHandle();
|
|
+ BlockPosition newblockposition = ((CraftBlockState) blockstate).getPosition();
|
|
+ IBlockData block = world.getBlockState(newblockposition);
|
|
+
|
|
+ if (!(block.getBlock() instanceof BlockTileEntity)) { // Containers get placed automatically
|
|
+ block.getBlock().onPlace(block, world, newblockposition, oldBlock, true);
|
|
+ }
|
|
+
|
|
+ world.notifyAndUpdatePhysics(newblockposition, null, oldBlock, block, world.getBlockState(newblockposition), updateFlag, 512); // send null chunk as chunk.k() returns false by this point
|
|
+ }
|
|
+
|
|
+ // Special case juke boxes as they update their tile entity. Copied from ItemRecord.
|
|
+ // PAIL: checkme on updates.
|
|
+ if (this.item instanceof ItemRecord) {
|
|
+ TileEntity tileentity = world.getBlockEntity(blockposition);
|
|
+
|
|
+ if (tileentity instanceof TileEntityJukeBox) {
|
|
+ TileEntityJukeBox tileentityjukebox = (TileEntityJukeBox) tileentity;
|
|
+
|
|
+ // There can only be one
|
|
+ ItemStack record = this.copy();
|
|
+ if (!record.isEmpty()) {
|
|
+ record.setCount(1);
|
|
+ }
|
|
+
|
|
+ tileentityjukebox.setTheItem(record);
|
|
+ world.gameEvent(GameEvent.BLOCK_CHANGE, blockposition, GameEvent.a.of(entityhuman, world.getBlockState(blockposition)));
|
|
+ }
|
|
+
|
|
+ this.shrink(1);
|
|
+ entityhuman.awardStat(StatisticList.PLAY_RECORD);
|
|
+ }
|
|
+
|
|
+ if (this.item == Items.WITHER_SKELETON_SKULL) { // Special case skulls to allow wither spawns to be cancelled
|
|
+ BlockPosition bp = blockposition;
|
|
+ if (!world.getBlockState(blockposition).canBeReplaced()) {
|
|
+ if (!world.getBlockState(blockposition).isSolid()) {
|
|
+ bp = null;
|
|
+ } else {
|
|
+ bp = bp.relative(itemactioncontext.getClickedFace());
|
|
+ }
|
|
+ }
|
|
+ if (bp != null) {
|
|
+ TileEntity te = world.getBlockEntity(bp);
|
|
+ if (te instanceof TileEntitySkull) {
|
|
+ BlockWitherSkull.checkSpawn(world, bp, (TileEntitySkull) te);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ // SPIGOT-4678
|
|
+ if (this.item instanceof ItemSign && ItemSign.openSign != null) {
|
|
+ try {
|
|
+ if (world.getBlockEntity(ItemSign.openSign) instanceof TileEntitySign tileentitysign) {
|
|
+ if (world.getBlockState(ItemSign.openSign).getBlock() instanceof BlockSign blocksign) {
|
|
+ blocksign.openTextEdit(entityhuman, tileentitysign, true, org.bukkit.event.player.PlayerSignOpenEvent.Cause.PLACE); // Craftbukkit
|
|
+ }
|
|
+ }
|
|
+ } finally {
|
|
+ ItemSign.openSign = null;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ // SPIGOT-7315: Moved from BlockBed#setPlacedBy
|
|
+ if (placeEvent != null && this.item instanceof ItemBed) {
|
|
+ BlockPosition position = ((CraftBlock) placeEvent.getBlock()).getPosition();
|
|
+ IBlockData blockData = world.getBlockState(position);
|
|
+
|
|
+ if (blockData.getBlock() instanceof BlockBed) {
|
|
+ world.blockUpdated(position, Blocks.AIR);
|
|
+ blockData.updateNeighbourShapes(world, position, 3);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ // SPIGOT-1288 - play sound stripped from ItemBlock
|
|
+ if (this.item instanceof ItemBlock) {
|
|
+ SoundEffectType soundeffecttype = ((ItemBlock) this.item).getBlock().defaultBlockState().getSoundType(); // TODO: not strictly correct, however currently only affects decorated pots
|
|
+ world.playSound(entityhuman, blockposition, soundeffecttype.getPlaceSound(), SoundCategory.BLOCKS, (soundeffecttype.getVolume() + 1.0F) / 2.0F, soundeffecttype.getPitch() * 0.8F);
|
|
+ }
|
|
+
|
|
+ entityhuman.awardStat(StatisticList.ITEM_USED.get(item));
|
|
+ }
|
|
}
|
|
+ world.capturedTileEntities.clear();
|
|
+ world.capturedBlockStates.clear();
|
|
+ // CraftBukkit end
|
|
|
|
return enuminteractionresult;
|
|
}
|
|
@@ -351,6 +585,21 @@
|
|
}
|
|
|
|
i -= k;
|
|
+ // CraftBukkit start
|
|
+ if (entityplayer != null) {
|
|
+ PlayerItemDamageEvent event = new PlayerItemDamageEvent(entityplayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), i);
|
|
+ event.getPlayer().getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (i != event.getDamage() || event.isCancelled()) {
|
|
+ event.getPlayer().updateInventory();
|
|
+ }
|
|
+ if (event.isCancelled()) {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ i = event.getDamage();
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (i <= 0) {
|
|
return false;
|
|
}
|
|
@@ -372,6 +621,11 @@
|
|
if (this.hurt(i, t0.getRandom(), t0 instanceof EntityPlayer ? (EntityPlayer) t0 : null)) {
|
|
consumer.accept(t0);
|
|
Item item = this.getItem();
|
|
+ // CraftBukkit start - Check for item breaking
|
|
+ if (this.count == 1 && t0 instanceof EntityHuman) {
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityHuman) t0, this);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
|
|
this.shrink(1);
|
|
if (t0 instanceof EntityHuman) {
|
|
@@ -524,6 +778,17 @@
|
|
return this.tag;
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ @Nullable
|
|
+ private NBTTagCompound getTagClone() {
|
|
+ return this.tag == null ? null : this.tag.copy();
|
|
+ }
|
|
+
|
|
+ private void setTagClone(@Nullable NBTTagCompound nbtttagcompound) {
|
|
+ this.setTag(nbtttagcompound == null ? null : nbtttagcompound.copy());
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
public NBTTagCompound getOrCreateTag() {
|
|
if (this.tag == null) {
|
|
this.setTag(new NBTTagCompound());
|
|
@@ -948,6 +1213,13 @@
|
|
nbttaglist.add(nbttagcompound);
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ @Deprecated
|
|
+ public void setItem(Item item) {
|
|
+ this.item = item;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
public IChatBaseComponent getDisplayName() {
|
|
IChatMutableComponent ichatmutablecomponent = IChatBaseComponent.empty().append(this.getHoverName());
|
|
|