[Bleeding] Implementation of inventory framework. Addresses BUKKIT-856

See the corresponding Bukkit commit for details.

Implementation details:
- Any packets that include an itemstack will send air stacks as null; maybe this will even eliminate the client crash that occurs if the client receives an air stack
- Better handling of null itemstacks in general (ie less converting them to air stacks)
- Inventory.setContents() can now take an array smaller than the inventory without error
- Player.updateInventory() should now correctly update the result slot in a crafting inventory

Some small credit goes to Afforess (initial implementation of openInventory() methods) and Drakia (initial implementation of InventoryOpenEvent and InventoryCloseEvent).
This commit is contained in:
Celtic Minstrel
2012-02-29 13:56:35 -05:00
committed by EvilSeph
parent 10e593649c
commit 0842bab48b
47 changed files with 1821 additions and 89 deletions

View File

@@ -2,6 +2,16 @@ package net.minecraft.server;
import java.util.List;
// CraftBukkit start
import java.util.ArrayList;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.entity.CraftHumanEntity;
import org.bukkit.entity.HumanEntity;
import org.bukkit.event.inventory.BrewEvent;
import org.bukkit.inventory.BrewerInventory;
// CraftBukkit end
public class TileEntityBrewingStand extends TileEntity implements IInventory {
public ItemStack[] a = new ItemStack[4]; // CraftBukkit private -> public
@@ -12,6 +22,20 @@ public class TileEntityBrewingStand extends TileEntity implements IInventory {
public TileEntityBrewingStand() {}
// CraftBukkit start
public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
public void onOpen(CraftHumanEntity who) {
transaction.add(who);
}
public void onClose(CraftHumanEntity who) {
transaction.remove(who);
}
public List<HumanEntity> getViewers() {
return transaction;
}
public ItemStack[] getContents() {
return this.a;
}
@@ -97,6 +121,12 @@ public class TileEntityBrewingStand extends TileEntity implements IInventory {
if (this.o()) {
ItemStack itemstack = this.a[3];
// CraftBukkit start - fire BREW event
BrewEvent event = new BrewEvent(world.getWorld().getBlockAt(x, y, z), (BrewerInventory) this.getOwner().getInventory());
Bukkit.getPluginManager().callEvent(event);
if(event.isCancelled()) return;
// CraftBukkit end
for (int i = 0; i < 3; ++i) {
if (this.a[i] != null && this.a[i].id == Item.POTION.id) {
int j = this.a[i].getData();