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

Taking into account ISidedInventory.getAccessibleSlotsFromSide in InventoryUtils, because some inventories are... special.

Browse Source 
E.g. AgriCraft's Analyzer has getInventorySize = 2, but there are no slots 0 and 1, only slots 36 and 37 (or so; anyway, something way out of the range of to be expected valid indices).
This commit is contained in:
Florian Nücke 2015-08-29 15:55:38 +02:00
parent 83ce705a99
commit 931a04c61b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/scala/li/cil/oc/util/InventoryUtils.scala
View File

@ -155,7 +155,10 @@ object InventoryUtils {
(stack != null && limit > 0) && { (stack != null && limit > 0) && {
var success = false var success = false
var remaining = limit var remaining = limit
val range = slots.getOrElse(0 until inventory.getSizeInventory) val range = slots.getOrElse(inventory match {
case sided: ISidedInventory => sided.getAccessibleSlotsFromSide(side.getOrElse(ForgeDirection.UNKNOWN).ordinal).toIterable
case _ => 0 until inventory.getSizeInventory
})
if (range.nonEmpty) { if (range.nonEmpty) {
// This is a special case for inserting with an explicit ordering, // This is a special case for inserting with an explicit ordering,
@ -204,8 +207,13 @@ object InventoryUtils {
* <p/> * <p/>
* This returns <tt>true</tt> if at least one item was extracted. * This returns <tt>true</tt> if at least one item was extracted.
*/ */
def extractFromInventory(consumer: (ItemStack) => Unit, inventory: IInventory, side: ForgeDirection, limit: Int = 64) = def extractFromInventory(consumer: (ItemStack) => Unit, inventory: IInventory, side: ForgeDirection, limit: Int = 64) = {
(0 until inventory.getSizeInventory).exists(slot => extractFromInventorySlot(consumer, inventory, side, slot, limit)) val range = inventory match {
case sided: ISidedInventory => sided.getAccessibleSlotsFromSide(side.ordinal).toIterable
case _ => 0 until inventory.getSizeInventory
}
range.exists(slot => extractFromInventorySlot(consumer, inventory, side, slot, limit))
}
/** /**
* Utility method for calling <tt>insertIntoInventory</tt> on an inventory * Utility method for calling <tt>insertIntoInventory</tt> on an inventory