diff options
author | Erik Broes <erikbroes@grum.nl> | 2011-06-27 00:25:01 +0200 |
---|---|---|
committer | Erik Broes <erikbroes@grum.nl> | 2011-06-27 00:47:03 +0200 |
commit | a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3 (patch) | |
tree | f7c9c5db09b72b57a85240cc7fdb2e4bcf7ab875 /src/main/java/net/minecraft/server/ItemStack.java | |
parent | 9e5dba8306f77e0583537efe7d5b3670639e3382 (diff) | |
download | craftbukkit-a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3.tar craftbukkit-a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3.tar.gz craftbukkit-a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3.tar.lz craftbukkit-a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3.tar.xz craftbukkit-a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3.zip |
Massive renaming update in nms. If you bypassed Bukkit, you will likely break.
Also minimized all the nms diffs and generic cleanups all around.
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemStack.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ItemStack.java | 14 |
1 files changed, 7 insertions, 7 deletions
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() { |