Fixes #822 Automation of IO Port works as inteded again

Top and bottom can insert into input slots 0 - 5 on the left
Sides can extract from output slots 6 - 11 on the eight
This commit is contained in:
thatsIch
2015-03-22 11:07:25 +01:00
parent 9c1c9056f1
commit da91585d69
11 changed files with 228 additions and 187 deletions
@@ -219,16 +219,16 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable
}
@Override
public boolean canExtractItem(int i, ItemStack itemstack, int j)
public boolean canExtractItem(int slotIndex, ItemStack extractedItem, int side )
{
if ( Platform.isChargeable( itemstack ) )
if ( Platform.isChargeable( extractedItem ) )
{
IAEItemPowerStorage ips = (IAEItemPowerStorage) itemstack.getItem();
if ( ips.getAECurrentPower( itemstack ) >= ips.getAEMaxPower( itemstack ) )
IAEItemPowerStorage ips = (IAEItemPowerStorage) extractedItem.getItem();
if ( ips.getAECurrentPower( extractedItem ) >= ips.getAEMaxPower( extractedItem ) )
return true;
}
return AEApi.instance().materials().materialCertusQuartzCrystalCharged.sameAsStack( itemstack );
return AEApi.instance().materials().materialCertusQuartzCrystalCharged.sameAsStack( extractedItem );
}
public void activate(EntityPlayer player)
@@ -168,15 +168,15 @@ public class TileCondenser extends AEBaseInvTile implements IFluidHandler, IConf
}
@Override
public boolean canExtractItem(int i, ItemStack itemstack, int j)
public boolean canExtractItem(int slotIndex, ItemStack extractedItem, int side )
{
return i != 0;
return slotIndex != 0;
}
@Override
public boolean canInsertItem(int i, ItemStack itemstack, int j)
public boolean canInsertItem(int slotIndex, ItemStack insertingItem, int side )
{
return i == 0;
return slotIndex == 0;
}
@Override
@@ -224,12 +224,12 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
}
@Override
public boolean canExtractItem(int i, ItemStack itemstack, int j)
public boolean canExtractItem(int slotIndex, ItemStack extractedItem, int side )
{
if ( this.smash )
return false;
return i == 0 || i == 1 || i == 3;
return slotIndex == 0 || slotIndex == 1 || slotIndex == 3;
}
@Override
@@ -142,7 +142,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
}
@Override
public boolean canExtractItem(int i, ItemStack itemstack, int j)
public boolean canExtractItem(int slotIndex, ItemStack extractedItem, int side )
{
return false;
}