Skip to content

Commit

Permalink
Merge pull request #562 from rfresh2/efly-fireworks
Browse files Browse the repository at this point in the history 
ElytraFlight Fireworks Mode
  • Loading branch information
@Avanatiker
Avanatiker authored Jul 15, 2023
2 parents 4a447e5 + e48a792 commit e13b451
Showing 1 changed file with 127 additions and 15 deletions.
142 changes: 127 additions & 15 deletions src/main/kotlin/com/lambda/client/module/modules/movement/ElytraFlight.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,19 @@ import com.lambda.client.commons.extension.toRadian
import com.lambda.client.event.SafeClientEvent
import com.lambda.client.event.events.PacketEvent
import com.lambda.client.event.events.PlayerTravelEvent
import com.lambda.client.manager.managers.HotbarManager.resetHotbar
import com.lambda.client.manager.managers.HotbarManager.serverSideItem
import com.lambda.client.manager.managers.HotbarManager.spoofHotbar
import com.lambda.client.manager.managers.PlayerPacketManager.sendPlayerPacket
import com.lambda.client.mixin.extension.boostedEntity
import com.lambda.client.mixin.extension.playerPosLookPitch
import com.lambda.client.mixin.extension.tickLength
import com.lambda.client.mixin.extension.timer
import com.lambda.client.mixin.extension.*
import com.lambda.client.module.Category
import com.lambda.client.module.Module
import com.lambda.client.module.modules.player.LagNotifier
import com.lambda.client.util.MovementUtils.calcMoveYaw
import com.lambda.client.util.MovementUtils.speed
import com.lambda.client.util.TickTimer
import com.lambda.client.util.TimeUnit
import com.lambda.client.util.items.*
import com.lambda.client.util.math.Vec2f
import com.lambda.client.util.text.MessageSendHelper.sendChatMessage
import com.lambda.client.util.threads.runSafe
Expand All @@ -24,9 +27,14 @@ import net.minecraft.client.audio.PositionedSoundRecord
import net.minecraft.entity.item.EntityFireworkRocket
import net.minecraft.init.Items
import net.minecraft.init.SoundEvents
import net.minecraft.item.ItemFirework
import net.minecraft.item.ItemStack
import net.minecraft.network.play.client.CPacketEntityAction
import net.minecraft.network.play.client.CPacketPlayerTryUseItem
import net.minecraft.network.play.server.SPacketEntityMetadata
import net.minecraft.network.play.server.SPacketPlayerPosLook
import net.minecraft.util.EnumHand
import net.minecraft.util.math.RayTraceResult
import kotlin.math.*


Expand Down Expand Up @@ -99,10 +107,25 @@ object ElytraFlight : Module(
private val downPitch by setting("Down Pitch", 0f, 0f..90f, 5f, { mode.value == ElytraFlightMode.VANILLA && page == Page.MODE_SETTINGS })
private val rocketPitch by setting("Rocket Pitch", 50f, 0f..90f, 5f, { mode.value == ElytraFlightMode.VANILLA && page == Page.MODE_SETTINGS })

/* Fireworks */
private val fireworkUseMode by setting("Firework Use Mode", FireworkUseMode.SPEED, { mode.value == ElytraFlightMode.FIREWORKS && page == Page.MODE_SETTINGS })
private val delay by setting("Fireworks Delay Ticks", 30, 0..100, 1, { mode.value == ElytraFlightMode.FIREWORKS && fireworkUseMode == FireworkUseMode.DELAY && page == Page.MODE_SETTINGS })
private val fireworkUseStartSpeed by setting ("Fireworks Use Min Speed", 1.0, 0.01..3.0, 0.01, { mode.value == ElytraFlightMode.FIREWORKS && fireworkUseMode == FireworkUseMode.SPEED && page == Page.MODE_SETTINGS })
private val fireworkBlockAvoid by setting("Avoid Blocks", false, { mode.value == ElytraFlightMode.FIREWORKS && page == Page.MODE_SETTINGS },
description = "Don't use fireworks if player is facing into a block")
private val fireworkBlockAvoidDist by setting("Avoid Blocks Raytrace Distance", 2.0, 1.0..10.0, 0.1, { mode.value == ElytraFlightMode.FIREWORKS && page == Page.MODE_SETTINGS && fireworkBlockAvoid })
private val fireworksVControl by setting("Boosted V Control", true, { mode.value == ElytraFlightMode.FIREWORKS && page == Page.MODE_SETTINGS })
private val fireworksVSpeed by setting("Boosted V Control Speed", 1.0, 0.0..3.0, 0.1, { mode.value == ElytraFlightMode.FIREWORKS && fireworksVControl && page == Page.MODE_SETTINGS })
private const val minFireworkUseDelayTicks = 20

enum class FireworkUseMode {
DELAY, SPEED
}

/* End of Mode Settings */

enum class ElytraFlightMode {
BOOST, CONTROL, CREATIVE, PACKET, VANILLA
BOOST, CONTROL, CREATIVE, PACKET, VANILLA, FIREWORKS
}

private enum class Page {
Expand Down Expand Up @@ -131,11 +154,14 @@ object ElytraFlight : Module(
private var firstY = 0.0
private var secondY = 0.0

/* Fireworks mode state */
private var fireworkTickTimer: TickTimer = TickTimer(TimeUnit.TICKS)

/* Event Listeners */
init {
safeListener<PacketEvent.Receive> {
if (player.isSpectator || !elytraIsEquipped || elytraDurability <= 1 || !isFlying || mode.value == ElytraFlightMode.BOOST) return@safeListener
if (it.packet is SPacketPlayerPosLook && mode.value != ElytraFlightMode.PACKET) {
if (it.packet is SPacketPlayerPosLook && mode.value != ElytraFlightMode.PACKET && mode.value != ElytraFlightMode.FIREWORKS) {
val packet = it.packet
packet.playerPosLookPitch = player.rotationPitch
}
Expand Down Expand Up @@ -166,6 +192,7 @@ object ElytraFlight : Module(
ElytraFlightMode.CREATIVE -> creativeMode()
ElytraFlightMode.PACKET -> packetMode(it)
ElytraFlightMode.VANILLA -> vanillaMode()
ElytraFlightMode.FIREWORKS -> fireworksMode()
}
}
spoofRotation()
Expand Down Expand Up @@ -205,7 +232,7 @@ object ElytraFlight : Module(
/* Holds player in the air if run out of durability */
if (!player.onGround && elytraDurability <= 1 && outOfDurability) {
holdPlayer(event)
} else if (outOfDurability) outOfDurability = false /* Reset if players is on ground or replace with a new elytra */
} else if (outOfDurability) outOfDurability = false /* Reset if player is on the ground or replace with a new elytra */

/* wasInLiquid check */
if (player.isInWater || player.isInLava) {
Expand Down Expand Up @@ -359,6 +386,7 @@ object ElytraFlight : Module(
ElytraFlightMode.CREATIVE -> speedCreative
ElytraFlightMode.PACKET -> speedPacket
ElytraFlightMode.VANILLA -> 1f
ElytraFlightMode.FIREWORKS -> 1f
}
}

Expand All @@ -372,16 +400,29 @@ object ElytraFlight : Module(
private fun SafeClientEvent.boostMode() {
val yaw = player.rotationYaw.toDouble().toRadian()
player.motionX -= player.movementInput.moveForward * sin(yaw) * speedBoost / 20
if (player.movementInput.jump) player.motionY += upSpeedBoost / 15 else if (player.movementInput.sneak) player.motionY -= downSpeedBoost / 15
if (player.movementInput.jump) {
player.motionY += upSpeedBoost / 15
} else if (player.movementInput.sneak) {
player.motionY -= downSpeedBoost / 15
}
player.motionZ += player.movementInput.moveForward * cos(yaw) * speedBoost / 20
}

/* Control Mode */
private fun SafeClientEvent.controlMode(event: PlayerTravelEvent) {
/* States and movement input */
val currentSpeed = sqrt(player.motionX * player.motionX + player.motionZ * player.motionZ)
val moveUp = if (!legacyLookBoost) player.movementInput.jump else player.rotationPitch < -10.0f && !isStandingStillH
val moveDown = if (InventoryMove.isEnabled && !InventoryMove.sneak && mc.currentScreen != null || moveUp) false else player.movementInput.sneak
val moveUp = if (!legacyLookBoost) {
player.movementInput.jump
} else {
player.rotationPitch < -10.0f && !isStandingStillH
}

val moveDown = if (InventoryMove.isEnabled && !InventoryMove.sneak && mc.currentScreen != null || moveUp) {
false
} else {
player.movementInput.sneak
}

/* Dynamic down speed */
val calcDownSpeed = if (dynamicDownSpeed) {
Expand All @@ -393,8 +434,13 @@ object ElytraFlight : Module(
} else downSpeedControl.toDouble()

/* Hover */
if (hoverTarget < 0.0 || moveUp) hoverTarget = player.posY else if (moveDown) hoverTarget = player.posY - calcDownSpeed
hoverState = (if (hoverState) player.posY < hoverTarget else player.posY < hoverTarget - 0.1) && altitudeHoldControl
if (hoverTarget < 0.0 || moveUp) {
hoverTarget = player.posY
} else if (moveDown) {
hoverTarget = player.posY - calcDownSpeed
}
hoverState = (if (hoverState) player.posY < hoverTarget else player.posY < hoverTarget - 0.1)
&& altitudeHoldControl

/* Set velocity */
if (!isStandingStillH || moveUp) {
Expand Down Expand Up @@ -492,8 +538,69 @@ object ElytraFlight : Module(
firstY = player.posY
}

private fun SafeClientEvent.fireworksMode() {
val isBoosted = world.getLoadedEntityList().any { it is EntityFireworkRocket && it.boostedEntity == player }
val currentSpeed = sqrt(player.motionX * player.motionX + player.motionZ * player.motionZ)

if (isBoosted) {
if (fireworksVControl) {
if (player.movementInput.jump) {
player.motionY = fireworksVSpeed
} else if (player.movementInput.sneak) {
player.motionY = -fireworksVSpeed
}
}
fireworkTickTimer.reset()
} else when (fireworkUseMode) {
FireworkUseMode.DELAY -> {
if (fireworkTickTimer.tick(delay, true)) useFirework()
}
FireworkUseMode.SPEED -> {
if (currentSpeed < fireworkUseStartSpeed
&& fireworkTickTimer.tick(minFireworkUseDelayTicks, true)
) useFirework()
}
}
}

private fun SafeClientEvent.useFirework() {
if (fireworkBlockAvoid) {
player.rayTrace(fireworkBlockAvoidDist, 1f)?.let {
if (it.typeOfHit == RayTraceResult.Type.BLOCK) return
}
}
playerController.syncCurrentPlayItem()

val holdingFireworksMainhand = isBoostingFirework(player.serverSideItem)
val holdingFireworksOffhand = isBoostingFirework(player.offhandSlot.stack)

if (holdingFireworksMainhand) {
connection.sendPacket(CPacketPlayerTryUseItem(EnumHand.MAIN_HAND))
} else if (holdingFireworksOffhand) {
connection.sendPacket(CPacketPlayerTryUseItem(EnumHand.OFF_HAND))
} else {
player.hotbarSlots.firstItem<ItemFirework, HotbarSlot> { isBoostingFirework(it) }?.let {
spoofHotbar(it.hotbarSlot)
connection.sendPacket(CPacketPlayerTryUseItem(EnumHand.MAIN_HAND))
resetHotbar()
return
}

swapToItemOrMove<ItemFirework>(this@ElytraFlight, { isBoostingFirework(it) })
fireworkTickTimer.reset(minFireworkUseDelayTicks * 40L)
}
}

private fun isBoostingFirework(it: ItemStack): Boolean {
return it.item is ItemFirework
&& it.getSubCompound("Fireworks")?.hasKey("Flight") == true
}

fun shouldSwing(): Boolean {
return isEnabled && isFlying && !autoLanding && (mode.value == ElytraFlightMode.CONTROL || mode.value == ElytraFlightMode.PACKET)
return isEnabled
&& isFlying
&& !autoLanding
&& (mode.value == ElytraFlightMode.CONTROL || mode.value == ElytraFlightMode.PACKET)
}

private fun SafeClientEvent.spoofRotation() {
Expand All @@ -504,8 +611,13 @@ object ElytraFlight : Module(

if (autoLanding) {
rotation = Vec2f(rotation.x, -20f)
} else if (mode.value != ElytraFlightMode.BOOST && mode.value != ElytraFlightMode.VANILLA) {
if (!isStandingStill && mode.value != ElytraFlightMode.CREATIVE) rotation = Vec2f(packetYaw, rotation.y)
} else if (mode.value != ElytraFlightMode.BOOST
&& mode.value != ElytraFlightMode.VANILLA
&& mode.value != ElytraFlightMode.FIREWORKS
) {
if (!isStandingStill && mode.value != ElytraFlightMode.CREATIVE) {
rotation = Vec2f(packetYaw, rotation.y)
}
if (spoofPitch) {
if (!isStandingStill) rotation = Vec2f(rotation.x, packetPitch)

Expand Down

0 comments on commit e13b451

Please sign in to comment.