post-processing property checks on break manager block updates and added ignore drop warnings setting in task flow debug

Author: beanbag44

common/src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt

@@ -31,6 +31,7 @@ import com.lambda.event.listener.UnsafeListener.Companion.listenUnsafe
 import com.lambda.graphics.renderer.esp.builders.buildFilled
 import com.lambda.graphics.renderer.esp.builders.buildOutline
 import com.lambda.interaction.construction.context.BreakContext
+import com.lambda.interaction.construction.processing.ProcessorRegistry
 import com.lambda.interaction.request.ManagerUtils.isPosBlocked
 import com.lambda.interaction.request.PositionBlocking
 import com.lambda.interaction.request.Priority
@@ -55,6 +56,7 @@ import com.lambda.util.BlockUtils.emptyState
 import com.lambda.util.BlockUtils.isEmpty
 import com.lambda.util.BlockUtils.isNotBroken
 import com.lambda.util.BlockUtils.isNotEmpty
+import com.lambda.util.BlockUtils.matches
 import com.lambda.util.Communication.warn
 import com.lambda.util.item.ItemUtils.block
 import com.lambda.util.math.lerp
@@ -151,9 +153,12 @@ object BreakManager : RequestHandler<BreakRequest>(
                 .filterNotNull()
                 .firstOrNull { it.context.blockPos == event.pos }
                 ?.let { info ->
+                    val currentState = info.context.cachedState
                     // if not broken
-                    if (isNotBroken(info.context.cachedState, event.newState)) {
-                        this@BreakManager.warn("Break at ${event.pos.toShortString()} was rejected with ${event.newState} instead of ${info.context.cachedState.emptyState}")
+                    if (isNotBroken(currentState, event.newState)) {
+                        // check to see if its just some small property changes, e.g. redstone ore changing the LIT property
+                        if (!currentState.matches(event.newState, ProcessorRegistry.postProcessedProperties))
+                            this@BreakManager.warn("Break at ${event.pos.toShortString()} was rejected with ${event.newState} instead of ${info.context.cachedState.emptyState}")
                         // update the checked state
                         info.context.cachedState = event.newState
                         return@listen

common/src/main/kotlin/com/lambda/interaction/request/breaking/BrokenBlockHandler.kt

@@ -24,6 +24,7 @@ import com.lambda.event.events.EntityEvent
 import com.lambda.event.events.WorldEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.event.listener.UnsafeListener.Companion.listenUnsafe
+import com.lambda.interaction.construction.processing.ProcessorRegistry
 import com.lambda.interaction.request.breaking.BreakConfig.BreakConfirmationMode
 import com.lambda.interaction.request.breaking.BreakManager.lastPosStarted
 import com.lambda.interaction.request.breaking.BreakManager.matchesBlockItem
@@ -58,7 +59,7 @@ object BrokenBlockHandler {
             if (!loaded) return@let
 
             if (!info.broken) warn("${info::class.simpleName} at ${info.context.blockPos.toShortString()} timed out")
-            else warn("${info::class.simpleName}'s item drop at ${info.context.blockPos.toShortString()} timed out")
+            else if (!TaskFlowModule.ignoreItemDropWarnings) warn("${info::class.simpleName}'s item drop at ${info.context.blockPos.toShortString()} timed out")
 
             if (!info.broken && info.breakConfig.breakConfirmation != BreakConfirmationMode.AwaitThenBreak) {
                 world.setBlockState(info.context.blockPos, info.context.cachedState)
@@ -75,12 +76,13 @@ object BrokenBlockHandler {
                     ?: if (reBreak?.context?.blockPos == event.pos) reBreak
                     else null
             }?.let { pending ->
-                // return if the state hasn't changed
-                if (event.newState.matches(pending.context.cachedState))
-                    return@listen
-
+                val currentState = pending.context.cachedState
                 // return if the block's not broken
-                if (isNotBroken(pending.context.cachedState, event.newState)) {
+                if (isNotBroken(currentState, event.newState)) {
+                    // return if the state hasn't changed
+                    if (event.newState.matches(currentState, ProcessorRegistry.postProcessedProperties))
+                        return@listen
+
                     if (!pending.isReBreaking) {
                         this@BrokenBlockHandler.warn("Broken block at ${event.pos.toShortString()} was rejected with ${event.newState} instead of ${pending.context.cachedState.emptyState}")
                         pending.stopPending()

common/src/main/kotlin/com/lambda/module/modules/client/TaskFlowModule.kt

@@ -17,7 +17,11 @@
 
 package com.lambda.module.modules.client
 
-import com.lambda.config.groups.*
+import com.lambda.config.groups.BuildSettings
+import com.lambda.config.groups.HotbarSettings
+import com.lambda.config.groups.InteractionSettings
+import com.lambda.config.groups.InventorySettings
+import com.lambda.config.groups.RotationSettings
 import com.lambda.event.events.RenderEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.construction.result.Drawable
@@ -43,6 +47,7 @@ object TaskFlowModule : Module(
 
     val showAllEntries by setting("Show All Entries", false, "Show all entries in the task tree") { page == Page.Debug }
     val shrinkFactor by setting("Shrink Factor", 0.001, 0.0..1.0, 0.001) { page == Page.Debug }
+    val ignoreItemDropWarnings by setting("Ignore Drop Warnings", false, "Hides the item drop warnings from the break manager") { page == Page.Debug }
 
     @Volatile
     var drawables = listOf<Drawable>()