diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java index 1b5ee44c5..0e7d61581 100755 --- a/src/main/java/refinedstorage/RefinedStorage.java +++ b/src/main/java/refinedstorage/RefinedStorage.java @@ -74,6 +74,7 @@ public final class RefinedStorage { public int networkTransmitterUsage; public float networkTransmitterPerBlockUsage; public int networkReceiverUsage; + public int diskManipulatorUsage; public int controllerCapacity; public boolean controllerUsesEnergy; @@ -128,6 +129,7 @@ public final class RefinedStorage { networkTransmitterUsage = config.getInt("networkTransmitter", "energy", 50, 0, Integer.MAX_VALUE, "The base energy used by Network Transmitters"); networkTransmitterPerBlockUsage = config.getFloat("networkTransmitterPerBlock", "energy", 4, 0, Float.MAX_VALUE, "The additional energy per block that the Network Transmitter uses, gets rounded up"); networkReceiverUsage = config.getInt("networkReceiver", "energy", 15, 0, Integer.MAX_VALUE, "The energy used by Network Receivers"); + diskManipulatorUsage = config.getInt("diskManipulator", "energy", 3, 0, Integer.MAX_VALUE, "The energy used by Disk Manipulators"); controllerCapacity = config.getInt("capacity", "controller", 32000, 0, Integer.MAX_VALUE, "The energy capacity of the Controller"); controllerUsesEnergy = config.getBoolean("usesEnergy", "controller", true, "Whether the Controller uses energy"); diff --git a/src/main/java/refinedstorage/tile/TileDiskManipulator.java b/src/main/java/refinedstorage/tile/TileDiskManipulator.java index c01f23ee7..dc74db230 100755 --- a/src/main/java/refinedstorage/tile/TileDiskManipulator.java +++ b/src/main/java/refinedstorage/tile/TileDiskManipulator.java @@ -11,6 +11,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; +import refinedstorage.RefinedStorage; import refinedstorage.apiimpl.storage.NBTStorage; import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; import refinedstorage.apiimpl.storage.fluid.FluidUtils; @@ -162,12 +163,14 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte @Override public int getEnergyUsage() { - return 0; + return RefinedStorage.INSTANCE.diskManipulatorUsage + upgrades.getEnergyUsage(); } @Override public void updateNode() { - if (ticks % upgrades.getSpeed() != 0) return; + if (ticks % upgrades.getSpeed() != 0) { + return; + } int slot = 0; if (type == IType.ITEMS) { while (slot < itemStorages.length && itemStorages[slot] == null) {