Fix: Revert saddle state on disable

Author: emyfops

…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

@@ -9,32 +9,38 @@ 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/resources/lambda.accesswidener

@@ -12,6 +12,7 @@ accessible field net/minecraft/client/world/ClientWorld entityManager Lnet/minec
 accessible field net/minecraft/entity/projectile/FireworkRocketEntity shooter Lnet/minecraft/entity/LivingEntity;
 accessible method net/minecraft/entity/Entity movementInputToVelocity (Lnet/minecraft/util/math/Vec3d;FF)Lnet/minecraft/util/math/Vec3d;
 accessible method net/minecraft/entity/passive/AbstractHorseEntity setHorseFlag (IZ)V
+accessible method net/minecraft/entity/passive/AbstractHorseEntity updateSaddle ()V
 
 # Camera
 accessible method net/minecraft/client/render/Camera setPos (DDD)V

common/src/main/resources/lambda.mixins.common.json

@@ -15,6 +15,7 @@
     "input.KeyBindingMixin",
     "input.KeyboardMixin",
     "input.MouseMixin",
+    "items.TridentMixin",
     "render.CameraMixin",
     "render.ChatInputSuggestorMixin",
     "render.ChatScreenMixin",
@@ -27,8 +28,7 @@
     "render.RenderTickCounterMixin",
     "render.VertexBufferMixin",
     "render.WorldRendererMixin",
-    "world.WorldMixin",
-    "items.TridentMixin"
+    "world.WorldMixin"
   ],
   "injectors": {
     "defaultRequire": 1