From 69cef6f72b17358e71f5e3f5e7ca0e718fe13563 Mon Sep 17 00:00:00 2001 From: Justin <33465177+BitByLogics@users.noreply.github.com> Date: Thu, 12 Feb 2026 20:38:31 -0500 Subject: [PATCH] Renamed `serializer` to `deserializer` --- .../clip/placeholderapi/PAPIComponents.java | 50 +++++++++---------- .../replacer/ComponentReplacer.java | 24 ++++----- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/paper/java/me/clip/placeholderapi/PAPIComponents.java b/src/paper/java/me/clip/placeholderapi/PAPIComponents.java index 3e695df..1eeedf0 100644 --- a/src/paper/java/me/clip/placeholderapi/PAPIComponents.java +++ b/src/paper/java/me/clip/placeholderapi/PAPIComponents.java @@ -61,19 +61,19 @@ public final class PAPIComponents { * * @param player Player to parse the placeholders against * @param component Component to set the placeholder values in - * @param serializer Optional function to serialize parsed placeholder values into ComponentLike + * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike * @return Component containing all translated placeholders */ @NotNull - public static Component setPlaceholders(final OfflinePlayer player, @NotNull final Component component, @Nullable Function serializer) { + public static Component setPlaceholders(final OfflinePlayer player, @NotNull final Component component, @Nullable Function deserializer) { if (PlaceholderAPIPlugin.getInstance().getPlaceholderAPIConfig().useAdventureProvidedReplacer()) { return component.replaceText(config -> config.match(PlaceholderAPI.PLACEHOLDER_PATTERN).replacement((result, builder) -> { String parsed = PERCENT_EXACT_REPLACER.apply(result.group(), player, PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()::getExpansion); - return serializer == null ? builder.content(parsed) : serializer.apply(parsed); + return deserializer == null ? builder.content(parsed) : deserializer.apply(parsed); })); } - return ComponentReplacer.replace(component, str -> PlaceholderAPI.setPlaceholders(player, str), serializer == null ? null : s -> serializer.apply(s).asComponent()); + return ComponentReplacer.replace(component, str -> PlaceholderAPI.setPlaceholders(player, str), deserializer == null ? null : s -> deserializer.apply(s).asComponent()); } /** @@ -95,12 +95,12 @@ public final class PAPIComponents { * * @param player Player to parse the placeholders against * @param components List of Components to set the placeholder values in - * @param serializer Optional function to serialize parsed placeholder values into ComponentLike + * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike * @return List of Components containing all translated placeholders */ @NotNull - public static List setPlaceholders(final OfflinePlayer player, @NotNull final List components, @Nullable Function serializer) { - return components.stream().map(component -> setPlaceholders(player, component, serializer == null ? null : s -> serializer.apply(s).asComponent())).collect(Collectors.toList()); + public static List setPlaceholders(final OfflinePlayer player, @NotNull final List components, @Nullable Function deserializer) { + return components.stream().map(component -> setPlaceholders(player, component, deserializer == null ? null : s -> deserializer.apply(s).asComponent())).collect(Collectors.toList()); } /** @@ -122,12 +122,12 @@ public final class PAPIComponents { * * @param player Player to parse the placeholders against * @param component Component to set the placeholder values in - * @param serializer Optional function to serialize parsed placeholder values into ComponentLike + * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike * @return Component containing all translated placeholders */ @NotNull - public static Component setPlaceholders(final Player player, @NotNull final Component component, @Nullable Function serializer) { - return setPlaceholders((OfflinePlayer) player, component, serializer); + public static Component setPlaceholders(final Player player, @NotNull final Component component, @Nullable Function deserializer) { + return setPlaceholders((OfflinePlayer) player, component, deserializer); } /** @@ -149,12 +149,12 @@ public final class PAPIComponents { * * @param player Player to parse the placeholders against * @param components List of Components to set the placeholder values in - * @param serializer Optional function to serialize parsed placeholder values into ComponentLike + * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike * @return List of components containing all translated placeholders */ @NotNull - public static List setPlaceholders(final Player player, @NotNull final List components, @Nullable Function serializer) { - return setPlaceholders((OfflinePlayer) player, components, serializer); + public static List setPlaceholders(final Player player, @NotNull final List components, @Nullable Function deserializer) { + return setPlaceholders((OfflinePlayer) player, components, deserializer); } /** @@ -176,17 +176,17 @@ public final class PAPIComponents { * * @param player Player to parse the placeholders against * @param component Component to set the placeholder values in - * @param serializer Optional function to serialize parsed placeholder values into ComponentLike + * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike * @return Component containing all translated placeholders */ @NotNull - public static Component setBracketPlaceholders(final OfflinePlayer player, @NotNull final Component component, @Nullable Function serializer) { + public static Component setBracketPlaceholders(final OfflinePlayer player, @NotNull final Component component, @Nullable Function deserializer) { if (PlaceholderAPIPlugin.getInstance().getPlaceholderAPIConfig().useAdventureReplacer()) { return component.replaceText(config -> config.match(PlaceholderAPI.BRACKET_PLACEHOLDER_PATTERN).replacement((result, builder) -> builder.content(BRACKET_EXACT_REPLACER.apply(result.group(), player, PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()::getExpansion)))); } - return ComponentReplacer.replace(component, str -> PlaceholderAPI.setBracketPlaceholders(player, str), serializer == null ? null : s -> serializer.apply(s).asComponent()); + return ComponentReplacer.replace(component, str -> PlaceholderAPI.setBracketPlaceholders(player, str), deserializer == null ? null : s -> deserializer.apply(s).asComponent()); } /** @@ -208,12 +208,12 @@ public final class PAPIComponents { * * @param player Player to parse the placeholders against * @param components List of Components to set the placeholder values in - * @param serializer Optional function to serialize parsed placeholder values into ComponentLike + * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike * @return List of Components containing all translated placeholders */ @NotNull - public static List setBracketPlaceholders(final OfflinePlayer player, @NotNull final List components, @Nullable Function serializer) { - return components.stream().map(component -> setBracketPlaceholders(player, component, serializer)).collect(Collectors.toList()); + public static List setBracketPlaceholders(final OfflinePlayer player, @NotNull final List components, @Nullable Function deserializer) { + return components.stream().map(component -> setBracketPlaceholders(player, component, deserializer)).collect(Collectors.toList()); } /** @@ -235,12 +235,12 @@ public final class PAPIComponents { * * @param player Player to parse the placeholders against * @param component Component to set the placeholder values in - * @param serializer Optional function to serialize parsed placeholder values into ComponentLike + * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike * @return Component containing all translated placeholders */ @NotNull - public static Component setBracketPlaceholders(final Player player, @NotNull final Component component, @Nullable Function serializer) { - return setBracketPlaceholders((OfflinePlayer) player, component, serializer); + public static Component setBracketPlaceholders(final Player player, @NotNull final Component component, @Nullable Function deserializer) { + return setBracketPlaceholders((OfflinePlayer) player, component, deserializer); } /** @@ -262,12 +262,12 @@ public final class PAPIComponents { * * @param player Player to parse the placeholders against * @param components List of Components to set the placeholder values in - * @param serializer Optional function to serialize parsed placeholder values into ComponentLike + * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike * @return List of Components containing all translated placeholders */ @NotNull - public static List setBracketPlaceholders(final Player player, @NotNull final List components, @Nullable Function serializer) { - return setBracketPlaceholders((OfflinePlayer) player, components, serializer); + public static List setBracketPlaceholders(final Player player, @NotNull final List components, @Nullable Function deserializer) { + return setBracketPlaceholders((OfflinePlayer) player, components, deserializer); } /** diff --git a/src/paper/java/me/clip/placeholderapi/replacer/ComponentReplacer.java b/src/paper/java/me/clip/placeholderapi/replacer/ComponentReplacer.java index f0b9a8b..cfa593b 100644 --- a/src/paper/java/me/clip/placeholderapi/replacer/ComponentReplacer.java +++ b/src/paper/java/me/clip/placeholderapi/replacer/ComponentReplacer.java @@ -18,25 +18,25 @@ import java.util.function.Function; public class ComponentReplacer { @NotNull - public static Component replace(@NotNull final Component component, @NotNull final Function replacer, @Nullable final Function serializer) { - return rebuild(component, replacer, serializer); + public static Component replace(@NotNull final Component component, @NotNull final Function replacer, @Nullable final Function deserializer) { + return rebuild(component, replacer, deserializer); } @NotNull - private static Component rebuild(@NotNull final Component component, @NotNull final Function replacer, @Nullable final Function serializer) { + private static Component rebuild(@NotNull final Component component, @NotNull final Function replacer, @Nullable final Function deserializer) { Component rebuilt; if (component instanceof TextComponent) { final TextComponent text = (TextComponent) component; final String replaced = replacer.apply(text.content()); - rebuilt = serializer == null ? Component.text(replaced) : serializer.apply(replaced); + rebuilt = deserializer == null ? Component.text(replaced) : deserializer.apply(replaced); } else if (component instanceof TranslatableComponent) { final TranslatableComponent translatable = (TranslatableComponent) component; final List arguments = new ArrayList<>(); for (final ComponentLike arg : translatable.arguments()) { - arguments.add(rebuild(arg.asComponent(), replacer, serializer)); + arguments.add(rebuild(arg.asComponent(), replacer, deserializer)); } rebuilt = Component.translatable(translatable.key(), arguments); @@ -53,12 +53,12 @@ public class ComponentReplacer { rebuilt = Component.empty(); } - rebuilt = rebuilt.style(rebuildStyle(component.style(), replacer, serializer)); + rebuilt = rebuilt.style(rebuildStyle(component.style(), replacer, deserializer)); if (!component.children().isEmpty()) { final List children = new ArrayList<>(); for (Component child : component.children()) { - children.add(rebuild(child, replacer, serializer)); + children.add(rebuild(child, replacer, deserializer)); } rebuilt = rebuilt.children(children); } @@ -67,7 +67,7 @@ public class ComponentReplacer { } @NotNull - private static Style rebuildStyle(@NotNull final Style style, @NotNull final Function replacer, @Nullable final Function serializer) { + private static Style rebuildStyle(@NotNull final Style style, @NotNull final Function replacer, @Nullable final Function deserializer) { final Style.Builder builder = style.toBuilder(); final ClickEvent click = style.clickEvent(); @@ -78,7 +78,7 @@ public class ComponentReplacer { final HoverEvent hover = style.hoverEvent(); if (hover != null) { - builder.hoverEvent(rebuildHoverEvent(hover, replacer, serializer)); + builder.hoverEvent(rebuildHoverEvent(hover, replacer, deserializer)); } return builder.build(); @@ -114,11 +114,11 @@ public class ComponentReplacer { } @NotNull - private static HoverEvent rebuildHoverEvent(@NotNull final HoverEvent hover, @NotNull final Function replacer, @Nullable final Function serializer) { + private static HoverEvent rebuildHoverEvent(@NotNull final HoverEvent hover, @NotNull final Function replacer, @Nullable final Function deserializer) { final Object value = hover.value(); if (value instanceof Component) { - final Component rebuilt = rebuild((Component) value, replacer, serializer); + final Component rebuilt = rebuild((Component) value, replacer, deserializer); return HoverEvent.showText(rebuilt); } @@ -131,7 +131,7 @@ public class ComponentReplacer { Component rebuiltName = null; if (entity.name() != null) { - rebuiltName = rebuild(entity.name(), replacer, serializer); + rebuiltName = rebuild(entity.name(), replacer, deserializer); } return HoverEvent.showEntity(entity.type(), entity.id(), rebuiltName);