diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/placeholder/FabricPlaceholderApiIntegration.java b/fabric/src/main/java/me/lucko/luckperms/fabric/placeholder/FabricPlaceholderApiIntegration.java index b2d0c662e..b5b9deabe 100644 --- a/fabric/src/main/java/me/lucko/luckperms/fabric/placeholder/FabricPlaceholderApiIntegration.java +++ b/fabric/src/main/java/me/lucko/luckperms/fabric/placeholder/FabricPlaceholderApiIntegration.java @@ -25,17 +25,16 @@ package me.lucko.luckperms.fabric.placeholder; +import eu.pb4.placeholders.api.ParserContext; import eu.pb4.placeholders.api.PlaceholderResult; import eu.pb4.placeholders.api.Placeholders; import eu.pb4.placeholders.api.ServerPlaceholderContext; -import me.lucko.luckperms.common.minecraft.MinecraftSenderFactory; +import eu.pb4.placeholders.api.parsers.NodeParser; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.placeholders.Placeholder; import me.lucko.luckperms.common.placeholders.PlaceholderContext; import me.lucko.luckperms.common.placeholders.PlaceholderRegistry; import me.lucko.luckperms.fabric.LPFabricPlugin; -import net.kyori.adventure.text.TextComponent; -import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.luckperms.api.query.QueryOptions; import net.minecraft.network.chat.Component; import net.minecraft.resources.Identifier; @@ -57,6 +56,8 @@ public class FabricPlaceholderApiIntegration { } } + private static final NodeParser NODE_PARSER = NodeParser.builder().legacyAll().simplifiedTextFormat().quickText().build(); + private record Handler(LPFabricPlugin plugin, Placeholder placeholder) implements eu.pb4.placeholders.api.Placeholder.Handler { @Override public PlaceholderResult onPlaceholderRequest(ServerPlaceholderContext context, String argument) { @@ -85,8 +86,7 @@ public class FabricPlaceholderApiIntegration { if (input == null) { return null; } - TextComponent component = LegacyComponentSerializer.legacySection().deserialize(input); - return MinecraftSenderFactory.toNativeText(component); + return NODE_PARSER.parseComponent(input, ParserContext.of()); } private static PlaceholderResult toResult(Component component) { diff --git a/hytale/loader-with-deps/build.gradle b/hytale/loader-with-deps/build.gradle index a3b7df5c9..3b7a231a0 100644 --- a/hytale/loader-with-deps/build.gradle +++ b/hytale/loader-with-deps/build.gradle @@ -3,7 +3,7 @@ plugins { } tasks.configureEach { - enabled = false + //enabled = false } dependencies {