Skip to content

feat: improve actionbarwidgetupdateevent #296

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

Draft
j10a1n15 wants to merge 5 commits into
base: 4.0
Choose a base branch
from
Draft

feat: improve actionbarwidgetupdateevent #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c3cdbce
feat: new class
j10a1n15 Nov 17, 2025
d42912f
Merge branch '4.0' into feat/actionbarwidget-rework
j10a1n15 Dec 10, 2025
3f2d300
Merge branch '4.0' into feat/actionbarwidget-rework
j10a1n15 Mar 25, 2026
cce4681
open class with priv const
j10a1n15 Mar 25, 2026
8c52b89
fully vonert it to components idek
j10a1n15 Mar 26, 2026
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
14 changes: 14 additions & 0 deletions src/main/kotlin/tech/thatgravyboat/skyblockapi/api/events/chat/ActionBarReceivedEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package tech.thatgravyboat.skyblockapi.api.events.chat

import me.owdding.dfu.item.LegacyTextFixer
import net.minecraft.network.chat.Component
import tech.thatgravyboat.skyblockapi.api.events.base.SkyBlockEvent
import tech.thatgravyboat.skyblockapi.utils.text.TextProperties.stripped
Expand All @@ -13,4 +14,17 @@ abstract class ActionBarReceivedEvent : SkyBlockEvent() {

class Pre(override val component: Component): ActionBarReceivedEvent(), Cancellable
class Post(override var component: Component): ActionBarReceivedEvent()

// TODO: remove once hypixel starts sending actual components in action bars
companion object {
internal fun preparePre(component: Component): Pre {
val fixedComponent = if (component.siblings.isEmpty()) LegacyTextFixer.parse(component.string) else component
return Pre(fixedComponent)
}

internal fun preparePost(component: Component): Post {
val fixedComponent = if (component.siblings.isEmpty()) LegacyTextFixer.parse(component.string) else component
return Post(fixedComponent)
}
}
}
50 changes: 46 additions & 4 deletions src/main/kotlin/tech/thatgravyboat/skyblockapi/api/events/info/ActionBarWidgetChangeEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,98 @@
package tech.thatgravyboat.skyblockapi.api.events.info

import tech.thatgravyboat.skyblockapi.api.data.item.ArmorStack
import net.minecraft.network.chat.Component
import tech.thatgravyboat.skyblockapi.RemoveNextVersion
import tech.thatgravyboat.skyblockapi.api.data.item.ArmorStack as ArmorStackType
import tech.thatgravyboat.skyblockapi.api.events.base.CancellableSkyBlockEvent
import tech.thatgravyboat.skyblockapi.api.events.base.SkyBlockEvent
import tech.thatgravyboat.skyblockapi.api.remote.hypixel.HypixelSkillAPI.Skill
import tech.thatgravyboat.skyblockapi.utils.extentions.toFormattedName
import kotlin.time.Duration

open class RenderActionBarWidgetEvent(val widget: ActionBarWidget) : CancellableSkyBlockEvent()
class RenderActionBarWidgetEvent(val widget: ActionBarWidget) : CancellableSkyBlockEvent()

@RemoveNextVersion(ReplaceWith("ActionBarWidgetUpdateEvent"))
open class ActionBarWidgetChangeEvent(
val widget: ActionBarWidget,
val old: String,
val new: String,
) : SkyBlockEvent()

private typealias ABWUE = ActionBarWidgetUpdateEvent

open class ActionBarWidgetUpdateEvent private constructor(val widget: ActionBarWidget, val old: Component, val new: Component) : SkyBlockEvent() {
class Health(val current: Int, val max: Int, old: Component, new: Component) : ABWUE(ActionBarWidget.HEALTH, old, new)
class Defense(val current: Int, old: Component, new: Component) : ABWUE(ActionBarWidget.DEFENSE, old, new)
class Mana(val current: Int, val max: Int, old: Component, new: Component) : ABWUE(ActionBarWidget.MANA, old, new)
class NoMana(old: Component, new: Component) : ABWUE(ActionBarWidget.NO_MANA, old, new)
class OverflowMana(val current: Int, old: Component, new: Component) : ABWUE(ActionBarWidget.OVERFLOW_MANA, old, new)
class RiftTime(val time: Duration, old: Component, new: Component) : ABWUE(ActionBarWidget.RIFT_TIME, old, new)
class Armadillo(val current: Float, val max: Float, old: Component, new: Component) : ABWUE(ActionBarWidget.ARMADILLO, old, new)
class ArmorStack(val current: Int, val type: ArmorStackType, old: Component, new: Component) : ABWUE(ActionBarWidget.ARMOR_STACK, old, new)
class Secrets(val current: Int, val max: Int, old: Component, new: Component) : ABWUE(ActionBarWidget.SECRETS, old, new)
class Drill(val current: Int, val max: Int, old: Component, new: Component) : ABWUE(ActionBarWidget.DRILL_FUEL, old, new)
class Ability(val manaAmount: Int, val ability: Component, old: Component, new: Component) : ABWUE(ActionBarWidget.ABILITY, old, new)
class Pressure(val current: Int, old: Component, new: Component) : ABWUE(ActionBarWidget.PRESSURE, old, new)
class SkyBlockXp(val gained: Long, old: Component, new: Component) : ABWUE(ActionBarWidget.SKYBLOCK_XP, old, new)
class Charges(val current: Int, val max: Component, old: Component, new: Component) : ABWUE(ActionBarWidget.CHARGES, old, new)
class Location(val location: Component, old: Component, new: Component) : ABWUE(ActionBarWidget.LOCATION, old, new)
class CellsAlignment(val amount: Int, old: Component, new: Component) : ABWUE(ActionBarWidget.CELLS_ALIGNMENT, old, new)
class SkillXpPercent(val amount: Float, val skill: Skill, val percent: Float, old: Component, new: Component) : ABWUE(ActionBarWidget.SKILL_XP, old, new)
class SkillXpLiteral(val amount: Float, val skill: Skill, val current: Long, val needed: Long, old: Component, new: Component) :
ABWUE(ActionBarWidget.SKILL_XP_LITERAL, old, new)

class Unknown(widget: ActionBarWidget, old: Component, new: Component) : ABWUE(widget, old, new)
}

// <editor-fold desc="Deprecated Classes">
@RemoveNextVersion(ReplaceWith("ActionBarWidgetUpdateEvent.Health"))
class HealthActionBarWidgetChangeEvent(val current: Int, val max: Int, old: String, new: String) :
ActionBarWidgetChangeEvent(ActionBarWidget.HEALTH, old, new)

@RemoveNextVersion(ReplaceWith("ActionBarWidgetUpdateEvent.Defense"))
class DefenseActionBarWidgetChangeEvent(val current: Int, old: String, new: String) :
ActionBarWidgetChangeEvent(ActionBarWidget.DEFENSE, old, new)

@RemoveNextVersion(ReplaceWith("ActionBarWidgetUpdateEvent.Mana"))
class ManaActionBarWidgetChangeEvent(val current: Int, val max: Int, old: String, new: String) :
ActionBarWidgetChangeEvent(ActionBarWidget.MANA, old, new)

@RemoveNextVersion(ReplaceWith("ActionBarWidgetUpdateEvent.OverflowMana"))
class OverflowManaActionBarWidgetChangeEvent(val current: Int, old: String, new: String) :
ActionBarWidgetChangeEvent(ActionBarWidget.OVERFLOW_MANA, old, new)

@RemoveNextVersion(ReplaceWith("ActionBarWidgetUpdateEvent.RiftTime"))
class RiftTimeActionBarWidgetChangeEvent(val time: Duration?, old: String, new: String) :
ActionBarWidgetChangeEvent(ActionBarWidget.RIFT_TIME, old, new)

@RemoveNextVersion(ReplaceWith("ActionBarWidgetUpdateEvent.Armadillo"))
class ArmadilloActionBarWidgetChangeEvent(val current: Float, val max: Float, old: String, new: String) :
ActionBarWidgetChangeEvent(ActionBarWidget.ARMADILLO, old, new)

class ArmorStackActionBarWidgetChangeEvent(val current: Int, val type: ArmorStack?, old: String, new: String) :
@RemoveNextVersion(ReplaceWith("ActionBarWidgetUpdateEvent.ArmorStack"))
class ArmorStackActionBarWidgetChangeEvent(val current: Int, val type: ArmorStackType?, old: String, new: String) :
ActionBarWidgetChangeEvent(ActionBarWidget.ARMOR_STACK, old, new)

@RemoveNextVersion(ReplaceWith("ActionBarWidgetUpdateEvent.Secrets"))
class SecretsActionBarWidgetChangeEvent(val current: Int, val max: Int, old: String, new: String) :
ActionBarWidgetChangeEvent(ActionBarWidget.SECRETS, old, new)

@RemoveNextVersion(ReplaceWith("ActionBarWidgetUpdateEvent.Drill"))
class DrillActionBarWidgetChangeEvent(val current: Int, val max: Int, old: String, new: String) :
ActionBarWidgetChangeEvent(ActionBarWidget.DRILL_FUEL, old, new)

@RemoveNextVersion(ReplaceWith("ActionBarWidgetUpdateEvent.Pressure"))
class PressureActionBarWidgetChangeEvent(val current: Int, old: String, new: String) :
ActionBarWidgetChangeEvent(ActionBarWidget.PRESSURE, old, new)

@RemoveNextVersion(ReplaceWith("ActionBarWidgetUpdateEvent.SkillXpPercent"))
class SkillXpPercentActionBarWidgetChangeEvent(val amount: Float, val skill: Skill?, val percent: Float, old: String, new: String) :
ActionBarWidgetChangeEvent(ActionBarWidget.SKILL_XP, old, new)

@RemoveNextVersion(ReplaceWith("ActionBarWidgetUpdateEvent.SkillXpLiteral"))
class SkillXpLiteralActionBarWidgetChangeEvent(val amount: Float, val skill: Skill?, val current: Long, val needed: Long, old: String, new: String) :
ActionBarWidgetChangeEvent(ActionBarWidget.SKILL_XP_LITERAL, old, new)
// </editor-fold>

enum class ActionBarWidget {
HEALTH,
Expand All @@ -73,6 +116,5 @@ enum class ActionBarWidget {
;

private val string = toFormattedName()

override fun toString() = string
}
9 changes: 9 additions & 0 deletions src/main/kotlin/tech/thatgravyboat/skyblockapi/impl/debug/DebugCommands.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import kotlin.io.path.createDirectories
@Module
object DebugCommands {

private var actionbarComponent: Component = Component.empty()
private var actionbar: String = ""
private var tabListFooter: Component = Component.empty()
private var tabListHeader: Component = Component.empty()
Expand All @@ -47,6 +48,7 @@ object DebugCommands {
@Subscription(receiveCancelled = true)
fun onActionBar(event: ActionBarReceivedEvent.Pre) {
actionbar = event.coloredText
actionbarComponent = event.component
}

@Subscription(priority = Int.MIN_VALUE)
Expand Down Expand Up @@ -165,6 +167,13 @@ object DebugCommands {
}

then("actionbar") {
then("raw") {
callback {
copyMessage("raw actionbar")
McClient.clipboard = actionbarComponent.toJson(ComponentSerialization.CODEC).toPrettyString()
}
}

callback {
copyMessage("actionbar")
McClient.clipboard = actionbar
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/tech/thatgravyboat/skyblockapi/impl/events/MiscEventHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ object MiscEventHandler {

ClientReceiveMessageEvents.ALLOW_GAME.register(phase) { message, overlay ->
if (overlay) {
!ActionBarReceivedEvent.Pre(message).post()
!ActionBarReceivedEvent.preparePre(message).post()
} else if (ChatReceivedEvent.Pre(message).post()) {
SkyBlockAPI.logger.info("[Cancelled] [CHAT] {}", message.string)
false
Expand All @@ -111,7 +111,7 @@ object MiscEventHandler {
}
ClientReceiveMessageEvents.MODIFY_GAME.register(phase) { message, overlay ->
if (overlay) {
ActionBarReceivedEvent.Post(message).let { event ->
ActionBarReceivedEvent.preparePost(message).let { event ->
event.post()
event.component
}
Expand Down
Loading
Loading