diff --git a/common/src/main/java/net/draycia/carbon/common/messages/CarbonMessageRenderer.java b/common/src/main/java/net/draycia/carbon/common/messages/CarbonMessageRenderer.java index 2aec14d4f..86428d7b7 100644 --- a/common/src/main/java/net/draycia/carbon/common/messages/CarbonMessageRenderer.java +++ b/common/src/main/java/net/draycia/carbon/common/messages/CarbonMessageRenderer.java @@ -21,12 +21,13 @@ import net.kyori.adventure.audience.Audience; import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.tag.Tag; import net.kyori.moonshine.message.IMessageRenderer; @FunctionalInterface -public interface CarbonMessageRenderer extends IMessageRenderer { +public interface CarbonMessageRenderer extends IMessageRenderer { - default IMessageRenderer asSourced() { + default IMessageRenderer asSourced() { return this::render; } diff --git a/common/src/main/java/net/draycia/carbon/common/messages/placeholders/BooleanPlaceholderResolver.java b/common/src/main/java/net/draycia/carbon/common/messages/placeholders/BooleanPlaceholderResolver.java index 491ea20e0..f0b5d92a4 100644 --- a/common/src/main/java/net/draycia/carbon/common/messages/placeholders/BooleanPlaceholderResolver.java +++ b/common/src/main/java/net/draycia/carbon/common/messages/placeholders/BooleanPlaceholderResolver.java @@ -22,18 +22,17 @@ import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.Map; -import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.tag.Tag; import net.kyori.moonshine.placeholder.ConclusionValue; import net.kyori.moonshine.placeholder.ContinuanceValue; import net.kyori.moonshine.placeholder.IPlaceholderResolver; import net.kyori.moonshine.util.Either; import org.checkerframework.checker.nullness.qual.Nullable; -public class BooleanPlaceholderResolver implements IPlaceholderResolver { +public class BooleanPlaceholderResolver implements IPlaceholderResolver { @Override - public @Nullable Map, ContinuanceValue>> - resolve( + public @Nullable Map, ContinuanceValue>> resolve( final String placeholderName, final Boolean value, final R receiver, @@ -42,10 +41,10 @@ public class BooleanPlaceholderResolver implements IPlaceholderResolver implements IPlaceholderResolver { +public class ComponentPlaceholderResolver implements IPlaceholderResolver { @Override - public @Nullable Map, ContinuanceValue>> - resolve( + public @Nullable Map, ContinuanceValue>> resolve( final String placeholderName, final Component value, final R receiver, @@ -44,7 +44,7 @@ public class ComponentPlaceholderResolver implements IPlaceholderResolver implements IPlaceholderResolver { +public class IntPlaceholderResolver implements IPlaceholderResolver { @Override - public @Nullable Map, ContinuanceValue>> resolve( + public @Nullable Map, ContinuanceValue>> resolve( final String placeholderName, final Integer value, final R receiver, @@ -40,7 +40,7 @@ public class IntPlaceholderResolver implements IPlaceholderResolver implements IPlaceholderResolver { +public class KeyPlaceholderResolver implements IPlaceholderResolver { @Override - public @Nullable Map, ContinuanceValue>> - resolve( + public @Nullable Map, ContinuanceValue>> resolve( final String placeholderName, final Key value, final R receiver, @@ -42,7 +41,7 @@ public class KeyPlaceholderResolver implements IPlaceholderResolver implements IPlaceholderResolver { +public class StringPlaceholderResolver implements IPlaceholderResolver { @Override - public @Nullable Map, ContinuanceValue>> - resolve( + public @Nullable Map, ContinuanceValue>> resolve( final String placeholderName, final String value, final R receiver, @@ -41,7 +40,7 @@ public class StringPlaceholderResolver implements IPlaceholderResolver implements IPlaceholderResolver { +public class UUIDPlaceholderResolver implements IPlaceholderResolver { @Override - public @Nullable Map, ContinuanceValue>> - resolve( + public @Nullable Map, ContinuanceValue>> resolve( final String placeholderName, final UUID value, final R receiver, @@ -45,7 +44,7 @@ public class UUIDPlaceholderResolver implements IPlaceholderResolver resolvedPlaceholders, + final Map resolvedPlaceholders, final Method method, final Type owner ) { final TagResolver.Builder tagResolver = TagResolver.builder(); for (final var entry : resolvedPlaceholders.entrySet()) { - tagResolver.tag(entry.getKey(), Tag.inserting(entry.getValue())); + tagResolver.tag(entry.getKey(), entry.getValue()); } final String placeholderResolvedMessage = this.configManager.primaryConfig().applyCustomPlaceholders(intermediateMessage); diff --git a/paper/src/main/java/net/draycia/carbon/paper/messages/PaperMessageRenderer.java b/paper/src/main/java/net/draycia/carbon/paper/messages/PaperMessageRenderer.java index 217c13cc5..ce1fb81b6 100644 --- a/paper/src/main/java/net/draycia/carbon/paper/messages/PaperMessageRenderer.java +++ b/paper/src/main/java/net/draycia/carbon/paper/messages/PaperMessageRenderer.java @@ -71,14 +71,14 @@ public PaperMessageRenderer(final ConfigManager configManager) { public Component render( final Audience receiver, final String intermediateMessage, - final Map resolvedPlaceholders, + final Map resolvedPlaceholders, final Method method, final Type owner ) { final TagResolver.Builder tagResolver = TagResolver.builder(); for (final var entry : resolvedPlaceholders.entrySet()) { - tagResolver.tag(entry.getKey(), Tag.inserting(entry.getValue())); + tagResolver.tag(entry.getKey(), entry.getValue()); } final String placeholderResolvedMessage = this.configManager.primaryConfig().applyCustomPlaceholders(intermediateMessage); diff --git a/velocity/src/main/java/net/draycia/carbon/velocity/VelocityMessageRenderer.java b/velocity/src/main/java/net/draycia/carbon/velocity/VelocityMessageRenderer.java index c993e2ceb..27dfac70d 100644 --- a/velocity/src/main/java/net/draycia/carbon/velocity/VelocityMessageRenderer.java +++ b/velocity/src/main/java/net/draycia/carbon/velocity/VelocityMessageRenderer.java @@ -56,14 +56,14 @@ public VelocityMessageRenderer(final ConfigManager configManager, final PluginMa public Component render( final Audience receiver, final String intermediateMessage, - final Map resolvedPlaceholders, + final Map resolvedPlaceholders, final Method method, final Type owner ) { final TagResolver.Builder tagResolver = TagResolver.builder(); for (final var entry : resolvedPlaceholders.entrySet()) { - tagResolver.tag(entry.getKey(), Tag.inserting(entry.getValue())); + tagResolver.tag(entry.getKey(), entry.getValue()); } final String placeholderResolvedMessage = this.configManager.primaryConfig().applyCustomPlaceholders(intermediateMessage);