onItemBreak variable

Author: beanbag44

common/src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt

@@ -187,7 +187,6 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
             postEvent()
         }
 
-        //ToDo: Clean this up
         listen<WorldEvent.BlockUpdate.Server> { event ->
             pendingInteractions
                 .firstOrNull { it.context.expectedPos == event.pos }
@@ -265,7 +264,7 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
         rotationConfig: RotationConfig,
         hotbarConfig: HotbarConfig,
         onBreak: () -> Unit,
-        onItemDrop: (ItemEntity) -> Unit
+        onItemDrop: ((ItemEntity) -> Unit)?
     ): BreakInfo? {
         val breakInfo = BreakInfo(requestCtx, BreakType.Primary,
             buildConfig.breakSettings, rotationConfig, hotbarConfig,
@@ -503,7 +502,7 @@ object BreakManager : RequestHandler<BreakRequest>(), PositionBlocking {
         val rotationConfig: RotationConfig,
         val hotbarConfig: HotbarConfig,
         val onBreak: () -> Unit,
-        val onItemDrop: (ItemEntity) -> Unit
+        val onItemDrop: ((ItemEntity) -> Unit)?
     ) {
         var breaking = false
         var breakingTicks = 0

common/src/main/kotlin/com/lambda/interaction/request/breaking/BreakRequest.kt

@@ -34,7 +34,7 @@ data class BreakRequest(
     val hotbarConfig: HotbarConfig,
     val prio: Priority = 0,
     val onBreak: () -> Unit,
-    val onItemDrop: (ItemEntity) -> Unit,
+    val onItemDrop: ((ItemEntity) -> Unit)?,
 ) : Request(prio) {
     override val done: Boolean
         get() = runSafe {

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

@@ -80,6 +80,11 @@ class BuildTask @Ta5kBuilder constructor(
     private val dropsToCollect = mutableSetOf<ItemEntity>()
 //    private var goodPositions = setOf<BlockPos>()
 
+    private val onItemDrop: ((item: ItemEntity) -> Unit)?
+        get() = if (collectDrops) {
+            item -> dropsToCollect.add(item)
+        } else null
+
     override fun SafeContext.onStart() {
         (blueprint as? PropagatingBlueprint)?.next()
     }
@@ -122,8 +127,9 @@ class BuildTask @Ta5kBuilder constructor(
                     build.breakSettings.request(
                         BreakRequest(
                             instantResults.map { it.context }, build, rotation, hotbar,
-                            onBreak = { breaks++ }
-                        ) { item -> if (collectDrops) dropsToCollect.add(item) }
+                            onBreak = { breaks++ },
+                            onItemDrop = onItemDrop
+                        )
                     )
                     return@onRotate
                 }
@@ -168,8 +174,9 @@ class BuildTask @Ta5kBuilder constructor(
 
                             val request = BreakRequest(
                                 breakContexts, build, rotation, hotbar,
-                                onBreak = { breaks++ }
-                            ) { item -> if (collectDrops) dropsToCollect.add(item) }
+                                onBreak = { breaks++ },
+                                onItemDrop = onItemDrop
+                            )
                             build.breakSettings.request(request)
                             return@onRotate
                         }