diff --git a/common/buildcraft/energy/BptBlockEngine.java b/common/buildcraft/energy/BptBlockEngine.java index 96ca808b..f47e8051 100644 --- a/common/buildcraft/energy/BptBlockEngine.java +++ b/common/buildcraft/energy/BptBlockEngine.java @@ -27,7 +27,7 @@ public class BptBlockEngine extends BptBlock { public void rotateLeft(BptSlotInfo slot, IBptContext context) { int o = slot.cpt.getInteger("orientation"); - o = ForgeDirection.values()[o].getLeftRotation().ordinal(); + o = ForgeDirection.values()[o].getRotation(ForgeDirection.DOWN).ordinal(); slot.cpt.setInteger("orientation", o); } diff --git a/common/buildcraft/energy/TileEngine.java b/common/buildcraft/energy/TileEngine.java index d5047ae8..48c8b18c 100644 --- a/common/buildcraft/energy/TileEngine.java +++ b/common/buildcraft/energy/TileEngine.java @@ -478,4 +478,9 @@ public class TileEngine extends TileBuildCraft implements IPowerReceptor, IInven } @Override public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) { return null; } + @Override + public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) { + // TODO Auto-generated method stub + return null; + } } diff --git a/common/buildcraft/factory/BptBlockRefinery.java b/common/buildcraft/factory/BptBlockRefinery.java index 4eebd56c..246c4b36 100644 --- a/common/buildcraft/factory/BptBlockRefinery.java +++ b/common/buildcraft/factory/BptBlockRefinery.java @@ -21,7 +21,7 @@ public class BptBlockRefinery extends BptBlock { @Override public void rotateLeft(BptSlotInfo slot, IBptContext context) { - slot.meta = ForgeDirection.values()[slot.meta].getLeftRotation().ordinal(); + slot.meta = ForgeDirection.values()[slot.meta].getRotation(ForgeDirection.DOWN).ordinal(); } @Override diff --git a/common/buildcraft/factory/TileRefinery.java b/common/buildcraft/factory/TileRefinery.java index c47bc1c3..219389f9 100644 --- a/common/buildcraft/factory/TileRefinery.java +++ b/common/buildcraft/factory/TileRefinery.java @@ -1,8 +1,8 @@ -/** +/** * Copyright (c) SpaceToad, 2011 * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ @@ -225,14 +225,14 @@ public class TileRefinery extends TileMachine implements ITankContainer, IPowerR private boolean containsInput(LiquidStack liquid) { if(liquid == null) return true; - + return new LiquidStack(slot1.liquidId, slot1.quantity, 0).containsLiquid(liquid) || new LiquidStack(slot2.liquidId, slot2.quantity, 0).containsLiquid(liquid); } private boolean consumeInput(LiquidStack liquid) { if(liquid == null) return true; - + if(new LiquidStack(slot1.liquidId, slot1.quantity, 0).containsLiquid(liquid)) { slot1.quantity -= liquid.amount; return true; @@ -240,7 +240,7 @@ public class TileRefinery extends TileMachine implements ITankContainer, IPowerR slot2.quantity -= liquid.amount; return true; } - + return false; } @@ -457,4 +457,10 @@ public class TileRefinery extends TileMachine implements ITankContainer, IPowerR }; } + @Override + public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) { + // TODO Auto-generated method stub + return null; + } + } diff --git a/common/buildcraft/factory/TileTank.java b/common/buildcraft/factory/TileTank.java index 74d04025..187563c9 100644 --- a/common/buildcraft/factory/TileTank.java +++ b/common/buildcraft/factory/TileTank.java @@ -82,14 +82,14 @@ public class TileTank extends TileBuildCraft implements ITankContainer public void readFromNBT(NBTTagCompound data) { super.readFromNBT(data); - + if(data.hasKey("stored") && data.hasKey("liquidId")) { LiquidStack liquid = new LiquidStack(data.getInteger("liquidId"), data.getInteger("stored"), 0); tank.setLiquid(liquid); } else - { + { LiquidStack liquid = new LiquidStack(0, 0, 0); liquid.readFromNBT(data.getCompoundTag("tank")); tank.setLiquid(liquid); @@ -253,4 +253,10 @@ public class TileTank extends TileBuildCraft implements ITankContainer compositeTank.setCapacity(capacity); return new ILiquidTank[]{compositeTank}; } + + @Override + public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) { + // TODO Auto-generated method stub + return null; + } } diff --git a/common/buildcraft/transport/PipeTransportLiquids.java b/common/buildcraft/transport/PipeTransportLiquids.java index ffc9137c..8696216f 100644 --- a/common/buildcraft/transport/PipeTransportLiquids.java +++ b/common/buildcraft/transport/PipeTransportLiquids.java @@ -464,4 +464,9 @@ public class PipeTransportLiquids extends PipeTransport implements ITankContaine return internalTanks; } + @Override + public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) { + // TODO Auto-generated method stub + return null; + } } diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index ea73bae6..b9bd31a2 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -548,7 +548,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank @Override public ILiquidTank[] getTanks(ForgeDirection direction) { if (BlockGenericPipe.isValid(pipe) && pipe.transport instanceof ITankContainer) - return ((ITankContainer) pipe.transport).getTanks(ForgeDirection.UNKNOWN); + return ((ITankContainer) pipe.transport).getTanks(direction); else return null; } @@ -629,4 +629,12 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank public double func_82115_m() { return 24 * 24; } + + @Override + public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) { + if (BlockGenericPipe.isValid(pipe) && pipe.transport instanceof ITankContainer) + return ((ITankContainer) pipe.transport).getTank(direction, type); + else + return null; + } } diff --git a/common/buildcraft/transport/blueprints/BptItemPipeDiamond.java b/common/buildcraft/transport/blueprints/BptItemPipeDiamond.java index b12c0695..fb271531 100644 --- a/common/buildcraft/transport/blueprints/BptItemPipeDiamond.java +++ b/common/buildcraft/transport/blueprints/BptItemPipeDiamond.java @@ -39,7 +39,7 @@ public class BptItemPipeDiamond extends BptItem { newInv[dir * 9 + s] = inv[dir * 9 + s]; for (int dir = 2; dir <= 5; ++dir) { - ForgeDirection r = ForgeDirection.values()[dir].getLeftRotation(); + ForgeDirection r = ForgeDirection.values()[dir].getRotation(ForgeDirection.DOWN); for (int s = 0; s < 9; ++s) newInv[r.ordinal() * 9 + s] = inv[dir * 9 + s]; diff --git a/common/buildcraft/transport/blueprints/BptItemPipeIron.java b/common/buildcraft/transport/blueprints/BptItemPipeIron.java index d657e7d8..9aa9b220 100644 --- a/common/buildcraft/transport/blueprints/BptItemPipeIron.java +++ b/common/buildcraft/transport/blueprints/BptItemPipeIron.java @@ -39,7 +39,7 @@ public class BptItemPipeIron extends BptItem { int orientation = slot.meta & 7; int others = slot.meta - orientation; - slot.meta = ForgeDirection.values()[orientation].getLeftRotation().ordinal() + others; + slot.meta = ForgeDirection.values()[orientation].getRotation(ForgeDirection.DOWN).ordinal() + others; } } diff --git a/common/buildcraft/transport/blueprints/BptItemPipeWooden.java b/common/buildcraft/transport/blueprints/BptItemPipeWooden.java index bda40828..d6aa9efe 100644 --- a/common/buildcraft/transport/blueprints/BptItemPipeWooden.java +++ b/common/buildcraft/transport/blueprints/BptItemPipeWooden.java @@ -39,7 +39,7 @@ public class BptItemPipeWooden extends BptItem { int orientation = slot.meta & 7; int others = slot.meta - orientation; - slot.meta = ForgeDirection.values()[orientation].getLeftRotation().ordinal() + others; + slot.meta = ForgeDirection.values()[orientation].getRotation(ForgeDirection.DOWN).ordinal() + others; } }