feat: do not use below count - autoblock scaffold (#3434)

CCBlueX · Jul 14, 2024 · e9783de · e9783de
1 parent 6992fc6
commit e9783de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
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
@@ -238,7 +238,7 @@ object ModuleScaffold : Module("Scaffold", Category.WORLD) {
             PreferFullCubeBlocks,
             PreferWalkableBlocks,
             PreferAverageHardBlocks,
-            PreferStackSize(higher = true),
+            PreferStackSize(higher = false),
         )
 
     override fun enable() {
@@ -497,6 +497,7 @@ object ModuleScaffold : Module("Scaffold", Category.WORLD) {
 
     private fun findBestValidHotbarSlotForTarget() =
         findPlaceableSlots()
+            .filter { it.second.count > ScaffoldAutoBlockFeature.doNotUseBelowCount }
             .maxWithOrNull { o1, o2 -> BLOCK_COMPARATOR_FOR_HOTBAR.compare(o1.second, o2.second) }
             ?.first
 
@@ -592,7 +593,8 @@ object ModuleScaffold : Module("Scaffold", Category.WORLD) {
             val bestMainHandSlot = findBestValidHotbarSlotForTarget()
 
             if (bestMainHandSlot != null) {
-                SilentHotbar.selectSlotSilently(this, bestMainHandSlot, ScaffoldAutoBlockFeature.slotResetDelay)
+                SilentHotbar.selectSlotSilently(this, bestMainHandSlot,
+                    ScaffoldAutoBlockFeature.slotResetDelay)
 
                 return true
             } else {

diff --git a/.../liquidbounce/features/module/modules/world/scaffold/features/ScaffoldAutoBlockFeature.kt b/.../liquidbounce/features/module/modules/world/scaffold/features/ScaffoldAutoBlockFeature.kt
@@ -24,4 +24,5 @@ import net.ccbluex.liquidbounce.features.module.modules.world.scaffold.ModuleSca
 object ScaffoldAutoBlockFeature : ToggleableConfigurable(ModuleScaffold, "AutoBlock", true) {
     val alwaysHoldBlock by boolean("Always", false)
     val slotResetDelay by int("SlotResetDelay", 5, 0..40, "ticks")
+    val doNotUseBelowCount by int("DoNotUseBelowCount", 1, 0..64)
 }