feat(AutoTool): Settings refactoring

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/world/ModuleAutoTool.kt

@@ -19,12 +19,14 @@
 package net.ccbluex.liquidbounce.features.module.modules.world
 
 import it.unimi.dsi.fastutil.ints.IntObjectImmutablePair
+import net.ccbluex.liquidbounce.config.types.Choice
+import net.ccbluex.liquidbounce.config.types.ChoiceConfigurable
 import net.ccbluex.liquidbounce.event.events.BlockBreakingProgressEvent
 import net.ccbluex.liquidbounce.event.handler
 import net.ccbluex.liquidbounce.features.module.Category
 import net.ccbluex.liquidbounce.features.module.ClientModule
 import net.ccbluex.liquidbounce.utils.client.SilentHotbar
-import net.ccbluex.liquidbounce.utils.item.isNothing
+import net.ccbluex.liquidbounce.utils.inventory.findBestToolToMineBlock
 import net.minecraft.block.BlockState
 import net.minecraft.entity.player.PlayerInventory
 import net.minecraft.item.ItemStack
@@ -36,20 +38,37 @@ import net.minecraft.util.math.BlockPos
  * Automatically chooses the best tool in your inventory to mine a block.
  */
 object ModuleAutoTool : ClientModule("AutoTool", Category.WORLD) {
+    val toolSelector =
+        choices(
+            "ToolSelector",
+            DynamicSelectMode,
+            arrayOf(DynamicSelectMode, StaticSelectMode)
+        )
 
-    // Ignore items with low durability
-    private val ignoreDurability by boolean("IgnoreDurability", false)
+    sealed class ToolSelectorMode(name: String) : Choice(name) {
+        abstract fun getTool(inventory: PlayerInventory, blockState: BlockState?): IntObjectImmutablePair<ItemStack>?
+    }
+
+    private object DynamicSelectMode : ToolSelectorMode("Dynamic") {
+        override val parent: ChoiceConfigurable<*>
+            get() = toolSelector
+
+        private val ignoreDurability by boolean("IgnoreDurability", false)
+
+        override fun getTool(inventory: PlayerInventory, blockState: BlockState?) =
+            inventory.findBestToolToMineBlock(blockState, ignoreDurability)
+    }
 
-    // Automatic search for the best weapon
-    private val search by boolean("Search", true)
+    private object StaticSelectMode : ToolSelectorMode("Static") {
+        override val parent: ChoiceConfigurable<*>
+            get() = toolSelector
 
-    /* Slot with the best tool
-     * Useful if the tool has special effects
-     * cannot be determined
-     *
-     * NOTE: option [search] must be disabled
-     */
-    private val slot by int("Slot", 0, 0..8)
+        private val slot by int("Slot", 0, 0..8)
+
+        override fun getTool(inventory: PlayerInventory, blockState: BlockState?): IntObjectImmutablePair<ItemStack> {
+            return IntObjectImmutablePair(slot, inventory.getStack(slot))
+        }
+    }
 
     private val swapPreviousDelay by int("SwapPreviousDelay", 20, 1..100, "ticks")
 
@@ -67,32 +86,8 @@ object ModuleAutoTool : ClientModule("AutoTool", Category.WORLD) {
 
         val blockState = world.getBlockState(pos)
         val inventory = player.inventory
-        val index = getTool(inventory, blockState)?.firstInt() ?: return
+        val index = toolSelector.activeChoice.getTool(inventory, blockState)?.firstInt() ?: return
         SilentHotbar.selectSlotSilently(this, index, swapPreviousDelay)
     }
 
-    fun getTool(inventory: PlayerInventory, blockState: BlockState?): IntObjectImmutablePair<ItemStack>? {
-        if (search || !running) {
-            val (hotbarSlot, stack) =
-                (0..8).map {
-                    it to inventory.getStack(it)
-                }.filter { (_, stack) ->
-                    val durabilityCheck = (stack.damage < (stack.maxDamage - 2) || ignoreDurability)
-                    (stack.isNothing() || (!player.isCreative && durabilityCheck))
-                }.maxByOrNull { (_, stack) ->
-                    stack.getMiningSpeedMultiplier(blockState)
-                } ?: return null
-
-            val miningSpeedMultiplier = stack.getMiningSpeedMultiplier(blockState)
-
-            // The current slot already matches the best
-            if (miningSpeedMultiplier == player.inventory.mainHandStack.getMiningSpeedMultiplier(blockState)) {
-                return null
-            }
-            return IntObjectImmutablePair(hotbarSlot, stack)
-        } else {
-            return IntObjectImmutablePair(slot, inventory.getStack(slot))
-        }
-    }
-
 }

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/world/packetmine/ModulePacketMine.kt

@@ -486,7 +486,7 @@ object ModulePacketMine : ClientModule("PacketMine", Category.WORLD) {
                 return null
             }
 
-            return ModuleAutoTool.getTool(player.inventory, state)
+            return ModuleAutoTool.toolSelector.activeChoice.getTool(player.inventory, state)
         }
 
     }

src/main/kotlin/net/ccbluex/liquidbounce/utils/inventory/InventoryUtils.kt

@@ -28,6 +28,7 @@ import com.viaversion.viaversion.api.Via
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper
 import com.viaversion.viaversion.api.type.Types
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3
+import it.unimi.dsi.fastutil.ints.IntObjectImmutablePair
 import net.ccbluex.liquidbounce.config.types.Configurable
 import net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.*
 import net.ccbluex.liquidbounce.features.module.modules.world.scaffold.ModuleScaffold
@@ -36,15 +37,16 @@ import net.ccbluex.liquidbounce.utils.client.*
 import net.ccbluex.liquidbounce.utils.input.shouldSwingHand
 import net.ccbluex.liquidbounce.utils.item.isNothing
 import net.fabricmc.loader.api.FabricLoader
+import net.minecraft.block.BlockState
 import net.minecraft.block.Blocks
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen
 import net.minecraft.component.type.DyedColorComponent
+import net.minecraft.entity.player.PlayerInventory
 import net.minecraft.item.Item
 import net.minecraft.item.ItemStack
 import net.minecraft.network.packet.c2s.play.CloseHandledScreenC2SPacket
 import net.minecraft.registry.Registries
 import net.minecraft.registry.tag.ItemTags
-import net.minecraft.util.ActionResult
 import net.minecraft.util.Hand
 import kotlin.math.abs
 
@@ -247,6 +249,29 @@ fun ItemStack.getArmorColor(): Int? {
     }
 }
 
+fun PlayerInventory.findBestToolToMineBlock(
+    blockState: BlockState?,
+    ignoreDurability: Boolean = true
+): IntObjectImmutablePair<ItemStack>? {
+    val (hotbarSlot, stack) =
+        (0..8).map {
+            it to getStack(it)
+        }.filter { (_, stack) ->
+            val durabilityCheck = (stack.damage < (stack.maxDamage - 2) || ignoreDurability)
+            (stack.isNothing() || (!player.isCreative && durabilityCheck))
+        }.maxByOrNull { (_, stack) ->
+            stack.getMiningSpeedMultiplier(blockState)
+        } ?: return null
+
+    val miningSpeedMultiplier = stack.getMiningSpeedMultiplier(blockState)
+
+    // The current slot already matches the best
+    if (miningSpeedMultiplier == player.inventory.mainHandStack.getMiningSpeedMultiplier(blockState)) {
+        return null
+    }
+    return IntObjectImmutablePair(hotbarSlot, stack)
+}
+
 /**
  * A list of blocks which may not be placed (apart from the usual checks), so inv cleaner and scaffold
  * won't count them as blocks