From 57112887cac7f4c8d63159ddc8f1f5b817b819d6 Mon Sep 17 00:00:00 2001 From: Tahg Date: Mon, 5 Dec 2011 04:00:45 -0500 Subject: [PATCH] Another fix for enchantments when moving around inventory. (Still glitches visually at times) --- .../java/net/minecraft/server/Container.java | 310 ++++++++++++++++++ 1 file changed, 310 insertions(+) create mode 100644 src/main/java/net/minecraft/server/Container.java diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java new file mode 100644 index 0000000000..48ae158d75 --- /dev/null +++ b/src/main/java/net/minecraft/server/Container.java @@ -0,0 +1,310 @@ +package net.minecraft.server; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +public abstract class Container { + + public List d = new ArrayList(); + public List e = new ArrayList(); + public int windowId = 0; + private short a = 0; + protected List listeners = new ArrayList(); + private Set b = new HashSet(); + + public Container() {} + + protected void a(Slot slot) { + slot.c = this.e.size(); + this.e.add(slot); + this.d.add(null); + } + + public void a(ICrafting icrafting) { + if (this.listeners.contains(icrafting)) { + throw new IllegalArgumentException("Listener already listening"); + } else { + this.listeners.add(icrafting); + icrafting.a(this, this.b()); + this.a(); + } + } + + public List b() { + ArrayList arraylist = new ArrayList(); + + for (int i = 0; i < this.e.size(); ++i) { + arraylist.add(((Slot) this.e.get(i)).getItem()); + } + + return arraylist; + } + + public void a() { + for (int i = 0; i < this.e.size(); ++i) { + ItemStack itemstack = ((Slot) this.e.get(i)).getItem(); + ItemStack itemstack1 = (ItemStack) this.d.get(i); + + if (!ItemStack.equals(itemstack1, itemstack)) { + itemstack1 = itemstack == null ? null : itemstack.cloneItemStack(); + this.d.set(i, itemstack1); + + for (int j = 0; j < this.listeners.size(); ++j) { + ((ICrafting) this.listeners.get(j)).a(this, i, itemstack1); + } + } + } + } + + public boolean a(EntityHuman entityhuman, int i) { + return false; + } + + public Slot a(IInventory iinventory, int i) { + for (int j = 0; j < this.e.size(); ++j) { + Slot slot = (Slot) this.e.get(j); + + if (slot.a(iinventory, i)) { + return slot; + } + } + + return null; + } + + public Slot b(int i) { + return (Slot) this.e.get(i); + } + + public ItemStack a(int i) { + Slot slot = (Slot) this.e.get(i); + + return slot != null ? slot.getItem() : null; + } + + public ItemStack a(int i, int j, boolean flag, EntityHuman entityhuman) { + ItemStack itemstack = null; + + if (j > 1) { + return null; + } else { + if (j == 0 || j == 1) { + PlayerInventory playerinventory = entityhuman.inventory; + + if (i == -999) { + if (playerinventory.l() != null && i == -999) { + if (j == 0) { + entityhuman.b(playerinventory.l()); + playerinventory.b((ItemStack) null); + } + + if (j == 1) { + entityhuman.b(playerinventory.l().a(1)); + if (playerinventory.l().count == 0) { + playerinventory.b((ItemStack) null); + } + } + } + } else if (flag) { + ItemStack itemstack1 = this.a(i); + + if (itemstack1 != null) { + int k = itemstack1.id; + + itemstack = itemstack1.cloneItemStack(); + Slot slot = (Slot) this.e.get(i); + + if (slot != null && slot.getItem() != null && slot.getItem().id == k) { + this.b(i, j, flag, entityhuman); + } + } + } else { + if (i < 0) { + return null; + } + + Slot slot1 = (Slot) this.e.get(i); + + if (slot1 != null) { + slot1.d(); + ItemStack itemstack2 = slot1.getItem(); + ItemStack itemstack3 = playerinventory.l(); + + if (itemstack2 != null) { + itemstack = itemstack2.cloneItemStack(); + } + + int l; + + if (itemstack2 == null) { + if (itemstack3 != null && slot1.isAllowed(itemstack3)) { + l = j == 0 ? itemstack3.count : 1; + if (l > slot1.a()) { + l = slot1.a(); + } + + slot1.c(itemstack3.a(l)); + if (itemstack3.count == 0) { + playerinventory.b((ItemStack) null); + } + } + } else if (itemstack3 == null) { + l = j == 0 ? itemstack2.count : (itemstack2.count + 1) / 2; + ItemStack itemstack4 = slot1.a(l); + + playerinventory.b(itemstack4); + if (itemstack2.count == 0) { + slot1.c((ItemStack) null); + } + + slot1.b(playerinventory.l()); + } else if (slot1.isAllowed(itemstack3)) { + // CraftBukkit + if (itemstack2.id == itemstack3.id && (!itemstack2.usesData() || itemstack2.getData() == itemstack3.getData()) && + ((itemstack2.tag == null && itemstack3.tag == null) || (itemstack2.tag != null && itemstack2.tag.equals(itemstack3.tag)))) { + l = j == 0 ? itemstack3.count : 1; + if (l > slot1.a() - itemstack2.count) { + l = slot1.a() - itemstack2.count; + } + + if (l > itemstack3.getMaxStackSize() - itemstack2.count) { + l = itemstack3.getMaxStackSize() - itemstack2.count; + } + + itemstack3.a(l); + if (itemstack3.count == 0) { + playerinventory.b((ItemStack) null); + } + + itemstack2.count += l; + } else if (itemstack3.count <= slot1.a()) { + slot1.c(itemstack3); + playerinventory.b(itemstack2); + } + // CraftBukkit + } else if (itemstack2.id == itemstack3.id && (!itemstack2.usesData() || itemstack2.getData() == itemstack3.getData()) && + ((itemstack2.tag == null && itemstack3.tag == null) || (itemstack2 != null && itemstack2.tag.equals(itemstack3.tag)))) { + l = itemstack2.count; + if (l > 0 && l + itemstack3.count <= itemstack3.getMaxStackSize()) { + itemstack3.count += l; + itemstack2.a(l); + if (itemstack2.count == 0) { + slot1.c((ItemStack) null); + } + + slot1.b(playerinventory.l()); + } + } + } + } + } + + return itemstack; + } + } + + protected void b(int i, int j, boolean flag, EntityHuman entityhuman) { + this.a(i, j, flag, entityhuman); + } + + public void a(EntityHuman entityhuman) { + PlayerInventory playerinventory = entityhuman.inventory; + + if (playerinventory.l() != null) { + entityhuman.b(playerinventory.l()); + playerinventory.b((ItemStack) null); + } + } + + public void a(IInventory iinventory) { + this.a(); + } + + public void a(int i, ItemStack itemstack) { + this.b(i).c(itemstack); + } + + public boolean c(EntityHuman entityhuman) { + return !this.b.contains(entityhuman); + } + + public void a(EntityHuman entityhuman, boolean flag) { + if (flag) { + this.b.remove(entityhuman); + } else { + this.b.add(entityhuman); + } + } + + public abstract boolean b(EntityHuman entityhuman); + + protected boolean a(ItemStack itemstack, int i, int j, boolean flag) { + boolean flag1 = false; + int k = i; + + if (flag) { + k = j - 1; + } + + Slot slot; + ItemStack itemstack1; + + if (itemstack.isStackable()) { + while (itemstack.count > 0 && (!flag && k < j || flag && k >= i)) { + slot = (Slot) this.e.get(k); + itemstack1 = slot.getItem(); + if (itemstack1 != null && itemstack1.id == itemstack.id && (!itemstack.usesData() || itemstack.getData() == itemstack1.getData())) { + int l = itemstack1.count + itemstack.count; + + if (l <= itemstack.getMaxStackSize()) { + itemstack.count = 0; + itemstack1.count = l; + slot.d(); + flag1 = true; + } else if (itemstack1.count < itemstack.getMaxStackSize()) { + itemstack.count -= itemstack.getMaxStackSize() - itemstack1.count; + itemstack1.count = itemstack.getMaxStackSize(); + slot.d(); + flag1 = true; + } + } + + if (flag) { + --k; + } else { + ++k; + } + } + } + + if (itemstack.count > 0) { + if (flag) { + k = j - 1; + } else { + k = i; + } + + while (!flag && k < j || flag && k >= i) { + slot = (Slot) this.e.get(k); + itemstack1 = slot.getItem(); + if (itemstack1 == null) { + slot.c(itemstack.cloneItemStack()); + slot.d(); + itemstack.count = 0; + flag1 = true; + break; + } + + if (flag) { + --k; + } else { + ++k; + } + } + } + + return flag1; + } +}