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

Strafe Rewrite #491

Merged
merged 2 commits into from
Jul 11, 2023
Merged

Strafe Rewrite #491

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a4b0ea
Strafe Rewrite
Doogie13 Feb 9, 2023
91d57d1
minor style changes
rfresh2 Jul 11, 2023
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
154 changes: 80 additions & 74 deletions src/main/kotlin/com/lambda/client/module/modules/movement/Speed.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ import com.lambda.client.commons.interfaces.DisplayEnum
import com.lambda.client.event.SafeClientEvent
import com.lambda.client.event.events.PacketEvent
import com.lambda.client.event.events.PlayerMoveEvent
import com.lambda.client.event.events.PlayerTravelEvent
import com.lambda.client.manager.managers.TimerManager.modifyTimer
import com.lambda.client.manager.managers.TimerManager.resetTimer
import com.lambda.client.mixin.extension.isInWeb
import com.lambda.client.mixin.extension.playerY
import com.lambda.client.module.Category
import com.lambda.client.module.Module
Expand All @@ -16,13 +14,8 @@ import com.lambda.client.util.EntityUtils.isInOrAboveLiquid
import com.lambda.client.util.MovementUtils
import com.lambda.client.util.MovementUtils.applySpeedPotionEffects
import com.lambda.client.util.MovementUtils.calcMoveYaw
import com.lambda.client.util.MovementUtils.setSpeed
import com.lambda.client.util.MovementUtils.speed
import com.lambda.client.util.TickTimer
import com.lambda.client.util.TimeUnit
import com.lambda.client.util.threads.runSafe
import com.lambda.client.util.threads.safeListener
import net.minecraft.client.settings.KeyBinding
import net.minecraft.network.play.client.CPacketPlayer
import net.minecraft.network.play.server.SPacketPlayerPosLook
import net.minecraftforge.fml.common.gameevent.TickEvent
Expand All @@ -43,12 +36,9 @@ object Speed : Module(
val mode = setting("Mode", SpeedMode.STRAFE)

// Strafe settings
private val strafeAirSpeedBoost by setting("Air Speed Boost", 0.028f, 0.01f..0.04f, 0.001f, { mode.value == SpeedMode.STRAFE })
private val strafeTimerBoost by setting("Timer Boost", true, { mode.value == SpeedMode.STRAFE })
private val strafeAutoJump by setting("Auto Jump", true, { mode.value == SpeedMode.STRAFE }, description = "WARNING: Food intensive!")
private val strafeOnlyOverhead by setting("Only strafe on overhead", false, { mode.value == SpeedMode.STRAFE && strafeAutoJump })
private val strafeAirSpeedBoost by setting("Strafe Speed", StrafeMode.Normal)
private val strafeOnlyOverhead by setting("Require Roof", false, { mode.value == SpeedMode.STRAFE })
private val strafeOnHoldingSprint by setting("On Holding Sprint", false, { mode.value == SpeedMode.STRAFE })
private val strafeCancelInertia by setting("Cancel Inertia", false, { mode.value == SpeedMode.STRAFE })

// YPort settings
private val yPortAccelerate by setting("Accelerate", true, { mode.value == SpeedMode.YPORT })
Expand All @@ -58,17 +48,17 @@ object Speed : Module(
private val yPortAcceleration by setting("Acceleration Speed", 2.149, 1.0..5.0, 0.001, { mode.value == SpeedMode.YPORT })
private val yPortDecay by setting("Decay Amount", 0.66, 0.0..1.0, 0.001, { mode.value == SpeedMode.YPORT })

private const val TIMER_SPEED = 45.955883f

// Strafe Mode
private var jumpTicks = 0
private val strafeTimer = TickTimer(TimeUnit.TICKS)
private const val TIMER_SPEED = 45.922115f

// yport stuff
private var currentSpeed = .2873
private var currentY = 0.0
private var phase: YPortPhase = YPortPhase.WALKING
private var prevPhase: YPortPhase = YPortPhase.WALKING

private var strafePhase = StrafePhase.ACCELERATING

private var yPortPhase = YPortPhase.WALKING
private var prevYPortPhase = YPortPhase.WALKING

private var goUp = false
private var lastDistance = 0.0

Expand All @@ -85,16 +75,30 @@ object Speed : Module(
FALLING
}

private enum class StrafePhase {
// to jump and accelerate
ACCELERATING,
// to fall to the ground
SLOWDOWN,
// to slowly fall to the ground
FALLING
}

enum class SpeedMode(override val displayName: String) : DisplayEnum {
STRAFE("Strafe"),
YPORT("YPort")
}

enum class StrafeMode {
Normal, Strict
}

init {
onEnable {
currentSpeed = .2873
phase = YPortPhase.WALKING
prevPhase = YPortPhase.WALKING
strafePhase = StrafePhase.ACCELERATING
yPortPhase = YPortPhase.WALKING
prevYPortPhase = YPortPhase.WALKING
goUp = false
currentY = 0.0
}
Expand All @@ -107,23 +111,12 @@ object Speed : Module(

safeListener<TickEvent.ClientTickEvent> {
lastDistance = hypot(player.posX - player.prevPosX, player.posZ - player.prevPosZ)
if (mode.value == SpeedMode.STRAFE
&& shouldStrafe()
) strafe()
}

safeListener<PlayerMoveEvent> {
when (mode.value) {
SpeedMode.STRAFE -> {
if (shouldStrafe()) {
setSpeed(max(player.speed, applySpeedPotionEffects(0.2873)))
} else {
reset()
if (strafeCancelInertia && !strafeTimer.tick(2L, false)) {
player.motionX = 0.0
player.motionZ = 0.0
}
}
handleStrafe(it)
}

SpeedMode.YPORT -> {
Expand Down Expand Up @@ -152,14 +145,14 @@ object Speed : Module(

if (currentY + unModOffset > 0)
offset += currentY
else if (yPortAirStrict && phase == YPortPhase.FALLING && prevPhase == YPortPhase.FALLING) {
else if (yPortAirStrict && yPortPhase == YPortPhase.FALLING && prevYPortPhase == YPortPhase.FALLING) {

var predictedY = currentY
predictedY -= 0.08
predictedY *= 0.9800000190734863 // 0.333200006 vs 0.341599999

if (predictedY + player.posY <= player.posY) {
phase = YPortPhase.WAITING
yPortPhase = YPortPhase.WAITING
}
}

Expand All @@ -175,55 +168,23 @@ object Speed : Module(
currentY = 0.0
goUp = false
// 3 extra ticks at base speed
phase = YPortPhase.WAITING
yPortPhase = YPortPhase.WAITING
}

mode.listeners.add {
runSafe { reset() }
}
}

private fun SafeClientEvent.strafe() {
player.jumpMovementFactor = strafeAirSpeedBoost
// slightly slower timer speed bypasses better (1.088)
if (strafeTimerBoost) modifyTimer(TIMER_SPEED)

if ((Step.isDisabled || player.onGround) && strafeAutoJump) jump()

strafeTimer.reset()
}

private fun SafeClientEvent.shouldStrafe(): Boolean =
!player.capabilities.isFlying
&& !player.isElytraFlying
&& !mc.gameSettings.keyBindSneak.isKeyDown
&& (!strafeOnHoldingSprint || mc.gameSettings.keyBindSprint.isKeyDown)
&& !BaritoneUtils.isPathing
&& MovementUtils.isInputting
&& !(player.isInOrAboveLiquid || player.isInWeb)
&& (!strafeOnlyOverhead || world.collidesWithAnyBlock(player.entityBoundingBox.offset(.0,.42,.0)))

private fun SafeClientEvent.reset() {
player.jumpMovementFactor = 0.02f
resetTimer()
jumpTicks = 0
}

private fun SafeClientEvent.jump() {
if (player.onGround && jumpTicks <= 0) {
if (player.isSprinting) {
val yaw = calcMoveYaw()
player.motionX -= sin(yaw) * 0.2
player.motionZ += cos(yaw) * 0.2
}

KeyBinding.setKeyBindState(mc.gameSettings.keyBindJump.keyCode, false)
player.motionY = 0.4
player.isAirBorne = true
jumpTicks = 5
}

jumpTicks--
}

private fun SafeClientEvent.handleBoost(event: PlayerMoveEvent) {
Expand All @@ -240,13 +201,13 @@ object Speed : Module(

modifyTimer(TIMER_SPEED)

prevPhase = phase
prevYPortPhase = yPortPhase

when (phase) {
when (yPortPhase) {
YPortPhase.ACCELERATING -> {
// NCP says hDistance < 2.15 * hDistanceBaseRef
currentSpeed *= yPortAcceleration
phase = if (yPortAirStrict) YPortPhase.FALLING else YPortPhase.SLOWDOWN
yPortPhase = if (yPortAirStrict) YPortPhase.FALLING else YPortPhase.SLOWDOWN
goUp = true
currentY = 0.0
}
Expand All @@ -258,12 +219,12 @@ object Speed : Module(
} else {
.2873
}
phase = YPortPhase.ACCELERATING
yPortPhase = YPortPhase.ACCELERATING
goUp = false
}

YPortPhase.FALLING -> {
if (prevPhase == YPortPhase.WALKING) {
if (prevYPortPhase == YPortPhase.WALKING) {
currentSpeed = if (yPortAccelerate) {
lastDistance - yPortDecay * (lastDistance - .2873)
} else {
Expand All @@ -281,7 +242,7 @@ object Speed : Module(

else -> {
currentSpeed = max(currentSpeed, .2873)
phase = YPortPhase.values()[phase.ordinal + 1 % YPortPhase.values().size]
yPortPhase = YPortPhase.values()[yPortPhase.ordinal + 1 % YPortPhase.values().size]
goUp = false
}
}
Expand All @@ -298,4 +259,49 @@ object Speed : Module(

player.setVelocity(event.x, event.y, event.z)
}

private fun SafeClientEvent.handleStrafe(event: PlayerMoveEvent) {
if (!shouldStrafe()) {
resetTimer()
event.x = .0
event.z = .0
currentSpeed = .2873
return
}

if (strafeOnlyOverhead && !world.collidesWithAnyBlock(player.entityBoundingBox.offset(.0,.42,.0))
|| strafeOnHoldingSprint && !mc.gameSettings.keyBindSprint.isKeyDown)
return

modifyTimer(TIMER_SPEED)

val base = applySpeedPotionEffects(.2873)

if (player.onGround)
strafePhase = StrafePhase.ACCELERATING

when (strafePhase) {
StrafePhase.ACCELERATING -> {
if (player.onGround)
event.y = .42
currentSpeed = base
currentSpeed *= if (strafeAirSpeedBoost == StrafeMode.Strict) 1.87 else 1.93
strafePhase = StrafePhase.SLOWDOWN
}

StrafePhase.SLOWDOWN -> {
currentSpeed -= .66 * base
strafePhase = StrafePhase.FALLING
}

StrafePhase.FALLING -> {
currentSpeed = lastDistance - lastDistance / 159
}
}

val yaw = calcMoveYaw()
currentSpeed = currentSpeed.coerceAtLeast(.2873)
event.x = -sin(yaw) * currentSpeed
event.z = cos(yaw) * currentSpeed
}
}