UnSprintOnPlace setting

CCBlueX · Nov 23, 2024 · 9f0ca64 · 9f0ca64
1 parent c1a8102
commit 9f0ca64
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/...a/net/ccbluex/liquidbounce/injection/mixins/minecraft/entity/MixinClientPlayerEntity.java b/...a/net/ccbluex/liquidbounce/injection/mixins/minecraft/entity/MixinClientPlayerEntity.java
@@ -296,8 +296,8 @@ private float hookSprintIgnoreHunger(float constant) {
     }
 
     @ModifyReturnValue(method = "canSprint", at = @At("RETURN"))
-    private boolean injectScaffoldSprintValue(boolean original) {
-        return original && (!ModuleScaffold.INSTANCE.handleEvents() || ScaffoldSprintFeature.INSTANCE.handleEvents());
+    private boolean hookScaffoldSprint(boolean original) {
+        return original && ScaffoldSprintFeature.INSTANCE.canSprint();
     }
 
     @ModifyExpressionValue(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/KeyBinding;isPressed()Z"))

diff --git a/.../kotlin/net/ccbluex/liquidbounce/features/module/modules/world/scaffold/ModuleScaffold.kt b/.../kotlin/net/ccbluex/liquidbounce/features/module/modules/world/scaffold/ModuleScaffold.kt
@@ -523,6 +523,7 @@ object ModuleScaffold : Module("Scaffold", Category.WORLD) {
             ScaffoldMovementPrediction.onPlace(currentOptimalLine, previousFallOffPos)
             ScaffoldEagleFeature.onBlockPlacement()
             ScaffoldBlinkFeature.onBlockPlacement()
+            ScaffoldSprintFeature.hasPlacedThisTick = true
 
             waitTicks(currentDelay)
         }

diff --git a/...uex/liquidbounce/features/module/modules/world/scaffold/features/ScaffoldSprintFeature.kt b/...uex/liquidbounce/features/module/modules/world/scaffold/features/ScaffoldSprintFeature.kt
@@ -1,8 +1,17 @@
 package net.ccbluex.liquidbounce.features.module.modules.world.scaffold.features
 
 import net.ccbluex.liquidbounce.config.ToggleableConfigurable
+import net.ccbluex.liquidbounce.event.repeatable
 import net.ccbluex.liquidbounce.features.module.modules.world.scaffold.ModuleScaffold
 
 object ScaffoldSprintFeature : ToggleableConfigurable(ModuleScaffold, "Sprint", true) {
     val spoof by boolean("Spoof", false)
+    private val unSprintOnPlace by boolean("UnSprintOnPlace", false)
+
+    var hasPlacedThisTick = false
+
+    @Suppress("unused")
+    private val tickHandler = repeatable { hasPlacedThisTick = false }
+
+    fun canSprint() = !ModuleScaffold.handleEvents() || handleEvents() && (!unSprintOnPlace || !hasPlacedThisTick)
 }