[1.20.4] Ref: Math utils and extensions

common/src/main/kotlin/com/lambda/config/groups/Targeting.kt

@@ -24,7 +24,7 @@ import com.lambda.interaction.rotation.Rotation.Companion.dist
 import com.lambda.interaction.rotation.Rotation.Companion.rotation
 import com.lambda.interaction.rotation.Rotation.Companion.rotationTo
 import com.lambda.threading.runSafe
-import com.lambda.util.math.VecUtils.distSq
+import com.lambda.util.math.distSq
 import com.lambda.util.world.fastEntitySearch
 import net.minecraft.client.network.ClientPlayerEntity
 import net.minecraft.client.network.OtherClientPlayerEntity
@@ -40,16 +40,16 @@ import net.minecraft.entity.passive.PassiveEntity
  * based on player settings and entity characteristics. It allows for specifying which types of entities
  * are targetable, the range of targeting, and various other conditions for targeting.
  *
- * @property owner The [Configurable] instance used to get and set configuration options for targeting.
- * @property predicate The predicate used to determine whether the targeting settings are visible and active.
- * @property defaultRange The default range within which entities can be targeted.
- * @property maxRange The maximum range within which entities can be targeted.
+ * @param owner The [Configurable] instance used to get and set configuration options for targeting.
+ * @param predicate The predicate used to determine whether the targeting settings are visible and active.
+ * @param defaultRange The default range within which entities can be targeted.
+ * @param maxRange The maximum range within which entities can be targeted.
  */
 abstract class Targeting(
-    owner: Configurable,
-    predicate: () -> Boolean = { true },
-    defaultRange: Double,
-    maxRange: Double,
+    private val owner: Configurable,
+    private val predicate: () -> Boolean = { true },
+    private val defaultRange: Double,
+    private val maxRange: Double,
 ) : TargetingConfig {
 
     /**

common/src/main/kotlin/com/lambda/graphics/renderer/esp/DynamicAABB.kt

@@ -17,11 +17,8 @@
 
 package com.lambda.graphics.renderer.esp
 
-import com.lambda.util.math.VecUtils.minus
-import com.lambda.util.math.VecUtils.plus
-import com.lambda.util.extension.max
-import com.lambda.util.extension.min
 import com.lambda.util.extension.prevPos
+import com.lambda.util.math.minus
 import net.minecraft.entity.Entity
 import net.minecraft.util.math.Box
 

common/src/main/kotlin/com/lambda/gui/api/component/core/DockingRect.kt

@@ -57,12 +57,15 @@ abstract class DockingRect {
     var screenSize: Vec2d = Vec2d.ZERO
 
     var position: Vec2d
-        get() = relativeToAbs(relativePos).coerceIn(0.0, screenSize.x - size.x, 0.0, screenSize.y - size.y)
+        get() = relativeToAbs(relativePos)
+            .coerceIn(0.0, screenSize.x - size.x, 0.0, screenSize.y - size.y)
         set(value) {
-            relativePos = absToRelative(value.roundToStep(ClickGui.dockingGridSize)); if (autoDocking) autoDocking()
+            relativePos = absToRelative(value.roundToStep(ClickGui.dockingGridSize))
+            if (autoDocking) autoDocking()
         }
 
-    private val dockingOffset get() = (screenSize - size) * Vec2d(dockingH.multiplier, dockingV.multiplier)
+    private val dockingOffset get() =
+        (screenSize - size) * Vec2d(dockingH.multiplier, dockingV.multiplier)
 
     private fun relativeToAbs(posIn: Vec2d) = posIn + dockingOffset
     private fun absToRelative(posIn: Vec2d) = posIn - dockingOffset

common/src/main/kotlin/com/lambda/interaction/PlayerPacketManager.kt

@@ -24,10 +24,10 @@ import com.lambda.event.events.PlayerPacketEvent
 import com.lambda.interaction.rotation.Rotation
 import com.lambda.threading.runSafe
 import com.lambda.util.collections.LimitedOrderedSet
-import com.lambda.util.extension.component1
-import com.lambda.util.extension.component2
-import com.lambda.util.extension.component3
-import com.lambda.util.math.VecUtils.approximate
+import com.lambda.util.math.approximate
+import com.lambda.util.math.component1
+import com.lambda.util.math.component2
+import com.lambda.util.math.component3
 import com.lambda.util.player.MovementUtils.motionX
 import com.lambda.util.player.MovementUtils.motionZ
 import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket

common/src/main/kotlin/com/lambda/interaction/blockplace/PlaceFinder.kt

@@ -22,8 +22,8 @@ import com.lambda.interaction.blockplace.PlaceInteraction.canPlaceAt
 import com.lambda.interaction.blockplace.PlaceInteraction.isClickable
 import com.lambda.interaction.visibilty.VisibilityChecker.getVisibleSurfaces
 import com.lambda.util.BlockUtils.blockState
-import com.lambda.util.math.VecUtils.distSq
-import com.lambda.util.math.VecUtils.getHitVec
+import com.lambda.util.math.distSq
+import com.lambda.util.math.getHitVec
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Box
 import net.minecraft.util.math.Direction

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

@@ -21,7 +21,7 @@ import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.util.BlockUtils.blockPos
 import com.lambda.util.collections.ResettableLazy
 import com.lambda.util.extension.Structure
-import com.lambda.util.math.VecUtils.blockPos
+import com.lambda.util.math.blockPos
 import net.minecraft.structure.StructureTemplate
 import net.minecraft.util.math.*
 

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

@@ -43,7 +43,7 @@ import com.lambda.util.BlockUtils.instantBreakable
 import com.lambda.util.BlockUtils.vecOf
 import com.lambda.util.Communication.warn
 import com.lambda.util.item.ItemStackUtils.equal
-import com.lambda.util.math.VecUtils.distSq
+import com.lambda.util.math.distSq
 import com.lambda.util.player.copyPlayer
 import com.lambda.util.world.raycast.RayCastUtils.blockResult
 import net.minecraft.block.OperatorBlock

common/src/main/kotlin/com/lambda/interaction/material/container/containers/StashContainer.kt

@@ -19,7 +19,7 @@ package com.lambda.interaction.material.container.containers
 
 import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.material.container.MaterialContainer
-import com.lambda.util.math.VecUtils.blockPos
+import com.lambda.util.math.blockPos
 import com.lambda.util.text.buildText
 import com.lambda.util.text.highlighted
 import com.lambda.util.text.literal

common/src/main/kotlin/com/lambda/interaction/rotation/Rotation.kt

@@ -22,8 +22,8 @@ import com.lambda.threading.runSafe
 import com.lambda.util.math.MathUtils.toDegree
 import com.lambda.util.math.MathUtils.toRadian
 import com.lambda.util.math.Vec2d
-import com.lambda.util.math.VecUtils.plus
-import com.lambda.util.math.VecUtils.times
+import com.lambda.util.math.plus
+import com.lambda.util.math.times
 import com.lambda.util.world.raycast.RayCastMask
 import com.lambda.util.world.raycast.RayCastUtils.rayCast
 import net.minecraft.entity.Entity

common/src/main/kotlin/com/lambda/interaction/visibilty/VisibilityChecker.kt

@@ -28,7 +28,7 @@ import com.lambda.interaction.rotation.RotationRequest
 import com.lambda.module.modules.client.TaskFlowModule
 import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.extension.component6
-import com.lambda.util.math.VecUtils.distSq
+import com.lambda.util.math.distSq
 import com.lambda.util.world.raycast.RayCastUtils.blockResult
 import com.lambda.util.world.raycast.RayCastUtils.entityResult
 import net.minecraft.entity.Entity

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

@@ -93,7 +93,7 @@ object DiscordRPC : Module(
         get() = uuid == currentParty?.leader?.uuid
 
     private val PlayerEntity.isInParty
-        get() = currentParty?.players?.any { it.uuid == this@isInParty.uuid }
+        get() = currentParty?.players?.any { it.uuid == this.uuid }
 
     init {
         listenUnsafe<ConnectionEvent.Connect.Login.EncryptionRequest> {
@@ -160,7 +160,7 @@ object DiscordRPC : Module(
         runConcurrent {
             while (rpc.connected) {
                 updateActivity()
-                delay(delay.toLong())
+                delay(delay)
             }
         }
     }

common/src/main/kotlin/com/lambda/module/modules/combat/Criticals.kt

@@ -24,10 +24,10 @@ import com.lambda.interaction.rotation.Rotation
 import com.lambda.interaction.rotation.Rotation.Companion.rotationTo
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
-import com.lambda.util.extension.component1
-import com.lambda.util.extension.component2
-import com.lambda.util.extension.component3
 import com.lambda.util.extension.rotation
+import com.lambda.util.math.component1
+import com.lambda.util.math.component2
+import com.lambda.util.math.component3
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket
 import net.minecraft.network.packet.c2s.play.PlayerInteractItemC2SPacket
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket

common/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt

@@ -38,9 +38,9 @@ import com.lambda.module.tag.ModuleTag
 import com.lambda.threading.runConcurrent
 import com.lambda.threading.runSafe
 import com.lambda.util.math.MathUtils.random
-import com.lambda.util.math.VecUtils.distSq
-import com.lambda.util.math.VecUtils.plus
-import com.lambda.util.math.VecUtils.times
+import com.lambda.util.math.distSq
+import com.lambda.util.math.plus
+import com.lambda.util.math.times
 import com.lambda.util.math.lerp
 import com.lambda.util.player.MovementUtils.moveDiff
 import com.lambda.util.player.prediction.buildPlayerPrediction

common/src/main/kotlin/com/lambda/module/modules/movement/BackTrack.kt

@@ -33,9 +33,9 @@ import com.lambda.util.ClientPacket
 import com.lambda.util.PacketUtils.handlePacketSilently
 import com.lambda.util.PacketUtils.sendPacketSilently
 import com.lambda.util.ServerPacket
-import com.lambda.util.math.VecUtils.dist
-import com.lambda.util.math.VecUtils.minus
-import com.lambda.util.math.VecUtils.plus
+import com.lambda.util.math.dist
+import com.lambda.util.math.minus
+import com.lambda.util.math.plus
 import com.lambda.util.math.lerp
 import com.lambda.util.math.multAlpha
 import net.minecraft.entity.LivingEntity

common/src/main/kotlin/com/lambda/module/modules/movement/Blink.kt

@@ -30,7 +30,7 @@ import com.lambda.module.tag.ModuleTag
 import com.lambda.util.ClientPacket
 import com.lambda.util.PacketUtils.handlePacketSilently
 import com.lambda.util.PacketUtils.sendPacketSilently
-import com.lambda.util.math.VecUtils.minus
+import com.lambda.util.math.minus
 import com.lambda.util.math.setAlpha
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket
 import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket

common/src/main/kotlin/com/lambda/module/modules/movement/Jesus.kt

@@ -27,7 +27,7 @@ import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.Nameable
 import com.lambda.util.math.MathUtils.toInt
-import com.lambda.util.math.VecUtils.minus
+import com.lambda.util.math.minus
 import com.lambda.util.player.MovementUtils.isInputting
 import com.lambda.util.player.MovementUtils.motionY
 import com.lambda.util.player.MovementUtils.setSpeed

common/src/main/kotlin/com/lambda/module/modules/movement/NoFall.kt

@@ -21,9 +21,9 @@ import com.lambda.event.events.MovementEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
-import com.lambda.util.extension.component1
-import com.lambda.util.extension.component2
-import com.lambda.util.extension.component3
+import com.lambda.util.math.component1
+import com.lambda.util.math.component2
+import com.lambda.util.math.component3
 import com.lambda.util.player.MovementUtils.motion
 import com.lambda.util.player.MovementUtils.motionY
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket

common/src/main/kotlin/com/lambda/module/modules/movement/TargetStrafe.kt

@@ -24,7 +24,7 @@ import com.lambda.interaction.rotation.Rotation.Companion.rotationTo
 import com.lambda.module.Module
 import com.lambda.module.modules.combat.KillAura
 import com.lambda.module.tag.ModuleTag
-import com.lambda.util.math.VecUtils.distSq
+import com.lambda.util.math.distSq
 import com.lambda.util.player.MovementUtils.buildMovementInput
 import com.lambda.util.player.MovementUtils.mergeFrom
 import kotlin.math.pow

common/src/main/kotlin/com/lambda/module/modules/network/Rubberband.kt

@@ -23,8 +23,8 @@ import com.lambda.interaction.PlayerPacketManager
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.Communication.warn
-import com.lambda.util.math.VecUtils.dist
-import com.lambda.util.math.VecUtils.distSq
+import com.lambda.util.math.dist
+import com.lambda.util.math.distSq
 import com.lambda.util.text.buildText
 import com.lambda.util.text.color
 import com.lambda.util.text.literal

common/src/main/kotlin/com/lambda/module/modules/player/Freecam.kt

@@ -27,11 +27,11 @@ import com.lambda.interaction.rotation.RotationRequest
 import com.lambda.interaction.rotation.RotationMode
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
-import com.lambda.util.extension.interpolate
 import com.lambda.util.extension.partialTicks
 import com.lambda.util.extension.rotation
-import com.lambda.util.math.VecUtils.plus
-import com.lambda.util.math.VecUtils.times
+import com.lambda.util.math.interpolate
+import com.lambda.util.math.plus
+import com.lambda.util.math.times
 import com.lambda.util.player.MovementUtils.calcMoveRad
 import com.lambda.util.player.MovementUtils.cancel
 import com.lambda.util.player.MovementUtils.handledByBaritone
@@ -64,7 +64,7 @@ object Freecam : Module(
     private var prevPosition: Vec3d = Vec3d.ZERO
     private var position: Vec3d = Vec3d.ZERO
     private val lerpPos: Vec3d
-        get() = prevPosition.interpolate(position, mc.partialTicks)
+        get() = prevPosition.interpolate(mc.partialTicks, position)
 
     private var rotation: Rotation = Rotation.ZERO
     private var velocity: Vec3d = Vec3d.ZERO

common/src/main/kotlin/com/lambda/module/modules/player/HighwayTools.kt

@@ -29,7 +29,7 @@ import com.lambda.util.Communication.info
 import com.lambda.util.extension.Structure
 import com.lambda.util.extension.moveY
 import com.lambda.util.math.MathUtils.floorToInt
-import com.lambda.util.math.VecUtils.rotateClockwise
+import com.lambda.util.math.rotateClockwise
 import com.lambda.util.player.MovementUtils.octant
 import com.lambda.util.world.StructureUtils.generateDirectionalTube
 import net.minecraft.block.Blocks

common/src/main/kotlin/com/lambda/module/modules/player/Scaffold.kt

@@ -45,8 +45,8 @@ import com.lambda.module.modules.client.GuiSettings
 import com.lambda.module.modules.client.TaskFlowModule
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.math.MathUtils.floorToInt
-import com.lambda.util.math.VecUtils.dist
-import com.lambda.util.math.VecUtils.distSq
+import com.lambda.util.math.dist
+import com.lambda.util.math.distSq
 import com.lambda.util.math.multAlpha
 import com.lambda.util.math.step
 import com.lambda.util.math.transform

common/src/main/kotlin/com/lambda/module/modules/render/Particles.kt

@@ -40,9 +40,10 @@ import com.lambda.module.modules.client.GuiSettings.colorSpeed
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.extension.partialTicks
 import com.lambda.util.math.MathUtils.random
-import com.lambda.util.math.VecUtils
-import com.lambda.util.math.VecUtils.plus
-import com.lambda.util.math.VecUtils.times
+import com.lambda.util.math.UP
+import com.lambda.util.math.DOWN
+import com.lambda.util.math.plus
+import com.lambda.util.math.times
 import com.lambda.util.math.lerp
 import com.lambda.util.math.multAlpha
 import com.lambda.util.math.transform
@@ -134,8 +135,8 @@ object Particles : Module(
         repeat(environmentSpawnAmount) {
             var particlePos = player.pos + Rotation(random(-180.0, 180.0), 0.0).vector * random(0.0, environmentRange)
 
-            Rotation.DOWN.rayCast(6.0, particlePos + VecUtils.UP * 2.0, true, RayCastMask.BLOCK)?.pos?.let {
-                particlePos = it + VecUtils.UP * 0.03
+            Rotation.DOWN.rayCast(6.0, particlePos + UP * 2.0, true, RayCastMask.BLOCK)?.pos?.let {
+                particlePos = it + UP * 0.03
             } ?: return@repeat
 
             val particleMotion = Rotation(
@@ -169,7 +170,7 @@ object Particles : Module(
 
             prevPos = position
 
-            if (!lay) motion += VecUtils.DOWN * gravity * 0.01
+            if (!lay) motion += DOWN * gravity * 0.01
             motion *= 0.9 + inertia * 0.1
 
             position += motion

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

@@ -19,10 +19,9 @@ package com.lambda.util.combat
 
 import com.lambda.context.SafeContext
 import com.lambda.core.annotations.InternalApi
-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.math.dist
+import com.lambda.util.math.minus
+import com.lambda.util.math.times
 import com.lambda.util.world.WorldUtils.internalGetFastEntities
 import com.lambda.util.world.fastEntitySearch
 import com.lambda.util.world.toFastVec
@@ -34,7 +33,6 @@ import net.minecraft.entity.decoration.EndCrystalEntity
 import net.minecraft.entity.effect.StatusEffects
 import net.minecraft.registry.tag.DamageTypeTags
 import net.minecraft.util.math.Vec3d
-import net.minecraft.util.math.Vec3i
 import net.minecraft.world.explosion.Explosion
 import kotlin.math.max
 import kotlin.math.min
@@ -81,16 +79,6 @@ object CombatUtils {
     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 [power of the explosion](https://minecraft.wiki/w/Explosion#Damage)
-     */
-    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.
      *
@@ -135,7 +123,7 @@ object CombatUtils {
      * @param position The position of the explosion
      * @param power The strength of the explosion
      */
-    fun SafeContext.explosionVelocity(entity: LivingEntity, position: Vec3d, power: Double): Vec3d {
+    fun explosionVelocity(entity: LivingEntity, position: Vec3d, power: Double): Vec3d {
         val distance = entity.pos.distanceTo(position)
 
         val size = power * 2.0

common/src/main/kotlin/com/lambda/util/extension/Box.kt

@@ -21,7 +21,7 @@ import net.minecraft.util.math.Box
 import net.minecraft.util.math.Vec3d
 
 val Box.min get() = Vec3d(minX, minY, minZ)
-
 val Box.max get() = Vec3d(maxX, maxY, maxZ)
 
 operator fun Box.contains(boundingBox: Box) = this.intersects(boundingBox)
+operator fun DoubleArray.component6() = this[5]