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

Fixes #743 crash with plugs, fixes #942 builder integration, closes #319 BC 6 prep

Browse Source
This commit is contained in:
thatsIch
2014-12-21 19:08:05 +01:00
parent cdf949a557
commit e300bf93fd
31 changed files with 261 additions and 1692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/inv/AdaptorBCPipe.java
+11 -11
View File
@@ -60,43 +60,43 @@ public class AdaptorBCPipe extends InventoryAdaptor
}
@Override
public ItemStack simulateSimilarRemove(int how_many, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination)
public ItemStack simulateSimilarRemove(int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination)
{
return null;
}
@Override
public ItemStack removeItems(int how_many, ItemStack filter, IInventoryDestination destination)
public ItemStack removeItems(int amount, ItemStack filter, IInventoryDestination destination)
{
return null;
}
@Override
public ItemStack simulateRemove(int how_many, ItemStack filter, IInventoryDestination destination)
public ItemStack simulateRemove(int amount, ItemStack filter, IInventoryDestination destination)
{
return null;
}
@Override
public ItemStack addItems(ItemStack A)
public ItemStack addItems(ItemStack toBeAdded )
{
if ( this.i == null )
return A;
if ( A == null )
return toBeAdded;
if ( toBeAdded == null )
return null;
if ( A.stackSize == 0 )
if ( toBeAdded.stackSize == 0 )
return null;
if ( this.bc.addItemsToPipe( this.i, A, this.d ) )
if ( this.bc.addItemsToPipe( this.i, toBeAdded, this.d ) )
return null;
return A;
return toBeAdded;
}
@Override
public ItemStack simulateAdd(ItemStack A)
public ItemStack simulateAdd(ItemStack toBeSimulated )
{
if ( this.i == null )
return A;
return toBeSimulated;
return null;
}