From 8a0b966db9901027c921a5a4873fea2652d92709 Mon Sep 17 00:00:00 2001 From: blocksimus <336769374+blocksimus@users.noreply.github.com> Date: Sun, 8 Nov 2026 15:57:52 +1100 Subject: [PATCH] feat: pause Baritone for KillAura and AutoEat --- .../handler/handlers/BaritoneHandler.kt | 41 +++++++++++++++++-- .../lambda/module/modules/combat/KillAura.kt | 3 ++ .../lambda/module/modules/player/AutoEat.kt | 6 +++ 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/lambda/interaction/handler/handlers/BaritoneHandler.kt b/src/main/kotlin/com/lambda/interaction/handler/handlers/BaritoneHandler.kt index 85fe0978f..6b2db2b34 100644 --- a/src/main/kotlin/com/lambda/interaction/handler/handlers/BaritoneHandler.kt +++ b/src/main/kotlin/com/lambda/interaction/handler/handlers/BaritoneHandler.kt @@ -21,6 +21,9 @@ import baritone.api.BaritoneAPI import baritone.api.IBaritone import baritone.api.Settings import baritone.api.pathing.goals.Goal +import baritone.api.process.IBaritoneProcess +import baritone.api.process.PathingCommand +import baritone.api.process.PathingCommandType import com.lambda.config.Config import com.lambda.config.ConfigBlock import com.lambda.config.Group @@ -30,6 +33,9 @@ import com.lambda.config.blocks.RotationSettings import com.lambda.config.categories.LambdaCategory import com.lambda.config.entries.onValueChange import com.lambda.context.Automated +import com.lambda.core.Loadable +import com.lambda.event.events.TickEvent +import com.lambda.event.listener.SafeListener.Companion.listen import com.lambda.util.BlockUtils.blockPos import net.minecraft.util.BlockMirror import net.minecraft.util.BlockRotation @@ -38,7 +44,7 @@ import net.minecraft.util.BlockRotation object BaritoneHandler : Config( "baritone", LambdaCategory -), Automated by AutomationConfig.DEFAULT { +), Loadable, Automated by AutomationConfig.DEFAULT { val baritoneAvailable by lazy { runCatching { Class.forName("baritone.api.BaritoneAPI") @@ -66,15 +72,44 @@ object BaritoneHandler : Config( get() = baritoneAvailable && primary?.pathingBehavior?.isPathing == true /** - * Whether Baritone is active (pathing, calculating goal, etc.) + * Whether Baritone is active (pathing, calculating goal, etc.) and not held still by [pause] */ @JvmStatic val isActive: Boolean - get() = baritoneAvailable && + get() = baritoneAvailable && !isPaused && (primary?.customGoalProcess?.isActive == true || primary?.pathingBehavior?.isPathing == true || primary?.pathingControlManager?.mostRecentInControl()?.orElse(null)?.isActive == true || primary?.elytraProcess?.isActive == true) + private val isPaused: Boolean + get() = baritoneAvailable && + primary?.pathingControlManager?.mostRecentInControl()?.orElse(null) === PauseProcess && + primary.pathingBehavior?.isPathing != true + + private var pauseRequested = false + + /** + * Requests Baritone to pause, call it from [TickEvent.Pre] every tick you want it paused + */ + fun pause() { + pauseRequested = true + } + + override fun load(): String { + if (baritoneAvailable) primary?.pathingControlManager?.registerProcess(PauseProcess) + listen { pauseRequested = false } + return "Loaded Baritone Handler" + } + + private object PauseProcess : IBaritoneProcess { + override fun isActive() = pauseRequested + override fun onTick(calcFailed: Boolean, isSafeToCancel: Boolean) = PathingCommand(null, PathingCommandType.REQUEST_PAUSE) + override fun isTemporary() = true + override fun onLostControl() {} + override fun priority() = 5.1 + override fun displayName0() = "Lambda pause" + } + /** * Sets the current Baritone goal and starts pathing */ diff --git a/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt b/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt index 679c0d9e9..ad9118444 100644 --- a/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt +++ b/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt @@ -31,6 +31,7 @@ import com.lambda.event.listener.SafeListener.Companion.listen import com.lambda.interaction.container.containers.HotbarContainer import com.lambda.interaction.container.selection.select import com.lambda.interaction.container.selection.stackSelection +import com.lambda.interaction.handler.handlers.BaritoneHandler import com.lambda.interaction.handler.handlers.ContainerHandler.findSlot import com.lambda.interaction.manager.managers.hotbar.hotbarRequest import com.lambda.interaction.manager.managers.rotating.rotationRequest @@ -58,6 +59,7 @@ object KillAura : Module( private const val TARGETING_TAB = "Targeting" @Tab(GENERAL_TAB) private val rotate by setting("Rotate", true) + @Tab(GENERAL_TAB) private val pauseBaritone by setting("Pause Baritone", true, "Pause Baritone to look at the target") { rotate } @Tab(GENERAL_TAB) private val swap by setting("Swap", true, "Swap to the item with the highest damage") @Tab(GENERAL_TAB) private val disableWhileGliding by setting("Disable While Gliding", false, "Disables when gliding with an elytra") @Tab(GENERAL_TAB) private val damageMode by setting("Damage Mode", DamageMode.Dps) @@ -113,6 +115,7 @@ object KillAura : Module( var rotated = true if (rotate) withSafeAutomated { val rotationRequest = lookAtEntity(entity)?.rotation?.let { rotationRequest { rotation(it) } }?.submit() ?: return@listen + if (pauseBaritone) BaritoneHandler.pause() rotated = rotationRequest.done && entity === prevEntity && validServerRot prevEntity = entity validServerRot = rotationRequest.done diff --git a/src/main/kotlin/com/lambda/module/modules/player/AutoEat.kt b/src/main/kotlin/com/lambda/module/modules/player/AutoEat.kt index 6ad4bbdd4..2a8dac91f 100644 --- a/src/main/kotlin/com/lambda/module/modules/player/AutoEat.kt +++ b/src/main/kotlin/com/lambda/module/modules/player/AutoEat.kt @@ -23,6 +23,7 @@ import com.lambda.config.hideAllExcept import com.lambda.config.withEdits import com.lambda.event.events.TickEvent import com.lambda.event.listener.SafeListener.Companion.listen +import com.lambda.interaction.handler.handlers.BaritoneHandler import com.lambda.module.Module import com.lambda.module.ModuleTag import com.lambda.task.Task @@ -37,6 +38,8 @@ object AutoEat : Module( description = "Eats food when you are hungry", tag = ModuleTag.PLAYER, ) { + private val pauseBaritone by setting("Pause Baritone", true, "Pause Baritone while eating") + private var eatTask: Task<*>? = null init { @@ -46,6 +49,9 @@ object AutoEat : Module( } listen { + val state = eatTask?.state + if (pauseBaritone && (state == Task.State.Running || state == Task.State.Paused)) BaritoneHandler.pause() + val reason = withSafeAutomated { reasonEating() } if (eatTask != null || !reason.shouldEat()) return@listen