diff --git a/src/main/scala/resonantinduction/archaic/Archaic.scala b/src/main/scala/resonantinduction/archaic/Archaic.scala index 45b58e374..accb56a83 100644 --- a/src/main/scala/resonantinduction/archaic/Archaic.scala +++ b/src/main/scala/resonantinduction/archaic/Archaic.scala @@ -51,7 +51,6 @@ import cpw.mods.fml.common.SidedProxy import cpw.mods.fml.common.event.FMLInitializationEvent import cpw.mods.fml.common.event.FMLPostInitializationEvent import cpw.mods.fml.common.event.FMLPreInitializationEvent -import cpw.mods.fml.common.network.NetworkMod import cpw.mods.fml.common.network.NetworkRegistry import cpw.mods.fml.common.registry.GameRegistry import Archaic._ @@ -119,46 +118,44 @@ class Archaic { def postInit(evt: FMLPostInitializationEvent) { ResonantTab.ITEMSTACK = new ItemStack(blockEngineeringTable) if (OreDictionary.getOres("cobblestone") == null) { - OreDictionary.registerOre("cobblestone", Block.cobblestone) + OreDictionary.registerOre("cobblestone", Blocks.cobblestone) } if (OreDictionary.getOres("stickWood") == null) { - OreDictionary.registerOre("stickWood", Item.stick) + OreDictionary.registerOre("stickWood", Items.stick) } - GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockEngineeringTable, "P", "C", 'P', Blocks.pressurePlatePlanks, - 'C', Blocks.workbench)) - GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockFilter, "B", "P", "B", 'B', Blocks.fenceIron, 'P', - Items.paper)) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ArchaicBlocks.blockCrate, 1, 0), "WWW", "WSW", "WWW", - 'S', "stickWood", 'W', "logWood")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ArchaicBlocks.blockCrate, 1, 1), "WWW", "WSW", "WWW", - 'S', new ItemStack(blockCrate, 1, 0), 'W', "ingotIron")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ArchaicBlocks.blockCrate, 1, 2), "WWW", "WSW", "WWW", - 'S', new ItemStack(blockCrate, 1, 1), 'W', UniversalRecipe.PRIMARY_METAL.get)) - GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockFirebox, "III", "SFS", "SSS", 'I', Items.iron_ingot, - 'F', Block.furnaceIdle, 'S', Block.stone)) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ArchaicBlocks.blockFirebox, 1, 1), "III", "SFS", "SSS", - 'I', UniversalRecipe.PRIMARY_METAL.get, 'F', new ItemStack(ArchaicBlocks.blockFirebox, 1, 0), 'S', UniversalRecipe.WIRE.get)) - GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockImprinter, "SSS", "W W", "PPP", 'S', Blocks.stone, - 'P', Block.pistonBase, 'W', "logWood")) - GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockTurntable, "SSS", "PGP", "WWW", 'S', Blocks.stone, - 'G', Item.redstone, 'P', Block.pistonBase, 'W', "logWood")) - GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockCast, "I I", "IBI", "III", 'S', Items.ingotIron, 'B', - Block.fenceIron)) - GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockGutter, "S S", "I I", "III", 'S', Items.stick, 'I', - "cobblestone")) - GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockGrate, "WBW", "B B", "WBW", 'B', Blocks.fenceIron, - 'W', "plankWood")) - GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockHotPlate, "SSS", "III", 'I', Items.iron_ingot, 'S', - Block.stone)) - GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockMillstone, "SPS", "SAS", "SSS", 'P', Blocks.pistonBase, - 'A', Item.pickaxeStone, 'S', Block.stone)) - GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockTank, "GGG", "GSG", "GGG", 'G', Blocks.glass, 'S', - Item.ingotIron)) - GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicItems.itemHandCrank, "S ", "SSS", " S", 'S', "stickWood")) - GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicItems.itemImprint, "PPP", "PIP", "PPP", 'P', Items.paper, 'I', - new ItemStack(Item.dyePowder, 0))) - GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicItems.itemHammer, "CC ", "CS ", " S", 'C', "cobblestone", 'S', - "stickWood")) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockEngineeringTable, Array("P", "C", 'P', Blocks.wooden_pressure_plate, 'C', Blocks.crafting_table))) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockFilter, Array("B", "P", "B", 'B', Blocks.iron_bars, 'P', Items.paper))) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ArchaicBlocks.blockCrate, 1, 0), Array("WWW", "WSW", "WWW", + 'S', "stickWood", 'W', "logWood"))) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ArchaicBlocks.blockCrate, 1, 1), Array("WWW", "WSW", "WWW", + 'S', new ItemStack(ArchaicBlocks.blockCrate, 1, 0), 'W', "ingotIron"))) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ArchaicBlocks.blockCrate, 1, 2), Array("WWW", "WSW", "WWW", + 'S', new ItemStack(ArchaicBlocks.blockCrate, 1, 1), 'W', UniversalRecipe.PRIMARY_METAL.get))) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockFirebox, Array("III", "SFS", "SSS", 'I', Items.iron_ingot, + 'F', Blocks.furnace, 'S', Blocks.stone))) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ArchaicBlocks.blockFirebox, 1, 1), Array("III", "SFS", "SSS", + 'I', UniversalRecipe.PRIMARY_METAL.get, 'F', new ItemStack(ArchaicBlocks.blockFirebox, 1, 0), 'S', UniversalRecipe.WIRE.get))) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockImprinter, Array("SSS", "W W", "PPP", 'S', Blocks.stone, + 'P', Blocks.piston, 'W', "logWood"))) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockTurntable, Array("SSS", "PGP", "WWW", 'S', Blocks.stone, + 'G', Items.redstone, 'P', Blocks.piston, 'W', "logWood"))) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockCast, Array("I I", "IBI", "III", 'S', Items.iron_ingot, 'B', + Blocks.iron_bars))) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockGutter, Array("S S", "I I", "III", 'S', Items.stick, 'I', + "cobblestone"))) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockGrate, Array("WBW", "B B", "WBW", 'B', Blocks.iron_bars, + 'W', "plankWood"))) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockHotPlate, Array("SSS", "III", 'I', Items.iron_ingot, 'S', + Blocks.stone))) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockMillstone, Array("SPS", "SAS", "SSS", 'P', Blocks.piston, + 'A', Items.stone_pickaxe, 'S', Blocks.stone))) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicBlocks.blockTank, Array("GGG", "GSG", "GGG", 'G', Blocks.glass, 'S', + Items.iron_ingot))) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicItems.itemHandCrank, Array("S ", "SSS", " S", 'S', "stickWood"))) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicItems.itemImprint, Array("PPP", "PIP", "PPP", 'P', Items.paper, 'I', + new ItemStack(Items.dye, 0)))) + GameRegistry.addRecipe(new ShapedOreRecipe(ArchaicItems.itemHammer, Array("CC ", "CS ", " S", 'C', "cobblestone", 'S', + "stickWood"))) GameRegistry.registerCraftingHandler(new CrateCraftingHandler()) proxy.postInit() modproxies.postInit()