Sided Inventories now properly observe their own rotation.

This commit is contained in:
AlgorithmX2
2014-03-13 21:59:37 -05:00
parent c77c48092f
commit 754d2c25d9
17 changed files with 39 additions and 30 deletions
+7 -7
View File
@@ -358,7 +358,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
{
icell = null;
fcell = null;
ItemStack is = inv.getStackInSlot( 1 );
if ( is != null )
{
@@ -367,17 +367,17 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
if ( cellHandler != null )
{
double power = 1.0;
IMEInventoryHandler<IAEItemStack> itemCell = cellHandler.getCellInventory( is, StorageChannel.ITEMS );
IMEInventoryHandler<IAEFluidStack> fluidCell = cellHandler.getCellInventory( is, StorageChannel.FLUIDS );
if ( itemCell != null )
power += cellHandler.cellIdleDrain( is, itemCell );
else if ( fluidCell != null )
power += cellHandler.cellIdleDrain( is, fluidCell );
gridProxy.setIdlePowerUsage( power );
icell = wrap( itemCell );
fcell = wrap( fluidCell );
}
@@ -487,9 +487,9 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
}
@Override
public int[] getAccessibleSlotsFromSide(int side)
public int[] getAccessibleSlotsBySide(ForgeDirection side)
{
if ( side == getForward().ordinal() )
if ( side == getForward() )
return front;
return sides;
}
+1 -1
View File
@@ -192,7 +192,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
}
@Override
public int[] getAccessibleSlotsFromSide(int side)
public int[] getAccessibleSlotsBySide(ForgeDirection side)
{
return sides;
}
+1 -1
View File
@@ -153,7 +153,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
}
@Override
public int[] getAccessibleSlotsFromSide(int side)
public int[] getAccessibleSlotsBySide(ForgeDirection side)
{
return sides;
}
+2 -1
View File
@@ -6,6 +6,7 @@ import java.io.IOException;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.tile.AEBaseInvTile;
import appeng.tile.events.AETileEventHandler;
import appeng.tile.events.TileEventType;
@@ -76,7 +77,7 @@ public class TileSkyChest extends AEBaseInvTile
}
@Override
public int[] getAccessibleSlotsFromSide(int side)
public int[] getAccessibleSlotsBySide(ForgeDirection side)
{
return sides;
}