Port LibsDisguises module over to 2.0

build.gradle.kts

@@ -31,7 +31,7 @@ dependencies {
     compileOnly("org.projectlombok:lombok:1.18.46")
     annotationProcessor("org.projectlombok:lombok:1.18.46")
     compileOnly("io.papermc.paper:paper-api:26.1.2.build.+")
-    compileOnly("dev.plex:server:2.0-SNAPSHOT")
+    compileOnly("dev.plex:api:2.0-SNAPSHOT")
     implementation("me.libraryaddict.disguises:libsdisguises:11.0.18")
     compileOnly("com.github.retrooper:packetevents-spigot:2.12.1")
 }

src/main/java/dev/plex/LibsDisguises.java

@@ -4,7 +4,6 @@ import dev.plex.command.DisguiseToggleCMD;
 import dev.plex.command.UndisguiseAllCMD;
 import dev.plex.listener.DisguiseListener;
 import dev.plex.module.PlexModule;
-import dev.plex.util.PlexLog;
 import org.bukkit.Bukkit;
 
 public class LibsDisguises extends PlexModule
@@ -17,14 +16,14 @@ public class LibsDisguises extends PlexModule
     {
         if (!Bukkit.getPluginManager().isPluginEnabled("LibsDisguises"))
         {
-            PlexLog.error("The Plex-LibsDisguises module requires the LibsDisguises plugin to work.");
+            api().logging().error("The Plex-LibsDisguises module requires the LibsDisguises plugin to work.");
             return;
         }
         registerCommand(new DisguiseToggleCMD());
         registerCommand(new UndisguiseAllCMD());
-        registerListener(new DisguiseListener());
+        disguiseListener = new DisguiseListener(api());
-        disguiseListener = new DisguiseListener();
         disguiseListener.getCommands();
+        registerListener(disguiseListener);
     }
 
     @Override

src/main/java/dev/plex/listener/DisguiseListener.java

@@ -1,9 +1,7 @@
 package dev.plex.listener;
 
 import dev.plex.LibsDisguises;
-import dev.plex.cache.DataUtils;
+import dev.plex.api.PlexApi;
-import dev.plex.player.PlexPlayer;
-import dev.plex.util.PlexLog;
 import java.util.ArrayList;
 import java.util.List;
 import me.libraryaddict.disguise.DisguiseAPI;
@@ -30,6 +28,13 @@ import org.bukkit.plugin.Plugin;
 
 public class DisguiseListener extends PlexListener
 {
+    private final PlexApi api;
+
+    public DisguiseListener(PlexApi api)
+    {
+        this.api = api;
+    }
+
     private static float safeYMod(float f)
     {
         return Math.max(-256f, Math.min(256f, f));
@@ -39,11 +44,7 @@ public class DisguiseListener extends PlexListener
     public void onDisguiseEvent(DisguiseEvent event)
     {
         event.setCancelled(true);
-        PlexPlayer plexPlayer = null;
+        Player playerSender = event.getCommandSender() instanceof Player player ? player : null;
-        if (event.getCommandSender() instanceof Player player)
-        {
-            plexPlayer = DataUtils.getPlayer(player.getUniqueId());
-        }
         if (event.getDisguise().getType() == DisguiseType.FISHING_HOOK)
         {
             event.getCommandSender().sendMessage(Component.text("You cannot use Fishing Hook disguises").color(NamedTextColor.RED));
@@ -68,7 +69,7 @@ public class DisguiseListener extends PlexListener
         {
             watcher.setInvulnerability(2048);
         }
-        if (event.getDisguise().isPlayerDisguise() && plexPlayer != null && !plexPlayer.getPlayer().hasPermission("plex.libsdisguises.player"))
+        if (event.getDisguise().isPlayerDisguise() && playerSender != null && !playerSender.hasPermission("plex.libsdisguises.player"))
         {
             PlayerDisguise playerDisguise = (PlayerDisguise)event.getDisguise();
             String targetName = playerDisguise.getName();
@@ -128,7 +129,6 @@ public class DisguiseListener extends PlexListener
             }
             else
             {
-                PlexPlayer plexPlayer = DataUtils.getPlayer(player.getUniqueId());
                 if (!player.hasPermission("plex.libsdisguises.bypass"))
                 {
                     DisguiseAPI.undisguiseToAll(player);
@@ -170,7 +170,7 @@ public class DisguiseListener extends PlexListener
                 commands.addAll(commandList);
             }
         }
-        PlexLog.log("Successfully fetched all LibsDisguises commands!");
+        api.logging().info("Successfully fetched all LibsDisguises commands!");
         return commands;
     }
 }

src/main/resources/module.yml

@@ -1,4 +1,5 @@
 name: Module-LibsDisguises
 main: dev.plex.LibsDisguises
 description: Control LibsDisguises with Plex
-version: 1.6
+version: 2.0
+apiCompatibility: 1