Skip to content

Commit 078d026

Browse files
Bump io.github.miniplaceholders:miniplaceholders-api from 2.3.0 to 3.0.1 (#6)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: hsgamer <huynhqtienvtag@gmail.com>
1 parent 3c75dd2 commit 078d026

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

query-forward/miniplaceholders/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<dependency>
2626
<groupId>io.github.miniplaceholders</groupId>
2727
<artifactId>miniplaceholders-api</artifactId>
28-
<version>2.3.0</version>
28+
<version>3.0.1</version>
2929
<scope>provided</scope>
3030
</dependency>
3131
<dependency>
3232
<groupId>io.papermc.paper</groupId>
3333
<artifactId>paper-api</artifactId>
34-
<version>1.19.4-R0.1-SNAPSHOT</version>
34+
<version>1.21.8-R0.1-SNAPSHOT</version>
3535
<scope>provided</scope>
3636
</dependency>
3737
<dependency>

query-forward/miniplaceholders/src/main/java/me/hsgamer/topper/spigot/query/forward/miniplaceholders/MiniPlaceholdersQueryForwarder.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.hsgamer.topper.spigot.query.forward.miniplaceholders;
22

33
import io.github.miniplaceholders.api.Expansion;
4-
import io.github.miniplaceholders.api.utils.TagsUtils;
4+
import io.github.miniplaceholders.api.utils.Tags;
55
import me.hsgamer.topper.query.forward.QueryForwardContext;
66
import net.kyori.adventure.text.Component;
77
import net.kyori.adventure.text.minimessage.tag.Tag;
@@ -33,16 +33,15 @@ public void accept(C queryContext) {
3333
String query = String.join(":", args);
3434
String result = queryContext.getQuery().apply(uuid, query).result;
3535
if (result == null) {
36-
return TagsUtils.EMPTY_TAG;
36+
return Tags.EMPTY_TAG;
3737
} else {
3838
return Tag.selfClosingInserting(Component.text(result));
3939
}
4040
};
4141

4242
Expansion expansion = Expansion.builder("topper")
4343
.globalPlaceholder("global", (queue, context) -> queryFunction.apply(null, queue))
44-
.filter(Player.class)
45-
.audiencePlaceholder("player", (audience, queue, ctx) -> queryFunction.apply(((Player) audience).getUniqueId(), queue))
44+
.audiencePlaceholder(Player.class, "player", (audience, queue, ctx) -> queryFunction.apply(audience.getUniqueId(), queue))
4645
.build();
4746

4847
expansion.register();

value/miniplaceholders/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<dependency>
2626
<groupId>io.github.miniplaceholders</groupId>
2727
<artifactId>miniplaceholders-api</artifactId>
28-
<version>2.3.0</version>
28+
<version>3.0.1</version>
2929
<scope>provided</scope>
3030
</dependency>
3131
<dependency>
3232
<groupId>io.papermc.paper</groupId>
3333
<artifactId>paper-api</artifactId>
34-
<version>1.19.4-R0.1-SNAPSHOT</version>
34+
<version>1.21.8-R0.1-SNAPSHOT</version>
3535
<scope>provided</scope>
3636
</dependency>
3737
</dependencies>

value/miniplaceholders/src/main/java/me/hsgamer/topper/spigot/value/miniplaceholders/MiniPlaceholderValueProvider.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import me.hsgamer.topper.value.core.ValueWrapper;
66
import net.kyori.adventure.text.Component;
77
import net.kyori.adventure.text.minimessage.MiniMessage;
8+
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
89
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
910
import org.bukkit.entity.Player;
1011
import org.jetbrains.annotations.NotNull;
@@ -26,10 +27,8 @@ private static String normalizePlaceholder(String placeholder) {
2627
public @NotNull ValueWrapper<String> apply(@NotNull Player key) {
2728
String parsed;
2829
try {
29-
Component component = MiniMessage.miniMessage().deserialize(placeholder,
30-
MiniPlaceholders.getAudiencePlaceholders(key),
31-
MiniPlaceholders.getGlobalPlaceholders()
32-
);
30+
TagResolver tagResolver = MiniPlaceholders.audienceGlobalPlaceholders();
31+
Component component = MiniMessage.miniMessage().deserialize(placeholder, key, tagResolver);
3332
parsed = PlainTextComponentSerializer.plainText().serialize(component).trim();
3433
} catch (Exception e) {
3534
return ValueWrapper.error("Error while parsing the placeholder: " + placeholder, e);

0 commit comments

Comments
 (0)