diff options
| author | vicisacat <victor.branchu@gmail.com> | 2024-04-24 16:20:01 +0200 |
|---|---|---|
| committer | viciscat <51047087+viciscat@users.noreply.github.com> | 2024-06-02 13:26:45 +0200 |
| commit | a781ad5c936f4307f70b191831701247976656f5 (patch) | |
| tree | 6b31533f96e5b652538570191ca562e08c5dc724 | |
| parent | 07a0b32d0d1eadce04963963975322a3a7a093cb (diff) | |
| download | Skyblocker-a781ad5c936f4307f70b191831701247976656f5.tar.gz Skyblocker-a781ad5c936f4307f70b191831701247976656f5.tar.bz2 Skyblocker-a781ad5c936f4307f70b191831701247976656f5.zip | |
fixes and things
4 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/EventNotificationsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/EventNotificationsCategory.java index 02be92a5..5b33f7cf 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/EventNotificationsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/EventNotificationsCategory.java @@ -19,8 +19,6 @@ public class EventNotificationsCategory { return ConfigCategory.createBuilder() .name(Text.literal("Event Notifications")) .groups(createGroups(config)) - .tooltip(Text.translatable("text.autoconfig.skyblocker.option.general.eventNotifications.@Tooltip[0]"), - Text.translatable("text.autoconfig.skyblocker.option.general.eventNotifications.@Tooltip[1]")) .build(); } @@ -33,6 +31,11 @@ public class EventNotificationsCategory { .name(Text.literal(entry.getKey())) .binding(EventNotifications.DEFAULT_REMINDERS, entry::getValue, entry::setValue) .controller(option -> () -> new DurationController(option)) // yea + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.eventNotifications.@Tooltip[0]"), + Text.empty(), + Text.translatable("text.autoconfig.skyblocker.option.general.eventNotifications.@Tooltip[1]"), + Text.empty(), + Text.translatable("text.autoconfig.skyblocker.option.general.eventNotifications.@Tooltip[2]", entry.getKey()))) .initial(60) .collapsed(true) .build() diff --git a/src/main/java/de/hysky/skyblocker/skyblock/events/EventNotifications.java b/src/main/java/de/hysky/skyblocker/skyblock/events/EventNotifications.java index 0d2d4d4d..f7f82afb 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/events/EventNotifications.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/events/EventNotifications.java @@ -139,6 +139,7 @@ public class EventNotifications { new EventToast(skyblockEvent.start(), eventName, eventIcons.getOrDefault(eventName, new ItemStack(Items.PAPER))) ); } + break; } } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/UpcomingEventsTab.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/UpcomingEventsTab.java index 134c5d4d..3459c47d 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/UpcomingEventsTab.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/UpcomingEventsTab.java @@ -67,7 +67,7 @@ public class UpcomingEventsTab extends ItemListWidget.TabContainerWidget { hovered = null; for (EventRenderer eventRenderer : events) { eventRenderer.render(context, x + 1, eventsY, mouseX, mouseY); - if (eventRenderer.isMouseOver(mouseX, mouseY, x+1, eventsY)) hovered = eventRenderer; + if (isMouseOver(mouseX, mouseY) && eventRenderer.isMouseOver(mouseX, mouseY, x+1, eventsY)) hovered = eventRenderer; eventsY += eventRenderer.getHeight(); } diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java index 8316bb9c..fa9292ca 100644 --- a/src/main/java/de/hysky/skyblocker/utils/Utils.java +++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java @@ -359,7 +359,7 @@ public class Utils { public static Text getDurationText(int timeInSeconds) { int seconds = timeInSeconds % 60; int minutes = (timeInSeconds/60) % 60; - int hours = (timeInSeconds/3600) % 24; + int hours = (timeInSeconds/3600); MutableText time = Text.empty(); if (hours > 0) { |