Fix comp drawers restoring wrong items if more than 3 tiers are available (ExU compressed blocks).

This commit is contained in:
Justin Aquadro committed 2014-11-24 01:01:38 -05:00
1 parent 545d40eb60
commit 8b4bcc8712
3 files changed
+43 -20

No files matched your search

@@ -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++) {
@@ -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 () {
@@ -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);
}