Little cleaner

This commit is contained in:
Gig 2015-05-03 15:53:42 +01:00
parent ce1ff273c2
commit 13b4d73e5a

View file

@ -29,17 +29,13 @@ public class ModRecipes {
public static void removeIc2Recipes() public static void removeIc2Recipes()
{ {
if (config.ExpensiveMacerator) if (config.ExpensiveMacerator);
;
RecipeRemover.removeAnyRecipe(IC2Items.getItem("macerator")); RecipeRemover.removeAnyRecipe(IC2Items.getItem("macerator"));
if (config.ExpensiveDrill) if (config.ExpensiveDrill);
;
RecipeRemover.removeAnyRecipe(IC2Items.getItem("miningDrill")); RecipeRemover.removeAnyRecipe(IC2Items.getItem("miningDrill"));
if (config.ExpensiveDiamondDrill) if (config.ExpensiveDiamondDrill);
;
RecipeRemover.removeAnyRecipe(IC2Items.getItem("diamondDrill")); RecipeRemover.removeAnyRecipe(IC2Items.getItem("diamondDrill"));
if (config.ExpensiveSolar) if (config.ExpensiveSolar);
;
RecipeRemover.removeAnyRecipe(IC2Items.getItem("solarPanel")); RecipeRemover.removeAnyRecipe(IC2Items.getItem("solarPanel"));
LogHelper.info("IC2 Recipes Removed"); LogHelper.info("IC2 Recipes Removed");
@ -49,165 +45,207 @@ public class ModRecipes {
{ {
// IC2 Recipes // IC2 Recipes
if (config.ExpensiveMacerator) if (config.ExpensiveMacerator);
; CraftingHelper.addShapedOreRecipe(IC2Items.getItem("macerator"),
CraftingHelper.addShapedOreRecipe(
IC2Items.getItem("macerator"),
new Object[] new Object[]
{ "FDF", "DMD", "FCF", 'F', Items.flint, 'D', Items.diamond, { "FDF", "DMD", "FCF",
'M', IC2Items.getItem("machine"), 'C', 'F', Items.flint,
IC2Items.getItem("electronicCircuit") }); 'D', Items.diamond,
if (config.ExpensiveDrill) 'M', IC2Items.getItem("machine"),
; 'C',IC2Items.getItem("electronicCircuit") });
CraftingHelper.addShapedOreRecipe(
IC2Items.getItem("miningDrill"),
new Object[]
{ " S ", "SCS", "SBS", 'S', "ingotSteel", 'B',
IC2Items.getItem("reBattery"), 'C',
IC2Items.getItem("electronicCircuit") });
if (config.ExpensiveDiamondDrill)
;
CraftingHelper.addShapedOreRecipe(
IC2Items.getItem("diamondDrill"),
new Object[]
{ " D ", "DBD", "TCT", 'D', "gemDiamond", 'T', "ingotTitanium",
'B', IC2Items.getItem("miningDrill"), 'C',
IC2Items.getItem("advancedCircuit") });
if (config.ExpensiveSolar)
;
CraftingHelper.addShapedOreRecipe(
IC2Items.getItem("solarPanel"),
new Object[]
{ "PPP", "SZS", "CGC", 'P', "paneGlass", 'S',
new ItemStack(ModItems.parts, 1, 1), 'Z',
IC2Items.getItem("carbonPlate"), 'G',
IC2Items.getItem("generator"), 'C',
IC2Items.getItem("electronicCircuit") });
CraftingHelper.addShapedOreRecipe( if (config.ExpensiveDrill);
new ItemStack(ModBlocks.thermalGenerator), CraftingHelper.addShapedOreRecipe(IC2Items.getItem("miningDrill"),
new Object[] new Object[]
{ "III", "IHI", "CGC", 'I', "ingotInvar", 'H', { " S ", "SCS", "SBS",
IC2Items.getItem("reinforcedGlass"), 'C', 'S', "ingotSteel",
IC2Items.getItem("electronicCircuit"), 'G', 'B',IC2Items.getItem("reBattery"),
IC2Items.getItem("geothermalGenerator") }); 'C',IC2Items.getItem("electronicCircuit") });
if (config.ExpensiveDiamondDrill);
CraftingHelper.addShapedOreRecipe(IC2Items.getItem("diamondDrill"),
new Object[]
{ " D ", "DBD", "TCT",
'D', "gemDiamond",
'T', "ingotTitanium",
'B', IC2Items.getItem("miningDrill"),
'C',IC2Items.getItem("advancedCircuit") });
if (config.ExpensiveSolar);
CraftingHelper.addShapedOreRecipe(IC2Items.getItem("solarPanel"),
new Object[]
{ "PPP", "SZS", "CGC",
'P', "paneGlass",
'S', new ItemStack(ModItems.parts, 1, 1),
'Z', IC2Items.getItem("carbonPlate"),
'G', IC2Items.getItem("generator"),
'C',IC2Items.getItem("electronicCircuit") });
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.thermalGenerator),
new Object[]
{ "III", "IHI", "CGC",
'I', "ingotInvar",
'H', IC2Items.getItem("reinforcedGlass"),
'C', IC2Items.getItem("electronicCircuit"),
'G', IC2Items.getItem("geothermalGenerator") });
// TechReborn Recipes // TechReborn Recipes
CraftingHelper.addShapedOreRecipe( CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 4, 6),
new ItemStack(ModItems.parts, 4, 6),
new Object[] new Object[]
{ "EEE", "EAE", "EEE", 'E', "gemEmerald", 'A', { "EEE", "EAE", "EEE",
IC2Items.getItem("electronicCircuit") }); 'E', "gemEmerald",
'A', IC2Items.getItem("electronicCircuit") });
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 7), CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 7),
new Object[] new Object[]
{ "AGA", "RPB", "ASA", 'A', "ingotAluminium", 'G', "dyeGreen", { "AGA", "RPB", "ASA",
'R', "dyeRed", 'P', "paneGlass", 'B', "dyeBlue", 'S', 'A', "ingotAluminium",
Items.glowstone_dust, }); 'G', "dyeGreen",
'R', "dyeRed",
'P', "paneGlass",
'B', "dyeBlue",
'S',Items.glowstone_dust, });
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 4, 8), CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 4, 8),
new Object[] new Object[]
{ "DSD", "S S", "DSD", 'D', "dustDiamond", 'S', "ingotSteel" }); { "DSD", "S S", "DSD",
'D', "dustDiamond",
'S', "ingotSteel" });
CraftingHelper.addShapedOreRecipe( CraftingHelper.addShapedOreRecipe(
new ItemStack(ModItems.parts, 16, 13), new ItemStack(ModItems.parts, 16, 13),
new Object[] new Object[]
{ "CSC", "SCS", "CSC", 'S', "ingotSteel", 'C', { "CSC", "SCS", "CSC",
IC2Items.getItem("electronicCircuit") }); 'S', "ingotSteel",
'C',IC2Items.getItem("electronicCircuit") });
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 2, 14), CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 2, 14),
new Object[] new Object[]
{ "TST", "SBS", "TST", 'S', "ingotSteel", 'T', "ingotTungsten", { "TST", "SBS", "TST",
'B', "blockSteel" }); 'S', "ingotSteel",
'T', "ingotTungsten",
'B', "blockSteel" });
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 15), CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 15),
new Object[] new Object[]
{ "AAA", "AMA", "AAA", 'A', "ingotAluminium", 'M', { "AAA", "AMA", "AAA",
new ItemStack(ModItems.parts, 1, 13) }); 'A', "ingotAluminium",
'M', new ItemStack(ModItems.parts, 1, 13) });
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 16), CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 16),
new Object[] new Object[]
{ "AAA", "AMA", "AAA", 'A', "ingotBronze", 'M', { "AAA", "AMA", "AAA",
new ItemStack(ModItems.parts, 1, 13) }); 'A', "ingotBronze",
'M', new ItemStack(ModItems.parts, 1, 13) });
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 17), CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 17),
new Object[] new Object[]
{ "AAA", "AMA", "AAA", 'A', "ingotSteel", 'M', { "AAA", "AMA", "AAA",
new ItemStack(ModItems.parts, 1, 13) }); 'A', "ingotSteel",
'M', new ItemStack(ModItems.parts, 1, 13) });
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 18), CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 18),
new Object[] new Object[]
{ "AAA", "AMA", "AAA", 'A', "ingotTitanium", 'M', { "AAA", "AMA", "AAA",
new ItemStack(ModItems.parts, 1, 13) }); 'A', "ingotTitanium",
'M', new ItemStack(ModItems.parts, 1, 13) });
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 19), CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 19),
new Object[] new Object[]
{ "AAA", "AMA", "AAA", 'A', "ingotBrass", 'M', { "AAA", "AMA", "AAA",
new ItemStack(ModItems.parts, 1, 13) }); 'A', "ingotBrass",
'M', new ItemStack(ModItems.parts, 1, 13) });
// Storage Blocks // Storage Blocks
CraftingHelper.addShapedOreRecipe( CraftingHelper.addShapedOreRecipe(
new ItemStack(ModBlocks.storage, 1, 0), new Object[] new ItemStack(ModBlocks.storage, 1, 0),
{ "AAA", "AAA", "AAA", 'A', "ingotSilver", }); new Object[]
{ "AAA", "AAA", "AAA",
'A', "ingotSilver", });
CraftingHelper.addShapedOreRecipe( CraftingHelper.addShapedOreRecipe(
new ItemStack(ModBlocks.storage, 1, 1), new Object[] new ItemStack(ModBlocks.storage, 1, 1),
{ "AAA", "AAA", "AAA", 'A', "ingotAluminium", }); new Object[]
{ "AAA", "AAA", "AAA",
'A', "ingotAluminium", });
CraftingHelper.addShapedOreRecipe( CraftingHelper.addShapedOreRecipe(
new ItemStack(ModBlocks.storage, 1, 2), new Object[] new ItemStack(ModBlocks.storage, 1, 2),
{ "AAA", "AAA", "AAA", 'A', "ingotTitanium", }); new Object[]
{ "AAA", "AAA", "AAA",
'A', "ingotTitanium", });
CraftingHelper.addShapedOreRecipe( CraftingHelper.addShapedOreRecipe(
new ItemStack(ModBlocks.storage, 1, 3), new Object[] new ItemStack(ModBlocks.storage, 1, 3),
{ "AAA", "AAA", "AAA", 'A', "gemSapphire", }); new Object[]
{ "AAA", "AAA", "AAA",
'A', "gemSapphire", });
CraftingHelper.addShapedOreRecipe( CraftingHelper.addShapedOreRecipe(
new ItemStack(ModBlocks.storage, 1, 4), new Object[] new ItemStack(ModBlocks.storage, 1, 4),
{ "AAA", "AAA", "AAA", 'A', "gemRuby", }); new Object[]
{ "AAA", "AAA", "AAA",
'A', "gemRuby", });
CraftingHelper.addShapedOreRecipe( CraftingHelper.addShapedOreRecipe(
new ItemStack(ModBlocks.storage, 1, 5), new Object[] new ItemStack(ModBlocks.storage, 1, 5),
{ "AAA", "AAA", "AAA", 'A', "gemGreenSapphire", }); new Object[]
{ "AAA", "AAA", "AAA",
'A', "gemGreenSapphire", });
CraftingHelper.addShapedOreRecipe( CraftingHelper.addShapedOreRecipe(
new ItemStack(ModBlocks.storage, 1, 6), new Object[] new ItemStack(ModBlocks.storage, 1, 6),
{ "AAA", "AAA", "AAA", 'A', "ingotChrome", }); new Object[]
{ "AAA", "AAA", "AAA",
'A', "ingotChrome", });
CraftingHelper.addShapedOreRecipe( CraftingHelper.addShapedOreRecipe(
new ItemStack(ModBlocks.storage, 1, 7), new Object[] new ItemStack(ModBlocks.storage, 1, 7),
{ "AAA", "AAA", "AAA", 'A', "ingotElectrum", }); new Object[]
{ "AAA", "AAA", "AAA",
'A', "ingotElectrum", });
CraftingHelper.addShapedOreRecipe( CraftingHelper.addShapedOreRecipe(
new ItemStack(ModBlocks.storage, 1, 8), new Object[] new ItemStack(ModBlocks.storage, 1, 8),
{ "AAA", "AAA", "AAA", 'A', "ingotTungsten", }); new Object[]
{ "AAA", "AAA", "AAA",
'A', "ingotTungsten", });
CraftingHelper.addShapedOreRecipe( CraftingHelper.addShapedOreRecipe(
new ItemStack(ModBlocks.storage, 1, 9), new Object[] new ItemStack(ModBlocks.storage, 1, 9),
{ "AAA", "AAA", "AAA", 'A', "ingotLead", }); new Object[]
{ "AAA", "AAA", "AAA",
'A', "ingotLead", });
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.storage, 1, CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.storage, 1, 10),
10), new Object[] new Object[]
{ "AAA", "AAA", "AAA", 'A', "ingotZinc", }); { "AAA", "AAA", "AAA",
'A', "ingotZinc", });
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.storage, 1, CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.storage, 1, 11),
11), new Object[] new Object[]
{ "AAA", "AAA", "AAA", 'A', "ingotBrass", }); { "AAA", "AAA", "AAA",
'A', "ingotBrass", });
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.storage, 1, CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.storage, 1, 12),
12), new Object[] new Object[]
{ "AAA", "AAA", "AAA", 'A', "ingotSteel", }); { "AAA", "AAA", "AAA",
'A', "ingotSteel", });
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.storage, 1, CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.storage, 1, 13),
13), new Object[] new Object[]
{ "AAA", "AAA", "AAA", 'A', "ingotPlatinum", }); { "AAA", "AAA", "AAA",
'A', "ingotPlatinum", });
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.storage, 1, CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.storage, 1, 14),
14), new Object[] new Object[]
{ "AAA", "AAA", "AAA", 'A', "ingotNickel", }); { "AAA", "AAA", "AAA",
'A', "ingotNickel", });
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.storage, 1, CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.storage, 1, 15),
15), new Object[] new Object[]
{ "AAA", "AAA", "AAA", 'A', "ingotInvar", }); { "AAA", "AAA", "AAA",
'A', "ingotInvar", });
LogHelper.info("Shapped Recipes Added"); LogHelper.info("Shapped Recipes Added");
} }