diff --git a/src/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java b/src/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java index 4b44d5844..41e260cb7 100644 --- a/src/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java +++ b/src/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java @@ -465,13 +465,13 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock, } @Override - public double getWattLoad() + public int getWattLoad() { if (this.hasTask) { - return .4;//400w + return 40; } - return .03;//30w + return 3; } @Override diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityAssembly.java b/src/com/builtbroken/assemblyline/machine/TileEntityAssembly.java index 15f7e89db..121d53227 100644 --- a/src/com/builtbroken/assemblyline/machine/TileEntityAssembly.java +++ b/src/com/builtbroken/assemblyline/machine/TileEntityAssembly.java @@ -17,7 +17,7 @@ import com.builtbroken.minecraft.tilenetwork.prefab.NetworkTileEntities; /** A class to be inherited by all machines on the assembly line. This class acts as a single peace * in a network of similar tiles allowing all to share power from one or more sources - * + * * @author DarkGuardsman */ public abstract class TileEntityAssembly extends TileEntityEnergyMachine implements INetworkEnergyPart { @@ -136,20 +136,21 @@ public abstract class TileEntityAssembly extends TileEntityEnergyMachine impleme } /** Amount of energy this tile runs on per tick */ - public double getWattLoad() + public int getWattLoad() { - return .001;//1J/t or 20J/t + return 1;//1J/t or 20J/t } - public double getExtraLoad() + public int getExtraLoad() { - return .001;//1J/t or 20J/t + return 1;//1J/t or 20J/t } @Override public void togglePowerMode() { - ((NetworkSharedPower) this.getTileNetwork()).setPowerLess(this.runPowerLess()); + super.togglePowerMode(); + ((NetworkSharedPower) this.getTileNetwork()).setPowerLess(!this.runPowerLess()); } @Override diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityManipulator.java b/src/com/builtbroken/assemblyline/machine/TileEntityManipulator.java index 928ed1a01..6e6b1c53c 100644 --- a/src/com/builtbroken/assemblyline/machine/TileEntityManipulator.java +++ b/src/com/builtbroken/assemblyline/machine/TileEntityManipulator.java @@ -271,8 +271,8 @@ public class TileEntityManipulator extends TileEntityFilterable implements IRota } @Override - public double getExtraLoad() + public int getExtraLoad() { - return .01;//1J/t or 20J/t + return 1; } } diff --git a/src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java b/src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java index e97b172de..838dcc058 100644 --- a/src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java +++ b/src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java @@ -22,7 +22,7 @@ import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.common.network.Player; /** Conveyer belt TileEntity that allows entities of all kinds to be moved - * + * * @author DarkGuardsman */ public class TileEntityConveyorBelt extends TileEntityAssembly implements IBelt, IRotatable { @@ -247,9 +247,9 @@ public class TileEntityConveyorBelt extends TileEntityAssembly implements IBelt, } @Override - public double getWattLoad() + public int getWattLoad() { - return 0.05 + (0.01 * this.getAffectedEntities().size());//50w + (10w * loadSize) + return 5; } }