AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 10:51:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

allowing subID value 'any' as wildcard (instead of the actual number that is the wildcard)

Browse Source
This commit is contained in:
Florian Nücke 2013-12-28 17:22:03 +01:00
parent d1cbe2c2b2
commit 1c0a03ab65
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@ generatorUpgrade {
}
navigationUpgrade {
input: [[ingotGold, compass, ingotGold]
["oc:circuitElite", {item=map, subID=32767}, "oc:circuitElite"]
["oc:circuitElite", {item=map, subID=any}, "oc:circuitElite"]
[ingotGold, potion, ingotGold]]
}
signUpgrade {

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

@ -264,6 +264,7 @@ object Recipes {
private def tryGetId(ingredient: java.util.HashMap[String, _]): Int =
if (ingredient.contains("subID")) ingredient.get("subID") match {
case id: Number => id.intValue
case "any" => 32767
case id: String => Integer.valueOf(id)
case _ => 0
} else 0