Skip to content

Commit 99e2bdd

Browse files
committed
fix: MiniPlaceholders v3
- Upgrade MiniPlaceholders dependency to v3.1.0 - Fix MiniPlaceholders placeholders not working when PlaceholderAPI is installed
1 parent fb84885 commit 99e2bdd

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
compileOnly("me.clip:placeholderapi:2.11.6")
3939
compileOnly("com.arcaniax:HeadDatabase-API:1.3.2")
4040
compileOnly("com.github.cryptomorin:XSeries:13.3.3")
41-
compileOnly("io.github.miniplaceholders:miniplaceholders-api:2.3.0")
41+
compileOnly("io.github.miniplaceholders:miniplaceholders-api:3.1.0")
4242
compileOnly("com.github.koca2000:NoteBlockAPI:1.6.2")
4343
}
4444

src/main/java/me/zetastormy/akropolis/util/text/PlaceholderUtil.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,12 @@ public static Component setPlaceholders(String rawText, Player player) {
5454
.replace("<world>", player.getWorld().getName())
5555
.replace("<location>", formatLocation(player.getLocation()));
5656

57-
if (papi) return TextUtil.parse(text, papiTag(player));
58-
if (miniplaceholders) return TextUtil.parse(text, MiniPlaceholders.getAudienceGlobalPlaceholders(player));
57+
return TextUtil.parse(
58+
text,
59+
player,
60+
(papi) ? papiTag(player) : TagResolver.empty(),
61+
(miniplaceholders) ? MiniPlaceholders.audienceGlobalPlaceholders() : TagResolver.empty()
62+
);
5963
}
6064

6165
return TextUtil.parse(text);

src/main/java/me/zetastormy/akropolis/util/text/TextUtil.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
package me.zetastormy.akropolis.util.text;
2121

22+
import net.kyori.adventure.pointer.Pointered;
2223
import org.bukkit.Color;
2324

2425
import net.kyori.adventure.text.Component;
@@ -41,6 +42,10 @@ public static Component parse(String message, TagResolver resolver) {
4142
return MINI_MESSAGE.deserialize(message, resolver);
4243
}
4344

45+
public static Component parse(String message, Pointered target, TagResolver... resolver) {
46+
return MINI_MESSAGE.deserialize(message, target, resolver);
47+
}
48+
4449
public static String raw(Component message) {
4550
return MINI_MESSAGE.serialize(message).replaceAll("\\\\<", "<");
4651
}

0 commit comments

Comments
 (0)