diff --git a/build.gradle.kts b/build.gradle.kts index 4d4c5f7..63b4626 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { compileOnly("me.clip:placeholderapi:2.11.6") compileOnly("com.arcaniax:HeadDatabase-API:1.3.2") compileOnly("com.github.cryptomorin:XSeries:13.3.3") - compileOnly("io.github.miniplaceholders:miniplaceholders-api:2.3.0") + compileOnly("io.github.miniplaceholders:miniplaceholders-api:3.1.0") compileOnly("com.github.koca2000:NoteBlockAPI:1.6.2") } diff --git a/src/main/java/me/zetastormy/akropolis/util/text/PlaceholderUtil.java b/src/main/java/me/zetastormy/akropolis/util/text/PlaceholderUtil.java index fb8771a..c1aefac 100644 --- a/src/main/java/me/zetastormy/akropolis/util/text/PlaceholderUtil.java +++ b/src/main/java/me/zetastormy/akropolis/util/text/PlaceholderUtil.java @@ -54,8 +54,12 @@ public static Component setPlaceholders(String rawText, Player player) { .replace("", player.getWorld().getName()) .replace("", formatLocation(player.getLocation())); - if (papi) return TextUtil.parse(text, papiTag(player)); - if (miniplaceholders) return TextUtil.parse(text, MiniPlaceholders.getAudienceGlobalPlaceholders(player)); + return TextUtil.parse( + text, + player, + (papi) ? papiTag(player) : TagResolver.empty(), + (miniplaceholders) ? MiniPlaceholders.audienceGlobalPlaceholders() : TagResolver.empty() + ); } return TextUtil.parse(text); diff --git a/src/main/java/me/zetastormy/akropolis/util/text/TextUtil.java b/src/main/java/me/zetastormy/akropolis/util/text/TextUtil.java index 598fd4c..c7c7dae 100644 --- a/src/main/java/me/zetastormy/akropolis/util/text/TextUtil.java +++ b/src/main/java/me/zetastormy/akropolis/util/text/TextUtil.java @@ -19,6 +19,7 @@ package me.zetastormy.akropolis.util.text; +import net.kyori.adventure.pointer.Pointered; import org.bukkit.Color; import net.kyori.adventure.text.Component; @@ -41,6 +42,10 @@ public static Component parse(String message, TagResolver resolver) { return MINI_MESSAGE.deserialize(message, resolver); } + public static Component parse(String message, Pointered target, TagResolver... resolver) { + return MINI_MESSAGE.deserialize(message, target, resolver); + } + public static String raw(Component message) { return MINI_MESSAGE.serialize(message).replaceAll("\\\\<", "<"); }