feat: Added velocity hit feature #4878
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,111 @@ | ||||||||||||||
| package net.ccbluex.liquidbounce.features.module.modules.combat.killaura.features | ||||||||||||||
|
|
||||||||||||||
| import com.google.common.collect.Lists | ||||||||||||||
| import net.ccbluex.liquidbounce.config.types.ToggleableConfigurable | ||||||||||||||
| import net.ccbluex.liquidbounce.event.events.PacketEvent | ||||||||||||||
| import net.ccbluex.liquidbounce.event.events.TransferOrigin | ||||||||||||||
| import net.ccbluex.liquidbounce.event.sequenceHandler | ||||||||||||||
| import net.ccbluex.liquidbounce.event.tickHandler | ||||||||||||||
| import net.ccbluex.liquidbounce.features.module.modules.combat.killaura.ModuleKillAura | ||||||||||||||
| import net.ccbluex.liquidbounce.utils.client.Chronometer | ||||||||||||||
| import net.ccbluex.liquidbounce.utils.client.PacketQueueManager | ||||||||||||||
| import net.minecraft.network.packet.s2c.play.* | ||||||||||||||
|
|
||||||||||||||
| object KillAuraVelocityHit : ToggleableConfigurable(ModuleKillAura, "VelocityHit", false) { | ||||||||||||||
|
|
||||||||||||||
| val extendRange by float("ExtendRange", 1.0f, 0.1f..2.0f) | ||||||||||||||
| private val whenLag by boolean("OnlyWhileLagging", false) | ||||||||||||||
|
|
||||||||||||||
|
|
||||||||||||||
| private var considerVelocityHit = false | ||||||||||||||
| private var damageReceived = false | ||||||||||||||
| private var onGroundTicks = 0 | ||||||||||||||
| private var isPossible = false | ||||||||||||||
|
Comment on lines
+19
to
+22
There was a problem hiding this comment. Documentation!
|
||||||||||||||
|
|
||||||||||||||
| private var timer = Chronometer() | ||||||||||||||
| private var lastPacketTime = Lists.newLinkedList<Long>() | ||||||||||||||
|
There was a problem hiding this comment. There are only a handful use cases for linked lists. The And documentation! There was a problem hiding this comment.
|
||||||||||||||
|
|
||||||||||||||
| private const val SAMPLE_SIZE = 10 | ||||||||||||||
|
|
||||||||||||||
| val isVelocityHitPossible | ||||||||||||||
| get() = super.running && isPossible | ||||||||||||||
|
|
||||||||||||||
| @Suppress("unused") | ||||||||||||||
| private val packetHandler = sequenceHandler<PacketEvent>(priority = 1) { event -> | ||||||||||||||
|
There was a problem hiding this comment. please use one of the priority categories. |
||||||||||||||
| val packet = event.packet | ||||||||||||||
|
|
||||||||||||||
| if (event.origin == TransferOrigin.RECEIVE) { | ||||||||||||||
| addRecentPacketTime() | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| when { | ||||||||||||||
| packet is EntityDamageS2CPacket && packet.entityId == player.id -> { | ||||||||||||||
| damageReceived = true | ||||||||||||||
| } | ||||||||||||||
| packet is EntityVelocityUpdateS2CPacket && packet.entityId == player.id && damageReceived -> { | ||||||||||||||
| considerVelocityHit = true | ||||||||||||||
| } | ||||||||||||||
|
Comment on lines
+41
to
+46
There was a problem hiding this comment. you have implemented a state machine, but you use two separate flags to keep track of what state the state machine is currently in. I'd recommend using an enum for the states, for example: enum PacketListenerState {
IDLE,
/**
* The player received damage, but no velocity packet was received (yet)
*/
DAMAGE_RECEIVED,
/**
* A hit with velocity was received.
*/
VELOCITY_DAMAGE_RECEIVED
} |
||||||||||||||
| } | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| @Suppress("unused") | ||||||||||||||
| private val gameHandler = tickHandler { | ||||||||||||||
| if (player.isDead || player.isSpectator) { | ||||||||||||||
| return@tickHandler | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| val enemy = ModuleKillAura.targetTracker.lockedOnTarget | ||||||||||||||
| var lagging = isLagging() || PacketQueueManager.isLagging | ||||||||||||||
|
|
||||||||||||||
| if (!whenLag) { | ||||||||||||||
| lagging = true | ||||||||||||||
| } | ||||||||||||||
|
Comment on lines
+57
to
+61
There was a problem hiding this comment. Are you sure that this code does what it should?
Suggested change
|
||||||||||||||
|
|
||||||||||||||
| if (enemy == null) { | ||||||||||||||
| reset() | ||||||||||||||
| return@tickHandler | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| val isInExtendedRange = player.distanceTo(enemy) <= ModuleKillAura.extendedReach | ||||||||||||||
| isPossible = lagging && considerVelocityHit && isInExtendedRange | ||||||||||||||
|
|
||||||||||||||
| if ((player.isOnGround && isPossible) || (player.fallDistance > 0.3 && isPossible)) { | ||||||||||||||
| onGroundTicks++ | ||||||||||||||
| } | ||||||||||||||
|
Comment on lines
+71
to
+73
There was a problem hiding this comment.
Suggested change
|
||||||||||||||
|
|
||||||||||||||
| if (onGroundTicks > 5) { | ||||||||||||||
| reset() | ||||||||||||||
| } | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| fun reset() { | ||||||||||||||
| isPossible = false | ||||||||||||||
| considerVelocityHit = false | ||||||||||||||
| damageReceived = false | ||||||||||||||
| onGroundTicks = 0 | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| private fun addRecentPacketTime() { | ||||||||||||||
| lastPacketTime.add(timer.elapsed) | ||||||||||||||
| timer.reset() | ||||||||||||||
|
|
||||||||||||||
| if (lastPacketTime.size > SAMPLE_SIZE) { | ||||||||||||||
| for (i in 0..<SAMPLE_SIZE) { | ||||||||||||||
| lastPacketTime.removeAt(0) | ||||||||||||||
| } | ||||||||||||||
| } | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| private fun isLagging(): Boolean { | ||||||||||||||
| if (lastPacketTime.size != SAMPLE_SIZE) { | ||||||||||||||
| return false | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| var sumTime = 0L | ||||||||||||||
| for (i in 0..<SAMPLE_SIZE) { | ||||||||||||||
| sumTime += lastPacketTime[i] | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| return sumTime / SAMPLE_SIZE.toDouble() > 0.5 | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| } | ||||||||||||||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Documentation! What does this feature do?