From a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3 Mon Sep 17 00:00:00 2001 From: Erik Broes Date: Mon, 27 Jun 2011 00:25:01 +0200 Subject: Massive renaming update in nms. If you bypassed Bukkit, you will likely break. Also minimized all the nms diffs and generic cleanups all around. --- src/main/java/net/minecraft/server/ItemStack.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/main/java/net/minecraft/server/ItemStack.java') diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java index 9d337631..243b974f 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -83,19 +83,19 @@ public final class ItemStack { this.damage = nbttagcompound.d("Damage"); } - public int b() { + public int getMaxStackSize() { return this.getItem().getMaxStackSize(); } - public boolean c() { - return this.b() > 1 && (!this.d() || !this.f()); + public boolean isStackable() { + return this.getMaxStackSize() > 1 && (!this.d() || !this.f()); } public boolean d() { return Item.byId[this.id].e() > 0; } - public boolean e() { + public boolean usesData() { return Item.byId[this.id].d(); } @@ -167,7 +167,7 @@ public final class ItemStack { Item.byId[this.id].a(this, entityliving); } - public ItemStack j() { + public ItemStack cloneItemStack() { return new ItemStack(this.id, this.count, this.damage); } @@ -179,12 +179,12 @@ public final class ItemStack { return this.count != itemstack.count ? false : (this.id != itemstack.id ? false : this.damage == itemstack.damage); } - public boolean a(ItemStack itemstack) { + public boolean doMaterialsMatch(ItemStack itemstack) { return this.id == itemstack.id && this.damage == itemstack.damage; } public static ItemStack b(ItemStack itemstack) { - return itemstack == null ? null : itemstack.j(); + return itemstack == null ? null : itemstack.cloneItemStack(); } public String toString() { -- cgit v1.2.3