207 lines
10 KiB
Diff
207 lines
10 KiB
Diff
--- a/net/minecraft/world/level/block/entity/TileEntityHopper.java
|
|
+++ b/net/minecraft/world/level/block/entity/TileEntityHopper.java
|
|
@@ -32,6 +32,21 @@
|
|
import net.minecraft.world.phys.shapes.OperatorBoolean;
|
|
import net.minecraft.world.phys.shapes.VoxelShapes;
|
|
|
|
+// CraftBukkit start
|
|
+import net.minecraft.world.InventoryLargeChest;
|
|
+import net.minecraft.world.entity.vehicle.EntityMinecartHopper;
|
|
+import org.bukkit.Bukkit;
|
|
+import org.bukkit.craftbukkit.block.CraftBlock;
|
|
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventory;
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
+import org.bukkit.entity.HumanEntity;
|
|
+import org.bukkit.event.inventory.HopperInventorySearchEvent;
|
|
+import org.bukkit.event.inventory.InventoryMoveItemEvent;
|
|
+import org.bukkit.event.inventory.InventoryPickupItemEvent;
|
|
+import org.bukkit.inventory.Inventory;
|
|
+// CraftBukkit end
|
|
+
|
|
public class TileEntityHopper extends TileEntityLootable implements IHopper {
|
|
|
|
public static final int MOVE_ITEM_SPEED = 8;
|
|
@@ -40,6 +55,36 @@
|
|
private int cooldownTime;
|
|
private long tickedGameTime;
|
|
|
|
+ // CraftBukkit start - add fields and methods
|
|
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
|
|
+ private int maxStack = MAX_STACK;
|
|
+
|
|
+ public List<ItemStack> getContents() {
|
|
+ return this.items;
|
|
+ }
|
|
+
|
|
+ public void onOpen(CraftHumanEntity who) {
|
|
+ transaction.add(who);
|
|
+ }
|
|
+
|
|
+ public void onClose(CraftHumanEntity who) {
|
|
+ transaction.remove(who);
|
|
+ }
|
|
+
|
|
+ public List<HumanEntity> getViewers() {
|
|
+ return transaction;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int getMaxStackSize() {
|
|
+ return maxStack;
|
|
+ }
|
|
+
|
|
+ public void setMaxStackSize(int size) {
|
|
+ maxStack = size;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
public TileEntityHopper(BlockPosition blockposition, IBlockData iblockdata) {
|
|
super(TileEntityTypes.HOPPER, blockposition, iblockdata);
|
|
this.items = NonNullList.withSize(5, ItemStack.EMPTY);
|
|
@@ -113,7 +158,7 @@
|
|
boolean flag = false;
|
|
|
|
if (!tileentityhopper.isEmpty()) {
|
|
- flag = ejectItems(world, blockposition, iblockdata, tileentityhopper);
|
|
+ flag = ejectItems(world, blockposition, iblockdata, (IInventory) tileentityhopper, tileentityhopper); // CraftBukkit
|
|
}
|
|
|
|
if (!tileentityhopper.inventoryFull()) {
|
|
@@ -147,7 +192,7 @@
|
|
return false;
|
|
}
|
|
|
|
- private static boolean ejectItems(World world, BlockPosition blockposition, IBlockData iblockdata, IInventory iinventory) {
|
|
+ private static boolean ejectItems(World world, BlockPosition blockposition, IBlockData iblockdata, IInventory iinventory, TileEntityHopper hopper) { // CraftBukkit
|
|
IInventory iinventory1 = getAttachedContainer(world, blockposition, iblockdata);
|
|
|
|
if (iinventory1 == null) {
|
|
@@ -161,7 +206,30 @@
|
|
for (int i = 0; i < iinventory.getContainerSize(); ++i) {
|
|
if (!iinventory.getItem(i).isEmpty()) {
|
|
ItemStack itemstack = iinventory.getItem(i).copy();
|
|
- ItemStack itemstack1 = addItem(iinventory, iinventory1, iinventory.removeItem(i, 1), enumdirection);
|
|
+ // ItemStack itemstack1 = addItem(iinventory, iinventory1, iinventory.removeItem(i, 1), enumdirection);
|
|
+
|
|
+ // CraftBukkit start - Call event when pushing items into other inventories
|
|
+ CraftItemStack oitemstack = CraftItemStack.asCraftMirror(iinventory.removeItem(i, 1));
|
|
+
|
|
+ Inventory destinationInventory;
|
|
+ // Have to special case large chests as they work oddly
|
|
+ if (iinventory1 instanceof InventoryLargeChest) {
|
|
+ destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((InventoryLargeChest) iinventory1);
|
|
+ } else if (iinventory1.getOwner() != null) {
|
|
+ destinationInventory = iinventory1.getOwner().getInventory();
|
|
+ } else {
|
|
+ destinationInventory = new CraftInventory(iinventory);
|
|
+ }
|
|
+
|
|
+ InventoryMoveItemEvent event = new InventoryMoveItemEvent(iinventory.getOwner().getInventory(), oitemstack.clone(), destinationInventory, true);
|
|
+ world.getCraftServer().getPluginManager().callEvent(event);
|
|
+ if (event.isCancelled()) {
|
|
+ hopper.setItem(i, itemstack);
|
|
+ hopper.setCooldown(8); // Delay hopper checks
|
|
+ return false;
|
|
+ }
|
|
+ ItemStack itemstack1 = addItem(iinventory, iinventory1, CraftItemStack.asNMSCopy(event.getItem()), enumdirection);
|
|
+ // CraftBukkit end
|
|
|
|
if (itemstack1.isEmpty()) {
|
|
iinventory1.setChanged();
|
|
@@ -226,7 +294,36 @@
|
|
|
|
if (!itemstack.isEmpty() && canTakeItemFromContainer(iinventory, itemstack, i, enumdirection)) {
|
|
ItemStack itemstack1 = itemstack.copy();
|
|
- ItemStack itemstack2 = addItem(iinventory, ihopper, iinventory.removeItem(i, 1), (EnumDirection) null);
|
|
+ // ItemStack itemstack2 = addItem(iinventory, ihopper, iinventory.removeItem(i, 1), (EnumDirection) null);
|
|
+ // CraftBukkit start - Call event on collection of items from inventories into the hopper
|
|
+ CraftItemStack oitemstack = CraftItemStack.asCraftMirror(iinventory.removeItem(i, 1));
|
|
+
|
|
+ Inventory sourceInventory;
|
|
+ // Have to special case large chests as they work oddly
|
|
+ if (iinventory instanceof InventoryLargeChest) {
|
|
+ sourceInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((InventoryLargeChest) iinventory);
|
|
+ } else if (iinventory.getOwner() != null) {
|
|
+ sourceInventory = iinventory.getOwner().getInventory();
|
|
+ } else {
|
|
+ sourceInventory = new CraftInventory(iinventory);
|
|
+ }
|
|
+
|
|
+ InventoryMoveItemEvent event = new InventoryMoveItemEvent(sourceInventory, oitemstack.clone(), ihopper.getOwner().getInventory(), false);
|
|
+
|
|
+ Bukkit.getServer().getPluginManager().callEvent(event);
|
|
+ if (event.isCancelled()) {
|
|
+ iinventory.setItem(i, itemstack1);
|
|
+
|
|
+ if (ihopper instanceof TileEntityHopper) {
|
|
+ ((TileEntityHopper) ihopper).setCooldown(8); // Delay hopper checks
|
|
+ } else if (ihopper instanceof EntityMinecartHopper) {
|
|
+ ((EntityMinecartHopper) ihopper).setCooldown(4); // Delay hopper minecart checks
|
|
+ }
|
|
+
|
|
+ return false;
|
|
+ }
|
|
+ ItemStack itemstack2 = addItem(iinventory, ihopper, CraftItemStack.asNMSCopy(event.getItem()), null);
|
|
+ // CraftBukkit end
|
|
|
|
if (itemstack2.isEmpty()) {
|
|
iinventory.setChanged();
|
|
@@ -241,6 +338,13 @@
|
|
|
|
public static boolean addItem(IInventory iinventory, EntityItem entityitem) {
|
|
boolean flag = false;
|
|
+ // CraftBukkit start
|
|
+ InventoryPickupItemEvent event = new InventoryPickupItemEvent(iinventory.getOwner().getInventory(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
|
|
+ entityitem.level.getCraftServer().getPluginManager().callEvent(event);
|
|
+ if (event.isCancelled()) {
|
|
+ return false;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
ItemStack itemstack = entityitem.getItem().copy();
|
|
ItemStack itemstack1 = addItem((IInventory) null, iinventory, itemstack, (EnumDirection) null);
|
|
|
|
@@ -327,16 +431,40 @@
|
|
return itemstack;
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ @Nullable
|
|
+ private static IInventory runHopperInventorySearchEvent(IInventory inventory, CraftBlock hopper, CraftBlock searchLocation, HopperInventorySearchEvent.ContainerType containerType) {
|
|
+ HopperInventorySearchEvent event = new HopperInventorySearchEvent((inventory != null) ? new CraftInventory(inventory) : null, containerType, hopper, searchLocation);
|
|
+ Bukkit.getServer().getPluginManager().callEvent(event);
|
|
+ CraftInventory craftInventory = (CraftInventory) event.getInventory();
|
|
+ return (craftInventory != null) ? craftInventory.getInventory() : null;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
@Nullable
|
|
private static IInventory getAttachedContainer(World world, BlockPosition blockposition, IBlockData iblockdata) {
|
|
EnumDirection enumdirection = (EnumDirection) iblockdata.getValue(BlockHopper.FACING);
|
|
|
|
- return getContainerAt(world, blockposition.relative(enumdirection));
|
|
+ // CraftBukkit start
|
|
+ BlockPosition searchPosition = blockposition.relative(enumdirection);
|
|
+ IInventory inventory = getContainerAt(world, blockposition.relative(enumdirection));
|
|
+
|
|
+ CraftBlock hopper = CraftBlock.at(world, blockposition);
|
|
+ CraftBlock searchBlock = CraftBlock.at(world, searchPosition);
|
|
+ return runHopperInventorySearchEvent(inventory, hopper, searchBlock, HopperInventorySearchEvent.ContainerType.DESTINATION);
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
@Nullable
|
|
private static IInventory getSourceContainer(World world, IHopper ihopper) {
|
|
- return getContainerAt(world, ihopper.getLevelX(), ihopper.getLevelY() + 1.0D, ihopper.getLevelZ());
|
|
+ // CraftBukkit start
|
|
+ IInventory inventory = getContainerAt(world, ihopper.getLevelX(), ihopper.getLevelY() + 1.0D, ihopper.getLevelZ());
|
|
+
|
|
+ BlockPosition blockPosition = new BlockPosition(ihopper.getLevelX(), ihopper.getLevelY(), ihopper.getLevelZ());
|
|
+ CraftBlock hopper = CraftBlock.at(world, blockPosition);
|
|
+ CraftBlock container = CraftBlock.at(world, blockPosition.above());
|
|
+ return runHopperInventorySearchEvent(inventory, hopper, container, HopperInventorySearchEvent.ContainerType.SOURCE);
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
public static List<EntityItem> getItemsAtAndAbove(World world, IHopper ihopper) {
|