Refactor block interaction logic to use expected positions

Replaced `resultingPos` with `expectedPos` across the codebase for improved clarity and consistency in block placement and interaction handling. Introduced enhanced logic for detecting unexpected positions and added a corresponding result type `UnexpectedPosition`. Updated related event systems and modules to align with the new `BlockChange` event structure.

Author: Avanatiker

common/src/main/java/com/lambda/mixin/world/WorldMixin.java

@@ -25,19 +25,12 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(World.class)
 public abstract class WorldMixin {
-    @Inject(method = "setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;II)Z", at = @At("HEAD"), cancellable = true)
-    void setBlockStatePre(BlockPos pos, BlockState state, int flags, int maxUpdateDepth, CallbackInfoReturnable<Boolean> cir) {
-        if (EventFlow.post(new WorldEvent.BlockUpdate.Pre(pos, state, flags, maxUpdateDepth)).isCanceled()) {
-            cir.setReturnValue(false);
-        }
-    }
-
-    @Inject(method = "setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;II)Z", at = @At("TAIL"))
-    void setBlockStatePost(BlockPos pos, BlockState state, int flags, int maxUpdateDepth, CallbackInfoReturnable<Boolean> cir) {
-        EventFlow.post(new WorldEvent.BlockUpdate.Post(pos, state, flags, maxUpdateDepth));
+    @Inject(method = "onBlockChanged", at = @At("TAIL"))
+    void onBlockChanged(BlockPos pos, BlockState oldBlock, BlockState newBlock, CallbackInfo ci) {
+        EventFlow.post(new WorldEvent.BlockChange(pos, oldBlock, newBlock));
     }
 }

common/src/main/kotlin/com/lambda/event/events/WorldEvent.kt

@@ -45,18 +45,11 @@ sealed class WorldEvent {
         ) : Event
     }
 
-    /**
-     * Represents a block update in the world
-     */
-    sealed class BlockUpdate(
+    class BlockChange(
         val pos: BlockPos,
-        val state: BlockState,
-        val flags: Int,
-        val maxUpdateDepth: Int,
-    ) {
-        class Pre(pos: BlockPos, state: BlockState, flags: Int, depth: Int) : BlockUpdate(pos, state, flags, depth), ICancellable by Cancellable()
-        class Post(pos: BlockPos, state: BlockState, flags: Int, depth: Int) : BlockUpdate(pos, state, flags, depth), Event
-    }
+        val oldState: BlockState,
+        val newState: BlockState,
+    ) : Event
 
     /**
      * Represents an entity being added to the world

common/src/main/kotlin/com/lambda/graphics/renderer/esp/ChunkedESP.kt

@@ -53,7 +53,7 @@ class ChunkedESP private constructor(
     }
 
     init {
-        listenConcurrently<WorldEvent.BlockUpdate.Post> { event ->
+        listenConcurrently<WorldEvent.BlockChange> { event ->
             world.getWorldChunk(event.pos).renderer.notifyChunks()
         }
 

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

@@ -35,7 +35,7 @@ data class BreakContext(
     override var hand: Hand,
     val instantBreak: Boolean,
 ) : BuildContext {
-    override val resultingPos: BlockPos
+    override val expectedPos: BlockPos
         get() = result.blockPos
 
     override val distance: Double by lazy {

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

@@ -29,9 +29,9 @@ interface BuildContext : Comparable<BuildContext> {
     val result: BlockHitResult
     val distance: Double
     val expectedState: BlockState
+    val expectedPos: BlockPos
     val checkedState: BlockState
     val hand: Hand
-    val resultingPos: BlockPos
     val rotation: RotationContext
 
     override fun compareTo(other: BuildContext): Int {

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

@@ -35,14 +35,12 @@ data class PlaceContext(
     override val expectedState: BlockState,
     override val checkedState: BlockState,
     override val hand: Hand,
+    override val expectedPos: BlockPos,
     val targetState: TargetState,
     val sneak: Boolean,
     val insideBlock: Boolean,
     val primeDirection: Direction?
 ) : BuildContext {
-    override val resultingPos: BlockPos
-        get() = result.blockPos.offset(result.side)
-
     override fun compareTo(other: BuildContext): Int {
         return when (other) {
             is PlaceContext -> compareBy<PlaceContext> {

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

@@ -56,7 +56,7 @@ sealed class BreakResult : BuildResult() {
         }
 
         override fun SafeContext.buildRenderer() {
-            withPos(context.resultingPos, color, context.result.side)
+            withPos(context.expectedPos, color, context.result.side)
         }
 
         override fun compareTo(other: ComparableResult<Rank>): Int {

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

@@ -59,7 +59,7 @@ sealed class PlaceResult : BuildResult() {
             withPos(hitPos, color, context.result.side)
 
             val light = Color(35, 188, 254, 20)
-            withState(context.expectedState, context.resultingPos, light)
+            withState(context.expectedState, context.expectedPos, light)
         }
 
         override fun compareTo(other: ComparableResult<Rank>): Int {
@@ -136,6 +136,13 @@ sealed class PlaceResult : BuildResult() {
         override val rank = Rank.PLACE_BLOCK_FEATURE_DISABLED
     }
 
+    data class UnexpectedPosition(
+        override val blockPos: BlockPos,
+        val actualPos: BlockPos
+    ) : PlaceResult() {
+        override val rank = Rank.UNEXPECTED_POSITION
+    }
+
     /**
      * The player has no permission to interact with the block. Or the stack cannot be used on the block.
      */

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

@@ -42,6 +42,7 @@ enum class Rank {
     BREAK_NO_PERMISSION,
     PLACE_SCAFFOLD_EXCEEDED,
     PLACE_BLOCK_FEATURE_DISABLED,
+    UNEXPECTED_POSITION,
     PLACE_ILLEGAL_USAGE,
 
     // not an issue

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

@@ -257,6 +257,12 @@ object BuildSimulator {
 
                 var context = ItemPlacementContext(usageContext)
 
+                // ToDo: Actually find these result positions as well and use them smartly
+                if (context.blockPos != pos) {
+                    acc.add(PlaceResult.UnexpectedPosition(pos, context.blockPos))
+                    return@forEach
+                }
+
                 if (!optimalStack.item.isEnabled(world.enabledFeatures)) {
                     acc.add(PlaceResult.BlockFeatureDisabled(pos, optimalStack))
                     return@forEach
@@ -309,6 +315,7 @@ object BuildSimulator {
                     resultState,
                     blockHit.blockPos.blockState(world),
                     Hand.MAIN_HAND,
+                    context.blockPos,
                     target,
                     shouldSneak,
                     false,