diff options
| author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2024-04-04 05:10:32 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-03 20:10:32 +0200 |
| commit | a7c6e08864f4d7a2ebf5776d2b4d5c8f1a691b56 (patch) | |
| tree | 8db33de28c4ed5b922dc180105a1e81ae19e300d /src | |
| parent | b19e2ed181ef8618d71ad33960befceff510cfa9 (diff) | |
| download | skyhanni-a7c6e08864f4d7a2ebf5776d2b4d5c8f1a691b56.tar.gz skyhanni-a7c6e08864f4d7a2ebf5776d2b4d5c8f1a691b56.tar.bz2 skyhanni-a7c6e08864f4d7a2ebf5776d2b4d5c8f1a691b56.zip | |
Backend: Make all event names uniform (#1290)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src')
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 Dungeo |
