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

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

Browse Source
This commit is contained in:
Florian Nücke 2014-06-02 13:17:31 +02:00
commit 00ad80382d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/li/cil/oc/common/tileentity/Robot.scala
View File

@ -46,7 +46,9 @@ class Robot(val isRemote: Boolean) extends traits.Computer with traits.PowerInfo
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
val actualInventorySize = 83 val actualInventorySize = 86
def maxInventorySize = actualInventorySize - 1 - containerCount - componentCount
var inventorySize = -1 var inventorySize = -1
@ -526,7 +528,7 @@ class Robot(val isRemote: Boolean) extends traits.Computer with traits.PowerInfo
override def hasRedstoneCard = (containerSlots ++ componentSlots).exists(slot => Option(getStackInSlot(slot)).fold(false)(driver.item.RedstoneCard.worksWith)) override def hasRedstoneCard = (containerSlots ++ componentSlots).exists(slot => Option(getStackInSlot(slot)).fold(false)(driver.item.RedstoneCard.worksWith))
private def computeInventorySize() = math.min(64, (containerSlots ++ componentSlots).foldLeft(0)((acc, slot) => acc + (Option(getStackInSlot(slot)) match { private def computeInventorySize() = math.min(maxInventorySize, (containerSlots ++ componentSlots).foldLeft(0)((acc, slot) => acc + (Option(getStackInSlot(slot)) match {
case Some(stack) => Option(Driver.driverFor(stack)) match { case Some(stack) => Option(Driver.driverFor(stack)) match {
case Some(driver: api.driver.Inventory) => driver.inventoryCapacity(stack) case Some(driver: api.driver.Inventory) => driver.inventoryCapacity(stack)
case _ => 0 case _ => 0