From 394908afe97a11e8a70cb44fcf857bcad5581815 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 12 Nov 2016 02:15:58 +0100 Subject: [PATCH] Added config option for reader / writer energy usage --- src/main/java/com/raoulvdberge/refinedstorage/RSConfig.java | 4 ++++ .../java/com/raoulvdberge/refinedstorage/tile/TileReader.java | 3 ++- .../java/com/raoulvdberge/refinedstorage/tile/TileWriter.java | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSConfig.java b/src/main/java/com/raoulvdberge/refinedstorage/RSConfig.java index cea7b535a..efcfce62c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSConfig.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSConfig.java @@ -44,6 +44,8 @@ public final class RSConfig { public float networkTransmitterPerBlockUsage; public int networkReceiverUsage; public int diskManipulatorUsage; + public int readerUsage; + public int writerUsage; public int euConversion; //endregion @@ -141,6 +143,8 @@ public final class RSConfig { 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"); + readerUsage = config.getInt("reader", ENERGY, 2, 0, Integer.MAX_VALUE, "The energy used by Readers"); + writerUsage = config.getInt("writer", ENERGY, 2, 0, Integer.MAX_VALUE, "The energy used by Writers"); euConversion = config.getInt("euConversion", ENERGY, 8, 1, Integer.MAX_VALUE, "The amount of RS that equals 1 EU"); //endregion diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileReader.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileReader.java index 92b1d7dba..0420d4ed6 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileReader.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileReader.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReader; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterHandler; @@ -49,7 +50,7 @@ public class TileReader extends TileNode implements IReader { @Override public int getEnergyUsage() { - return 0; // @TODO + return RS.INSTANCE.config.readerUsage; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java index 8a627daf4..d1f980521 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.tile; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterHandler; @@ -27,7 +28,7 @@ public class TileWriter extends TileNode implements IWriter { @Override public int getEnergyUsage() { - return 0; // @TODO + return RS.INSTANCE.config.writerUsage; } @Override @@ -43,6 +44,7 @@ public class TileWriter extends TileNode implements IWriter { @Override public void updateNode() { + // NO OP } @Override