Make BlockBreakingMovementBehaviourMixin more robust

Instead of checking the current actor origin against the current block being broken, we check the current actor origin against the origin when it started breaking the block.
This ensures that no matter how large of an area the actor is breaking (IE. rollers, drills from addons that break in an absurd 10x10 area, etc), breaking will still occur until the actor is moved suffeciently far away.

Author: Cyvack

neoforge/src/main/java/dev/ryanhcode/sable/neoforge/mixin/compatibility/create/behaviour_compatibility/block_breaking_behaviour/BlockBreakingMovementBehaviourMixin.java

@@ -7,14 +7,20 @@
 import com.simibubi.create.content.kinetics.base.BlockBreakingMovementBehaviour;
 import dev.ryanhcode.sable.ActiveSableCompanion;
 import dev.ryanhcode.sable.Sable;
+import dev.ryanhcode.sable.companion.math.JOMLConversion;
 import dev.ryanhcode.sable.neoforge.mixinhelper.compatibility.create.block_breakers.SubLevelBlockBreakingUtility;
 import dev.ryanhcode.sable.sublevel.SubLevel;
+import net.createmod.catnip.math.VecHelper;
+import net.createmod.catnip.nbt.NBTHelper;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtUtils;
+import net.minecraft.nbt.Tag;
+import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
+import org.joml.Vector3d;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -50,45 +56,60 @@ public abstract class BlockBreakingMovementBehaviourMixin implements MovementBeh
                 original.call(context, breakingPosWSublevel);
             }
         }
-    }
 
-    @Inject(method = "tick", at = @At("HEAD"), cancellable = true)
-    public void sable$testBreakingPosDist(final MovementContext context, final CallbackInfo ci) {
-        final CompoundTag data = context.data;
-        if (data.contains("BreakingPos") || data.contains("LastPos")) {
-            final BlockPos blockPos = NbtUtils.readBlockPos(data, "BreakingPos").orElseGet(() -> NbtUtils.readBlockPos(data, "LastPos").orElse(null));
+        //make sure we're actually starting to break something
+        if (context.stall && (context.data.contains("BreakingPos"))) {
+            final Vector3d checkPos = JOMLConversion.toJOML(context.position);
 
-            if (blockPos != null) {
-                final Vec3 localCenter = context.localPos.getCenter();
+            //project our position into the real world
+            final SubLevel parentSublevel = Sable.HELPER.getContaining(context.world, context.position);
+            if (parentSublevel != null) {
+                parentSublevel.logicalPose().transformPosition(checkPos);
+            }
+
+            //project our position into the target's plot
+            final SubLevel targetSublevel = Sable.HELPER.getContaining(context.world, NbtUtils.readBlockPos(context.data, "BreakingPos").orElseThrow());
+            if (targetSublevel != null) {
+                targetSublevel.logicalPose().transformPositionInverse(checkPos);
+            }
 
-                Vec3 sublevelLocalCenter = context.contraption.entity.toGlobalVector(localCenter, 1);
-                Vec3 targetCenter = blockPos.getCenter();
+            //save the current projected position to check movement distance against
+            context.data.put("ProjectedPos", VecHelper.writeNBT(JOMLConversion.toMojang(checkPos)));
+        }
+    }
 
-                final ActiveSableCompanion helper = Sable.HELPER;
-                final SubLevel parentSublevel = helper.getContaining(context.world, context.contraption.anchor);
-                final SubLevel targetSubLevel = helper.getContaining(context.world, blockPos);
+    @Inject(method = "cancelStall", at = @At("TAIL"))
+    public void sable$removeProjected(final MovementContext context, final CallbackInfo ci) {
+        context.data.remove("ProjectedPos");
+    }
 
-                if (parentSublevel != null) {
-                    sublevelLocalCenter = parentSublevel.logicalPose().transformPosition(sublevelLocalCenter);
-                }
+    @Inject(method = "tick", at = @At("HEAD"), cancellable = true)
+    public void sable$testProjectedPosDist(final MovementContext context, final CallbackInfo ci) {
+        final CompoundTag data = context.data;
 
-                if (targetSubLevel != null) {
-                    targetCenter = targetSubLevel.logicalPose().transformPosition(targetCenter);
-                }
+        //kind of a work-around to not require injecting into every place where BreakingPos is removed.
+        if (!context.data.contains("BreakingPos")) {
+            data.remove("ProjectedPos");
+            return;
+        }
 
-                if (sublevelLocalCenter.distanceToSqr(targetCenter) > 2 * 2) {
-                    data.remove("Progress");
-                    data.remove("TicksUntilNextProgress");
-                    data.remove("BreakingPos");
-                    data.remove("LastPos");
-                    data.remove("WaitingTicks");
+        final Vec3 sublevelLocalCenter = context.contraption.entity.toGlobalVector(context.localPos.getCenter(), 1);
+        if (data.contains("ProjectedPos") && Sable.HELPER.distanceSquaredWithSubLevels(context.world, VecHelper.readNBT(data.getList("ProjectedPos", Tag.TAG_DOUBLE)), sublevelLocalCenter) > 2*2) {
+            final BlockPos blockPos = NbtUtils.readBlockPos(data, "BreakingPos").orElse(null);
 
-                    context.stall = false;
-                    context.world.destroyBlockProgress(data.getInt("BreakerId"), blockPos, -1);
+            data.remove("Progress");
+            data.remove("TicksUntilNextProgress");
+            data.remove("BreakingPos");
+            data.remove("LastPos");
+            data.remove("WaitingTicks");
+            data.remove("ProjectedPos");
 
-                    ci.cancel();
-                }
+            context.stall = false;
+            if (blockPos != null) {
+                context.world.destroyBlockProgress(data.getInt("BreakerId"), blockPos, -1);
             }
+
+            ci.cancel();
         }
     }
 }