Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LEGACY: Added noPackets option to Sprint module and improved Freeze module #1774

Merged
merged 4 commits into from
Jan 8, 2024
Merged

LEGACY: Added noPackets option to Sprint module and improved Freeze module #1774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c08d0d6
some improvements
FDPUser443 Jan 6, 2024
9107786
imports and Sprint noPackets
FDPUser443 Jan 6, 2024
c66483e
prevent legit sprint from cancelling packets
FDPUser443 Jan 6, 2024
63a9e51
Merge remote-tracking branch 'origin/legacy' into legacy
FDPUser443 Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/AutoPot.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import net.ccbluex.liquidbounce.utils.PacketUtils.sendPackets
import net.ccbluex.liquidbounce.utils.Rotation
import net.ccbluex.liquidbounce.utils.RotationUtils.serverRotation
import net.ccbluex.liquidbounce.utils.RotationUtils.setTargetRotation
import net.ccbluex.liquidbounce.utils.extensions.tryJump
import net.ccbluex.liquidbounce.utils.inventory.InventoryUtils
import net.ccbluex.liquidbounce.utils.inventory.InventoryUtils.serverOpenInventory
import net.ccbluex.liquidbounce.utils.inventory.isSplashPotion
Expand Down Expand Up @@ -61,7 +62,7 @@ object AutoPot : Module("AutoPot", ModuleCategory.COMBAT) {
if (potionInHotbar != null && thePlayer.health <= health) {
if (thePlayer.onGround) {
when (mode.lowercase()) {
"jump" -> thePlayer.jump()
"jump" -> thePlayer.tryJump()
"port" -> thePlayer.moveEntity(0.0, 0.42, 0.0)
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/Criticals.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import net.ccbluex.liquidbounce.utils.PacketUtils.sendPackets
import net.ccbluex.liquidbounce.utils.extensions.component1
import net.ccbluex.liquidbounce.utils.extensions.component2
import net.ccbluex.liquidbounce.utils.extensions.component3
import net.ccbluex.liquidbounce.utils.extensions.tryJump
import net.ccbluex.liquidbounce.utils.timing.MSTimer
import net.ccbluex.liquidbounce.value.FloatValue
import net.ccbluex.liquidbounce.value.IntegerValue
Expand All @@ -39,12 +40,12 @@ object Criticals : Module("Criticals", ModuleCategory.COMBAT) {

override fun onEnable() {
if (mode == "NoGround")
mc.thePlayer.jump()
mc.thePlayer.tryJump()
}

private fun verusJump() {
mc.thePlayer.isInWeb = true
mc.thePlayer.jump()
mc.thePlayer.tryJump()
mc.thePlayer.prevPosY = mc.thePlayer.posY

mc.thePlayer.isInWeb = false
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/Velocity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import net.ccbluex.liquidbounce.features.module.modules.movement.Speed
import net.ccbluex.liquidbounce.utils.MovementUtils.isOnGround
import net.ccbluex.liquidbounce.utils.MovementUtils.speed
import net.ccbluex.liquidbounce.utils.extensions.toDegrees
import net.ccbluex.liquidbounce.utils.extensions.tryJump
import net.ccbluex.liquidbounce.utils.misc.RandomUtils.nextInt
import net.ccbluex.liquidbounce.utils.realMotionX
import net.ccbluex.liquidbounce.utils.realMotionY
Expand Down Expand Up @@ -327,7 +328,7 @@ object Velocity : Module("Velocity", ModuleCategory.COMBAT) {

if (mode == "Jump" && hasReceivedVelocity) {
if (!player.isJumping && nextInt(endExclusive = 100) < chance && shouldJump() && player.isSprinting && player.onGround && player.hurtTime == 9) {
player.jump()
player.tryJump()
limitUntilJump = 0
}
hasReceivedVelocity = false
Expand Down
15 changes: 8 additions & 7 deletions src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/BufferSpeed.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import net.ccbluex.liquidbounce.utils.MovementUtils
import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
import net.ccbluex.liquidbounce.utils.MovementUtils.strafe
import net.ccbluex.liquidbounce.utils.block.BlockUtils.getBlock
import net.ccbluex.liquidbounce.utils.extensions.tryJump
import net.ccbluex.liquidbounce.value.BoolValue
import net.ccbluex.liquidbounce.value.FloatValue
import net.ccbluex.liquidbounce.value.ListValue
Expand Down Expand Up @@ -97,7 +98,7 @@ object BufferSpeed : Module("BufferSpeed", ModuleCategory.MOVEMENT) {
fastHop = false

if (slime && (getBlock(blockPos.down()) is BlockSlime || getBlock(blockPos) is BlockSlime)) {
thePlayer.jump()
thePlayer.tryJump()

thePlayer.motionX = thePlayer.motionY * 1.132
thePlayer.motionY = 0.08
Expand All @@ -115,7 +116,7 @@ object BufferSpeed : Module("BufferSpeed", ModuleCategory.MOVEMENT) {
"new" -> {
fastHop = true
if (legitHop) {
thePlayer.jump()
thePlayer.tryJump()
thePlayer.onGround = false
legitHop = false
return
Expand All @@ -124,7 +125,7 @@ object BufferSpeed : Module("BufferSpeed", ModuleCategory.MOVEMENT) {

strafe(0.375f)

thePlayer.jump()
thePlayer.tryJump()
thePlayer.motionY = 0.41
return
}
Expand All @@ -140,15 +141,15 @@ object BufferSpeed : Module("BufferSpeed", ModuleCategory.MOVEMENT) {
fastHop = true

if (legitHop) {
thePlayer.jump()
thePlayer.tryJump()
thePlayer.onGround = false
legitHop = false
return
}

thePlayer.onGround = false
strafe(0.375f)
thePlayer.jump()
thePlayer.tryJump()
thePlayer.motionY = 0.41
return
}
Expand All @@ -170,7 +171,7 @@ object BufferSpeed : Module("BufferSpeed", ModuleCategory.MOVEMENT) {
if (thePlayer.posY - thePlayer.posY.toInt() >= 0.12500) {
boost(snowBoost)
} else {
thePlayer.jump()
thePlayer.tryJump()
forceDown = true
}
return
Expand All @@ -184,7 +185,7 @@ object BufferSpeed : Module("BufferSpeed", ModuleCategory.MOVEMENT) {
}
"new" ->
if (isNearBlock && !thePlayer.movementInput.jump) {
thePlayer.jump()
thePlayer.tryJump()
thePlayer.motionY = 0.08
thePlayer.motionX *= 0.99
thePlayer.motionZ *= 0.99
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/FastStairs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import net.ccbluex.liquidbounce.features.module.Module
import net.ccbluex.liquidbounce.features.module.ModuleCategory
import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
import net.ccbluex.liquidbounce.utils.block.BlockUtils.getBlock
import net.ccbluex.liquidbounce.utils.extensions.tryJump
import net.ccbluex.liquidbounce.value.BoolValue
import net.ccbluex.liquidbounce.value.ListValue
import net.minecraft.block.BlockStairs
Expand Down Expand Up @@ -79,7 +80,7 @@ object FastStairs : Module("FastStairs", ModuleCategory.MOVEMENT) {
canJump = true
} else if (mode.startsWith("AAC") && canJump) {
if (longJump) {
thePlayer.jump()
thePlayer.tryJump()
thePlayer.motionX *= 1.35
thePlayer.motionZ *= 1.35
}
Expand Down
48 changes: 43 additions & 5 deletions src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Freeze.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,59 @@
package net.ccbluex.liquidbounce.features.module.modules.movement

import net.ccbluex.liquidbounce.event.EventTarget
import net.ccbluex.liquidbounce.event.PacketEvent
import net.ccbluex.liquidbounce.event.UpdateEvent
import net.ccbluex.liquidbounce.features.module.Module
import net.ccbluex.liquidbounce.features.module.ModuleCategory
import net.minecraft.network.play.client.C03PacketPlayer
import net.minecraft.network.play.server.S08PacketPlayerPosLook

object Freeze : Module("Freeze", ModuleCategory.MOVEMENT) {
private var motionX = 0.0
private var motionY = 0.0
private var motionZ = 0.0
private var x = 0.0
private var y = 0.0
private var z = 0.0

override fun onEnable() {
mc.thePlayer ?: return

x = mc.thePlayer.posX
y = mc.thePlayer.posY
z = mc.thePlayer.posZ
motionX = mc.thePlayer.motionX
motionY = mc.thePlayer.motionY
motionZ = mc.thePlayer.motionZ
}

@EventTarget
fun onUpdate(event: UpdateEvent) {
val thePlayer = mc.thePlayer
mc.thePlayer.motionX = 0.0
mc.thePlayer.motionY = 0.0
mc.thePlayer.motionZ = 0.0
mc.thePlayer.setPositionAndRotation(x, y, z, mc.thePlayer.rotationYaw, mc.thePlayer.rotationPitch)
}

thePlayer.isDead = true
thePlayer.rotationYaw = thePlayer.cameraYaw
thePlayer.rotationPitch = thePlayer.cameraPitch
@EventTarget
fun onPacket(event: PacketEvent) {
if (event.packet is C03PacketPlayer) {
event.cancelEvent()
}
if (event.packet is S08PacketPlayerPosLook) {
x = event.packet.x
y = event.packet.y
z = event.packet.z
motionX = 0.0
motionY = 0.0
motionZ = 0.0
}
}

override fun onDisable() {
mc.thePlayer?.isDead = false
mc.thePlayer.motionX = motionX
mc.thePlayer.motionY = motionY
mc.thePlayer.motionZ = motionZ
mc.thePlayer.setPositionAndRotation(x, y, z, mc.thePlayer.rotationYaw, mc.thePlayer.rotationPitch)
}
}
3 changes: 2 additions & 1 deletion src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/LongJump.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import net.ccbluex.liquidbounce.features.module.modules.movement.longjumpmodes.o
import net.ccbluex.liquidbounce.features.module.modules.movement.longjumpmodes.other.Buzz
import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
import net.ccbluex.liquidbounce.utils.MovementUtils.speed
import net.ccbluex.liquidbounce.utils.extensions.tryJump
import net.ccbluex.liquidbounce.value.BoolValue
import net.ccbluex.liquidbounce.value.FloatValue
import net.ccbluex.liquidbounce.value.ListValue
Expand Down Expand Up @@ -77,7 +78,7 @@ object LongJump : Module("LongJump", ModuleCategory.MOVEMENT) {
}
if (autoJump && mc.thePlayer.onGround && isMoving) {
jumped = true
mc.thePlayer.jump()
mc.thePlayer.tryJump()
}
}

Expand Down
5 changes: 3 additions & 2 deletions src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Parkour.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@ import net.ccbluex.liquidbounce.event.UpdateEvent
import net.ccbluex.liquidbounce.features.module.Module
import net.ccbluex.liquidbounce.features.module.ModuleCategory
import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
import net.ccbluex.liquidbounce.utils.extensions.tryJump

object Parkour : Module("Parkour", ModuleCategory.MOVEMENT, subjective = true, gameDetecting = false) {

@EventTarget
fun onUpdate(event: UpdateEvent) {
val thePlayer = mc.thePlayer ?: return

if (isMoving && thePlayer.onGround && !thePlayer.isSneaking && !mc.gameSettings.keyBindSneak.isKeyDown && !mc.gameSettings.keyBindJump.isKeyDown &&
if (isMoving && thePlayer.onGround && !thePlayer.isSneaking && !mc.gameSettings.keyBindSneak.isKeyDown &&
mc.theWorld.getCollidingBoundingBoxes(thePlayer, thePlayer.entityBoundingBox
.offset(0.0, -0.5, 0.0).expand(-0.001, 0.0, -0.001)).isEmpty())
thePlayer.jump()
thePlayer.tryJump()
}
}
19 changes: 19 additions & 0 deletions src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Sprint.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
*/
package net.ccbluex.liquidbounce.features.module.modules.movement

import net.ccbluex.liquidbounce.event.EventTarget
import net.ccbluex.liquidbounce.event.PacketEvent
import net.ccbluex.liquidbounce.features.module.Module
import net.ccbluex.liquidbounce.features.module.ModuleCategory
import net.ccbluex.liquidbounce.features.module.modules.world.Scaffold
Expand All @@ -16,6 +18,7 @@ import net.ccbluex.liquidbounce.utils.inventory.InventoryUtils.serverOpenInvento
import net.ccbluex.liquidbounce.value.BoolValue
import net.ccbluex.liquidbounce.value.FloatValue
import net.ccbluex.liquidbounce.value.ListValue
import net.minecraft.network.play.client.C0BPacketEntityAction
import net.minecraft.potion.Potion
import net.minecraft.util.MovementInput
import kotlin.math.abs
Expand All @@ -42,6 +45,7 @@ object Sprint : Module("Sprint", ModuleCategory.MOVEMENT, gameDetecting = false)
private val checkServerSide by BoolValue("CheckServerSide", false) { mode == "Vanilla" }
private val checkServerSideGround by BoolValue("CheckServerSideOnlyGround", false)
{ mode == "Vanilla" && checkServerSide }
private val noPackets by BoolValue("NoPackets", false) { mode == "Vanilla" }

private var isSprinting = false

Expand Down Expand Up @@ -143,4 +147,19 @@ object Sprint : Module("Sprint", ModuleCategory.MOVEMENT, gameDetecting = false)

return modifiedForward < threshold
}

@EventTarget
fun onPacket(event: PacketEvent) {
if (mode == "Legit") {
return
}

val packet = event.packet
if (packet !is C0BPacketEntityAction || !noPackets || event.isCancelled) {
return
}
if (packet.action == C0BPacketEntityAction.Action.STOP_SPRINTING || packet.action == C0BPacketEntityAction.Action.START_SPRINTING) {
event.cancelEvent()
}
}
}
3 changes: 2 additions & 1 deletion src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Step.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import net.ccbluex.liquidbounce.utils.MovementUtils.direction
import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
import net.ccbluex.liquidbounce.utils.PacketUtils.sendPacket
import net.ccbluex.liquidbounce.utils.PacketUtils.sendPackets
import net.ccbluex.liquidbounce.utils.extensions.tryJump
import net.ccbluex.liquidbounce.utils.timing.MSTimer
import net.ccbluex.liquidbounce.value.FloatValue
import net.ccbluex.liquidbounce.value.IntegerValue
Expand Down Expand Up @@ -95,7 +96,7 @@ object Step : Module("Step", ModuleCategory.MOVEMENT, gameDetecting = false) {
if (thePlayer.onGround && couldStep()) {
thePlayer.motionX *= 1.26
thePlayer.motionZ *= 1.26
thePlayer.jump()
thePlayer.tryJump()
isAACStep = true
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Strafe.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import net.ccbluex.liquidbounce.utils.MovementUtils.direction
import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
import net.ccbluex.liquidbounce.utils.MovementUtils.speed
import net.ccbluex.liquidbounce.utils.extensions.toDegreesF
import net.ccbluex.liquidbounce.utils.extensions.tryJump
import net.ccbluex.liquidbounce.value.BoolValue
import net.ccbluex.liquidbounce.value.FloatValue
import kotlin.math.cos
Expand Down Expand Up @@ -45,7 +46,7 @@ object Strafe : Module("Strafe", ModuleCategory.MOVEMENT, gameDetecting = false)
}
val yaw = mc.thePlayer.rotationYaw
mc.thePlayer.rotationYaw = direction.toDegreesF()
mc.thePlayer.jump()
mc.thePlayer.tryJump()
mc.thePlayer.rotationYaw = yaw
jump = true
if (wasDown) {
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/WallClimb.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import net.ccbluex.liquidbounce.features.module.Module
import net.ccbluex.liquidbounce.features.module.ModuleCategory
import net.ccbluex.liquidbounce.utils.MovementUtils.direction
import net.ccbluex.liquidbounce.utils.block.BlockUtils.collideBlockIntersects
import net.ccbluex.liquidbounce.utils.extensions.tryJump
import net.ccbluex.liquidbounce.value.FloatValue
import net.ccbluex.liquidbounce.value.ListValue
import net.minecraft.init.Blocks
Expand Down Expand Up @@ -54,7 +55,7 @@ object WallClimb : Module("WallClimb", ModuleCategory.MOVEMENT) {
if (thePlayer.isCollidedHorizontally) {
when (clipMode.lowercase()) {
"jump" -> if (thePlayer.onGround)
thePlayer.jump()
thePlayer.tryJump()
"fast" -> if (thePlayer.onGround)
thePlayer.motionY = 0.42
else if (thePlayer.motionY < 0)
Expand Down
3 changes: 2 additions & 1 deletion ...et/ccbluex/liquidbounce/features/module/modules/movement/flymodes/hypixel/BoostHypixel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import net.ccbluex.liquidbounce.utils.PacketUtils.sendPackets
import net.ccbluex.liquidbounce.utils.extensions.component1
import net.ccbluex.liquidbounce.utils.extensions.component2
import net.ccbluex.liquidbounce.utils.extensions.component3
import net.ccbluex.liquidbounce.utils.extensions.tryJump
import net.ccbluex.liquidbounce.utils.timing.TickTimer
import net.minecraft.init.Blocks.air
import net.minecraft.network.play.client.C03PacketPlayer
Expand Down Expand Up @@ -59,7 +60,7 @@ object BoostHypixel : FlyMode("BoostHypixel") {

sendPacket(C04PacketPlayerPosition(x, y, z, true))

mc.thePlayer.jump()
mc.thePlayer.tryJump()

mc.thePlayer.posY += 0.42f // Visual

Expand Down
3 changes: 2 additions & 1 deletion ...ain/java/net/ccbluex/liquidbounce/features/module/modules/movement/flymodes/ncp/OldNCP.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import net.ccbluex.liquidbounce.utils.PacketUtils.sendPackets
import net.ccbluex.liquidbounce.utils.extensions.component1
import net.ccbluex.liquidbounce.utils.extensions.component2
import net.ccbluex.liquidbounce.utils.extensions.component3
import net.ccbluex.liquidbounce.utils.extensions.tryJump
import net.minecraft.network.play.client.C03PacketPlayer.C04PacketPlayerPosition

object OldNCP : FlyMode("OldNCP") {
Expand All @@ -27,7 +28,7 @@ object OldNCP : FlyMode("OldNCP") {
)
}

mc.thePlayer.jump()
mc.thePlayer.tryJump()
mc.thePlayer.swingItem()
}

Expand Down
Loading
Loading