diff --git a/src/main/java/refinedstorage/RSConfig.java b/src/main/java/refinedstorage/RSConfig.java index 43952fc8d..955af56e6 100755 --- a/src/main/java/refinedstorage/RSConfig.java +++ b/src/main/java/refinedstorage/RSConfig.java @@ -44,6 +44,7 @@ public final class RSConfig { public float networkTransmitterPerBlockUsage; public int networkReceiverUsage; public int diskManipulatorUsage; + public int euConversion; //endregion //region Controller @@ -130,6 +131,7 @@ 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"); + euConversion = config.getInt("euConversion", ENERGY, 4, 0, Integer.MAX_VALUE, "The amount of RS that equals 1 EU"); //endregion //region Controller diff --git a/src/main/java/refinedstorage/integration/ic2/IntegrationIC2.java b/src/main/java/refinedstorage/integration/ic2/IntegrationIC2.java index e41b656f4..740e1ba75 100755 --- a/src/main/java/refinedstorage/integration/ic2/IntegrationIC2.java +++ b/src/main/java/refinedstorage/integration/ic2/IntegrationIC2.java @@ -1,6 +1,8 @@ package refinedstorage.integration.ic2; import net.minecraftforge.fml.common.Loader; +import refinedstorage.RS; + public final class IntegrationIC2 { public static boolean isLoaded() { @@ -8,10 +10,10 @@ public final class IntegrationIC2 { } public static int toRS(double amount) { - return amount >= Double.POSITIVE_INFINITY ? Integer.MAX_VALUE : ((int) Math.floor(amount) * 4); + return amount >= Double.POSITIVE_INFINITY ? Integer.MAX_VALUE : ((int) Math.floor(amount) * RS.INSTANCE.config.euConversion); } public static double toEU(int amount) { - return Math.floor(amount / 4); + return Math.floor(amount / RS.INSTANCE.config.euConversion); } }