Revert "cleaner configs idea"

This reverts commit 5de8935.

Author: beanbag44

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

@@ -25,7 +25,6 @@ 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
@@ -62,14 +61,11 @@ object BuildCommand : LambdaCommand(
                                 .loadStructureByRelativePath(Path.of(pathString))
                                 .let { template ->
                                     info("Building structure $pathString with dimensions ${template.size.toShortString()} created by ${template.author}")
-                                    DefaultConfigs.run {
-                                        lastBuildTask = build(
-                                            template
-                                                .toStructure()
-                                                .move(player.blockPos)
-                                                .toBlueprint()
-                                        ).run()
-                                    }
+                                    lastBuildTask = template.toStructure()
+                                        .move(player.blockPos)
+                                        .toBlueprint()
+                                        .build()
+                                        .run()
 
                                     return@executeWithResult success()
                                 }

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

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2024 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 net.minecraft.client.MinecraftClient
+import net.minecraft.client.network.ClientPlayNetworkHandler
+import net.minecraft.client.network.ClientPlayerEntity
+import net.minecraft.client.network.ClientPlayerInteractionManager
+import net.minecraft.client.world.ClientWorld
+
+/**
+ * Representing an abstract context in the [MinecraftClient].
+ *
+ * @property mc The Minecraft client instance.
+ * @property world The world in which the player is currently located, or `null` if the world is not available.
+ * @property player The player entity, or `null` if the player is not available.
+ * @property interaction The interaction manager for the player, or `null` if the interaction manager is not available.
+ * @property connection The network handler for the player, or `null` if the network handler is not available.
+ */
+abstract class AbstractContext {
+    val mc: MinecraftClient = MinecraftClient.getInstance()
+    abstract val world: ClientWorld?
+    abstract val player: ClientPlayerEntity?
+    abstract val interaction: ClientPlayerInteractionManager?
+    abstract val connection: ClientPlayNetworkHandler?
+}

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

@@ -35,29 +35,16 @@ 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 {
-    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
+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
 
     fun toSafe(): SafeContext? {
-        if (clientWorld == null || clientPlayer == null || clientInteraction == null || clientConnection == null) {
+        if (world == null || player == null || interaction == null || connection == null) {
             return null
         }
-        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)
-        }
+        return SafeContext(world, player, interaction, connection)
     }
 }

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

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

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

@@ -20,7 +20,6 @@ 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
@@ -97,7 +96,7 @@ sealed class BreakResult : BuildResult() {
 
         override val pausesParent get() = true
 
-        override fun Configured.resolve() =
+        override fun resolve() =
             selectStack {
                 isItem(badItem).not()
             }.transfer(MainHandContainer, inventory)

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

@@ -20,7 +20,6 @@ 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
@@ -206,7 +205,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
 
         override val pausesParent get() = true
 
-        override fun Configured.resolve() = neededSelection
+        override fun resolve() = neededSelection
             .transfer(MainHandContainer, inventory) ?: MaterialContainer.FailureTask("Couldn't find $neededSelection anywhere.")
 
         override fun SafeContext.buildRenderer() {
@@ -242,7 +241,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
 
         override val pausesParent get() = true
 
-        override fun Configured.resolve() =
+        override fun resolve() =
             neededStack.select()
                 .transfer(MainHandContainer, inventory) ?: MaterialContainer.FailureTask("Couldn't find ${neededStack.item.name.string} anywhere.")
 

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

@@ -19,7 +19,6 @@ 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
@@ -110,7 +109,7 @@ sealed class PlaceResult : BuildResult() {
     ) : Resolvable, PlaceResult() {
         override val rank = Rank.PLACE_CANT_REPLACE
 
-        override fun Configured.resolve() = breakBlock(blockPos)
+        override fun resolve() = breakBlock(blockPos)
     }
 
     /**