Cleanup message sender and add logging

eldoriarpg · Jan 8, 2025 · f169d90 · f169d90
1 parent 4739e45
commit f169d90
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,7 +17,7 @@ plugins {
 publishData {
     addRepo(Repo.main("", "", false))
     addRepo(Repo.snapshot("SNAPSHOT", "", false))
-    publishingVersion = "2.1.7"
+    publishingVersion = "2.1.8"
 }
 version = publishData.getVersion()
 

diff --git a/messaging/src/main/java/de/eldoria/eldoutilities/messages/MessageSender.java b/messaging/src/main/java/de/eldoria/eldoutilities/messages/MessageSender.java
@@ -43,7 +43,7 @@
  */
 public abstract class MessageSender {
     private static final Map<Class<? extends Plugin>, MessageSender> PLUGIN_SENDER = new HashMap<>();
-    @Nullable
+    @NotNull
     private final Class<? extends Plugin> ownerPlugin;
     private final Plugin plugin;
     private MiniMessage miniMessage;
@@ -107,10 +107,7 @@ private MessageSender update(MiniMessage miniMessage, TagResolver messageTagReso
      * <p>
      * The message will be localized if a localizer is available and a locale code is detected.
      * <p>
-     * The message can be a simple locale code in the format "code" or "code.code....".
-     * <p>
-     * If multiple code should be used every code musst be surrounded by a {@code $} mark. Example {@code "$code.code$
-     * and $code.more.code$}. You can write what you want between locale codes.
+     * The message can be a simple locale code in the format "code.code....".
      *
      * @param sender  receiver of the message
      * @param message message with optional color codes
@@ -125,10 +122,7 @@ public void sendMessage(CommandSender sender, String message, TagResolver... pla
      * <p>
      * The message will be localized if a localizer is available and a locale code is detected.
      * <p>
-     * The message can be a simple locale code in the format "code" or "code.code....".
-     * <p>
-     * If multiple code should be used every code musst be surrounded by a {@code $} mark. Example {@code "$code.code$
-     * and $code.more.code$}. You can write what you want between locale codes.
+     * The message can be a simple locale code in the format "code.code....".
      *
      * @param sender   receiver of the message
      * @param composer message composer
@@ -143,13 +137,10 @@ public void sendMessage(CommandSender sender, IMessageComposer composer) {
      * <p>
      * The message will be localized if a localizer is available and a locale code is detected.
      * <p>
-     * The message can be a simple locale code in the format "code" or "code.code....".
-     * <p>
-     * If multiple code should be used every code musst be surrounded by a {@code $} mark. Example {@code "$code.code$
-     * and $code.more.code$}. You can write what you want between locale codes.
+     * The message can be a simple locale code in the format "code.code....".
      *
      * @param sender  receiver of the message
-     * @param message message with optinal color codes
+     * @param message message with optional color codes
      */
     public void sendError(CommandSender sender, String message, TagResolver... placeholder) {
         sendMessage(sender, serialize(sender, message, errorTagResolver, placeholder));
@@ -160,10 +151,7 @@ public void sendError(CommandSender sender, String message, TagResolver... place
      * <p>
      * The message will be localized if a localizer is available and a locale code is detected.
      * <p>
-     * The message can be a simple locale code in the format "code" or "code.code....".
-     * <p>
-     * If multiple code should be used every code musst be surrounded by a {@code $} mark. Example {@code "$code.code$
-     * and $code.more.code$}. You can write what you want between locale codes.
+     * The message can be a simple locale code in the format "code.code....".
      *
      * @param sender   receiver of the message
      * @param composer message composer

diff --git a/messaging/src/main/java/de/eldoria/eldoutilities/messages/MessageSenderBuilder.java b/messaging/src/main/java/de/eldoria/eldoutilities/messages/MessageSenderBuilder.java
@@ -33,13 +33,13 @@ public class MessageSenderBuilder {
                                                                     .tag("default", Tag.styling(NamedTextColor.RED));
     private final TagResolver.Builder defaultTagResolver = TagResolver.builder();
 
-    @Nullable
+    @NotNull
     private final Plugin plugin;
     private Component prefix = Component.empty();
     private ILocalizer localizer = ILocalizer.DEFAULT;
     private UnaryOperator<String> preProcessor = s -> s;
 
-    public MessageSenderBuilder(@Nullable Plugin plugin) {
+    public MessageSenderBuilder(@NotNull Plugin plugin) {
         this.plugin = plugin;
     }
 
@@ -118,6 +118,7 @@ public MessageSender register() {
                 .build();
         MessageSender messageSender;
         if (!isPaper() || hasRelocatedAdventure()) {
+            plugin.getLogger().info("Using Spigot Message Sender");
             messageSender = new SpigotMessageSender(plugin,
                     miniMessage.tags(defaultResolver)
                                .preProcessor(in -> preProcessor.apply(localizer.localize(in)))
@@ -126,6 +127,7 @@ public MessageSender register() {
                     TagResolver.resolver(defaultResolver, errorTagResolver.build()),
                     prefix);
         } else {
+            plugin.getLogger().info("Using Paper Message Sender");
             messageSender = new PaperMessageSender(plugin,
                     miniMessage.tags(defaultResolver)
                                .preProcessor(in -> preProcessor.apply(localizer.localize(in)))