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

inlined getOreNameOrItemStackFromName

Browse Source
This commit is contained in:
Florian Nücke 2013-12-25 00:55:07 +01:00
parent 76cec04771
commit 98832e18f8
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,11 +211,7 @@ object Recipes {
} }
} }
else throw new RecipeException("Invalid ingredient type (no oreDict, item or block entry).") else throw new RecipeException("Invalid ingredient type (no oreDict, item or block entry).")
case name: String => getOreNameOrItemStackFromName(name) case name: String =>
case _ => throw new RecipeException("Invalid ingredient type (not a map or string).")
}
private def getOreNameOrItemStackFromName(name: String) =
if (name == null || name.trim.isEmpty) null if (name == null || name.trim.isEmpty) null
else if (OreDictionary.getOres(name) != null && !OreDictionary.getOres(name).isEmpty) name else if (OreDictionary.getOres(name) != null && !OreDictionary.getOres(name).isEmpty) name
else { else {
@ -227,6 +223,8 @@ object Recipes {
} }
} }
} }
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) =
item != null && (item.getUnlocalizedName == name || item.getUnlocalizedName == "item." + name) item != null && (item.getUnlocalizedName == name || item.getUnlocalizedName == "item." + name)