dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mc1.10' into mc1.10

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-10-09 21:39:44 +02:00
parent 94716bcef0 10eb7ed331
commit 9a0612a56c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/RSConfig.java
View File

@@ -44,6 +44,7 @@ public final class RSConfig {
public float networkTransmitterPerBlockUsage; public float networkTransmitterPerBlockUsage;
public int networkReceiverUsage; public int networkReceiverUsage;
public int diskManipulatorUsage; public int diskManipulatorUsage;
public int euConversion;
//endregion //endregion
//region Controller //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"); 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"); 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"); 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 //endregion
//region Controller //region Controller

6
src/main/java/refinedstorage/integration/ic2/IntegrationIC2.java
View File

@@ -1,6 +1,8 @@
package refinedstorage.integration.ic2; package refinedstorage.integration.ic2;
import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Loader;
import refinedstorage.RS;
public final class IntegrationIC2 { public final class IntegrationIC2 {
public static boolean isLoaded() { public static boolean isLoaded() {
@@ -8,10 +10,10 @@ public final class IntegrationIC2 {
} }
public static int toRS(double amount) { 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) { public static double toEU(int amount) {
return Math.floor(amount / 4); return Math.floor(amount / RS.INSTANCE.config.euConversion);
} }
} }