added more vector distance functions

Author: emyfops

common/src/main/kotlin/com/lambda/util/combat/Explosion.kt

@@ -23,14 +23,17 @@ import com.lambda.context.SafeContext
 import com.lambda.core.annotations.InternalApi
 import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.BlockUtils.fluidState
+import com.lambda.util.math.VecUtils.dist
 import com.lambda.util.math.VecUtils.minus
 import com.lambda.util.math.VecUtils.times
+import com.lambda.util.math.VecUtils.vec3d
 import com.lambda.util.world.WorldUtils.internalGetFastEntities
 import com.lambda.util.world.toFastVec
 import net.minecraft.enchantment.ProtectionEnchantment
 import net.minecraft.entity.LivingEntity
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Vec3d
+import net.minecraft.util.math.Vec3i
 import net.minecraft.world.explosion.Explosion
 import kotlin.math.max
 
@@ -44,6 +47,16 @@ object Explosion {
     fun SafeContext.explosionDamage(source: Explosion, entity: LivingEntity) =
         explosionDamage(source.position, entity, source.power.toDouble())
 
+    /**
+     * Calculates the damage dealt by an explosion to a living entity.
+     * @param position The position of the explosion.
+     * @param entity The entity to calculate the damage for.
+     * @param power The strength of the explosion above 0.
+     * @return The damage dealt by the explosion.
+     */
+    fun SafeContext.explosionDamage(position: Vec3i, entity: LivingEntity, power: Double): Double =
+        explosionDamage(position.vec3d, entity, power)
+
     /**
      * Calculates the damage dealt by an explosion to a living entity.
      * @param position The position of the explosion.
@@ -52,7 +65,7 @@ object Explosion {
      * @return The damage dealt by the explosion.
      */
     fun SafeContext.explosionDamage(position: Vec3d, entity: LivingEntity, power: Double): Double {
-        val distance = entity.pos.distanceTo(position)
+        val distance = entity dist position
 
         val impact = (1.0 - distance / (power * 2.0)) *
                 Explosion.getExposure(position, entity) *

common/src/main/kotlin/com/lambda/util/math/VecUtils.kt

@@ -25,6 +25,7 @@ import net.minecraft.util.math.Vec3d
 import net.minecraft.util.math.Vec3i
 import kotlin.math.pow
 import kotlin.math.roundToInt
+import kotlin.math.sqrt
 
 object VecUtils {
     val Vec3d.blockPos: BlockPos
@@ -39,33 +40,30 @@ object VecUtils {
         get() =
             CENTER + vector.vec3d * 0.5
 
-    infix fun Vec3d.dist(other: Vec3d): Double = this.distanceTo(other)
-
+    fun Vec3d.approximate(other: Vec3d, precision: Double = 2.0E-4): Boolean = (subtract(other) distSq Vec3d.ZERO) > precision.pow(2)
+    infix fun Vec3d.dist(other: Vec3d): Double = sqrt(this distSq other)
+    infix fun Vec3d.dist(other: Vec3i): Double = sqrt(this distSq other)
     infix fun Vec3d.distSq(other: Vec3d): Double = this.squaredDistanceTo(other)
-
-    fun Vec3d.approximate(other: Vec3d, precision: Double = 2.0E-4): Boolean =
-        (subtract(other) distSq Vec3d.ZERO) > precision.pow(2)
-
-    infix fun Vec3i.distSq(other: Vec3d): Double = Vec3d.of(this) distSq other
-
-    infix fun Vec3i.distSq(other: Vec3i): Int = (this.x - other.x).sq + (this.y - other.y).sq + (this.z - other.z).sq
-
-    infix fun Entity.distSq(other: Vec3d): Double = this.pos distSq other
-
-    infix fun Entity.distSq(other: Vec3i): Int = this.blockPos distSq other
-
+    infix fun Vec3d.distSq(other: Vec3i): Double = this.squaredDistanceTo(other.x.toDouble(), other.y.toDouble(), other.z.toDouble())
     infix operator fun Vec3d.plus(other: Vec3d): Vec3d = this.add(other)
-
     infix operator fun Vec3d.minus(other: Vec3d): Vec3d = this.subtract(other)
-
     infix operator fun Vec3d.times(other: Vec3d): Vec3d = this.multiply(other)
-
     infix operator fun Vec3d.div(other: Vec3d): Vec3d = this.multiply(1.0 / other.x, 1.0 / other.y, 1.0 / other.z)
-
     infix operator fun Vec3d.times(other: Double): Vec3d = this.multiply(other)
-
     infix operator fun Vec3d.div(other: Double): Vec3d = this.multiply(1.0 / other)
 
+    infix fun Vec3i.dist(other: Vec3d): Double = sqrt(this distSq other)
+    infix fun Vec3i.dist(other: Vec3i): Double = sqrt((this distSq other).toDouble())
+    infix fun Vec3i.distSq(other: Vec3d): Double = this.getSquaredDistance(other)
+    infix fun Vec3i.distSq(other: Vec3i): Int = (this.x - other.x).sq + (this.y - other.y).sq + (this.z - other.z).sq
+
+    infix fun Entity.dist(other: Vec3d): Double = pos dist other
+    infix fun Entity.dist(other: Vec3i): Double = blockPos dist other
+    infix fun Entity.dist(other: Entity): Double = distanceTo(other).toDouble()
+    infix fun Entity.distSq(other: Vec3d): Double = this.pos distSq other
+    infix fun Entity.distSq(other: Vec3i): Int = this.blockPos distSq other
+    infix fun Entity.distSq(other: Entity): Double = squaredDistanceTo(other)
+
     val UP = Vec3d(0.0, 1.0, 0.0)
     val DOWN = Vec3d(0.0, -1.0, 0.0)
     val CENTER = Vec3d(0.5, 0.5, 0.5)