Update for 1.4_00_01 -- if you bypassed Bukkit, you will most likely break.

This commit is contained in:
Erik Broes
2011-04-20 19:05:14 +02:00
parent ac9f297445
commit 483a878b8b
116 changed files with 3155 additions and 3207 deletions

View File

@@ -19,23 +19,23 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
}
public int getSize() {
return getInventory().q_();
return getInventory().getSize();
}
public String getName() {
return getInventory().c();
return getInventory().getName();
}
public ItemStack getItem(int index) {
return new CraftItemStack(getInventory().c_(index));
public CraftItemStack getItem(int index) {
return new CraftItemStack(getInventory().getItem(index));
}
public ItemStack[] getContents() {
ItemStack[] items = new ItemStack[getSize()];
public CraftItemStack[] getContents() {
CraftItemStack[] items = new CraftItemStack[getSize()];
net.minecraft.server.ItemStack[] mcItems = getInventory().getContents();
for (int i = 0; i < mcItems.length; i++ ) {
items[i] = mcItems[i] == null ? null : new CraftItemStack(mcItems[i]);
items[i] = new CraftItemStack(mcItems[i]);
}
return items;
@@ -59,12 +59,12 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
}
public void setItem(int index, ItemStack item) {
getInventory().a(index, (item == null ? null : new net.minecraft.server.ItemStack( item.getTypeId(), item.getAmount(), item.getDurability())));
getInventory().setItem(index, (item == null ? null : new net.minecraft.server.ItemStack( item.getTypeId(), item.getAmount(), item.getDurability())));
}
public boolean contains(int materialId) {
for (ItemStack item: getContents()) {
if (item != null && item.getTypeId() == materialId) {
if (item.getTypeId() == materialId) {
return true;
}
}
@@ -86,15 +86,15 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
}
return false;
}
public boolean contains(int materialId, int amount) {
int amt = 0;
for (ItemStack item: getContents()) {
if (item != null && item.getTypeId() == materialId) {
amt += item.getAmount();
if (item.getTypeId() == materialId && item.getAmount() >= amount) {
return true;
}
}
return amt >= amount;
return false;
}
public boolean contains(Material material, int amount) {
@@ -107,13 +107,13 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
}
int amt = 0;
for (ItemStack i: getContents()) {
if (item.equals(i)) {
amt += item.getAmount();
if (item.equals(i) && item.getAmount() >= amount) {
return true;
}
}
return amt >= amount;
return false;
}
public HashMap<Integer, ItemStack> all(int materialId) {
HashMap<Integer, ItemStack> slots = new HashMap<Integer, ItemStack>();
@@ -312,7 +312,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
}
private int getMaxItemStack() {
return getInventory().r_();
return getInventory().getMaxStackSize();
}
public void remove(int materialId) {

View File

@@ -19,7 +19,7 @@ public class CraftInventoryPlayer extends CraftInventory implements PlayerInvent
}
public CraftItemStack getItemInHand() {
return new CraftItemStack( getInventory().b() );
return new CraftItemStack( getInventory().getItemInHand() );
}
public void setItemInHand(ItemStack stack) {
@@ -27,22 +27,22 @@ public class CraftInventoryPlayer extends CraftInventory implements PlayerInvent
}
public int getHeldItemSlot() {
return getInventory().c;
return getInventory().itemInHandIndex;
}
public ItemStack getHelmet() {
public CraftItemStack getHelmet() {
return getItem( getSize() + 3 );
}
public ItemStack getChestplate() {
public CraftItemStack getChestplate() {
return getItem( getSize() + 2 );
}
public ItemStack getLeggings() {
public CraftItemStack getLeggings() {
return getItem( getSize() + 1 );
}
public ItemStack getBoots() {
public CraftItemStack getBoots() {
return getItem( getSize() + 0 );
}

View File

@@ -121,6 +121,6 @@ public class CraftItemStack extends ItemStack {
@Override
public int getMaxStackSize() {
return item.a().b();
return item.getItem().getMaxStackSize();
}
}

View File

@@ -12,14 +12,14 @@ public class CraftSlot implements org.bukkit.inventory.Slot {
}
public Inventory getInventory() {
return new CraftInventory( slot.e );
return new CraftInventory( slot.inventory );
}
public int getIndex() {
return slot.d;
return slot.index;
}
public ItemStack getItem() {
return new CraftItemStack( slot.a() );
return new CraftItemStack( slot.getItem() );
}
}