Task control with registry, block break tests

Author: Avanatiker

common/src/main/kotlin/com/lambda/config/Configuration.kt

@@ -9,6 +9,7 @@ import com.lambda.config.configurations.ModuleConfig
 import com.lambda.event.EventFlow.lambdaScope
 import com.lambda.event.events.ClientEvent
 import com.lambda.event.listener.UnsafeListener.Companion.unsafeListener
+import com.lambda.threading.runIO
 import com.lambda.util.Communication.info
 import com.lambda.util.Communication.logError
 import com.lambda.util.StringUtils.capitalize
@@ -81,7 +82,7 @@ abstract class Configuration : Jsonable {
     }
 
     fun tryLoad() {
-        lambdaScope.launch(Dispatchers.IO) {
+        runIO {
             runCatching { load(primary) }
                 .onSuccess {
                     val message = "${configName.capitalize()} config loaded."
@@ -108,7 +109,7 @@ abstract class Configuration : Jsonable {
     }
 
     fun trySave() {
-        lambdaScope.launch(Dispatchers.IO) {
+        runIO {
             runCatching { save() }
                 .onSuccess {
                     val message = "Saved ${configName.capitalize()} config."

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

@@ -3,14 +3,12 @@ package com.lambda.core
 import com.lambda.Lambda
 import com.lambda.Lambda.LOG
 import com.lambda.command.CommandManager
-import com.lambda.config.configurations.GuiConfig
 import com.lambda.graphics.renderer.gui.font.LambdaFont
 import com.lambda.gui.impl.clickgui.GuiConfigurable
-import com.lambda.gui.impl.clickgui.LambdaClickGui
 import com.lambda.interaction.PlayerPacketManager
 import com.lambda.interaction.RotationManager
 import com.lambda.module.ModuleRegistry
-import com.lambda.task.tasks.TaskTester
+import com.lambda.task.TaskRegistry
 import com.lambda.util.Communication.ascii
 import kotlin.system.measureTimeMillis
 
@@ -27,8 +25,6 @@ object Loader {
         ascii.split("\n").forEach { LOG.info(it) }
         LOG.info("Initializing ${Lambda.MOD_NAME} ${Lambda.VERSION}")
 
-        TaskTester
-
         val initTime = measureTimeMillis {
             loadables.forEach { loadable ->
                 var info: String
@@ -42,6 +38,7 @@ object Loader {
 
         LOG.info("${Lambda.MOD_NAME} ${Lambda.VERSION} was successfully initialized (${initTime}ms)")
 
+        TaskRegistry
         GuiConfigurable // ToDo: Find more elegant solution
     }
 }

common/src/main/kotlin/com/lambda/event/EventFlow.kt

@@ -1,8 +1,10 @@
 package com.lambda.event
 
+import com.lambda.context.SafeContext
 import com.lambda.event.callback.ICancellable
 import com.lambda.event.listener.Listener
 import com.lambda.threading.runConcurrent
+import com.lambda.threading.runSafe
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.*
@@ -48,6 +50,14 @@ object EventFlow {
     }
 
     suspend inline fun <reified E : Event> awaitEvent(
+        noinline predicate: SafeContext.(E) -> Boolean = { true },
+    ) = concurrentFlow.filterIsInstance<E>().first {
+        runSafe {
+            predicate(it)
+        } ?: false
+    }
+
+    suspend inline fun <reified E : Event> awaitEventUnsafe(
         noinline predicate: (E) -> Boolean = { true },
     ) = concurrentFlow.filterIsInstance<E>().first(predicate)
 

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

@@ -31,7 +31,7 @@ abstract class RotationEvent : Event {
         init {
             // Always check if baritone wants to rotate as well
             RotationManager.BaritoneProcessor.baritoneContext?.let { context ->
-                this.context = RotationContext(context.rotation, context.config)
+                this.context = context
             }
         }
 
@@ -53,16 +53,15 @@ abstract class RotationEvent : Event {
             blockPos: BlockPos,
             rotationConfig: IRotationConfig = TaskFlow.rotationSettings,
             interactionConfig: InteractionConfig = TaskFlow.interactionSettings,
-            sides: Set<Direction> = emptySet(),
-            priority: Int = 0,
+            sides: Set<Direction> = emptySet()
         ) = runSafe {
             val state = world.getBlockState(blockPos)
             val voxelShape = state.getOutlineShape(world, blockPos)
             val boundingBoxes = voxelShape.boundingBoxes.map { it.offset(blockPos) }
-            findRotation(rotationConfig, interactionConfig, boundingBoxes, priority, sides) {
+            findRotation(rotationConfig, interactionConfig, boundingBoxes, sides) {
                 blockResult?.blockPos == blockPos && (blockResult?.side in sides || sides.isEmpty())
             }?.let {
-                requests.add(it)
+                context = it
                 return@runSafe it
             }
             return@runSafe null

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

@@ -1,15 +1,12 @@
 package com.lambda.event.events
 
 import com.lambda.event.Event
-import net.minecraft.client.gui.screen.Screen
-import net.minecraft.client.gui.screen.ingame.HandledScreen
-import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider
 import net.minecraft.item.ItemStack
 import net.minecraft.screen.ScreenHandler
 
 sealed class ScreenHandlerEvent : Event {
-    class Open<T : ScreenHandler>(val screen: T) : ScreenHandlerEvent()
-    class Close<T : ScreenHandler>(val screen: T) : ScreenHandlerEvent()
+    class Open<H : ScreenHandler>(val screenHandler: H) : ScreenHandlerEvent()
+    class Close<H : ScreenHandler>(val screenHandler: H) : ScreenHandlerEvent()
     data class Loaded(
         val revision: Int,
         val stacks: List<ItemStack>,

common/src/main/kotlin/com/lambda/graphics/buffer/vao/VAO.kt

@@ -18,7 +18,7 @@ import com.lambda.graphics.gl.VaoUtils.bufferData
 import com.lambda.graphics.gl.VaoUtils.unbindIndexBuffer
 import com.lambda.graphics.gl.VaoUtils.unbindVertexArray
 import com.lambda.graphics.gl.VaoUtils.unbindVertexBuffer
-import com.lambda.threading.runOnGameThread
+import com.lambda.threading.runGameConcurrent
 import com.mojang.blaze3d.systems.RenderSystem.drawElements
 import org.lwjgl.opengl.GL30C.*
 import java.awt.Color
@@ -48,7 +48,7 @@ class VAO(
         val stride = attribGroup.stride
         objectSize = stride * drawMode.indicesCount
 
-        runOnGameThread {
+        runGameConcurrent {
             vertices = byteBuffer(objectSize * 256 * 4)
             verticesPointer = address(vertices)
             verticesPosition = verticesPointer

common/src/main/kotlin/com/lambda/interaction/RotationManager.kt

@@ -16,7 +16,7 @@ import com.lambda.interaction.rotation.Rotation.Companion.lerp
 import com.lambda.interaction.rotation.RotationContext
 import com.lambda.interaction.rotation.RotationMode
 import com.lambda.module.modules.client.Baritone
-import com.lambda.threading.runOnGameThreadConcurrent
+import com.lambda.threading.runGameConcurrent
 import com.lambda.threading.runSafe
 import com.lambda.util.math.MathUtils.lerp
 import com.lambda.util.math.MathUtils.toRadian
@@ -51,7 +51,7 @@ object RotationManager : Loadable {
             val packet = event.packet
             if (packet !is PlayerPositionLookS2CPacket) return@listener
 
-            runOnGameThreadConcurrent {
+            runGameConcurrent {
                 reset(Rotation(packet.yaw, packet.pitch))
             }
         }

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

@@ -1,15 +1,12 @@
 package com.lambda.interaction.material
 
-import com.lambda.context.SafeContext
 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.module.modules.client.TaskFlow
 import com.lambda.util.Communication.info
 import com.lambda.util.item.ItemUtils
-import com.lambda.util.player.SlotUtils.combined
 import com.lambda.util.primitives.extension.containerStacks
 import net.minecraft.block.BlockState
 import net.minecraft.block.entity.BlockEntity
@@ -41,7 +38,7 @@ object ContainerManager {
         }
 
         listener<ScreenHandlerEvent.Close<GenericContainerScreenHandler>> { event ->
-            val handler = event.screen
+            val handler = event.screenHandler
 
             when (val block = lastInteractedBlockEntity) {
                 is EnderChestBlockEntity -> {

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

@@ -6,6 +6,7 @@ import com.lambda.interaction.material.StackSelection
 import com.lambda.task.TaskChain
 import com.lambda.task.buildTask
 import com.lambda.task.emptyChain
+import com.lambda.threading.runGameBlocking
 import com.lambda.util.player.SlotUtils.hotbar
 import net.minecraft.item.ItemStack
 
@@ -16,16 +17,7 @@ object HotbarContainer : MaterialContainer(Rank.HOTBAR) {
 
     override fun prepare() = emptyChain()
 
-    override fun withdraw(selection: StackSelection) = buildTask {
-//        gameThreadBlocking {
-//            stacks.filter(selection.selector).forEach { stack ->
-//                player.inventory.selectedSlot = player.inventory.main.indexOf(stack)
-//                delay(TaskFlow.itemMoveDelay)
-//            }
-//        }
-    }
+    override fun withdraw(selection: StackSelection) = emptyChain()
 
-    override fun deposit(selection: StackSelection): TaskChain {
-        TODO("Not yet implemented")
-    }
+    override fun deposit(selection: StackSelection) = emptyChain()
 }

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

@@ -15,33 +15,4 @@ object InventoryContainer : MaterialContainer(Rank.INVENTORY) {
     override fun withdraw(selection: StackSelection) = emptyChain()
 
     override fun deposit(selection: StackSelection) = emptyChain()
-
-//    Lambda.LOG.info("Moving $selection from inventory to slot ${destination.slot}")
-//    stacks.filter(selection.selector).take(selection.count).forEach { stack ->
-//        player.currentScreenHandler?.let { screenHandler ->
-//            if (screenHandler.stacks[destination.slot].item == stack.item) {
-//                return@forEach
-//            }
-//            val currentStackSlot = screenHandler.stacks.indexOf(stack)
-//            if (currentStackSlot == destination.slot) {
-//                return@forEach
-//            }
-//            interaction.clickSlot(
-//                player.currentScreenHandler?.syncId ?: 0,
-//                currentStackSlot,
-//                0,
-//                SlotActionType.PICKUP,
-//                player,
-//            )
-//            delay(TaskFlow.itemMoveDelay)
-//            interaction.clickSlot(
-//                player.currentScreenHandler?.syncId ?: 0,
-//                destination.slot,
-//                0,
-//                SlotActionType.PICKUP,
-//                player,
-//            )
-//            delay(TaskFlow.itemMoveDelay)
-//        }
-//    }
 }