Release 2.0.34 (#337)

gradle.properties

@@ -1,3 +1,3 @@
 group=xyz.jonesdev.sonar
-version=2.0.33
+version=2.0.34
 description=A lightweight, effective, and easy-to-use anti-bot plugin for Velocity, BungeeCord, and Bukkit.

sonar-api/src/main/java/xyz/jonesdev/sonar/api/config/SonarConfiguration.java

@@ -22,7 +22,6 @@ import lombok.*;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-import net.kyori.adventure.title.Title;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.Sonar;
@@ -301,16 +300,6 @@ public final class SonarConfiguration {
     verification.verificationFailed = deserializeDisconnectMessage("verification.failed");
 
     verboseAnimation = Collections.unmodifiableList(messagesConfig.getStringList("verbose.animation"));
-
-    notifications.notificationTitle = MiniMessage.miniMessage().deserialize(
-      messagesConfig.getString("notifications.title"));
-    notifications.notificationSubtitle = MiniMessage.miniMessage().deserialize(
-      messagesConfig.getString("notifications.subtitle"));
-    notifications.title = Title.title(
-      Sonar.get().getConfig().getNotifications().getNotificationTitle(),
-      Sonar.get().getConfig().getNotifications().getNotificationSubtitle());
-    notifications.notificationChat = MiniMessage.miniMessage().deserialize(
-      String.join("<newline>", messagesConfig.getStringList("notifications.chat")));
   }
 
   private @NotNull Component deserializeDisconnectMessage(final String path) {
@@ -352,8 +341,6 @@ public final class SonarConfiguration {
   private final Database database = new Database();
   @Getter
   private final Webhook webhook = new Webhook();
-  @Getter
-  private final Notifications notifications = new Notifications();
 
   @Getter
   private Component prefix;
@@ -378,15 +365,6 @@ public final class SonarConfiguration {
   @Getter
   private List<String> verboseAnimation;
 
-  @Getter
-  @NoArgsConstructor(access = AccessLevel.PRIVATE)
-  public static final class Notifications {
-    private Title title;
-    private Component notificationTitle;
-    private Component notificationSubtitle;
-    private Component notificationChat;
-  }
-
   @Getter
   @NoArgsConstructor(access = AccessLevel.PRIVATE)
   public static final class Queue {

sonar-api/src/main/java/xyz/jonesdev/sonar/api/verbose/Notification.java

@@ -22,8 +22,10 @@ import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.kyori.adventure.title.Title;
 import xyz.jonesdev.sonar.api.Sonar;
 
+import java.util.List;
 import java.util.UUID;
 
 import static xyz.jonesdev.sonar.api.Sonar.DECIMAL_FORMAT;
@@ -40,26 +42,36 @@ public final class Notification extends Observable {
     }
 
     // Prepare the chat notification
-    final Component chatNotificationComponent = MiniMessage.miniMessage().deserialize(
-      Sonar.get().getConfig().getMessagesConfig().getString(""),
-      Placeholder.component("prefix", Sonar.get().getConfig().getPrefix()),
-      Placeholder.unparsed("queued", DECIMAL_FORMAT.format(Sonar.get().getFallback().getQueue().getPlayers().size())),
-      Placeholder.unparsed("verifying", DECIMAL_FORMAT.format(Sonar.get().getFallback().getConnected().size())),
-      Placeholder.unparsed("blacklisted", DECIMAL_FORMAT.format(Sonar.get().getFallback().getBlacklist().estimatedSize())),
-      Placeholder.unparsed("total-joins", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalPlayersJoined())),
-      Placeholder.unparsed("logins-per-second", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getLoginsPerSecond())),
-      Placeholder.unparsed("connections-per-second", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getConnectionsPerSecond())),
-      Placeholder.unparsed("verify-total", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalAttemptedVerifications())),
-      Placeholder.unparsed("verify-success", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalSuccessfulVerifications())),
-      Placeholder.unparsed("verify-failed", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalFailedVerifications())),
-      Placeholder.unparsed("incoming-traffic", Sonar.get().getStatistics().getCurrentIncomingBandwidthFormatted()),
-      Placeholder.unparsed("outgoing-traffic", Sonar.get().getStatistics().getCurrentOutgoingBandwidthFormatted()),
-      Placeholder.unparsed("incoming-traffic-ttl", Sonar.get().getStatistics().getTotalIncomingBandwidthFormatted()),
-      Placeholder.unparsed("outgoing-traffic-ttl", Sonar.get().getStatistics().getTotalOutgoingBandwidthFormatted()),
-      Placeholder.unparsed("used-memory", formatMemory(getUsedMemory())),
-      Placeholder.unparsed("free-memory", formatMemory(getFreeMemory())),
-      Placeholder.unparsed("total-memory", formatMemory(getTotalMemory())),
-      Placeholder.unparsed("max-memory", formatMemory(getMaxMemory())));
+    final Component notificationTitle = MiniMessage.miniMessage().deserialize(
+      Sonar.get().getConfig().getMessagesConfig().getString("notifications.title"));
+    final Component notificationSubtitle = MiniMessage.miniMessage().deserialize(
+      Sonar.get().getConfig().getMessagesConfig().getString("notifications.subtitle"));
+    final Title title = Title.title(notificationTitle, notificationSubtitle);
+
+    final List<String> chatNotification = Sonar.get().getConfig().getMessagesConfig().getStringList("notifications.chat");
+    final Component[] chatNotificationComponents = new Component[chatNotification.size()];
+
+    for (int i = 0; i < chatNotificationComponents.length; i++) {
+      chatNotificationComponents[i] = MiniMessage.miniMessage().deserialize(chatNotification.get(i),
+        Placeholder.component("prefix", Sonar.get().getConfig().getPrefix()),
+        Placeholder.unparsed("queued", DECIMAL_FORMAT.format(Sonar.get().getFallback().getQueue().getPlayers().size())),
+        Placeholder.unparsed("verifying", DECIMAL_FORMAT.format(Sonar.get().getFallback().getConnected().size())),
+        Placeholder.unparsed("blacklisted", DECIMAL_FORMAT.format(Sonar.get().getFallback().getBlacklist().estimatedSize())),
+        Placeholder.unparsed("total-joins", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalPlayersJoined())),
+        Placeholder.unparsed("logins-per-second", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getLoginsPerSecond())),
+        Placeholder.unparsed("connections-per-second", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getConnectionsPerSecond())),
+        Placeholder.unparsed("verify-total", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalAttemptedVerifications())),
+        Placeholder.unparsed("verify-success", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalSuccessfulVerifications())),
+        Placeholder.unparsed("verify-failed", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalFailedVerifications())),
+        Placeholder.unparsed("incoming-traffic", Sonar.get().getStatistics().getCurrentIncomingBandwidthFormatted()),
+        Placeholder.unparsed("outgoing-traffic", Sonar.get().getStatistics().getCurrentOutgoingBandwidthFormatted()),
+        Placeholder.unparsed("incoming-traffic-ttl", Sonar.get().getStatistics().getTotalIncomingBandwidthFormatted()),
+        Placeholder.unparsed("outgoing-traffic-ttl", Sonar.get().getStatistics().getTotalOutgoingBandwidthFormatted()),
+        Placeholder.unparsed("used-memory", formatMemory(getUsedMemory())),
+        Placeholder.unparsed("free-memory", formatMemory(getFreeMemory())),
+        Placeholder.unparsed("total-memory", formatMemory(getTotalMemory())),
+        Placeholder.unparsed("max-memory", formatMemory(getMaxMemory())));
+    }
 
     // Send the title and chat messages to all online players
     for (final UUID subscriber : Sonar.get().getNotificationHandler().getSubscribers()) {
@@ -67,9 +79,11 @@ public final class Notification extends Observable {
       if (audience == null) continue;
 
       // Send the message to all online subscribers
-      audience.sendMessage(chatNotificationComponent);
+      for (Component component : chatNotificationComponents) {
+        audience.sendMessage(component);
+      }
       // Send the title to all online subscribers
-      audience.showTitle(Sonar.get().getConfig().getNotifications().getTitle());
+      audience.showTitle(title);
     }
   }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/service/SonarServiceManager.java

@@ -32,16 +32,10 @@ public final class SonarServiceManager {
   private final ScheduledExecutorService FALLBACK_QUEUE = createScheduledExecutor("sonar-queue-thread");
   private final ScheduledExecutorService STATISTICS = createScheduledExecutor("sonar-statistics-thread");
 
-  private final Thread.UncaughtExceptionHandler EXCEPTION_HANDLER = (thread, exception) -> {
-    Sonar.get().getLogger().error("[services] Uncaught exception in thread {}", thread.getName());
-    exception.printStackTrace(System.err);
-  };
-
   private @NotNull ScheduledExecutorService createScheduledExecutor(final String threadName) {
     return Executors.newSingleThreadScheduledExecutor(runnable -> {
       final Thread thread = Executors.defaultThreadFactory().newThread(runnable);
       thread.setName(threadName);
-      thread.setUncaughtExceptionHandler(EXCEPTION_HANDLER);
       thread.setDaemon(true);
       return thread;
     });