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

Fixed some recipes not using proper ore dict name. Closes #1399.

Browse Source 
For good, I hope.
This commit is contained in:
Florian Nücke 2015-10-05 23:16:05 +02:00
parent eb5b44f598
commit 816ab0c542
5 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/resources/assets/opencomputers/recipes/default.recipes
View File

@ -183,7 +183,7 @@ redstoneCard1 {
["", "oc:materialCard", ""]]
}
redstoneCard2 {
input: [[blockRedstone, "oc:circuitChip2", enderPearl]
input: [[blockRedstone, "oc:circuitChip2", materialEnderPearl]
["", "oc:materialCard", ""]]
}
lanCard {
@ -191,7 +191,7 @@ lanCard {
["", "oc:materialCard", ""]]
}
wlanCard {
input: [[enderPearl, "oc:circuitChip2", ""]
input: [[materialEnderPearl, "oc:circuitChip2", ""]
["", "oc:materialCard", ""]]
}
linkedCard {
@ -211,9 +211,9 @@ worldSensorCard {
}
angelUpgrade {
input: [[ingotIron, enderPearl, ingotIron]
input: [[ingotIron, materialEnderPearl, ingotIron]
["oc:circuitChip1", pistonStickyBase, "oc:circuitChip1"]
[ingotIron, enderPearl, ingotIron]]
[ingotIron, materialEnderPearl, ingotIron]]
}
batteryUpgrade1 {
input: [[ingotIron, nuggetGold, ingotIron]
@ -231,7 +231,7 @@ batteryUpgrade3 {
[diamond, "oc:capacitor", diamond]]
}
chunkloaderUpgrade {
input: [[ingotGold, glass, ingotGold]
input: [[ingotGold, blockGlass, ingotGold]
["oc:circuitChip3", eyeOfEnder, "oc:circuitChip3"]
[obsidian, "oc:materialCircuitBoardPrinted", obsidian]]
}
@ -306,7 +306,7 @@ signUpgrade {
[ingotIron, pistonStickyBase, ingotIron]]
}
solarGeneratorUpgrade {
input: [[glass, glass, glass]
input: [[blockGlass, blockGlass, blockGlass]
["oc:circuitChip3", blockLapis, "oc:circuitChip3"]
[ingotIron, "oc:materialCircuitBoardPrinted", ingotIron]]
}
@ -391,9 +391,9 @@ chameliumBlock {
["oc:chamelium", "oc:chamelium", "oc:chamelium"]]
}
endstone {
input: [[enderPearl, "oc:chameliumBlock", enderPearl]
["oc:chameliumBlock", enderPearl, "oc:chameliumBlock"]
[enderPearl, "oc:chameliumBlock", enderPearl]]
input: [[materialEnderPearl, "oc:chameliumBlock", materialEnderPearl]
["oc:chameliumBlock", materialEnderPearl, "oc:chameliumBlock"]
[materialEnderPearl, "oc:chameliumBlock", materialEnderPearl]]
output: 4
}
inkCartridgeEmpty {
@ -508,7 +508,7 @@ card {
interweb {
input: [[string, string, string]
[string, enderPearl, string]
[string, materialEnderPearl, string]
[string, string, string]]
}
@ -554,7 +554,7 @@ case3 {
[diamond, "oc:materialCircuitBoardPrinted", diamond]]
}
disassembler {
input: [["oc:materialCU", thinGlass, "oc:analyzer"]
input: [["oc:materialCU", paneGlass, "oc:analyzer"]
[craftingPiston, "", obsidian]
[ingotIron, bucketLava, ingotIron]]
}
@ -569,12 +569,12 @@ geolyzer {
[ingotGold, "oc:materialCircuitBoardPrinted", ingotGold]]
}
hologram1 {
input: [["oc:circuitChip2", thinGlass, "oc:circuitChip2"]
input: [["oc:circuitChip2", paneGlass, "oc:circuitChip2"]
["oc:materialCircuitBoardPrinted", diamond, "oc:materialCircuitBoardPrinted"]
[obsidian, yellowDust, obsidian]]
}
hologram2 {
input: [["oc:circuitChip3", glass, "oc:circuitChip3"]
input: [["oc:circuitChip3", blockGlass, "oc:circuitChip3"]
["oc:materialCircuitBoardPrinted", blockDiamond, "oc:materialCircuitBoardPrinted"]
[obsidian, blazePowder, obsidian]]
}
@ -629,17 +629,17 @@ relay {
}
screen1 {
input: [[ingotIron, redstone, ingotIron]
[redstone, "oc:circuitChip1", glass]
[redstone, "oc:circuitChip1", blockGlass]
[ingotIron, redstone, ingotIron]]
}
screen2 {
input: [[ingotGold, dyeRed, ingotGold]
[dyeGreen, "oc:circuitChip2", glass]
[dyeGreen, "oc:circuitChip2", blockGlass]
[ingotGold, dyeBlue, ingotGold]]
}
screen3 {
input: [[obsidian, yellowDust, obsidian]
[yellowDust, "oc:circuitChip3", glass]
[yellowDust, "oc:circuitChip3", blockGlass]
[obsidian, yellowDust, obsidian]]
}
transposer {

4
src/main/resources/assets/opencomputers/recipes/gregtech.recipes
View File

@ -126,7 +126,7 @@ lanCard {
}
wlanCard {
input: [[screwTitanium , "oc:circuitChip3" , screwTitanium]
[enderPearl, "oc:lanCard", enderPearl]
[materialEnderPearl, "oc:lanCard", materialEnderPearl]
[screwTitanium , craftingToolScrewdriver, screwTitanium]]
}
@ -333,7 +333,7 @@ relay {
}
screen1 {
input: [[plateAluminium, plateAluminium, craftingToolWrench]
[redstone, "oc:materialTransistor", thinGlass]
[redstone, "oc:materialTransistor", paneGlass]
[plateAluminium, plateAluminium, craftingToolScrewdriver]]
}
screen2 {

18
src/main/resources/assets/opencomputers/recipes/hardmode.recipes
View File

@ -109,7 +109,7 @@ redstoneCard1 {
["", "oc:materialCard", ""]]
}
redstoneCard2 {
input: [[blockRedstone, "oc:circuitChip2", enderPearl]
input: [[blockRedstone, "oc:circuitChip2", materialEnderPearl]
["", "oc:redstoneCard1", ""]]
}
lanCard {
@ -117,7 +117,7 @@ lanCard {
["", "oc:materialCard", ""]]
}
wlanCard {
input: [[enderPearl, "oc:circuitChip2", ""]
input: [[materialEnderPearl, "oc:circuitChip2", ""]
["", "oc:lanCard", ""]]
}
linkedCard {
@ -178,7 +178,7 @@ signUpgrade {
[ingotIron, pistonStickyBase, ingotIron]]
}
solarGeneratorUpgrade {
input: [[glass, glass, glass]
input: [[blockGlass, blockGlass, blockGlass]
["oc:circuitChip3", "oc:generatorUpgrade", "oc:circuitChip3"]]
}
@ -291,9 +291,9 @@ card {
}
interweb {
input: [[string, enderPearl, string]
[enderPearl, string, enderPearl]
[string, enderPearl, string]]
input: [[string, materialEnderPearl, string]
[materialEnderPearl, string, materialEnderPearl]
[string, materialEnderPearl, string]]
}
adapter {
@ -372,9 +372,9 @@ relay {
[ingotIron, "oc:materialCircuitBoardPrinted", ingotIron]]
}
screen1 {
input: [[ingotIron, ingotIron, glass]
[redstone, "oc:materialTransistor", glass]
[ingotIron, ingotIron, glass]]
input: [[ingotIron, ingotIron, blockGlass]
[redstone, "oc:materialTransistor", blockGlass]
[ingotIron, ingotIron, blockGlass]]
}
screen2 {
input: [[ingotGold, dyeRed, ingotGold]

4
src/main/resources/assets/opencomputers/recipes/peaceful.recipes
View File

@ -21,7 +21,7 @@ angelUpgrade {
[ingotIron, diamond, ingotIron]]
}
chunkloaderUpgrade {
input: [[ingotGold, glass, ingotGold]
input: [[ingotGold, blockGlass, ingotGold]
["oc:circuitChip3", diamond, "oc:circuitChip3"]
[obsidian, "oc:materialCircuitBoardPrinted", obsidian]]
}
@ -69,7 +69,7 @@ geolyzer {
[ingotGold, "oc:materialCircuitBoardPrinted", ingotGold]]
}
hologram2 {
input: [["oc:circuitChip3", glass, "oc:circuitChip3"]
input: [["oc:circuitChip3", blockGlass, "oc:circuitChip3"]
["oc:materialCircuitBoardPrinted", blockDiamond, "oc:materialCircuitBoardPrinted"]
[obsidian, yellowDust, obsidian]]
}

1
src/main/scala/li/cil/oc/common/Proxy.scala
View File

@ -38,6 +38,7 @@ class Proxy {
OreDictionary.registerOre("craftingPiston", net.minecraft.init.Blocks.piston)
OreDictionary.registerOre("craftingPiston", net.minecraft.init.Blocks.sticky_piston)
OreDictionary.registerOre("torchRedstoneActive", net.minecraft.init.Blocks.redstone_torch)
OreDictionary.registerOre("materialEnderPearl", net.minecraft.init.Items.ender_pearl)
OreDictionary.registerOre("nuggetGold", net.minecraft.init.Items.gold_nugget)
OreDictionary.registerOre("chest", net.minecraft.init.Blocks.chest)
OreDictionary.registerOre("chest", net.minecraft.init.Blocks.ender_chest)