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' into master-MC1.10

Browse Source 
# Conflicts:
#	src/main/scala/li/cil/oc/server/component/Trade.scala
#	src/main/scala/li/cil/oc/util/InventoryUtils.scala
This commit is contained in:
payonel 2018-09-22 21:21:48 -07:00
commit 10c13e5ec1
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/li/cil/oc/server/component/Trade.scala
View File

@ -74,7 +74,7 @@ class Trade(val info: TradeInfo) extends AbstractValue {
val secondInputStack = if (recipe.hasSecondItemToBuy) Option(recipe.getSecondItemToBuy) else None
def containsAccumulativeItemStack(stack: ItemStack) =
InventoryUtils.extractFromInventory(stack, inventory, null, simulate = true).stackSize == 0
InventoryUtils.extractFromInventory(stack, inventory, null, simulate = true, exact = false).stackSize == 0
def hasRoomForItemStack(stack: ItemStack) = {
val remainder = stack.copy()
InventoryUtils.insertIntoInventory(remainder, InventoryUtils.asItemHandler(inventory), remainder.stackSize, simulate = true)
@ -87,8 +87,8 @@ class Trade(val info: TradeInfo) extends AbstractValue {
val outputStack = recipe.getItemToSell.copy()
if (hasRoomForItemStack(outputStack)) {
// We established that out inventory allows to perform the trade, now actually do the trade.
InventoryUtils.extractFromInventory(firstInputStack, InventoryUtils.asItemHandler(inventory))
secondInputStack.map(InventoryUtils.extractFromInventory(_, InventoryUtils.asItemHandler(inventory)))
InventoryUtils.extractFromInventory(firstInputStack, InventoryUtils.asItemHandler(inventory), exact = false)
secondInputStack.map(InventoryUtils.extractFromInventory(_, InventoryUtils.asItemHandler(inventory), exact = false))
InventoryUtils.insertIntoInventory(outputStack, InventoryUtils.asItemHandler(inventory), outputStack.stackSize)
// Tell the merchant we used the recipe, so MC can disable it and/or enable more recipes.

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

@ -224,19 +224,20 @@ object InventoryUtils {
* <p/>
* This will try to remove items of the same type as the specified item stack
* up to the number of the stack's size for all slots in the specified inventory.
* If exact is true, the items colated will also match meta data
* <p/>
* This uses the <tt>extractFromInventorySlot</tt> method, and therefore
* handles special cases such as sided inventories and stack size limits.
*/
def extractFromInventory(stack: ItemStack, inventory: IItemHandler, simulate: Boolean = false): ItemStack = {
def extractFromInventory(stack: ItemStack, inventory: IItemHandler, simulate: Boolean = false, exact: Boolean = true): ItemStack = {
val remaining = stack.copy()
for (slot <- 0 until inventory.getSlots if remaining.stackSize > 0) {
extractFromInventorySlot(stack => {
if (haveSameItemType(remaining, stack, checkNBT = true)) {
val transferred = stack.stackSize min remaining.stackSize
extractFromInventorySlot(stackInInv => {
if (stackInInv != null && remaining.getItem == stackInInv.getItem && (!exact || haveSameItemType(remaining, stackInInv, checkNBT = true))) {
val transferred = stackInInv.stackSize min remaining.stackSize
remaining.stackSize -= transferred
if (!simulate) {
stack.stackSize -= transferred
stackInInv.stackSize -= transferred
}
}
}, inventory, slot, limit = remaining.stackSize)
@ -244,8 +245,8 @@ object InventoryUtils {
remaining
}
def extractFromInventory(stack: ItemStack, inventory: IInventory, side: EnumFacing, simulate: Boolean): ItemStack =
extractFromInventory(stack, asItemHandler(inventory, side), simulate)
def extractFromInventory(stack: ItemStack, inventory: IInventory, side: EnumFacing, simulate: Boolean, exact: Boolean): ItemStack =
extractFromInventory(stack, asItemHandler(inventory, side), simulate, exact)
/**
* Utility method for calling <tt>insertIntoInventory</tt> on an inventory