[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

@@ -1,15 +1,30 @@
package net.minecraft.server;
// CraftBukkit start
import org.bukkit.craftbukkit.inventory.CraftInventory;
import org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest;
import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
import org.bukkit.craftbukkit.inventory.CraftInventoryView;
// CraftBukkit end
public class ContainerChest extends Container {
private IInventory a;
public IInventory a; // CraftBukkit - private->public
private int b;
// CraftBukkit start
private CraftInventoryView bukkitEntity = null;
private PlayerInventory player;
// CraftBukkit end
public ContainerChest(IInventory iinventory, IInventory iinventory1) {
this.a = iinventory1;
this.b = iinventory1.getSize() / 9;
iinventory1.f();
int i = (this.b - 4) * 18;
// CraftBukkit start - save player
// TODO: Should we check to make sure it really is an InventoryPlayer?
this.player = (PlayerInventory)iinventory;
// CraftBukkit end
int j;
int k;
@@ -32,6 +47,7 @@ public class ContainerChest extends Container {
}
public boolean b(EntityHuman entityhuman) {
if (!this.checkReachable) return true; // CraftBukkit
return this.a.a(entityhuman);
}
@@ -61,6 +77,24 @@ public class ContainerChest extends Container {
return itemstack;
}
// CraftBukkit start
public CraftInventoryView getBukkitView() {
if (bukkitEntity != null) {
return bukkitEntity;
}
CraftInventory inventory;
if (a instanceof PlayerInventory) {
inventory = new CraftInventoryPlayer((PlayerInventory)a);
} else if (a instanceof InventoryLargeChest) {
inventory = new CraftInventoryDoubleChest((InventoryLargeChest)a);
} else {
inventory = new CraftInventory(this.a);
}
bukkitEntity = new CraftInventoryView(this.player.d.getBukkitEntity(), inventory, this);
return bukkitEntity;
}
// CraftBukkit end
public void a(EntityHuman entityhuman) {
super.a(entityhuman);
this.a.g();