diff options
Diffstat (limited to 'src/main/java')
73 files changed, 92 insertions, 99 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt index 93ba6f136..3e128292e 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt @@ -110,7 +110,7 @@ object GetFromSackAPI { } @SubscribeEvent - fun onTooltipRender(event: LorenzToolTipEvent) { + fun onTooltip(event: LorenzToolTipEvent) { if (!LorenzUtils.inSkyBlock) return val list = inventoryMap[event.slot.slotIndex] ?: return event.toolTip.let { tip -> diff --git a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt index bc8522dd6..02d0e9f89 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt @@ -104,7 +104,7 @@ object SkillAPI { } @SubscribeEvent - fun onActionBar(event: ActionBarUpdateEvent) { + fun onActionBarUpdate(event: ActionBarUpdateEvent) { val actionBar = event.actionBar.removeColor() val components = SPACE_SPLITTER.splitToList(actionBar) for (component in components) { diff --git a/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt index 06de4bcf3..65af5b8bd 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt @@ -145,7 +145,7 @@ object BitsAPI { } @SubscribeEvent - fun onInventoryFullyLoaded(event: InventoryFullyOpenedEvent) { + fun onInventoryOpen(event: InventoryFullyOpenedEvent) { if (!isEnabled()) return val stacks = event.inventoryItems diff --git a/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt index e584efd80..0a0a6b819 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt @@ -259,7 +259,7 @@ object MaxwellAPI { // Load powers from repo @SubscribeEvent - fun onRepoLoad(event: RepositoryReloadEvent) { + fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<MaxwellPowersJson>("MaxwellPowers") powers = data.powers } diff --git a/src/main/java/at/hannibal2/skyhanni/events/ProfileApiDataLoadedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ProfileApiDataLoadedEvent.kt deleted file mode 100644 index 12640898f..000000000 --- a/src/main/java/at/hannibal2/skyhanni/events/ProfileApiDataLoadedEvent.kt +++ /dev/null @@ -1,5 +0,0 @@ -package at.hannibal2.skyhanni.events - -import com.google.gson.JsonObject - -class ProfileApiDataLoadedEvent(val profileData: JsonObject) : LorenzEvent()
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardTips.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardTips.kt index f222040df..83078c989 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardTips.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardTips.kt @@ -36,7 +36,7 @@ class BingoCardTips { ) @SubscribeEvent - fun onItemTooltipLow(event: LorenzToolTipEvent) { + fun onTooltip(event: LorenzToolTipEvent) { if (!isEnabled()) return if (!inventoryPattern.matches(InventoryUtils.openInventoryName())) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt index fa7c55b51..087769645 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt @@ -22,7 +22,7 @@ class PlayerChatModifier { } @SubscribeEvent - fun onChatReceive(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { val foundCommands = mutableListOf<IChatComponent>() val message = event.chatComponent diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt index 2e9259f0a..01712fec4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt @@ -70,7 +70,7 @@ object BestiaryData { } @SubscribeEvent - fun onRender(event: GuiContainerEvent.BackgroundDrawnEvent) { + fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) { if (!isEnabled()) return if (inInventory) { for (slot in InventoryUtils.getItemsInOpenChest()) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt index 9ca631d39..4d893ab9a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt @@ -126,7 +126,7 @@ object EnderNodeTracker { } @SubscribeEvent - fun onInventoryUpdate(event: OwnInventoryItemUpdateEvent) { + fun onOwnInventoryItemUpdate(event: OwnInventoryItemUpdateEvent) { if (!isEnabled()) return if (!ProfileStorageData.loaded) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/SpawnTimers.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/SpawnTimers.kt index ee8f2b8f0..d84f4eeaa 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/SpawnTimers.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/SpawnTimers.kt @@ -63,7 +63,7 @@ class SpawnTimers { } @SubscribeEvent - fun onChatReceived(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { if (!isEnabled()) return val message = event.message.removeColor().lowercase() diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt index e58d6c275..5196b08db 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt @@ -64,7 +64,7 @@ object PartyCommands { } @SubscribeEvent - fun onSendCommand(event: MessageSendToServerEvent) { + fun onMessageSendToServer(event: MessageSendToServerEvent) { if (!config.partyKickReason) { return } diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt index 5584ee216..ea94117af 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt @@ -173,7 +173,7 @@ class CroesusChestTracker { } @SubscribeEvent - fun onSlotClicked(event: GuiContainerEvent.SlotClickEvent) { + fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.showUsedKismets) return if (chestInventory != null && event.slotId == kismetSlotId) { @@ -199,7 +199,7 @@ class CroesusChestTracker { } @SubscribeEvent - fun onRenderItemTipAmount(event: RenderItemTipEvent) { + fun onRenderItemTip(event: RenderItemTipEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.kismetStackSize) return if (chestInventory == null) return 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 5f78d5886..57afa54cb 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt @@ -51,7 +51,7 @@ class DungeonDeathCounter { deathPatternsList.any { it.matches(message) } @SubscribeEvent(receiveCanceled = true) - fun onChatPacket(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { if (!isEnabled()) return if (isDeathMessage(event.message)) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt index 1614ad8ab..b561f52c6 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt @@ -289,7 +289,7 @@ class DungeonFinderFeatures { } @SubscribeEvent - fun onToolTipRender(event: LorenzToolTipEvent) { + fun onTooltip(event: LorenzToolTipEvent) { if (!isEnabled()) return if (!inInventory) return val toolTip = toolTipMap[event.slot.slotIndex] diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt index d845edbbf..82002040c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt @@ -166,7 +166,7 @@ class DungeonHideItems { } @SubscribeEvent - fun onReceivePacket(event: ReceiveParticleEvent) { + fun onReceiveParticle(event: ReceiveParticleEvent) { if (!LorenzUtils.inDungeons) return if (!config.hideSuperboomTNT && !config.hideReviveStone) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt index 904391bab..020831405 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt @@ -72,7 +72,7 @@ object UniqueGiftingOpportunitiesFeatures { } @SubscribeEvent - fun onEntityJoinWorldEvent(event: EntityJoinWorldEvent) { + fun onEntityJoinWorld(event: EntityJoinWorldEvent) { playerColor(event) val entity = event.entity as? EntityArmorStand ?: return analyzeArmorStand(entity) 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 8e22d2a76..a40dacca6 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 @@ -41,7 +41,7 @@ object Year300RaffleEvent { Instant.now().isBefore(SkyBlockTime(301).toInstant()) @SubscribeEvent - fun onRender(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { config.activeTimerPosition.renderSingleLineWithItems( overlay ?: return, posLabel = "300þ Anniversary Active Timer" diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt index 7b3e0003b..bb5c1271b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt @@ -44,7 +44,7 @@ class BurrowWarpHelper { } @SubscribeEvent - fun onStatusBar(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { if (!LorenzUtils.inSkyBlock) return if (event.message == "§cYou haven't unlocked this fast travel destination!") { diff --git a/src/main/java/at/hannibal2/skyhanni/features/fame/AccountUpgradeReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/fame/AccountUpgradeReminder.kt index a383d8683..4f1e3b5ea 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fame/AccountUpgradeReminder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fame/AccountUpgradeReminder.kt @@ -61,7 +61,7 @@ class AccountUpgradeReminder { } @SubscribeEvent - fun onInventoryLoad(event: InventoryFullyOpenedEvent) { + fun onInventoryOpen(event: InventoryFullyOpenedEvent) { if (!LorenzUtils.inSkyBlock) return inInventory = event.inventoryName == "Community Shop" } @@ -84,7 +84,7 @@ class AccountUpgradeReminder { } @SubscribeEvent - fun onUpgradeStarted(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { if (claimedRegex.matches(event.message)) { clearUpgrade() } else { diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt index ef82d2d06..3df18c3e6 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt @@ -50,7 +50,7 @@ class TotemOfCorruption { ) @SubscribeEvent - fun onRender(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isOverlayEnabled() || display.isEmpty()) return config.position.renderStrings(display, posLabel = "Totem of Corruption") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt index c8880bdc2..0f4721a44 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishMessages.kt @@ -26,7 +26,7 @@ class TrophyFishMessages { ) @SubscribeEvent - fun onStatusBar(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { if (!LorenzUtils.inSkyBlock) return var displayName = "" var displayRarity = "" diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt index 1fbdbaea4..db00be611 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt @@ -183,7 +183,7 @@ object GardenAPI { private var lastLocation: LorenzVec? = null @SubscribeEvent - fun onBlockBreak(event: BlockClickEvent) { + fun onBlockClick(event: BlockClickEvent) { if (!inGarden()) return val blockState = event.getBlockState 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 9e7a2b6ec..9fba9db86 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt @@ -499,7 +499,7 @@ object GardenNextJacobContest { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!config.display) return if (!inCalendar) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/SensitivityReducer.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/SensitivityReducer.kt index 0cb3291b2..4bb5d7937 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/SensitivityReducer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/SensitivityReducer.kt @@ -77,7 +77,7 @@ object SensitivityReducer { } @SubscribeEvent - fun onConfigInit(event: ConfigLoadEvent) { + fun onConfigLoad(event: ConfigLoadEvent) { config.reducingFactor.afterChange { reloadSensitivity() } @@ -169,7 +169,7 @@ object SensitivityReducer { } @SubscribeEvent - fun onLogin(event: HypixelJoinEvent) { + fun onHypixelJoin(event: HypixelJoinEvent) { val divisor = config.reducingFactor.get() val expectedLoweredSensitivity = doTheMath(gameSettings.mouseSensitivity, true) if (abs(storage.savedMouseloweredSensitivity - expectedLoweredSensitivity) <= 0.0001) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt index b663690f0..e47100cb4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt @@ -26,7 +26,7 @@ class JacobContestFFNeededDisplay { private val cache = mutableMapOf<ItemStack, List<List<Any>>>() @SubscribeEvent - fun onTooltip(event: RenderItemTooltipEvent) { + fun onRenderItemTooltip(event: RenderItemTooltipEvent) { if (!isEnabled()) return if (!InventoryUtils.openInventoryName().contains("Your Contests")) return @@ -113,7 +113,7 @@ class JacobContestFFNeededDisplay { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!isEnabled()) return if (!FarmingContestAPI.inInventory) return if (System.currentTimeMillis() > lastToolTipTime + 200) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt index edc1300df..99be1d561 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestStatsSummary.kt @@ -28,7 +28,7 @@ class JacobContestStatsSummary { } @SubscribeEvent - fun onFarmingContestEvent(event: FarmingContestEvent) { + fun onFarmingContest(event: FarmingContestEvent) { if (!isEnabled()) return when (event.phase) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt index c493bd6ca..7510bc1e4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt @@ -29,7 +29,7 @@ class JacobContestTimeNeeded { private var currentBracket = ContestBracket.GOLD @SubscribeEvent(priority = EventPriority.LOW) - fun onLateInventoryOpen(event: InventoryUpdatedEvent) { + fun onInventoryUpdated(event: InventoryUpdatedEvent) { if (FarmingContestAPI.inInventory) { update() } @@ -185,7 +185,7 @@ class JacobContestTimeNeeded { } else getLatestBlocksPerSecond() @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!isEnabled()) return if (!FarmingContestAPI.inInventory) return config.jacobContextTimesPos.renderStringsAndItems(display, posLabel = "Jacob Contest Time Needed") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt index 80f068c2a..374dece04 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt @@ -53,7 +53,7 @@ class JacobFarmingContestsInventory { } @SubscribeEvent - fun onLateInventoryOpen(event: InventoryUpdatedEvent) { + fun onInventoryUpdated(event: InventoryUpdatedEvent) { if (!LorenzUtils.inSkyBlock) return if (event.inventoryName != "Your Contests") return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt index 27518b7d3..342cfd8ea 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt @@ -29,7 +29,7 @@ class AnitaExtraFarmingFortune { private var levelPrice = mapOf<Int, Price>() @SubscribeEvent - fun onItemTooltip(event: LorenzToolTipEvent) { + fun onTooltip(event: LorenzToolTipEvent) { if (!config.extraFarmingFortune) return if (InventoryUtils.openInventoryName() != "Anita") return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneInventory.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneInventory.kt index b6ff2169b..414b18462 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneInventory.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneInventory.kt @@ -53,7 +53,7 @@ class GardenCropMilestoneInventory { } @SubscribeEvent - fun onItemTooltip(event: LorenzToolTipEvent) { + fun onTooltip(event: LorenzToolTipEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.tooltipTweak.cropMilestoneTotalProgress) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotIcon.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotIcon.kt index 32a75c425..45a55824e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotIcon.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/plots/GardenPlotIcon.kt @@ -84,7 +84,7 @@ object GardenPlotIcon { } @SubscribeEvent(priority = EventPriority.HIGH) - fun onStackClick(event: GuiContainerEvent.SlotClickEvent) { + fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) { if (!isEnabled()) return lastClickedSlotId = event.slotId if (event.slotId == 53) { 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 a6354084a..989ba8014 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 @@ -44,14 +44,14 @@ class SprayDisplay { } @SubscribeEvent - fun onJoin(event: IslandChangeEvent) { + fun onIslandChange(event: IslandChangeEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.expiryNotification || event.newIsland != IslandType.GARDEN) return sendExpiredPlotsToChat(true) } @SubscribeEvent - fun onRenderOverlay(ignored: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!GardenAPI.inGarden() || !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/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt index 53e164ccc..8d22a6c4c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt @@ -454,7 +454,7 @@ object GardenVisitorFeatures { } @SubscribeEvent - fun onChatMessage(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { if (config.hypixelArrivedMessage && visitorArrivePattern.matcher(event.message).matches()) { event.blockedReason = "new_visitor_arrived" } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt index 8693053ab..58aada3ff 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorListener.kt @@ -133,7 +133,7 @@ class VisitorListener { } @SubscribeEvent(priority = EventPriority.HIGH) - fun onStackClick(event: GuiContainerEvent.SlotClickEvent) { + fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) { if (!VisitorAPI.inInventory) return if (event.clickType != 0) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt index a1daa8ef9..381f46dca 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ChestValue.kt @@ -86,7 +86,7 @@ class ChestValue { } @SubscribeEvent(priority = EventPriority.LOW) - fun onDrawBackground(event: GuiContainerEvent.BackgroundDrawnEvent) { + fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) { if (!isEnabled()) return if (!config.enableHighlight) return if (inInventory) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/DojoRankDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/DojoRankDisplay.kt index 6b4e8a064..01d47e308 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/DojoRankDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/DojoRankDisplay.kt @@ -33,7 +33,7 @@ class DojoRankDisplay { private var belts = mapOf<String, Int>() @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!isEnabled()) return config.dojoRankDisplayPosition.renderStrings(display, posLabel = "Dojo Rank Display") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt index 338a873fc..ff239fc66 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HarpFeatures.kt @@ -128,7 +128,7 @@ object HarpFeatures { } @SubscribeEvent - fun onInventoryCloseEvent(event: InventoryCloseEvent) { + fun onInventoryClose(event: InventoryCloseEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.guiScale) return unSetGUIScale() diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HighlightBonzoMasks.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HighlightBonzoMasks.kt index ff9a33587..23702719f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HighlightBonzoMasks.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HighlightBonzoMasks.kt @@ -64,7 +64,7 @@ class HighlightBonzoMasks { } @SubscribeEvent - fun onChatReceived(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { val message = event.message.removeColor() if (bonzoMaskMessage.matches(message)) { maskTimers["BONZO_MASK"] = CooldownTimer(TimeSource.Monotonic.markNow(), bonzoMaskCooldown) diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/MaxPurseItems.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/MaxPurseItems.kt index 53b74c7f7..fdeccd4ba 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/MaxPurseItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/MaxPurseItems.kt @@ -63,7 +63,7 @@ class MaxPurseItems { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!isEnabled()) return if (!BazaarApi.inBazaarInventory) return // I would use BazaarAPI for price info, but as soon as NEU's data goes out of date, it will be wrong diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/QuiverNotification.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/QuiverNotification.kt index 3bcd6e43b..9063fcb0d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/QuiverNotification.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/QuiverNotification.kt @@ -16,7 +16,7 @@ object QuiverNotification { ) @SubscribeEvent - fun onChatMessage(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { if (!SkyHanniMod.configManager.features.inventory.quiverAlert) return quiverChatPattern.matchMatcher(event.message) { TitleManager.sendTitle("§c${group("arrowsLeft")} arrows left!", 3.seconds, 3.6, 7f) diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt index 95bcbbccc..9118db86e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt @@ -45,7 +45,7 @@ object SackDisplay { } @SubscribeEvent - fun onRender(event: GuiContainerEvent.BackgroundDrawnEvent) { + fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) { if (!SackAPI.inSackInventory) return if (!config.highlightFull) return for (slot in InventoryUtils.getItemsInOpenChest()) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickNPCSell.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickNPCSell.kt index b1a95c313..b3921721e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickNPCSell.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ShiftClickNPCSell.kt @@ -27,7 +27,7 @@ object ShiftClickNPCSell { fun isEnabled() = LorenzUtils.inSkyBlock && config @SubscribeEvent - fun onOpen(event: InventoryFullyOpenedEvent) { + fun onInventoryOpen(event: InventoryFullyOpenedEvent) { if (!LorenzUtils.inSkyBlock) return if (event.inventoryItems.isEmpty()) return val item = event.inventoryItems[event.inventoryItems.keys.last() + sellSlot] ?: return @@ -36,7 +36,7 @@ object ShiftClickNPCSell { } @SubscribeEvent - fun onClose(event: InventoryCloseEvent) { + fun onInventoryClose(event: InventoryCloseEvent) { inInventory = false } diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/StatsTuning.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/StatsTuning.kt index 7d625bd60..2e6484f68 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/StatsTuning.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/StatsTuning.kt @@ -97,7 +97,7 @@ class StatsTuning { } @SubscribeEvent(priority = EventPriority.LOW) - fun onDrawSelectedTemplate(event: GuiContainerEvent.BackgroundDrawnEvent) { + fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) { if (!LorenzUtils.inSkyBlock) return val chestName = InventoryUtils.openInventoryName() diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarBestSellMethod.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarBestSellMethod.kt index 5dbcde99e..c9fecb44f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarBestSellMethod.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarBestSellMethod.kt @@ -72,7 +72,7 @@ class BazaarBestSellMethod { } @SubscribeEvent(priority = EventPriority.HIGH) - fun onStackClick(event: GuiContainerEvent.SlotClickEvent) { + fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) { lastClickedItem = event.slot?.stack nextCloseWillResetItem = false } diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarOpenPriceWebsite.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarOpenPriceWebsite.kt index 77178c41a..395df582e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarOpenPriceWebsite.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarOpenPriceWebsite.kt @@ -42,7 +42,7 @@ class BazaarOpenPriceWebsite { } @SubscribeEvent(priority = EventPriority.HIGH) - fun onStackClick(event: GuiContainerEvent.SlotClickEvent) { + fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) { if (!isEnabled()) return val lastItem = BazaarApi.currentlyOpenedProduct ?: return diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt index c17308bb9..c1b4582c9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/CraftMaterialsFromBazaar.kt @@ -152,7 +152,7 @@ class CraftMaterialsFromBazaar { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!isEnabled()) return if (!inRecipeInventory && !purchasing) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/tiarelay/TiaRelayHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/tiarelay/TiaRelayHelper.kt index c03363a23..fd4240f10 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/tiarelay/TiaRelayHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/tiarelay/TiaRelayHelper.kt @@ -25,7 +25,7 @@ class TiaRelayHelper { private var resultDisplay = mutableMapOf<Int, Int>() @SubscribeEvent - fun onSoundPlay(event: PlaySoundEvent) { + fun onPlaySound(event: PlaySoundEvent) { if (!LorenzUtils.inSkyBlock) return val soundName = event.soundName diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt index c7c146ffc..998e25e35 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt @@ -55,7 +55,7 @@ class ItemAbilityCooldown { private val VOODOO_DOLL_WILTED = "VOODOO_DOLL_WILTED".asInternalName() @SubscribeEvent - fun onSoundEvent(event: PlaySoundEvent) { + fun onPlaySound(event: PlaySoundEvent) { when { // Hyperion event.soundName == "mob.zombie.remedy" && event.pitch == 0.6984127f && event.volume == 1f -> { diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsParkour.kt index f00476d78..5fc57e010 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsParkour.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/DeepCavernsParkour.kt @@ -126,7 +126,7 @@ class DeepCavernsParkour { } @SubscribeEvent(priority = EventPriority.HIGH) - fun onStackClick(event: GuiContainerEvent.SlotClickEvent) { + fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) { if (showStartIcon && event.slotId == 40) { event.isCanceled = true ChatUtils.chat("Manually enabled Deep Caverns Parkour.") diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt index 56dddeb13..c98a32a68 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt @@ -141,7 +141,7 @@ class MinionXp { } @SubscribeEvent - fun onItemTooltipEvent(event: LorenzToolTipEvent) { + fun onTooltip(event: LorenzToolTipEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.xpDisplay) return when { @@ -168,7 +168,7 @@ class MinionXp { } @SubscribeEvent - fun onIslandChangeEvent(event: IslandChangeEvent) { + fun onIslandChange(event: IslandChangeEvent) { minionStorages.clear() xpItemMap.clear() collectItemXpList.clear() 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 b2530af37..52058aca6 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt @@ -27,7 +27,7 @@ class CustomTextBox { private fun String.format() = replace("&", "§").split("\\n").toList() @SubscribeEvent - fun onRenderGUIOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!config.onlyInGUI) return if (!isEnabled()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/FixNEUHeavyPearls.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/FixNEUHeavyPearls.kt index da2d89243..7e266ca70 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/FixNEUHeavyPearls.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FixNEUHeavyPearls.kt @@ -15,7 +15,7 @@ class FixNEUHeavyPearls { private val heavyPearl = "HEAVY_PEARL".asInternalName() @SubscribeEvent - fun onSackChange(event: ItemAddEvent) { + fun onItemAdd(event: ItemAddEvent) { if (!isEnabled()) return if (event.internalName == heavyPearl && event.amount == 3) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt index a06304213..1467c983c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt @@ -29,7 +29,7 @@ class PatcherSendCoordinates { ) @SubscribeEvent - fun onPatcherCoordinates(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { if (!SkyHanniMod.feature.misc.patcherSendCoordWaypoint) return val message = event.message.removeColor() diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt index 73cb02b5a..56c6b8bfe 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt @@ -35,7 +35,7 @@ class PlayerChatSymbols { ) @SubscribeEvent - fun onChatReceived(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.enabled) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt index 1693c0a5d..ca8fcbd3e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt @@ -230,7 +230,7 @@ object DiscordRPCManager : IPCListener { // Events that change things in DiscordStatus @SubscribeEvent - fun onKeybind(event: LorenzKeyPressEvent) { + fun onKeyClick(event: LorenzKeyPressEvent) { if (!isEnabled() || !PriorityEntry.AFK.isSelected()) return // autoPriority 4 is dynamic afk beenAfkFor = SimpleTimeMark.now() } 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 fdd6db618..71b0f831d 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 @@ -89,7 +89,7 @@ object EstimatedItemValue { private var renderedItems = 0 @SubscribeEvent - fun onRenderOverlayGui(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { renderedItems = 0 } @@ -101,7 +101,7 @@ object EstimatedItemValue { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { tryRendering() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt index b232b837d..89162c619 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboPlaytime.kt @@ -72,7 +72,7 @@ class LimboPlaytime { } @SubscribeEvent - fun onHoverItem(event: LorenzToolTipEvent) { + fun onTooltip(event: LorenzToolTipEvent) { if (!LorenzUtils.inSkyBlock) return if (!event.slot.inventory.name.startsWith("Detailed /playtime")) return if (event.slot.slotIndex != 4) return 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 9e9a9113f..9f4fb8c78 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 @@ -54,7 +54,7 @@ object LimboTimeTracker { } @SubscribeEvent - fun catchPlaytime(event: MessageSendToServerEvent) { + fun onMessageSendToServer(event: MessageSendToServerEvent) { if (event.message.startsWith("/playtime") && inLimbo) { event.isCanceled printStats(true) @@ -158,7 +158,7 @@ object LimboTimeTracker { } @SubscribeEvent - fun onDebugCollect(event: DebugDataCollectEvent) { + fun onDebugDataCollect(event: DebugDataCollectEvent) { event.title("Limbo") if (!inLimbo) { event.addIrrelevant("not in limbo") @@ -178,7 +178,7 @@ object LimboTimeTracker { } @SubscribeEvent - fun onLogin(event: HypixelJoinEvent) { + fun onHypixelJoin(event: HypixelJoinEvent) { if (!doMigrate) return if (unmigratedPB != 0) { ChatUtils.debug("Migrating limbo personalBest") diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt index 5b1f4e2ae..0e3bb13ba 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt @@ -174,7 +174,7 @@ object TrevorFeatures { } @SubscribeEvent(priority = EventPriority.LOWEST) - fun renderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.trapperCooldownGui) return if (!onFarmingIsland()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt index 7f15d294c..ebd0f474d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt @@ -27,7 +27,7 @@ class AshfangHideParticles { } @SubscribeEvent - fun onReceivePacket(event: ReceiveParticleEvent) { + fun onReceiveParticle(event: ReceiveParticleEvent) { if (isEnabled()) { event.isCanceled = true } 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 ff6ba8987..9d969fae2 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 @@ -133,7 +133,7 @@ class CrimsonIsleReputationHelper(skyHanniMod: SkyHanniMod) { } @SubscribeEvent(priority = EventPriority.LOWEST) - fun renderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.enabled) return if (!IslandType.CRIMSON_ISLE.isInIsland()) return 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 5118bf25b..7c6828f2e 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 @@ -110,7 +110,7 @@ object DanceRoomHelper { } @SubscribeEvent - fun onSound(event: PlaySoundEvent) { + fun onPlaySound(event: PlaySoundEvent) { if (!isEnabled() || !inRoom) return if ((event.soundName == "random.burp" && event.volume == 0.8f) || (event.soundName == "random.levelup" && event.pitch == 1.8412699f && event.volume == 1.0f)) { index = 0 diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt index 1fa1c700e..bbaff34cb 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt @@ -59,7 +59,7 @@ class RiftMotesOrb { } @SubscribeEvent - fun onChatMessage(event: LorenzChatEvent) { + fun onChat(event: LorenzChatEvent) { motesPattern.matchMatcher(event.message) { motesOrbs.minByOrNull { it.location.distanceToPlayer() }?.let { it.pickedUp = true diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt index 9167f3b25..98649093d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt @@ -64,7 +64,7 @@ class ShowMotesNpcSellPrice { } @SubscribeEvent(priority = EventPriority.LOW) - fun onDrawSelectedTemplate(event: GuiContainerEvent.BackgroundDrawnEvent) { + fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) { if (!isInventoryValueEnabled()) return val name = InventoryUtils.openInventoryName() if (!name.contains("Rift Storage")) return @@ -78,7 +78,7 @@ class ShowMotesNpcSellPrice { } @SubscribeEvent - fun onItemTooltipLow(event: LorenzToolTipEvent) { + fun onTooltip(event: LorenzToolTipEvent) { if (!isShowPriceEnabled()) return val itemStack = event.itemStack diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt index 95c3bc9d2..85bd64e9e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt @@ -222,7 +222,7 @@ object VampireSlayerFeatures { } @SubscribeEvent - fun onEntityHit(event: EntityClickEvent) { + fun onEntityClick(event: EntityClickEvent) { if (!isEnabled()) return if (event.clickType != ClickType.LEFT_CLICK) return if (event.clickedEntity !is EntityOtherPlayerMP) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt index 821ff6a71..a4555eaf3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt @@ -37,7 +37,7 @@ class BlazeSlayerClearView { } @SubscribeEvent - fun onReceivePacket(event: ReceiveParticleEvent) { + fun onReceiveParticle(event: ReceiveParticleEvent) { if (isEnabled()) { event.isCanceled = true } diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerHideParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerHideParticles.kt index 857dfcc91..4eb8f91aa 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerHideParticles.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerHideParticles.kt @@ -25,7 +25,7 @@ class EndermanSlayerHideParticles { } @SubscribeEvent - fun onReceivePacket(event: ReceiveParticleEvent) { + fun onReceiveParticle(event: ReceiveParticleEvent) { if (!isEnabled()) return when (event.type) { diff --git a/src/main/java/at/hannibal2/skyhanni/test/ShowItemUuid.kt b/src/main/java/at/hannibal2/skyhanni/test/ShowItemUuid.kt index 030f6161f..6a352ca0f 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/ShowItemUuid.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/ShowItemUuid.kt @@ -9,7 +9,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class ShowItemUuid { @SubscribeEvent - fun onItemTooltipLow(event: LorenzToolTipEvent) { + fun onTooltip(event: LorenzToolTipEvent) { if (!SkyHanniMod.feature.dev.debug.showItemUuid) return event.itemStack.getItemUuid()?.let { event.toolTip.add("§7Item UUID: '$it'") diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt index 7e31bdb3d..69d9c7887 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt @@ -475,22 +475,20 @@ class SkyHanniDebugsAndTests { } @SubscribeEvent - fun onRenderLocation(event: GuiRenderEvent.GuiOverlayRenderEvent) { - if (LorenzUtils.inSkyBlock && Minecraft.getMinecraft().gameSettings.showDebugInfo && debugConfig.currentAreaDebug) { - config.debugLocationPos.renderString( - "Current Area: ${HypixelData.skyBlockArea}", - posLabel = "SkyBlock Area (Debug)" - ) - } - } - - @SubscribeEvent fun onChat(event: LorenzChatEvent) { } @SubscribeEvent fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!LorenzUtils.inSkyBlock) return + + if (Minecraft.getMinecraft().gameSettings.showDebugInfo && debugConfig.currentAreaDebug) { + config.debugLocationPos.renderString( + "Current Area: ${HypixelData.skyBlockArea}", + posLabel = "SkyBlock Area (Debug)" + ) + } + if (!debugConfig.enabled) return if (displayLine.isNotEmpty()) { diff --git a/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt b/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt index 03a0776ce..76ebba30e 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt @@ -49,7 +49,7 @@ object TestCopyBestiaryValues { ) @SubscribeEvent(priority = EventPriority.LOW) - fun onLateInventoryOpen(event: InventoryUpdatedEvent) { + fun onInventoryUpdated(event: InventoryUpdatedEvent) { if (!SkyHanniMod.feature.dev.debug.copyBestiaryData) return SkyHanniDebugsAndTests.displayLine = "" diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt index 7b0fcddbd..be279eaa8 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/command/TrackSoundsCommand.kt @@ -76,7 +76,7 @@ object TrackSoundsCommand { } @SubscribeEvent - fun onSoundEvent(event: PlaySoundEvent) { + fun onPlaySound(event: PlaySoundEvent) { if (cutOfTime.isInPast()) return if (event.soundName == "game.player.hurt" && event.pitch == 0f && event.volume == 0f) return // remove random useless sound if (event.soundName == "") return // sound with empty name aren't useful @@ -85,7 +85,7 @@ object TrackSoundsCommand { } @SubscribeEvent - fun onRender(event: GuiRenderEvent.GuiOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (cutOfTime.isInPast()) return position.renderRenderables(display, posLabel = "Track sound log") } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt index d2f12b1d0..180eaf5a2 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ChatUtils.kt @@ -206,7 +206,7 @@ object ChatUtils { (lastMessageSent + sendQueue.size * messageDelay).takeIf { !it.isInPast() } ?: SimpleTimeMark.now() @SubscribeEvent - fun sendQueuedChatMessages(event: LorenzTickEvent) { + fun onTick(event: LorenzTickEvent) { val player = Minecraft.getMinecraft().thePlayer if (player == null) { sendQueue.clear() diff --git a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt index 97f9196f2..15dbfbaf0 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt @@ -92,7 +92,7 @@ object RepoPatternManager { } @SubscribeEvent - fun onConfigInit(event: ConfigLoadEvent) { + fun onConfigLoad(event: ConfigLoadEvent) { config.forceLocal.afterChange { reloadPatterns() } } |