Migrate advancements handling to multification-bukkit and introduce PacketEventsUtil for dynamic PacketEvents checks.

Author: P1otrulla

multification-bukkit/src/com/eternalcode/multification/bukkit/BukkitMultification.java

@@ -1,7 +1,9 @@
 package com.eternalcode.multification.bukkit;
 
 import com.eternalcode.multification.Multification;
+import com.eternalcode.multification.bukkit.notice.resolver.advancement.AdvancementResolver;
 import com.eternalcode.multification.bukkit.notice.resolver.sound.SoundBukkitResolver;
+import com.eternalcode.multification.bukkit.util.PacketEventsUtil;
 import com.eternalcode.multification.executor.AsyncExecutor;
 import com.eternalcode.multification.locate.LocaleProvider;
 import com.eternalcode.multification.viewer.ViewerProvider;
@@ -17,7 +19,13 @@ public abstract class BukkitMultification<TRANSLATION> extends Multification<Com
 
     protected BukkitMultification() {
         super();
+
+        // TODO: add special registration method for it?
         this.noticeRegistry.registerResolver(new SoundBukkitResolver());
+
+        if (PacketEventsUtil.isPacketEventsLoaded()) {
+            this.noticeRegistry.registerResolver(new AdvancementResolver());
+        }
     }
 
     @Override

multification-bukkit/src/com/eternalcode/multification/bukkit/notice/resolver/advancement/AdvancementResolver.java

@@ -21,6 +21,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -40,17 +41,11 @@ public class AdvancementResolver implements TextContentResolver<AdvancementConte
 
     private static final String FORMAT = "%s|%s|%s|%s|%s|%b|%b|%f|%f|%s";
 
-    private final NoticeKey<AdvancementContent> key;
-    private final Plugin plugin;
-
-    public AdvancementResolver(Plugin plugin) {
-        this.key = PacketEventsNoticeKey.ADVANCEMENT;
-        this.plugin = plugin;
-    }
+    private final Plugin plugin = JavaPlugin.getProvidingPlugin(AdvancementResolver.class);
 
     @Override
     public NoticeKey<AdvancementContent> noticeKey() {
-        return this.key;
+        return PacketEventsNoticeKey.ADVANCEMENT;
     }
 
     @Override

multification-bukkit/src/com/eternalcode/multification/bukkit/notice/resolver/advancement/PacketEventsNotice.java

@@ -1,9 +1,6 @@
 package com.eternalcode.multification.bukkit.notice.resolver.advancement;
 
 import com.eternalcode.multification.notice.Notice;
-import com.eternalcode.multification.packetevents.notice.resolver.AdvancementContent;
-import com.eternalcode.multification.packetevents.notice.resolver.AdvancementFrameType;
-import com.eternalcode.multification.packetevents.notice.resolver.PacketEventsNoticeKey;
 
 import java.time.Duration;
 

multification-bukkit/src/com/eternalcode/multification/bukkit/util/PacketEventsUtil.java

@@ -0,0 +1,42 @@
+package com.eternalcode.multification.bukkit.util;
+
+public class PacketEventsUtil {
+
+    private static Boolean packetEventsLoaded = null;
+
+    private static final String[] PACKETEVENTS_CLASSES = {
+            "com.github.retrooper.packetevents.PacketEvents",
+            "io.github.retrooper.packetevents.PacketEvents",
+            "com.github.retrooper.packetevents.PacketEventsAPI",
+            "io.github.retrooper.packetevents.PacketEventsAPI"
+    };
+
+    /**
+     * Checks if PacketEvents is loaded via Class.forName()
+     * Handles different relocations
+     *
+     * @return true if PacketEvents is available, false otherwise
+     */
+    public static boolean isPacketEventsLoaded() {
+        if (packetEventsLoaded == null) {
+            packetEventsLoaded = checkPacketEventsClass();
+        }
+        return packetEventsLoaded;
+    }
+
+    /**
+     * Checks if any PacketEvents class exists
+     *
+     * @return true if PacketEvents class was found
+     */
+    private static boolean checkPacketEventsClass() {
+        for (String className : PACKETEVENTS_CLASSES) {
+            try {
+                Class.forName(className);
+                return true;
+            }
+            catch (ClassNotFoundException ignored) {}
+        }
+        return false;
+    }
+}