fix(appeng): use long instead of int for item sizes (#183)

Author: hinyb

src/main/scala/li/cil/oc/integration/appeng/AEStackFactory.scala

@@ -3,6 +3,7 @@ package li.cil.oc.integration.appeng
 import appeng.api.storage.data.{IAEStack, IAEStackType}
 import appeng.util.item.{AEFluidStack, AEItemStack}
 import li.cil.oc.api.driver.Converter
+import li.cil.oc.integration.util.MapUtils.MapWrapper
 import li.cil.oc.integration.vanilla.{ConverterFluidStack, ConverterItemStack}
 
 import java.util
@@ -24,22 +25,32 @@ object AEStackFactory {
 
   def parse[T <: IAEStack[T]](map: util.Map[_, _])(implicit tag: ClassTag[T]): T = {
     classRegistry.get(tag.runtimeClass) match {
-      case Some(entry) => entry.parser(map).asInstanceOf[T]
+      case Some(entry) =>
+        val result = entry.parser(map).asInstanceOf[T]
+        result.setStackSize(map.getLong("size").get)
+        result
       case None => throw new UnregisteredAETypeException(s"Type ${tag.runtimeClass} hasn't been registered");
     }
   }
 
   def parse(key: String, map: util.Map[_, _]): IAEStack[_] = {
     idRegistry.get(key) match {
-      case Some(entry) => entry.parser(map)
+      case Some(entry) =>
+        val result = entry.parser(map)
+        result.setStackSize(map.getLong("size").get)
+        result
       case None => throw new UnregisteredAETypeException(s"Type $key hasn't been registered");
     }
   }
 
   def convert(stack: IAEStack[_], map: util.Map[AnyRef, AnyRef]): Unit = {
-    classRegistry.get(stack.getClass) match {
-      case Some(entry) => entry.converter(stack, map)
-      case None => throw new UnregisteredAETypeException(s"Type ${stack.getClass} hasn't been registered");
+    val id = stack.getStackType.getId
+    idRegistry.get(id) match {
+      case Some(entry) =>
+        entry.converter(stack, map)
+        map.put("size", Long.box(stack.getStackSize))
+        map.put("isCraftable", Boolean.box(stack.isCraftable))
+      case None => throw new UnregisteredAETypeException(s"Type ${id} hasn't been registered");
     }
   }
 

src/main/scala/li/cil/oc/integration/appeng/ModAppEng.scala

@@ -37,8 +37,7 @@ object ModAppEng extends ModProxy {
     Driver.add(DriverBlockInterface)
     Driver.add(DriverUpgradeAE)
 
-    Driver.add(ConverterAEItemStack)
-    Driver.add(ConverterAEFluidStack)
+    Driver.add(ConverterAEStack)
     Driver.add(new ConverterCellInventory)
     Driver.add(ConverterDimensionalCoord)
     Driver.add(ConverterPattern)

src/main/scala/li/cil/oc/integration/appeng/NetworkControl.scala

@@ -26,11 +26,10 @@ import li.cil.oc.integration.ae2fc.Ae2FcUtil
 import li.cil.oc.integration.appeng.NetworkControl._
 import li.cil.oc.integration.appeng.internal.SubscriptionBase
 import li.cil.oc.integration.ec.ECUtil
-import li.cil.oc.server.driver.Registry
-import li.cil.oc.util.{AE2Bridge, DatabaseAccess}
 import li.cil.oc.util.ExtendedArguments._
 import li.cil.oc.util.ExtendedNBT._
 import li.cil.oc.util.ResultWrapper._
+import li.cil.oc.util.{AE2Bridge, DatabaseAccess}
 import net.minecraft.item.{Item, ItemStack}
 import net.minecraft.nbt.{JsonToNBT, NBTTagCompound}
 import net.minecraft.tileentity.TileEntity
@@ -189,7 +188,7 @@ trait NetworkControl[AETile >: Null <: TileEntity with IGridProxyable with IActi
     }
     DatabaseAccess.withDatabase(node, args.checkString(1), database => {
       val items = allItems
-        .collect { case aeItem if matches(convert(aeItem, tile), filter) => aePotential(aeItem, tile) }.toArray
+        .collect { case aeItem if matches(convert(aeItem, tile), filter) => aeItem }.toArray
       val offset = args.optSlot(database.data, 2, 0)
       val count = args.optInteger(3, Int.MaxValue) min (database.size - offset) min items.length
       var slot = offset
@@ -641,32 +640,28 @@ object NetworkControl extends AETypes {
     }
   }
 
-  private def aePotential(aeItem: AEStack, tile: TileEntity with IGridProxyable): AEStack = {
-    if (aeItem.getStackSize > 0 || !aeItem.isCraftable)
-      aeItem
-    else
-      asCraft(aeItem, tile)
-  }
-
-  private def hashConvert(value: java.util.HashMap[_, _]) = {
-    val hash = new java.util.HashMap[String, AnyRef]
-    value.collect { case (k: String, v: AnyRef) => hash += k -> v }
+  private def hashConvert(value: java.util.HashMap[AnyRef, AnyRef]) = {
+    val hash = new java.util.HashMap[String, AnyRef](((value.size() + 1) / 0.75).toInt)
+    val it = value.entrySet().iterator()
+    while (it.hasNext) {
+      val entry = it.next()
+      val k = entry.getKey
+      val v = entry.getValue
+      k match {
+        case str: String =>
+          hash.put(str, v)
+        case _ =>
+      }
+    }
     hash
   }
 
   def convert(aeItem: AEStack, tile: TileEntity with IGridProxyable): java.util.HashMap[String, AnyRef] = {
-    val potentialItem = aePotential(aeItem, tile)
-    val result = Registry.convert(Array[AnyRef](potentialItem))
-      .collect { case hash: java.util.HashMap[_, _] => hashConvert(hash) }
-    if (result.length > 0) {
-      val hash = result(0)
-      // it would have been nice to put these fields in a registry convert
-      // but the potential ae item needs the tile and position data
-      hash.update("size", Long.box(aeItem.getStackSize))
-      hash.update("isCraftable", Boolean.box(aeItem.isCraftable))
-      return hash
+    val converted = new java.util.HashMap[AnyRef, AnyRef]()
+    try AEStackFactory.convert(aeItem, converted) catch {
+      case t: Throwable => OpenComputers.log.warn("Type converter threw an exception.", t)
     }
-    null
+    hashConvert(converted)
   }
 
   private def loadController(nbt: NBTTagCompound, f: TileEntity with IGridProxyable with IActionHost => Unit): Unit = {

src/main/scala/li/cil/oc/integration/thaumicenergistics/ModThaumicEnergistics.scala

@@ -11,7 +11,6 @@ object ModThaumicEnergistics extends ModProxy {
   override def initialize(): Unit = {
     AEStackFactory.register[AEEssentiaStack](AEEssentiaStackType.ESSENTIA_STACK_TYPE, ConvertAEEssentiaStack.convert, ConvertAEEssentiaStack.parse)
 
-    Driver.add(ConvertAEEssentiaStack)
     Driver.add(DriverController)
     Driver.add(DriverBlockInterface)
     Driver.add(DriverEssentiaExportBus)