From e31b85097e07f26a558e1005979ebb715fa37df8 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal002@users.noreply.github.com> Date: Wed, 25 Mar 2026 16:34:22 +0100 Subject: [PATCH 1/2] renamed GuiOverlayRenderEvent listener functions --- src/main/java/at/hannibal2/skyhanni/data/title/TitleManager.kt | 2 +- .../at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt | 2 +- .../at/hannibal2/skyhanni/features/combat/ArmorStackDisplay.kt | 2 +- .../hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt | 2 +- .../java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt | 2 +- .../at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt | 2 +- .../skyhanni/features/dungeon/DungeonCreationCooldown.kt | 2 +- .../hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt | 2 +- .../skyhanni/features/dungeon/DungeonMilestonesDisplay.kt | 2 +- .../skyhanni/features/event/anniversary/Year300RaffleEvent.kt | 2 +- .../hannibal2/skyhanni/features/event/carnival/CarnivalGoal.kt | 2 +- .../skyhanni/features/event/hoppity/HoppityCallWarning.kt | 2 +- .../at/hannibal2/skyhanni/features/event/spook/TheGreatSpook.kt | 2 +- .../at/hannibal2/skyhanni/features/event/winter/JyrreTimer.kt | 2 +- .../hannibal2/skyhanni/features/fishing/FishingHookDisplay.kt | 2 +- .../at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt | 2 +- .../skyhanni/features/fishing/trophy/GoldenFishTimer.kt | 2 +- .../hannibal2/skyhanni/features/foraging/TreeProgressDisplay.kt | 2 +- .../skyhanni/features/garden/AtmosphericFilterDisplay.kt | 2 +- .../at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt | 2 +- .../skyhanni/features/garden/GardenNextJacobContest.kt | 2 +- .../at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt | 2 +- .../at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt | 2 +- .../skyhanni/features/garden/farming/CropSpeedMeter.kt | 2 +- .../features/garden/farming/lane/FarmingLaneFeatures.kt | 2 +- .../at/hannibal2/skyhanni/features/garden/pests/SprayDisplay.kt | 2 +- .../hannibal2/skyhanni/features/garden/pests/SprayFeatures.kt | 2 +- .../skyhanni/features/garden/sensitivity/LockMouseLook.kt | 2 +- .../features/garden/visitor/GardenVisitorDropStatistics.kt | 2 +- .../at/hannibal2/skyhanni/features/gifting/UniqueGiftCounter.kt | 2 +- src/main/java/at/hannibal2/skyhanni/features/gui/BeaconPower.kt | 2 +- .../java/at/hannibal2/skyhanni/features/gui/MayorOverlay.kt | 2 +- .../java/at/hannibal2/skyhanni/features/gui/TabWidgetDisplay.kt | 2 +- .../skyhanni/features/gui/customscoreboard/CustomScoreboard.kt | 2 +- .../at/hannibal2/skyhanni/features/gui/quiver/QuiverDisplay.kt | 2 +- .../java/at/hannibal2/skyhanni/features/hunting/LassoDisplay.kt | 2 +- .../features/inventory/chocolatefactory/CFCustomReminder.kt | 2 +- .../skyhanni/features/itemabilities/ChickenHeadTimer.kt | 2 +- .../java/at/hannibal2/skyhanni/features/mining/ColdOverlay.kt | 2 +- .../at/hannibal2/skyhanni/features/mining/FlowstateHelper.kt | 2 +- .../at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt | 2 +- .../skyhanni/features/mining/eventtracker/MiningEventDisplay.kt | 2 +- .../at/hannibal2/skyhanni/features/misc/CollectionTracker.kt | 2 +- .../java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt | 2 +- .../at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt | 2 +- .../java/at/hannibal2/skyhanni/features/misc/InWaterDisplay.kt | 2 +- .../at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt | 2 +- .../at/hannibal2/skyhanni/features/misc/SkyBlockKickDuration.kt | 2 +- .../java/at/hannibal2/skyhanni/features/misc/TimeFeatures.kt | 2 +- .../skyhanni/features/misc/compacttablist/TabListRenderer.kt | 2 +- .../skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt | 2 +- .../skyhanni/features/misc/items/EstimatedItemValue.kt | 2 +- .../hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt | 2 +- .../at/hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt | 2 +- .../skyhanni/features/nether/CrimsonMinibossRespawnTimer.kt | 2 +- .../skyhanni/features/nether/VolcanoExplosivityDisplay.kt | 2 +- .../skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt | 2 +- .../features/nether/ashfang/AshfangNextResetCooldown.kt | 2 +- .../nether/reputationhelper/CrimsonIsleReputationHelper.kt | 2 +- .../features/rift/area/livingcave/LivingMetalSuitProgress.kt | 2 +- .../skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt | 2 +- .../skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt | 2 +- .../skyhanni/features/rift/everywhere/PunchcardHighlight.kt | 2 +- .../at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt | 2 +- .../hannibal2/skyhanni/features/skillprogress/SkillProgress.kt | 2 +- .../skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt | 2 +- .../skyhanni/features/summonings/SummoningMobManager.kt | 2 +- .../at/hannibal2/skyhanni/test/command/track/TrackCommand.kt | 2 +- .../java/at/hannibal2/skyhanni/utils/RenderDisplayHelper.kt | 2 +- 69 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/data/title/TitleManager.kt b/src/main/java/at/hannibal2/skyhanni/data/title/TitleManager.kt index 9dd6f963d97d..b0098620a4c1 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/title/TitleManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/title/TitleManager.kt @@ -339,7 +339,7 @@ object TitleManager { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (InventoryUtils.inInventory()) return val globalTitle = currentTitles[TitleLocation.GLOBAL] ?: return globalTitle.tryRenderGlobalTitle() diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt index 942b44728c66..84ddaa524fa1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt @@ -242,7 +242,7 @@ object MinionCraftHelper { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!SkyBlockUtils.isBingoProfile) return if (!config.minionCraftHelperEnabled) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ArmorStackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ArmorStackDisplay.kt index a47313ffa7aa..1bc5e0f59636 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/ArmorStackDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ArmorStackDisplay.kt @@ -34,7 +34,7 @@ object ArmorStackDisplay { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.position.renderString(display, posLabel = "Armor Stack Display") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt index 65786ab024d0..97501bb71484 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/BroodmotherFeatures.kt @@ -160,7 +160,7 @@ object BroodmotherFeatures { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isCountdownEnabled()) return if (display.isEmpty()) return if (broodmotherSpawnTime.isInPast() && !broodmotherSpawnTime.isFarPast()) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt index c1db0c68b164..8c00b97a316d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt @@ -60,7 +60,7 @@ object FlareDisplay { } @HandleEvent(onlyOnSkyblock = true) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!enabled) return if (config.flashScreen && activeWarning) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt index 3f60b5af35ce..a03bd4ffc987 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt @@ -148,7 +148,7 @@ object DungeonCopilot { private fun isEnabled(): Boolean = DungeonApi.inDungeon() && config.enabled @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.pos.renderString(nextStep, posLabel = "Dungeon Copilot") diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCreationCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCreationCooldown.kt index 16a176cd68e9..7aa455a50cae 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCreationCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCreationCooldown.kt @@ -62,7 +62,7 @@ object DungeonCreationCooldown { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (!cooldown.isInFuture()) return val display = Renderable.text("§eDungeon Creation Cooldown: §b${cooldown.timeUntil().format()}") diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt index 7af8c4339cb0..ada0a8c12fc1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt @@ -89,7 +89,7 @@ object DungeonDeathCounter { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.deathCounterPos.renderString( diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt index 478da4bbfe08..3d333c57c265 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt @@ -78,7 +78,7 @@ object DungeonMilestonesDisplay { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.showMileStonesDisplayPos.renderString( diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/Year300RaffleEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/Year300RaffleEvent.kt index d6c9174f3407..0f947a051599 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/Year300RaffleEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/Year300RaffleEvent.kt @@ -46,7 +46,7 @@ object Year300RaffleEvent { fun isEnabled() = SkyBlockUtils.inSkyBlock && config.enableActiveTimer && SkyBlockTime(301).toTimeMark().isInPast() @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { config.activeTimerPosition.renderRenderable( overlay ?: return, posLabel = "300þ Anniversary Active Timer", diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalGoal.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalGoal.kt index c5a90f2c3035..4b967caeec5a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalGoal.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalGoal.kt @@ -196,7 +196,7 @@ enum class CarnivalGoal( private var display = emptyList() @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (dirty) { display = buildList { diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCallWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCallWarning.kt index 867e0313b3ca..61a5cb62a892 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCallWarning.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCallWarning.kt @@ -87,7 +87,7 @@ object HoppityCallWarning { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled() || !activeWarning) return // Calculate a fluctuating alpha value based on the sine of time, for a smooth oscillation val randomizationAlphaDouble = ((2 + sin(Instant.now().toEpochMilli().toDouble() / 1000)) * 255 / 4) diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/spook/TheGreatSpook.kt b/src/main/java/at/hannibal2/skyhanni/features/event/spook/TheGreatSpook.kt index c823cbb42301..2be39b7d2ad5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/spook/TheGreatSpook.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/spook/TheGreatSpook.kt @@ -146,7 +146,7 @@ object TheGreatSpook { } @HandleEvent(onlyOnSkyblock = true) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isGreatSpookActive) return if (config.primalFearTimer) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/winter/JyrreTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/event/winter/JyrreTimer.kt index 295c98c0bfd5..c5e70a60ce01 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/winter/JyrreTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/winter/JyrreTimer.kt @@ -53,7 +53,7 @@ object JyrreTimer { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return display?.let { config.pos.renderRenderable(it, posLabel = "Refined Jyrre Timer") diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingHookDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingHookDisplay.kt index 34ae85fb00be..c1929adbf7d7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingHookDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingHookDisplay.kt @@ -69,7 +69,7 @@ object FishingHookDisplay { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return isRendering = false diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt index 8ca9d6300582..f520fff542e2 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt @@ -90,7 +90,7 @@ object SharkFishCounter { private fun isWaterFishingRod() = FishingApi.isFishing() && !FishingApi.holdingLavaRod @HandleEvent(onlyOnSkyblock = true) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!SkyHanniMod.feature.fishing.sharkFishCounter) return if (!hasWaterRodInHand) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt index 5f89baf84c8b..b168f91781d8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt @@ -197,7 +197,7 @@ object GoldenFishTimer { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isActive()) return display?.let { config.position.renderRenderable(it, posLabel = "Golden Fish Timer") diff --git a/src/main/java/at/hannibal2/skyhanni/features/foraging/TreeProgressDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/foraging/TreeProgressDisplay.kt index 50b6c26c8193..614e146dea97 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/foraging/TreeProgressDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/foraging/TreeProgressDisplay.kt @@ -25,7 +25,7 @@ object TreeProgressDisplay { private var display: Renderable? = null @HandleEvent(onlyOnIsland = IslandType.GALATEA) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.enabled) return display?.let { config.position.renderRenderable(it, posLabel = "Tree Progress") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/AtmosphericFilterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/AtmosphericFilterDisplay.kt index 069c2fa67557..ece224b68eed 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/AtmosphericFilterDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/AtmosphericFilterDisplay.kt @@ -26,7 +26,7 @@ object AtmosphericFilterDisplay { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (GardenApi.inGarden()) { config.position.renderString(display, posLabel = "Atmospheric Filter Perk Display") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt index ec801bdc63e2..4baaccfe5b99 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt @@ -226,7 +226,7 @@ object GardenLevelDisplay { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (GardenApi.hideExtraGuis()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt index be8e1282e003..6f46d7851148 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt @@ -445,7 +445,7 @@ object GardenNextJacobContest { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return val display = display ?: simpleDisplay ?: return config.position.renderRenderable(display, posLabel = "Next Jacob Contest") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt index 33cddc029aa1..b8b58ea82486 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt @@ -146,7 +146,7 @@ object GardenOptimalSpeed { } @HandleEvent(onlyOnIsland = IslandType.GARDEN) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { val speed = optimalSpeed ?: return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt index 353574e65b86..96ab7a998aeb 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt @@ -23,7 +23,7 @@ object GardenYawAndPitch { private var lastPitch = 0f @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!SkyBlockUtils.onHypixel) return if (!isEnabled()) return if (GardenApi.hideExtraGuis()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt index 3d9f3ddf9088..77630ac0807c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt @@ -119,7 +119,7 @@ object CropSpeedMeter { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return GardenApi.config.cropSpeedMeterPos.renderStrings(display, posLabel = "Crop Speed Meter") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneFeatures.kt index 675f0225bf1f..d1356e7b6a46 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneFeatures.kt @@ -212,7 +212,7 @@ object FarmingLaneFeatures { private fun LorenzVec.capAtBuildHeight(): LorenzVec = if (y > 76) copy(y = 76.0) else this @HandleEvent(onlyOnIsland = IslandType.GARDEN) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.distanceDisplay) return config.distanceDisplayPosition.renderStrings(display, posLabel = "Lane Display") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayDisplay.kt index 74f928519b9b..1201a72c9822 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayDisplay.kt @@ -52,7 +52,7 @@ object SprayDisplay { } @HandleEvent(onlyOnIsland = IslandType.GARDEN) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.displayEnabled) return val display = display ?: return config.displayPosition.renderString(display, posLabel = "Active Plot Spray Display") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayFeatures.kt index f06304c0869f..407ad7e5d726 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/SprayFeatures.kt @@ -58,7 +58,7 @@ object SprayFeatures { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return val display = display ?: return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/sensitivity/LockMouseLook.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/sensitivity/LockMouseLook.kt index 6301ed967dd7..d3686550fe17 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/sensitivity/LockMouseLook.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/sensitivity/LockMouseLook.kt @@ -63,7 +63,7 @@ object LockMouseLook { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isActive) return config.lockedMouseDisplay.renderString("§eMouse Locked", posLabel = "Mouse Locked") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt index 18680a86c36f..f8664de7fcf3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt @@ -290,7 +290,7 @@ object GardenVisitorDropStatistics { } @HandleEvent(onlyOnIsland = IslandType.GARDEN) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.enabled.get()) return if (GardenApi.hideExtraGuis()) return if (config.onlyOnBarn.get() && !GardenApi.onBarnPlot) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/gifting/UniqueGiftCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/gifting/UniqueGiftCounter.kt index 6a2b7141f79b..d474d9688908 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gifting/UniqueGiftCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gifting/UniqueGiftCounter.kt @@ -65,7 +65,7 @@ object UniqueGiftCounter { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.position.renderString( diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/BeaconPower.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/BeaconPower.kt index c78ff73b3bd1..eb7c8f07b00d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/BeaconPower.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/BeaconPower.kt @@ -102,7 +102,7 @@ object BeaconPower { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.beaconPowerPosition.renderRenderable(Renderable.text(display), posLabel = "Beacon Power") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/MayorOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/MayorOverlay.kt index d2a82cf9e8cb..ef0681bc0bd1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/MayorOverlay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/MayorOverlay.kt @@ -86,7 +86,7 @@ enum class MayorOverlay(private val configLine: String, private val createLines: } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return display?.let { config.position.renderRenderable(it, posLabel = "Mayor Overlay") } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/TabWidgetDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/TabWidgetDisplay.kt index dd57256cded9..9c27192ee4b7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/TabWidgetDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/TabWidgetDisplay.kt @@ -73,7 +73,7 @@ enum class TabWidgetDisplay( private fun isEnabled() = SkyBlockUtils.inSkyBlock && config.enabled @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (config.displayPositions.isEmpty()) return config.display.get().forEach { widget -> diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt index 1120c991d8cd..0d69421831fe 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt @@ -65,7 +65,7 @@ object CustomScoreboard { private var lastLines: List = emptyList() @HandleEvent(onlyOnSkyblock = true) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return display ?: return diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/quiver/QuiverDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/quiver/QuiverDisplay.kt index 80eec69dc862..288293765cac 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/quiver/QuiverDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/quiver/QuiverDisplay.kt @@ -73,7 +73,7 @@ object QuiverDisplay { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (display.isEmpty()) updateDisplay() val whenToShow = config.whenToShow.get() diff --git a/src/main/java/at/hannibal2/skyhanni/features/hunting/LassoDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/hunting/LassoDisplay.kt index a441fd08fd61..343c45e8751e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/hunting/LassoDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/hunting/LassoDisplay.kt @@ -27,7 +27,7 @@ object LassoDisplay { private var display: Renderable? = null @HandleEvent(onlyOnSkyblock = true) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.lassoDisplay) return display?.let { config.lassoDisplayPosition.renderRenderable(it, posLabel = "Lasso Display") diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/CFCustomReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/CFCustomReminder.kt index 813079c45015..ea9d7669f529 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/CFCustomReminder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/CFCustomReminder.kt @@ -141,7 +141,7 @@ object CFCustomReminder { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (!configReminder.always) return if (Minecraft.getInstance().screen is ContainerScreen) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/ChickenHeadTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/ChickenHeadTimer.kt index f0b08bef3588..709b7bd4a0b3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/ChickenHeadTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/ChickenHeadTimer.kt @@ -52,7 +52,7 @@ object ChickenHeadTimer { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (!hasChickenHead) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/ColdOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/ColdOverlay.kt index 5af5a86b1e7c..f755345620b5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/ColdOverlay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/ColdOverlay.kt @@ -25,7 +25,7 @@ object ColdOverlay { private val textureLocation = createResourceLocation("minecraft", "textures/misc/powder_snow_outline.png") @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return val alpha = getColdAlpha() if (alpha == 0f) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/FlowstateHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/FlowstateHelper.kt index 2e2068dbf4fe..17cea294d8ba 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/FlowstateHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/FlowstateHelper.kt @@ -121,7 +121,7 @@ object FlowstateHelper { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!IslandTypeTags.CUSTOM_MINING.inAny() || !config.enabled) return if (flowstateCache == null && !streakEndTimer.isInFuture()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt index 60306ec4e0b0..96ca76478c28 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt @@ -166,7 +166,7 @@ object KingTalismanHelper { private fun getCurrentKing() = getKingTimes().sortedDesc().firstNotNullOf { it.key } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.position.renderStrings(display, posLabel = "King Talisman Helper") diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventDisplay.kt index 40771a868639..1a9522c1abd9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventDisplay.kt @@ -34,7 +34,7 @@ object MiningEventDisplay { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!shouldDisplay()) return config.position.renderRenderables(display, posLabel = "Mining Event Tracker") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt index b7179051b9ce..5b34b280ff2f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt @@ -244,7 +244,7 @@ object CollectionTracker { } @HandleEvent(onlyOnSkyblock = true) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { display?.let { SkyHanniMod.feature.misc.collectionCounterPos.renderRenderable(it, posLabel = "Collection Tracker") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt index ee18e7ceef76..7a39b005f140 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt @@ -37,7 +37,7 @@ object CustomTextBox { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (config.onlyInGui) return if (!isEnabled()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt index e1ad1c6341b6..9121364eec57 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt @@ -79,7 +79,7 @@ object InGameDateDisplay { private fun String.removeOrdinal() = replace("nd", "").replace("rd", "").replace("st", "").replace("th", "") @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.position.renderString(display, posLabel = "In-game Date Display") diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/InWaterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/InWaterDisplay.kt index 7a9ba15d1639..3481008cb8cb 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/InWaterDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/InWaterDisplay.kt @@ -14,7 +14,7 @@ object InWaterDisplay { private val config get() = SkyHanniMod.feature.misc.stranded @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return val text = "§7In Water: " + if (MinecraftCompat.localPlayer.isInWater) "§aTrue" else "§cFalse" diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt index 425bdc915d99..3a324a89a081 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt @@ -49,7 +49,7 @@ object MovementSpeedDisplay { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.playerMovementSpeedPos.renderString(display, posLabel = "Movement Speed") diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/SkyBlockKickDuration.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/SkyBlockKickDuration.kt index 79d106a5be87..1c3df1663215 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/SkyBlockKickDuration.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/SkyBlockKickDuration.kt @@ -77,7 +77,7 @@ object SkyBlockKickDuration { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (!SkyBlockUtils.onHypixel) return if (!showTime) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/TimeFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/TimeFeatures.kt index 0bb10b6acac9..d489d37aae54 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/TimeFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/TimeFeatures.kt @@ -28,7 +28,7 @@ object TimeFeatures { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { @Suppress("InSkyBlockEarlyReturn") if (!SkyBlockUtils.inSkyBlock && !OutsideSBFeature.REAL_TIME.isSelected()) return if (config.realTime) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListRenderer.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListRenderer.kt index 1a7722d3b67a..9d0831032c37 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListRenderer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListRenderer.kt @@ -45,7 +45,7 @@ object TabListRenderer { private var isTabToggled = false @HandleEvent(onlyOnSkyblock = true, priority = HandleEvent.LOWEST) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (GlobalRender.renderDisabled || !config.enabled.get() || !config.toggleTab) return if (Minecraft.getInstance().screen != null) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt index 1997b9683331..ea80c70eb945 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/effects/NonGodPotEffectDisplay.kt @@ -160,7 +160,7 @@ object NonGodPotEffectDisplay { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled() || !config.displayEnabled) return if (RiftApi.inRift()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt index e26a9f0a3c94..9e470e9dfa0c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt @@ -83,7 +83,7 @@ object EstimatedItemValue { private var renderedItems = 0 @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { renderedItems = 0 } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt index 2f8efd859b0a..d514afd62538 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt @@ -113,7 +113,7 @@ object LimboTimeTracker { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (!inLimbo) return if (SkyBlockUtils.inSkyBlock) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt index 01604eeb8e42..0bb789957a0a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt @@ -135,7 +135,7 @@ object TrevorTracker { } @HandleEvent(onlyOnIsland = IslandType.THE_FARMING_ISLANDS) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!shouldDisplay()) return config.position.renderRenderables(display, posLabel = "Trevor Tracker") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/CrimsonMinibossRespawnTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/CrimsonMinibossRespawnTimer.kt index 9818e69937b3..8df641b7d081 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/CrimsonMinibossRespawnTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/CrimsonMinibossRespawnTimer.kt @@ -82,7 +82,7 @@ object CrimsonMinibossRespawnTimer { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return val renderable = display ?: drawDisplay() config.minibossTimerPosition.renderRenderable(renderable, posLabel = "Miniboss Timer") diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/VolcanoExplosivityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/VolcanoExplosivityDisplay.kt index 9d9118541550..a24cb3e99dec 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/VolcanoExplosivityDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/VolcanoExplosivityDisplay.kt @@ -39,7 +39,7 @@ object VolcanoExplosivityDisplay { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.positionVolcano.renderRenderable(Renderable.text(display), posLabel = "Volcano Explosivity") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt index 9e49fc5d6d38..d91ce8ea073d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt @@ -32,7 +32,7 @@ object AshfangFreezeCooldown { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (!isCurrentlyFrozen()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt index d966417fa018..1fc6f92bc0bd 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt @@ -16,7 +16,7 @@ object AshfangNextResetCooldown { private val ashfangResetTime = 46.1.seconds @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (AshfangManager.lastSpawnTime.isFarPast()) return val nextSpawn = AshfangManager.lastSpawnTime + ashfangResetTime diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt index fddf1a56609c..abb3e21498ce 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt @@ -118,7 +118,7 @@ object CrimsonIsleReputationHelper { } @HandleEvent(priority = HandleEvent.LOWEST, onlyOnIsland = IslandType.CRIMSON_ISLE) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.enabled.get()) return if (config.useHotkey && !isHotkeyHeld()) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt index cc5271e2f394..75d8da4ee713 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt @@ -25,7 +25,7 @@ object LivingMetalSuitProgress { private var progressMap = mapOf() @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.position.renderRenderables( display, diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt index 9770d7577d1c..961888aba792 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt @@ -87,7 +87,7 @@ object DanceRoomHelper { } @HandleEvent(onlyOnIsland = IslandType.THE_RIFT) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.enabled || !inRoom) return config.position.renderRenderables( display, diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt index 9257e646582f..835a6a951e1f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt @@ -43,7 +43,7 @@ object CruxTalismanDisplay { private var percentValue = 0.0 @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.position.renderRenderables( display, diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/PunchcardHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/PunchcardHighlight.kt index 8067018d79fe..64e4e8834b86 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/PunchcardHighlight.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/PunchcardHighlight.kt @@ -214,7 +214,7 @@ object PunchcardHighlight { } @HandleEvent(onlyOnIsland = IslandType.THE_RIFT) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.gui.get()) return config.position.renderRenderable(display, "Punchcard Overlay") diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt index 2fc3c1a36cef..5e91bb108158 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt @@ -126,7 +126,7 @@ object RiftTimer { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (RiftApi.inMirrorVerse) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt index b8529262ef61..56f93c88f657 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt @@ -60,7 +60,7 @@ object SkillProgress { var hideInActionBar = listOf() @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isDisplayEnabled()) return if (display.isEmpty()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt index 6bf23b888bfe..abbf18fbbc24 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt @@ -241,7 +241,7 @@ object BlazeSlayerDaggerHelper { } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (textTop == "") return diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt index 07b651a7136c..e8fdcf9fb7e0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt @@ -126,7 +126,7 @@ object SummoningMobManager { } @HandleEvent(onlyOnSkyblock = true) - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.summoningMobDisplay) return if (mobs.isEmpty()) return diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/track/TrackCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/track/TrackCommand.kt index b2329c5cbf0a..8d45981b6da7 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/command/track/TrackCommand.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/command/track/TrackCommand.kt @@ -176,7 +176,7 @@ abstract class TrackCommand( } } - open fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + open fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (cutOffTime.isInPast()) return config.position.renderRenderables(display, posLabel = "Track $commonName log") } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderDisplayHelper.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderDisplayHelper.kt index 7bda2ac587fb..24c259547cdd 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/RenderDisplayHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderDisplayHelper.kt @@ -59,7 +59,7 @@ class RenderDisplayHelper( } @HandleEvent - fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { val isInOwnInventory = Minecraft.getInstance().screen is InventoryScreen for (display in currentlyVisibleDisplays) { if (display.outsideInventory && !display.renderIn(isInOwnInventory)) { From d9522612f502b3eb08014aaf85e78fe84e337ec9 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal002@users.noreply.github.com> Date: Wed, 25 Mar 2026 18:41:01 +0100 Subject: [PATCH 2/2] fix build --- .../skyhanni/test/command/track/TrackParticlesCommand.kt | 2 +- .../hannibal2/skyhanni/test/command/track/TrackSoundsCommand.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/track/TrackParticlesCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/track/TrackParticlesCommand.kt index 20c57d643e17..d7bc2228d186 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/command/track/TrackParticlesCommand.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/command/track/TrackParticlesCommand.kt @@ -48,7 +48,7 @@ object TrackParticlesCommand : TrackCommand(co override fun onRenderWorld(event: SkyHanniRenderWorldEvent) = super.onRenderWorld(event) @HandleEvent - override fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) = super.onRenderOverlay(event) + override fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) = super.onGuiRenderOverlay(event) @HandleEvent override fun onTick() = super.onTick() diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/track/TrackSoundsCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/track/TrackSoundsCommand.kt index 991db1f51e15..c2d517e6e43b 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/command/track/TrackSoundsCommand.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/command/track/TrackSoundsCommand.kt @@ -65,7 +65,7 @@ object TrackSoundsCommand : TrackCommand( override fun onRenderWorld(event: SkyHanniRenderWorldEvent) = super.onRenderWorld(event) @HandleEvent - override fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) = super.onRenderOverlay(event) + override fun onGuiRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) = super.onGuiRenderOverlay(event) @HandleEvent override fun onTick() = super.onTick()