diff options
| -rw-r--r-- | src/main/kotlin/features/inventory/REIDependencyWarner.kt | 1 | ||||
| -rw-r--r-- | src/main/kotlin/features/inventory/TimerInLore.kt | 3 | ||||
| -rw-r--r-- | src/main/kotlin/util/SkyblockId.kt | 6 | ||||
| -rw-r--r-- | translations/en_us.json | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/main/kotlin/features/inventory/REIDependencyWarner.kt b/src/main/kotlin/features/inventory/REIDependencyWarner.kt index 7d88dd1..476759a 100644 --- a/src/main/kotlin/features/inventory/REIDependencyWarner.kt +++ b/src/main/kotlin/features/inventory/REIDependencyWarner.kt @@ -52,6 +52,7 @@ object REIDependencyWarner { @Subscribe fun checkREIDependency(event: SkyblockServerUpdateEvent) { if (!SBData.isOnSkyblock) return + if (!RepoManager.Config.warnForMissingItemListMod) return if (hasREI) return if (sentWarning) return sentWarning = true diff --git a/src/main/kotlin/features/inventory/TimerInLore.kt b/src/main/kotlin/features/inventory/TimerInLore.kt index 309ea61..8eac77f 100644 --- a/src/main/kotlin/features/inventory/TimerInLore.kt +++ b/src/main/kotlin/features/inventory/TimerInLore.kt @@ -81,6 +81,9 @@ object TimerInLore { CHOCOLATEFACTORY("Next Charge", "Available at"), STONKSAUCTION("Auction ends in", "Ends at"), LIZSTONKREDEMPTION("Resets in:", "Resets at"), + TIMEREMAININGS("Time Remaining:", "Ends at"), + COOLDOWN("Cooldown:", "Come back at"), + ONCOOLDOWN("On cooldown:", "Available at"), EVENTENDING("Event ends in:", "Ends at"); } diff --git a/src/main/kotlin/util/SkyblockId.kt b/src/main/kotlin/util/SkyblockId.kt index 6260679..a2c586a 100644 --- a/src/main/kotlin/util/SkyblockId.kt +++ b/src/main/kotlin/util/SkyblockId.kt @@ -237,8 +237,10 @@ val ItemStack.skyBlockId: SkyblockId? } } - "BALLOON_HAT_2024" -> { - SkyblockId("BALLOON_HAT_2024_${extraAttributes.getString("party_hat_color").getOrNull()?.uppercase()}") + "BALLOON_HAT_2024", "BALLOON_HAT_2025" -> { + val partyHatYear = extraAttributes.getInt("party_hat_year").getOrNull() + val partyHatColor = extraAttributes.getString("party_hat_color").getOrNull() + SkyblockId("BALLOON_HAT_${partyHatYear}_${partyHatColor?.uppercase()}") } else -> { diff --git a/translations/en_us.json b/translations/en_us.json index 5e970f1..ec126f9 100644 --- a/translations/en_us.json +++ b/translations/en_us.json @@ -133,7 +133,7 @@ "firmament.config.fixes.peek-chat.description": "Hold this keybinding to view the chat as if you have it opened, but while still being able to control your character.", "firmament.config.fixes.player-skins": "Fix unsigned Player Skins", "firmament.config.fixes.player-skins.description": "Mark all player skins as signed, preventing console spam, and some rendering issues.", - "firmament.config.inventory-buttons": "Inventory buttons", + "firmament.config.inventory-buttons": "Inventory Buttons", "firmament.config.inventory-buttons.hover-text": "Hover Tooltip", "firmament.config.inventory-buttons.hover-text.description": "Hovering over inventory buttons will show the command they run.", "firmament.config.inventory-buttons.open-editor": "Open Editor", @@ -207,7 +207,7 @@ "firmament.config.power-user.entity-data.description": "Print out information about the entity under your cross-hair.", "firmament.config.power-user.show-item-id": "Show SkyBlock Ids", "firmament.config.power-user.show-item-id.description": "Show the SkyBlock id of items underneath them.", - "firmament.config.price-data": "Price data", + "firmament.config.price-data": "Price Data", "firmament.config.price-data.avg-lowest-bin-days": "AVG Lowest Bin Days", "firmament.config.price-data.avg-lowest-bin-days.choice.off": "Off", "firmament.config.price-data.avg-lowest-bin-days.choice.onedayavglowestbin": "1 Day", |