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

Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7

Browse Source
This commit is contained in:
Florian Nücke 2014-03-17 09:03:39 +01:00
commit 678424ee09
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/li/cil/oc/server/driver/Registry.scala
View File

@ -6,6 +6,7 @@ import li.cil.oc.api.driver.Converter
import li.cil.oc.{OpenComputers, api} import li.cil.oc.{OpenComputers, api}
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.minecraft.world.World import net.minecraft.world.World
import scala.collection.convert.WrapAsScala._
import scala.collection.mutable.ArrayBuffer import scala.collection.mutable.ArrayBuffer
/** /**
@ -90,6 +91,9 @@ private[oc] object Registry extends api.detail.DriverAPI {
case arg: Map[_, _] => arg.map { case arg: Map[_, _] => arg.map {
case (key: AnyRef, value: AnyRef) => convertRecursively(key) -> convertRecursively(value) case (key: AnyRef, value: AnyRef) => convertRecursively(key) -> convertRecursively(value)
} }
case arg: java.util.Map[_, _] => arg.map {
case (key: AnyRef, value: AnyRef) => convertRecursively(key) -> convertRecursively(value)
}
case arg => case arg =>
val result = new util.HashMap[AnyRef, AnyRef]() val result = new util.HashMap[AnyRef, AnyRef]()