fix jumping when event is cancelled

ManInMyVan · Jun 26, 2024 · f452850 · f452850
1 parent a8333da
commit f452850
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 82 deletions.
diff --git a/...ava/net/ccbluex/liquidbounce/features/module/modules/combat/criticalsmodes/aac/AACJump.kt b/...ava/net/ccbluex/liquidbounce/features/module/modules/combat/criticalsmodes/aac/AACJump.kt
@@ -6,7 +6,7 @@
 package net.ccbluex.liquidbounce.features.module.modules.combat.criticalsmodes.aac
 
 import net.ccbluex.liquidbounce.features.module.modules.combat.criticalsmodes.CriticalsMode
-import net.ccbluex.liquidbounce.utils.extensions.jump
+import net.ccbluex.liquidbounce.utils.extensions.jmp
 import net.minecraft.entity.Entity
 
 /**
@@ -15,7 +15,7 @@ import net.minecraft.entity.Entity
 object AACJump : CriticalsMode("AACJump") {
     override fun onAttack(entity: Entity) {
         mc.thePlayer.isInWeb = true
-        mc.thePlayer.jump(ignoreGround = true)
+        mc.thePlayer.jmp(ignoreGround = true)
         mc.thePlayer.prevPosY = mc.thePlayer.posY
         mc.thePlayer.isInWeb = false
         if (!mc.thePlayer.onGround) {

diff --git a/...net/ccbluex/liquidbounce/features/module/modules/combat/criticalsmodes/other/VerusJump.kt b/...net/ccbluex/liquidbounce/features/module/modules/combat/criticalsmodes/other/VerusJump.kt
@@ -6,7 +6,7 @@
 package net.ccbluex.liquidbounce.features.module.modules.combat.criticalsmodes.other
 
 import net.ccbluex.liquidbounce.features.module.modules.combat.criticalsmodes.CriticalsMode
-import net.ccbluex.liquidbounce.utils.extensions.jump
+import net.ccbluex.liquidbounce.utils.extensions.jmp
 import net.minecraft.entity.Entity
 
 /**
@@ -18,7 +18,7 @@ object VerusJump : CriticalsMode("VerusJump") {
         mc.thePlayer.onGround = false
         mc.thePlayer.posY = mc.thePlayer.prevPosY
         mc.thePlayer.isInWeb = true
-        mc.thePlayer.jump(ignoreGround = true)
+        mc.thePlayer.jmp(ignoreGround = true)
         mc.thePlayer.prevPosY = mc.thePlayer.posY
         mc.thePlayer.isInWeb = false
     }

diff --git a/.../net/ccbluex/liquidbounce/features/module/modules/combat/criticalsmodes/vanilla/Motion.kt b/.../net/ccbluex/liquidbounce/features/module/modules/combat/criticalsmodes/vanilla/Motion.kt
@@ -8,12 +8,12 @@ package net.ccbluex.liquidbounce.features.module.modules.combat.criticalsmodes.v
 import net.ccbluex.liquidbounce.features.module.modules.combat.Criticals.motionBoost
 import net.ccbluex.liquidbounce.features.module.modules.combat.Criticals.motionY
 import net.ccbluex.liquidbounce.features.module.modules.combat.criticalsmodes.CriticalsMode
-import net.ccbluex.liquidbounce.utils.extensions.jump
+import net.ccbluex.liquidbounce.utils.extensions.jmp
 import net.minecraft.entity.Entity
 
 /**
  * @author CCBlueX/LiquidBounce
  */
 object Motion : CriticalsMode("Motion") {
-    override fun onAttack(entity: Entity) = mc.thePlayer.jump(motionY, motionBoost, ignoreGround = true)
+    override fun onAttack(entity: Entity) = mc.thePlayer.jmp(motionY, motionBoost, ignoreGround = true)
 }
diff --git a/...a/net/ccbluex/liquidbounce/features/module/modules/combat/velocitymodes/vanilla/Custom.kt b/...a/net/ccbluex/liquidbounce/features/module/modules/combat/velocitymodes/vanilla/Custom.kt
@@ -69,7 +69,7 @@ object Custom : VelocityMode("Custom") {
 
     override fun onUpdate() {
         if (jump && mc.thePlayer.hurtTime == 9 && chanceOf(1f - jumpFailRate / 100f))
-            mc.thePlayer.jump(jumpMotion)
+            mc.thePlayer.jmp(jumpMotion)
         if (reverse && !(reverseNoGround && mc.thePlayer.onGround)) {
             run {
                 val nearbyEntity = getNearestEntityInRange() ?: return@run

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/BufferSpeed.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/BufferSpeed.kt
@@ -15,7 +15,6 @@ 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.jmp
-import net.ccbluex.liquidbounce.utils.extensions.jump
 import net.ccbluex.liquidbounce.value.BooleanValue
 import net.ccbluex.liquidbounce.value.FloatValue
 import net.ccbluex.liquidbounce.value.ListValue
@@ -128,7 +127,7 @@ object BufferSpeed : Module("BufferSpeed", MOVEMENT) {
 
                         strafe(0.375f)
 
-                        thePlayer.jump(0.41, ignoreJumpBoost = true)
+                        thePlayer.jmp(0.41, ignoreJumpBoost = true)
                         return
                     }
                 }
@@ -152,7 +151,7 @@ object BufferSpeed : Module("BufferSpeed", MOVEMENT) {
 
                         thePlayer.onGround = false
                         strafe(0.375f)
-                        thePlayer.jump(0.41, ignoreJumpBoost = true)
+                        thePlayer.jmp(0.41, ignoreJumpBoost = true)
                         return
                     }
                 }
@@ -188,7 +187,7 @@ object BufferSpeed : Module("BufferSpeed", MOVEMENT) {
 
                     "new" ->
                         if (isNearBlock && !thePlayer.movementInput.jump) {
-                            thePlayer.jump(0.08, ignoreJumpBoost = true)
+                            thePlayer.jmp(0.08, ignoreJumpBoost = true)
                             thePlayer.motionX *= 0.99
                             thePlayer.motionZ *= 0.99
                             down = true

diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Spider.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/movement/Spider.kt
@@ -13,7 +13,6 @@ import net.ccbluex.liquidbounce.utils.MovementUtils.direction
 import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
 import net.ccbluex.liquidbounce.utils.block.BlockUtils.collideBlockIntersects
 import net.ccbluex.liquidbounce.utils.extensions.jmp
-import net.ccbluex.liquidbounce.utils.extensions.jump
 import net.ccbluex.liquidbounce.utils.extensions.resetSpeed
 import net.ccbluex.liquidbounce.utils.extensions.stopXZ
 import net.ccbluex.liquidbounce.value.BooleanValue
@@ -91,7 +90,7 @@ object Spider : Module("Spider", MOVEMENT) {
                     glitch = collideGlitch
                 if (mc.thePlayer.isCollidedHorizontally)
                     if (mc.thePlayer.onGround) {
-                        mc.thePlayer.jump(collideJumpMotion)
+                        mc.thePlayer.jmp(collideJumpMotion)
                     } else if (collideFast && mc.thePlayer.motionY < 0)
                         mc.thePlayer.motionY = -collideFastSpeed.toDouble()
             }

diff --git a/...ain/java/net/ccbluex/liquidbounce/features/module/modules/movement/flymodes/other/Wave.kt b/...ain/java/net/ccbluex/liquidbounce/features/module/modules/movement/flymodes/other/Wave.kt
@@ -11,7 +11,7 @@ import net.ccbluex.liquidbounce.features.module.modules.movement.Fly.waveUpSpeed
 import net.ccbluex.liquidbounce.features.module.modules.movement.flymodes.FlyMode
 import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
 import net.ccbluex.liquidbounce.utils.MovementUtils.strafe
-import net.ccbluex.liquidbounce.utils.extensions.jump
+import net.ccbluex.liquidbounce.utils.extensions.jmp
 import net.minecraft.potion.Potion.moveSpeed
 
 /**
@@ -23,7 +23,7 @@ object Wave : FlyMode("Wave") {
         mc.timer.timerSpeed = if (isMoving) waveTimer else 1f
 
         if (mc.thePlayer.onGround) {
-            mc.thePlayer.jump(0.0798)
+            mc.thePlayer.jmp(0.0798)
             return
         }
 

diff --git a/...java/net/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/aac/AAC4BHop.kt b/...java/net/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/aac/AAC4BHop.kt
@@ -9,7 +9,6 @@ import net.ccbluex.liquidbounce.features.module.modules.movement.speedmodes.Spee
 import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
 import net.ccbluex.liquidbounce.utils.MovementUtils.strafe
 import net.ccbluex.liquidbounce.utils.extensions.jmp
-import net.ccbluex.liquidbounce.utils.extensions.jump
 
 /**
  * @author CCBlueX/LiquidBounce
@@ -36,7 +35,7 @@ object AAC4BHop : SpeedMode("AAC4BHop") {
             if (thePlayer.onGround) {
                 thePlayer.onGround = false
                 strafe(0.375f)
-                thePlayer.jump(0.41, ignoreGround = true)
+                thePlayer.jmp(0.41, ignoreGround = true)
             } else thePlayer.speedInAir = 0.0211f
         } else {
             thePlayer.motionX = 0.0

diff --git a/...java/net/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/aac/AAC7BHop.kt b/...java/net/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/aac/AAC7BHop.kt
@@ -8,7 +8,7 @@ package net.ccbluex.liquidbounce.features.module.modules.movement.speedmodes.aac
 import net.ccbluex.liquidbounce.features.module.modules.movement.speedmodes.SpeedMode
 import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
 import net.ccbluex.liquidbounce.utils.MovementUtils.speed
-import net.ccbluex.liquidbounce.utils.extensions.jump
+import net.ccbluex.liquidbounce.utils.extensions.jmp
 import net.ccbluex.liquidbounce.utils.extensions.toRadiansD
 import kotlin.math.cos
 import kotlin.math.sin
@@ -24,7 +24,7 @@ object AAC7BHop : SpeedMode("AAC7BHop") {
             return
 
         if (thePlayer.onGround) {
-            thePlayer.jump(0.405)
+            thePlayer.jmp(0.405)
             thePlayer.motionX *= 1.004
             thePlayer.motionZ *= 1.004
             return

diff --git a/...va/net/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/aac/AACLowHop3.kt b/...va/net/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/aac/AACLowHop3.kt
@@ -11,7 +11,7 @@ import net.ccbluex.liquidbounce.utils.MovementUtils.direction
 import net.ccbluex.liquidbounce.utils.MovementUtils.forward
 import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
 import net.ccbluex.liquidbounce.utils.MovementUtils.speed
-import net.ccbluex.liquidbounce.utils.extensions.jump
+import net.ccbluex.liquidbounce.utils.extensions.jmp
 import kotlin.math.cos
 import kotlin.math.sin
 
@@ -33,7 +33,7 @@ object AACLowHop3 : SpeedMode("AACLowHop3") {
                 if (thePlayer.onGround) {
                     waitForGround = false
                     if (!firstJump) firstJump = true
-                    thePlayer.jump(0.41)
+                    thePlayer.jmp(0.41)
                 } else {
                     if (waitForGround) return
                     if (thePlayer.isCollidedHorizontally) return

diff --git a/...ava/net/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/aac/AACYPort2.kt b/...ava/net/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/aac/AACYPort2.kt
@@ -8,7 +8,7 @@ package net.ccbluex.liquidbounce.features.module.modules.movement.speedmodes.aac
 import net.ccbluex.liquidbounce.event.events.MotionEvent
 import net.ccbluex.liquidbounce.features.module.modules.movement.speedmodes.SpeedMode
 import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
-import net.ccbluex.liquidbounce.utils.extensions.jump
+import net.ccbluex.liquidbounce.utils.extensions.jmp
 
 /**
  * @author CCBlueX/LiquidBounce
@@ -20,7 +20,7 @@ object AACYPort2 : SpeedMode("AACYPort2") {
 
             thePlayer.cameraPitch = 0f
             if (thePlayer.onGround) {
-                thePlayer.jump(0.3851)
+                thePlayer.jmp(0.3851)
                 thePlayer.motionX *= 1.01
                 thePlayer.motionZ *= 1.01
             } else thePlayer.motionY = -0.21

diff --git a/...in/java/net/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/ncp/UNCP2.kt b/...in/java/net/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/ncp/UNCP2.kt
@@ -9,7 +9,7 @@ import net.ccbluex.liquidbounce.event.events.MotionEvent
 import net.ccbluex.liquidbounce.features.module.modules.movement.speedmodes.SpeedMode
 import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
 import net.ccbluex.liquidbounce.utils.MovementUtils.strafe
-import net.ccbluex.liquidbounce.utils.extensions.jump
+import net.ccbluex.liquidbounce.utils.extensions.jmp
 import net.ccbluex.liquidbounce.utils.extensions.stopXZ
 
 /**
@@ -27,6 +27,6 @@ object UNCP2 : SpeedMode("UNCP2") {
         mc.timer.timerSpeed = 1.08f
         strafe()
         mc.thePlayer.jumpMovementFactor = 0.024f
-        mc.thePlayer.jump(0.39935305)
+        mc.thePlayer.jmp(0.39935305)
     }
 }
diff --git a/...ava/net/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/ncp/UNCPYPort.kt b/...ava/net/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/ncp/UNCPYPort.kt
@@ -12,7 +12,7 @@ import net.ccbluex.liquidbounce.features.module.modules.movement.speedmodes.Spee
 import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
 import net.ccbluex.liquidbounce.utils.MovementUtils.speed
 import net.ccbluex.liquidbounce.utils.MovementUtils.strafe
-import net.ccbluex.liquidbounce.utils.extensions.jump
+import net.ccbluex.liquidbounce.utils.extensions.jmp
 import net.minecraft.network.play.server.S12PacketEntityVelocity
 
 /**
@@ -28,7 +28,7 @@ object UNCPYPort : SpeedMode("UNCPYPort") {
             mc.thePlayer.motionY -= 0.16
 
         if (mc.thePlayer.onGround && isMoving) {
-            mc.thePlayer.jump(0.3993535)
+            mc.thePlayer.jmp(0.3993535)
         }
         speed = speed.coerceAtMost(1.75f)
         strafe(speed, true)

diff --git a/.../net/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/other/WaveLowHop.kt b/.../net/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/other/WaveLowHop.kt
@@ -9,7 +9,7 @@ import net.ccbluex.liquidbounce.features.module.modules.movement.Speed.wavelowho
 import net.ccbluex.liquidbounce.features.module.modules.movement.speedmodes.SpeedMode
 import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
 import net.ccbluex.liquidbounce.utils.MovementUtils.strafe
-import net.ccbluex.liquidbounce.utils.extensions.jump
+import net.ccbluex.liquidbounce.utils.extensions.jmp
 import net.ccbluex.liquidbounce.utils.extensions.resetSpeed
 import net.ccbluex.liquidbounce.utils.extensions.stopXZ
 import net.minecraft.potion.Potion.moveSpeed
@@ -33,7 +33,7 @@ object WaveLowHop : SpeedMode("WaveLowHop") {
 
         if (mc.thePlayer.onGround) {
             wasGround = true
-            mc.thePlayer.jump(0.42, ignoreJumpBoost = true)
+            mc.thePlayer.jmp(ignoreJumpBoost = true)
             speed = if (hasSpeed) 1.2f else 0.49f
         } else if (wasGround) {
             wasGround = false

diff --git a/...et/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/verus/VerusLowHop2.kt b/...et/ccbluex/liquidbounce/features/module/modules/movement/speedmodes/verus/VerusLowHop2.kt
@@ -9,7 +9,7 @@ import net.ccbluex.liquidbounce.event.events.MoveEvent
 import net.ccbluex.liquidbounce.features.module.modules.movement.speedmodes.SpeedMode
 import net.ccbluex.liquidbounce.utils.MovementUtils.isMoving
 import net.ccbluex.liquidbounce.utils.MovementUtils.strafe
-import net.ccbluex.liquidbounce.utils.extensions.jump
+import net.ccbluex.liquidbounce.utils.extensions.jmp
 
 /**
  * @author liquidbounceplusreborn/LiquidbouncePlus-Reborn
@@ -20,7 +20,7 @@ object VerusLowHop2 : SpeedMode("VerusLowHop2") {
             if (!isMoving)
                 return
             if (onGround) {
-                jump(0)
+                jmp(0)
                 strafe(0.61f)
                 event.y = 0.41999998688698
             }

diff --git a/src/main/java/net/ccbluex/liquidbounce/utils/PotionUtils.kt b/src/main/java/net/ccbluex/liquidbounce/utils/PotionUtils.kt
diff --git a/src/main/java/net/ccbluex/liquidbounce/utils/extensions/Extensions.kt b/src/main/java/net/ccbluex/liquidbounce/utils/extensions/Extensions.kt
@@ -10,7 +10,6 @@ import net.ccbluex.liquidbounce.utils.MinecraftInstance.Companion.mc
 import net.ccbluex.liquidbounce.utils.MovementUtils.JUMP_HEIGHT
 import net.ccbluex.liquidbounce.utils.MovementUtils.getJumpBoostModifier
 import net.ccbluex.liquidbounce.utils.PacketUtils.sendPacket
-import net.ccbluex.liquidbounce.utils.PotionUtils.Potions
 import net.ccbluex.liquidbounce.utils.Rotation
 import net.ccbluex.liquidbounce.utils.RotationUtils.getFixedSensitivityAngle
 import net.ccbluex.liquidbounce.utils.block.BlockUtils
@@ -395,14 +394,6 @@ fun EntityPlayer.jmp(
     ignoreJumpBoost: Boolean = false,
     ignoreGround: Boolean = false,
     whenJumping: Boolean = false,
-) = jump(motion, boost, ignoreJumpBoost, ignoreGround, whenJumping)
-
-fun EntityPlayer.jump(
-    motion: Number = JUMP_HEIGHT,
-    boost: Boolean = true,
-    ignoreJumpBoost: Boolean = false,
-    ignoreGround: Boolean = false,
-    whenJumping: Boolean = false,
 ) {
     if (!ignoreGround && !onGround) return
     if (!whenJumping && mc.gameSettings.keyBindJump.pressed) return
@@ -411,23 +402,22 @@ fun EntityPlayer.jump(
     val z = motionZ
 
     jump()
-    motionY = getJumpBoostModifier(motion.toDouble(), !ignoreJumpBoost)
+
+    // only change motion if the jump wasn't cancelled
+    if (motionY == getJumpBoostModifier(JUMP_HEIGHT))
+        motionY = getJumpBoostModifier(motion.toDouble(), !ignoreJumpBoost)
 
     if (!boost) {
         motionX = x
         motionZ = z
     }
 }
 
-infix fun EntityPlayer.has(potion: Potions) = isPotionActive(potion.potion)
 infix fun EntityPlayer.has(potion: Potion) = isPotionActive(potion)
-fun EntityPlayer.get(potion: Potions): PotionEffect? = getActivePotionEffect(potion.potion)
 fun EntityPlayer.get(potion: Potion): PotionEffect? = getActivePotionEffect(potion)
 
 infix fun Entity.isInsideOf(material: Material) = isInsideOfMaterial(material)
 
-val Potion.potion
-    get() = Potions.entries.find { it.potion == this }
 
 val PotionEffect?.level
     get() = this?.let { amplifier + 1 } ?: 0