diff --git a/src/minecraft/fluidmech/api/mech/IForce.java b/src/minecraft/fluidmech/api/mech/IForce.java index 010b8c02c..b67aa0e82 100644 --- a/src/minecraft/fluidmech/api/mech/IForce.java +++ b/src/minecraft/fluidmech/api/mech/IForce.java @@ -12,8 +12,6 @@ public interface IForce */ public int getForceSide(ForgeDirection side); - public int getForce(); - /** * * @param side diff --git a/src/minecraft/fluidmech/api/mech/IForceLoad.java b/src/minecraft/fluidmech/api/mech/IForceLoad.java new file mode 100644 index 000000000..b5c1410c2 --- /dev/null +++ b/src/minecraft/fluidmech/api/mech/IForceLoad.java @@ -0,0 +1,15 @@ +package fluidmech.api.mech; + +import net.minecraftforge.common.ForgeDirection; + +public interface IForceLoad +{ + /** + * + * @param side + * @return if mechanical force can be inputed from this side + */ + public boolean canInputSide(ForgeDirection side); + + public int applyForce(ForgeDirection side, int force); +} diff --git a/src/minecraft/fluidmech/api/mech/IForceProvider.java b/src/minecraft/fluidmech/api/mech/IForceProvider.java new file mode 100644 index 000000000..6daf7a639 --- /dev/null +++ b/src/minecraft/fluidmech/api/mech/IForceProvider.java @@ -0,0 +1,20 @@ +package fluidmech.api.mech; + +import net.minecraftforge.common.ForgeDirection; + +public interface IForceProvider +{ + /** + * + * @param side the rpm is coming from + * @return rpm that the block is running at + */ + public int getForceSide(ForgeDirection side); + + /** + * + * @param side + * @return if mechanical force can be outputed from this side + */ + public boolean canOutputSide(ForgeDirection side); +} diff --git a/src/minecraft/fluidmech/api/mech/IMechanicalConnector.java b/src/minecraft/fluidmech/api/mech/IMechanicalConnector.java new file mode 100644 index 000000000..3efb169e5 --- /dev/null +++ b/src/minecraft/fluidmech/api/mech/IMechanicalConnector.java @@ -0,0 +1,8 @@ +package fluidmech.api.mech; + +import net.minecraftforge.common.ForgeDirection; + +public interface IMechanicalConnector +{ + public boolean canRodeConnect(ForgeDirection side); +} diff --git a/src/minecraft/fluidmech/common/machines/mech/TileEntityGenerator.java b/src/minecraft/fluidmech/common/machines/mech/TileEntityGenerator.java index c07fb1f7f..2caf89730 100644 --- a/src/minecraft/fluidmech/common/machines/mech/TileEntityGenerator.java +++ b/src/minecraft/fluidmech/common/machines/mech/TileEntityGenerator.java @@ -198,12 +198,6 @@ public class TileEntityGenerator extends TileEntityElectrical implements IPacket return 0; } - @Override - public int getForce() - { - return this.force; - } - @Override public boolean canOutputSide(ForgeDirection side) { diff --git a/src/minecraft/fluidmech/common/machines/mech/TileEntityRod.java b/src/minecraft/fluidmech/common/machines/mech/TileEntityRod.java index 6c236f2e0..1d563e8cc 100644 --- a/src/minecraft/fluidmech/common/machines/mech/TileEntityRod.java +++ b/src/minecraft/fluidmech/common/machines/mech/TileEntityRod.java @@ -116,13 +116,6 @@ public class TileEntityRod extends TileEntity implements IPacketReceiver, IForce return this.pos; } - @Override - public int getForce() - { - // TODO Auto-generated method stub - return this.currentForce; - } - @Override public String getMeterReading(EntityPlayer user, ForgeDirection side) {