Fix wrong detection of relocation

eldoriarpg · Jan 8, 2025 · 03499f7 · 03499f7
1 parent f169d90
commit 03499f7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 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.8"
+    publishingVersion = "2.1.9"
 }
 version = publishData.getVersion()
 

diff --git a/messaging/src/main/java/de/eldoria/eldoutilities/messages/MessageSenderBuilder.java b/messaging/src/main/java/de/eldoria/eldoutilities/messages/MessageSenderBuilder.java
@@ -32,6 +32,7 @@ public class MessageSenderBuilder {
     private final TagResolver.Builder errorTagResolver = TagResolver.builder()
                                                                     .tag("default", Tag.styling(NamedTextColor.RED));
     private final TagResolver.Builder defaultTagResolver = TagResolver.builder();
+    private static final String ADVENTURE_PATH = String.join(".","net", "kyori", "adventure", "text");
 
     @NotNull
     private final Plugin plugin;
@@ -117,8 +118,13 @@ public MessageSender register() {
                 .resolver(StandardTags.defaults())
                 .build();
         MessageSender messageSender;
-        if (!isPaper() || hasRelocatedAdventure()) {
-            plugin.getLogger().info("Using Spigot Message Sender");
+        plugin.getLogger().info("Determining message sender type");
+        boolean paper = isPaper();
+        if (!paper) {
+            plugin.getLogger().info("Detected non paper based server");
+        }
+        if (!paper || hasRelocatedAdventure()) {
+            plugin.getLogger().info("Using legacy message sender");
             messageSender = new SpigotMessageSender(plugin,
                     miniMessage.tags(defaultResolver)
                                .preProcessor(in -> preProcessor.apply(localizer.localize(in)))
@@ -140,7 +146,11 @@ public MessageSender register() {
         return messageSender;
     }
 
-    public static boolean hasRelocatedAdventure() {
-        return !Component.class.getPackageName().startsWith(String.join("net", "kyori", "adventure", "text"));
+    boolean hasRelocatedAdventure() {
+        boolean relocated = !Component.class.getPackageName().startsWith(ADVENTURE_PATH);
+        if (relocated) {
+            plugin.getLogger().info("Found relocated adventure at %s instead of net.kyori.adventure.text.".formatted(Component.class.getPackageName()));
+        }
+        return relocated;
     }
 }