From 724083b13eec0e1de68c18118a4ccf35d9228925 Mon Sep 17 00:00:00 2001 From: RettichLP Date: Sat, 9 May 2026 20:22:29 +0200 Subject: [PATCH] Move PayDay notification logic from EconomyListener to Configuration --- .../ucutils/common/configuration/Configuration.java | 13 +++++++++++++ .../ucutils/listener/impl/EconomyListener.java | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/de/rettichlp/ucutils/common/configuration/Configuration.java b/src/main/java/de/rettichlp/ucutils/common/configuration/Configuration.java index 8402911e..ebb816f4 100644 --- a/src/main/java/de/rettichlp/ucutils/common/configuration/Configuration.java +++ b/src/main/java/de/rettichlp/ucutils/common/configuration/Configuration.java @@ -19,6 +19,8 @@ import static de.rettichlp.ucutils.UCUtils.LOGGER; import static de.rettichlp.ucutils.UCUtils.api; +import static de.rettichlp.ucutils.UCUtils.messageService; +import static de.rettichlp.ucutils.UCUtils.notificationService; import static java.nio.file.Files.newBufferedReader; import static java.nio.file.Files.newBufferedWriter; @@ -44,6 +46,17 @@ public void addMinutesSinceLastPayDay(int minutes) { if (this.minutesSinceLastPayDay % 10 == 0) { new Thread(this::saveToFile).start(); // asynchronously save every active 10 minutes } + + switch (this.minutesSinceLastPayDay) { + case 50 -> { + messageService.sendModMessage("Du hast in 10 Minuten PayDay und mehr als 100000$ auf der Bank!", false); + notificationService.notificationSound(1); + } + case 55 -> { + messageService.sendModMessage("Du hast in 5 Minuten PayDay und mehr als 100000$ auf der Bank!", false); + notificationService.notificationSound(2); + } + } } public void addPredictedPayDaySalary(int salary) { diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/EconomyListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/EconomyListener.java index 2e1b71bb..ddb06f0f 100644 --- a/src/main/java/de/rettichlp/ucutils/listener/impl/EconomyListener.java +++ b/src/main/java/de/rettichlp/ucutils/listener/impl/EconomyListener.java @@ -219,18 +219,6 @@ public boolean onMessageReceive(Text text, String message) { if (paydayTimeMatcher.find()) { int minutesSinceLastPayDay = parseInt(paydayTimeMatcher.group("minutes")); configuration.setMinutesSinceLastPayDay(minutesSinceLastPayDay); - - switch (minutesSinceLastPayDay) { - case 50 -> { - messageService.sendModMessage("Du hast in 10 Minuten PayDay und mehr als 100000$ auf der Bank!", false); - notificationService.notificationSound(1); - } - case 55 -> { - messageService.sendModMessage("Du hast in 5 Minuten PayDay und mehr als 100000$ auf der Bank!", false); - notificationService.notificationSound(2); - } - } - return true; }