diff --git a/src/main/java/techreborn/compat/recipes/RecipesIC2.java b/src/main/java/techreborn/compat/recipes/RecipesIC2.java index d75f315ec..f802c028d 100644 --- a/src/main/java/techreborn/compat/recipes/RecipesIC2.java +++ b/src/main/java/techreborn/compat/recipes/RecipesIC2.java @@ -1,10 +1,13 @@ package techreborn.compat.recipes; import cpw.mods.fml.common.Mod; +import ic2.api.recipe.RecipeInputOreDict; +import ic2.api.recipe.Recipes; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import ic2.api.item.IC2Items; +import net.minecraft.nbt.NBTTagCompound; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.init.ModItems; @@ -18,7 +21,8 @@ public class RecipesIC2 { public static void init() { removeIc2Recipes(); - addShappedIc2Recipes(); + addShappedIc2Recipes(); + addTechRebornRecipes(); } public static void removeIc2Recipes() @@ -39,314 +43,314 @@ public class RecipesIC2 { { if (config.ExpensiveMacerator); CraftingHelper.addShapedOreRecipe(IC2Items.getItem("macerator"), - new Object[] - { "FDF", "DMD", "FCF", - 'F', Items.flint, - 'D', Items.diamond, - 'M', IC2Items.getItem("machine"), - 'C',IC2Items.getItem("electronicCircuit") }); + new Object[] + {"FDF", "DMD", "FCF", + 'F', Items.flint, + 'D', Items.diamond, + 'M', IC2Items.getItem("machine"), + 'C', IC2Items.getItem("electronicCircuit")}); if (config.ExpensiveDrill); CraftingHelper.addShapedOreRecipe(IC2Items.getItem("miningDrill"), - new Object[] - { " S ", "SCS", "SBS", - 'S', "ingotSteel", - 'B',IC2Items.getItem("reBattery"), - 'C',IC2Items.getItem("electronicCircuit") }); + 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") }); + 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") }); + 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', "plateInvar", - 'H', IC2Items.getItem("reinforcedGlass"), - 'C', "circuitBasic", - 'G', IC2Items.getItem("geothermalGenerator") }); + new Object[] + {"III", "IHI", "CGC", + 'I', "plateInvar", + 'H', IC2Items.getItem("reinforcedGlass"), + 'C', "circuitBasic", + 'G', IC2Items.getItem("geothermalGenerator")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.thermalGenerator), new Object[] - { "AAA", "AHA", "CGC", + {"AAA", "AHA", "CGC", 'A', "plateAluminum", 'H', IC2Items.getItem("reinforcedGlass"), 'C', "circuitBasic", - 'G', IC2Items.getItem("geothermalGenerator") }); + 'G', IC2Items.getItem("geothermalGenerator")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Semifluidgenerator), new Object[] - { "III", "IHI", "CGC", + {"III", "IHI", "CGC", 'I', "plateIron", 'H', IC2Items.getItem("reinforcedGlass"), 'C', "circuitBasic", - 'G', IC2Items.getItem("generator") }); + 'G', IC2Items.getItem("generator")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Semifluidgenerator), new Object[] - { "AAA", "AHA", "CGC", + {"AAA", "AHA", "CGC", 'A', "plateAluminum", 'H', IC2Items.getItem("reinforcedGlass"), 'C', "circuitBasic", - 'G', IC2Items.getItem("generator") }); + 'G', IC2Items.getItem("generator")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.DieselGenerator), new Object[] - { "III", "I I", "CGC", + {"III", "I I", "CGC", 'I', "plateIron", 'C', "circuitBasic", - 'G', IC2Items.getItem("generator") }); + 'G', IC2Items.getItem("generator")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.DieselGenerator), new Object[] - { "AAA", "A A", "CGC", + {"AAA", "A A", "CGC", 'A', "plateAluminum", 'C', "circuitBasic", - 'G', IC2Items.getItem("generator") }); + 'G', IC2Items.getItem("generator")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MagicalAbsorber), new Object[] - { "CSC", "IBI", "CAC", + {"CSC", "IBI", "CAC", 'C', "circuitMaster", 'S', "craftingSuperconductor", 'B', Blocks.beacon, 'A', ModBlocks.Magicenergeyconverter, - 'I', IC2Items.getItem("iridiumPlate") }); + 'I', IC2Items.getItem("iridiumPlate")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Magicenergeyconverter), new Object[] - { "CTC", "PBP", "CLC", + {"CTC", "PBP", "CLC", 'C', "circuitAdvanced", 'P', "platePlatinum", 'B', Blocks.beacon, 'L', IC2Items.getItem("lapotronCrystal"), - 'T', IC2Items.getItem("teleporter") }); + 'T', IC2Items.getItem("teleporter")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Dragoneggenergysiphoner), new Object[] - { "CTC", "ISI", "CBC", + {"CTC", "ISI", "CBC", 'I', IC2Items.getItem("iridiumPlate"), 'C', "circuitMaster", 'B', "batteryUltimate", 'S', ModBlocks.Supercondensator, - 'T', IC2Items.getItem("teleporter") }); + 'T', IC2Items.getItem("teleporter")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.centrifuge), new Object[] - { "SCS", "BEB", "SCS", + {"SCS", "BEB", "SCS", 'S', "plateSteel", 'C', "circuitAdvanced", 'B', IC2Items.getItem("advancedMachine"), - 'E', IC2Items.getItem("extractor") }); + 'E', IC2Items.getItem("extractor")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.IndustrialElectrolyzer), new Object[] - { "SXS", "CEC", "SMS", + {"SXS", "CEC", "SMS", 'S', "plateSteel", 'C', "circuitAdvanced", 'X', IC2Items.getItem("extractor"), 'E', IC2Items.getItem("electrolyzer"), - 'M', IC2Items.getItem("magnetizer") }); + 'M', IC2Items.getItem("magnetizer")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.BlastFurnace), new Object[] - { "CHC", "HBH", "FHF", + {"CHC", "HBH", "FHF", 'H', new ItemStack(ModItems.parts, 1, 17), 'C', "circuitAdvanced", 'B', IC2Items.getItem("advancedMachine"), - 'F', IC2Items.getItem("inductionFurnace") }); + 'F', IC2Items.getItem("inductionFurnace")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Grinder), new Object[] - { "ECP", "GGG", "CBC", + {"ECP", "GGG", "CBC", 'E', ModBlocks.IndustrialElectrolyzer, 'P', IC2Items.getItem("pump"), 'C', "circuitAdvanced", 'B', IC2Items.getItem("advancedMachine"), - 'G', "craftingGrinder" }); + 'G', "craftingGrinder"}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ImplosionCompressor), new Object[] - { "ABA", "CPC", "ABA", + {"ABA", "CPC", "ABA", 'A', IC2Items.getItem("advancedAlloy"), 'C', "circuitAdvanced", 'B', IC2Items.getItem("advancedMachine"), - 'P', IC2Items.getItem("compressor") }); + 'P', IC2Items.getItem("compressor")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.VacuumFreezer), new Object[] - { "SPS", "CGC", "SPS", + {"SPS", "CGC", "SPS", 'S', "plateSteel", 'C', "circuitAdvanced", 'G', IC2Items.getItem("reinforcedGlass"), - 'P', IC2Items.getItem("pump") }); + 'P', IC2Items.getItem("pump")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Distillationtower), new Object[] - { "CMC", "PBP", "EME", + {"CMC", "PBP", "EME", 'E', ModBlocks.IndustrialElectrolyzer, 'M', "circuitMaster", 'B', IC2Items.getItem("advancedMachine"), 'C', ModBlocks.centrifuge, - 'P', IC2Items.getItem("pump") }); + 'P', IC2Items.getItem("pump")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AlloyFurnace), new Object[] - { "III", "F F", "III", + {"III", "F F", "III", 'I', "plateIron", - 'F', IC2Items.getItem("ironFurnace") }); + 'F', IC2Items.getItem("ironFurnace")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AlloySmelter), new Object[] - { "IHI", "CFC", "IHI", + {"IHI", "CFC", "IHI", 'I', "plateInvar", 'C', "circuitBasic", 'H', new ItemStack(ModItems.parts, 1, 17), - 'F', ModBlocks.AlloyFurnace }); + 'F', ModBlocks.AlloyFurnace}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AssemblyMachine), new Object[] - { "CPC", "SBS", "CSC", + {"CPC", "SBS", "CSC", 'S', "plateSteel", 'C', "circuitBasic", 'B', IC2Items.getItem("machine"), - 'P', "craftingPiston" }); + 'P', "craftingPiston"}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ChemicalReactor), new Object[] - { "IMI", "CPC", "IEI", + {"IMI", "CPC", "IEI", 'I', "plateInvar", 'C', "circuitAdvanced", 'M', IC2Items.getItem("magnetizer"), 'P', IC2Items.getItem("compressor"), - 'E', IC2Items.getItem("extractor") }); + 'E', IC2Items.getItem("extractor")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ChemicalReactor), new Object[] - { "AMA", "CPC", "AEA", + {"AMA", "CPC", "AEA", 'A', "plateAluminum", 'C', "circuitAdvanced", 'M', IC2Items.getItem("magnetizer"), 'P', IC2Items.getItem("compressor"), - 'E', IC2Items.getItem("extractor") }); + 'E', IC2Items.getItem("extractor")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.lathe), new Object[] - { "SLS", "GBG", "SCS", + {"SLS", "GBG", "SCS", 'S', "plateSteel", 'C', "circuitAdvanced", 'G', "gearSteel", 'B', IC2Items.getItem("advancedMachine"), - 'L', IC2Items.getItem("LathingTool") }); + 'L', IC2Items.getItem("LathingTool")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.platecuttingmachine), new Object[] - { "SCS", "GDG", "SBS", + {"SCS", "GDG", "SBS", 'S', "plateSteel", 'C', "circuitAdvanced", 'G', "gearSteel", 'B', IC2Items.getItem("advancedMachine"), - 'D', new ItemStack(ModItems.parts, 1, 9) }); + 'D', new ItemStack(ModItems.parts, 1, 9)}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.RollingMachine), new Object[] - { "PCP", "MBM", "PCP", + {"PCP", "MBM", "PCP", 'P', "craftingPiston", 'C', "circuitAdvanced", 'M', IC2Items.getItem("compressor"), - 'B', IC2Items.getItem("machine") }); + 'B', IC2Items.getItem("machine")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ElectricCraftingTable), new Object[] - { "ITI", "IBI", "ICI", + {"ITI", "IBI", "ICI", 'I', "plateIron", 'C', "circuitAdvanced", 'T', "crafterWood", - 'B', IC2Items.getItem("machine") }); + 'B', IC2Items.getItem("machine")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ElectricCraftingTable), new Object[] - { "ATA", "ABA", "ACA", + {"ATA", "ABA", "ACA", 'A', "plateAluminum", 'C', "circuitAdvanced", 'T', "crafterWood", - 'B', IC2Items.getItem("machine") }); + 'B', IC2Items.getItem("machine")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ChunkLoader), new Object[] - { "SCS", "CMC", "SCS", + {"SCS", "CMC", "SCS", 'S', "plateSteel", 'C', "circuitMaster", - 'M', new ItemStack(ModItems.parts, 1, 39) }); + 'M', new ItemStack(ModItems.parts, 1, 39)}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Lesu), new Object[] - { " L ", "CBC", " M ", + {" L ", "CBC", " M ", 'L', IC2Items.getItem("lvTransformer"), 'C', "circuitAdvanced", 'M', IC2Items.getItem("mvTransformer"), - 'B', ModBlocks.LesuStorage }); + 'B', ModBlocks.LesuStorage}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.LesuStorage), new Object[] - { "LLL", "LCL", "LLL", + {"LLL", "LCL", "LLL", 'L', "blockLapis", - 'C', "circuitBasic" }); + 'C', "circuitBasic"}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Woodenshelf), new Object[] - { "WWW", "A A", "WWW", + {"WWW", "A A", "WWW", 'W', "plankWood", - 'A', "plateAluminum" }); + 'A', "plateAluminum"}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Metalshelf), new Object[] - { "III", "A A", "III", + {"III", "A A", "III", 'I', "plateIron", - 'A', "plateAluminum" }); + 'A', "plateAluminum"}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.HighAdvancedMachineBlock), new Object[] - { "CTC", "TBT", "CTC", + {"CTC", "TBT", "CTC", 'C', "plateChrome", 'T', "plateTitanium", - 'B', IC2Items.getItem("advancedMachine") }); + 'B', IC2Items.getItem("advancedMachine")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 0), new Object[] - { "III", "CBC", "III", + {"III", "CBC", "III", 'I', "plateIron", 'C', "circuitBasic", - 'B', IC2Items.getItem("machine") }); + 'B', IC2Items.getItem("machine")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 1), new Object[] - { "SSS", "CBC", "SSS", + {"SSS", "CBC", "SSS", 'S', "plateSteel", 'C', "circuitAdvanced", - 'B', IC2Items.getItem("advancedMachine") }); + 'B', IC2Items.getItem("advancedMachine")}); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 2), new Object[] - { "HHH", "CBC", "HHH", + {"HHH", "CBC", "HHH", 'H', "plateChrome", 'C', "circuitElite", - 'B', ModBlocks.HighAdvancedMachineBlock }); + 'B', ModBlocks.HighAdvancedMachineBlock}); @@ -354,7 +358,7 @@ public class RecipesIC2 { LogHelper.info("Added Expensive IC2 Recipes"); } - public static void addTechreboenRecipes() + public static void addTechRebornRecipes() { CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 4, 6), new Object[] @@ -417,10 +421,76 @@ public class RecipesIC2 { 'M', new ItemStack(ModItems.parts, 1, 13) }); CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 19), - new Object[] - { "AAA", "AMA", "AAA", - 'A', "ingotBrass", - 'M', new ItemStack(ModItems.parts, 1, 13) }); - } + new Object[] + {"AAA", "AMA", "AAA", + 'A', "ingotBrass", + 'M', new ItemStack(ModItems.parts, 1, 13)}); + + //Macerator + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreAluminm"), null, new ItemStack(ModItems.crushedOre, 2, 0)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreArdite"), null, new ItemStack(ModItems.crushedOre, 2, 1)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreBauxite"), null, new ItemStack(ModItems.crushedOre, 2, 2)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCadmium"), null, new ItemStack(ModItems.crushedOre, 2, 3)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCinnabar"), null, new ItemStack(ModItems.crushedOre, 2, 4)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCobalt"), null, new ItemStack(ModItems.crushedOre, 2, 5)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreDarkIron"), null, new ItemStack(ModItems.crushedOre, 2, 6)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreIndium"), null, new ItemStack(ModItems.crushedOre, 2, 7)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreIridium"), null, new ItemStack(ModItems.crushedOre, 2, 8)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreNickel"), null, new ItemStack(ModItems.crushedOre, 2, 9)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreOsmium"), null, new ItemStack(ModItems.crushedOre, 2, 10)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("orePlatinum"), null, new ItemStack(ModItems.crushedOre, 2, 11)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("orePyrite"), null, new ItemStack(ModItems.crushedOre, 2, 12)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSphalerite"), null, new ItemStack(ModItems.crushedOre, 2, 13)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTetrahedrite"), null, new ItemStack(ModItems.crushedOre, 2, 14)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTungsten"), null, new ItemStack(ModItems.crushedOre, 2, 15)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreGalena"), null, new ItemStack(ModItems.crushedOre, 2, 16)); + + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreRedstone"), null, new ItemStack(Items.redstone, 10)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreLapis"), null, new ItemStack(ModItems.dusts, 12, 40)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreDiamond"), null, new ItemStack(ModItems.dusts, 2, 25)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreEmerald"), null, new ItemStack(ModItems.dusts, 2, 27)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreRuby"), null, new ItemStack(ModItems.dusts, 2, 64)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSapphire"), null, new ItemStack(ModItems.dusts, 2, 66)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("orePeridot"), null, new ItemStack(ModItems.dusts, 2, 56)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSulfur"), null, new ItemStack(ModItems.dusts, 8, 73)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSaltpeter"), null, new ItemStack(ModItems.dusts, 8, 65)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTeslatite"), null, new ItemStack(ModItems.dusts, 10, 75)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreMithril"), null, new ItemStack(ModItems.dusts, 2, 50)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreVinteum"), null, new ItemStack(ModItems.dusts, 2, 81)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("limestone"), null, new ItemStack(ModItems.dusts, 1, 43)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("stoneNetherrack"), null, new ItemStack(ModItems.dusts, 2, 51)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("stoneEndstone"), null, new ItemStack(ModItems.dusts, 2, 51)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("stoneRedrock"), null, new ItemStack(ModItems.dusts, 2, 63)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreMagnetite"), null, new ItemStack(ModItems.dusts, 2, 46)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreLodestone"), null, new ItemStack(ModItems.dusts, 2, 44)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTellurium"), null, new ItemStack(ModItems.dusts, 2, 74)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSilicon"), null, new ItemStack(ModItems.dusts, 2, 67)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreVoidstone"), null, new ItemStack(ModItems.dusts, 2, 82)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCalcite"), null, new ItemStack(ModItems.dusts, 2, 14)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSodalite"), null, new ItemStack(ModItems.dusts, 12, 69)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreGraphite"), null, new ItemStack(ModItems.dusts, 12, 33)); + + //Ore Washing Plant + NBTTagCompound liquidAmount = new NBTTagCompound(); + liquidAmount.setInteger("amount", 1000); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedAluminum"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 0), new ItemStack(ModItems.tinyDusts, 2, 2), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedArdite"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 1), new ItemStack(ModItems.tinyDusts, 2, 6), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedBauxite"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 2), new ItemStack(ModItems.tinyDusts, 2, 9), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCadmium"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 3), new ItemStack(ModItems.tinyDusts, 2, 13), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCinnabar"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 4), new ItemStack(ModItems.tinyDusts, 2, 17), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedCobalt"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 5), new ItemStack(ModItems.tinyDusts, 2, 20), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedDarkIron"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 6), new ItemStack(ModItems.tinyDusts, 2, 24), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIndium"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 7), new ItemStack(ModItems.tinyDusts, 2, 37), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedIridium"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 8), new ItemStack(ModItems.tinyDusts, 2, 39), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedNickel"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 9), new ItemStack(ModItems.tinyDusts, 2, 55), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedOsmium"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 10), new ItemStack(ModItems.tinyDusts, 2, 57), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPlatinum"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 11), new ItemStack(ModItems.tinyDusts, 2, 60), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedPyrite"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 12), new ItemStack(ModItems.tinyDusts, 2, 62), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedSphalerite"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 13), new ItemStack(ModItems.tinyDusts, 2, 74), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTetrahedrite"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 14), new ItemStack(ModItems.tinyDusts, 2, 79), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedTungsten"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 15), new ItemStack(ModItems.tinyDusts, 2, 82), IC2Items.getItem("stoneDust")); + Recipes.oreWashing.addRecipe(new RecipeInputOreDict("crushedGalena"), liquidAmount, new ItemStack(ModItems.purifiedCrushedOre, 1, 16), new ItemStack(ModItems.tinyDusts, 2, 88), IC2Items.getItem("stoneDust")); + + } } diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 79f7aac9a..31cb5b686 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -278,32 +278,30 @@ public class ModBlocks { OreDictionary.registerOre("orePyrite", new ItemStack(ore, 1, 5)); OreDictionary.registerOre("oreCinnabar", new ItemStack(ore, 1, 6)); OreDictionary.registerOre("oreSphalerite", new ItemStack(ore, 1, 7)); - OreDictionary.registerOre("oreTungston", new ItemStack(ore, 1, 8)); + OreDictionary.registerOre("oreTungsten", new ItemStack(ore, 1, 8)); OreDictionary.registerOre("oreSheldonite", new ItemStack(ore, 1, 9)); - OreDictionary.registerOre("oreOlivine", new ItemStack(ore, 1, 10)); + OreDictionary.registerOre("orePlatinum", new ItemStack(ore, 1, 9)); + OreDictionary.registerOre("orePeridot", new ItemStack(ore, 1, 10)); OreDictionary.registerOre("oreSodalite", new ItemStack(ore, 1, 11)); + OreDictionary.registerOre("oreTetrahedrite", new ItemStack(ore, 1, 12)); + OreDictionary.registerOre("oreTin", new ItemStack(ore, 1, 13)); + OreDictionary.registerOre("oreLead", new ItemStack(ore, 1, 14)); + OreDictionary.registerOre("oreSilver", new ItemStack(ore, 1, 15)); OreDictionary.registerOre("blockSilver", new ItemStack(storage, 1, 0)); - OreDictionary.registerOre("blockAluminium", - new ItemStack(storage, 1, 1)); - OreDictionary - .registerOre("blockTitanium", new ItemStack(storage, 1, 2)); - OreDictionary - .registerOre("blockSapphire", new ItemStack(storage, 1, 3)); + OreDictionary.registerOre("blockAluminium", new ItemStack(storage, 1, 1)); + OreDictionary.registerOre("blockTitanium", new ItemStack(storage, 1, 2)); + OreDictionary.registerOre("blockSapphire", new ItemStack(storage, 1, 3)); OreDictionary.registerOre("blockRuby", new ItemStack(storage, 1, 4)); - OreDictionary.registerOre("blockGreenSapphire", new ItemStack(storage, - 1, 5)); + OreDictionary.registerOre("blockGreenSapphire", new ItemStack(storage, 1, 5)); OreDictionary.registerOre("blockChrome", new ItemStack(storage, 1, 6)); - OreDictionary - .registerOre("blockElectrum", new ItemStack(storage, 1, 7)); - OreDictionary - .registerOre("blockTungsten", new ItemStack(storage, 1, 8)); + OreDictionary.registerOre("blockElectrum", new ItemStack(storage, 1, 7)); + OreDictionary.registerOre("blockTungsten", new ItemStack(storage, 1, 8)); OreDictionary.registerOre("blockLead", new ItemStack(storage, 1, 9)); OreDictionary.registerOre("blockZinc", new ItemStack(storage, 1, 10)); OreDictionary.registerOre("blockBrass", new ItemStack(storage, 1, 11)); OreDictionary.registerOre("blockSteel", new ItemStack(storage, 1, 12)); - OreDictionary.registerOre("blockPlatinum", - new ItemStack(storage, 1, 13)); + OreDictionary.registerOre("blockPlatinum", new ItemStack(storage, 1, 13)); OreDictionary.registerOre("blockNickel", new ItemStack(storage, 1, 14)); OreDictionary.registerOre("blockInvar", new ItemStack(storage, 1, 15)); diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 05e3e817d..de73ef769 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -197,6 +197,7 @@ public class ModItems { OreDictionary.registerOre("dustVoidstone", new ItemStack(dusts, 1, 82)); OreDictionary.registerOre("dustYellowGarnet", new ItemStack(dusts, 1, 83)); OreDictionary.registerOre("dustZinc", new ItemStack(dusts, 1, 84)); + OreDictionary.registerOre("dustGalena", new ItemStack(dusts, 1, 85)); // Small Dusts OreDictionary.registerOre("dustSmallAlmandine", new ItemStack(smallDusts, 1, 0)); @@ -289,6 +290,7 @@ public class ModItems { OreDictionary.registerOre("dustSmallVoidstone", new ItemStack(smallDusts, 1, 85)); OreDictionary.registerOre("dustSmallYellowGarnet", new ItemStack(smallDusts, 1, 86)); OreDictionary.registerOre("dustSmallZinc", new ItemStack(smallDusts, 1, 87)); + OreDictionary.registerOre("dustSmallGalena", new ItemStack(smallDusts, 1, 88)); // Tiny Dusts OreDictionary.registerOre("dustTinyAlmandine", new ItemStack(tinyDusts, 1, 0)); @@ -381,6 +383,7 @@ public class ModItems { OreDictionary.registerOre("dustTinyVoidstone", new ItemStack(tinyDusts, 1, 85)); OreDictionary.registerOre("dustTinyYellowGarnet", new ItemStack(tinyDusts, 1, 86)); OreDictionary.registerOre("dustTinyZinc", new ItemStack(tinyDusts, 1, 87)); + OreDictionary.registerOre("dustTinyGalena", new ItemStack(tinyDusts, 1, 88)); // Ingots OreDictionary.registerOre("ingotAluminum", new ItemStack(ingots, 1, 0)); @@ -516,6 +519,7 @@ public class ModItems { OreDictionary.registerOre("crushedSphalerite", new ItemStack(crushedOre, 1, 13)); OreDictionary.registerOre("crushedTetrahedrite", new ItemStack(crushedOre, 1, 14)); OreDictionary.registerOre("crushedTungsten", new ItemStack(crushedOre, 1, 15)); + OreDictionary.registerOre("crushedGalena", new ItemStack(crushedOre, 1, 16)); // Purified Crushed Ore OreDictionary.registerOre("crushedPurifiedAluminum", new ItemStack(purifiedCrushedOre, 1, 0)); @@ -535,6 +539,7 @@ public class ModItems { OreDictionary.registerOre("crushedPurifiedSphalerite", new ItemStack(purifiedCrushedOre, 1, 13)); OreDictionary.registerOre("crushedPurifiedTetrahedrite", new ItemStack(purifiedCrushedOre, 1, 14)); OreDictionary.registerOre("crushedPurifiedTungsten", new ItemStack(purifiedCrushedOre, 1, 15)); + OreDictionary.registerOre("crushedPurifiedGalena", new ItemStack(purifiedCrushedOre, 1, 16)); // Purified Crushed Ore OreDictionary.registerOre("craftingGrinder", new ItemStack(parts, 1, 8)); @@ -548,7 +553,7 @@ public class ModItems { OreDictionary.registerOre("gearTitanium", new ItemStack(parts, 1, 22)); OreDictionary.registerOre("gearSteel", new ItemStack(parts, 1, 23)); OreDictionary.registerOre("gearTungstensteel", new ItemStack(parts, 1, 24)); - OreDictionary.registerOre("blockLapis", new ItemStack(parts, 1, 27)); + OreDictionary.registerOre("blockLapis", new ItemStack(parts, 1, 24)); }