mirror of
https://github.com/GTNewHorizons/StorageDrawers.git
synced 2026-11-22 13:09:47 +00:00
Fix general inventory management
This commit is contained in:
1 parent
73b8e5fd91
commit
bbb78429c6
3 files changed
+53
-10
No files matched your search
+18
-1
@@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in new issue
Block a user