Ignore unobtainable block properties

Author: Avanatiker

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

@@ -62,7 +62,8 @@ sealed class PlaceResult : BuildResult() {
     data class NoIntegrity(
         override val blockPos: BlockPos,
         val expected: BlockState,
-        val simulated: ItemPlacementContext
+        val simulated: ItemPlacementContext,
+        val actual: BlockState? = null
     ) : Drawable, PlaceResult() {
         override val rank = Rank.PLACE_NO_INTEGRITY
         private val color = Color(252, 3, 3, 100)

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

@@ -94,7 +94,7 @@ object BuildSimulator {
         }
 
         /* block is unbreakable, so it cant be broken or replaced */
-        if (state.getHardness(world, pos) < 0) {
+        if (state.getHardness(world, pos) < 0 && !player.isCreative) {
             return BuildResult.Unbreakable(pos, state)
         }
 
@@ -222,7 +222,9 @@ object BuildSimulator {
                 }
 
                 if (!target.matches(resultState, pos, world)) {
-                    acc.add(PlaceResult.NoIntegrity(pos, resultState, context))
+                    acc.add(PlaceResult.NoIntegrity(
+                        pos, resultState, context, (target as? TargetState.State)?.blockState)
+                    )
                     return@forEach
                 }
 

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

@@ -8,6 +8,7 @@ import net.minecraft.block.BlockState
 import net.minecraft.client.world.ClientWorld
 import net.minecraft.item.ItemStack
 import net.minecraft.item.Items
+import net.minecraft.state.property.Properties
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 
@@ -46,7 +47,9 @@ sealed class TargetState(val type: Type) : StateMatcher {
 
     data class State(val blockState: BlockState) : TargetState(Type.STATE) {
         override fun matches(state: BlockState, pos: BlockPos, world: ClientWorld) =
-            state == blockState
+            state.block == blockState.block && state.properties.all {
+                it in TaskFlow.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/module/modules/client/TaskFlow.kt

@@ -7,6 +7,7 @@ import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.BlockUtils.allSigns
 import com.lambda.util.item.ItemUtils
+import net.minecraft.state.property.Properties
 
 object TaskFlow : Module(
     name = "TaskFlow",
@@ -32,4 +33,11 @@ object TaskFlow : Module(
     }
     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
+    )
+//    val ignoredTags by setting("Ignored Tags", defaultIgnoreTags)
 }