diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index 7b62977f6..d035ff209 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -1,5 +1,6 @@ package techreborn.config; +import cpw.mods.fml.common.Loader; import net.minecraft.util.StatCollector; import net.minecraftforge.common.config.Configuration; @@ -77,6 +78,8 @@ public class ConfigTechReborn { public static int farmEu; public static int aesuMaxOutput; public static int aesuMaxStorage; + public static boolean enableRF; + public static boolean enableEU; // Charge public static int AdvancedDrillCharge; public static int LapotronPackCharge; @@ -336,6 +339,16 @@ public class ConfigTechReborn { StatCollector.translateToLocal("config.techreborn.aesuMaxStorage.tooltip")) .getInt(); + enableRF = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.enableRF"), !Loader.isModLoaded("IC2"), + StatCollector.translateToLocal("config.techreborn.enableRF.tooltip")) + .getBoolean(); + + enableEU = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.enableEU"), Loader.isModLoaded("IC2"), + StatCollector.translateToLocal("config.techreborn.enableEU")) + .getBoolean(); + // Charge AdvancedDrillCharge = config .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.advancedDrillMaxCharge"), 60000, diff --git a/src/main/java/techreborn/powerSystem/PowerSystem.java b/src/main/java/techreborn/powerSystem/PowerSystem.java index a4f408a0f..79a10163d 100644 --- a/src/main/java/techreborn/powerSystem/PowerSystem.java +++ b/src/main/java/techreborn/powerSystem/PowerSystem.java @@ -1,8 +1,10 @@ package techreborn.powerSystem; +import techreborn.config.ConfigTechReborn; + public class PowerSystem { - public static boolean RFPOWENET = true; + public static boolean RFPOWENET = ConfigTechReborn.enableRF; - public static boolean EUPOWENET = true; + public static boolean EUPOWENET = ConfigTechReborn.enableEU; } diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 235c65549..2fbc707e5 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -797,6 +797,10 @@ config.techreborn.euPerRF=EU Conversion config.techreborn.euPerRF.tooltip=The amount of RF that equal 1 EU. 4 by default, so 4RF == 1EU and .25EU == 1RF config.techreborn.farmeu=Farm EU per Tick config.techreborn.farmeu.tooltip=Amount of eu used per tick by the farm +config.techreborn.enableRF=Enable RF support +config.techreborn.enableRF.tooltip= Enable RF support for all machines. +config.techreborn.enableEU=Enable EU support +config.techreborn.enableEU.tooltip= Enable EU support for all machines. #ConfigGui config.techreborn.category.general=General Configs