small fixes / cleanup

Author: beanbag44

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

@@ -33,8 +33,8 @@ class BuildSettings(
         Scan("Scan")
     }
 
-    override val breakBlocks by c.setting("Break", true, "Break blocks")
-    override val interactBlocks by c.setting("Place / Interact", true, "Interact blocks")
+    override val breakBlocks by c.setting("Break", true, "Break blocks").group(baseGroup, Group.General).index()
+    override val interactBlocks by c.setting("Place / Interact", true, "Interact blocks").group(baseGroup, Group.General).index()
 
     override val pathing by c.setting("Pathing", true, "Path to blocks").group(baseGroup, Group.General).index()
     override val stayInRange by c.setting("Stay In Range", true, "Stay in range of blocks").group(baseGroup, Group.General).index()

src/main/kotlin/com/lambda/interaction/construction/simulation/SimInfo.kt

@@ -68,7 +68,7 @@ interface SimInfo : Automated {
 	        pov,
 	        Stack(),
 	        concurrentResults
-		)?.takeIf { it.hasBasicRequirements() }?.sim()
+		).takeIf { it.hasBasicRequirements() }?.sim()
 
         /**
          * Creates a new [SimInfo] using the current [SimInfo]'s [dependencyStack] and [concurrentResults],
@@ -89,7 +89,7 @@ interface SimInfo : Automated {
 	        pov,
 	        Stack<Sim<*>>().apply { addAll(dependencyStack) },
 	        concurrentResults
-		)?.takeIf { it.hasBasicRequirements() }?.sim()
+		).takeIf { it.hasBasicRequirements() }?.sim()
 
 	    @SimDsl
 	    private fun AutomatedSafeContext.getTypedInfo(
@@ -99,10 +99,10 @@ interface SimInfo : Automated {
 		    pov: Vec3d,
 		    dependencyStack: Stack<Sim<*>>,
 		    concurrentResults: MutableSet<BuildResult>
-	    ): SimInfo? =
+	    ): SimInfo {
 		    if (!targetState.isEmpty()) {
 			    getProcessingInfo(state, targetState, pos)?.let { preProcessing ->
-				    object : InteractSimInfo, Automated by this {
+				    return object : InteractSimInfo, Automated by this {
 					    override val pos = pos
 					    override val state = state
 					    override val targetState = targetState
@@ -121,7 +121,9 @@ interface SimInfo : Automated {
 						    expectedState.matches(state, if (!completely) preProcessing.info.ignore else emptySet())
 				    }
 			    }
-		    } else object : BreakSimInfo, Automated by this {
+		    }
+
+		    return object : BreakSimInfo, Automated by this {
 			    override val pos = pos
 			    override val state = state
 			    override val targetState = targetState
@@ -132,6 +134,7 @@ interface SimInfo : Automated {
 			    context(_: AutomatedSafeContext, _: Sim<*>)
 			    override suspend fun sim() = simBreak()
 		    }
+	    }
     }
 }
 

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

@@ -128,11 +128,12 @@ class BuildTask private constructor(
         val viableResults = results
             .filter { result ->
                 val finalResult = (result as? Dependent)?.lastDependency ?: result
-                pendingInteractions.none { it.blockPos == result.pos } &&
+                pendingInteractions.none { it.blockPos == finalResult.pos } &&
+                        (finalResult !is Contextual ||
                         when (finalResult) {
                             is BreakResult -> buildConfig.breakBlocks
                             else -> buildConfig.interactBlocks
-                        }
+                        })
             }
             .sorted()