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

fixed oredict names

Browse Source
This commit is contained in:
Johannes Lohrer 2013-12-28 17:24:00 +01:00
parent 5c5ddd1f72
commit ee7e1ece01
4 changed files with 74 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ lanCard {
} }
wlanCard { wlanCard {
input: [[enderPearl, "oc:circuitAdvanced", ""] input: [[enderPearl, "oc:circuitAdvanced", ""]
["", componentCardLan, ""]] ["", "oc:componentCardLan", ""]]
} }
craftingUpgrade { craftingUpgrade {
@ -234,7 +234,7 @@ powerDistributor {
} }
redstone { redstone {
input: [[ingotIron, blockRedstone, ingotIron] input: [[ingotIron, blockRedstone, ingotIron]
[blockRedstone, componentCardRedstone, blockRedstone] [blockRedstone, "oc:componentCardRedstone", blockRedstone]
[ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]] [ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]]
} }
robot { robot {
@ -244,7 +244,7 @@ robot {
} }
router { router {
input: [[ingotIron, "oc:craftingCable", ingotIron] input: [[ingotIron, "oc:craftingCable", ingotIron]
["oc:craftingCable", componentCardLan, "oc:craftingCable"] ["oc:craftingCable", "oc:componentCardLan", "oc:craftingCable"]
[ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]] [ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]]
} }
screen1 { screen1 {

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

@ -2,95 +2,95 @@
# Instead, use the custom.conf file to edit recipes by redefining them there. # Instead, use the custom.conf file to edit recipes by redefining them there.
analyzer { analyzer {
input: [["craftingTransistor", torchRedstoneActive, "craftingTransistor"] input: [["oc:craftingTransistor", torchRedstoneActive, "oc:craftingTransistor"]
[circuitAdvanced, "item.GT_Scanner", circuitAdvanced] ["oc:circuitAdvanced", "item.GT_Scanner", "oc:circuitAdvanced"]
[screwAluminium, craftingToolScrewdriver, screwAluminium]] [screwAluminium, craftingToolScrewdriver, screwAluminium]]
} }
ram1 { ram1 {
type:assembly type:assembly
input: [circuitBasic, craftingCircuitBoardAdvanced] input: ["oc:circuitBasic", "oc:craftingCircuitBoardPrinted"]
number:[3,3] number:[3,3]
eu:32 eu:32
time=250 time=250
} }
ram2 { ram2 {
input: [[circuitAdvanced, circuitAdvanced, circuitAdvanced] input: [["oc:circuitAdvanced", "oc:circuitAdvanced", "oc:circuitAdvanced"]
[craftingRAMBasic, craftingCircuitBoardAdvanced, craftingRAMBasic] ["oc:craftingRAMBasic", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMBasic"]
[Dataorb, craftingToolWrench, Dataorb]] [Dataorb, craftingToolWrench, Dataorb]]
} }
ram3 { ram3 {
input: [[circuitElite, circuitElite, circuitElite] input: [["oc:circuitElite", "oc:circuitElite", "oc:circuitElite"]
[craftingRAMAdvanced, craftingCircuitBoardAdvanced, craftingRAMAdvanced] ["oc:craftingRAMAdvanced", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMAdvanced"]
[Dataorb, craftingToolWrench, Dataorb]] [Dataorb, craftingToolWrench, Dataorb]]
} }
floppy { floppy {
input: [[screwAluminium, lever, screwAluminium] input: [[screwAluminium, lever, screwAluminium]
[craftingCircuitBoardBasic, "oc:craftingDisk", craftingCircuitBoardBasic] [plateAluminium, "oc:craftingDisk", plateAluminium]
[screwAluminium, craftingToolScrewdriver, screwAluminium]] [screwAluminium, craftingToolScrewdriver, screwAluminium]]
} }
hdd1 { hdd1 {
input: [[craftingRAMBasic, "oc:craftingDisk", craftingRAMBasic] input: [["oc:craftingRAMBasic", "oc:craftingDisk", "oc:craftingRAMBasic"]
[craftingRAMBasic, "oc:craftingDisk", craftingRAMBasic] ["oc:craftingRAMBasic", "oc:craftingDisk", "oc:craftingRAMBasic"]
[screwAluminium, craftingToolScrewdriver, circuitAdvanced]] [screwAluminium, craftingToolScrewdriver, "oc:circuitAdvanced"]]
} }
hdd2 { hdd2 {
input: [[craftingHDDBasic, craftingCircuitBoardAdvanced , craftingHDDBasic] input: [["oc:craftingHDDBasic", "oc:craftingCircuitBoardPrinted" , "oc:craftingHDDBasic"]
[circuitAdvanced, screwTitanium , circuitAdvanced] ["oc:circuitAdvanced", screwTitanium , "oc:circuitAdvanced"]
[screwTitanium , craftingToolScrewdriver, screwTitanium ]] [screwTitanium , craftingToolScrewdriver, screwTitanium ]]
} }
hdd3 { hdd3 {
input: [[craftingRAMAdvanced, craftingCircuitBoardAdvanced , craftingRAMAdvanced] input: [["oc:craftingRAMAdvanced", "oc:craftingCircuitBoardPrinted" , "oc:craftingRAMAdvanced"]
[circuitElite , screwTungstenSteel , circuitElite ] ["oc:circuitElite" , screwTungstenSteel , "oc:circuitElite" ]
[screwTungstenSteel , craftingToolScrewdriver, screwTungstenSteel ]] [screwTungstenSteel , craftingToolScrewdriver, screwTungstenSteel ]]
} }
redstoneCard { redstoneCard {
input: [[screwStainlessSteel , circuitAdvanced , screwStainlessSteel] input: [[screwStainlessSteel , "oc:circuitAdvanced" , screwStainlessSteel]
["comparator", craftingCircuitBoardAdvanced, diode] ["comparator", "oc:craftingCircuitBoardPrinted", diode]
[screwStainlessSteel , craftingToolScrewdriver, screwStainlessSteel]] [screwStainlessSteel , craftingToolScrewdriver, screwStainlessSteel]]
} }
lanCard { lanCard {
input: [[screwStainlessSteel , circuitAdvanced , screwStainlessSteel] input: [[screwStainlessSteel , "oc:circuitAdvanced" , screwStainlessSteel]
[craftingWireCopper, craftingCircuitBoardAdvanced, craftingWireCopper] ["oc:craftingCable", "oc:craftingCircuitBoardPrinted", "oc:craftingCable"]
[screwStainlessSteel , craftingToolScrewdriver, screwStainlessSteel]] [screwStainlessSteel , craftingToolScrewdriver, screwStainlessSteel]]
} }
wlanCard { wlanCard {
input: [[screwTitanium , circuitElite , screwTitanium] input: [[screwTitanium , "oc:circuitElite" , screwTitanium]
[{item="item.GT_Components",subID=84}, componentCardLan, {item="item.GT_Components",subID=82}] [{item="item.GT_Components",subID=84}, componentCardLan, {item="item.GT_Components",subID=82}]
[screwTitanium , craftingToolScrewdriver, screwTitanium]] [screwTitanium , craftingToolScrewdriver, screwTitanium]]
} }
craftingUpgrade { craftingUpgrade {
input: [[screwStainlessSteel, craftingCircuitBoardAdvanced , screwStainlessSteel] input: [[screwStainlessSteel, "oc:craftingCircuitBoardPrinted" , screwStainlessSteel]
[circuitAdvanced, {item=tile.BlockMetaID_Machine,subID=16}, circuitAdvanced] ["oc:circuitAdvanced", {item=tile.BlockMetaID_Machine,subID=16}, "oc:circuitAdvanced"]
[screwStainlessSteel, craftingToolScrewdriver, screwStainlessSteel]] [screwStainlessSteel, craftingToolScrewdriver, screwStainlessSteel]]
} }
generatorUpgrade { generatorUpgrade {
input: [[screwStainlessSteel, craftingCircuitBoardAdvanced , screwStainlessSteel] input: [[screwStainlessSteel, "oc:craftingCircuitBoardPrinted" , screwStainlessSteel]
[circuitAdvanced,craftingGenerator , circuitAdvanced] ["oc:circuitAdvanced",craftingGenerator , "oc:circuitAdvanced"]
[screwStainlessSteel, craftingToolScrewdriver, screwStainlessSteel]] [screwStainlessSteel, craftingToolScrewdriver, screwStainlessSteel]]
} }
#todo #todo
#navigationUpgrade { #navigationUpgrade {
# input: [[ingotGold, compass, ingotGold] # input: [[ingotGold, compass, ingotGold]
# [circuitElite, {item=map, subID=32767}, circuitElite] # ["oc:circuitElite", {item=map, subID=32767}, "oc:circuitElite"]
# [ingotGold, potion, ingotGold]] # [ingotGold, potion, ingotGold]]
#} #}
#todo #todo
#signUpgrade { #signUpgrade {
# input: [[ingotIron, dyePowder, ingotIron] # input: [[ingotIron, dyePowder, ingotIron]
# [circuitAdvanced, stickWood, circuitAdvanced] # ["oc:circuitAdvanced", stickWood, "oc:circuitAdvanced"]
# [ingotIron, pistonStickyBase, ingotIron]] # [ingotIron, pistonStickyBase, ingotIron]]
#} #}
#todo #todo
#solarGeneratorUpgrade { #solarGeneratorUpgrade {
# input: [[glass, glass, glass] # input: [[glass, glass, glass]
# [circuitAdvanced, "oc:craftingGenerator", circuitAdvanced]] # ["oc:circuitAdvanced", "oc:craftingGenerator", "oc:circuitAdvanced"]]
#} #}
@ -152,13 +152,12 @@ alu {
} }
############ ############
cpu { cpu {
input: [[circuitAdvanced, {item=oc:item,subID=24}, circuitBasic] input: [["oc:circuitAdvanced", {item=oc:item,subID=24}, "oc:circuitBasic"]
[plateAluminium, craftingControlUnit, plateAluminium] [screwAluminium, "oc:craftingALU", screwAluminium]]
[screwAluminium, craftingALU, screwAluminium]]
} }
cu { cu {
input: [[nuggetGold, torchRedstoneActive, nuggetGold] input: [[nuggetGold, torchRedstoneActive, nuggetGold]
[craftingTransistor, clock, craftingTransistor] ["oc:craftingTransistor", clock, "oc:craftingTransistor"]
[nuggetGold, redstone, nuggetGold]] [nuggetGold, redstone, nuggetGold]]
} }
@ -172,18 +171,18 @@ circuitBoard {
} }
printedCircuitBoard { printedCircuitBoard {
type: shapeless type: shapeless
input: [craftingCircuitBoardBasic, nuggetGold, "oc:craftingAcid"] input: ["oc:craftingCircuitBoard", nuggetGold, "oc:craftingAcid"]
} }
card { card {
input: [[nuggetIron, circuitBasic, craftingTransistor] input: [[nuggetIron, "oc:circuitBasic", "oc:craftingTransistor"]
[nuggetIron, craftingCircuitBoardAdvanced, craftingCircuitBoardAdvanced] [nuggetIron, "oc:craftingCircuitBoardPrinted", "oc:craftingCircuitBoardPrinted"]
[nuggetIron, nuggetGold, nuggetGold]] [nuggetIron, nuggetGold, nuggetGold]]
} }
adapter { adapter {
input: [[ingotIron, craftingWireCopper, ingotIron] input: [[ingotIron, "oc:craftingCable", ingotIron]
[craftingWireCopper, circuitBasic, craftingWireCopper] ["oc:craftingCable", "oc:circuitBasic", "oc:craftingCable"]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]] [ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]]
} }
cable { cable {
input: [["", nuggetIron, ""] input: [["", nuggetIron, ""]
@ -192,76 +191,76 @@ cable {
output: 4 output: 4
} }
capacitor { capacitor {
input: [[ingotIron, craftingTransistor, ingotIron] input: [[ingotIron, "oc:craftingTransistor", ingotIron]
[nuggetGold, paper, nuggetGold] [nuggetGold, paper, nuggetGold]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]] [ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]]
} }
charger { charger {
input: [[ingotIron, ingotGold, ingotIron] input: [[ingotIron, ingotGold, ingotIron]
[craftingCapacitor, circuitAdvanced, craftingCapacitor] ["oc:craftingCapacitor", "oc:circuitAdvanced", "oc:craftingCapacitor"]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]] [ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]]
} }
case1 { case1 {
input: [[ingotIron, craftingCircuitBoardAdvanced, ingotIron] input: [[ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]
[fenceIron, craftingCPU, fenceIron] [fenceIron, "oc:craftingCPU", fenceIron]
[ingotIron, circuitBasic, ingotIron]] [ingotIron, "oc:circuitBasic", ingotIron]]
} }
case2 { case2 {
input: [[ingotGold, craftingCircuitBoardAdvanced, ingotGold] input: [[ingotGold, "oc:craftingCircuitBoardPrinted", ingotGold]
[circuitAdvanced, craftingRawMachineBasic, circuitAdvanced] ["oc:circuitAdvanced", "oc:craftingCaseBasic", "oc:circuitAdvanced"]
[ingotGold, circuitAdvanced, ingotGold]] [ingotGold, "oc:circuitAdvanced", ingotGold]]
} }
case3 { case3 {
input: [[circuitElite, craftingCircuitBoardAdvanced, circuitElite] input: [["oc:circuitElite", "oc:craftingCircuitBoardPrinted", "oc:circuitElite"]
[diamond, craftingRawMachineAdvanced, diamond] [diamond, "oc:craftingCaseAdvanced", diamond]
[circuitElite, craftingCircuitBoardAdvanced, circuitElite]] ["oc:circuitElite", "oc:craftingCircuitBoardPrinted", "oc:circuitElite"]]
} }
diskDrive { diskDrive {
input: [[ingotIron, circuitBasic, ingotIron] input: [[ingotIron, "oc:circuitBasic", ingotIron]
[pistonBase, stickWood, ""] [pistonBase, stickWood, ""]
[ingotIron, circuitBasic, ingotIron]] [ingotIron, "oc:circuitBasic", ingotIron]]
} }
keyboard { keyboard {
input: [["oc:craftingButtonGroup", "oc:craftingButtonGroup", "oc:craftingButtonGroup"] input: [["oc:craftingButtonGroup", "oc:craftingButtonGroup", "oc:craftingButtonGroup"]
["oc:craftingButtonGroup", "oc:craftingArrowKey", "oc:craftingNumPad"]] ["oc:craftingButtonGroup", "oc:craftingArrowKey", "oc:craftingNumPad"]]
} }
powerConverter { powerConverter {
input: [[ingotIron, craftingWireCopper, ingotIron] input: [[ingotIron, "oc:craftingCable", ingotIron]
[ingotGold, circuitBasic, ingotGold] [ingotGold, "oc:circuitBasic", ingotGold]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]] [ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]]
} }
powerDistributor { powerDistributor {
input: [[ingotIron, ingotGold, ingotIron] input: [[ingotIron, ingotGold, ingotIron]
[craftingWireCopper, circuitBasic, craftingWireCopper] ["oc:craftingCable", "oc:circuitBasic", "oc:craftingCable"]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]] [ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]]
} }
redstone { redstone {
input: [[ingotIron, blockRedstone, ingotIron] input: [[ingotIron, blockRedstone, ingotIron]
[blockRedstone, componentCardRedstone, blockRedstone] [blockRedstone, "oc:componentCardRedstone", blockRedstone]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]] [ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]]
} }
robot { robot {
input: [[craftingMonitorBasic, craftingGPUBasic, craftingDiskDrive] input: [["oc:craftingScreenBasic", "oc:craftingGPUBasic", craftingDiskDrive]
[dispenser, craftingRawMachineBasic, craftingRAMBasic] [dispenser, "oc:craftingCaseBasic", "oc:craftingRAMBasic"]
[craftingCapacitor, minecartHopper, craftingCapacitor]] ["oc:craftingCapacitor", minecartHopper, "oc:craftingCapacitor"]]
} }
router { router {
input: [[ingotIron, craftingWireCopper, ingotIron] input: [[ingotIron, "oc:craftingCable", ingotIron]
[craftingWireCopper, componentCardLan, craftingWireCopper] ["oc:craftingCable", "oc:componentCardLan", "oc:craftingCable"]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]] [ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]]
} }
screen1 { screen1 {
input: [[ingotIron, ingotIron, glass] input: [[ingotIron, ingotIron, glass]
[redstone, craftingTransistor, glass] [redstone, "oc:craftingTransistor", glass]
[ingotIron, ingotIron, glass]] [ingotIron, ingotIron, glass]]
} }
screen2 { screen2 {
input: [[ingotGold, {item=dyePowder, subID=1}, ingotGold] input: [[ingotGold, {item=dyePowder, subID=1}, ingotGold]
[circuitAdvanced, {item=dyePowder, subID=2}, craftingMonitorBasic] ["oc:circuitAdvanced", {item=dyePowder, subID=2}, "oc:craftingScreenBasic"]
[ingotGold, {item=dyePowder, subID=4}, ingotGold]] [ingotGold, {item=dyePowder, subID=4}, ingotGold]]
} }
screen3 { screen3 {
input: [[obsidian, craftingCircuitBoardAdvanced, circuitElite] input: [[obsidian, "oc:craftingCircuitBoardPrinted", "oc:circuitElite"]
[blazeRod, netherquartz, craftingMonitorAdvanced] [blazeRod, netherquartz, "oc:craftingScreenAdvanced"]
[obsidian, craftingCircuitBoardAdvanced, circuitElite]] [obsidian, "oc:craftingCircuitBoardPrinted", "oc:circuitElite"]]
} }

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

@ -76,7 +76,7 @@ object Blocks {
redstone = new Redstone(blockSimpleWithRedstone) redstone = new Redstone(blockSimpleWithRedstone)
register("oc:craftingWireCopper", cable.createItemStack()) register("oc:craftingCable", cable.createItemStack())
register("oc:craftingCapacitor", capacitor.createItemStack()) register("oc:craftingCapacitor", capacitor.createItemStack())
register("oc:craftingCaseBasic", case1.createItemStack()) register("oc:craftingCaseBasic", case1.createItemStack())
register("oc:craftingCaseAdvanced", case2.createItemStack()) register("oc:craftingCaseAdvanced", case2.createItemStack())

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

@ -122,7 +122,7 @@ object Items {
register("oc:circuitAdvanced", chip2.createItemStack()) register("oc:circuitAdvanced", chip2.createItemStack())
register("oc:circuitElite", chip3.createItemStack()) register("oc:circuitElite", chip3.createItemStack())
register("oc:craftingTransistor", transistor.createItemStack()) register("oc:craftingTransistor", transistor.createItemStack())
register("oc:craftingControlUnit", cu.createItemStack()) register("oc:craftingCU", cu.createItemStack())
register("oc:craftingALU", alu.createItemStack()) register("oc:craftingALU", alu.createItemStack())
register("oc:craftingCPU", cpu.createItemStack()) register("oc:craftingCPU", cpu.createItemStack())
register("oc:componentCardRedstone", rs.createItemStack()) register("oc:componentCardRedstone", rs.createItemStack())