From bbb78429c6047a04b8e241886dacb1bafcedb9f6 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Sun, 9 Nov 2014 23:14:37 -0500 Subject: [PATCH] Fix general inventory management --- .../block/tile/TileEntityDrawersStandard.java | 19 ++++++++- .../storage/DefaultStorageProvider.java | 3 ++ .../storagedrawers/storage/DrawerData.java | 41 +++++++++++++++---- 3 files changed, 53 insertions(+), 10 deletions(-) diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersStandard.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersStandard.java index bc11282..92ef9c6 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersStandard.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersStandard.java @@ -1,7 +1,11 @@ package com.jaquadro.minecraft.storagedrawers.block.tile; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; +import com.jaquadro.minecraft.storagedrawers.config.ConfigManager; import com.jaquadro.minecraft.storagedrawers.storage.*; import com.jaquadro.minecraft.storagedrawers.storage.IStorageProvider; +import net.minecraft.tileentity.TileEntity; public class TileEntityDrawersStandard extends TileEntityDrawers { @@ -15,6 +19,19 @@ public class TileEntityDrawersStandard extends TileEntityDrawers @Override protected IStorageProvider getStorageProvider () { - return new DefaultStorageProvider(this, this); + return new StandardStorageProvider(); + } + + private class StandardStorageProvider extends DefaultStorageProvider { + + public StandardStorageProvider () { + super(TileEntityDrawersStandard.this, TileEntityDrawersStandard.this); + } + + @Override + public int getSlotStackCapacity (int slot) { + ConfigManager config = StorageDrawers.config; + return config.getStorageUpgradeMultiplier(getStorageLevel()) * getDrawerCapacity(); + } } } diff --git a/src/com/jaquadro/minecraft/storagedrawers/storage/DefaultStorageProvider.java b/src/com/jaquadro/minecraft/storagedrawers/storage/DefaultStorageProvider.java index f2e423a..59886cd 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/storage/DefaultStorageProvider.java +++ b/src/com/jaquadro/minecraft/storagedrawers/storage/DefaultStorageProvider.java @@ -39,6 +39,9 @@ public class DefaultStorageProvider implements IStorageProvider @Override public void markAmountDirty (int slot) { + if (tile.getWorldObj().isRemote) + return; + int count = group.getDrawer(slot).getStoredItemCount(); IMessage message = new CountUpdateMessage(tile.xCoord, tile.yCoord, tile.zCoord, slot, count); diff --git a/src/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java b/src/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java index 2cb4106..e54ef99 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java +++ b/src/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java @@ -30,8 +30,8 @@ public class DrawerData implements IDrawer, IInventoryAdapter storageProvider = provider; this.slot = slot; + protoStack = nullStack; inventoryStack = new DrawerInventoryStack(); - reset(); } @Override @@ -55,9 +55,14 @@ public class DrawerData implements IDrawer, IInventoryAdapter @Override public void setStoredItem (ItemStack itemPrototype, int amount) { + setStoredItem(itemPrototype, amount, true); + } + + private void setStoredItem (ItemStack itemPrototype, int amount, boolean mark) { if (itemPrototype == null) { reset(); - storageProvider.markDirty(slot); + if (mark) + storageProvider.markDirty(slot); return; } @@ -65,10 +70,11 @@ public class DrawerData implements IDrawer, IInventoryAdapter protoStack.stackSize = 1; refreshOreDictMatches(); - setStoredItemCount(amount); + setStoredItemCount(amount, mark, false); inventoryStack.reset(); - storageProvider.markDirty(slot); + if (mark) + storageProvider.markDirty(slot); } @Override @@ -81,12 +87,26 @@ public class DrawerData implements IDrawer, IInventoryAdapter @Override public void setStoredItemCount (int amount) { + setStoredItemCount(amount, true, true); + } + + public void setStoredItemCount (int amount, boolean mark, boolean clearOnEmpty) { if (storageProvider.isCountCentrallyManaged()) storageProvider.setSlotCount(amount); else count = amount; - storageProvider.markAmountDirty(slot); + if (amount == 0) { + if (clearOnEmpty) { + protoStack = nullStack; + oreDictMatches = null; + inventoryStack.reset(); + if (mark) + storageProvider.markDirty(slot); + } + } + else if (mark) + storageProvider.markAmountDirty(slot); } @Override @@ -146,20 +166,23 @@ public class DrawerData implements IDrawer, IInventoryAdapter } public void readFromNBT (NBTTagCompound tag) { - reset(); - if (tag.hasKey("Item") && tag.hasKey("Count")) { 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, tag.getInteger("Count")); + setStoredItem(stack, tag.getInteger("Count"), false); + } + else { + protoStack = nullStack; + oreDictMatches = null; + inventoryStack.reset(); } } private void reset () { - setStoredItemCount(0); + setStoredItemCount(0, false, true); protoStack = nullStack; oreDictMatches = null; inventoryStack.reset();