fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FZ Integration Re-Added.

Browse Source
This commit is contained in:
AlgorithmX2
2014-03-18 21:55:49 -05:00
parent 9e85c33b16
commit 43beaea742
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration/modules/helpers/FactorizationBarrel.java
+10 -4
View File
@@ -38,9 +38,15 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
return fProxy.barrelGetMaxItemCount( te ) - fProxy.barrelGetItemCount( te );
}
public boolean containsItemType(IAEItemStack i)
public boolean containsItemType(IAEItemStack i, boolean acceptEmpty)
{
return i.equals( fProxy.barrelGetItem( te ) );
ItemStack currentItem = fProxy.barrelGetItem( te );
// empty barrels want your love too!
if ( acceptEmpty && currentItem == null )
return true;
return i.equals( currentItem );
}
public long storedItemCount()
@@ -66,7 +72,7 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
fProxy.setItemType( te, input.getItemStack() );
}
if ( containsItemType( input ) )
if ( containsItemType( input, mode == Actionable.SIMULATE ) )
{
int max = fProxy.barrelGetMaxItemCount( te );
int newTotal = (int) storedItemCount() + (int) input.getStackSize();
@@ -92,7 +98,7 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
@Override
public IAEItemStack extractItems(IAEItemStack request, Actionable mode, BaseActionSource src)
{
if ( containsItemType( request ) )
if ( containsItemType( request, false ) )
{
int howMany = (int) storedItemCount();
if ( request.getStackSize() >= howMany )