From 1c3edcb57138455b8a692836ea5a969601b2d313 Mon Sep 17 00:00:00 2001 From: Modmuss50 Date: Sun, 3 Apr 2016 23:16:49 +0100 Subject: [PATCH 1/2] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index dab126232..a275c3477 100644 --- a/build.gradle +++ b/build.gradle @@ -77,7 +77,7 @@ dependencies { } compile 'RebornCore:RebornCore-1.9:2.0.4.+:dev' deobfCompile "mezz.jei:jei_1.9:3.2.5.+" - deobfCompile 'MCMultiPart:MCMultiPart-experimental:1.1.0_57:universal' + deobfCompile 'MCMultiPart:MCMultiPart-experimental:1.1.0_55:universal' } From 3b94b091940c340443707892d04a9a5377052890 Mon Sep 17 00:00:00 2001 From: Prospector Date: Sun, 3 Apr 2016 15:20:35 -0700 Subject: [PATCH 2/2] Add Transformer configs Closes #501 --- .../techreborn/config/ConfigTechReborn.java | 21 +++++++++++++++++++ .../tiles/transformers/TileHVTransformer.java | 3 ++- .../tiles/transformers/TileLVTransformer.java | 3 ++- .../tiles/transformers/TileMVTransformer.java | 3 ++- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index 427c5957b..620cf9efd 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -33,6 +33,13 @@ public class ConfigTechReborn public static int FarmEu; public static int AesuMaxOutput; public static int AesuMaxStorage; + + public static int LVTransformerMaxInput; + public static int LVTransformerMaxOutput; + public static int MVTransformerMaxInput; + public static int MVTransformerMaxOutput; + public static int HVTransformerMaxInput; + public static int HVTransformerMaxOutput; // Charge public static int IronDrillCharge; public static int DiamondDrillCharge; @@ -206,6 +213,20 @@ public class ConfigTechReborn AesuMaxStorage = config.get(CATEGORY_POWER, "AESU Max Storage", 30, "Set the max Storage for the AESU") .getInt(); + //Transformers + LVTransformerMaxInput = config.get(CATEGORY_POWER, "LV Transformer Max Input", 128, "Set the max input for the LV Trasnformer") + .getInt(); + LVTransformerMaxOutput = config.get(CATEGORY_POWER, "LV Transformer Max Output", 32, "Set the max output for the LV Trasnformer") + .getInt(); + MVTransformerMaxInput = config.get(CATEGORY_POWER, "MV Transformer Max Input", 512, "Set the max input for the MV Trasnformer") + .getInt(); + MVTransformerMaxOutput = config.get(CATEGORY_POWER, "MV Transformer Max Output", 128, "Set the max output for the MV Trasnformer") + .getInt(); + HVTransformerMaxInput = config.get(CATEGORY_POWER, "HV Transformer Max Input", 2048, "Set the max input for the HV Trasnformer") + .getInt(); + HVTransformerMaxOutput = config.get(CATEGORY_POWER, "HV Transformer Max Output", 512, "Set the max output for the HV Trasnformer") + .getInt(); + // Charge IronDrillCharge = config .get(CATEGORY_POWER, "IronDrill MaxCharge", 10000, "Set the max charge for the iron drill").getInt(); diff --git a/src/main/java/techreborn/tiles/transformers/TileHVTransformer.java b/src/main/java/techreborn/tiles/transformers/TileHVTransformer.java index 1a811b248..106e170a8 100644 --- a/src/main/java/techreborn/tiles/transformers/TileHVTransformer.java +++ b/src/main/java/techreborn/tiles/transformers/TileHVTransformer.java @@ -1,6 +1,7 @@ package techreborn.tiles.transformers; import reborncore.api.power.EnumPowerTier; +import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; /** @@ -11,7 +12,7 @@ public class TileHVTransformer extends TileTransformer public TileHVTransformer() { - super("HVTransformer", ModBlocks.hvt, EnumPowerTier.EXTREME, 2048, 412, 2048*2); + super("HVTransformer", ModBlocks.hvt, EnumPowerTier.EXTREME, ConfigTechReborn.HVTransformerMaxInput, ConfigTechReborn.HVTransformerMaxOutput, ConfigTechReborn.HVTransformerMaxInput*2); } } diff --git a/src/main/java/techreborn/tiles/transformers/TileLVTransformer.java b/src/main/java/techreborn/tiles/transformers/TileLVTransformer.java index 3dc92f8fa..f30d86360 100644 --- a/src/main/java/techreborn/tiles/transformers/TileLVTransformer.java +++ b/src/main/java/techreborn/tiles/transformers/TileLVTransformer.java @@ -1,6 +1,7 @@ package techreborn.tiles.transformers; import reborncore.api.power.EnumPowerTier; +import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; /** @@ -11,7 +12,7 @@ public class TileLVTransformer extends TileTransformer public TileLVTransformer() { - super("LVTransformer", ModBlocks.lvt, EnumPowerTier.LOW, 128, 32, 128*2); + super("LVTransformer", ModBlocks.lvt, EnumPowerTier.LOW, ConfigTechReborn.LVTransformerMaxInput, ConfigTechReborn.LVTransformerMaxOutput, ConfigTechReborn.LVTransformerMaxInput*2); } } diff --git a/src/main/java/techreborn/tiles/transformers/TileMVTransformer.java b/src/main/java/techreborn/tiles/transformers/TileMVTransformer.java index ec927b758..fe0a33a32 100644 --- a/src/main/java/techreborn/tiles/transformers/TileMVTransformer.java +++ b/src/main/java/techreborn/tiles/transformers/TileMVTransformer.java @@ -1,6 +1,7 @@ package techreborn.tiles.transformers; import reborncore.api.power.EnumPowerTier; +import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; /** @@ -11,7 +12,7 @@ public class TileMVTransformer extends TileTransformer public TileMVTransformer() { - super("MVTransformer", ModBlocks.mvt, EnumPowerTier.HIGH, 512, 128, 512*2); + super("MVTransformer", ModBlocks.mvt, EnumPowerTier.HIGH, ConfigTechReborn.MVTransformerMaxInput, ConfigTechReborn.MVTransformerMaxOutput, ConfigTechReborn.LVTransformerMaxInput*2); } @Override