Skip to content

Commit 0f869ff

Browse files
committed
ref: math utils and extensions
1 parent 2bc6ef4 commit 0f869ff

File tree

41 files changed

+387
-444
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+387
-444
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import com.lambda.interaction.rotation.Rotation.Companion.dist
2424
import com.lambda.interaction.rotation.Rotation.Companion.rotation
2525
import com.lambda.interaction.rotation.Rotation.Companion.rotationTo
2626
import com.lambda.threading.runSafe
27-
import com.lambda.util.math.VecUtils.distSq
27+
import com.lambda.util.math.distSq
2828
import com.lambda.util.world.fastEntitySearch
2929
import net.minecraft.client.network.ClientPlayerEntity
3030
import net.minecraft.client.network.OtherClientPlayerEntity
@@ -40,16 +40,16 @@ import net.minecraft.entity.passive.PassiveEntity
4040
* based on player settings and entity characteristics. It allows for specifying which types of entities
4141
* are targetable, the range of targeting, and various other conditions for targeting.
4242
*
43-
* @property owner The [Configurable] instance used to get and set configuration options for targeting.
44-
* @property predicate The predicate used to determine whether the targeting settings are visible and active.
45-
* @property defaultRange The default range within which entities can be targeted.
46-
* @property maxRange The maximum range within which entities can be targeted.
43+
* @param owner The [Configurable] instance used to get and set configuration options for targeting.
44+
* @param predicate The predicate used to determine whether the targeting settings are visible and active.
45+
* @param defaultRange The default range within which entities can be targeted.
46+
* @param maxRange The maximum range within which entities can be targeted.
4747
*/
4848
abstract class Targeting(
49-
owner: Configurable,
50-
predicate: () -> Boolean = { true },
51-
defaultRange: Double,
52-
maxRange: Double,
49+
private val owner: Configurable,
50+
private val predicate: () -> Boolean = { true },
51+
private val defaultRange: Double,
52+
private val maxRange: Double,
5353
) : TargetingConfig {
5454

5555
/**

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@
1717

1818
package com.lambda.graphics.renderer.esp
1919

20-
import com.lambda.util.math.VecUtils.minus
21-
import com.lambda.util.math.VecUtils.plus
22-
import com.lambda.util.extension.max
23-
import com.lambda.util.extension.min
2420
import com.lambda.util.extension.prevPos
21+
import com.lambda.util.math.minus
2522
import net.minecraft.entity.Entity
2623
import net.minecraft.util.math.Box
2724

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import com.lambda.event.events.PlayerPacketEvent
2424
import com.lambda.interaction.rotation.Rotation
2525
import com.lambda.threading.runSafe
2626
import com.lambda.util.collections.LimitedOrderedSet
27-
import com.lambda.util.extension.component1
28-
import com.lambda.util.extension.component2
29-
import com.lambda.util.extension.component3
30-
import com.lambda.util.math.VecUtils.approximate
27+
import com.lambda.util.math.approximate
28+
import com.lambda.util.math.component1
29+
import com.lambda.util.math.component2
30+
import com.lambda.util.math.component3
3131
import com.lambda.util.player.MovementUtils.motionX
3232
import com.lambda.util.player.MovementUtils.motionZ
3333
import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import com.lambda.interaction.blockplace.PlaceInteraction.canPlaceAt
2222
import com.lambda.interaction.blockplace.PlaceInteraction.isClickable
2323
import com.lambda.interaction.visibilty.VisibilityChecker.getVisibleSurfaces
2424
import com.lambda.util.BlockUtils.blockState
25-
import com.lambda.util.math.VecUtils.distSq
26-
import com.lambda.util.math.VecUtils.getHitVec
25+
import com.lambda.util.math.distSq
26+
import com.lambda.util.math.getHitVec
2727
import net.minecraft.util.math.BlockPos
2828
import net.minecraft.util.math.Box
2929
import net.minecraft.util.math.Direction

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import com.lambda.interaction.construction.verify.TargetState
2121
import com.lambda.util.BlockUtils.blockPos
2222
import com.lambda.util.collections.ResettableLazy
2323
import com.lambda.util.extension.Structure
24-
import com.lambda.util.math.VecUtils.blockPos
24+
import com.lambda.util.math.blockPos
2525
import net.minecraft.structure.StructureTemplate
2626
import net.minecraft.util.math.*
2727

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import com.lambda.util.BlockUtils.instantBreakable
4343
import com.lambda.util.BlockUtils.vecOf
4444
import com.lambda.util.Communication.warn
4545
import com.lambda.util.item.ItemStackUtils.equal
46-
import com.lambda.util.math.VecUtils.distSq
46+
import com.lambda.util.math.distSq
4747
import com.lambda.util.player.copyPlayer
4848
import com.lambda.util.world.raycast.RayCastUtils.blockResult
4949
import net.minecraft.block.OperatorBlock

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package com.lambda.interaction.material.container.containers
1919

2020
import com.lambda.interaction.material.StackSelection
2121
import com.lambda.interaction.material.container.MaterialContainer
22-
import com.lambda.util.math.VecUtils.blockPos
22+
import com.lambda.util.math.blockPos
2323
import com.lambda.util.text.buildText
2424
import com.lambda.util.text.highlighted
2525
import com.lambda.util.text.literal

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import com.lambda.threading.runSafe
2222
import com.lambda.util.math.MathUtils.toDegree
2323
import com.lambda.util.math.MathUtils.toRadian
2424
import com.lambda.util.math.Vec2d
25-
import com.lambda.util.math.VecUtils.plus
26-
import com.lambda.util.math.VecUtils.times
25+
import com.lambda.util.math.plus
26+
import com.lambda.util.math.times
2727
import com.lambda.util.world.raycast.RayCastMask
2828
import com.lambda.util.world.raycast.RayCastUtils.rayCast
2929
import net.minecraft.entity.Entity

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import com.lambda.interaction.rotation.RotationRequest
2828
import com.lambda.module.modules.client.TaskFlowModule
2929
import com.lambda.util.BlockUtils.blockState
3030
import com.lambda.util.extension.component6
31-
import com.lambda.util.math.VecUtils.distSq
31+
import com.lambda.util.math.distSq
3232
import com.lambda.util.world.raycast.RayCastUtils.blockResult
3333
import com.lambda.util.world.raycast.RayCastUtils.entityResult
3434
import net.minecraft.entity.Entity

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ object DiscordRPC : Module(
9393
get() = uuid == currentParty?.leader?.uuid
9494

9595
private val PlayerEntity.isInParty
96-
get() = currentParty?.players?.any { it.uuid == this@isInParty.uuid }
96+
get() = currentParty?.players?.any { it.uuid == this.uuid }
9797

9898
init {
9999
listenUnsafe<ConnectionEvent.Connect.Login.EncryptionRequest> {
@@ -160,7 +160,7 @@ object DiscordRPC : Module(
160160
runConcurrent {
161161
while (rpc.connected) {
162162
updateActivity()
163-
delay(delay.toLong())
163+
delay(delay)
164164
}
165165
}
166166
}

0 commit comments

Comments
 (0)