feat: Auto Rod #5419
Open
feat: Auto Rod #5419
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MukjepScarlet
suggested changes
Jan 23, 2025
There was a problem hiding this comment.
Remove this. Use Chronometer.
| return -1 | ||
| } | ||
|
|
||
| private fun getAllNearbyEnemies(): List<Entity?>? { |
Comment on lines
212
to
223
| /** | ||
| * Find rod in inventory | ||
| */ | ||
| private fun findRod(startSlot: Int, endSlot: Int): Int { | ||
| for (i in startSlot until endSlot) { | ||
| val stack = mc.player?.inventory?.getStack(i) | ||
| if (stack != null && stack.item == Items.FISHING_ROD) { | ||
| return i | ||
| } | ||
| } | ||
| return -1 | ||
| } |
There was a problem hiding this comment.
Slots.Hotbar.findSlotIndex(Items.FISHING_ROD)
|
|
||
| init { | ||
|
|
||
|
|
1zun4
reviewed
Jan 25, 2025
1zun4
reviewed
Jan 25, 2025
|
|
||
| object ModuleAutoRod : ClientModule("AutoRod", Category.COMBAT) { | ||
|
|
||
| object facingEnemy : ToggleableConfigurable(this, "FacingEnemy", true) { |
There was a problem hiding this comment.
"FacingEnemy" - Follow Kotlin Naming Convention
1zun4
reviewed
Jan 25, 2025
|
|
||
| object facingEnemy : ToggleableConfigurable(this, "FacingEnemy", true) { | ||
|
|
||
| object ignoreOnEnemyLowHealth : ToggleableConfigurable(this, "IgnoreOnEnemyLowHealth", true) { |
There was a problem hiding this comment.
IgnoreOnEnemyLowHealth same here with Naming Convention.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/ModuleAutoRod.kt
Fixed
Show fixed
Hide fixed
1zun4
reviewed
Jan 25, 2025
| private val pushTimer = Chronometer() | ||
| private val rodPullTimer = Chronometer() | ||
| private var rodInUse = false | ||
| private var switchBack: Int? = -1 |
There was a problem hiding this comment.
Type of Int? is not required to be defined in this case.
1zun4
reviewed
Jan 25, 2025
src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/ModuleAutoRod.kt
Show resolved
Hide resolved
1zun4
reviewed
Jan 25, 2025
| val tickHandler = tickHandler { | ||
| // Check if player is using rod | ||
| val usingRod = | ||
| (mc.player?.isUsingItem == true && mc.player?.mainHandStack?.item == Items.FISHING_ROD) || rodInUse |
There was a problem hiding this comment.
mc.player.isUsingItem can be replaced with player.isUsingItem
Suggested change
| (mc.player?.isUsingItem == true && mc.player?.mainHandStack?.item == Items.FISHING_ROD) || rodInUse | |
| (player.isUsingItem && player.mainHandStack.item == Items.FISHING_ROD) || rodInUse |
1zun4
reviewed
Jan 25, 2025
|
|
||
| } else { | ||
| // Stop using rod | ||
| mc.player?.stopUsingItem() |
There was a problem hiding this comment.
Suggested change
| mc.player?.stopUsingItem() | |
| player.stopUsingItem() |
1zun4
reviewed
Jan 25, 2025
| var facingEntity = mc.targetedEntity | ||
| if (facingEntity == null) { | ||
|
|
||
| var finaltarget: Entity? = null |
There was a problem hiding this comment.
finaltarget does not follow Kotlin Naming Convention as well - should be finalTarget instead.
1zun4
reviewed
Jan 25, 2025
Comment on lines
108
to
110
| if(finaltarget == null){ | ||
| return@tickHandler | ||
| } |
There was a problem hiding this comment.
Suggested change
| if(finaltarget == null){ | |
| return@tickHandler | |
| } | |
| if(finaltarget == null) { | |
| return@tickHandler | |
| } |
1zun4
reviewed
Jan 25, 2025
|
|
||
| if (rod && pushTimer.hasElapsed(pushDelay.toLong())) { | ||
| // Check if player has rod in hand | ||
| if (mc.player?.mainHandStack != Items.FISHING_ROD) { |
There was a problem hiding this comment.
Suggested change
| if (mc.player?.mainHandStack != Items.FISHING_ROD) { | |
| if (player.mainHandStack != Items.FISHING_ROD) { |
1zun4
reviewed
Jan 25, 2025
| return@tickHandler | ||
| } | ||
| // Switch to rod | ||
| switchBack = mc.player?.inventory?.getSlotWithStack(mc.player?.inventory?.mainHandStack) |
There was a problem hiding this comment.
Suggested change
| switchBack = mc.player?.inventory?.getSlotWithStack(mc.player?.inventory?.mainHandStack) | |
| switchBack = player.inventory.getSlotWithStack(player.inventory.mainHandStack) |
1zun4
reviewed
Jan 25, 2025
| if (rod == null) { | ||
| return | ||
| } | ||
| mc.player?.inventory?.selectedSlot = rod |
There was a problem hiding this comment.
We do not change the selected slot like that in LiquidBounce Nextgen. LiquidBounce Nextgen offers a much util for that instead called SilentHotbar.
1zun4
reviewed
Jan 25, 2025
src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/ModuleAutoRod.kt
Show resolved
Hide resolved
|
@1zun4 modified,but I have no idea about using KeybindIsPressedEvent and make it work.So I keep it as it. |
ManInMyVan
suggested changes
Jan 26, 2025
Comment on lines
+280
to
+281
|
|
||
|
|
src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/ModuleAutoRod.kt
Show resolved
Hide resolved
src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/ModuleAutoRod.kt
Show resolved
Hide resolved
src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/ModuleAutoRod.kt
Show resolved
Hide resolved
src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/ModuleAutoRod.kt
Show resolved
Hide resolved
Comment on lines
163
to
170
| val rod = Slots.Hotbar.findSlot(Items.FISHING_ROD)?.hotbarSlot | ||
| if (rod == null) { | ||
| // There is no rod in hotbar | ||
| return@tickHandler | ||
| } | ||
| // Switch to rod | ||
|
|
||
|
|
There was a problem hiding this comment.
Suggested change
| val rod = Slots.Hotbar.findSlot(Items.FISHING_ROD)?.hotbarSlot | |
| if (rod == null) { | |
| // There is no rod in hotbar | |
| return@tickHandler | |
| } | |
| // Switch to rod | |
| val rod = Slots.Hotbar.findSlot(Items.FISHING_ROD)?.hotbarSlot ?: return@tickHandler | |
| // Switch to rod |
Comment on lines
74
to
75
| val usingRod = | ||
| (player.isUsingItem == true && player.mainHandStack?.item == Items.FISHING_ROD) || rodInUse |
There was a problem hiding this comment.
Suggested change
| val usingRod = | |
| (player.isUsingItem == true && player.mainHandStack?.item == Items.FISHING_ROD) || rodInUse | |
| val usingRod = player.isUsingItem && player.mainHandStack?.item == Items.FISHING_ROD || rodInUse |
src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/ModuleAutoRod.kt
Show resolved
Hide resolved
src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/ModuleAutoRod.kt
Show resolved
Hide resolved
| } else { | ||
| var rod = false | ||
|
|
||
| if (FacingEnemy.enabled && player.getActualHealth()!! >= IgnoreOnEnemyLowHealth.playerHealthThreshold) { |
There was a problem hiding this comment.
Suggested change
| if (FacingEnemy.enabled && player.getActualHealth()!! >= IgnoreOnEnemyLowHealth.playerHealthThreshold) { | |
| if (FacingEnemy.enabled && player.getActualHealth() >= IgnoreOnEnemyLowHealth.playerHealthThreshold) { |
any reason you're using getActualHealth here?
ManInMyVan
suggested changes
Jan 26, 2025
src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/ModuleAutoRod.kt
Show resolved
Hide resolved
Comment on lines
122
to
123
| (player.isUsingItem) || | ||
| KillAuraAutoBlock.blockVisual |
There was a problem hiding this comment.
Suggested change
| (player.isUsingItem) || | |
| KillAuraAutoBlock.blockVisual | |
| player.isUsingItem || KillAuraAutoBlock.blockVisual |
ManInMyVan
suggested changes
Jan 26, 2025
src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/ModuleAutoRod.kt
Show resolved
Hide resolved
src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/combat/ModuleAutoRod.kt
Show resolved
Hide resolved
|
|
||
| } | ||
| } | ||
| } else player.health.let { it1 -> |
Check warning
Code scanning / detekt
Braces do not comply with the specified policy Warning
|
I am currently working on refactoring this. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The branch carried AutoRod from legacy to nextgen.