diff --git a/client/gui/implementations/GuiInscriber.java b/client/gui/implementations/GuiInscriber.java index 6999136d3..5cf5f2721 100644 --- a/client/gui/implementations/GuiInscriber.java +++ b/client/gui/implementations/GuiInscriber.java @@ -41,12 +41,9 @@ public class GuiInscriber extends AEBaseGui @Override public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { - int k = 25; - int l = -15; - pb.max = cvc.maxProessingTime; pb.current = cvc.processingTime; - pb.FullMsg = ( pb.current * 100 / pb.max ) + "%"; + pb.FullMsg = (pb.current * 100 / pb.max) + "%"; fontRendererObj.drawString( GuiText.Inscriber.getLocal(), 8, 6, 4210752 ); fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 ); diff --git a/tile/AEBaseInvTile.java b/tile/AEBaseInvTile.java index aa2da4bf0..13f60881e 100644 --- a/tile/AEBaseInvTile.java +++ b/tile/AEBaseInvTile.java @@ -1,10 +1,13 @@ package appeng.tile; +import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; +import appeng.block.AEBaseBlock; import appeng.tile.events.AETileEventHandler; import appeng.tile.events.TileEventType; import appeng.tile.inventory.IAEAppEngInventory; @@ -135,7 +138,17 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor @Override public abstract void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removed, ItemStack added); - @Override - public abstract int[] getAccessibleSlotsFromSide(int side); + public abstract int[] getAccessibleSlotsBySide(ForgeDirection whichSide); + @Override + final public int[] getAccessibleSlotsFromSide(int side) + { + Block blk = worldObj.getBlock( xCoord, yCoord, zCoord ); + if ( blk instanceof AEBaseBlock ) + { + ForgeDirection mySide = ForgeDirection.getOrientation( side ); + return getAccessibleSlotsBySide( ((AEBaseBlock) blk).mapRotation( this, mySide ) ); + } + return getAccessibleSlotsBySide( ForgeDirection.getOrientation( side ) ); + } } diff --git a/tile/grindstone/TileGrinder.java b/tile/grindstone/TileGrinder.java index 88d6acef3..1b66eaed8 100644 --- a/tile/grindstone/TileGrinder.java +++ b/tile/grindstone/TileGrinder.java @@ -71,7 +71,7 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getAccessibleSlotsBySide(ForgeDirection side) { return sides; } diff --git a/tile/misc/TileCharger.java b/tile/misc/TileCharger.java index 509496cb8..f73ae0196 100644 --- a/tile/misc/TileCharger.java +++ b/tile/misc/TileCharger.java @@ -193,7 +193,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getAccessibleSlotsBySide(ForgeDirection whichSide) { return sides; } diff --git a/tile/misc/TileCondenser.java b/tile/misc/TileCondenser.java index f244f9ac4..2021ba8d6 100644 --- a/tile/misc/TileCondenser.java +++ b/tile/misc/TileCondenser.java @@ -172,7 +172,7 @@ public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory, } @Override - public int[] getAccessibleSlotsFromSide(int var1) + public int[] getAccessibleSlotsBySide(ForgeDirection side) { return sides; } diff --git a/tile/misc/TileInscriber.java b/tile/misc/TileInscriber.java index 3b6ea2e6b..8176ccfed 100644 --- a/tile/misc/TileInscriber.java +++ b/tile/misc/TileInscriber.java @@ -158,10 +158,8 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getAccessibleSlotsBySide(ForgeDirection d) { - ForgeDirection d = ForgeDirection.getOrientation( side ); - if ( d == ForgeDirection.UP ) return top; diff --git a/tile/misc/TileInterface.java b/tile/misc/TileInterface.java index 1d2e70b25..039e39b47 100644 --- a/tile/misc/TileInterface.java +++ b/tile/misc/TileInterface.java @@ -137,9 +137,9 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IS } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getAccessibleSlotsBySide(ForgeDirection side) { - return duality.getAccessibleSlotsFromSide( side ); + return duality.getAccessibleSlotsFromSide( side.ordinal() ); } @Override diff --git a/tile/misc/TileVibrationChamber.java b/tile/misc/TileVibrationChamber.java index 603a4d38d..d18bd6248 100644 --- a/tile/misc/TileVibrationChamber.java +++ b/tile/misc/TileVibrationChamber.java @@ -119,7 +119,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getAccessibleSlotsBySide(ForgeDirection side) { return sides; } diff --git a/tile/networking/TileController.java b/tile/networking/TileController.java index f76eab850..e2a1043b8 100644 --- a/tile/networking/TileController.java +++ b/tile/networking/TileController.java @@ -170,7 +170,7 @@ public class TileController extends AENetworkPowerTile implements IAEPowerStorag } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getAccessibleSlotsBySide(ForgeDirection side) { return sides; } diff --git a/tile/networking/TileEnergyAcceptor.java b/tile/networking/TileEnergyAcceptor.java index 582c736ef..b44f96f3c 100644 --- a/tile/networking/TileEnergyAcceptor.java +++ b/tile/networking/TileEnergyAcceptor.java @@ -95,7 +95,7 @@ public class TileEnergyAcceptor extends AENetworkPowerTile } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getAccessibleSlotsBySide(ForgeDirection side) { return sides; } diff --git a/tile/networking/TileWireless.java b/tile/networking/TileWireless.java index e90f98fcd..7a43fcc77 100644 --- a/tile/networking/TileWireless.java +++ b/tile/networking/TileWireless.java @@ -136,7 +136,7 @@ public class TileWireless extends AENetworkInvTile } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getAccessibleSlotsBySide(ForgeDirection side) { return sides; } diff --git a/tile/qnb/TileQuantumBridge.java b/tile/qnb/TileQuantumBridge.java index 599c5e812..8258bb372 100644 --- a/tile/qnb/TileQuantumBridge.java +++ b/tile/qnb/TileQuantumBridge.java @@ -120,7 +120,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getAccessibleSlotsBySide(ForgeDirection side) { if ( isCenter() ) return sidesLink; diff --git a/tile/spatial/TileSpatialIOPort.java b/tile/spatial/TileSpatialIOPort.java index 9515b24a7..81c9ba7a8 100644 --- a/tile/spatial/TileSpatialIOPort.java +++ b/tile/spatial/TileSpatialIOPort.java @@ -145,7 +145,7 @@ public class TileSpatialIOPort extends AENetworkInvTile implements Callable } @Override - public int[] getAccessibleSlotsFromSide(int side) + public int[] getAccessibleSlotsBySide(ForgeDirection side) { return sides; } diff --git a/tile/storage/TileChest.java b/tile/storage/TileChest.java index 2a8b5a78c..9263a4351 100644 --- a/tile/storage/TileChest.java +++ b/tile/storage/TileChest.java @@ -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 itemCell = cellHandler.getCellInventory( is, StorageChannel.ITEMS ); IMEInventoryHandler 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; } diff --git a/tile/storage/TileDrive.java b/tile/storage/TileDrive.java index ef66213af..17e5aa3b6 100644 --- a/tile/storage/TileDrive.java +++ b/tile/storage/TileDrive.java @@ -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; } diff --git a/tile/storage/TileIOPort.java b/tile/storage/TileIOPort.java index 933e6cfd4..66ef8a1c4 100644 --- a/tile/storage/TileIOPort.java +++ b/tile/storage/TileIOPort.java @@ -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; } diff --git a/tile/storage/TileSkyChest.java b/tile/storage/TileSkyChest.java index 555c2f2d0..c9326a769 100644 --- a/tile/storage/TileSkyChest.java +++ b/tile/storage/TileSkyChest.java @@ -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; }