Working drop collection

Author: Avanatiker

common/src/main/kotlin/com/lambda/module/modules/network/PacketLimiter.kt

@@ -17,12 +17,12 @@ object PacketLimiter : Module(
     defaultTags = setOf(ModuleTag.NETWORK)
 ) {
     private var packetQueue = LimitedDecayQueue<PacketEvent.Send.Pre>(99, 1000)
-    private val limit by setting("Limit", 99, 1..100, 1, "The maximum amount of packets to send per given time interval").apply {
+    private val limit by setting("Limit", 99, 1..100, 1, "The maximum amount of packets to send per given time interval", unit = " packets").apply {
         onValueChange { _, to ->
             packetQueue.setMaxSize(to)
         }
     }
-    private val interval by setting("Duration", 1000L, 1L..1000L, 50L, "The interval / duration in milliseconds to limit packets for").apply {
+    private val interval by setting("Duration", 1000L, 1L..1000L, 50L, "The interval / duration in milliseconds to limit packets for", unit = " ms").apply {
         onValueChange { _, to ->
             packetQueue.setInterval(to)
         }

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

@@ -16,10 +16,17 @@ import com.lambda.task.tasks.GoalTask.Companion.moveToBlock
 import com.lambda.task.tasks.GoalTask.Companion.moveToBlockUntil
 import com.lambda.task.tasks.GoalTask.Companion.moveToGoal
 import com.lambda.task.tasks.GoalTask.Companion.moveToGoalUntil
+import com.lambda.util.BaritoneUtils
 import com.lambda.util.BlockUtils.blockState
+import com.lambda.util.BlockUtils.item
+import com.lambda.util.item.ItemUtils.defaultDisposables
+import com.lambda.util.player.SlotUtils.clickSlot
+import com.lambda.util.player.SlotUtils.hotbarAndStorage
+import com.lambda.util.primitives.extension.inventorySlots
 import com.lambda.util.world.raycast.RayCastUtils.blockResult
 import net.minecraft.block.BlockState
 import net.minecraft.entity.ItemEntity
+import net.minecraft.screen.slot.SlotActionType
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 
@@ -37,6 +44,7 @@ class BreakBlock @Ta5kBuilder constructor(
     val SafeContext.state: BlockState get() = blockPos.blockState(world)
     override var cooldown = Int.MAX_VALUE
         get() = maxOf(TaskFlow.build.breakCoolDown, TaskFlow.taskCooldown)
+    private var drop: ItemEntity? = null
 
     override fun SafeContext.onStart() {
         parent?.let {
@@ -67,6 +75,23 @@ class BreakBlock @Ta5kBuilder constructor(
         }
 
         listener<TickEvent.Pre> {
+            drop?.let { itemDrop ->
+                if (!world.entities.contains(itemDrop)) {
+                    success(itemDrop)
+                    return@listener
+                }
+
+                if (player.hotbarAndStorage.none { it.isEmpty }) {
+                    player.currentScreenHandler.inventorySlots.firstOrNull {
+                        it.stack.item in defaultDisposables
+                    }?.let {
+                        clickSlot(it.index, 1, SlotActionType.THROW)
+                    }
+                }
+
+                BaritoneUtils.setGoalAndPath(GoalBlock(itemDrop.blockPos))
+            }
+
             if (finish()) {
                 success(null)
                 return@listener
@@ -80,17 +105,12 @@ class BreakBlock @Ta5kBuilder constructor(
 
         listener<WorldEvent.EntitySpawn> {
             if (collectDrop
+                && drop == null
                 && it.entity is ItemEntity
                 && it.entity.pos.isInRange(blockPos.toCenterPos(), 1.0)
 //                && it.entity.stack.item == beginState?.block?.item // ToDo: The item entities are all air??
             ) {
-                moveToGoalUntil(
-                    { GoalBlock(it.entity.blockPos) },
-                    { !world.entities.contains(it.entity) }
-                ).onSuccess { _, _ ->
-                    success(it.entity)
-                }.start(this@BreakBlock)
-//                success(it.entity)
+                drop = it.entity
             }
         }
     }

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

@@ -1,9 +1,7 @@
 package com.lambda.task.tasks
 
-import baritone.api.pathing.goals.Goal
 import baritone.api.pathing.goals.GoalNear
 import com.lambda.Lambda.LOG
-import com.lambda.Lambda.mc
 import com.lambda.context.SafeContext
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listener
@@ -16,13 +14,8 @@ import com.lambda.interaction.construction.simulation.BuildSimulator.simulate
 import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.module.modules.client.TaskFlow
 import com.lambda.task.Task
-import com.lambda.threading.runConcurrent
-import com.lambda.threading.runGameScheduled
 import com.lambda.util.BaritoneUtils
-import net.minecraft.block.BlockState
-import net.minecraft.util.math.BlockBox
 import net.minecraft.util.math.BlockPos
-import net.minecraft.world.chunk.WorldChunk
 
 class BuildStructure @Ta5kBuilder constructor(
     private val blueprint: Blueprint,