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

changed ore dict entries for oc

Browse Source 
added some gt recipes (WIP)
added Reflection assembly for GT
This commit is contained in:
Johannes Lohrer 2013-12-28 17:02:44 +01:00
parent fefcb44b8b
commit 28bf54a64c
6 changed files with 416 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,92 +3,92 @@
analyzer { analyzer {
input: [["", torchRedstoneActive, ""] input: [["", torchRedstoneActive, ""]
[craftingTransistor, circuitBasic, nuggetGold] ["oc:craftingTransistor", "oc:circuitBasic", nuggetGold]
[craftingTransistor, craftingCircuitBoardAdvanced, nuggetGold]] ["oc:craftingTransistor", "oc:craftingCircuitBoardPrinted", nuggetGold]]
} }
ram1 { ram1 {
input: [[circuitBasic, circuitBasic, circuitBasic] input: [["oc:circuitBasic", "oc:circuitBasic", "oc:circuitBasic"]
[craftingCircuitBoardAdvanced, craftingCircuitBoardAdvanced, craftingCircuitBoardAdvanced]] ["oc:craftingCircuitBoardPrinted", "oc:craftingCircuitBoardPrinted", "oc:craftingCircuitBoardPrinted"]]
} }
ram2 { ram2 {
input: [[circuitAdvanced, circuitAdvanced, circuitAdvanced] input: [["oc:circuitAdvanced", "oc:circuitAdvanced", "oc:circuitAdvanced"]
[craftingRAMBasic, craftingCircuitBoardAdvanced, craftingRAMBasic]] ["oc:craftingRAMBasic", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMBasic"]]
} }
ram3 { ram3 {
input: [[circuitElite, circuitElite, circuitElite] input: [["oc:circuitElite", "oc:circuitElite", "oc:circuitElite"]
[craftingRAMAdvanced, craftingCircuitBoardAdvanced, craftingRAMAdvanced]] ["oc:craftingRAMAdvanced", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMAdvanced"]]
} }
floppy { floppy {
input: [[nuggetIron, lever, nuggetIron] input: [[nuggetIron, lever, nuggetIron]
[craftingCircuitBoardBasic, "oc:craftingDisk", craftingCircuitBoardBasic] ["oc:craftingCircuitBoard", "oc:craftingDisk", "oc:craftingCircuitBoard"]
[nuggetIron, paper, nuggetIron]] [nuggetIron, paper, nuggetIron]]
} }
hdd1 { hdd1 {
input: [[circuitBasic, "oc:craftingDisk", ingotIron] input: [["oc:circuitBasic", "oc:craftingDisk", ingotIron]
[craftingCircuitBoardAdvanced, "oc:craftingDisk", pistonBase] ["oc:craftingCircuitBoardPrinted", "oc:craftingDisk", pistonBase]
[circuitBasic, "oc:craftingDisk", ingotIron]] ["oc:circuitBasic", "oc:craftingDisk", ingotIron]]
} }
hdd2 { hdd2 {
input: [[ingotGold, craftingHDDBasic, ingotGold] input: [[ingotGold, "oc:craftingHDDBasic", ingotGold]
[circuitAdvanced, craftingCircuitBoardAdvanced, circuitAdvanced] ["oc:circuitAdvanced", "oc:craftingCircuitBoardPrinted", "oc:circuitAdvanced"]
[ingotGold, craftingHDDBasic, ingotGold]] [ingotGold, "oc:craftingHDDBasic", ingotGold]]
} }
hdd3 { hdd3 {
input: [[circuitElite, craftingHDDAdvanced, circuitElite] input: [["oc:circuitElite", "oc:craftingHDDAdvanced", "oc:circuitElite"]
[craftingRAMBasic, craftingCircuitBoardAdvanced, craftingRAMBasic] ["oc:craftingRAMBasic", "oc:craftingCircuitBoardPrinted", "oc:craftingRAMBasic"]
[circuitElite, craftingHDDAdvanced, circuitElite]] ["oc:circuitElite", "oc:craftingHDDAdvanced", "oc:circuitElite"]]
} }
graphicsCard1 { graphicsCard1 {
input: [[circuitBasic, craftingALU, craftingRAMBasic] input: [["oc:circuitBasic", "oc:craftingALU", "oc:craftingRAMBasic"]
["", craftingCircuitBoardBasic, ""]] ["", "oc:craftingCircuitBoardPrinted", ""]]
} }
graphicsCard2 { graphicsCard2 {
input: [[circuitAdvanced, circuitAdvanced, craftingRAMAdvanced] input: [["oc:circuitAdvanced", "oc:circuitAdvanced", "oc:craftingRAMAdvanced"]
["", craftingGPUBasic, ""]] ["", "oc:craftingGPUBasic", ""]]
} }
graphicsCard3 { graphicsCard3 {
input: [[circuitElite, circuitElite, craftingRAMElite] input: [["oc:circuitElite", "oc:circuitElite", "oc:craftingRAMElite"]
["", craftingGPUAdvanced, ""]] ["", "oc:craftingGPUAdvanced", ""]]
} }
redstoneCard { redstoneCard {
input: [[torchRedstoneActive, circuitBasic, ""] input: [[torchRedstoneActive, "oc:circuitBasic", ""]
["", craftingCircuitBoardBasic, ""]] ["", "oc:craftingCircuitBoardPrinted", ""]]
} }
lanCard { lanCard {
input: [[craftingWireCopper, circuitBasic, ""] input: [["oc:craftingCable", "oc:circuitBasic", ""]
["", craftingGPUBasic, ""]] ["", "oc:craftingCircuitBoardPrinted", ""]]
} }
wlanCard { wlanCard {
input: [[enderPearl, circuitAdvanced, ""] input: [[enderPearl, "oc:circuitAdvanced", ""]
["", componentCardLan, ""]] ["", componentCardLan, ""]]
} }
craftingUpgrade { craftingUpgrade {
input: [[ingotIron, pistonBase, ingotIron] input: [[ingotIron, pistonBase, ingotIron]
[circuitBasic, workbench, circuitBasic] ["oc:circuitBasic", workbench, "oc:circuitBasic"]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]] [ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]]
} }
generatorUpgrade { generatorUpgrade {
input: [[ingotIron, "", ingotIron] input: [[ingotIron, "", ingotIron]
[circuitBasic, pistonBase, circuitBasic] ["oc:circuitBasic", pistonBase, "oc:circuitBasic"]
[craftingCircuitBoardAdvanced, ingotIron, craftingCircuitBoardAdvanced]] ["oc:craftingCircuitBoardPrinted", ingotIron, "oc:craftingCircuitBoardPrinted"]]
} }
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]]
} }
signUpgrade { signUpgrade {
input: [[ingotIron, dyePowder, ingotIron] input: [[ingotIron, dyePowder, ingotIron]
[circuitAdvanced, stickWood, circuitAdvanced] ["oc:circuitAdvanced", stickWood, "oc:circuitAdvanced"]
[ingotIron, pistonStickyBase, ingotIron]] [ingotIron, pistonStickyBase, ingotIron]]
} }
solarGeneratorUpgrade { solarGeneratorUpgrade {
input: [[glass, glass, glass] input: [[glass, glass, glass]
[circuitAdvanced, "oc:craftingGenerator", circuitAdvanced]] ["oc:circuitAdvanced", "oc:craftingGenerator", "oc:circuitAdvanced"]]
} }
nuggetIron { nuggetIron {
@ -130,32 +130,32 @@ transistor {
} }
chip1 { chip1 {
input: [[nuggetIron, fenceIron, nuggetIron] input: [[nuggetIron, fenceIron, nuggetIron]
[redstone, craftingTransistor, redstone] [redstone, "oc:craftingTransistor", redstone]
[nuggetIron, fenceIron, nuggetIron]] [nuggetIron, fenceIron, nuggetIron]]
} }
chip2 { chip2 {
input: [[nuggetGold, {item=dyePowder, subID=4} , nuggetGold] input: [[nuggetGold, {item=dyePowder, subID=4} , nuggetGold]
[circuitBasic, diamond, circuitBasic] ["oc:circuitBasic", diamond, "oc:circuitBasic"]
[nuggetGold, {item=dyePowder, subID=4}, nuggetGold]] [nuggetGold, {item=dyePowder, subID=4}, nuggetGold]]
} }
chip3 { chip3 {
input: [[yellowDust, comparator, yellowDust] input: [[yellowDust, comparator, yellowDust]
[circuitAdvanced, emerald, circuitAdvanced] ["oc:circuitAdvanced", emerald, "oc:circuitAdvanced"]
[yellowDust, comparator, yellowDust]] [yellowDust, comparator, yellowDust]]
} }
alu { alu {
input: [[diode, torchRedstoneActive, diode] input: [[diode, torchRedstoneActive, diode]
[craftingTransistor, craftingTransistor, craftingTransistor] ["oc:craftingTransistor", "oc:craftingTransistor", "oc:craftingTransistor"]
[nuggetIron, redstone, nuggetIron]] [nuggetIron, redstone, nuggetIron]]
} }
cpu { cpu {
input: [[circuitBasic, redstone, circuitBasic] input: [["oc:circuitBasic", redstone, "oc:circuitBasic"]
[fenceIron, craftingControlUnit, fenceIron] [fenceIron, "oc:craftingCU", fenceIron]
[circuitBasic, craftingALU, circuitBasic]] ["oc:circuitBasic", "oc:craftingALU", "oc:circuitBasic"]]
} }
cu { cu {
input: [[nuggetGold, torchRedstoneActive, nuggetGold] input: [[nuggetGold, torchRedstoneActive, nuggetGold]
[craftingTransistor, clock, craftingTransistor] ["oc:craftingTransistor", clock, "oc:craftingTransistor"]
[nuggetGold, redstone, nuggetGold]] [nuggetGold, redstone, nuggetGold]]
} }
@ -169,18 +169,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, ""]
@ -189,76 +189,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, componentCardRedstone, blockRedstone]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]] [ingotIron, "oc:craftingCircuitBoardPrinted", ingotIron]]
} }
robot { robot {
input: [[craftingMonitorBasic, craftingGPUBasic, craftingDiskDrive] input: [["oc:craftingScreenBasic", "oc:craftingGPUBasic", "oc: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", 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"]]
} }

267
assets/opencomputers/recipes/gregtech.recipes Normal file
View File

@ -0,0 +1,267 @@
# Do not change this file, it is rewritten each time you start the game.
# Instead, use the custom.conf file to edit recipes by redefining them there.
analyzer {
input: [["craftingTransistor", torchRedstoneActive, "craftingTransistor"]
[circuitAdvanced, "item.GT_Scanner", circuitAdvanced]
[screwAluminium, craftingToolScrewdriver, screwAluminium]]
}
ram1 {
type:assembly
input: [circuitBasic, craftingCircuitBoardAdvanced]
number:[3,3]
eu:32
time=250
}
ram2 {
input: [[circuitAdvanced, circuitAdvanced, circuitAdvanced]
[craftingRAMBasic, craftingCircuitBoardAdvanced, craftingRAMBasic]
[Dataorb, craftingToolWrench, Dataorb]]
}
ram3 {
input: [[circuitElite, circuitElite, circuitElite]
[craftingRAMAdvanced, craftingCircuitBoardAdvanced, craftingRAMAdvanced]
[Dataorb, craftingToolWrench, Dataorb]]
}
floppy {
input: [[screwAluminium, lever, screwAluminium]
[craftingCircuitBoardBasic, "oc:craftingDisk", craftingCircuitBoardBasic]
[screwAluminium, craftingToolScrewdriver, screwAluminium]]
}
hdd1 {
input: [[craftingRAMBasic, "oc:craftingDisk", craftingRAMBasic]
[craftingRAMBasic, "oc:craftingDisk", craftingRAMBasic]
[screwAluminium, craftingToolScrewdriver, circuitAdvanced]]
}
hdd2 {
input: [[craftingHDDBasic, craftingCircuitBoardAdvanced , craftingHDDBasic]
[circuitAdvanced, screwTitanium , circuitAdvanced]
[screwTitanium , craftingToolScrewdriver, screwTitanium ]]
}
hdd3 {
input: [[craftingRAMAdvanced, craftingCircuitBoardAdvanced , craftingRAMAdvanced]
[circuitElite , screwTungstenSteel , circuitElite ]
[screwTungstenSteel , craftingToolScrewdriver, screwTungstenSteel ]]
}
redstoneCard {
input: [[screwStainlessSteel , circuitAdvanced , screwStainlessSteel]
["comparator", craftingCircuitBoardAdvanced, diode]
[screwStainlessSteel , craftingToolScrewdriver, screwStainlessSteel]]
}
lanCard {
input: [[screwStainlessSteel , circuitAdvanced , screwStainlessSteel]
[craftingWireCopper, craftingCircuitBoardAdvanced, craftingWireCopper]
[screwStainlessSteel , craftingToolScrewdriver, screwStainlessSteel]]
}
wlanCard {
input: [[screwTitanium , circuitElite , screwTitanium]
[{item="item.GT_Components",subID=84}, componentCardLan, {item="item.GT_Components",subID=82}]
[screwTitanium , craftingToolScrewdriver, screwTitanium]]
}
craftingUpgrade {
input: [[screwStainlessSteel, craftingCircuitBoardAdvanced , screwStainlessSteel]
[circuitAdvanced, {item=tile.BlockMetaID_Machine,subID=16}, circuitAdvanced]
[screwStainlessSteel, craftingToolScrewdriver, screwStainlessSteel]]
}
generatorUpgrade {
input: [[screwStainlessSteel, craftingCircuitBoardAdvanced , screwStainlessSteel]
[circuitAdvanced,craftingGenerator , circuitAdvanced]
[screwStainlessSteel, craftingToolScrewdriver, screwStainlessSteel]]
}
#todo
#navigationUpgrade {
# input: [[ingotGold, compass, ingotGold]
# [circuitElite, {item=map, subID=32767}, circuitElite]
# [ingotGold, potion, ingotGold]]
#}
#todo
#signUpgrade {
# input: [[ingotIron, dyePowder, ingotIron]
# [circuitAdvanced, stickWood, circuitAdvanced]
# [ingotIron, pistonStickyBase, ingotIron]]
#}
#todo
#solarGeneratorUpgrade {
# input: [[glass, glass, glass]
# [circuitAdvanced, "oc:craftingGenerator", circuitAdvanced]]
#}
cuttingWire {
input: [[stickWood, ingotTin, stickWood]
["", craftingToolWireCutter, ""]]
}
acid {
type: shapeless
input: [bucketWater, dustEmerald, fermentedSpiderEye, slimeball]
output=16
}
disk {
input: [["", plateAluminium, ""]
[plateAluminium, "", plateAluminium]
["", plateAluminium, ""]]
}
transistor {
type:assembly
input: [redstone, plateIron]
number:[1,2]
eu:16
time=500
output=4
}
chip1 {
type:assembly
input: [itemPartCircuit, {item=oc:item,subID=23}]
number:[1,4]
eu:25
time=480
output=4
}
chip2 {
type:assembly
input: [itemPartCircuitAdv, {item=oc:item,subID=23}]
number:[1,8]
eu:25
time=640
output=4
}
chip3 {
type:assembly
input: [{item=Components,subID=1}, {item=oc:item,subID=23}]
number:[1,16]
eu:25
time=800
output=4
}
alu {
type:assembly
input: [comparator, {item=oc:item,subID=24}]
number:[3,1]
eu:24
time=500
output=1
}
############
cpu {
input: [[circuitAdvanced, {item=oc:item,subID=24}, circuitBasic]
[plateAluminium, craftingControlUnit, plateAluminium]
[screwAluminium, craftingALU, screwAluminium]]
}
cu {
input: [[nuggetGold, torchRedstoneActive, nuggetGold]
[craftingTransistor, clock, craftingTransistor]
[nuggetGold, redstone, nuggetGold]]
}
rawCircuitBoard {
type: shapeless
input: ["oc:craftingWire", clay, {item=dyePowder, subID=2}]
}
circuitBoard {
type: furnace
input: "oc:craftingCircuitBoardRaw"
}
printedCircuitBoard {
type: shapeless
input: [craftingCircuitBoardBasic, nuggetGold, "oc:craftingAcid"]
}
card {
input: [[nuggetIron, circuitBasic, craftingTransistor]
[nuggetIron, craftingCircuitBoardAdvanced, craftingCircuitBoardAdvanced]
[nuggetIron, nuggetGold, nuggetGold]]
}
adapter {
input: [[ingotIron, craftingWireCopper, ingotIron]
[craftingWireCopper, circuitBasic, craftingWireCopper]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]]
}
cable {
input: [["", nuggetIron, ""]
[nuggetIron, redstone, nuggetIron]
["", nuggetIron, ""]]
output: 4
}
capacitor {
input: [[ingotIron, craftingTransistor, ingotIron]
[nuggetGold, paper, nuggetGold]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]]
}
charger {
input: [[ingotIron, ingotGold, ingotIron]
[craftingCapacitor, circuitAdvanced, craftingCapacitor]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]]
}
case1 {
input: [[ingotIron, craftingCircuitBoardAdvanced, ingotIron]
[fenceIron, craftingCPU, fenceIron]
[ingotIron, circuitBasic, ingotIron]]
}
case2 {
input: [[ingotGold, craftingCircuitBoardAdvanced, ingotGold]
[circuitAdvanced, craftingRawMachineBasic, circuitAdvanced]
[ingotGold, circuitAdvanced, ingotGold]]
}
case3 {
input: [[circuitElite, craftingCircuitBoardAdvanced, circuitElite]
[diamond, craftingRawMachineAdvanced, diamond]
[circuitElite, craftingCircuitBoardAdvanced, circuitElite]]
}
diskDrive {
input: [[ingotIron, circuitBasic, ingotIron]
[pistonBase, stickWood, ""]
[ingotIron, circuitBasic, ingotIron]]
}
keyboard {
input: [["oc:craftingButtonGroup", "oc:craftingButtonGroup", "oc:craftingButtonGroup"]
["oc:craftingButtonGroup", "oc:craftingArrowKey", "oc:craftingNumPad"]]
}
powerConverter {
input: [[ingotIron, craftingWireCopper, ingotIron]
[ingotGold, circuitBasic, ingotGold]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]]
}
powerDistributor {
input: [[ingotIron, ingotGold, ingotIron]
[craftingWireCopper, circuitBasic, craftingWireCopper]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]]
}
redstone {
input: [[ingotIron, blockRedstone, ingotIron]
[blockRedstone, componentCardRedstone, blockRedstone]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]]
}
robot {
input: [[craftingMonitorBasic, craftingGPUBasic, craftingDiskDrive]
[dispenser, craftingRawMachineBasic, craftingRAMBasic]
[craftingCapacitor, minecartHopper, craftingCapacitor]]
}
router {
input: [[ingotIron, craftingWireCopper, ingotIron]
[craftingWireCopper, componentCardLan, craftingWireCopper]
[ingotIron, craftingCircuitBoardAdvanced, ingotIron]]
}
screen1 {
input: [[ingotIron, ingotIron, glass]
[redstone, craftingTransistor, glass]
[ingotIron, ingotIron, glass]]
}
screen2 {
input: [[ingotGold, {item=dyePowder, subID=1}, ingotGold]
[circuitAdvanced, {item=dyePowder, subID=2}, craftingMonitorBasic]
[ingotGold, {item=dyePowder, subID=4}, ingotGold]]
}
screen3 {
input: [[obsidian, craftingCircuitBoardAdvanced, circuitElite]
[blazeRod, netherquartz, craftingMonitorAdvanced]
[obsidian, craftingCircuitBoardAdvanced, circuitElite]]
}

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

@ -76,16 +76,15 @@ object Blocks {
redstone = new Redstone(blockSimpleWithRedstone) redstone = new Redstone(blockSimpleWithRedstone)
register("craftingWireCopper", cable.createItemStack()) register("oc:craftingWireCopper", cable.createItemStack())
register("craftingCapacitor", capacitor.createItemStack()) register("oc:craftingCapacitor", capacitor.createItemStack())
register("craftingRawMachineBasic", case1.createItemStack()) register("oc:craftingCaseBasic", case1.createItemStack())
register("craftingRawMachineAdvanced", case2.createItemStack()) register("oc:craftingCaseAdvanced", case2.createItemStack())
register("craftingRawMachineElite", case3.createItemStack()) register("oc:craftingCaseElite", case3.createItemStack())
register("craftingDiskDrive", diskDrive.createItemStack()) register("oc:craftingDiskDrive", diskDrive.createItemStack())
register("craftingMonitorBasic", screen1.createItemStack()) register("oc:craftingScreenBasic", screen1.createItemStack())
register("craftingMonitorAdvanced", screen2.createItemStack()) register("oc:craftingScreenAdvanced", screen2.createItemStack())
register("craftingMonitorElite", screen3.createItemStack()) register("oc:craftingScreenElite", screen3.createItemStack())
register("torchRedstoneActive", new ItemStack(Block.torchRedstoneActive, 1, 0)) register("torchRedstoneActive", new ItemStack(Block.torchRedstoneActive, 1, 0))
} }

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

@ -115,27 +115,27 @@ object Items {
registerExclusive("nuggetIron", ironNugget.createItemStack()) registerExclusive("nuggetIron", ironNugget.createItemStack())
register("oc:craftingCircuitBoardRaw", rawCircuitBoard.createItemStack()) register("oc:craftingCircuitBoardRaw", rawCircuitBoard.createItemStack())
register("craftingCircuitBoardBasic", circuitBoard.createItemStack()) register("oc:craftingCircuitBoard", circuitBoard.createItemStack())
register("craftingCircuitBoardAdvanced", pcb.createItemStack()) register("oc:craftingCircuitBoardPrinted", pcb.createItemStack())
register("oc:craftingWire", cuttingWire.createItemStack()) register("oc:craftingWire", cuttingWire.createItemStack())
register("circuitBasic", chip1.createItemStack()) register("oc:circuitBasic", chip1.createItemStack())
register("circuitAdvanced", chip2.createItemStack()) register("oc:circuitAdvanced", chip2.createItemStack())
register("circuitElite", chip3.createItemStack()) register("oc:circuitElite", chip3.createItemStack())
register("craftingTransistor", transistor.createItemStack()) register("oc:craftingTransistor", transistor.createItemStack())
register("craftingControlUnit", cu.createItemStack()) register("oc:craftingControlUnit", cu.createItemStack())
register("craftingALU", alu.createItemStack()) register("oc:craftingALU", alu.createItemStack())
register("craftingCPU", cpu.createItemStack()) register("oc:craftingCPU", cpu.createItemStack())
register("componentCardRedstone", rs.createItemStack()) register("oc:componentCardRedstone", rs.createItemStack())
register("componentCardLan", lan.createItemStack()) register("oc:componentCardLan", lan.createItemStack())
register("craftingGPUBasic", gpu1.createItemStack()) register("oc:craftingGPUBasic", gpu1.createItemStack())
register("craftingGPUAdvanced", gpu2.createItemStack()) register("oc:craftingGPUAdvanced", gpu2.createItemStack())
register("craftingGPUElite", gpu3.createItemStack()) register("oc:craftingGPUElite", gpu3.createItemStack())
register("craftingRAMBasic", ram1.createItemStack()) register("oc:craftingRAMBasic", ram1.createItemStack())
register("craftingRAMAdvanced", ram2.createItemStack()) register("oc:craftingRAMAdvanced", ram2.createItemStack())
register("craftingRAMElite", ram3.createItemStack()) register("oc:craftingRAMElite", ram3.createItemStack())
register("craftingHDDBasic", hdd1.createItemStack()) register("oc:craftingHDDBasic", hdd1.createItemStack())
register("craftingHDDAdvanced", hdd2.createItemStack()) register("oc:craftingHDDAdvanced", hdd2.createItemStack())
register("craftingHDDElite", hdd3.createItemStack()) register("oc:craftingHDDElite", hdd3.createItemStack())
register("oc:craftingButtonGroup", buttonGroup.createItemStack()) register("oc:craftingButtonGroup", buttonGroup.createItemStack())
register("oc:craftingArrowKey", arrowKeys.createItemStack()) register("oc:craftingArrowKey", arrowKeys.createItemStack())
register("oc:craftingNumPad", numPad.createItemStack()) register("oc:craftingNumPad", numPad.createItemStack())

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

@ -13,15 +13,18 @@ import org.apache.commons.io.FileUtils
import scala.Some import scala.Some
import scala.collection.convert.wrapAsScala._ import scala.collection.convert.wrapAsScala._
import scala.collection.mutable.ArrayBuffer import scala.collection.mutable.ArrayBuffer
import li.cil.oc.util.mods.GregTech
object Recipes { object Recipes {
def init() { def init() {
try { try {
val defaultRecipes = new File(Loader.instance.getConfigDir + File.separator + "opencomputers" + File.separator + "default.recipes") val defaultRecipes = new File(Loader.instance.getConfigDir + File.separator + "opencomputers" + File.separator + "default.recipes")
val gregTechRecipes = new File(Loader.instance.getConfigDir + File.separator + "opencomputers" + File.separator + "gregtech.recipes")
val userRecipes = new File(Loader.instance.getConfigDir + File.separator + "opencomputers" + File.separator + "user.recipes") val userRecipes = new File(Loader.instance.getConfigDir + File.separator + "opencomputers" + File.separator + "user.recipes")
defaultRecipes.getParentFile.mkdirs() defaultRecipes.getParentFile.mkdirs()
FileUtils.copyURLToFile(getClass.getResource("/assets/opencomputers/recipes/default.recipes"), defaultRecipes) FileUtils.copyURLToFile(getClass.getResource("/assets/opencomputers/recipes/default.recipes"), defaultRecipes)
FileUtils.copyURLToFile(getClass.getResource("/assets/opencomputers/recipes/gregtech.recipes"), gregTechRecipes)
if (!userRecipes.exists()) { if (!userRecipes.exists()) {
FileUtils.copyURLToFile(getClass.getResource("/assets/opencomputers/recipes/user.recipes"), userRecipes) FileUtils.copyURLToFile(getClass.getResource("/assets/opencomputers/recipes/user.recipes"), userRecipes)
} }
@ -246,7 +249,7 @@ object Recipes {
} }
} }
} }
case _ => throw new RecipeException("Invalid ingredient type (not a map or string).") case _ => throw new RecipeException("Invalid ingredient type (not a map or string): ")
} }
private def itemNameEquals(item: Item, name: String) = private def itemNameEquals(item: Item, name: String) =

34
li/cil/oc/util/mods/GregTech.scala Normal file
View File

@ -0,0 +1,34 @@
package li.cil.oc.util.mods
import net.minecraft.item.ItemStack
object GregTech {
private val (sRecipeAdder, addAssemblerRecipe)=try{
val api = Class.forName("gregtechmod.api.GregTech_API")
for(meth<-api.getMethods){
println(meth)
}
val iRecipe = Class.forName("gregtechmod.api.interfaces.IGT_RecipeAdder")
val adder = api.getField("sRecipeAdder").get(null)
val addAssemb = iRecipe.getMethods.find(_.getName == "addAssemblerRecipe")
(Option(adder),addAssemb)
} catch {
case e: Throwable =>{
e.printStackTrace()
(None, null)
}
}
def available = sRecipeAdder.isDefined
def addAssemblerRecipe (input1: ItemStack, input2: ItemStack, output: ItemStack, duration: Int, eut: Int){
(sRecipeAdder,addAssemblerRecipe) match{
case (Some(adder),Some(recipe))=>recipe.invoke(adder,input1,input2,output,duration:java.lang.Integer,eut:java.lang.Integer)
case _=>
}
}
}