Merge branch 'rv1' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv2

2014-09-17 11:25:30 -05:00
parent 4e90cd73f6 2913d71acd
commit 306ee9e036
26 changed files with 606 additions and 838 deletions
@@ -62,19 +62,17 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver
 		alpha = io;
 	}

-	@Override
+	
 	final public int getMachineX()
 	{
 		return xCoord;
 	}

-	@Override
 	final public int getMachineY()
 	{
 		return yCoord;
 	}

-	@Override
 	final public int getMachineZ()
 	{
 		return zCoord;
@@ -101,7 +99,6 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver
 		power = p;
 	}

-	@Override
 	final public boolean canReadFromBlock(int x, int y, int z)
 	{
 		ForgeDirection side = ForgeDirection.UNKNOWN;
@@ -136,4 +133,16 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver
 		omega = 0;
 	}

+	@Override
+	final public boolean canReadFrom(ForgeDirection side)
+	{
+		return internalCanAcceptPower && getPowerSides().contains( side );
+	}
+
+	@Override
+	final public int getMinTorque(int available)
+	{
+		return 0;
+	}
+
 }