Merge remote-tracking branch 'origin/master'

Author: bladekt

build.gradle.kts

@@ -1,4 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import net.fabricmc.loom.api.LoomGradleExtensionAPI
 import net.fabricmc.loom.task.RemapJarTask
 
 val modId = property("mod_id").toString()
@@ -8,6 +9,8 @@ val minecraftVersion = property("minecraft_version").toString()
 val yarnMappings = property("yarn_mappings").toString()
 
 val libs = file("libs")
+val Project.loom: LoomGradleExtensionAPI
+    get() = (this as ExtensionAware).extensions.getByName("loom") as LoomGradleExtensionAPI
 
 plugins {
     kotlin("jvm") version "1.9.23"

common/src/main/kotlin/com/lambda/event/events/RotationEvent.kt

@@ -11,7 +11,7 @@ import com.lambda.interaction.visibilty.VisibilityChecker.findRotation
 import com.lambda.threading.runSafe
 import com.lambda.util.world.raycast.RayCastUtils.blockResult
 import com.lambda.util.world.raycast.RayCastUtils.entityResult
-import net.minecraft.entity.LivingEntity
+import net.minecraft.entity.Entity
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 
@@ -37,7 +37,7 @@ abstract class RotationEvent : Event {
         fun lookAtEntity(
             rotationConfig: IRotationConfig,
             interactionConfig: InteractionConfig,
-            entity: LivingEntity
+            entity: Entity
         ) {
             runSafe {
                 findRotation(rotationConfig, interactionConfig, listOf(entity.boundingBox)) {
@@ -68,4 +68,4 @@ abstract class RotationEvent : Event {
     }
 
     class Post(val context: RotationContext) : RotationEvent()
-}
+}

common/src/main/kotlin/com/lambda/module/modules/EntityTest.kt

@@ -3,7 +3,7 @@ package com.lambda.module.modules
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.module.Module
-import com.lambda.util.world.EntityUtils.getClosestEntity
+import com.lambda.util.world.WorldUtils.getClosestEntity
 import net.minecraft.entity.Entity
 
 object EntityTest : Module(

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

@@ -2,20 +2,14 @@ package com.lambda.module.modules.combat
 
 import com.lambda.config.InteractionSettings
 import com.lambda.config.RotationSettings
-import com.lambda.event.events.RotationEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.concurrentListener
 import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
-import com.lambda.util.Communication.info
-import com.lambda.util.combat.Explosion.velocity
-import com.lambda.util.world.EntityUtils.getClosestEntity
-import com.lambda.util.world.EntityUtils.getFastEntities
-import net.minecraft.entity.Entity
+import com.lambda.util.world.WorldUtils.getClosestEntity
 import net.minecraft.entity.LivingEntity
 import net.minecraft.util.Hand
-import net.minecraft.world.explosion.Explosion
 
 object CrystalAura : Module(
     name = "CrystalAura",

…da/module/modules/movement/HorseUtils.kt …module/modules/movement/EntityControl.ktcommon/src/main/kotlin/com/lambda/module/modules/movement/HorseUtils.kt renamed to common/src/main/kotlin/com/lambda/module/modules/movement/EntityControl.kt common/src/main/kotlin/com/lambda/module/modules/movement/HorseUtils.kt renamed to common/src/main/kotlin/com/lambda/module/modules/movement/EntityControl.kt

@@ -5,36 +5,42 @@ import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
-import com.lambda.util.world.EntityUtils.getEntities
+import com.lambda.util.world.WorldUtils.getEntities
 import net.minecraft.entity.passive.AbstractHorseEntity
 import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket
 
-object HorseUtils : Module(
-    name = "HorseUtils",
-    description = "Various utilities for horses.",
+object EntityControl : Module(
+    name = "EntityControl",
+    description = "Control mountable entities",
     defaultTags = setOf(ModuleTag.MOVEMENT, ModuleTag.BYPASS)
 ) {
     private val page by setting("Page", Page.General)
 
     /* General */
     private val forceMount by setting("Force Mount", true, description = "Attempts to force mount chested entities.", visibility = { page == Page.General })
-    private val tameHorses by setting("Tame Horses", true, description = "Automatically tames horses (client-side only).", visibility = { page == Page.General })
 
-    /* Rendering */
-    private val showInfo by setting("Show Info", true, description = "Renders information about entities.", visibility = { page == Page.Rendering })
-
-    private val theHonses = mutableListOf<AbstractHorseEntity>() // Petah, the honse is here
-    private val tame: (AbstractHorseEntity) -> Unit = { horse -> if (tameHorses) horse.setHorseFlag(4, true) }
+    /* Movement */
+    private val speed by setting("Entity Speed", 2.0, 0.1..10.0, 0.1, description = "Speed for entities.", visibility = { page == Page.Movement })
 
     private enum class Page {
-        General, Rendering
+        General, Movement
     }
 
+    private val theHonses = mutableListOf<AbstractHorseEntity>() // Petah, the honse is here
+
     init {
         listener<TickEvent.Pre> {
-            getEntities(theHonses, iterator = tame)
+            getEntities(player.pos, 8.0, theHonses, { horse, _ -> horse.setHorseFlag(4, true) })
         }
 
+        /*listener<MovementEvent.Pre> {
+            if (!player.isRiding) return@listener
+
+            // We can do this because the player movement depends on the entity movement
+            player.vehicle?.motionX = speed
+            player.vehicle?.motionZ = speed
+        }*/
+
         listener<PacketEvent.Send.Pre> { event ->
             if (!forceMount) return@listener
             if (event.packet !is PlayerInteractEntityC2SPacket) return@listener
@@ -45,5 +51,10 @@ object HorseUtils : Module(
 
             event.cancel()
         }
+
+        onDisable {
+            theHonses.forEach { horse -> horse.updateSaddle() }
+            theHonses.clear()
+        }
     }
 }

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

@@ -1,10 +1,12 @@
 package com.lambda.module.modules.movement
 
+import com.lambda.context.SafeContext
 import com.lambda.event.events.PacketEvent
 import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
 import com.lambda.threading.runSafe
+import com.lambda.util.collections.filterPointer
 import net.minecraft.entity.projectile.FireworkRocketEntity
 import net.minecraft.network.packet.c2s.common.CommonPongC2SPacket
 import net.minecraft.network.packet.s2c.play.EntitiesDestroyS2CPacket
@@ -25,24 +27,24 @@ object RocketExtend : Module(
             if (event.packet is PlayerPositionLookS2CPacket) reset()
 
             if (event.packet is EntitiesDestroyS2CPacket) {
-                val rockets = event.packet.entityIds.map(world::getEntityById)
-                    .filter { it is FireworkRocketEntity && it.shooter == player }
-                    .mapNotNull { it as? FireworkRocketEntity }
-                    .also { event.packet.entityIds.removeAll(it.map(FireworkRocketEntity::getId).toSet()) }
-                extendedRockets.addAll(rockets)
+                event.packet.entityIds.map(world::getEntityById)
+                    .filterPointer(extendedRockets, { _, id -> event.packet.entityIds.removeInt(id) }) { rocket -> rocket.shooter == player }
             }
         }
 
         listener<PacketEvent.Send.Pre> { event ->
             if (event.packet !is CommonPongC2SPacket) return@listener
+
             if (extendedRockets.isEmpty()) {
                 lastPingTime = System.currentTimeMillis()
                 return@listener
             }
+
             if (System.currentTimeMillis() - lastPingTime > keepAliveTime * 1000) {
                 reset()
                 return@listener
             }
+
             pingPacket = event.packet
             event.cancel()
         }
@@ -52,7 +54,7 @@ object RocketExtend : Module(
         }
     }
 
-    private fun reset() = runSafe {
+    private fun SafeContext.reset() {
         extendedRockets.forEach(FireworkRocketEntity::discard)
         extendedRockets.clear()
         pingPacket?.let(connection::sendPacket)

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

@@ -11,12 +11,14 @@ package com.lambda.util.collections
  * @param R The target type to filter elements to.
  * @param C The type of the destination mutable collection.
  * @param destination The mutable collection to which the filtered elements will be added.
+ * @param iterator The iterator function that processes the filtered elements and their index.
  * @param predicate The predicate function that determines whether an element should be included based on its type and other criteria.
  */
 inline fun <reified R, C : MutableCollection<in R>> Iterable<*>.filterPointer(
-    destination: C? = null,
-    iterator: (R) -> Unit,
+    destination: C?,
+    iterator: (R, Int) -> Unit,
     predicate: (R) -> Boolean,
 ) {
-    for (element in this) if (element is R && predicate(element)) { iterator(element); destination?.add(element) }
+    var index = 0
+    for (element in this) if (element is R && predicate(element)) { iterator(element, index++); destination?.add(element) }
 }

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

@@ -3,7 +3,7 @@ package com.lambda.util.combat
 import com.lambda.context.SafeContext
 import com.lambda.util.math.VecUtils.minus
 import com.lambda.util.math.VecUtils.times
-import com.lambda.util.world.EntityUtils.getFastEntities
+import com.lambda.util.world.WorldUtils.getFastEntities
 import net.minecraft.enchantment.ProtectionEnchantment
 import net.minecraft.entity.LivingEntity
 import net.minecraft.util.math.BlockPos