Fix compile errors, and bump forge to 1.11.2

This commit is contained in:
modmuss50 2016-12-27 19:47:54 +00:00
parent 0922e0b886
commit b2d070c7f3
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
4 changed files with 76 additions and 76 deletions

View file

@ -1,5 +1,5 @@
minecraftVersion="1.11" minecraftVersion="1.11.2"
name="TechReborn-1.11" name="TechReborn-1.11.2"
curseID="233564" curseID="233564"
child-project="reborncore" child-project="reborncore"
child-type="requiredLibrary" child-type="requiredLibrary"

View file

@ -75,7 +75,7 @@ if (ENV.BUILD_NUMBER) {
} }
minecraft { minecraft {
version = "1.11-13.19.0.2180" version = "1.11.2-13.20.0.2201"
mappings = "snapshot_20161118" mappings = "snapshot_20161118"
replace "@MODVERSION@", project.version replace "@MODVERSION@", project.version
// makeObfSourceJar = false // makeObfSourceJar = false

View file

@ -14,20 +14,20 @@ import techreborn.parts.powerCables.ItemStandaloneCables;
*/ */
public enum IC2Duplicates { public enum IC2Duplicates {
GRINDER(new ItemStack(ModBlocks.Grinder)), GRINDER(new ItemStack(ModBlocks.grinder)),
ELECTRICAL_FURNACE(new ItemStack(ModBlocks.ElectricFurnace)), ELECTRICAL_FURNACE(new ItemStack(ModBlocks.electricFurnace)),
IRON_FURNACE(new ItemStack(ModBlocks.ironFurnace)), IRON_FURNACE(new ItemStack(ModBlocks.ironFurnace)),
GENERATOR(new ItemStack(ModBlocks.Generator)), GENERATOR(new ItemStack(ModBlocks.generator)),
EXTRACTOR(new ItemStack(ModBlocks.Extractor)), EXTRACTOR(new ItemStack(ModBlocks.extractor)),
SOLAR_PANEL(new ItemStack(ModBlocks.solarPanel)), SOLAR_PANEL(new ItemStack(ModBlocks.solarPanel)),
RECYCLER(new ItemStack(ModBlocks.recycler)), RECYCLER(new ItemStack(ModBlocks.recycler)),
COMPRESSOR(new ItemStack(ModBlocks.Compressor)), COMPRESSOR(new ItemStack(ModBlocks.compressor)),
BAT_BOX(new ItemStack(ModBlocks.batBox)), BAT_BOX(new ItemStack(ModBlocks.batBox)),
MFE(new ItemStack(ModBlocks.mfe)), MFE(new ItemStack(ModBlocks.MFE)),
MFSU(new ItemStack(ModBlocks.mfsu)), MFSU(new ItemStack(ModBlocks.MFSU)),
LVT(new ItemStack(ModBlocks.lvt)), LVT(new ItemStack(ModBlocks.LVT)),
MVT(new ItemStack(ModBlocks.mvt)), MVT(new ItemStack(ModBlocks.MVT)),
HVT(new ItemStack(ModBlocks.hvt)), HVT(new ItemStack(ModBlocks.HVT)),
CABLE_COPPER(EnumStandaloneCableType.COPPER.getStack()), CABLE_COPPER(EnumStandaloneCableType.COPPER.getStack()),
CABLE_GLASSFIBER(EnumStandaloneCableType.GLASSFIBER.getStack()), CABLE_GLASSFIBER(EnumStandaloneCableType.GLASSFIBER.getStack()),
CABLE_GOLD(EnumStandaloneCableType.GOLD.getStack()), CABLE_GOLD(EnumStandaloneCableType.GOLD.getStack()),
@ -36,13 +36,13 @@ public enum IC2Duplicates {
CABLE_IGOLD(EnumStandaloneCableType.IGOLD.getStack()), CABLE_IGOLD(EnumStandaloneCableType.IGOLD.getStack()),
CABLE_IHV(EnumStandaloneCableType.IHV.getStack()), CABLE_IHV(EnumStandaloneCableType.IHV.getStack()),
CABLE_IIHV(EnumStandaloneCableType.TIN.getStack()), CABLE_IIHV(EnumStandaloneCableType.TIN.getStack()),
UPGRADE_OVERCLOCKER(ItemUpgrades.getUpgradeByName("Overclock")), UPGRADE_OVERCLOCKER(ItemUpgrades.getUpgradeByName("overclock")),
UPGRADE_TRANSFORMER(ItemUpgrades.getUpgradeByName("Transformer")), UPGRADE_TRANSFORMER(ItemUpgrades.getUpgradeByName("transformer")),
UPGRADE_STORAGE(ItemUpgrades.getUpgradeByName("EnergyStorage")), UPGRADE_STORAGE(ItemUpgrades.getUpgradeByName("energy_storage")),
MIXED_METAL(ItemIngots.getIngotByName("mixedMetal")), MIXED_METAL(ItemIngots.getIngotByName("mixed_metal")),
CARBON_FIBER(ItemParts.getPartByName("carbonfiber")), CARBON_FIBER(ItemParts.getPartByName("carbon_fiber")),
CARBON_MESH(ItemParts.getPartByName("carbonmesh")), CARBON_MESH(ItemParts.getPartByName("carbon_mesh")),
REFINED_IRON(ItemIngots.getIngotByName("refinedIron")); REFINED_IRON(ItemIngots.getIngotByName("refined_iron"));
ItemStack ic2Stack; ItemStack ic2Stack;
ItemStack trStack; ItemStack trStack;

View file

@ -579,7 +579,7 @@ public class ModRecipes {
"ingotCopper", 'W', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig()); "ingotCopper", 'W', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig());
} }
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 0), "RRR", "CAC", "RRR", 'R', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.machineCasing, 4, 0), "RRR", "CAC", "RRR", 'R',
IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(), 'C', "circuitBasic", 'A', IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(), 'C', "circuitBasic", 'A',
BlockMachineFrame.getFrameByName("machine", 1)); BlockMachineFrame.getFrameByName("machine", 1));
@ -614,125 +614,125 @@ public class ModRecipes {
'O', BlockMachineFrame.getFrameByName("advancedMachine", 1)); 'O', BlockMachineFrame.getFrameByName("advancedMachine", 1));
} }
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.IndustrialElectrolyzer), "RER", "CEC", "RER", 'R', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.industrialElectrolyzer), "RER", "CEC", "RER", 'R',
IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(), 'E', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'C', IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(), 'E', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'C',
"circuitAdvanced"); "circuitAdvanced");
// Mixed Metal Ingot Recipes :P // Mixed Metal Ingot Recipes :P
if(!IC2Duplicates.deduplicate()){ if(!IC2Duplicates.deduplicate()){
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBronze", 'T', "ingotTin"); "ingotRefinedIron", 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBronze", 'T', "ingotZinc"); "ingotRefinedIron", 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBrass", 'T', "ingotTin"); "ingotRefinedIron", 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBrass", 'T', "ingotZinc"); "ingotRefinedIron", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel", .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBronze", 'T', "ingotTin"); 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel", .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBronze", 'T', "ingotZinc"); 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel", .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBrass", 'T', "ingotTin"); 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel", .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBrass", 'T', "ingotZinc"); 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel", .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBronze", 'T', "ingotAluminum"); 'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel", .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBrass", 'T', "ingotAluminum"); 'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar", .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBronze", 'T', "ingotTin"); 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar", .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBronze", 'T', "ingotZinc"); 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar", .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBrass", 'T', "ingotTin"); 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar", .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBrass", 'T', "ingotZinc"); 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar", .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBronze", 'T', "ingotAluminum"); 'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar", .addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBrass", 'T', "ingotAluminum"); 'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBronze", 'T', "ingotTin"); "ingotTitanium", 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBronze", 'T', "ingotZinc"); "ingotTitanium", 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBrass", 'T', "ingotTin"); "ingotTitanium", 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBrass", 'T', "ingotZinc"); "ingotTitanium", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBronze", 'T', "ingotAluminum"); "ingotTitanium", 'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBrass", 'T', "ingotAluminum"); "ingotTitanium", 'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBronze", 'T', "ingotTin"); "ingotTungsten", 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBronze", 'T', "ingotZinc"); "ingotTungsten", 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBrass", 'T', "ingotTin"); "ingotTungsten", 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBrass", 'T', "ingotZinc"); "ingotTungsten", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBronze", 'T', "ingotAluminum"); "ingotTungsten", 'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBrass", 'T', "ingotAluminum"); "ingotTungsten", 'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotTin"); "ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotZinc"); "ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotTin"); "ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotZinc"); "ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 9), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 9), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotAluminum"); "ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 9), "RRR", "BBB", "TTT", 'R', CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 9), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotAluminum"); "ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotAluminum");
} }
@ -922,11 +922,11 @@ public class ModRecipes {
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Transformer"), "GGG", "WTW", "GCG", 'G', CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("transformer"), "GGG", "WTW", "GCG", 'G',
"blockGlass", 'W', IC2Duplicates.CABLE_IGOLD.getStackBasedOnConfig(), 'C', "blockGlass", 'W', IC2Duplicates.CABLE_IGOLD.getStackBasedOnConfig(), 'C',
"circuitBasic", 'T', IC2Duplicates.MVT.getStackBasedOnConfig()); "circuitBasic", 'T', IC2Duplicates.MVT.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("EnergyStorage"), "PPP", "WBW", "PCP", 'P', CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("energy_storage"), "PPP", "WBW", "PCP", 'P',
"plankWood", 'W', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), 'C', "plankWood", 'W', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), 'C',
"circuitBasic", 'B', ModItems.reBattery); "circuitBasic", 'B', ModItems.reBattery);
@ -1055,7 +1055,7 @@ public class ModRecipes {
.addShapedOreRecipe(new ItemStack(ModBlocks.digitalChest), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D', .addShapedOreRecipe(new ItemStack(ModBlocks.digitalChest), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D',
ItemParts.getPartByName("dataOrb"), 'C', ItemParts.getPartByName("computerMonitor")); ItemParts.getPartByName("dataOrb"), 'C', ItemParts.getPartByName("computerMonitor"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AlloySmelter), "XCX", "FMF", "XXX", 'C', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.alloySmelter), "XCX", "FMF", "XXX", 'C',
"circuitBasic", 'F', IC2Duplicates.ELECTRICAL_FURNACE.getStackBasedOnConfig(), 'M', "circuitBasic", 'F', IC2Duplicates.ELECTRICAL_FURNACE.getStackBasedOnConfig(), 'M',
BlockMachineFrame.getFrameByName("machine", 1)); BlockMachineFrame.getFrameByName("machine", 1));
@ -1107,7 +1107,7 @@ public class ModRecipes {
CraftingHelper.addSmelting(ItemDusts.getDustByName("gold", 1), new ItemStack(Items.GOLD_INGOT), 1F); CraftingHelper.addSmelting(ItemDusts.getDustByName("gold", 1), new ItemStack(Items.GOLD_INGOT), 1F);
CraftingHelper.addSmelting(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber"), 1F); CraftingHelper.addSmelting(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber"), 1F);
if(!IC2Duplicates.deduplicate()){ if(!IC2Duplicates.deduplicate()){
CraftingHelper.addSmelting(new ItemStack(Items.IRON_INGOT), ItemIngots.getIngotByName("refinediron"), 1F); CraftingHelper.addSmelting(new ItemStack(Items.IRON_INGOT), ItemIngots.getIngotByName("refined_iron"), 1F);
} }
CraftingHelper.addSmelting(BlockOre2.getOreByName("copper"), ItemIngots.getIngotByName("copper"), 1F); CraftingHelper.addSmelting(BlockOre2.getOreByName("copper"), ItemIngots.getIngotByName("copper"), 1F);
CraftingHelper.addSmelting(BlockOre2.getOreByName("tin"), ItemIngots.getIngotByName("tin"), 1F); CraftingHelper.addSmelting(BlockOre2.getOreByName("tin"), ItemIngots.getIngotByName("tin"), 1F);
@ -2085,11 +2085,11 @@ public class ModRecipes {
IC2Duplicates.GENERATOR.getStackBasedOnConfig()); IC2Duplicates.GENERATOR.getStackBasedOnConfig());
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.DieselGenerator), "III", "I I", "CGC", 'I', IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(), .addShapedOreRecipe(new ItemStack(ModBlocks.dieselGenerator), "III", "I I", "CGC", 'I', IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(),
'C', "circuitBasic", 'G', IC2Duplicates.GENERATOR.getStackBasedOnConfig()); 'C', "circuitBasic", 'G', IC2Duplicates.GENERATOR.getStackBasedOnConfig());
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.DieselGenerator), "AAA", "A A", "CGC", 'A', "ingotAluminum", .addShapedOreRecipe(new ItemStack(ModBlocks.dieselGenerator), "AAA", "A A", "CGC", 'A', "ingotAluminum",
'C', "circuitBasic", 'G', IC2Duplicates.GENERATOR.getStackBasedOnConfig()); 'C', "circuitBasic", 'G', IC2Duplicates.GENERATOR.getStackBasedOnConfig());
// CraftingHelper.addShapedOreRecipe(new // CraftingHelper.addShapedOreRecipe(new
@ -2119,16 +2119,16 @@ public class ModRecipes {
"circuitAdvanced", 'B', "machineBlockAdvanced", 'E', "circuitAdvanced", 'B', "machineBlockAdvanced", 'E',
IC2Duplicates.EXTRACTOR.getStackBasedOnConfig()); IC2Duplicates.EXTRACTOR.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.BlastFurnace), "CHC", "HBH", "FHF", 'H', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.blastFurnace), "CHC", "HBH", "FHF", 'H',
ItemParts.getPartByName("cupronickelHeatingCoil"), 'C', "circuitAdvanced", 'B', ItemParts.getPartByName("cupronickelHeatingCoil"), 'C', "circuitAdvanced", 'B',
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'F', IC2Duplicates.ELECTRICAL_FURNACE.getStackBasedOnConfig()); BlockMachineFrame.getFrameByName("advancedMachine", 1), 'F', IC2Duplicates.ELECTRICAL_FURNACE.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.IndustrialGrinder), "ECP", "GGG", "CBC", 'E', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.industrialGrinder), "ECP", "GGG", "CBC", 'E',
ModBlocks.IndustrialElectrolyzer, 'P', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'C', ModBlocks.industrialElectrolyzer, 'P', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'C',
"circuitAdvanced", 'B', "machineBlockAdvanced", "circuitAdvanced", 'B', "machineBlockAdvanced",
'G', IC2Duplicates.GRINDER.getStackBasedOnConfig()); 'G', IC2Duplicates.GRINDER.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ImplosionCompressor), "ABA", "CPC", "ABA", 'A', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.implosionCompressor), "ABA", "CPC", "ABA", 'A',
ItemIngots.getIngotByName("advancedAlloy"), 'C', "circuitAdvanced", 'B', ItemIngots.getIngotByName("advancedAlloy"), 'C', "circuitAdvanced", 'B',
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'P', IC2Duplicates.COMPRESSOR.getStackBasedOnConfig()); BlockMachineFrame.getFrameByName("advancedMachine", 1), 'P', IC2Duplicates.COMPRESSOR.getStackBasedOnConfig());
@ -2144,16 +2144,16 @@ public class ModRecipes {
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.alloyFurnace), "III", "F F", "III", 'I', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.alloyFurnace), "III", "F F", "III", 'I',
ItemIngots.getIngotByName("refined_iron"), 'F', new ItemStack(ModBlocks.ironFurnace)); ItemIngots.getIngotByName("refined_iron"), 'F', new ItemStack(ModBlocks.ironFurnace));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AlloyFurnace), "III", "F F", "III", 'I', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.alloyFurnace), "III", "F F", "III", 'I',
IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(), 'F', IC2Duplicates.IRON_FURNACE.getStackBasedOnConfig()); IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(), 'F', IC2Duplicates.IRON_FURNACE.getStackBasedOnConfig());
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.ChemicalReactor), "IMI", "CPC", "IEI", 'I', "ingotInvar", .addShapedOreRecipe(new ItemStack(ModBlocks.chemicalReactor), "IMI", "CPC", "IEI", 'I', "ingotInvar",
'C', "circuitAdvanced", 'M', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'P', 'C', "circuitAdvanced", 'M', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'P',
IC2Duplicates.COMPRESSOR.getStackBasedOnConfig(), 'E', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig()); IC2Duplicates.COMPRESSOR.getStackBasedOnConfig(), 'E', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig());
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.RollingMachine), "PCP", "MBM", "PCP", 'P', Blocks.PISTON, .addShapedOreRecipe(new ItemStack(ModBlocks.rollingMachine), "PCP", "MBM", "PCP", 'P', Blocks.PISTON,
'C', "circuitAdvanced", 'M', IC2Duplicates.COMPRESSOR.getStackBasedOnConfig(), 'B', 'C', "circuitAdvanced", 'M', IC2Duplicates.COMPRESSOR.getStackBasedOnConfig(), 'B',
BlockMachineFrame.getFrameByName("machine", 1)); BlockMachineFrame.getFrameByName("machine", 1));
@ -2180,8 +2180,8 @@ public class ModRecipes {
// 'C', "circuitMaster", // 'C', "circuitMaster",
// 'M', new ItemStack(ModItems.parts, 1, 39)); // 'M', new ItemStack(ModItems.parts, 1, 39));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Lesu), " L ", "CBC", " M ", 'L', IC2Duplicates.LVT.getStackBasedOnConfig(), 'C', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.LESU), " L ", "CBC", " M ", 'L', IC2Duplicates.LVT.getStackBasedOnConfig(), 'C',
"circuitAdvanced", 'M', IC2Duplicates.MVT.getStackBasedOnConfig(), 'B', ModBlocks.LesuStorage); "circuitAdvanced", 'M', IC2Duplicates.MVT.getStackBasedOnConfig(), 'B', ModBlocks.LESUStorage);
CraftingHelper CraftingHelper
.addShapedOreRecipe(BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), "CTC", "TBT", "CTC", .addShapedOreRecipe(BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), "CTC", "TBT", "CTC",
@ -2205,10 +2205,10 @@ public class ModRecipes {
IC2Duplicates.COMPRESSOR.getStackBasedOnConfig()); IC2Duplicates.COMPRESSOR.getStackBasedOnConfig());
} }
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.PlasmaGenerator), "PPP", "PTP", "CGC", 'P', // CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.PlasmaGenerator), "PPP", "PTP", "CGC", 'P',
ItemPlates.getPlateByName("tungstensteel"), 'T', IC2Duplicates.HVT.getStackBasedOnConfig(), // ItemPlates.getPlateByName("tungstensteel"), 'T', IC2Duplicates.HVT.getStackBasedOnConfig(),
'G', IC2Duplicates.GENERATOR.getStackBasedOnConfig(), 'C', // 'G', IC2Duplicates.GENERATOR.getStackBasedOnConfig(), 'C',
"circuitMaster"); // "circuitMaster");
// Smetling // Smetling
CraftingHelper CraftingHelper
@ -3212,7 +3212,7 @@ public class ModRecipes {
if (ConfigTechReborn.ExpensiveSolar && !IC2Duplicates.deduplicate()) if (ConfigTechReborn.ExpensiveSolar && !IC2Duplicates.deduplicate())
CraftingHelper CraftingHelper
.addShapedOreRecipe(IC2Duplicates.SOLAR_PANEL.getStackBasedOnConfig(), "PPP", "SZS", "CGC", 'P', .addShapedOreRecipe(IC2Duplicates.SOLAR_PANEL.getStackBasedOnConfig(), "PPP", "SZS", "CGC", 'P',
"paneGlass", 'S', ItemPlates.getPlateByName("silicon"), 'Z', "paneGlass", 'S', ItemPlates.getPlateByName("lazurite"), 'Z',
"plateCarbon", 'G', "plateCarbon", 'G',
IC2Duplicates.GENERATOR.getStackBasedOnConfig(), 'C', IC2Duplicates.GENERATOR.getStackBasedOnConfig(), 'C',
"circuitBasic"); "circuitBasic");