From 3737d46b3283638cce155967f4df056189eeb1eb Mon Sep 17 00:00:00 2001 From: StorageESP Date: Mon, 7 Mar 2022 16:36:51 +0100 Subject: [PATCH 1/2] Add disable when pressing opposite key option --- .../module/modules/movement/AutoWalk.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/AutoWalk.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/AutoWalk.kt index 4c567eff2..bfa18492f 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/movement/AutoWalk.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/movement/AutoWalk.kt @@ -28,6 +28,7 @@ object AutoWalk : Module( ) { private val mode = setting("Direction", AutoWalkMode.BARITONE) private val disableOnDisconnect by setting("Disable On Disconnect", true) + private var pause by setting("Pause when pressing opposite movement key", true) private enum class AutoWalkMode(override val displayName: String) : DisplayEnum { FORWARD("Forward"), @@ -73,17 +74,16 @@ object AutoWalk : Module( if (it.movementInput !is MovementInputFromOptions) return@listener - when (mode.value) { - AutoWalkMode.FORWARD -> { - it.movementInput.moveForward = 1.0f - } - AutoWalkMode.BACKWARD -> { - it.movementInput.moveForward = -1.0f - } - else -> { - // Baritone mode - } + if (mode.value == AutoWalkMode.BACKWARD && if (pause) !mc.gameSettings.keyBindForward.isKeyDown else true) { + it.movementInput.moveForward = -1.0f + } else if (mode.value == AutoWalkMode.FORWARD && if (pause) !mc.gameSettings.keyBindBack.isKeyDown else true) { + it.movementInput.moveForward = 1.0f + } else if (pause){ + it.movementInput.moveForward = 0.0f + } else { + // Baritone mode } + } safeListener { From 701b3e9db3eb5a00cd72cf9381c95b31554e8ee4 Mon Sep 17 00:00:00 2001 From: Constructor Date: Wed, 6 Apr 2022 03:39:09 +0200 Subject: [PATCH 2/2] Cleanup --- .../module/modules/movement/AutoWalk.kt | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/kotlin/com/lambda/client/module/modules/movement/AutoWalk.kt b/src/main/kotlin/com/lambda/client/module/modules/movement/AutoWalk.kt index bfa18492f..b807d1696 100644 --- a/src/main/kotlin/com/lambda/client/module/modules/movement/AutoWalk.kt +++ b/src/main/kotlin/com/lambda/client/module/modules/movement/AutoWalk.kt @@ -28,7 +28,7 @@ object AutoWalk : Module( ) { private val mode = setting("Direction", AutoWalkMode.BARITONE) private val disableOnDisconnect by setting("Disable On Disconnect", true) - private var pause by setting("Pause when pressing opposite movement key", true) + private var pauseOnBackwards by setting("Pause on opposite movement", true) private enum class AutoWalkMode(override val displayName: String) : DisplayEnum { FORWARD("Forward"), @@ -74,20 +74,24 @@ object AutoWalk : Module( if (it.movementInput !is MovementInputFromOptions) return@listener - if (mode.value == AutoWalkMode.BACKWARD && if (pause) !mc.gameSettings.keyBindForward.isKeyDown else true) { - it.movementInput.moveForward = -1.0f - } else if (mode.value == AutoWalkMode.FORWARD && if (pause) !mc.gameSettings.keyBindBack.isKeyDown else true) { - it.movementInput.moveForward = 1.0f - } else if (pause){ - it.movementInput.moveForward = 0.0f - } else { - // Baritone mode + it.movementInput.moveForward = when (mode.value) { + AutoWalkMode.FORWARD -> { + if (pauseOnBackwards && mc.gameSettings.keyBindBack.isKeyDown) 0.0f else 1.0f + } + AutoWalkMode.BACKWARD -> { + if (pauseOnBackwards && mc.gameSettings.keyBindForward.isKeyDown) 0.0f else -1.0f + } + else -> { + 0.0f + } } - } safeListener { - if (mode.value == AutoWalkMode.BARITONE && !checkBaritoneElytra() && !isActive()) { + if (mode.value == AutoWalkMode.BARITONE + && !checkBaritoneElytra() + && !isActive() + ) { startPathing() } }