feat(AutoTool): Settings refactoring #5260
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
src/main/kotlin/net/ccbluex/liquidbounce/utils/inventory/InventoryUtils.kt
Fixed
Show fixed
Hide fixed
| private val slot by int("Slot", 0, 0..8) | ||
|
|
||
| override fun getTool(inventory: PlayerInventory, blockState: BlockState?): IntObjectImmutablePair<ItemStack> { | ||
| return IntObjectImmutablePair(slot, inventory.getStack(slot)) | ||
| } |
There was a problem hiding this comment.
Why would we want to choose a static slot though?
There was a problem hiding this comment.
It's already there, I didn't change the functionality of AutoTool itself
There was a problem hiding this comment.
Look at what's already available
| 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) | ||
| } |
There was a problem hiding this comment.
No reason to move this into another class when it's not being used multiple times.
There was a problem hiding this comment.
i did it 'cause of the confusion in this code. Logically, I don't think PacketMine should inherit the AutoTool settings.
There was a problem hiding this comment.
Yes, I'm confused, make your own verdict, if it has to inherit AutoTool settings, then yes, there is no point in a separate [findBestToolToMineBlock] method.
| ): IntObjectImmutablePair<ItemStack>? { | ||
| val (hotbarSlot, stack) = | ||
| (0..8).map { | ||
| it to getStack(it) |
There was a problem hiding this comment.
IntObjectImmutablePair(it, getStack(it))
There was a problem hiding this comment.
it doesnt make sense
There was a problem hiding this comment.
int to any? -> Pair<Integer, @Nullable Object> while u has IntObjectImmutablePair as result type
There was a problem hiding this comment.
in the end it's not my code (I moved it). If you want to change something, change it and create a pr.
Made the settings more intuitive