resettableLazy() -> updatableLazy()

Author: Avanatiker

common/src/main/kotlin/com/lambda/interaction/construction/blueprint/Blueprint.kt

@@ -19,7 +19,7 @@ package com.lambda.interaction.construction.blueprint
 
 import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.util.BlockUtils.blockPos
-import com.lambda.util.collections.resettableLazy
+import com.lambda.util.collections.updatableLazy
 import com.lambda.util.extension.Structure
 import com.lambda.util.math.roundedBlockPos
 import net.minecraft.structure.StructureTemplate
@@ -28,8 +28,8 @@ import net.minecraft.util.math.*
 abstract class Blueprint {
     abstract val structure: Structure
 
-    val bounds = resettableLazy {
-        if (structure.isEmpty()) return@resettableLazy null
+    val bounds = updatableLazy {
+        if (structure.isEmpty()) return@updatableLazy null
         val maxX = structure.keys.maxOf { it.x }
         val maxY = structure.keys.maxOf { it.y }
         val maxZ = structure.keys.maxOf { it.z }

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

@@ -71,7 +71,7 @@ data class BreakContext(
     override fun compareTo(other: BuildContext): Int {
         return when (other) {
             is BreakContext -> compareBy<BreakContext> {
-                it.rotation.target.distance
+                it.rotation.target.angleDistance
             }.compare(this, other)
 
             else -> 1

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

@@ -22,7 +22,6 @@ import com.lambda.context.SafeContext
 import com.lambda.graphics.renderer.esp.DirectionMask
 import com.lambda.graphics.renderer.esp.DirectionMask.exclude
 import com.lambda.interaction.construction.verify.TargetState
-import com.lambda.interaction.request.rotation.Rotation.Companion.dist
 import com.lambda.interaction.request.rotation.RotationRequest
 import com.lambda.threading.runSafe
 import com.lambda.util.BlockUtils
@@ -83,7 +82,7 @@ data class PlaceContext(
             }.thenBy {
                 it.sneak
             }.thenBy {
-                it.rotation.target.distance
+                it.rotation.target.angleDistance
             }.thenBy {
                 it.distance
             }.thenBy {

common/src/main/kotlin/com/lambda/interaction/request/rotation/visibilty/RotationTarget.kt

@@ -20,12 +20,11 @@ package com.lambda.interaction.request.rotation.visibilty
 import com.lambda.context.SafeContext
 import com.lambda.interaction.request.rotation.Rotation
 import com.lambda.interaction.request.rotation.Rotation.Companion.dist
-import com.lambda.interaction.request.rotation.Rotation.Companion.rotation
 import com.lambda.interaction.request.rotation.RotationConfig
 import com.lambda.interaction.request.rotation.RotationManager
 import com.lambda.interaction.request.rotation.RotationRequest
 import com.lambda.threading.runSafe
-import com.lambda.util.collections.resettableLazy
+import com.lambda.util.collections.updatableLazy
 
 /**
  * Represents a target for rotation.
@@ -39,13 +38,13 @@ data class RotationTarget(
     val verify: RotationTarget.() -> Boolean = { hit?.verifyRotation() ?: true },
     private val buildRotation: SafeContext.() -> Rotation?,
 ) {
-    val targetRotation = resettableLazy {
+    val targetRotation = updatableLazy {
         runSafe { buildRotation() }
     }
 
-    val distance by lazy {
-        runSafe { targetRotation.value?.dist(RotationManager.currentRotation) } ?: 1000.0
-    }
+    val angleDistance get() = runSafe {
+        targetRotation.value?.dist(RotationManager.currentRotation)
+    } ?: 1000.0
 
     /**
      * Requests a rotation based on the given configuration.

common/src/main/kotlin/com/lambda/util/collections/UpdatableLazy.kt

@@ -68,4 +68,4 @@ class UpdatableLazy<T>(private val initializer: () -> T) {
  * @param initializer A lambda function that defines how the value should be computed.
  * @return An `UpdatableLazy` instance capable of managing a lazily-initialized value.
  */
-fun <T> resettableLazy(initializer: () -> T) = UpdatableLazy(initializer)
+fun <T> updatableLazy(initializer: () -> T) = UpdatableLazy(initializer)