1.1 - Added MiniMessage methods

Author: CroaBeast

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.croabeast</groupId>
     <artifactId>PrismaticAPI</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
     <packaging>jar</packaging>
 
     <name>PrismaticAPI</name>
@@ -140,6 +140,20 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-minimessage</artifactId>
+            <version>4.21.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-serializer-legacy</artifactId>
+            <version>4.21.0</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.viaversion</groupId>
             <artifactId>viaversion-api</artifactId>

src/main/java/me/croabeast/prismatic/PrismaticAPI.java

@@ -3,6 +3,9 @@
 import com.google.common.collect.ImmutableMap;
 import lombok.experimental.UtilityClass;
 import me.croabeast.prismatic.color.ColorPattern;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.md_5.bungee.api.ChatColor;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.entity.Player;
@@ -117,7 +120,7 @@ public ChatColor fromString(String string, boolean legacy) {
     }
 
     /**
-     * Parses a color string into a {@link ChatColor}, using optional player context
+     * Parses a color string into a {@link ChatColor}, using server context
      * to decide if legacy (pre-1.16) color mode should apply.
      * <p>
      * The input may include legacy color code markers ('&' or '§').
@@ -126,44 +129,29 @@ public ChatColor fromString(String string, boolean legacy) {
      *   returns {@link ChatColor#getByChar(char)}.
      * <p>
      * - If it’s a six-digit hex (A–F, 0–9), delegates to
-     *   {@link #fromString(String, boolean)} with legacy determined by server and client versions.
+     *   {@link #fromString(String, boolean)} with legacy determined by server version.
      * </p>
      * - Otherwise, defaults to {@link ChatColor#WHITE}.
      *
-     * @param player the {@link Player} whose client version may force legacy mode (may be {@code null})
      * @param string the color code to parse (may include '&' or '§' markers)
      * @return the corresponding {@link ChatColor}, or {@link ChatColor#WHITE} if unrecognized
      */
-    public ChatColor fromString(Player player, String string) {
+    public ChatColor fromString(String string) {
+        ChatColor color = ChatColor.WHITE;
+
         if (string.matches("^[&§]x")) string = string.substring(2);
         string = string.replaceAll("[&§]", "");
 
-        if (string.matches("^(?i)[a-fk-or0-9]$"))
-            return ChatColor.getByChar(string.toCharArray()[0]);
-
-        if (string.matches("^(?i)[a-f0-9]{6}$")) {
-            boolean legacy = ClientVersion.SERVER_VERSION < 16.0;
-            if (player != null)
-                legacy = legacy || ClientVersion.isLegacy(player);
-            return fromString(string, legacy);
-        }
+        if (string.length() == 1 &&
+                ((color = ChatColor.getByChar(string.toCharArray()[0])) != null))
+            return color;
 
-        return ChatColor.WHITE;
-    }
+        if (string.length() == 6)
+            try {
+                color = ChatColor.of('#' + string);
+            } catch (Exception ignored) {}
 
-    /**
-     * Parses a color string into a {@link ChatColor} based solely on server version,
-     * without any player-specific legacy checks.
-     * <p>
-     * This is equivalent to calling {@link #fromString(Player, String)} with a {@code null}
-     * player, so legacy mode is determined only by {@link ClientVersion#SERVER_VERSION}.
-     * </p>
-     *
-     * @param string the color code to parse (may include '&' or '§' markers)
-     * @return the corresponding {@link ChatColor}, or {@link ChatColor#WHITE} if unrecognized
-     */
-    public ChatColor fromString(String string) {
-        return fromString(null, string);
+        return color;
     }
 
     /**
@@ -226,6 +214,17 @@ public String applyColor(Color color, String string, boolean legacy) {
         return getBukkit(color, legacy) + string;
     }
 
+    /**
+     * Prepends a given {@link TextComponent} with the {@link ChatColor} corresponding to the provided color.
+     *
+     * @param color    the color to apply
+     * @param string   the string to colorize
+     * @return the colorized component
+     */
+    public TextComponent applyColor(Color color, String string) {
+        return LegacyComponentSerializer.legacySection().deserialize(getBukkit(color, ClientVersion.SERVER_VERSION < 16.0) + string);
+    }
+
     /**
      * Applies an array of {@link ChatColor} objects sequentially to each character of the source string.
      * <p>
@@ -270,6 +269,13 @@ public String applyGradient(String string, Color start, Color end, boolean legac
         return i <= 1 ? string : apply(string, createGradient(start, end, i, legacy));
     }
 
+    public TextComponent applyGradient(Color start, Color end, String string) {
+        int i = stripSpecial(string).length();
+        return LegacyComponentSerializer.legacySection().deserialize(i > 1 ?
+                apply(string, createGradient(start, end, i, ClientVersion.SERVER_VERSION < 16.0)) :
+                string);
+    }
+
     /**
      * Applies a rainbow color effect to the given string.
      *
@@ -283,6 +289,13 @@ public String applyRainbow(String string, float saturation, boolean legacy) {
         return i == 0 ? string : apply(string, createRainbow(i, saturation, legacy));
     }
 
+    public TextComponent applyRainbow(float saturation, String string) {
+        int i = stripSpecial(string).length();
+        return LegacyComponentSerializer.legacySection().deserialize(i != 0 ?
+                apply(string, createRainbow(i, saturation, ClientVersion.SERVER_VERSION < 16.0)) :
+                string);
+    }
+
     /**
      * Colorizes the given string by applying all registered {@link ColorPattern} effects.
      * <p>
@@ -313,6 +326,14 @@ public String colorize(String string) {
         return colorize(null, string);
     }
 
+    public TextComponent colorizeAsComponent(Player player, String string) {
+        return LegacyComponentSerializer.legacySection().deserialize(colorize(player, string));
+    }
+
+    public TextComponent colorizeAsComponent(String string) {
+        return LegacyComponentSerializer.legacySection().deserialize(colorize(string));
+    }
+
     /**
      * Strips Bukkit color codes (e.g. {@code &a}, {@code §b}) from the provided string.
      *