fix(AutoMount): Fix AutoMount module

Author: IceTank

src/main/kotlin/com/lambda/module/modules/movement/AutoMount.kt

@@ -17,16 +17,27 @@
 
 package com.lambda.module.modules.movement
 
+import com.lambda.config.AutomationConfig
 import com.lambda.context.SafeContext
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
+import com.lambda.interaction.managers.rotating.visibilty.VisibilityChecker
+import com.lambda.interaction.managers.rotating.visibilty.VisibilityChecker.findRotation
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
+import com.lambda.threading.runSafeAutomated
+import com.lambda.util.Communication.debug
+import com.lambda.util.Communication.info
+import com.lambda.util.EntityUtils
 import com.lambda.util.Timer
+import com.lambda.util.math.dist
 import com.lambda.util.world.fastEntitySearch
 import net.minecraft.entity.Entity
 import net.minecraft.entity.EntityType
+import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket
 import net.minecraft.registry.Registries
+import net.minecraft.util.Hand
+import net.minecraft.util.math.Vec3d
 import kotlin.time.Duration.Companion.milliseconds
 
 class AutoMount : Module(
@@ -36,30 +47,45 @@ class AutoMount : Module(
 ) {
 	var autoRemount by setting("Auto Remount", false, description = "Automatically remounts if you get off")
 	var autoMountEntities by setting("Auto Mount Entities", true, description = "Automatically mounts nearby entities in range")
-	var autoMountEntityList by setting("Auto Mount Entity List", mutableListOf<EntityType<*>>(), mutableListOf(Registries.ENTITY_TYPE.toList())) { autoMountEntities }
+	var autoMountEntityList by setting("Auto Mount Entity List",
+		mutableListOf(),
+		Registries.ENTITY_TYPE.toList()
+	) { autoMountEntities }
 
 	var interval by setting("Interval", 50, 1..200, 1, unit = "ms", description = "Interact interval")
-	var range by setting("Range", 5.0, 1.0..10.0, 0.1, description = "Mount range")
+	var range by setting("Range", 4.0, 1.0..20.0, 0.1, description = "Mount range")
+
+	override var automationConfig = AutomationConfig(
+		name = "AutoMount"
+	)
 
 	val intervalTimer = Timer()
 	var lastEntity: Entity? = null
 
 	init {
+		onEnable {
+			intervalTimer.reset()
+			lastEntity = null
+		}
+
 		listen<TickEvent.Pre> {
 			if (!intervalTimer.timePassed(interval.milliseconds)) {
 				return@listen
 			}
-			if (autoMountEntities && !player.isRiding) {
-				val entity = fastEntitySearch<Entity>(range) {
-					autoMountEntityList.contains(it.type) && canRide(it) && it.distanceTo(player) <= range
-				}
-				entity.firstOrNull()?.let {
-					intervalTimer.reset()
-					player.startRiding(it)
+			if (autoMountEntities && player.vehicle == null) {
+				runSafeAutomated {
+					val entity = fastEntitySearch<Entity>(10.0) {
+						autoMountEntityList.contains(it.type) && canRide(it) && it.findRotation(range, player.eyePos) != null
+					}.sortedBy { it.squaredDistanceTo(player.pos) }
+					entity.firstOrNull()?.let {
+						intervalTimer.reset()
+						interactEntity(it)
+						debug("Mounting ${it.name}")
+					}
 				}
 			}
 			if (autoRemount) {
-				if (player.isRiding) {
+				if (player.vehicle != null) {
 					lastEntity = player.vehicle
 				} else {
 					lastEntity?.let {
@@ -68,7 +94,7 @@ class AutoMount : Module(
 						} else {
 							if (canRide(it)) {
 								intervalTimer.reset()
-								player.startRiding(it)
+								interactEntity(it)
 							}
 						}
 					}
@@ -77,11 +103,12 @@ class AutoMount : Module(
 		}
 	}
 
-	private fun SafeContext.canRide(entity: Entity): Boolean {
-		return entity.canAddPassenger(player)
+	private fun SafeContext.interactEntity(entity: Entity) {
+		mc.networkHandler?.sendPacket(PlayerInteractEntityC2SPacket.interactAt(entity, false, Hand.MAIN_HAND, Vec3d(0.5, 0.5, 0.5)))
+		mc.networkHandler?.sendPacket(PlayerInteractEntityC2SPacket.interact(entity, false, Hand.MAIN_HAND))
 	}
 
-	private fun Entity.canAddPassenger(other: Entity): Boolean {
-		return this.canAddPassenger(other)
+	private fun SafeContext.canRide(entity: Entity): Boolean {
+		return entity.canAddPassenger(player)
 	}
 }

src/main/resources/lambda.accesswidener

@@ -155,3 +155,6 @@ transitive-accessible method net/minecraft/block/AbstractBlock getPickStack (Lne
 transitive-accessible field net/minecraft/client/gui/screen/ingame/HandledScreen focusedSlot Lnet/minecraft/screen/slot/Slot;
 transitive-accessible field net/minecraft/registry/SimpleRegistry frozen Z
 transitive-accessible field net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen messages [Ljava/lang/String;
+
+# AutoMount
+accessible method net/minecraft/entity/Entity canAddPassenger (Lnet/minecraft/entity/Entity;)Z