Make non-component placeholders preProcessParsed

Hexaoxide · Sep 9, 2023 · 7a43d07 · 7a43d07
1 parent 9d6b1cc
commit 7a43d07
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 37 deletions.
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
@@ -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<Audience, String, Component, Component> {
+public interface CarbonMessageRenderer extends IMessageRenderer<Audience, String, Component, Tag> {
 
-    default IMessageRenderer<SourcedAudience, String, Component, Component> asSourced() {
+    default IMessageRenderer<SourcedAudience, String, Component, Tag> asSourced() {
         return this::render;
     }
 

diff --git a/...main/java/net/draycia/carbon/common/messages/placeholders/BooleanPlaceholderResolver.java b/...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<R> implements IPlaceholderResolver<R, Boolean, Component> {
+public class BooleanPlaceholderResolver<R> implements IPlaceholderResolver<R, Boolean, Tag> {
 
     @Override
-    public @Nullable Map<String, Either<ConclusionValue<? extends Component>, ContinuanceValue<?>>>
-    resolve(
+    public @Nullable Map<String, Either<ConclusionValue<? extends Tag>, ContinuanceValue<?>>> resolve(
         final String placeholderName,
         final Boolean value,
         final R receiver,
@@ -42,10 +41,10 @@ public class BooleanPlaceholderResolver<R> implements IPlaceholderResolver<R, Bo
         final @Nullable Object[] parameters
     ) {
         if (value == null) {
-            return Map.of(placeholderName, Either.left(ConclusionValue.conclusionValue(Component.text("false"))));
+            return Map.of(placeholderName, Either.left(ConclusionValue.conclusionValue(Tag.preProcessParsed("false"))));
         }
 
-        return Map.of(placeholderName, Either.left(ConclusionValue.conclusionValue(Component.text(value.toString()))));
+        return Map.of(placeholderName, Either.left(ConclusionValue.conclusionValue(Tag.preProcessParsed(value.toString()))));
     }
 
 }
diff --git a/...in/java/net/draycia/carbon/common/messages/placeholders/ComponentPlaceholderResolver.java b/...in/java/net/draycia/carbon/common/messages/placeholders/ComponentPlaceholderResolver.java
@@ -23,6 +23,7 @@
 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;
@@ -32,19 +33,18 @@
 import org.checkerframework.framework.qual.DefaultQualifier;
 
 @DefaultQualifier(NonNull.class)
-public class ComponentPlaceholderResolver<R> implements IPlaceholderResolver<R, Component, Component> {
+public class ComponentPlaceholderResolver<R> implements IPlaceholderResolver<R, Component, Tag> {
 
     @Override
-    public @Nullable Map<String, Either<ConclusionValue<? extends Component>, ContinuanceValue<?>>>
-    resolve(
+    public @Nullable Map<String, Either<ConclusionValue<? extends Tag>, ContinuanceValue<?>>> resolve(
         final String placeholderName,
         final Component value,
         final R receiver,
         final Type owner,
         final Method method,
         final @Nullable Object[] parameters
     ) {
-        return Map.of(placeholderName, Either.left(ConclusionValue.conclusionValue(value)));
+        return Map.of(placeholderName, Either.left(ConclusionValue.conclusionValue(Tag.inserting(value))));
     }
 
 }
diff --git a/...src/main/java/net/draycia/carbon/common/messages/placeholders/IntPlaceholderResolver.java b/...src/main/java/net/draycia/carbon/common/messages/placeholders/IntPlaceholderResolver.java
@@ -22,25 +22,25 @@
 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 IntPlaceholderResolver<R> implements IPlaceholderResolver<R, Integer, Component> {
+public class IntPlaceholderResolver<R> implements IPlaceholderResolver<R, Integer, Tag> {
 
     @Override
-    public @Nullable Map<String, Either<ConclusionValue<? extends Component>, ContinuanceValue<?>>> resolve(
+    public @Nullable Map<String, Either<ConclusionValue<? extends Tag>, ContinuanceValue<?>>> resolve(
         final String placeholderName,
         final Integer value,
         final R receiver,
         final Type owner,
         final Method method,
         final @Nullable Object[] parameters
     ) {
-        return Map.of(placeholderName, Either.left(ConclusionValue.conclusionValue(Component.text(value))));
+        return Map.of(placeholderName, Either.left(ConclusionValue.conclusionValue(Tag.preProcessParsed(String.valueOf(value)))));
     }
 
 }
diff --git a/...src/main/java/net/draycia/carbon/common/messages/placeholders/KeyPlaceholderResolver.java b/...src/main/java/net/draycia/carbon/common/messages/placeholders/KeyPlaceholderResolver.java
@@ -23,26 +23,25 @@
 import java.lang.reflect.Type;
 import java.util.Map;
 import net.kyori.adventure.key.Key;
-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 KeyPlaceholderResolver<R> implements IPlaceholderResolver<R, Key, Component> {
+public class KeyPlaceholderResolver<R> implements IPlaceholderResolver<R, Key, Tag> {
 
     @Override
-    public @Nullable Map<String, Either<ConclusionValue<? extends Component>, ContinuanceValue<?>>>
-    resolve(
+    public @Nullable Map<String, Either<ConclusionValue<? extends Tag>, ContinuanceValue<?>>> resolve(
         final String placeholderName,
         final Key value,
         final R receiver,
         final Type owner,
         final Method method,
         final @Nullable Object[] parameters
     ) {
-        return Map.of(placeholderName, Either.left(ConclusionValue.conclusionValue(Component.text(value.toString()))));
+        return Map.of(placeholderName, Either.left(ConclusionValue.conclusionValue(Tag.preProcessParsed(value.toString()))));
     }
 
 }
diff --git a/.../main/java/net/draycia/carbon/common/messages/placeholders/StringPlaceholderResolver.java b/.../main/java/net/draycia/carbon/common/messages/placeholders/StringPlaceholderResolver.java
@@ -22,26 +22,25 @@
 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 StringPlaceholderResolver<R> implements IPlaceholderResolver<R, String, Component> {
+public class StringPlaceholderResolver<R> implements IPlaceholderResolver<R, String, Tag> {
 
     @Override
-    public @Nullable Map<String, Either<ConclusionValue<? extends Component>, ContinuanceValue<?>>>
-    resolve(
+    public @Nullable Map<String, Either<ConclusionValue<? extends Tag>, ContinuanceValue<?>>> resolve(
         final String placeholderName,
         final String value,
         final R receiver,
         final Type owner,
         final Method method,
         final @Nullable Object[] parameters
     ) {
-        return Map.of(placeholderName, Either.left(ConclusionValue.conclusionValue(Component.text(value))));
+        return Map.of(placeholderName, Either.left(ConclusionValue.conclusionValue(Tag.preProcessParsed(value))));
     }
 
 }
diff --git a/...rc/main/java/net/draycia/carbon/common/messages/placeholders/UUIDPlaceholderResolver.java b/...rc/main/java/net/draycia/carbon/common/messages/placeholders/UUIDPlaceholderResolver.java
@@ -23,7 +23,7 @@
 import java.lang.reflect.Type;
 import java.util.Map;
 import java.util.UUID;
-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;
@@ -33,19 +33,18 @@
 import org.checkerframework.framework.qual.DefaultQualifier;
 
 @DefaultQualifier(NonNull.class)
-public class UUIDPlaceholderResolver<R> implements IPlaceholderResolver<R, UUID, Component> {
+public class UUIDPlaceholderResolver<R> implements IPlaceholderResolver<R, UUID, Tag> {
 
     @Override
-    public @Nullable Map<String, Either<ConclusionValue<? extends Component>, ContinuanceValue<?>>>
-    resolve(
+    public @Nullable Map<String, Either<ConclusionValue<? extends Tag>, ContinuanceValue<?>>> resolve(
         final String placeholderName,
         final UUID value,
         final R receiver,
         final Type owner,
         final Method method,
         final @Nullable Object[] parameters
     ) {
-        return Map.of(placeholderName, Either.left(ConclusionValue.conclusionValue(Component.text(value.toString()))));
+        return Map.of(placeholderName, Either.left(ConclusionValue.conclusionValue(Tag.preProcessParsed(value.toString()))));
     }
 
 }
diff --git a/fabric/src/main/java/net/draycia/carbon/fabric/FabricMessageRenderer.java b/fabric/src/main/java/net/draycia/carbon/fabric/FabricMessageRenderer.java
@@ -54,14 +54,14 @@ public FabricMessageRenderer(final ConfigManager configManager) {
     public Component render(
         final Audience receiver,
         final String intermediateMessage,
-        final Map<String, ? extends Component> resolvedPlaceholders,
+        final Map<String, ? extends Tag> 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
@@ -71,14 +71,14 @@ public PaperMessageRenderer(final ConfigManager configManager) {
     public Component render(
         final Audience receiver,
         final String intermediateMessage,
-        final Map<String, ? extends Component> resolvedPlaceholders,
+        final Map<String, ? extends Tag> 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
@@ -56,14 +56,14 @@ public VelocityMessageRenderer(final ConfigManager configManager, final PluginMa
     public Component render(
         final Audience receiver,
         final String intermediateMessage,
-        final Map<String, ? extends Component> resolvedPlaceholders,
+        final Map<String, ? extends Tag> 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);