Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
This commit is contained in:
commit
4f01850616
5 changed files with 28 additions and 4 deletions
|
@ -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'
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue