AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 02:12:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

recipes for the remaining blocks and items

Browse Source
This commit is contained in:
Florian Nücke 2013-12-01 19:34:26 +01:00
parent cbf17609bd
commit 729331f55d
2 changed files with 95 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
li/cil/oc/Blocks.scala
View File

@ -18,7 +18,7 @@ object Blocks {
var diskDrive: DiskDrive = null
var keyboard: Keyboard = null
var powerDistributor: PowerDistributor = null
var powerSupply: PowerConverter = null
var powerConverter: PowerConverter = null
var robotProxy: RobotProxy = null
var robotAfterimage: RobotAfterimage = null
var router: Router = null
@ -61,7 +61,7 @@ object Blocks {
diskDrive = new DiskDrive(blockSimple)
keyboard = new Keyboard(blockSpecial)
powerDistributor = new PowerDistributor(blockSimple)
powerSupply = new PowerConverter(blockSimple)
powerConverter = new PowerConverter(blockSimple)
robotAfterimage = new RobotAfterimage(blockSpecial)
robotProxy = new RobotProxy(blockSpecialWithRedstone)
router = new Router(blockSimple)

141
li/cil/oc/Recipes.scala
View File

@ -12,9 +12,10 @@ object Recipes {
val cactusGreen = new ItemStack(Item.dyePowder, 1, 2)
val clock = new ItemStack(Item.pocketSundial)
val comparator = new ItemStack(Item.comparator)
val craftingTable = new ItemStack(Block.workbench)
val diamond = new ItemStack(Item.diamond)
val dirt = new ItemStack(Block.dirt)
val dispenser = new ItemStack(Block.dispenser)
val dropper = new ItemStack(Block.dropper)
val emerald = new ItemStack(Item.emerald)
val enderPearl = new ItemStack(Item.enderPearl)
val glass = new ItemStack(Block.glass)
@ -26,7 +27,7 @@ object Recipes {
val lapis = new ItemStack(Item.dyePowder, 1, 4)
val lever = new ItemStack(Block.lever)
val minecartHopper = new ItemStack(Item.minecartHopper)
val netherQuarz = new ItemStack(Item.netherQuartz)
val netherQuartz = new ItemStack(Item.netherQuartz)
val obsidian = new ItemStack(Block.obsidian)
val paper = new ItemStack(Item.paper)
val piston = new ItemStack(Block.pistonBase)
@ -64,39 +65,6 @@ object Recipes {
val transistor = Items.transistor.createItemStack()
val wlanCard = Items.wlan.createItemStack()
// ----------------------------------------------------------------------- //
addRecipe(Blocks.adapter.createItemStack(),
"x ",
" ",
"xxx",
'x', dirt)
addRecipe(Blocks.capacitor.createItemStack(),
"x ",
" ",
"xxx",
'x', dirt)
addRecipe(Blocks.powerDistributor.createItemStack(),
"x ",
" ",
"xxx",
'x', dirt)
addRecipe(Blocks.powerSupply.createItemStack(),
"x ",
" ",
"xxx",
'x', dirt)
addRecipe(Blocks.router.createItemStack(),
"x ",
" ",
"xxx",
'x', dirt)
// ----------------------------------------------------------------------- //
GameRegistry.addShapelessRecipe(new ItemStack(Item.potion), Item.bucketWater, Item.glassBottle)
@ -212,16 +180,6 @@ object Recipes {
// ----------------------------------------------------------------------- //
addRecipe(Items.analyzer.createItemStack(),
" r ",
"tcg",
"tpg",
'r', redstoneTorch,
't', transistor,
'c', chip1,
'g', goldNugget,
'p', printedCircuitBoard)
addRecipe(Blocks.case1.createItemStack(),
"ipi",
"bcb",
@ -278,9 +236,39 @@ object Recipes {
'p', printedCircuitBoard,
'c', chip3,
'b', blazeRod,
'q', netherQuarz,
'q', netherQuartz,
's', Blocks.screen2.createItemStack())
addRecipe(Blocks.capacitor.createItemStack(),
"iti",
"gpg",
"ibi",
'i', ironIngot,
't', transistor,
'g', goldNugget,
'p', paper,
'b', printedCircuitBoard)
addRecipe(Blocks.powerDistributor.createItemStack(),
"ici",
"wgw",
"ibi",
'i', ironIngot,
'c', chip1,
'w', cable,
'g', goldIngot,
'b', printedCircuitBoard)
addRecipe(Blocks.powerConverter.createItemStack(),
"iwi",
"gcg",
"ibi",
'i', ironIngot,
'c', chip1,
'w', cable,
'g', goldIngot,
'b', printedCircuitBoard)
addRecipe(Blocks.diskDrive.createItemStack(),
"ici",
"ps ",
@ -290,17 +278,45 @@ object Recipes {
'p', piston,
's', stick)
addRecipe(Blocks.router.createItemStack(),
"ini",
"ncn",
"ibi",
'i', ironIngot,
'n', lanCard,
'c', chip1,
'b', printedCircuitBoard)
addRecipe(Blocks.adapter.createItemStack(),
"iwi",
"wcw",
"ibi",
'i', ironIngot,
'w', cable,
'c', chip1,
'b', printedCircuitBoard)
addRecipe(Blocks.charger.createItemStack(),
"igi",
"pcp",
"ibi",
'i', ironIngot,
'g', goldIngot,
'p', Blocks.capacitor.createItemStack(),
'c', chip2,
'b', printedCircuitBoard)
addRecipe(Blocks.robotProxy.createItemStack(),
"sgf",
"dcr",
"pmp",
"bmb",
's', Blocks.screen1.createItemStack(),
'g', gpu1,
'f', Blocks.diskDrive.createItemStack(),
'd', dispenser,
'c', Blocks.case1.createItemStack(),
'r', ram1,
'p', piston,
'b', Blocks.capacitor.createItemStack(),
'm', minecartHopper)
addRecipe(Blocks.keyboard.createItemStack(),
@ -319,6 +335,16 @@ object Recipes {
// ----------------------------------------------------------------------- //
addRecipe(Items.analyzer.createItemStack(),
" r ",
"tcg",
"tpg",
'r', redstoneTorch,
't', transistor,
'c', chip1,
'g', goldNugget,
'p', printedCircuitBoard)
addRecipe(ram1,
"ccc",
"bbb",
@ -419,6 +445,25 @@ object Recipes {
'p', enderPearl,
'c', chip2,
'b', lanCard)
addRecipe(Items.generator.createItemStack(),
"i i",
"cpc",
"bib",
'i', ironIngot,
'c', chip1,
'p', piston,
'b', printedCircuitBoard)
addRecipe(Items.crafting.createItemStack(),
"idi",
"cwc",
"ibi",
'i', ironIngot,
'd', dropper,
'c', chip1,
'w', craftingTable,
'b', printedCircuitBoard)
}
private def addRecipe(output: ItemStack, args: Any*) = {