Skip to content

improve(Eagle/Module):AutoBlocks #7165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Chasteful wants to merge 1 commit into
base: nextgen
Choose a base branch
from
Open

improve(Eagle/Module):AutoBlocks #7165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 35 additions & 24 deletions src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/ModuleEagle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import net.ccbluex.liquidbounce.features.module.modules.world.scaffold.ScaffoldB
import net.ccbluex.liquidbounce.utils.entity.isCloseToEdge
import net.ccbluex.liquidbounce.utils.kotlin.EventPriorityConvention.SAFETY_FEATURE
import net.ccbluex.liquidbounce.utils.kotlin.random
import net.minecraft.item.ItemStack
import java.util.function.Predicate

/**
Expand All @@ -42,19 +43,15 @@ object ModuleEagle : ClientModule(
) {

private val edgeDistance by floatRange("EdgeDistance", 0.4f..0.6f, 0.01f..1.3f)
.onChanged {
currentEdgeDistance = it.random()
}
.onChanged { currentEdgeDistance = it.random() }

private var currentEdgeDistance: Float = edgeDistance.random()
private var wasSneaking = false
private var sneakCaptured = false
var shouldBeActive = false

private fun shouldActivateEagle(event: MovementInputEvent, conditionsMet: Boolean): Boolean {
if (player.abilities.flying || !conditionsMet) {
return false
}

if (player.abilities.flying || !conditionsMet) return false
return player.isCloseToEdge(event.directionalInput, currentEdgeDistance.toDouble())
}

Expand All @@ -63,7 +60,6 @@ object ModuleEagle : ClientModule(
sneakCaptured = false
return
}

when {
!sneakCaptured && active && originalSneak -> sneakCaptured = true
sneakCaptured && !originalSneak -> sneakCaptured = false
Expand All @@ -79,19 +75,38 @@ object ModuleEagle : ClientModule(
wasSneaking = true
return
}

if (wasSneaking) {
currentEdgeDistance = edgeDistance.random()
wasSneaking = false
}
}

private object Conditional : ToggleableConfigurable(this, "Conditional", true) {
private val conditions by multiEnumChoice(
"Conditions",
Condition.ON_GROUND
)
private object EagleAutoBlockFeature : ToggleableConfigurable(this, "AutoBlock", true) {
val doNotUseBelowCount by int("DoNotUseBelowCount", 2, 0..64)
fun trySwitchBlock(): Boolean {
if (!enabled || player.isCreative || !shouldBeActive) return false

val handStack = player.mainHandStack
if (isValidBlock(handStack) && handStack.count >= doNotUseBelowCount) return false

fun switchTo(predicate: (ItemStack) -> Boolean): Boolean {
Copy link
Contributor

@MukjepScarlet MukjepScarlet Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use SilentHotbar

for (i in 0..8) {
val stack = player.inventory.getStack(i)
if (predicate(stack)) {
player.inventory.selectedSlot = i
return true
}
}
return false
}

return switchTo { isValidBlock(it) && it.count >= doNotUseBelowCount }
|| switchTo { isValidBlock(it) }
}
}

private object Conditional : ToggleableConfigurable(this, "Conditional", true) {
private val conditions by multiEnumChoice("Conditions", Condition.ON_GROUND)
val pitch by floatRange("Pitch", -90f..90f, -90f..90f)

val controlsSneak
Expand Down Expand Up @@ -123,7 +138,7 @@ object ModuleEagle : ClientModule(
}

init {
tree(Conditional)
treeAll(Conditional, EagleAutoBlockFeature)
}

override fun onDisabled() {
Expand All @@ -138,19 +153,15 @@ object ModuleEagle : ClientModule(

val originalSneak = mc.options.sneakKey.isPressed
val conditionsMet = Conditional.shouldSneak(event)
val isActive = shouldActivateEagle(event, conditionsMet)
shouldBeActive = shouldActivateEagle(event, conditionsMet)

updateSneakCapture(originalSneak, isActive)
EagleAutoBlockFeature.trySwitchBlock()

val controlsSneak = shouldOverrideSneak(conditionsMet, isActive)
updateSneakCapture(originalSneak, shouldBeActive)

event.sneak = if (controlsSneak) {
isActive
} else {
originalSneak || isActive
}
val controlsSneak = shouldOverrideSneak(conditionsMet, shouldBeActive)
event.sneak = if (controlsSneak) shouldBeActive else (originalSneak || shouldBeActive)

updateSneakState(event.sneak)
}

}