@@ -28,18 +28,15 @@ import com.lambda.interaction.request.hotbar.HotbarRequest
2828import com.lambda.module.Module
2929import com.lambda.module.tag.ModuleTag
3030import com.lambda.threading.runSafe
31- import com.lambda.util.Communication.warn
3231import com.lambda.util.NamedEnum
3332import com.lambda.util.player.SlotUtils.hotbar
3433import com.lambda.util.player.SlotUtils.hotbarAndStorage
35- import com.lambda.util.player.SlotUtils.storage
3634import net.minecraft.client.network.ClientPlayerEntity
3735import net.minecraft.entity.effect.StatusEffects
3836import net.minecraft.item.Items
3937import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket
4038import net.minecraft.network.packet.c2s.play.HandSwingC2SPacket
4139import net.minecraft.network.packet.c2s.play.PlayerInteractItemC2SPacket
42- import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket
4340import net.minecraft.screen.slot.SlotActionType
4441import net.minecraft.util.Hand
4542import net.minecraft.util.hit.HitResult
@@ -66,7 +63,7 @@ object BetterFirework : Module(
6663 Hotbar (" Hotbar" )
6764 }
6865
69- private var takeoffState = TakeoffState .NONE
66+ private var takeoffState = TakeoffState .None
7067
7168 val ClientPlayerEntity .canTakeoff: Boolean
7269 get() = isOnGround || canOpenElytra
@@ -77,20 +74,20 @@ object BetterFirework : Module(
7774 init {
7875 listen<TickEvent .Pre > {
7976 when (takeoffState) {
80- TakeoffState .NONE -> {}
77+ TakeoffState .None -> {}
8178
82- TakeoffState .JUMPING -> {
79+ TakeoffState .Jumping -> {
8380 player.jump()
84- takeoffState = TakeoffState .START_FLYING
81+ takeoffState = TakeoffState .StartFlying
8582 }
8683
87- TakeoffState .START_FLYING -> {
84+ TakeoffState .StartFlying -> {
8885 if (player.canOpenElytra) {
8986 player.startGliding()
9087 connection.sendPacket(ClientCommandC2SPacket (player, ClientCommandC2SPacket .Mode .START_FALL_FLYING ))
9188 }
9289 startFirework(silentUse)
93- takeoffState = TakeoffState .NONE
90+ takeoffState = TakeoffState .None
9491 }
9592 }
9693 }
@@ -115,9 +112,9 @@ object BetterFirework : Module(
115112 mc.itemUseCooldown + = 4
116113 val cancelInteract = player.canTakeoff || fireworkInteractCancel
117114 if (player.canTakeoff) {
118- takeoffState = TakeoffState .JUMPING
115+ takeoffState = TakeoffState .Jumping
119116 } else if (player.canOpenElytra) {
120- takeoffState = TakeoffState .START_FLYING
117+ takeoffState = TakeoffState .StartFlying
121118 }
122119 return cancelInteract
123120 } ? : false
@@ -132,14 +129,14 @@ object BetterFirework : Module(
132129 if (mc.crosshairTarget?.type == HitResult .Type .BLOCK && ! middleClickCancel) {
133130 return false
134131 }
135- if (takeoffState != TakeoffState .NONE ) {
132+ if (takeoffState != TakeoffState .None ) {
136133 return false // Prevent using multiple times
137134 }
138135 if (player.canOpenElytra || player.isGliding) {
139136 // If already gliding use another firework
140- takeoffState = TakeoffState .START_FLYING
137+ takeoffState = TakeoffState .StartFlying
141138 } else if (player.canTakeoff) {
142- takeoffState = TakeoffState .JUMPING
139+ takeoffState = TakeoffState .Jumping
143140 }
144141 return true
145142 } ? : false
@@ -192,8 +189,8 @@ object BetterFirework : Module(
192189 }
193190
194191 enum class TakeoffState {
195- NONE ,
196- JUMPING ,
197- START_FLYING
192+ None ,
193+ Jumping ,
194+ StartFlying
198195 }
199196}
0 commit comments