From 1853d1590f38d9dbf19a67df3a89b5b8facbc41d Mon Sep 17 00:00:00 2001 From: youhavetrouble Date: Sun, 6 Aug 2023 19:44:55 +0200 Subject: [PATCH] potential workaround for placeholders returning minimessage format --- build.gradle.kts | 2 +- .../notjustnameplates/text/TextParser.java | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index dcd3361..3f2454f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "me.youhavetrouble" -version = "1.2.0" +version = "1.2.1-pre1" description = "Nameplates using display entities" java { diff --git a/src/main/java/me/youhavetrouble/notjustnameplates/text/TextParser.java b/src/main/java/me/youhavetrouble/notjustnameplates/text/TextParser.java index 1c47245..16c01e2 100644 --- a/src/main/java/me/youhavetrouble/notjustnameplates/text/TextParser.java +++ b/src/main/java/me/youhavetrouble/notjustnameplates/text/TextParser.java @@ -29,18 +29,22 @@ public class TextParser { final String placeholder = argumentQueue.popOr("placeholder tag requires an argument").value(); switch (placeholder) { case "name" -> { - return Tag.selfClosingInserting(player.name()) ; + return Tag.selfClosingInserting(player.name()); } case "displayname" -> { return Tag.selfClosingInserting(player.displayName()); } default -> { - if (NotJustNameplates.isPapiHooked()) { - final String parsedPlaceholder = PlaceholderAPI.setPlaceholders(player, '%' + placeholder + '%'); + if (!NotJustNameplates.isPapiHooked()) return Tag.selfClosingInserting(Component.text(placeholder)); + + final String parsedPlaceholder = PlaceholderAPI.setPlaceholders(player, '%' + placeholder + '%'); + + if (parsedPlaceholder.contains(LegacyComponentSerializer.SECTION_CHAR + "")) { Component componentPlaceholder = LegacyComponentSerializer.legacySection().deserialize(parsedPlaceholder); return Tag.selfClosingInserting(componentPlaceholder); } - return Tag.selfClosingInserting(Component.text(placeholder)); + + return Tag.selfClosingInserting(MiniMessage.miniMessage().deserialize(parsedPlaceholder)); } }