Fix collecting items

Author: Avanatiker

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

@@ -30,6 +30,7 @@ sealed class BreakResult : BuildResult() {
         private val color = Color(222, 0, 0, 100)
 
         var collectDrop = false
+        override val pausesParent get() = collectDrop
 
         override fun SafeContext.onStart() {
             breakBlock(context, collectDrop = collectDrop).onSuccess { _, _ ->

common/src/main/kotlin/com/lambda/module/modules/player/HighwayTools.kt

@@ -28,7 +28,7 @@ object HighwayTools : Module(
     private val rimHeight by setting("Rim Height", 1, 0..6, 1)
     private val cornerBlock by setting("Corner Block", false, description = "Include corner blocks in the highway")
     private val ceiling by setting("Ceiling", false, description = "Smooth roof over the highway")
-    private val ceilingMaterial by setting("Ceiling Material", Blocks.OBSIDIAN, description = "Material to build the ceiling with")
+    private val ceilingMaterial by setting("Ceiling Material", Blocks.OBSIDIAN, description = "Material to build the ceiling with") { ceiling }
     private val distance by setting("Distance", -1, -1..1000000, 1, description = "Distance to build the highway (negative for infinite)")
     private val sliceSize by setting("Slice Size", 3, 1..5, 1, description = "Number of slices to build at once")
     private val material by setting("Highway Material", Blocks.OBSIDIAN, description = "Material to build the highway with")

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

@@ -76,6 +76,7 @@ class BreakBlock @Ta5kBuilder constructor(
         listener<TickEvent.Pre> {
             drop?.let { itemDrop ->
                 if (!world.entities.contains(itemDrop)) {
+                    BaritoneUtils.cancel()
                     success(itemDrop)
                     return@listener
                 }
@@ -86,6 +87,7 @@ class BreakBlock @Ta5kBuilder constructor(
                     }?.let {
                         clickSlot(it.index, 1, SlotActionType.THROW)
                     }
+                    return@listener
                 }
 
                 BaritoneUtils.setGoalAndPath(GoalBlock(itemDrop.blockPos))
@@ -98,16 +100,17 @@ class BreakBlock @Ta5kBuilder constructor(
             if (done()) {
                 state = State.COLLECTING
                 if (!collectDrop) {
+                    BaritoneUtils.cancel()
                     success(null)
                 }
             }
         }
 
+        // ToDo: Find out when the stack entity is filled with the item
         listener<WorldEvent.EntityUpdate> {
             if (collectDrop
                 && it.entity is ItemEntity
                 && it.entity.pos.isInRange(blockPos.toCenterPos(), 0.5)
-
             ) {
                 drop = it.entity
             }

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

@@ -32,15 +32,11 @@ class PlaceContainer @Ta5kBuilder constructor(
                     .simulate(player.getCameraPosVec(mc.tickDelta))
             }
 
-//        val res = results.sorted()
-//        res
-
         val succeeds = results.filterIsInstance<PlaceResult.Place>().filter {
             canBeOpened(stack, it.blockPos, it.context.result.side)
         }
         val wrongStacks = results.filterIsInstance<BuildResult.WrongStack>().filter {
-            val result = (it.context as? PlaceContext)?.result ?: return@filter false
-            canBeOpened(stack, it.blockPos, result.side)
+            canBeOpened(stack, it.blockPos, it.context.result.side)
         }
         (succeeds + wrongStacks).minOrNull()?.let { result ->
             build {

common/src/main/kotlin/com/lambda/util/item/ItemUtils.kt

@@ -53,6 +53,7 @@ object ItemUtils {
 
     val misc = setOf(
         Items.SHEARS,
+        Items.FLINT_AND_STEEL,
     )
 
     val tools = pickaxes + shovels + axes + hoes + swords + misc