From 37ba159fa182f875cd5602c72f37c2bcca31bed4 Mon Sep 17 00:00:00 2001 From: Tntrololol Date: Mon, 25 May 2015 12:37:51 -0500 Subject: [PATCH] Fixed storage block ore dictionary registrations --- src/main/java/techreborn/init/ModBlocks.java | 35 +++++---- src/main/java/techreborn/init/ModRecipes.java | 74 +++++++------------ 2 files changed, 47 insertions(+), 62 deletions(-) diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 8ff5b290a..752f1ae1c 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -291,21 +291,30 @@ public class ModBlocks { 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("blockAluminum", 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("blockChrome", new ItemStack(storage, 1, 6)); + OreDictionary.registerOre("blockChrome", new ItemStack(storage, 1, 3)); + OreDictionary.registerOre("blockSteel", new ItemStack(storage, 1, 4)); + OreDictionary.registerOre("blockBrass", new ItemStack(storage, 1, 5)); + OreDictionary.registerOre("blockLead", new ItemStack(storage, 1, 6)); 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("blockNickel", new ItemStack(storage, 1, 14)); - OreDictionary.registerOre("blockInvar", new ItemStack(storage, 1, 15)); + OreDictionary.registerOre("blockZinc", new ItemStack(storage, 1, 8)); + OreDictionary.registerOre("blockPlatinum", new ItemStack(storage, 1, 9)); + OreDictionary.registerOre("blockTungsten", new ItemStack(storage, 1, 10)); + OreDictionary.registerOre("blockNickel", new ItemStack(storage, 1, 11)); + OreDictionary.registerOre("blockInvar", new ItemStack(storage, 1, 12)); + OreDictionary.registerOre("blockOsmium", new ItemStack(storage, 1, 13)); + OreDictionary.registerOre("blockIridium", new ItemStack(storage, 1, 14)); + + OreDictionary.registerOre("blockTungstensteel", new ItemStack(storage2, 1, 0)); + OreDictionary.registerOre("blockLodestone", new ItemStack(storage2, 1, 1)); + OreDictionary.registerOre("blockTellurium", new ItemStack(storage2, 1, 2)); + OreDictionary.registerOre("blockRuby", new ItemStack(storage2, 1, 5)); + OreDictionary.registerOre("blockSapphire", new ItemStack(storage2, 1, 6)); + OreDictionary.registerOre("blockPeridot", new ItemStack(storage2, 1, 7)); + OreDictionary.registerOre("blockYellowGarnet", new ItemStack(storage2, 1, 8)); + OreDictionary.registerOre("blockRedGarnet", new ItemStack(storage2, 1, 9)); + OreDictionary.registerOre("craftingPiston", Blocks.piston); OreDictionary.registerOre("craftingPiston", Blocks.sticky_piston); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 066041e33..1e7ae2108 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -135,59 +135,35 @@ public class ModRecipes { } public static void addShaplessRecipes() { - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, - 4), "blockSilver"); - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, - 5), "blockAluminium"); - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, - 6), "blockTitanium"); - CraftingHelper.addShapelessOreRecipe( - new ItemStack(ModItems.gems, 9, 1), "blockSapphire"); - CraftingHelper.addShapelessOreRecipe( - new ItemStack(ModItems.gems, 9, 0), "blockRuby"); - CraftingHelper.addShapelessOreRecipe( - new ItemStack(ModItems.gems, 9, 2), "blockGreenSapphire"); - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, - 7), "blockChrome"); - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, - 8), "blockElectrum"); - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, - 9), "blockTungsten"); - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, - 10), "blockLead"); - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, - 11), "blockZinc"); - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, - 12), "blockBrass"); - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, - 13), "blockSteel"); - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, - 14), "blockPlatinum"); - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, - 15), "blockNickel"); - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, - 16), "blockInvar"); - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.rockCutter, - 1, 27), Items.apple); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 4), "blockSilver"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 5), "blockAluminium"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 6), "blockTitanium"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.gems, 9, 1), "blockSapphire"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.gems, 9, 0), "blockRuby"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.gems, 9, 2), "blockGreenSapphire"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 7), "blockChrome"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 8), "blockElectrum"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 9), "blockTungsten"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 10), "blockLead"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 11), "blockZinc"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 12), "blockBrass"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 13), "blockSteel"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 14), "blockPlatinum"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 15), "blockNickel"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots, 9, 16), "blockInvar"); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.rockCutter, 1, 27), Items.apple); LogHelper.info("Shapless Recipes Added"); } public static void addSmeltingRecipes() { - GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 27), - new ItemStack(Items.iron_ingot), 1F); - GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 23), - new ItemStack(Items.gold_ingot), 1F); - GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 14), - IC2Items.getItem("copperIngot"), 1F); - GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 51), - IC2Items.getItem("tinIngot"), 1F); - GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 7), - IC2Items.getItem("bronzeIngot"), 1F); - GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 29), - IC2Items.getItem("leadIngot"), 1F); - GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 45), - IC2Items.getItem("silverIngot"), 1F); + GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 27), new ItemStack(Items.iron_ingot), 1F); + GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 23), new ItemStack(Items.gold_ingot), 1F); + GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 14), IC2Items.getItem("copperIngot"), 1F); + GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 51), IC2Items.getItem("tinIngot"), 1F); + GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 7), IC2Items.getItem("bronzeIngot"), 1F); + GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 29), IC2Items.getItem("leadIngot"), 1F); + GameRegistry.addSmelting(new ItemStack(ModItems.dusts, 1, 45), IC2Items.getItem("silverIngot"), 1F); LogHelper.info("Smelting Recipes Added"); } @@ -524,7 +500,7 @@ public class ModRecipes { } //Obsidian - RecipeHanderer.addRecipe(new PlateCuttingMachineRecipe(new ItemStack(Blocks.obsidian), new ItemStack(ModItems.plate, 1, 18), 100, 4)); + RecipeHanderer.addRecipe(new PlateCuttingMachineRecipe(new ItemStack(Blocks.obsidian), new ItemStack(ModItems.plate, 9, 18), 100, 4)); } public static void addUUrecipes() {