tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Storage Buses no longer assume an inventory can be accessed just because it implements IInventory.

Browse source
This commit is contained in:
AlgorithmX2 2014-07-23 17:39:42 -05:00
parent 980dff203f
commit 8bcd346226
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/features/registries/entries/ExternalIInv.java
View file

@ -22,9 +22,11 @@ public class ExternalIInv implements IExternalStorageHandler
@Override
public IMEInventory getInventory(TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource src)
{
if ( channel == StorageChannel.ITEMS && te instanceof IInventory )
return new MEMonitorIInventory( InventoryAdaptor.getAdaptor( (IInventory) te, d ) );
InventoryAdaptor ad = InventoryAdaptor.getAdaptor( (IInventory) te, d );
if ( channel == StorageChannel.ITEMS && ad != null )
return new MEMonitorIInventory( ad );
return null;
}

2
helpers/DualityInterface.java
View file

@ -380,7 +380,7 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt
{
public InterfaceInventory(DualityInterface tileInterface) {
super( InventoryAdaptor.getAdaptor( tileInterface.storage, ForgeDirection.UP ) );
super( new AdaptorIInventory( tileInterface.storage ) );
mySource = new MachineSource( iHost );
}

1
integration/modules/helpers/MFRDSUHandler.java
View file

@ -24,6 +24,7 @@ public class MFRDSUHandler implements IExternalStorageHandler
{
if ( chan == StorageChannel.ITEMS )
return new MEMonitorIInventory( new IMEAdaptor( DSU.instance.getDSU( te ), src ) );
return null;
}
}