cleaner configs idea

Author: beanbag44

common/src/main/kotlin/com/lambda/command/commands/BuildCommand.kt

@@ -25,6 +25,7 @@ import com.lambda.brigadier.argument.value
 import com.lambda.brigadier.executeWithResult
 import com.lambda.brigadier.required
 import com.lambda.command.LambdaCommand
+import com.lambda.context.DefaultConfigs
 import com.lambda.interaction.construction.StructureRegistry
 import com.lambda.interaction.construction.blueprint.Blueprint.Companion.toStructure
 import com.lambda.interaction.construction.blueprint.StaticBlueprint.Companion.toBlueprint
@@ -61,11 +62,14 @@ object BuildCommand : LambdaCommand(
                                 .loadStructureByRelativePath(Path.of(pathString))
                                 .let { template ->
                                     info("Building structure $pathString with dimensions ${template.size.toShortString()} created by ${template.author}")
-                                    lastBuildTask = template.toStructure()
-                                        .move(player.blockPos)
-                                        .toBlueprint()
-                                        .build()
-                                        .run()
+                                    DefaultConfigs.run {
+                                        lastBuildTask = build(
+                                            template
+                                                .toStructure()
+                                                .move(player.blockPos)
+                                                .toBlueprint()
+                                        ).run()
+                                    }
 
                                     return@executeWithResult success()
                                 }

common/src/main/kotlin/com/lambda/context/AbstractContext.kt

@@ -35,16 +35,29 @@ import net.minecraft.client.world.ClientWorld
  *
  * @function toSafe Converts the `ClientContext` to a `SafeContext` if all properties are not `null`, or returns `null` otherwise.
  */
-open class ClientContext : AbstractContext() {
-    final override val world: ClientWorld? = mc.world
-    final override val player: ClientPlayerEntity? = mc.player
-    final override val interaction: ClientPlayerInteractionManager? = mc.interactionManager
-    final override val connection: ClientPlayNetworkHandler? = mc.networkHandler
+open class ClientContext {
+    val mc: MinecraftClient = MinecraftClient.getInstance()
+    val clientWorld: ClientWorld? = mc.world
+    val clientPlayer: ClientPlayerEntity? = mc.player
+    val clientInteraction: ClientPlayerInteractionManager? = mc.interactionManager
+    val clientConnection: ClientPlayNetworkHandler? = mc.networkHandler
 
     fun toSafe(): SafeContext? {
-        if (world == null || player == null || interaction == null || connection == null) {
+        if (clientWorld == null || clientPlayer == null || clientInteraction == null || clientConnection == null) {
             return null
         }
-        return SafeContext(world, player, interaction, connection)
+        return object : SafeContext {
+            override val mc = this@ClientContext.mc
+            override val world: ClientWorld = clientWorld
+            override val player: ClientPlayerEntity = clientPlayer
+            override val interaction: ClientPlayerInteractionManager = clientInteraction
+            override val connection: ClientPlayNetworkHandler = clientConnection
+        }
+    }
+
+    fun toSafeConfigured(configured: Configured): ConfiguredSafeContext? {
+        return toSafe()?.let { safeContext ->
+            ConfiguredSafeContext(safeContext, configured)
+        }
     }
 }

common/src/main/kotlin/com/lambda/context/ClientContext.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.context
+
+import com.lambda.config.groups.BuildConfig
+import com.lambda.config.groups.InteractionConfig
+import com.lambda.config.groups.InventoryConfig
+import com.lambda.interaction.request.hotbar.HotbarConfig
+import com.lambda.interaction.request.rotation.RotationConfig
+
+interface Configured {
+    val build: BuildConfig
+    val interact: InteractionConfig
+    val inventory: InventoryConfig
+    val hotbar: HotbarConfig
+    val rotation: RotationConfig
+}

common/src/main/kotlin/com/lambda/context/Configured.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.context
+
+class ConfiguredSafeContext(
+    safeContext: SafeContext,
+    configured: Configured
+) : SafeContext by safeContext, Configured by configured

common/src/main/kotlin/com/lambda/context/ConfiguredSafeContext.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.context
+
+import com.lambda.module.modules.client.TaskFlowModule
+
+object DefaultConfigs : Configured {
+    override val build     = TaskFlowModule.build
+    override val interact  = TaskFlowModule.interact
+    override val inventory = TaskFlowModule.inventory
+    override val hotbar    = TaskFlowModule.hotbar
+    override val rotation  = TaskFlowModule.rotation
+}
+
+val Configured.breaking get() = build.breaking
+val Configured.placing get() = build.placing

common/src/main/kotlin/com/lambda/context/DefaultConfigs.kt

@@ -46,9 +46,10 @@ import net.minecraft.client.world.ClientWorld
  * @property interaction The interaction manager for the player.
  * @property connection The network handler for the player.
  **/
-open class SafeContext internal constructor(
-    override val world: ClientWorld,
-    override val player: ClientPlayerEntity,
-    override val interaction: ClientPlayerInteractionManager,
-    override val connection: ClientPlayNetworkHandler,
-) : AbstractContext()
+interface SafeContext {
+    val mc: MinecraftClient
+    val world: ClientWorld
+    val player: ClientPlayerEntity
+    val interaction: ClientPlayerInteractionManager
+    val connection: ClientPlayNetworkHandler
+}

common/src/main/kotlin/com/lambda/context/SafeContext.kt

@@ -20,6 +20,7 @@ package com.lambda.interaction.construction.result
 import baritone.api.pathing.goals.GoalBlock
 import baritone.api.pathing.goals.GoalInverted
 import com.lambda.config.groups.InventoryConfig
+import com.lambda.context.Configured
 import com.lambda.context.SafeContext
 import com.lambda.interaction.construction.context.BreakContext
 import com.lambda.interaction.material.StackSelection.Companion.selectStack
@@ -96,7 +97,7 @@ sealed class BreakResult : BuildResult() {
 
         override val pausesParent get() = true
 
-        override fun resolve() =
+        override fun Configured.resolve() =
             selectStack {
                 isItem(badItem).not()
             }.transfer(MainHandContainer, inventory)

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

@@ -20,6 +20,7 @@ package com.lambda.interaction.construction.result
 import baritone.api.pathing.goals.GoalBlock
 import baritone.api.pathing.goals.GoalNear
 import com.lambda.config.groups.InventoryConfig
+import com.lambda.context.Configured
 import com.lambda.context.SafeContext
 import com.lambda.interaction.construction.context.BuildContext
 import com.lambda.interaction.material.StackSelection
@@ -205,7 +206,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
 
         override val pausesParent get() = true
 
-        override fun resolve() = neededSelection
+        override fun Configured.resolve() = neededSelection
             .transfer(MainHandContainer, inventory) ?: MaterialContainer.FailureTask("Couldn't find $neededSelection anywhere.")
 
         override fun SafeContext.buildRenderer() {
@@ -241,7 +242,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
 
         override val pausesParent get() = true
 
-        override fun resolve() =
+        override fun Configured.resolve() =
             neededStack.select()
                 .transfer(MainHandContainer, inventory) ?: MaterialContainer.FailureTask("Couldn't find ${neededStack.item.name.string} anywhere.")
 

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

@@ -19,6 +19,7 @@ package com.lambda.interaction.construction.result
 
 import baritone.api.pathing.goals.GoalBlock
 import baritone.api.pathing.goals.GoalInverted
+import com.lambda.context.Configured
 import com.lambda.context.SafeContext
 import com.lambda.interaction.construction.context.PlaceContext
 import com.lambda.task.tasks.BuildTask.Companion.breakBlock
@@ -109,7 +110,7 @@ sealed class PlaceResult : BuildResult() {
     ) : Resolvable, PlaceResult() {
         override val rank = Rank.PLACE_CANT_REPLACE
 
-        override fun resolve() = breakBlock(blockPos)
+        override fun Configured.resolve() = breakBlock(blockPos)
     }
 
     /**