Merge branch '1.21.5' into feature/manager-loggers

Author: beanbag44

src/main/java/com/lambda/mixin/baritone/MixinLookBehavior.java

@@ -36,7 +36,7 @@ void onTargetUpdate(Rotation rotation, boolean blockInteract, CallbackInfo ci) {
         LookBehavior instance = ((LookBehavior) (Object) this);
         if (instance.baritone != BaritoneManager.getPrimary()) return;
 
-        RotationManager.handleBaritoneRotation(rotation.getYaw(), rotation.getPitch());
+        RotationManager.handleBaritoneRotation(rotation.getYaw());
         ci.cancel();
     }
 

src/main/kotlin/com/lambda/interaction/construction/simulation/BuildGoal.kt

@@ -23,7 +23,7 @@ import com.lambda.util.world.toFastVec
 import net.minecraft.util.math.BlockPos
 
 class BuildGoal(
-    private val sim: Simulation,
+    val sim: Simulation,
     blocked: BlockPos
 ) : Goal {
     private val blockedVec = blocked.toFastVec()

src/main/kotlin/com/lambda/interaction/request/rotating/RotationManager.kt

@@ -63,6 +63,7 @@ object RotationManager : RequestHandler<RotationRequest>(
     var serverRotation = Rotation.ZERO
     @JvmStatic
     var prevServerRotation = Rotation.ZERO
+    var baritoneRequest: RotationRequest? = null
 
     var activeRequest: RotationRequest? = null
     private var changedThisTick = false
@@ -163,12 +164,16 @@ object RotationManager : RequestHandler<RotationRequest>(
     }
 
     @JvmStatic
-    fun handleBaritoneRotation(yaw: Float, pitch: Float) {
-        lookAt(Rotation(yaw, pitch)).requestBy(BaritoneManager.rotation)
+    fun handleBaritoneRotation(yaw: Float) {
+        runSafe {
+            baritoneRequest = lookAt(Rotation(yaw, player.pitch)).requestBy(BaritoneManager.rotation)
+        }
     }
 
     @JvmStatic
     fun redirectStrafeInputs(input: Input) = runSafe {
+        if (activeRequest == baritoneRequest) return@runSafe
+
         val movementYaw = movementYaw ?: return@runSafe
         val playerYaw = player.yaw
 

src/main/kotlin/com/lambda/module/hud/Baritone.kt

@@ -18,6 +18,8 @@
 package com.lambda.module.hud
 
 import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.interaction.BaritoneManager.primary
+import com.lambda.interaction.construction.simulation.BuildGoal
 import com.lambda.module.HudModule
 import com.lambda.module.tag.ModuleTag
 
@@ -27,6 +29,11 @@ object Baritone : HudModule(
     tag = ModuleTag.HUD,
 ) {
     override fun ImGuiBuilder.buildLayout() {
-
+        primary.customGoalProcess.goal?.let {
+            when(it) {
+                is BuildGoal -> text("Lambda Simulation: ${it.sim}")
+                else -> text("Baritone: $it")
+            }
+        } ?: text("No Baritone Process Running")
     }
 }

src/main/kotlin/com/lambda/module/modules/debug/BaritoneTest.kt

@@ -17,10 +17,10 @@
 
 package com.lambda.module.modules.debug
 
-import baritone.api.BaritoneAPI
 import baritone.api.pathing.goals.GoalXZ
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
+import com.lambda.interaction.BaritoneManager
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
 
@@ -31,7 +31,11 @@ object BaritoneTest : Module(
 ) {
     init {
         listen<TickEvent.Pre> {
-            BaritoneAPI.getProvider().primaryBaritone.customGoalProcess.setGoalAndPath(GoalXZ(0, 0))
+            BaritoneManager.setGoalAndPath(GoalXZ(0, 0))
+        }
+
+        onDisable {
+            BaritoneManager.cancel()
         }
     }
 }