Storage Bus no longer shows items that cannot be extracted.

This commit is contained in:
AlgorithmX2 2014-08-11 22:56:33 -05:00
parent 0e65911673
commit feb7d7be95
3 changed files with 9 additions and 3 deletions

View file

@ -165,7 +165,7 @@ public class MEMonitorIInventory implements IMEInventory<IAEItemStack>, IMEMonit
for (ItemSlot is : adaptor) for (ItemSlot is : adaptor)
{ {
CachedItemStack old = memory.get( is.slot ); CachedItemStack old = memory.get( is.slot );
ItemStack newIS = is == null ? null : is.getItemStack(); ItemStack newIS = is == null || is.isExtractable == false ? null : is.getItemStack();
ItemStack oldIS = old == null ? null : old.itemStack; ItemStack oldIS = old == null ? null : old.itemStack;
if ( isDiffrent( newIS, oldIS ) ) if ( isDiffrent( newIS, oldIS ) )

View file

@ -341,8 +341,12 @@ public class AdaptorIInventory extends InventoryAdaptor
@Override @Override
public ItemSlot next() public ItemSlot next()
{ {
is.slot = x; ItemStack iss = i.getStackInSlot( x );
is.setItemStack( i.getStackInSlot( x++ ) );
is.isExtractable = canRemoveStackFromSlot( x, iss );
is.setItemStack( iss );
is.slot = x++;
return is; return is;
} }

View file

@ -13,6 +13,8 @@ public class ItemSlot
private IAEItemStack aeitemstack; private IAEItemStack aeitemstack;
private ItemStack itemStack; private ItemStack itemStack;
public boolean isExtractable;
public void setItemStack(ItemStack is) public void setItemStack(ItemStack is)
{ {
aeitemstack = null; aeitemstack = null;