diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index 31613828..0ef7f848 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -28,6 +28,7 @@ import crazypants.enderio.conduit.RaytraceResult; import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.ConduitGeometryUtil; +import crazypants.enderio.config.Config; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.monitor.PacketConduitProbe; import crazypants.enderio.power.BasicCapacitor; @@ -44,9 +45,9 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { static final Map ICONS = new HashMap(); static final ICapacitor[] CAPACITORS = new BasicCapacitor[] { - new BasicCapacitor(640, 640, 640), - new BasicCapacitor(5120, 5120, 5120), - new BasicCapacitor(20480, 20480, 20480) + new BasicCapacitor(Config.powerConduitTierOneRF, Config.powerConduitTierOneRF), + new BasicCapacitor(Config.powerConduitTierTwoRF, Config.powerConduitTierTwoRF), + new BasicCapacitor(Config.powerConduitTierThreeRF, Config.powerConduitTierThreeRF) }; static final String[] POSTFIX = new String[] { "", "Enhanced", "Ender" }; diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index add8ce76..71c362cd 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -267,6 +267,10 @@ public final class Config { public static int soulBinderLevelThreePowerPerTickRF = 2000; public static int soulBinderBrokenSpawnerRF = 2500000; + public static int powerConduitTierOneRF = 640; + public static int powerConduitTierTwoRF = 5120; + public static int powerConduitTierThreeRF = 20480; + public static void load(FMLPreInitializationEvent event) { FMLCommonHandler.instance().bus().register(new Config()); @@ -309,6 +313,14 @@ public final class Config { "The maximum storage for a single capacitor in RF") .getInt(capacitorBankMaxStorageRF); + powerConduitTierOneRF = config.get(sectionPower.name, "powerConduitTierOneRF", powerConduitTierOneRF, "The maximum IO for the tier 1 power conduit") + .getInt(powerConduitTierOneRF); + powerConduitTierTwoRF = config.get(sectionPower.name, "powerConduitTierTwoRF", powerConduitTierTwoRF, "The maximum IO for the tier 2 power conduit") + .getInt(powerConduitTierTwoRF); + powerConduitTierThreeRF = config.get(sectionPower.name, "powerConduitTierThreeRF", powerConduitTierTwoRF, "The maximum IO for the tier 3 power conduit") + .getInt(powerConduitTierThreeRF); + + painterEnergyPerTaskRF = config.get(sectionPower.name, "painterEnergyPerTaskRF", painterEnergyPerTaskRF, "The total amount of RF required to paint one block") .getInt(painterEnergyPerTaskRF);