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

API Update.

Browse source
This commit is contained in:
AlgorithmX2 2014-05-24 18:23:23 -05:00
parent d5cfa12f76
commit 1b207a17e9
7 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/features/registries/ExternalStorageRegistry.java
View file

@ -5,6 +5,7 @@ import java.util.List;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.storage.IExternalStorageHandler; import appeng.api.storage.IExternalStorageHandler;
import appeng.api.storage.IExternalStorageRegistry; import appeng.api.storage.IExternalStorageRegistry;
import appeng.api.storage.StorageChannel; import appeng.api.storage.StorageChannel;
@ -21,15 +22,15 @@ public class ExternalStorageRegistry implements IExternalStorageRegistry
} }
@Override @Override
public IExternalStorageHandler getHandler(TileEntity te, ForgeDirection d, StorageChannel chan) public IExternalStorageHandler getHandler(TileEntity te, ForgeDirection d, StorageChannel chan, BaseActionSource mySrc)
{ {
for (IExternalStorageHandler x : Handlers) for (IExternalStorageHandler x : Handlers)
{ {
if ( x.canHandle( te, d, chan ) ) if ( x.canHandle( te, d, chan, mySrc ) )
return x; return x;
} }
if ( lastHandler.canHandle( te, d, chan ) ) if ( lastHandler.canHandle( te, d, chan, mySrc ) )
return lastHandler; return lastHandler;
return null; return null;

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

@ -14,7 +14,7 @@ public class ExternalIInv implements IExternalStorageHandler
{ {
@Override @Override
public boolean canHandle(TileEntity te, ForgeDirection d, StorageChannel channel) public boolean canHandle(TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource mySrc)
{ {
return channel == StorageChannel.ITEMS && te instanceof IInventory; return channel == StorageChannel.ITEMS && te instanceof IInventory;
} }

2
integration/modules/BCHelpers/BCPipeHandler.java
View file

@ -12,7 +12,7 @@ public class BCPipeHandler implements IExternalStorageHandler
{ {
@Override @Override
public boolean canHandle(TileEntity te, ForgeDirection d, StorageChannel chan) public boolean canHandle(TileEntity te, ForgeDirection d, StorageChannel chan, BaseActionSource mySrc)
{ {
return chan == StorageChannel.ITEMS && BC.instance.isPipe( te, d ); return chan == StorageChannel.ITEMS && BC.instance.isPipe( te, d );
} }

2
integration/modules/helpers/FactorizationHandler.java
View file

@ -14,7 +14,7 @@ public class FactorizationHandler implements IExternalStorageHandler
{ {
@Override @Override
public boolean canHandle(TileEntity te, ForgeDirection d, StorageChannel chan) public boolean canHandle(TileEntity te, ForgeDirection d, StorageChannel chan, BaseActionSource mySrc)
{ {
return chan == StorageChannel.ITEMS && FZ.instance.isBarrel( te ); return chan == StorageChannel.ITEMS && FZ.instance.isBarrel( te );
} }

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

@ -14,7 +14,7 @@ public class MFRDSUHandler implements IExternalStorageHandler
{ {
@Override @Override
public boolean canHandle(TileEntity te, ForgeDirection d, StorageChannel chan) public boolean canHandle(TileEntity te, ForgeDirection d, StorageChannel chan, BaseActionSource mySrc)
{ {
return chan == StorageChannel.ITEMS && DSU.instance.isDSU( te ); return chan == StorageChannel.ITEMS && DSU.instance.isDSU( te );
} }

4
me/storage/AEExternalHandler.java
View file

@ -16,10 +16,10 @@ public class AEExternalHandler implements IExternalStorageHandler
{ {
@Override @Override
public boolean canHandle(TileEntity te, ForgeDirection d, StorageChannel channel) public boolean canHandle(TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource mySrc)
{ {
if ( channel == StorageChannel.ITEMS && te instanceof ITileStorageMonitorable ) if ( channel == StorageChannel.ITEMS && te instanceof ITileStorageMonitorable )
return true; return ((ITileStorageMonitorable) te).getMonitorable( d, mySrc ) != null;
return te instanceof TileCondenser; return te instanceof TileCondenser;
} }

2
parts/misc/PartStorageBus.java
View file

@ -241,7 +241,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
monitor = null; monitor = null;
if ( target != null ) if ( target != null )
{ {
IExternalStorageHandler esh = AEApi.instance().registries().externalStorage().getHandler( target, side.getOpposite(), StorageChannel.ITEMS ); IExternalStorageHandler esh = AEApi.instance().registries().externalStorage().getHandler( target, side.getOpposite(), StorageChannel.ITEMS, mySrc );
if ( esh != null ) if ( esh != null )
{ {
IMEInventory inv = esh.getInventory( target, side.getOpposite(), StorageChannel.ITEMS, mySrc ); IMEInventory inv = esh.getInventory( target, side.getOpposite(), StorageChannel.ITEMS, mySrc );