Fix task usecases

Author: Avanatiker

common/build.gradle.kts

@@ -27,6 +27,12 @@ dependencies {
     implementation(kotlin("reflect"))
 
     // Baritone
-    modImplementation("baritone-api:baritone-api:1.10.2")
+//    modImplementation("baritone-api:baritone-api:1.10.2")
     modImplementation("baritone-api:baritone-unoptimized-fabric:1.10.2")
+
+    testImplementation(kotlin("test"))
+}
+
+tasks.test {
+    useJUnitPlatform()
 }

common/src/main/java/com/lambda/mixin/MinecraftClientMixin.java

@@ -14,13 +14,16 @@
 import net.minecraft.client.network.ClientPlayerInteractionManager;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(MinecraftClient.class)
 public class MinecraftClientMixin {
+    @Shadow @Nullable public Screen currentScreen;
+
     @Inject(method = "tick", at = @At("HEAD"))
     void onTickPre(CallbackInfo ci) {
         EventFlow.post(new TickEvent.Pre());
@@ -56,12 +59,12 @@ private void onScreenOpen(@Nullable Screen screen, CallbackInfo ci) {
 
     @Inject(method = "setScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;removed()V", shift = At.Shift.AFTER))
     private void onScreenRemove(@Nullable Screen screen, CallbackInfo ci) {
-        if (screen == null) return;
-        if (screen instanceof ScreenHandlerProvider<?> handledScreen) {
+        if (currentScreen == null) return;
+        if (currentScreen instanceof ScreenHandlerProvider<?> handledScreen) {
             EventFlow.post(new ScreenHandlerEvent.Close<>(handledScreen.getScreenHandler()));
         }
 
-        EventFlow.post(new ScreenEvent.Close<>(screen));
+        EventFlow.post(new ScreenEvent.Close<>(currentScreen));
     }
 
     @Redirect(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;isBreakingBlock()Z"))

common/src/main/kotlin/com/lambda/core/Loader.kt

@@ -8,6 +8,7 @@ import com.lambda.graphics.renderer.gui.font.LambdaFont
 import com.lambda.gui.GuiConfigurable
 import com.lambda.interaction.PlayerPacketManager
 import com.lambda.interaction.RotationManager
+import com.lambda.interaction.material.ContainerManager
 import com.lambda.module.ModuleRegistry
 import com.lambda.sound.SoundRegistry
 import com.lambda.util.Communication.ascii
@@ -23,6 +24,7 @@ object Loader {
         GuiConfigurable,
         FriendRegistry,
         SoundRegistry,
+        ContainerManager
     )
 
     fun initialize() {

common/src/main/kotlin/com/lambda/interaction/material/ContainerManager.kt

@@ -1,10 +1,12 @@
 package com.lambda.interaction.material
 
+import com.lambda.core.Loadable
 import com.lambda.event.events.InteractionEvent
 import com.lambda.event.events.ScreenHandlerEvent
 import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.interaction.material.StackSelection.Companion.select
 import com.lambda.interaction.material.container.*
+import com.lambda.util.BlockUtils.blockEntity
 import com.lambda.util.Communication.info
 import com.lambda.util.item.ItemUtils
 import com.lambda.util.primitives.extension.containerStacks
@@ -19,7 +21,7 @@ import net.minecraft.screen.ScreenHandlerType
 import java.util.TreeSet
 
 // ToDo: Make this a Configurable to save container caches. Should use a cached region based storage system.
-object ContainerManager {
+object ContainerManager : Loadable {
     // ToDo: Maybe use reflection to get all containers?
     val container = TreeSet<MaterialContainer>().apply {
         add(CreativeContainer)
@@ -34,10 +36,14 @@ object ContainerManager {
 
     init {
         listener<InteractionEvent.Block> {
-            lastInteractedBlockEntity = world.getBlockEntity(it.blockHitResult.blockPos)
+            lastInteractedBlockEntity = it.blockHitResult.blockPos.blockEntity(world)
         }
 
         listener<ScreenHandlerEvent.Close<GenericContainerScreenHandler>> { event ->
+            // ToDo: ;-; i hate type erasure.
+            //  The listener will be triggered for any H, not just GenericContainerScreenHandler
+            if (event.screenHandler !is GenericContainerScreenHandler) return@listener
+
             val handler = event.screenHandler
 
             when (val block = lastInteractedBlockEntity) {

common/src/main/kotlin/com/lambda/interaction/material/MaterialContainer.kt

@@ -25,16 +25,19 @@ abstract class MaterialContainer(
     /**
      * Brings the player into a withdrawal/deposit state. E.g.: move to a chest etc.
      */
-    open fun prepare(): Task<*> = emptyTask()
+    @Task.Ta5kBuilder
+    open fun prepare(): Task<*> = emptyTask("EmptyPrepare")
 
     /**
      * Withdraws items from the container to the player's inventory.
      */
+    @Task.Ta5kBuilder
     abstract fun withdraw(selection: StackSelection): Task<*>
 
     /**
      * Deposits items from the player's inventory into the container.
      */
+    @Task.Ta5kBuilder
     abstract fun deposit(selection: StackSelection): Task<*>
 
     open fun filter(selection: StackSelection) =
@@ -64,12 +67,15 @@ abstract class MaterialContainer(
         selector = { true }
         count = transferAmount
 
-        return TransferResult.Success(emptyTask().withSubTasks {
-            prepare()
-            withdraw(this@transfer)
-            destination.prepare()
-            deposit(this@transfer)
-        })
+        return TransferResult.Success(
+            prepare().onSuccess { prep, _ ->
+                withdraw(this@transfer).onSuccess { with, _ ->
+                    destination.prepare().onSuccess { dest, _ ->
+                        destination.deposit(this@transfer).start(dest)
+                    }.start(with)
+                }.start(prep)
+            }
+        )
     }
 
     fun List<ItemStack>.doShulkerCheck() =

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

@@ -1,5 +1,6 @@
 package com.lambda.interaction.material.container
 
+import com.lambda.Lambda.mc
 import com.lambda.interaction.material.MaterialContainer
 import com.lambda.interaction.material.StackSelection
 import com.lambda.task.Task.Companion.buildTask
@@ -10,9 +11,9 @@ data object CreativeContainer : MaterialContainer(Rank.CREATIVE) {
     override var stacks = emptyList<ItemStack>()
 
     override fun available(selection: StackSelection): Int =
-        if (selection.optimalStack != null) Int.MAX_VALUE else 0
+        if (mc.player?.isCreative == true && selection.optimalStack != null) Int.MAX_VALUE else 0
 
-    override fun deposit(selection: StackSelection) = buildTask {
+    override fun deposit(selection: StackSelection) = buildTask("CreativeDeposit") {
         if (!player.isCreative) {
             // ToDo: Maybe switch gamemode?
             throw NotInCreativeModeException()
@@ -25,7 +26,7 @@ data object CreativeContainer : MaterialContainer(Rank.CREATIVE) {
     }
 
     // Withdraws items from the creative menu to the player's main hand
-    override fun withdraw(selection: StackSelection) = buildTask {
+    override fun withdraw(selection: StackSelection) = buildTask("CreativeWithdraw") {
         selection.optimalStack?.let { optimalStack ->
             if (player.mainHandStack.equal(optimalStack)) return@buildTask
 

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

@@ -2,14 +2,10 @@ package com.lambda.interaction.material.container
 
 import com.lambda.interaction.material.MaterialContainer
 import com.lambda.interaction.material.StackSelection
-import com.lambda.interaction.material.StackSelection.Companion.select
 import com.lambda.task.Task
-import com.lambda.task.tasks.AcquireMaterial.Companion.acquireStack
-import com.lambda.task.tasks.GoalTask.Companion.moveIntoEntityRange
 import com.lambda.task.tasks.InventoryTask.Companion.deposit
 import com.lambda.task.tasks.InventoryTask.Companion.withdraw
 import com.lambda.task.tasks.OpenContainer.Companion.openContainer
-import com.lambda.task.tasks.PlaceContainer.Companion.placeContainer
 import net.minecraft.block.Blocks
 import net.minecraft.item.ItemStack
 import net.minecraft.item.Items

common/src/main/kotlin/com/lambda/module/modules/debug/ContainerTest.kt

@@ -0,0 +1,28 @@
+package com.lambda.module.modules.debug
+
+import com.lambda.event.events.TickEvent
+import com.lambda.event.listener.SafeListener.Companion.listener
+import com.lambda.interaction.material.StackSelection.Companion.select
+import com.lambda.module.Module
+import com.lambda.module.tag.ModuleTag
+import com.lambda.task.tasks.AcquireMaterial.Companion.acquire
+import com.lambda.util.Communication.info
+import net.minecraft.item.Items
+
+object ContainerTest : Module(
+    name = "ContainerTest",
+    description = "Test container",
+    defaultTags = setOf(ModuleTag.DEBUG)
+) {
+    init {
+        listener<TickEvent.Pre> {
+//            info(task.info)
+        }
+
+        onEnable {
+            acquire {
+                Items.OBSIDIAN.select()
+            }.start(null)
+        }
+    }
+}