From a861f09b01a5bf50f786745929d0754ac546ea14 Mon Sep 17 00:00:00 2001
From: AlgorithmX2 <AlgorithmX2@gmail.com>
Date: Sat, 24 May 2014 18:25:22 -0500
Subject: [PATCH] ME Chest insertion behavior fixed. ME Chest drive slot now
 properly accessible from front drive face. ME Chests can now function as
 tanks. ( fluid cells from extra cells ) ME Chests now return an empty slot
 list when they have no storage cells ( thus disconnecting from pipes. ) Fixed
 https://github.com/M3gaFr3ak/ExtraCells2/issues/18

---
 tile/storage/TileChest.java | 43 ++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/tile/storage/TileChest.java b/tile/storage/TileChest.java
index bc22dc251..2acb5cc92 100644
--- a/tile/storage/TileChest.java
+++ b/tile/storage/TileChest.java
@@ -78,6 +78,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
 
 	static final int sides[] = new int[] { 0 };
 	static final int front[] = new int[] { 1 };
+	static final int noslots[] = new int[] {};
 
 	AppEngInternalInventory inv = new AppEngInternalInventory( this, 2 );
 	BaseActionSource mySrc = new MachineSource( this );
@@ -479,25 +480,47 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
 	@Override
 	public boolean canInsertItem(int i, ItemStack itemstack, int j)
 	{
-		try
+		if ( i == 1 )
 		{
-			IMEInventory<IAEItemStack> cell = getHandler( StorageChannel.ITEMS );
-			IAEItemStack returns = cell.injectItems( AEApi.instance().storage().createItemStack( inv.getStackInSlot( 0 ) ), Actionable.SIMULATE, mySrc );
-			return returns == null || returns.getStackSize() != itemstack.stackSize;
+			if ( AEApi.instance().registries().cell().getCellInventory( itemstack, StorageChannel.ITEMS ) != null )
+				return true;
+			if ( AEApi.instance().registries().cell().getCellInventory( itemstack, StorageChannel.FLUIDS ) != null )
+				return true;
 		}
-		catch (ChestNoHandler t)
+		else
 		{
+			try
+			{
+				IMEInventory<IAEItemStack> cell = getHandler( StorageChannel.ITEMS );
+				IAEItemStack returns = cell.injectItems( AEApi.instance().storage().createItemStack( inv.getStackInSlot( 0 ) ), Actionable.SIMULATE, mySrc );
+				return returns == null || returns.getStackSize() != itemstack.stackSize;
+			}
+			catch (ChestNoHandler t)
+			{
+			}
 		}
-
 		return false;
 	}
 
 	@Override
 	public int[] getAccessibleSlotsBySide(ForgeDirection side)
 	{
-		if ( side == getForward() )
+		if ( ForgeDirection.SOUTH == side )
 			return front;
-		return sides;
+
+		if ( gridProxy.isActive() )
+		{
+			try
+			{
+				if ( getHandler( StorageChannel.ITEMS ) != null )
+					return sides;
+			}
+			catch (ChestNoHandler e)
+			{
+				// nope!
+			}
+		}
+		return noslots;
 	}
 
 	@Override
@@ -652,7 +675,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
 		{
 			IMEInventoryHandler h = getHandler( StorageChannel.FLUIDS );
 			if ( h.getChannel() == StorageChannel.FLUIDS )
-				return new FluidTankInfo[] { new FluidTankInfo( null ) }; // eh?
+				return new FluidTankInfo[] { new FluidTankInfo( null, 1 ) }; // eh?
 		}
 		catch (ChestNoHandler e)
 		{
@@ -708,7 +731,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
 	@Override
 	public IStorageMonitorable getMonitorable(ForgeDirection side, BaseActionSource src)
 	{
-		if ( Platform.canAccess( gridProxy, src ) )
+		if ( Platform.canAccess( gridProxy, src ) && side != getForward() )
 			return this;
 		return null;
 	}