Merge branch '1.21.11' into improvement/container-utils-rework

Author: beanbag44

README.md

@@ -2,11 +2,12 @@
     <img src="https://raw.githubusercontent.com/lambda-client/assets/main/lambda%20logo%20text.svg" style="width: 69%" alt="logo">
 </p>
 
-![Minecraft](https://img.shields.io/badge/minecraft-1.21.5-green?link=https%3A%2F%2Fwww.minecraft.net%2F)
+![Minecraft](https://img.shields.io/badge/minecraft-1.21.11-green?link=https%3A%2F%2Fwww.minecraft.net%2F)
+![Minecraft](https://img.shields.io/badge/minecraft-1.21.5-red?link=https%3A%2F%2Fwww.minecraft.net%2F)
 ![GitHub Downloads](https://img.shields.io/github/downloads/lambda-client/lambda/total)
 ![Discord](https://img.shields.io/discord/834570721070022687?logo=Discord&logoColor=white&link=https%3A%2F%2Fdiscord.gg%2FMBAEzyFn)
 ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/lambda-client/lambda?color=royalblue)
-![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/lambda-client/lambda/build.yml?branch=1.21.5&logo=gradle)
+![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/lambda-client/lambda/nightly_build.yml?logo=gradle)
 ![GitHub Contributors](https://img.shields.io/github/contributors/lambda-client/lambda)
 ![GitHub Repo Stars](https://img.shields.io/github/stars/lambda-client/lambda)
 ![GitHub License](https://img.shields.io/github/license/lambda-client/lambda?logo=gplv3&link=https%3A%2F%2Fwww.gnu.org%2Flicenses%2Fgpl-3.0.en.html)
@@ -55,10 +56,13 @@ Find our backup matrix space at [\#lambda-client:matrix.org](https://app.element
 
 ## Installation
 <a href="https://fabricmc.net/wiki/install"><img src="https://cdn.jonasjones.dev/mod-badges/support-fabric.png" width="150px" alt="Fabric Supported"></a>
-1. Install Minecraft 1.21.5 [(download)](https://www.minecraft.net/)
+1. Install the Minecraft version corresponding to the mod release(download)](https://www.minecraft.net/)
 2. Install Fabric [(download)](https://fabricmc.net/use/installer/)
 3. Get the latest Lambda version here [(download)](https://github.com/lambda-client/lambda/releases/download/0.0.2%2B1.21.5/lambda-0.0.2+1.21.5.jar)
-4. Put the file in your `.minecraft/mods` folder
+4. Get the corresponding [Baritone](https://github.com/cabaletta/baritone/releases) api fabric build
+5. Get [Kotlin For Fabric](https://modrinth.com/mod/fabric-language-kotlin)
+6. Get the latest [Fabric API](https://modrinth.com/mod/fabric-api/) release
+7. Put the files in your `.minecraft/mods` folder
 
 ## Getting Started
 
@@ -99,4 +103,4 @@ you can visit our [official Discord server](https://discord.gg/MBAEzyFn).
 
 > ### Disclaimer
 > Lambda is not affiliated with Mojang Studios. Minecraft is a registered trademark of Mojang Studios.
-Use of the Lambda software is subject to the terms outlined in the license agreement [GNU General Public License v3.0](https://github.com/lambda-client/lambda/blob/master/LICENSE.md).
+Use of the Lambda software is subject to the terms outlined in the license agreement [GNU General Public License v3.0](https://github.com/lambda-client/lambda/blob/master/LICENSE.md).

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() == true }?.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() == true }?.sim()
 
 	    @SimDsl
 	    private fun AutomatedSafeContext.getTypedInfo(
@@ -99,10 +99,11 @@ interface SimInfo : Automated {
 		    pov: Vec3d,
 		    dependencyStack: Stack<Sim<*>>,
 		    concurrentResults: MutableSet<BuildResult>
-	    ): SimInfo {
+	    ): SimInfo? {
 		    if (!targetState.isEmpty()) {
 			    getProcessingInfo(state, targetState, pos)?.let { preProcessing ->
-				    return object : InteractSimInfo, Automated by this {
+				    return if (preProcessing.info.omitInteraction) null
+				    else object : InteractSimInfo, Automated by this {
 					    override val pos = pos
 					    override val state = state
 					    override val targetState = targetState

src/main/kotlin/com/lambda/interaction/construction/simulation/processing/PreProcessingInfo.kt

@@ -35,6 +35,7 @@ interface PreProcessingInfo {
 	val placing: Boolean
 	val sneak: Boolean?
 	val noCaching: Boolean
+	val omitInteraction: Boolean
 
 	companion object {
 		context(_: AutomatedSafeContext)
@@ -47,6 +48,7 @@ interface PreProcessingInfo {
 			override val placing = true
 			override val sneak = null
 			override val noCaching = true
+			override val omitInteraction = false
 		}
 	}
 }
@@ -60,7 +62,7 @@ class PreProcessingInfoAccumulator(
 	override var placing: Boolean = true,
 	override var sneak: Boolean? = null,
 	override var noCaching: Boolean = false,
-	var omitInteraction: Boolean = false
+	override var omitInteraction: Boolean = false
 ) : PreProcessingInfo {
 	@InfoAccumulator
 	fun offerSurfaceScan(scan: SurfaceScan) {

src/main/kotlin/com/lambda/interaction/construction/simulation/processing/ProcessorRegistry.kt

@@ -139,9 +139,9 @@ object ProcessorRegistry : Loadable {
 			preProcess(pos, state, targetBlockState, targetState.getStack(pos)).also { info ->
 				if (info?.noCaching != true) processorCache[processorCacheKey] = info
 			}
-		}
+		} ?: return null
 
-		return PreProcessingData(preProcessingInfo ?: return null, pos)
+		return PreProcessingData(preProcessingInfo, pos)
 	}
 
 	context(safeContext: SafeContext)
@@ -153,7 +153,7 @@ object ProcessorRegistry : Loadable {
 						with(processor) { preProcess(state, targetState, pos) }
 				}
 			}
-			if (!stateProcessing) {
+			if (!stateProcessing && !omitInteraction) {
 				if (state.block != expectedState.block) {
 					if (!state.isReplaceable) return@run null
 					propertyPreProcessors.forEach { processor ->
@@ -169,7 +169,6 @@ object ProcessorRegistry : Loadable {
 					if (!state.matches(targetState, ignore)) return@run null
 				}
 			}
-			if (omitInteraction) return@run null
 			complete()
 		}
 }