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

Allow specifying AE2 CPU when crafting.

Browse Source
This commit is contained in:
Aaron Gallagher 2016-01-16 13:05:06 -05:00
parent 96ee1ec6e6
commit c1181babd6
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/scala/li/cil/oc/integration/appeng/NetworkControl.scala
View File

@ -168,7 +168,7 @@ object NetworkControl {
@Callback(doc = "function():table -- Returns the item stack representation of the crafting result.") @Callback(doc = "function():table -- Returns the item stack representation of the crafting result.")
def getItemStack(context: Context, args: Arguments): Array[AnyRef] = Array(stack.getItemStack) def getItemStack(context: Context, args: Arguments): Array[AnyRef] = Array(stack.getItemStack)
@Callback(doc = "function([int amount]):userdata -- Requests the item to be crafted, returning an object that allows tracking the crafting status.") @Callback(doc = "function([amount:int[, prioritizePower:boolean[, cpuName:string]]]):userdata -- Requests the item to be crafted, returning an object that allows tracking the crafting status.")
def request(context: Context, args: Arguments): Array[AnyRef] = { def request(context: Context, args: Arguments): Array[AnyRef] = {
if (controller == null || controller.isInvalid) { if (controller == null || controller.isInvalid) {
return result(Unit, "no controller") return result(Unit, "no controller")
@ -181,13 +181,20 @@ object NetworkControl {
val craftingGrid = controller.getProxy.getCrafting val craftingGrid = controller.getProxy.getCrafting
val source = new MachineSource(controller) val source = new MachineSource(controller)
val future = craftingGrid.beginCraftingJob(controller.getWorldObj, controller.getProxy.getGrid, source, request, null) val future = craftingGrid.beginCraftingJob(controller.getWorldObj, controller.getProxy.getGrid, source, request, null)
val prioritizePower = args.optBoolean(1, true)
val cpuName = args.optString(2, "")
val cpu = if (!cpuName.isEmpty()) {
controller.getProxy.getCrafting.getCpus.collectFirst({
case c if cpuName.equals(c.getName()) => c
}).orNull
} else null
val status = new CraftingStatus() val status = new CraftingStatus()
Future { Future {
try { try {
val job = future.get() // Make 100% sure we wait for this outside the scheduled closure. val job = future.get() // Make 100% sure we wait for this outside the scheduled closure.
EventHandler.scheduleServer(() => { EventHandler.scheduleServer(() => {
val link = craftingGrid.submitJob(job, Craftable.this, null, true, source) val link = craftingGrid.submitJob(job, Craftable.this, cpu, prioritizePower, source)
if (link != null) { if (link != null) {
status.setLink(link) status.setLink(link)
links += link links += link