improve block update checks in managers

Author: beanbag44

common/src/main/kotlin/com/lambda/interaction/construction/context/PlaceContext.kt

@@ -38,7 +38,7 @@ data class PlaceContext(
     override val rotation: RotationRequest,
     override var hotbarIndex: Int,
     override val blockPos: BlockPos,
-    override val cachedState: BlockState,
+    override var cachedState: BlockState,
     override val expectedState: BlockState,
     val sneak: Boolean,
     val insideBlock: Boolean,

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

@@ -33,7 +33,6 @@ import com.lambda.graphics.renderer.esp.builders.buildOutline
 import com.lambda.interaction.construction.blueprint.Blueprint.Companion.toStructure
 import com.lambda.interaction.construction.blueprint.StaticBlueprint.Companion.toBlueprint
 import com.lambda.interaction.construction.context.BreakContext
-import com.lambda.interaction.construction.processing.ProcessorRegistry
 import com.lambda.interaction.construction.result.BreakResult
 import com.lambda.interaction.construction.simulation.BuildSimulator.simulate
 import com.lambda.interaction.construction.verify.TargetState
@@ -70,8 +69,6 @@ import com.lambda.util.BlockUtils.calcItemBlockBreakingDelta
 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
 import com.lambda.util.player.gamemode
@@ -189,21 +186,16 @@ object BreakManager : RequestHandler<BreakRequest>(
                     val currentState = info.context.cachedState
                     // if not broken
                     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("Server updated breaking block at ${event.pos.toShortString()} with a new state: ${event.newState}")
                         // update the cached state
                         info.context.cachedState = event.newState
                         return@listen
                     }
                     destroyBlock(info)
                     info.request.onStop?.invoke(info.context.blockPos)
                     info.internalOnBreak()
-                    if (!info.callbacksCompleted) {
-                        info.startPending()
-                    } else {
+                    if (info.callbacksCompleted)
                         ReBreakManager.offerReBreak(info)
-                    }
+                    else info.startPending()
                     info.nullify()
                 }
         }

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

@@ -83,11 +83,11 @@ object BrokenBlockHandler : PostActionHandler<BreakInfo>() {
                         return@listen
                     }
 
-                    if (!pending.isReBreaking) {
+                    if (pending.isReBreaking) {
+                        pending.context.cachedState = event.newState
+                    } else {
                         this@BrokenBlockHandler.warn("Broken block at ${event.pos.toShortString()} was rejected with ${event.newState} instead of ${pending.context.cachedState.emptyState}")
                         pending.stopPending()
-                    } else {
-                        pending.context.cachedState = event.newState
                     }
                     return@listen
                 }

common/src/main/kotlin/com/lambda/interaction/request/interacting/InteractedBlockHandler.kt

@@ -21,6 +21,7 @@ import com.lambda.Lambda.mc
 import com.lambda.config.groups.InteractionConfig
 import com.lambda.event.events.WorldEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
+import com.lambda.interaction.construction.processing.ProcessorRegistry
 import com.lambda.interaction.request.PostActionHandler
 import com.lambda.module.modules.client.TaskFlowModule
 import com.lambda.util.BlockUtils.matches
@@ -44,13 +45,20 @@ object InteractedBlockHandler : PostActionHandler<InteractionInfo>() {
             pendingActions
                 .firstOrNull { it.context.blockPos == event.pos }
                 ?.let { pending ->
-                    pending.stopPending()
-
                     if (!pending.context.expectedState.matches(event.newState)) {
+                        if (pending.context.cachedState.matches(event.newState, ProcessorRegistry.postProcessedProperties)) {
+                            pending.context.cachedState = event.newState
+                            return@listen
+                        }
+
+                        pending.stopPending()
+
                         this@InteractedBlockHandler.warn("Interacted block at ${event.pos.toShortString()} was rejected with ${event.newState} instead of ${pending.context.expectedState}")
                         return@listen
                     }
 
+                    pending.stopPending()
+
                     //ToDo: reliable way to recreate the sounds played when interacting with any given block
 //                    if (pending.interactConfirmationMode == InteractionConfig.InteractConfirmationMode.AwaitThenInteract)
 //                        with (pending.context) {

common/src/main/kotlin/com/lambda/interaction/request/interacting/InteractionManager.kt

@@ -92,7 +92,7 @@ object InteractionManager : RequestHandler<InteractRequest>(
 
             if (!ctx.requestDependencies(request)) return
 
-            if (request.interactConfirmationMode == InteractionConfig.InteractConfirmationMode.None) {
+            if (request.interactConfirmationMode != InteractionConfig.InteractConfirmationMode.None) {
                 InteractionInfo(ctx, request.pendingInteractionsList, request).startPending()
             }
             if (request.interactConfirmationMode != InteractionConfig.InteractConfirmationMode.AwaitThenInteract) {

common/src/main/kotlin/com/lambda/interaction/request/placing/PlacedBlockHandler.kt

@@ -20,6 +20,7 @@ package com.lambda.interaction.request.placing
 import com.lambda.Lambda.mc
 import com.lambda.event.events.WorldEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
+import com.lambda.interaction.construction.processing.ProcessorRegistry
 import com.lambda.interaction.request.PostActionHandler
 import com.lambda.interaction.request.placing.PlaceManager.placeSound
 import com.lambda.module.modules.client.TaskFlowModule
@@ -46,14 +47,20 @@ object PlacedBlockHandler : PostActionHandler<PlaceInfo>() {
             pendingActions
                 .firstOrNull { it.context.blockPos == event.pos }
                 ?.let { pending ->
-                    pending.stopPending()
-
-                    // return if the block wasn't placed properly
                     if (!pending.context.expectedState.matches(event.newState)) {
-                        this@PlacedBlockHandler.warn("Place at ${event.pos.toShortString()} was rejected with ${event.newState} instead of ${pending.context.expectedState}")
+                        if (pending.context.cachedState.matches(event.newState, ProcessorRegistry.postProcessedProperties)) {
+                            pending.context.cachedState = event.newState
+                            return@listen
+                        }
+
+                        pending.stopPending()
+
+                        this@PlacedBlockHandler.warn("Placed block at ${event.pos.toShortString()} was rejected with ${event.newState} instead of ${pending.context.expectedState}")
                         return@listen
                     }
 
+                    pending.stopPending()
+
                     if (pending.placeConfig.placeConfirmationMode == PlaceConfig.PlaceConfirmationMode.AwaitThenPlace)
                         with (pending.context) {
                             placeSound(expectedState.block.item as BlockItem, expectedState, blockPos)