cleanup

Author: beanbag44

src/main/kotlin/com/lambda/interaction/construction/result/results/GenericResult.kt

@@ -32,7 +32,6 @@ import com.lambda.interaction.material.container.MaterialContainer
 import com.lambda.interaction.material.container.containers.MainHandContainer
 import net.minecraft.item.ItemStack
 import net.minecraft.util.math.BlockPos
-import net.minecraft.util.math.Direction
 import net.minecraft.util.math.Vec3d
 import java.awt.Color
 
@@ -45,8 +44,7 @@ sealed class GenericResult : BuildResult() {
     data class NotVisible(
         override val pos: BlockPos,
         val hitPos: BlockPos,
-        val side: Direction,
-        val distance: Double,
+        val distance: Double
     ) : Drawable, GenericResult() {
         override val name: String get() = "Not visible at $pos."
         override val rank = Rank.NotVisible

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/BreakChecker.kt

@@ -53,6 +53,7 @@ import com.lambda.util.BlockUtils.instantBreakable
 import com.lambda.util.BlockUtils.isEmpty
 import com.lambda.util.item.ItemStackUtils.inventoryIndexOrSelected
 import com.lambda.util.math.distSq
+import com.lambda.util.math.vec3d
 import com.lambda.util.world.raycast.RayCastUtils.blockResult
 import io.ktor.util.collections.*
 import kotlinx.coroutines.Dispatchers
@@ -187,9 +188,10 @@ class BreakChecker @SimCheckerDsl private constructor(simInfo: SimInfo)
         withContext(Dispatchers.Default) {
             boxes.map { box ->
                 launch {
-                    val sides = if (buildConfig.checkSideVisibility) {
-                        box.getVisibleSurfaces(eye).intersect(Direction.entries)
-                    } else Direction.entries.toSet()
+                    val sides = if (buildConfig.checkSideVisibility)
+                        box.getVisibleSurfaces(eye)
+                    else Direction.entries.toSet()
+
                     scanSurfaces(box, sides, buildConfig.resolution) { side, vec ->
                         if (eye distSq vec > reachSq) {
                             misses.add(vec)
@@ -215,8 +217,12 @@ class BreakChecker @SimCheckerDsl private constructor(simInfo: SimInfo)
         }
 
         if (validHits.isEmpty()) {
-            // ToDo: If we can only mine exposed surfaces we need to add not visible result here
-            result(GenericResult.OutOfReach(pos, eye, misses))
+            if (misses.isNotEmpty()) {
+                result(GenericResult.OutOfReach(pos, eye, misses))
+                return true
+            }
+
+            result(GenericResult.NotVisible(pos, pos, eye.distanceTo(pos.vec3d)))
             return true
         }
 

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/PlaceChecker.kt

@@ -55,6 +55,7 @@ import com.lambda.util.math.vec3d
 import com.lambda.util.player.MovementUtils.sneaking
 import com.lambda.util.player.copyPlayer
 import com.lambda.util.world.raycast.RayCastUtils.blockResult
+import io.ktor.util.collections.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
@@ -146,8 +147,8 @@ class PlaceChecker @SimCheckerDsl private constructor(simInfo: SimInfo)
 
         val boxes = voxelShape.boundingBoxes.map { it.offset(pos) }
 
-        val validHits = mutableListOf<CheckedHit>()
-        val misses = mutableSetOf<Vec3d>()
+        val validHits = ConcurrentSet<CheckedHit>()
+        val misses = ConcurrentSet<Vec3d>()
         val reachSq = buildConfig.interactReach.pow(2)
 
         // ToDo: For each hand
@@ -198,7 +199,7 @@ class PlaceChecker @SimCheckerDsl private constructor(simInfo: SimInfo)
                 return
             }
 
-            result(GenericResult.NotVisible(pos, pos, side, eye.distanceTo(pos.offset(side).vec3d)))
+            result(GenericResult.NotVisible(pos, pos, eye.distanceTo(pos.offset(side).vec3d)))
             return
         }
 
@@ -210,7 +211,7 @@ class PlaceChecker @SimCheckerDsl private constructor(simInfo: SimInfo)
         } else selectHitPos(validHits, fakePlayer)
     }
 
-    private fun AutomatedSafeContext.selectHitPos(validHits: List<CheckedHit>, fakePlayer: ClientPlayerEntity) {
+    private fun AutomatedSafeContext.selectHitPos(validHits: Collection<CheckedHit>, fakePlayer: ClientPlayerEntity) {
         buildConfig.pointSelection.select(validHits)?.let { checkedHit ->
             val hitResult = checkedHit.hit.blockResult ?: return
 

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/PostProcessingChecker.kt

@@ -178,17 +178,11 @@ class PostProcessingChecker @SimCheckerDsl private constructor(simInfo: SimInfo)
         if (validHits.isEmpty()) {
             if (misses.isNotEmpty()) {
                 result(GenericResult.OutOfReach(pos, eye, misses))
-            } else {
-                //ToDo: Must clean up surface scan usage / renders. Added temporary direction until changes are made
-                result(
-                    GenericResult.NotVisible(
-                        pos,
-                        pos,
-                        Direction.UP,
-                        eye.distanceTo(pos.offset(Direction.UP).vec3d)
-                    )
-                )
+                return
             }
+
+            //ToDo: Must clean up surface scan usage / renders. Added temporary direction until changes are made
+            result(GenericResult.NotVisible(pos, pos, eye.distanceTo(pos.vec3d)))
             return
         }