FIX: Prevents betterfirework from trying to start flying without an elytra or a firework. Shows a warning message to the user instead. #227
Conversation
| init { | ||
| private var activateButton by setting("Activate Key", Bind(0, 0, Mouse.Middle.ordinal), "Button to activate Firework") | ||
| .onPress { | ||
| mc.player?.isElytraEquipped()?.let { equipped -> |
There was a problem hiding this comment.
You don't have to use mc as player is part of the safe context.
| return false | ||
| } | ||
|
|
||
| fun ClientPlayerEntity.hasFireworks(minimum: Int = 1): Boolean { |
There was a problem hiding this comment.
You can instead use this
val ClientPlayerEntity.hasFireworks: Boolean
get() = selectStack { isItem(Items.FIREWORK_ROCKET) }
.filterStacks(inventory.mainStacks)
.isNotEmpty()There was a problem hiding this comment.
I was thinking that this could be useful in the future development of the module. That is why I added the minimum required fireworks, this could be moved to StackSelection.kt with an Item argument though. What do you think?
There was a problem hiding this comment.
I was thinking that this could be useful in the future development of the module. That is why I added the minimum required fireworks, this could be moved to StackSelection.kt with an Item argument though. What do you think?
There is already an argument in selectStack that specifies the minimum stack size. It is currently set to at least 1
|
|
||
| private var takeoffState = TakeoffState.None | ||
|
|
||
| fun ClientPlayerEntity.isElytraEquipped(): Boolean { |
There was a problem hiding this comment.
We prefer using getters instead of functions that only returns a value
Here's how that would look like:
val ClientPlayerEntity.hasElytraEquipped: Boolean
get() = inventory.equipment.get(EquipmentSlot.CHEST).item == Items.ELYTRA
| player.isElytraEquipped.let { equipped -> | ||
| if (!equipped) { | ||
| warn("You need to equip an elytra to use this module!") | ||
| return@onPress | ||
| } | ||
| } | ||
| player.hasFireworks.let { hasFireworks -> |
There was a problem hiding this comment.
You can inline those checks now that you're not checking for null :3
2 participants
Previously BetterFirework tried to fly without an Elytra. This fixes the issue.