feat: Duration instead of a long for CalendarEvents

Author: ArikSquad

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/calendar/CalendarEvent.java

@@ -9,6 +9,7 @@
 import net.swofty.proxyapi.ProxyService;
 import org.tinylog.Logger;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -22,7 +23,7 @@ public record CalendarEvent(
         Function<Integer, String> displayName,
         List<String> description,
         List<Long> times,
-        long duration,
+        Duration duration,
         boolean tracksYear,
         BiConsumer<Long, Integer> action
 ) {
@@ -40,7 +41,7 @@ public record CalendarEvent(
                     "§7the Baker is giving out free Cake!"
             ),
             List.of(10L),
-            20 * 60 * 60L, // 1 hour
+            Duration.ofHours(1),
             true,
             (time, year) -> {
                 // New Year's actions
@@ -58,7 +59,7 @@ public record CalendarEvent(
                     "§7special items are sold."
             ),
             calculateDarkAuctionTimes(),
-            20 * 5 * 60L,
+            Duration.ofMinutes(5),
             false,
             (time, year) -> {
                 ProxyService darkAuctionService = new ProxyService(ServiceType.DARK_AUCTION);
@@ -108,7 +109,11 @@ public static List<CalendarEvent> getCurrentEvents(long time) {
         List<CalendarEvent> activeEvents = new ArrayList<>();
         for (CalendarEvent event : allEvents) {
             for (Long eventStartTime : event.times()) {
-                if (time >= eventStartTime && time < eventStartTime + event.duration()) {
+                // convert ticks to milliseconds
+                Duration timeSinceEventStart = Duration.ofMillis((time - eventStartTime) * 50);
+
+                // checks if the event is currently active
+                if (!timeSinceEventStart.isNegative() && timeSinceEventStart.compareTo(event.duration()) < 0) {
                     activeEvents.add(event);
                     break;
                 }

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/calendar/SkyBlockCalendar.java

@@ -6,6 +6,7 @@
 import net.minestom.server.timer.TaskSchedule;
 import net.swofty.type.skyblockgeneric.commands.MinionGenerationCommand;
 
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -97,10 +98,10 @@ public static List<CalendarEvent> getCurrentEvents() {
     /**
      * A record to hold information about upcoming events.
      * @param timeUntilBegin <b>ticks</b> until the event begins
-     * @param duration <b>ticks</b> duration of the event
+     * @param duration duration of the event
      * @param year the year the event will occur
      */
-    public record EventInfo(long timeUntilBegin, long duration, int year) {}
+    public record EventInfo(long timeUntilBegin, Duration duration, int year) {}
 
     public static Map<EventInfo, CalendarEvent> getEventsWithDurationUntil(int amount) {
         Map<EventInfo, CalendarEvent> result = new LinkedHashMap<>();

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockMenu.java

@@ -283,8 +283,8 @@ private static long getTicksRemaining(CalendarEvent currentEvent) {
                 long currentElapsedInYear = SkyBlockCalendar.getElapsed() % SkyBlockCalendar.YEAR;
                 long eventEndTime = 0;
                 for (Long eventStartTime : currentEvent.times()) {
-                    if (currentElapsedInYear >= eventStartTime && currentElapsedInYear < eventStartTime + currentEvent.duration()) {
-                        eventEndTime = eventStartTime + currentEvent.duration();
+                    if (currentElapsedInYear >= eventStartTime && currentElapsedInYear < eventStartTime + currentEvent.duration().toMillis() / 50) {
+                        eventEndTime = eventStartTime + currentEvent.duration().toMillis() / 50;
                         break;
                     }
                 }

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/calendar/GUICalendar.java

@@ -41,7 +41,7 @@ public void onOpen(InventoryGUIOpenEvent e) {
 					public ItemStack.Builder getItem(HypixelPlayer player) {
 						List<Component> loreHeader = List.of(
 								Component.text("§7Starts in: §e" + StringUtility.formatTimeLeft(info.timeUntilBegin() * 50L)),
-								Component.text("§7Event lasts for §e" +  StringUtility.formatTimeLeft(info.duration() * 50L) + "§7!"),
+								Component.text("§7Event lasts for §e" +  StringUtility.formatTimeLeft(info.duration().toMillis()) + "§7!"),
 								Component.text(" ")
 						);
 						List<Component> loreFooter = event.description().stream()