Fix components formatting not converting properly from bukkit -> kyori

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ com-mojang-authlib-new = "6.0.54"
 commons-lang-commons-lang = "2.6"
 io-netty-netty-buffer = "4.1.90.Final"
 io-netty-netty-codec = "4.1.90.Final"
-io-papermc-paper-paper-api = "1.20.3-R0.1-SNAPSHOT"
+io-papermc-paper-paper-api = "1.21.1-R0.1-SNAPSHOT"
 net-kyori-adventure-api = "4.17.0"
 net-kyori-adventure-text-minimessage = "4.17.0"
 net-kyori-adventure-text-serializer-gson = "4.17.0"

plugin/build.gradle.kts

@@ -12,9 +12,9 @@ dependencies {
     compileOnly(libs.io.netty.netty.codec)
     compileOnly(libs.commons.lang.commons.lang)
     compileOnly(libs.com.mojang.authlib.new)
+    compileOnly(libs.io.papermc.paper.paper.api);
     compileOnly(libs.org.spigotmc.spigot.api)
     compileOnly(libs.com.retro.packetevents)
-    compileOnly(libs.io.papermc.paper.paper.api);
     compileOnly(libs.it.unimi.dsi.fastutil)
     compileOnly(libs.placeholder.api)
 }

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/LibsEquipment.java

@@ -228,6 +228,17 @@ public class LibsEquipment implements EntityEquipment {
         throw new UnsupportedOperationException("This is not supported on a disguise");
     }
 
+    //@Override
+    @Deprecated
+    public float getDropChance(EquipmentSlot equipmentSlot) {
+        return 0;
+    }
+
+    //@Override
+    @Deprecated
+    public void setDropChance(EquipmentSlot equipmentSlot, float v) {
+    }
+
     //@Override
     @Deprecated
     public void setBoots(ItemStack boots, boolean silent) {

plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java

@@ -289,7 +289,21 @@ public class DisguiseUtilities {
     @Getter
     private static final char[] alphabet = "0123456789abcdefghijklmnopqrstuvwxyz".toCharArray();
     private static final Pattern urlMatcher = Pattern.compile("^(?:(https?)://)?([-\\w_.]{2,}\\.[a-z]{2,4})(/\\S*)?$");
+    /**
+     * -- GETTER --
+     *  Returns the list of people who have /disguiseViewSelf toggled
+     *
+     * @return
+     */
+    @Getter
     private final static List<UUID> viewSelf = new ArrayList<>();
+    /**
+     * -- GETTER --
+     *  Returns the list of people who have /disguiseviewbar toggled
+     *
+     * @return
+     */
+    @Getter
     private final static List<UUID> viewBar = new ArrayList<>();
     private static long lastSavedPreferences;
     @Getter
@@ -441,45 +455,62 @@ public class DisguiseUtilities {
         }.runTaskLater(LibsDisguises.getInstance(), 20 * TimeUnit.SECONDS.toMillis(120));
     }
 
-    /**
-     * Returns the list of people who have /disguiseViewSelf toggled
-     *
-     * @return
-     */
-    public static List<UUID> getViewSelf() {
-        return viewSelf;
-    }
-
-    public static String getDisplayName(CommandSender player) {
-        if (player == null) {
+    public static String getDisplayName(CommandSender commandSender) {
+        if (commandSender == null) {
             return "???";
         }
 
-        if (!(player instanceof Player)) {
-            return player.getName();
+        if (!(commandSender instanceof Player)) {
+            return commandSender.getName();
         }
 
-        Team team = ((Player) player).getScoreboard().getEntryTeam(player.getName());
+        Player player = (Player) commandSender;
+
+        Team team = player.getScoreboard().getEntryTeam(commandSender.getName());
 
         if (team == null) {
-            team = ((Player) player).getScoreboard().getEntryTeam(((Player) player).getUniqueId().toString());
+            team = player.getScoreboard().getEntryTeam(player.getUniqueId().toString());
         }
 
         String name;
 
         if (team == null || (StringUtils.isEmpty(team.getPrefix()) && StringUtils.isEmpty(team.getSuffix()))) {
-            name = ((Player) player).getDisplayName();
+            // Only in paper on 1.16+ can we fetch this via component
+            if (isRunningPaper() && NmsVersion.v1_16.isSupported()) {
+                name = toMiniMessage(player.displayName());
 
-            if (name.equals(player.getName())) {
-                name = ((Player) player).getPlayerListName();
+                if (name.equals(player.getName())) {
+                    name = toMiniMessage(player.playerListName());
+                }
+            } else {
+                name = player.getDisplayName();
+
+                if (name.equals(player.getName())) {
+                    name = player.getPlayerListName();
+                }
             }
         } else {
-            name = team.getPrefix() + team.getColor() + player.getName() + team.getSuffix();
+            // Only in paper on 1.16+ can we fetch the prefix & suffix via component
+            if (isRunningPaper() && NmsVersion.v1_16.isSupported()) {
+                // This nasty workaround is because kyori isn't able to tell if "&lText &cHere" should have "Here" bold or not.
+                // Normally the &c would have reset it, but (checked on 1.21) using getPrefix will return the above text when the "Here"
+                // should explicitly not be bold
+                // That is expected, however Kyori minimessage parses it as bold.
+                // It's treating the string as "<bold>text <red>here</red></bold>" instead of "<bold>text </bold><red>here</red>"
+                name = toMiniMessage(team.prefix()) + team.getColor() + player.getName() + toMiniMessage(team.suffix());
+            } else {
+                name = team.getPrefix() + team.getColor() + player.getName() + team.getSuffix();
+            }
         }
 
         return getHexedColors(name);
     }
 
+    private static String toMiniMessage(Component component) {
+        // Why do we run this through two serializers? Because the alternative is that we shade 2 versions of minimessage instead of just 1.
+        return getMiniMessage().serialize(internalComponentSerializer.deserialize(externalComponentSerializer.serialize(component)));
+    }
+
     public static String getHexedColors(String string) {
         if (string == null) {
             return string;
@@ -632,15 +663,6 @@ public class DisguiseUtilities {
         }
     }
 
-    /**
-     * Returns the list of people who have /disguiseviewbar toggled
-     *
-     * @return
-     */
-    public static List<UUID> getViewBar() {
-        return viewBar;
-    }
-
     public static void setPlayerVelocity(Player player) {
         velocityTimes.put(player.getEntityId(),
             NmsVersion.v1_19_R3.isSupported() ? player.getWorld().getGameTime() : System.currentTimeMillis());
@@ -2822,10 +2844,12 @@ public class DisguiseUtilities {
             message = message.replace("§" + color.getChar(), "<" + color.name().toLowerCase(Locale.ENGLISH) + ">");
         }
 
-        // The <underline> thing is because the proper syntax is <underlined> but it's not consistant among several plugins including
+        // The <underline> thing is because the proper syntax is <underlined> but the tag name is not consistant among several plugins
+        // including
         // Essentials & Kyori
-        String serialized = internalComponentSerializer.serialize(getMiniMessage().deserialize(
-            message.replace("<underline>", "<underlined>").replace("</underline>", "</underlined>").replace("§", "&")));
+        message = message.replace("<underline>", "<underlined>").replace("</underline>", "</underlined>");
+
+        String serialized = internalComponentSerializer.serialize(getMiniMessage().deserialize(message.replace("§", "&")));
 
         return externalComponentSerializer.deserialize(serialized);
     }