Refactor inventory and build configurations

Standardize access to `disposables` and `ignoredBlocks` under specific config groups for modularity. Improved task handling by adding a new debug setting and validating rotation states in build tasks. Removed redundant logging and adjusted conditional checks for cleaner code execution.

Author: Avanatiker

common/src/main/kotlin/com/lambda/config/groups/BuildConfig.kt

@@ -17,19 +17,22 @@
 
 package com.lambda.config.groups
 
+import net.minecraft.block.Block
+
 interface BuildConfig {
     // General
     val pathing: Boolean
     val stayInRange: Boolean
     val collectDrops: Boolean
-    val forceSilkTouch: Boolean
 
     // Breaking
     val rotateForBreak: Boolean
     val breakConfirmation: Boolean
     val maxPendingBreaks: Int
     val breaksPerTick: Int
     val breakWeakBlocks: Boolean
+    val forceSilkTouch: Boolean
+    val ignoredBlocks: Set<Block>
 
     // Placing
     val rotateForPlace: Boolean

common/src/main/kotlin/com/lambda/config/groups/BuildSettings.kt

@@ -18,6 +18,8 @@
 package com.lambda.config.groups
 
 import com.lambda.config.Configurable
+import com.lambda.module.modules.client.TaskFlowModule.setting
+import com.lambda.util.BlockUtils.allSigns
 
 class BuildSettings(
     c: Configurable,
@@ -41,6 +43,7 @@ class BuildSettings(
     override val breaksPerTick by c.setting("Instant Breaks Per Tick", 5, 1..30, 1, "Maximum instant block breaks per tick") { vis() && page == Page.BREAK }
     override val breakWeakBlocks by c.setting("Break Weak Blocks", false, "Break blocks that dont have structural integrity (e.g: grass)") { vis() && page == Page.BREAK }
     override val forceSilkTouch by c.setting("Force Silk Touch", false, "Force silk touch when breaking blocks") { vis() && page == Page.BREAK }
+    override val ignoredBlocks by setting("Ignored Blocks", allSigns, "Blocks that wont be broken") { vis() && page == Page.BREAK }
 
     // Placing
     override val rotateForPlace by c.setting("Rotate For Place", true, "Rotate towards block while placing") { vis() && page == Page.PLACE }

common/src/main/kotlin/com/lambda/config/groups/InventoryConfig.kt

@@ -19,8 +19,11 @@ package com.lambda.config.groups
 
 import com.lambda.interaction.material.container.MaterialContainer
 import com.lambda.interaction.material.StackSelection
+import net.minecraft.block.Block
 
 interface InventoryConfig {
+    val disposables: Set<Block>
+
     val actionTimout: Int
     val swapWithDisposables: Boolean
 

common/src/main/kotlin/com/lambda/config/groups/InventorySettings.kt

@@ -18,14 +18,15 @@
 package com.lambda.config.groups
 
 import com.lambda.config.Configurable
+import com.lambda.util.item.ItemUtils
 
 class InventorySettings(
     c: Configurable,
     vis: () -> Boolean = { true },
 ) : InventoryConfig {
-    override val actionTimout by c.setting("Action Timeout", 10, 0..100, 1, "How long to wait for after each inventory action", " ticks")
+    override val disposables by c.setting("Disposables", ItemUtils.defaultDisposables, "Items that will be ignored when checking for a free slot", vis)
+    override val actionTimout by c.setting("Action Timeout", 10, 0..100, 1, "How long to wait for after each inventory action", " ticks", vis)
     override val swapWithDisposables by c.setting("Swap With Disposables", true, "Swap items with disposable ones", vis)
-
     override val providerPriority by c.setting("Provider Priority", InventoryConfig.Priority.WITH_MIN_ITEMS, "What container to prefer when retrieving the item from", vis)
     override val storePriority by c.setting("Store Priority", InventoryConfig.Priority.WITH_MIN_ITEMS, "What container to prefer when storing the item to", vis)
 }

common/src/main/kotlin/com/lambda/interaction/construction/simulation/BuildSimulator.kt

@@ -97,7 +97,7 @@ object BuildSimulator {
         }
 
         /* block should be ignored */
-        if (state.block in TaskFlowModule.ignoredBlocks && target.type == TargetState.Type.AIR) {
+        if (state.block in TaskFlowModule.build.ignoredBlocks && target.type == TargetState.Type.AIR) {
             return BuildResult.Ignored(pos)
         }
 

common/src/main/kotlin/com/lambda/interaction/construction/verify/TargetState.kt

@@ -55,7 +55,7 @@ sealed class TargetState(val type: Type) : StateMatcher {
 
         override fun getStack(world: ClientWorld, pos: BlockPos) =
             findDisposable()?.stacks?.firstOrNull {
-                it.item.block in TaskFlowModule.disposables
+                it.item.block in TaskFlowModule.inventory.disposables
             } ?: ItemStack(Items.NETHERRACK)
 
         override fun isAir() = false
@@ -70,7 +70,7 @@ sealed class TargetState(val type: Type) : StateMatcher {
 
         override fun getStack(world: ClientWorld, pos: BlockPos) =
             findDisposable()?.stacks?.firstOrNull {
-                it.item.block in TaskFlowModule.disposables
+                it.item.block in TaskFlowModule.inventory.disposables
             } ?: ItemStack(Items.NETHERRACK)
 
         override fun isAir() = false
@@ -81,7 +81,7 @@ sealed class TargetState(val type: Type) : StateMatcher {
 
         override fun matches(state: BlockState, pos: BlockPos, world: ClientWorld) =
             state.block == blockState.block && state.properties.all {
-                it in TaskFlowModule.defaultIgnoreTags || state[it] == blockState[it]
+                /*it in TaskFlowModule.defaultIgnoreTags ||*/ state[it] == blockState[it]
             }
         override fun getStack(world: ClientWorld, pos: BlockPos): ItemStack =
             blockState.block.getPickStack(world, pos, blockState)

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

@@ -133,7 +133,7 @@ object ContainerManager : Loadable {
     }?.first
 
     fun findDisposable() = container().find { container ->
-        TaskFlowModule.disposables.any { container.materialAvailable(it.item.select()) >= 0 }
+        TaskFlowModule.inventory.disposables.any { container.materialAvailable(it.item.select()) >= 0 }
     }
 
     class NoContainerFound(selection: StackSelection) : Exception("No container found matching $selection")

common/src/main/kotlin/com/lambda/interaction/material/transfer/InventoryTransaction.kt

@@ -20,7 +20,6 @@ package com.lambda.interaction.material.transfer
 import com.lambda.context.SafeContext
 import com.lambda.task.Task
 import com.lambda.threading.runSafe
-import com.lambda.util.Communication.info
 
 abstract class InventoryTransaction : Task<InventoryChanges>() {
     private var changes: InventoryChanges? = null
@@ -33,7 +32,6 @@ abstract class InventoryTransaction : Task<InventoryChanges>() {
         runSafe {
             changes?.let {
                 it.detectChanges()
-                info("Changes: $it")
                 success(it)
             }
         } ?: failure("Failed to finish transaction")

common/src/main/kotlin/com/lambda/module/modules/client/TaskFlowModule.kt

@@ -18,6 +18,7 @@
 package com.lambda.module.modules.client
 
 import com.lambda.config.groups.BuildSettings
+import com.lambda.config.groups.BuildSettings.Page
 import com.lambda.config.groups.InteractionSettings
 import com.lambda.config.groups.InventorySettings
 import com.lambda.config.groups.RotationSettings
@@ -36,7 +37,7 @@ object TaskFlowModule : Module(
     defaultTags = setOf(ModuleTag.CLIENT, ModuleTag.AUTOMATION)
 ) {
     enum class Page {
-        BUILD, ROTATION, INTERACTION, INVENTORY
+        BUILD, ROTATION, INTERACTION, INVENTORY, DEBUG
     }
 
     private val page by setting("Page", Page.BUILD)
@@ -45,20 +46,7 @@ object TaskFlowModule : Module(
     val interact = InteractionSettings(this) { page == Page.INTERACTION }
     val inventory = InventorySettings(this) { page == Page.INVENTORY }
 
-    val disposables by setting("Disposables", ItemUtils.defaultDisposables)
-    val ignoredBlocks by setting("Ignored Blocks", allSigns)
-    val defaultIgnoreTags = setOf(
-        Properties.DISTANCE_1_7,
-        Properties.PERSISTENT,
-        Properties.WATERLOGGED,
-        Properties.STAIR_SHAPE,
-        Properties.UP,
-        Properties.DOWN,
-        Properties.NORTH,
-        Properties.EAST,
-        Properties.SOUTH,
-        Properties.WEST
-    )
+    val showAllEntries by setting("Show All Entries", false, "Show all entries in the task tree") { page == Page.DEBUG }
 
     @Volatile
     var drawables = listOf<Drawable>()

common/src/main/kotlin/com/lambda/task/Task.kt

@@ -23,6 +23,7 @@ import com.lambda.event.EventFlow
 import com.lambda.event.Subscriber
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
+import com.lambda.module.modules.client.TaskFlowModule
 import com.lambda.threading.runSafe
 import com.lambda.util.Communication.logError
 import com.lambda.util.Nameable
@@ -323,9 +324,9 @@ abstract class Task<Result> : Nameable {
 
     private fun StringBuilder.appendTaskTree(task: Task<*>, level: Int = 0) {
         appendLine("${" ".repeat(level * 4)}${task.name}" + if (task !is TaskFlow) " [${task.state.display}]" else "")
-//        if (task.state == State.COMPLETED || task.state == State.CANCELLED) return
+        if (!TaskFlowModule.showAllEntries && (task.state == State.COMPLETED || task.state == State.CANCELLED)) return
         task.subTasks.forEach {
-//            if (task is TaskFlow && (it.state == State.COMPLETED || it.state == State.CANCELLED)) return@forEach
+            if (!TaskFlowModule.showAllEntries && task is TaskFlow && (it.state == State.COMPLETED || it.state == State.CANCELLED)) return@forEach
             appendTaskTree(it, level + 1)
         }
     }