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

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

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

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

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

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

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

@ -21,7 +21,7 @@ angelUpgrade {
[ingotIron, diamond, ingotIron]] [ingotIron, diamond, ingotIron]]
} }
chunkloaderUpgrade { chunkloaderUpgrade {
input: [[ingotGold, glass, ingotGold] input: [[ingotGold, blockGlass, ingotGold]
["oc:circuitChip3", diamond, "oc:circuitChip3"] ["oc:circuitChip3", diamond, "oc:circuitChip3"]
[obsidian, "oc:materialCircuitBoardPrinted", obsidian]] [obsidian, "oc:materialCircuitBoardPrinted", obsidian]]
} }
@ -69,7 +69,7 @@ geolyzer {
[ingotGold, "oc:materialCircuitBoardPrinted", ingotGold]] [ingotGold, "oc:materialCircuitBoardPrinted", ingotGold]]
} }
hologram2 { hologram2 {
input: [["oc:circuitChip3", glass, "oc:circuitChip3"] input: [["oc:circuitChip3", blockGlass, "oc:circuitChip3"]
["oc:materialCircuitBoardPrinted", blockDiamond, "oc:materialCircuitBoardPrinted"] ["oc:materialCircuitBoardPrinted", blockDiamond, "oc:materialCircuitBoardPrinted"]
[obsidian, yellowDust, obsidian]] [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.piston)
OreDictionary.registerOre("craftingPiston", net.minecraft.init.Blocks.sticky_piston) OreDictionary.registerOre("craftingPiston", net.minecraft.init.Blocks.sticky_piston)
OreDictionary.registerOre("torchRedstoneActive", net.minecraft.init.Blocks.redstone_torch) 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("nuggetGold", net.minecraft.init.Items.gold_nugget)
OreDictionary.registerOre("chest", net.minecraft.init.Blocks.chest) OreDictionary.registerOre("chest", net.minecraft.init.Blocks.chest)
OreDictionary.registerOre("chest", net.minecraft.init.Blocks.ender_chest) OreDictionary.registerOre("chest", net.minecraft.init.Blocks.ender_chest)