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

Fix AE2 Integration

Browse Source
This commit is contained in:
Pelotrio 2023-12-31 17:16:34 +01:00
parent 44f59fb36e
commit cec0babb96
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,17 +221,26 @@ object NetworkControl {
val status = new CraftingStatus()
Future {
try {
val job = future.get() // Make 100% sure we wait for this outside the scheduled closure.
EventHandler.scheduleServer(() => {
val link = craftingGrid.submitJob(job, Craftable.this, cpu, prioritizePower, source)
if (link != null) {
status.setLink(link)
links += link
}
else {
status.fail("missing resources?")
}
})
while (!future.isDone) {
Thread.sleep(10)
}
val job = future.get()
if (future.isCancelled) {
status.fail("missing resources")
} else {
EventHandler.scheduleServer(() => {
val link = craftingGrid.submitJob(job, Craftable.this, cpu, prioritizePower, source)
if (link != null) {
status.setLink(link)
links += link
}
else {
status.fail("missing resources?")
}
})
}
}
catch {
case e: Exception =>
@ -365,6 +374,12 @@ object NetworkControl {
this.reason = s"request failed ($reason)"
}
@Callback(doc = "function():boolean -- Get whether the crafting request is currently computing.")
def isComputing(context: Context, args: Arguments): Array[AnyRef] = result(isComputing)
@Callback(doc = "function():boolean -- Get whether the crafting request has failed.")
def hasFailed(context: Context, args: Arguments): Array[AnyRef] = result(failed)
@Callback(doc = "function():boolean -- Get whether the crafting request has been canceled.")
def isCanceled(context: Context, args: Arguments): Array[AnyRef] = {
if (isComputing) return result(false, "computing")