AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-11 16:28:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Returning number of crafted items from crafting upgrade's craft() as second result (this is the stack size of the result). Closes #561.

Browse Source
This commit is contained in:
Florian Nücke 2014-09-11 16:22:41 +02:00
parent e3649a3887
commit 4e8971111b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
View File

@ -23,7 +23,7 @@ class UpgradeCrafting(val owner: Container with Robot) extends component.Managed
@Callback(doc = """function([count:number]):number -- Tries to craft the specified number of items in the top left area of the inventory.""") @Callback(doc = """function([count:number]):number -- Tries to craft the specified number of items in the top left area of the inventory.""")
def craft(context: Context, args: Arguments): Array[AnyRef] = { def craft(context: Context, args: Arguments): Array[AnyRef] = {
val count = if (args.count > 0) args.checkInteger(0) else Int.MaxValue val count = if (args.count > 0) args.checkInteger(0) else Int.MaxValue
result(CraftingInventory.craft(count)) result(CraftingInventory.craft(count): _*)
} }
private object CraftingInventory extends inventory.InventoryCrafting(new inventory.Container { private object CraftingInventory extends inventory.InventoryCrafting(new inventory.Container {
@ -31,14 +31,14 @@ class UpgradeCrafting(val owner: Container with Robot) extends component.Managed
}, 3, 3) { }, 3, 3) {
var amountPossible = 0 var amountPossible = 0
def craft(wantedCount: Int): Boolean = { def craft(wantedCount: Int): Seq[_] = {
load() load()
val manager = CraftingManager.getInstance val manager = CraftingManager.getInstance
val result = manager.findMatchingRecipe(CraftingInventory, owner.world) val result = manager.findMatchingRecipe(CraftingInventory, owner.world)
if (result == null) return false if (result == null) return Seq(false, 0)
val targetStackSize = if (result.isStackable) math.min(wantedCount, result.getMaxStackSize) else result.stackSize val targetStackSize = if (result.isStackable) math.min(wantedCount, result.getMaxStackSize) else result.stackSize
val timesCrafted = math.min(targetStackSize / result.stackSize, amountPossible) val timesCrafted = math.min(targetStackSize / result.stackSize, amountPossible)
if (timesCrafted <= 0) return true if (timesCrafted <= 0) return Seq(true, 0)
GameRegistry.onItemCrafted(owner.player, result, this) GameRegistry.onItemCrafted(owner.player, result, this)
val surplus = mutable.ArrayBuffer.empty[ItemStack] val surplus = mutable.ArrayBuffer.empty[ItemStack]
for (slot <- 0 until getSizeInventory) { for (slot <- 0 until getSizeInventory) {
@ -63,12 +63,13 @@ class UpgradeCrafting(val owner: Container with Robot) extends component.Managed
} }
save() save()
result.stackSize *= timesCrafted result.stackSize *= timesCrafted
val countCrafted = result.stackSize
val inventory = owner.player.inventory val inventory = owner.player.inventory
inventory.addItemStackToInventory(result) inventory.addItemStackToInventory(result)
for (stack <- surplus) { for (stack <- surplus) {
inventory.addItemStackToInventory(stack) inventory.addItemStackToInventory(stack)
} }
true Seq(true, countCrafted)
} }
def load() { def load() {