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

Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8

Browse Source
This commit is contained in:
Florian Nücke 2015-03-16 00:02:01 +01:00
commit b6d88b4eac
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/common/init/Items.scala
View File

@ -127,7 +127,7 @@ object Items extends ItemAPI {
val code = new Array[Byte](4 * 1024)
val count = OpenComputers.getClass.getResourceAsStream(Settings.scriptPath + "bios.lua").read(code)
data.setByteArray(Settings.namespace + "eeprom", code.take(count))
data.setString(Settings.namespace + "label", "Lua BIOS")
data.setString(Settings.namespace + "label", "EEPROM (Lua BIOS)")
val nbt = new NBTTagCompound()
nbt.setTag(Settings.namespace + "data", data)

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

@ -131,12 +131,14 @@ private[oc] object Registry extends api.detail.DriverAPI {
case arg: Array[_] => convertList(arg, arg.zipWithIndex.iterator, memo)
case arg: Product => convertList(arg, arg.productIterator.zipWithIndex, memo)
case arg: Seq[_] => convertList(arg, arg.zipWithIndex.iterator, memo)
case arg: java.lang.Iterable[_] => convertList(arg, arg.zipWithIndex.iterator, memo)
case arg: Map[_, _] => convertMap(arg, arg, memo)
case arg: mutable.Map[_, _] => convertMap(arg, arg.toMap, memo)
case arg: java.util.Map[_, _] => convertMap(arg, arg.toMap, memo)
case arg: Iterable[_] => convertList(arg, arg.zipWithIndex.toIterator, memo)
case arg: java.lang.Iterable[_] => convertList(arg, arg.zipWithIndex.iterator, memo)
case arg =>
val converted = new util.HashMap[AnyRef, AnyRef]()
memo += arg -> converted