Remove deprecated rotation fix and fix wrong hit check

Author: Avanatiker

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

@@ -31,7 +31,6 @@ import com.lambda.interaction.material.container.ContainerManager.findBestAvaila
 import com.lambda.interaction.request.rotation.Rotation.Companion.rotation
 import com.lambda.interaction.request.rotation.Rotation.Companion.rotationTo
 import com.lambda.interaction.request.rotation.RotationRequest
-import com.lambda.interaction.request.rotation.visibilty.RequestedHit
 import com.lambda.interaction.request.rotation.visibilty.VisibilityChecker.CheckedHit
 import com.lambda.interaction.request.rotation.visibilty.VisibilityChecker.getVisibleSurfaces
 import com.lambda.interaction.request.rotation.visibilty.VisibilityChecker.scanSurfaces
@@ -55,7 +54,6 @@ import net.minecraft.item.ItemUsageContext
 import net.minecraft.registry.RegistryKeys
 import net.minecraft.state.property.Properties
 import net.minecraft.util.Hand
-import net.minecraft.util.hit.HitResult
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Box
 import net.minecraft.util.math.Direction
@@ -152,7 +150,7 @@ object BuildSimulator {
                 hit.blockResult?.blockPos == hitPos && hit.blockResult?.side == hitSide
             }
 
-            val checkedHits = mutableListOf<CheckedHit>()
+            val validHits = mutableListOf<CheckedHit>()
             val misses = mutableSetOf<Vec3d>()
             val reachSq = reach.pow(2)
 
@@ -175,11 +173,11 @@ object BuildSimulator {
                     val checked = CheckedHit(hit, newRotation, reach)
                     if (!checked.verify()) return@scanSurfaces
 
-                    checkedHits.add(checked)
+                    validHits.add(checked)
                 }
             }
 
-            if (checkedHits.isEmpty()) {
+            if (validHits.isEmpty()) {
                 if (misses.isNotEmpty()) {
                     acc.add(BuildResult.OutOfReach(pos, eye, misses))
                     return@forEach
@@ -189,7 +187,7 @@ object BuildSimulator {
                 return@forEach
             }
 
-            interact.pointSelection.select(checkedHits)?.let { checkedHit ->
+            interact.pointSelection.select(validHits)?.let { checkedHit ->
                 val optimalStack = target.getStack(world, pos)
 
                 // ToDo: For each hand and sneak or not?
@@ -379,7 +377,6 @@ object BuildSimulator {
             hit.blockResult?.blockPos == pos
         }
 
-        val checkedHits = mutableListOf<CheckedHit>()
         /* the player is buried inside the block */
         if (boxes.any { it.contains(eye) }) {
             currentCast?.blockResult?.let { blockHit ->
@@ -400,7 +397,7 @@ object BuildSimulator {
             }
         }
 
-        val validHits = mutableMapOf<Vec3d, HitResult>()
+        val validHits = mutableListOf<CheckedHit>()
         val misses = mutableSetOf<Vec3d>()
         val reachSq = reach.pow(2)
 
@@ -417,7 +414,7 @@ object BuildSimulator {
                 val checked = CheckedHit(hit, newRotation, reach)
                 if (!checked.verify()) return@scanSurfaces
 
-                checkedHits.add(checked)
+                validHits.add(checked)
             }
         }
 
@@ -427,7 +424,7 @@ object BuildSimulator {
             return acc
         }
 
-        interact.pointSelection.select(checkedHits)?.let { checkedHit ->
+        interact.pointSelection.select(validHits)?.let { checkedHit ->
             val blockHit = checkedHit.hit.blockResult ?: return@let
 
             val breakContext = BreakContext(

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

@@ -42,20 +42,6 @@ object TaskFlowModule : Module(
     val build = BuildSettings(this) { page == Page.BUILD }
     val rotation = RotationSettings(this) { page == Page.ROTATION }
     val interact = InteractionSettings(this, InteractionMask.BOTH) { page == Page.INTERACTION }
-
-    // ToDo: remove
-    // might be useless since grim has ping compensation things and shit
-    // its better to make sure the interactions are 100% matching the minecraft's ones
-    private val pingTimeout by setting("Ping Timeout", false, "Timeout on high ping") { page == Page.INTERACTION }
-    private val inScopeThreshold by setting("Constant Timeout", 1, 0..20, 1, "How many ticks to wait after target box is in rotation scope"," ticks") {
-        page == Page.INTERACTION && !pingTimeout
-    }
-
-    val scopeThreshold: Int
-        get() =
-            if (pingTimeout) PingManager.lastPing.toInt() / 50
-            else inScopeThreshold
-
     val inventory = InventorySettings(this) { page == Page.INVENTORY }
 
     val showAllEntries by setting("Show All Entries", false, "Show all entries in the task tree") { page == Page.DEBUG }

common/src/main/kotlin/com/lambda/task/tasks/OpenContainer.kt

@@ -86,12 +86,10 @@ class OpenContainer @Ta5kBuilder constructor(
             val target = lookAtBlock(blockPos, sides, interact)
             if (rotate && !target.requestBy(rotation).done) return@listen
 
-            if (inScope++ >= TaskFlowModule.scopeThreshold) {
-                val hitResult = target.hit?.hitIfValid()?.blockResult ?: return@listen
-                interaction.interactBlock(player, Hand.MAIN_HAND, hitResult)
+            val hitResult = target.hit?.hitIfValid()?.blockResult ?: return@listen
+            interaction.interactBlock(player, Hand.MAIN_HAND, hitResult)
 
-                state = State.OPENING
-            }
+            state = State.OPENING
         }
     }
 }