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

Merge branch 'master-MC1.8.9' into master-MC1.9.4

Browse Source
This commit is contained in:
Vexatos 2017-05-11 20:34:55 +02:00
commit e596e61783
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/li/cil/oc/integration/jei/CallbackDocHandler.scala
View File

@ -30,7 +30,7 @@ object CallbackDocHandler {
private val VexPattern = """(?s)^function(\(.*?\).*?); (.*)$""".r private val VexPattern = """(?s)^function(\(.*?\).*?); (.*)$""".r
def getRecipes(registry: IModRegistry): util.List[_] = registry.getItemRegistry.getItemList.collect { def getRecipes(registry: IModRegistry): util.List[CallbackDocRecipe] = registry.getItemRegistry.getItemList.collect {
case stack: ItemStack => case stack: ItemStack =>
val callbacks = api.Driver.environmentsFor(stack).flatMap(getCallbacks).toBuffer val callbacks = api.Driver.environmentsFor(stack).flatMap(getCallbacks).toBuffer
@ -67,9 +67,7 @@ object CallbackDocHandler {
Option(pages.map(page => new CallbackDocRecipe(stack, page))) Option(pages.map(page => new CallbackDocRecipe(stack, page)))
} }
else None else None
}.collect { }.flatten.flatten.toList
case Some(handler) => handler
}.flatten.toList
private def getCallbacks(env: Class[_]) = if (env != null) { private def getCallbacks(env: Class[_]) = if (env != null) {

8
src/main/scala/li/cil/oc/integration/jei/ManualUsageHandler.scala
View File

@ -21,12 +21,12 @@ import scala.collection.convert.WrapAsScala._
object ManualUsageHandler { object ManualUsageHandler {
def getRecipes(registry: IModRegistry): util.List[_] = registry.getItemRegistry.getItemList.collect { def getRecipes(registry: IModRegistry): util.List[ManualUsageRecipe] = registry.getItemRegistry.getItemList.collect {
case stack: ItemStack => api.Manual.pathFor(stack) match { case stack: ItemStack => api.Manual.pathFor(stack) match {
case s: String => new ManualUsageRecipe(stack, s) case s: String => Option(new ManualUsageRecipe(stack, s))
case _ => case _ => None
}
} }
}.flatten.toList
object ManualUsageRecipeHandler extends IRecipeHandler[ManualUsageRecipe] { object ManualUsageRecipeHandler extends IRecipeHandler[ManualUsageRecipe] {
override def getRecipeWrapper(recipe: ManualUsageRecipe) = recipe override def getRecipeWrapper(recipe: ManualUsageRecipe) = recipe