Merge branch 'master' of github.com:SirSengir/BuildCraft

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);
 	}

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;
+	}
 }

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

common/buildcraft/factory/TileRefinery.java

@@ -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;
+	}
+
 }

common/buildcraft/factory/TileTank.java

@@ -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;
+    }
 }

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;
+	}
 }

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;
+	}
 }

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];

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;
 	}
 
 }

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;
 	}
 
 }