From 8b4bcc8712f8b3b61b8769bd0eed695d040cd560 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Mon, 24 Nov 2014 01:01:38 -0500 Subject: [PATCH] Fix comp drawers restoring wrong items if more than 3 tiers are available (ExU compressed blocks). --- .../block/tile/TileEntityDrawersComp.java | 35 +++++++++++++++++++ .../storage/CompDrawerData.java | 23 ++---------- .../storage/ICentralInventory.java | 5 +++ 3 files changed, 43 insertions(+), 20 deletions(-) diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java index ea82353..a1593df 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java @@ -11,6 +11,7 @@ import com.jaquadro.minecraft.storagedrawers.storage.*; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.IMessage; import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; @@ -108,6 +109,17 @@ public class TileEntityDrawersComp extends TileEntityDrawers convRate[1] = tag.getByte("Conv1"); if (tag.hasKey("Conv2")) convRate[2] = tag.getByte("Conv2"); + + for (int i = 0; i < getDrawerCount(); i++) { + IDrawer drawer = getDrawer(i); + if (drawer instanceof CompDrawerData) + ((CompDrawerData) drawer).refresh(); + } + + if (worldObj != null && !worldObj.isRemote) { + //TileEntityDrawersComp.this.markDirty(); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } } catch (Throwable t) { trapLoadFailure(t, tag); @@ -445,7 +457,30 @@ public class TileEntityDrawersComp extends TileEntityDrawers return protoStack[slot].getItem().getItemStackLimit(protoStack[slot]); } + @Override + public void writeToNBT (int slot, NBTTagCompound tag) { + ItemStack protoStack = getStoredItemPrototype(slot); + if (protoStack != null && protoStack.getItem() != null) { + tag.setShort("Item", (short) Item.getIdFromItem(protoStack.getItem())); + tag.setShort("Meta", (short) protoStack.getItemDamage()); + tag.setInteger("Count", 0); // TODO: Remove when ready to break 1.1.7 compat + if (protoStack.getTagCompound() != null) + tag.setTag("Tags", protoStack.getTagCompound()); + } + } + + @Override + public void readFromNBT (int slot, NBTTagCompound tag) { + if (tag.hasKey("Item")) { + ItemStack stack = new ItemStack(Item.getItemById(tag.getShort("Item"))); + stack.setItemDamage(tag.getShort("Meta")); + if (tag.hasKey("Tags")) + stack.setTagCompound(tag.getCompoundTag("Tags")); + + protoStack[slot] = stack; + } + } private void clear () { for (int i = 0; i < getDrawerCount(); i++) { diff --git a/src/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java b/src/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java index 5613ac4..a53b24f 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java +++ b/src/com/jaquadro/minecraft/storagedrawers/storage/CompDrawerData.java @@ -74,30 +74,13 @@ public class CompDrawerData extends BaseDrawerData @Override public void writeToNBT (NBTTagCompound tag) { - ItemStack protoStack = getStoredItemPrototype(); - if (protoStack != null && protoStack.getItem() != null) { - tag.setShort("Item", (short) Item.getIdFromItem(protoStack.getItem())); - tag.setShort("Meta", (short) protoStack.getItemDamage()); - tag.setInteger("Count", 0); // TODO: Remove when ready to break 1.1.7 compat - - if (protoStack.getTagCompound() != null) - tag.setTag("Tags", protoStack.getTagCompound()); - } + central.writeToNBT(slot, tag); } @Override public void readFromNBT (NBTTagCompound tag) { - if (tag.hasKey("Item")) { - ItemStack stack = new ItemStack(Item.getItemById(tag.getShort("Item"))); - stack.setItemDamage(tag.getShort("Meta")); - if (tag.hasKey("Tags")) - stack.setTagCompound(tag.getCompoundTag("Tags")); - - setStoredItem(stack, 0); - } - else { - reset(); - } + central.readFromNBT(slot, tag); + refresh(); } public void refresh () { diff --git a/src/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java b/src/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java index 578dadb..d9492aa 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java +++ b/src/com/jaquadro/minecraft/storagedrawers/storage/ICentralInventory.java @@ -1,6 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.storage; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public interface ICentralInventory { @@ -17,4 +18,8 @@ public interface ICentralInventory public int getRemainingCapacity (int slot); public int getStoredItemStackSize (int slot); + + public void readFromNBT (int slot, NBTTagCompound tag); + + public void writeToNBT (int slot, NBTTagCompound tag); }