From 4c24c7e4ac37e5b914dcddbd4572faddb5baad9d Mon Sep 17 00:00:00 2001 From: Dg636 Date: Sat, 18 Mar 2023 20:32:55 -0400 Subject: [PATCH 1/4] Update KillAura.kt Signed-off-by: Dg636 --- .../liquidbounce/features/module/modules/combat/KillAura.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt index 490033a02..9c1ddf0a1 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt @@ -137,7 +137,7 @@ class KillAura : Module() { // Rotations private val rotationModeValue = ListValue( "RotationMode", - arrayOf("None", "LiquidBounce", "ForceCenter", "SmoothCenter", "SmoothLiquid", "LockView", "OldMatrix"), + arrayOf("None", "LiquidBounce", "ForceCenter", "SmoothCenter", "SmoothLiquid", "LockView"), "LiquidBounce" ) // TODO: RotationMode Bypass Intave @@ -1038,7 +1038,6 @@ class KillAura : Module() { true ) ?: return false - if (rotationModeValue.get() == "OldMatrix") directRotation.pitch = 89.9f var diffAngle = RotationUtils.getRotationDifference(RotationUtils.serverRotation, directRotation) if (diffAngle < 0) diffAngle = -diffAngle @@ -1067,7 +1066,7 @@ class KillAura : Module() { directRotation, (180.0).toFloat() ) - "SmoothCenter", "SmoothLiquid", "OldMatrix" -> RotationUtils.limitAngleChange( + "SmoothCenter", "SmoothLiquid" -> RotationUtils.limitAngleChange( RotationUtils.serverRotation, directRotation, (calculateSpeed).toFloat() From e93b6ef59af51ce10315973964d2700ec350798e Mon Sep 17 00:00:00 2001 From: Dg636 Date: Sat, 18 Mar 2023 20:48:40 -0400 Subject: [PATCH 2/4] Update HypSpoofNofall.kt Signed-off-by: Dg636 --- .../player/nofalls/other/HypSpoofNofall.kt | 12 ------- .../player/nofalls/other/HypixelFlagNofall.kt | 32 +++++++++++++++++++ 2 files changed, 32 insertions(+), 12 deletions(-) delete mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypSpoofNofall.kt create mode 100644 src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypixelFlagNofall.kt diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypSpoofNofall.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypSpoofNofall.kt deleted file mode 100644 index 6c8293465..000000000 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypSpoofNofall.kt +++ /dev/null @@ -1,12 +0,0 @@ -package net.ccbluex.liquidbounce.features.module.modules.player.nofalls.other - -import net.ccbluex.liquidbounce.event.PacketEvent -import net.ccbluex.liquidbounce.features.module.modules.player.nofalls.NoFallMode -import net.ccbluex.liquidbounce.utils.PacketUtils -import net.minecraft.network.play.client.C03PacketPlayer - -class HypSpoofNofall : NoFallMode("HypSpoof") { - override fun onPacket(event: PacketEvent) { - if(event.packet is C03PacketPlayer) PacketUtils.sendPacketNoEvent(C03PacketPlayer.C04PacketPlayerPosition(event.packet.x, event.packet.y, event.packet.z, true)) - } -} \ No newline at end of file diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypixelFlagNofall.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypixelFlagNofall.kt new file mode 100644 index 000000000..d563dfec9 --- /dev/null +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypixelFlagNofall.kt @@ -0,0 +1,32 @@ +package net.ccbluex.liquidbounce.features.module.modules.player.nofalls.other + +import net.ccbluex.liquidbounce.event.PacketEvent +import net.ccbluex.liquidbounce.event.UpdateEvent +import net.ccbluex.liquidbounce.features.module.modules.player.nofalls.NoFallMode +import net.ccbluex.liquidbounce.utils.PacketUtils +import net.ccbluex.liquidbounce.utils.misc.FallingPlayer +import net.minecraft.network.play.client.C03PacketPlayer + +class HypixelFlagNofall : NoFallMode("HypixelFlag") { + + private var sendPacket = false + + override fun onUpdate(event: UpdateEvent) { + if (mc.thePlayer.onGround) { + sendPacket = false + } + } + + override fun onPacket(event: PacketEvent) { + val fallingPlayer = FallingPlayer(mc.thePlayer) + val collLoc = fallingPlayer.findCollision(60) // null -> too far to calc or fall pos in void + if (abs((collLoc?.y ?: 0) - mc.thePlayer.posY) < 3 && mc.thePlayer.fallDistance > 4 && !sendPacket) { + event.cancelEvent() + mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(event.packet.x, event.packet.y, event.packet.z, false)) + mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(event.packet.x, event.packet.y, event.packet.z - 23, true)) + mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(event.packet.x, event.packet.y, event.packet.z, false)) + + sendPacket = true + } + } +} From d1ec8495f5ecedafd3ee10f8c011f97950db3d14 Mon Sep 17 00:00:00 2001 From: Dg636 Date: Sat, 18 Mar 2023 20:58:30 -0400 Subject: [PATCH 3/4] Update HypixelFlagNofall.kt Signed-off-by: Dg636 --- .../player/nofalls/other/HypixelFlagNofall.kt | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypixelFlagNofall.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypixelFlagNofall.kt index d563dfec9..6aa94aea3 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypixelFlagNofall.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypixelFlagNofall.kt @@ -18,15 +18,17 @@ class HypixelFlagNofall : NoFallMode("HypixelFlag") { } override fun onPacket(event: PacketEvent) { - val fallingPlayer = FallingPlayer(mc.thePlayer) - val collLoc = fallingPlayer.findCollision(60) // null -> too far to calc or fall pos in void - if (abs((collLoc?.y ?: 0) - mc.thePlayer.posY) < 3 && mc.thePlayer.fallDistance > 4 && !sendPacket) { - event.cancelEvent() - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(event.packet.x, event.packet.y, event.packet.z, false)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(event.packet.x, event.packet.y, event.packet.z - 23, true)) - mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(event.packet.x, event.packet.y, event.packet.z, false)) - - sendPacket = true - } + if (packet is C03PacketPlayer) { + val fallingPlayer = FallingPlayer(mc.thePlayer) + val collLoc = fallingPlayer.findCollision(60) // null -> too far to calc or fall pos in void + if (abs((collLoc?.y ?: 0) - mc.thePlayer.posY) < 3 && mc.thePlayer.fallDistance > 4 && !sendPacket) { + event.cancelEvent() + mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(event.packet.x, event.packet.y, event.packet.z, false)) + mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(event.packet.x, event.packet.y, event.packet.z - 23, true)) + mc.netHandler.addToSendQueue(C03PacketPlayer.C04PacketPlayerPosition(event.packet.x, event.packet.y, event.packet.z, false)) + + sendPacket = true + } + } } } From f56580bc9753188b7655b068a325cd9a71882d4c Mon Sep 17 00:00:00 2001 From: Dg636 Date: Sat, 18 Mar 2023 21:08:28 -0400 Subject: [PATCH 4/4] Update HypixelFlagNofall.kt --- .../module/modules/player/nofalls/other/HypixelFlagNofall.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypixelFlagNofall.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypixelFlagNofall.kt index 6aa94aea3..525199617 100644 --- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypixelFlagNofall.kt +++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/nofalls/other/HypixelFlagNofall.kt @@ -6,6 +6,7 @@ import net.ccbluex.liquidbounce.features.module.modules.player.nofalls.NoFallMod import net.ccbluex.liquidbounce.utils.PacketUtils import net.ccbluex.liquidbounce.utils.misc.FallingPlayer import net.minecraft.network.play.client.C03PacketPlayer +import kotlin.math.abs class HypixelFlagNofall : NoFallMode("HypixelFlag") { @@ -18,7 +19,7 @@ class HypixelFlagNofall : NoFallMode("HypixelFlag") { } override fun onPacket(event: PacketEvent) { - if (packet is C03PacketPlayer) { + if (event.packet is C03PacketPlayer) { val fallingPlayer = FallingPlayer(mc.thePlayer) val collLoc = fallingPlayer.findCollision(60) // null -> too far to calc or fall pos in void if (abs((collLoc?.y ?: 0) - mc.thePlayer.posY) < 3 && mc.thePlayer.fallDistance > 4 && !sendPacket) {