Better error handling

Author: Avanatiker

common/src/main/kotlin/com/lambda/interaction/construction/result/BreakResult.kt

@@ -9,6 +9,7 @@ import com.lambda.interaction.material.StackSelection.Companion.select
 import com.lambda.interaction.material.StackSelection.Companion.selectStack
 import com.lambda.interaction.material.container.MainHandContainer
 import com.lambda.task.Task.Companion.emptyTask
+import com.lambda.task.Task.Companion.failTask
 import com.lambda.task.tasks.BreakBlock.Companion.breakBlock
 import com.lambda.task.tasks.GoalTask.Companion.moveToGoalUntil
 import net.minecraft.block.BlockState
@@ -50,7 +51,7 @@ sealed class BreakResult : BuildResult() {
     ) : Resolvable, BreakResult() {
         override val rank = Rank.BREAK_NOT_EXPOSED
 
-        override val resolve get() = emptyTask("Block is not exposed to air.")
+        override val resolve get() = failTask("Block is not exposed to air.")
 
         override fun compareTo(other: ComparableResult<Rank>): Int {
             return when (other) {
@@ -77,7 +78,7 @@ sealed class BreakResult : BuildResult() {
                     ?.solve ?: run {
                         selectStack {
                             isItem(badItem).not()
-                        }.transfer(MainHandContainer)?.solve ?: emptyTask("No item found or space") // ToDo: Should throw error
+                        }.transfer(MainHandContainer)?.solve ?: failTask("No item found or space")
                     }
 
         override fun compareTo(other: ComparableResult<Rank>): Int {

common/src/main/kotlin/com/lambda/interaction/construction/result/BuildResult.kt

@@ -7,6 +7,7 @@ import com.lambda.interaction.material.StackSelection.Companion.select
 import com.lambda.interaction.material.container.MainHandContainer
 import com.lambda.task.Task
 import com.lambda.task.Task.Companion.emptyTask
+import com.lambda.task.Task.Companion.failTask
 import com.lambda.task.tasks.GoalTask.Companion.moveNearBlock
 import com.lambda.task.tasks.GoalTask.Companion.moveToGoal
 import com.lambda.task.tasks.GoalTask.Companion.moveUntilLoaded
@@ -136,7 +137,7 @@ abstract class BuildResult : ComparableResult<Rank> {
         override val rank = Rank.WRONG_ITEM
 
         override val resolve get() =
-            neededItem.select().transfer(MainHandContainer)?.solve ?: emptyTask("Item ${neededItem.name.string} not found") // ToDo: Should throw error
+            neededItem.select().transfer(MainHandContainer)?.solve ?: failTask("Item ${neededItem.name.string} not found")
 
         override fun compareTo(other: ComparableResult<Rank>): Int {
             return when (other) {
@@ -159,7 +160,7 @@ abstract class BuildResult : ComparableResult<Rank> {
         override val rank = Rank.WRONG_ITEM
 
         override val resolve get() =
-            neededStack.select().transfer(MainHandContainer)?.solve ?: emptyTask() // ToDo: Should throw error
+            neededStack.select().transfer(MainHandContainer)?.solve ?: failTask("Stack ${neededStack.name.string} not found")
 
         override fun compareTo(other: ComparableResult<Rank>): Int {
             return when (other) {

common/src/main/kotlin/com/lambda/interaction/material/container/EnderChestContainer.kt

@@ -4,6 +4,7 @@ import com.lambda.interaction.material.MaterialContainer
 import com.lambda.interaction.material.StackSelection
 import com.lambda.task.Task
 import com.lambda.task.Task.Companion.emptyTask
+import com.lambda.task.Task.Companion.failTask
 import com.lambda.task.tasks.InventoryTask.Companion.deposit
 import com.lambda.task.tasks.InventoryTask.Companion.withdraw
 import com.lambda.task.tasks.OpenContainer.Companion.openContainer
@@ -31,15 +32,15 @@ object EnderChestContainer : MaterialContainer(Rank.ENDER_CHEST) {
 //        }
 
     override fun withdraw(selection: StackSelection): Task<*> {
-        val pos = placePos ?: return emptyTask("No placePos found for EnderChestContainer")
+        val pos = placePos ?: return failTask("No placePos found for EnderChestContainer")
         return openContainer<GenericContainerScreenHandler>(pos)
             .onSuccess { _, screen ->
                 withdraw(screen, selection)
             }
     }
 
     override fun deposit(selection: StackSelection): Task<*> {
-        val pos = placePos ?: return emptyTask("No placePos found for EnderChestContainer")
+        val pos = placePos ?: return failTask("No placePos found for EnderChestContainer")
         return openContainer<GenericContainerScreenHandler>(pos)
             .onSuccess { _, screen ->
                 deposit(screen, selection)

common/src/main/kotlin/com/lambda/interaction/material/container/ShulkerBoxContainer.kt

@@ -5,6 +5,7 @@ import com.lambda.interaction.material.MaterialContainer
 import com.lambda.interaction.material.StackSelection
 import com.lambda.task.Task
 import com.lambda.task.Task.Companion.emptyTask
+import com.lambda.task.Task.Companion.failTask
 import com.lambda.task.tasks.BuildStructure.Companion.breakAndCollectBlock
 import com.lambda.task.tasks.InventoryTask.Companion.deposit
 import com.lambda.task.tasks.InventoryTask.Companion.withdraw
@@ -37,17 +38,17 @@ data class ShulkerBoxContainer(
         }
 
     override fun withdraw(selection: StackSelection): Task<*> {
-        val open = openScreen ?: return emptyTask("No open screen found for ShulkerBoxContainer")
-        val place = placePosition ?: return emptyTask("No place position found for ShulkerBoxContainer")
+        val open = openScreen ?: return failTask("No open screen found for ShulkerBoxContainer")
+        val place = placePosition ?: return failTask("No place position found for ShulkerBoxContainer")
         info("Withdrawing $selection from ${shulkerStack.name.string}")
         return withdraw(open, selection).onSuccess { withdraw, _ ->
             breakAndCollectBlock(place).start(withdraw)
         }
     }
 
     override fun deposit(selection: StackSelection): Task<*> {
-        val open = openScreen ?: return emptyTask("No open screen found for ShulkerBoxContainer")
-        val place = placePosition ?: return emptyTask("No place position found for ShulkerBoxContainer")
+        val open = openScreen ?: return failTask("No open screen found for ShulkerBoxContainer")
+        val place = placePosition ?: return failTask("No place position found for ShulkerBoxContainer")
         info("Depositing $selection to ${shulkerStack.name.string}")
         return deposit(open, selection).onSuccess { deposit, _ ->
             breakAndCollectBlock(place).start(deposit)

common/src/main/kotlin/com/lambda/interaction/material/transfer/TransferResult.kt

@@ -3,6 +3,7 @@ package com.lambda.interaction.material.transfer
 import com.lambda.interaction.material.MaterialContainer
 import com.lambda.interaction.material.StackSelection
 import com.lambda.task.Task
+import com.lambda.task.Task.Companion.failTask
 
 abstract class TransferResult {
     abstract val solve: Task<*>
@@ -23,11 +24,11 @@ abstract class TransferResult {
 
     data object NoSpace : TransferResult() {
         // ToDo: Needs inventory space resolver. compressing or disposing
-        override val solve = Task.emptyTask("NoSpace")
+        override val solve = failTask("NoSpace")
     }
 
     data class MissingItems(val missing: Int) : TransferResult() {
         // ToDo: Find other satisfying permutations
-        override val solve = Task.emptyTask("MissingItems")
+        override val solve = failTask("MissingItems")
     }
 }

common/src/main/kotlin/com/lambda/task/Task.kt

@@ -439,15 +439,21 @@ abstract class Task<Result>(
         val MAX_DEPTH = 20
         const val MAX_DEBUG_ENTRIES = 15
 
-        interface EmptyTask
-
         @Ta5kBuilder
         fun emptyTask(
             name: String = "EmptyTask",
-        ): Task<Unit> = object : EmptyTask, Task<Unit>() {
+        ): Task<Unit> = object : Task<Unit>() {
             init { this.name = name }
             override fun SafeContext.onStart() { success(Unit) }
         }
+        
+        @Ta5kBuilder
+        fun failTask(
+            message: String
+        ): Task<Unit> = object : Task<Unit>() {
+            init { this.name = "FailTask" }
+            override fun SafeContext.onStart() { failure(message) }
+        }
 
         @Ta5kBuilder
         fun buildTask(

common/src/main/kotlin/com/lambda/task/tasks/PlaceContainer.kt

@@ -14,7 +14,7 @@ import com.lambda.util.BlockUtils.blockPos
 import net.minecraft.item.ItemStack
 import net.minecraft.util.math.BlockPos
 
-class PlaceContainer(
+class PlaceContainer @Ta5kBuilder constructor(
     val stack: ItemStack,
 ) : Task<BlockPos>() {
     override fun SafeContext.onStart() {