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

made cards actually use the card part in their recipe, instead of a pcb...

Browse Source
This commit is contained in:
Florian Nücke 2014-01-09 14:21:41 +01:00
parent 2399b774b6
commit 641d7437d1
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/opencomputers/recipes/default.recipes
View File

@ -43,7 +43,7 @@ hdd3 {
graphicsCard1 { graphicsCard1 {
input: [["oc:circuitBasic", "oc:craftingALU", "oc:craftingRAMBasic"] input: [["oc:circuitBasic", "oc:craftingALU", "oc:craftingRAMBasic"]
["", "oc:craftingCircuitBoardPrinted", ""]] ["", "oc:craftingCard", ""]]
} }
graphicsCard2 { graphicsCard2 {
input: [["oc:circuitAdvanced", "oc:circuitAdvanced", "oc:craftingRAMAdvanced"] input: [["oc:circuitAdvanced", "oc:circuitAdvanced", "oc:craftingRAMAdvanced"]
@ -55,11 +55,11 @@ graphicsCard3 {
} }
redstoneCard { redstoneCard {
input: [[torchRedstoneActive, "oc:circuitBasic", ""] input: [[torchRedstoneActive, "oc:circuitBasic", ""]
["", "oc:craftingCircuitBoardPrinted", ""]] ["", "oc:craftingCard", ""]]
} }
lanCard { lanCard {
input: [["oc:craftingCable", "oc:circuitBasic", ""] input: [["oc:craftingCable", "oc:circuitBasic", ""]
["", "oc:craftingCircuitBoardPrinted", ""]] ["", "oc:craftingCard", ""]]
} }
wlanCard { wlanCard {
input: [[enderPearl, "oc:circuitAdvanced", ""] input: [[enderPearl, "oc:circuitAdvanced", ""]

18
assets/opencomputers/recipes/gregtech.recipes
View File

@ -46,18 +46,19 @@ hdd3 {
[screwTungstenSteel , craftingToolScrewdriver, screwTungstenSteel]] [screwTungstenSteel , craftingToolScrewdriver, screwTungstenSteel]]
} }
# graphicsCard1 { fallback to default }
# graphicsCard2 { fallback to default }
# graphicsCard3 { fallback to default }
redstoneCard { redstoneCard {
input: [[screwStainlessSteel , "oc:circuitAdvanced" , screwStainlessSteel] input: [[screwStainlessSteel , "oc:circuitAdvanced" , screwStainlessSteel]
["comparator", "oc:craftingCircuitBoardPrinted", diode] ["comparator", "oc:craftingCard", diode]
[screwStainlessSteel , craftingToolScrewdriver, screwStainlessSteel]] [screwStainlessSteel , craftingToolScrewdriver, screwStainlessSteel]]
} }
lanCard { lanCard {
input: [[screwStainlessSteel , "oc:circuitAdvanced" , screwStainlessSteel] input: [[screwStainlessSteel , "oc:circuitAdvanced" , screwStainlessSteel]
["oc:craftingCable", "oc:craftingCircuitBoardPrinted", "oc:craftingCable"] ["oc:craftingCable", "oc:craftingCard", "oc:craftingCable"]
[screwStainlessSteel , craftingToolScrewdriver, screwStainlessSteel]] [screwStainlessSteel , craftingToolScrewdriver, screwStainlessSteel]]
} }
wlanCard { wlanCard {
input: [[screwTitanium , "oc:circuitElite" , screwTitanium] input: [[screwTitanium , "oc:circuitElite" , screwTitanium]
[{item="item.GT_Components", subID=84}, "oc:componentCardLan", {item="item.GT_Components", subID=82}] [{item="item.GT_Components", subID=84}, "oc:componentCardLan", {item="item.GT_Components", subID=82}]
@ -69,7 +70,6 @@ craftingUpgrade {
["oc:circuitAdvanced", {item=tile.BlockMetaID_Machine, subID=16}, "oc:circuitAdvanced"] ["oc:circuitAdvanced", {item=tile.BlockMetaID_Machine, subID=16}, "oc:circuitAdvanced"]
[screwStainlessSteel, craftingToolScrewdriver, screwStainlessSteel]] [screwStainlessSteel, craftingToolScrewdriver, screwStainlessSteel]]
} }
generatorUpgrade { generatorUpgrade {
input: [[screwStainlessSteel, "oc:craftingCircuitBoardPrinted" , screwStainlessSteel] input: [[screwStainlessSteel, "oc:craftingCircuitBoardPrinted" , screwStainlessSteel]
["oc:circuitAdvanced", craftingGenerator, "oc:circuitAdvanced"] ["oc:circuitAdvanced", craftingGenerator, "oc:circuitAdvanced"]
@ -85,7 +85,6 @@ signUpgrade {
["oc:circuitBasic", stickWood, "oc:circuitBasic"] ["oc:circuitBasic", stickWood, "oc:circuitBasic"]
[screwAluminium, craftingToolScrewdriver, screwAluminium]] [screwAluminium, craftingToolScrewdriver, screwAluminium]]
} }
solarGeneratorUpgrade { solarGeneratorUpgrade {
input: [[screwTitanium, "", screwTitanium] input: [[screwTitanium, "", screwTitanium]
["oc:circuitElite", {item=GT_Components, subID=7} , "oc:circuitElite"] ["oc:circuitElite", {item=GT_Components, subID=7} , "oc:circuitElite"]
@ -107,6 +106,10 @@ disk {
["", plateAluminium, ""]] ["", plateAluminium, ""]]
} }
# buttonGroup { fallback to default }
# arrowKeys { fallback to default }
# numPad { fallback to default }
transistor { transistor {
type: assembly type: assembly
input: [redstone, {item="GT_Materials", subID=64}] input: [redstone, {item="GT_Materials", subID=64}]
@ -161,6 +164,7 @@ cu {
output: 3 output: 3
} }
# rawCircuitBoard { fallback to default }
circuitBoard { circuitBoard {
type: furnace type: furnace
input: "oc:craftingCircuitBoardRaw" input: "oc:craftingCircuitBoardRaw"
@ -219,7 +223,7 @@ diskDrive {
[craftingPiston, craftingRawMachineTier02, craftingLenseWhite] [craftingPiston, craftingRawMachineTier02, craftingLenseWhite]
["oc:circuitAdvanced", craftingToolWrench, "oc:circuitAdvanced"]] ["oc:circuitAdvanced", craftingToolWrench, "oc:circuitAdvanced"]]
} }
# keyboard { fallback to default }
powerConverter { powerConverter {
input: [["", "oc:circuitAdvanced", ""] input: [["", "oc:circuitAdvanced", ""]
[plateAluminium, {item=Electric, subID=4}, plateAluminium] [plateAluminium, {item=Electric, subID=4}, plateAluminium]

1
li/cil/oc/Items.scala
View File

@ -120,6 +120,7 @@ object Items {
register("oc:craftingCircuitBoardRaw", rawCircuitBoard.createItemStack()) register("oc:craftingCircuitBoardRaw", rawCircuitBoard.createItemStack())
register("oc:craftingCircuitBoard", circuitBoard.createItemStack()) register("oc:craftingCircuitBoard", circuitBoard.createItemStack())
register("oc:craftingCircuitBoardPrinted", pcb.createItemStack()) register("oc:craftingCircuitBoardPrinted", pcb.createItemStack())
register("oc:craftingCard", card.createItemStack())
register("oc:craftingWire", cuttingWire.createItemStack()) register("oc:craftingWire", cuttingWire.createItemStack())
register("oc:circuitBasic", chip1.createItemStack()) register("oc:circuitBasic", chip1.createItemStack())
register("oc:circuitAdvanced", chip2.createItemStack()) register("oc:circuitAdvanced", chip2.createItemStack())