Refactor Task system for enhanced flexibility and clarity

Replaced `TaskResult` with more explicit task patterns and streamlined result handling. Improved modularity by refactoring references to `TaskFlow` into `TaskFlowModule`. Added `name` properties to various tasks for better debugging and logging.

Author: Avanatiker

common/src/main/java/com/lambda/mixin/render/DebugHudMixin.java

@@ -17,7 +17,7 @@
 
 package com.lambda.mixin.render;
 
-import com.lambda.task.RootTask;
+import com.lambda.task.TaskFlow;
 import com.lambda.util.DebugInfoHud;
 import net.minecraft.client.gui.hud.DebugHud;
 import org.spongepowered.asm.mixin.Mixin;
@@ -36,6 +36,6 @@ private void onGetRightText(CallbackInfoReturnable<List<String>> cir) {
 
     @Inject(method = "getLeftText", at = @At(value = "TAIL"))
     private void onGetLeftText(CallbackInfoReturnable<List<String>> cir) {
-        RootTask.INSTANCE.addInfo(cir.getReturnValue());
+        cir.getReturnValue().addAll(List.of(TaskFlow.INSTANCE.toString().split("\n")));
     }
 }

common/src/main/java/com/lambda/mixin/world/ClientWorldMixin.java

@@ -34,13 +34,6 @@
 
 @Mixin(ClientWorld.class)
 public class ClientWorldMixin {
-    @Inject(method = "handleBlockUpdate", at = @At("HEAD"), cancellable = true)
-    private void handleBlockUpdateInject(BlockPos pos, BlockState state, int flags, CallbackInfo ci) {
-        if (EventFlow.post(new WorldEvent.BlockUpdate(pos, state, flags)).isCanceled()) {
-            ci.cancel();
-        }
-    }
-
     @Inject(method = "addEntity", at = @At("HEAD"), cancellable = true)
     private void addEntity(Entity entity, CallbackInfo ci) {
         if (EventFlow.post(new WorldEvent.EntitySpawn(entity)).isCanceled()) ci.cancel();

common/src/main/java/com/lambda/mixin/world/WorldMixin.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.mixin.world;
+
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.WorldEvent;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(World.class)
+public abstract class WorldMixin {
+    @Inject(method = "setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;II)Z", at = @At("HEAD"), cancellable = true)
+    void setBlockStatePre(BlockPos pos, BlockState state, int flags, int maxUpdateDepth, CallbackInfoReturnable<Boolean> cir) {
+        if (EventFlow.post(new WorldEvent.BlockUpdate.Pre(pos, state, flags, maxUpdateDepth)).isCanceled()) {
+            cir.setReturnValue(false);
+        }
+    }
+
+    @Inject(method = "setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;II)Z", at = @At("TAIL"))
+    void setBlockStatePost(BlockPos pos, BlockState state, int flags, int maxUpdateDepth, CallbackInfoReturnable<Boolean> cir) {
+        EventFlow.post(new WorldEvent.BlockUpdate.Post(pos, state, flags, maxUpdateDepth));
+    }
+}

common/src/main/kotlin/com/lambda/command/commands/BuildCommand.kt

@@ -26,6 +26,7 @@ import com.lambda.command.LambdaCommand
 import com.lambda.interaction.construction.StructureRegistry
 import com.lambda.interaction.construction.blueprint.Blueprint.Companion.toStructure
 import com.lambda.interaction.construction.blueprint.StaticBlueprint.Companion.toBlueprint
+import com.lambda.task.TaskFlow.run
 import com.lambda.task.tasks.BuildTask.Companion.build
 import com.lambda.threading.runSafe
 import com.lambda.util.Communication.info
@@ -62,7 +63,7 @@ object BuildCommand : LambdaCommand(
                                             .move(player.blockPos)
                                             .toBlueprint()
                                             .build(pathing = doPathing)
-                                            .start(null)
+                                            .run()
 
                                         return@executeWithResult CommandResult.success()
                                     }

common/src/main/kotlin/com/lambda/command/commands/TaskCommand.kt

@@ -21,20 +21,28 @@ import com.lambda.brigadier.argument.literal
 import com.lambda.brigadier.execute
 import com.lambda.brigadier.required
 import com.lambda.command.LambdaCommand
-import com.lambda.task.RootTask
+import com.lambda.task.TaskFlow
 import com.lambda.util.Communication.info
 import com.lambda.util.extension.CommandBuilder
 
 object TaskCommand : LambdaCommand(
     name = "task",
-    usage = "task <cancel>",
+    usage = "task <cancel|clear>",
     description = "Control tasks"
 ) {
     override fun CommandBuilder.create() {
         required(literal("cancel")) {
             execute {
                 this@TaskCommand.info("Cancelling all tasks")
-                RootTask.cancel()
+                TaskFlow.cancel()
+            }
+        }
+
+        required(literal("clear")) {
+            execute {
+                this@TaskCommand.info("Clearing all tasks")
+                TaskFlow.cancel()
+                TaskFlow.clear()
             }
         }
     }

common/src/main/kotlin/com/lambda/command/commands/TransferCommand.kt

@@ -27,6 +27,7 @@ import com.lambda.interaction.material.ContainerManager
 import com.lambda.interaction.material.ContainerManager.containerMatchSelection
 import com.lambda.interaction.material.StackSelection.Companion.selectStack
 import com.lambda.interaction.material.transfer.TransferResult
+import com.lambda.task.TaskFlow.run
 import com.lambda.util.Communication.info
 import com.lambda.util.extension.CommandBuilder
 
@@ -77,18 +78,18 @@ object TransferCommand : LambdaCommand(
                                 it.name == to().value().split(" with ").firstOrNull()
                             } ?: return@executeWithResult failure("To container not found")
 
-                            when (val result = fromContainer.transfer(selection, toContainer)) {
+                            when (val transaction = fromContainer.transfer(selection, toContainer)) {
                                 is TransferResult.Transfer -> {
-                                    info("$result started.")
-                                    lastTransfer = result
-                                    result.onSuccess { _, _ ->
+                                    info("$transaction started.")
+                                    lastTransfer = transaction
+                                    transaction.finally {
                                         info("$lastTransfer completed.")
-                                    }.start(null)
+                                    }.run()
                                     return@executeWithResult success()
                                 }
 
                                 is TransferResult.MissingItems -> {
-                                    return@executeWithResult failure("Missing items: ${result.missing}")
+                                    return@executeWithResult failure("Missing items: ${transaction.missing}")
                                 }
 
                                 is TransferResult.NoSpace -> {

common/src/main/kotlin/com/lambda/event/events/WorldEvent.kt

@@ -21,7 +21,6 @@ import com.lambda.event.Event
 import com.lambda.event.callback.Cancellable
 import com.lambda.event.callback.ICancellable
 import net.minecraft.block.BlockState
-import net.minecraft.client.world.ClientWorld
 import net.minecraft.entity.Entity
 import net.minecraft.entity.data.TrackedData
 import net.minecraft.util.math.BlockPos
@@ -49,11 +48,15 @@ sealed class WorldEvent {
     /**
      * Represents a block update in the world
      */
-    class BlockUpdate(
+    sealed class BlockUpdate(
         val pos: BlockPos,
         val state: BlockState,
-        val flags: Int
-    ) : ICancellable by Cancellable()
+        val flags: Int,
+        val maxUpdateDepth: Int,
+    ) {
+        class Pre(pos: BlockPos, state: BlockState, flags: Int, depth: Int) : BlockUpdate(pos, state, flags, depth), ICancellable by Cancellable()
+        class Post(pos: BlockPos, state: BlockState, flags: Int, depth: Int) : BlockUpdate(pos, state, flags, depth), Event
+    }
 
     /**
      * Represents an entity being added to the world

common/src/main/kotlin/com/lambda/graphics/renderer/esp/ChunkedESP.kt

@@ -53,7 +53,7 @@ class ChunkedESP private constructor(
     }
 
     init {
-        listenConcurrently<WorldEvent.BlockUpdate> { event ->
+        listenConcurrently<WorldEvent.BlockUpdate.Post> { event ->
             world.getWorldChunk(event.pos).renderer.notifyChunks()
         }
 

common/src/main/kotlin/com/lambda/interaction/construction/blueprint/Blueprint.kt

@@ -46,6 +46,8 @@ abstract class Blueprint {
 
     fun isOutOfBounds(vec3d: Vec3d): Boolean = !bounds.contains(vec3d.blockPos)
 
+    val center get() = bounds.center.blockPos
+
     companion object {
         fun emptyStructure(): Structure = emptyMap()
 

common/src/main/kotlin/com/lambda/interaction/construction/blueprint/DynamicBlueprint.kt

@@ -36,6 +36,8 @@ data class DynamicBlueprint(
     override var structure: Structure = emptyMap()
         private set
 
+    override fun toString() = "Dynamic Blueprint at ${center.toShortString()}"
+
     companion object {
         fun offset(offset: Vec3i): SafeContext.(Structure) -> Structure = {
             it.map { (pos, state) ->