Refactor countdown logic to directly create notifications for The Rettington Companion integration

Author: rettichlp

src/main/java/de/rettichlp/ucutils/common/integrations/TheRettingtonCompanionIntegration.java

@@ -7,22 +7,17 @@
 import de.rettichlp.ucutils.common.gui.widgets.MoneyWidget;
 import de.rettichlp.ucutils.common.gui.widgets.PayDayWidget;
 import de.rettichlp.ucutils.common.gui.widgets.ServiceCountWidget;
-import de.rettichlp.ucutils.common.models.Countdown;
 
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 import static de.rettichlp.ucutils.UCUtils.notificationService;
-import static de.rettichlp.ucutils.UCUtils.storage;
 
 public class TheRettingtonCompanionIntegration implements TheRettingtonCompanionApi {
 
     @Override
     public Set<Notification> getNotifications() {
-        Set<Notification> notifications = new HashSet<>(notificationService.getNotifications());
-        notifications.addAll(storage.getCountdowns().stream().map(Countdown::toWidget).toList());
-        return notifications;
+        return notificationService.getNotifications();
     }
 
     @Override

src/main/java/de/rettichlp/ucutils/common/models/Countdown.java

@@ -8,6 +8,7 @@
 import java.time.LocalDateTime;
 
 import static de.rettichlp.ucutils.UCUtils.messageService;
+import static de.rettichlp.ucutils.UCUtils.notificationService;
 import static de.rettichlp.ucutils.UCUtils.storage;
 import static de.rettichlp.ucutils.UCUtils.utilService;
 import static java.time.Duration.between;
@@ -29,17 +30,7 @@ public Countdown(String title, Duration duration, Runnable runAfter) {
         this.title = title;
         this.duration = duration;
 
-        storage.getCountdowns().add(this);
-
-        utilService.delayedAction(runAfter, this.duration.toMillis());
-    }
-
-    public Duration getRemainingDuration() {
-        return between(now(), this.startTime.plus(this.duration));
-    }
-
-    public Notification toWidget() {
-        return Notification.builder()
+        Notification countdownNotification = Notification.builder()
                 .componentSupplier(() -> {
                     String millisToFriendlyString = messageService.millisToFriendlyString(getRemainingDuration().toMillis());
 
@@ -48,7 +39,15 @@ public Notification toWidget() {
                             .append(literal(":").withStyle(GRAY)).append(" ")
                             .append(literal(millisToFriendlyString));
                 })
-                .displayDuration(this.duration)
+                .displayDuration(duration)
                 .build();
+
+        storage.getCountdowns().add(this);
+        notificationService.getNotifications().add(countdownNotification);
+        utilService.delayedAction(runAfter, this.duration.toMillis());
+    }
+
+    public Duration getRemainingDuration() {
+        return between(now(), this.startTime.plus(this.duration));
     }
 }