Use more efficient implementation of iridium colors; Add support for …

…using adventure along with iridium coloring

buildSrc/src/main/kotlin/honey-publish.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "dev.shiza"
-version = "1.0.0-SNAPSHOT"
+version = "1.0.1-SNAPSHOT"
 
 java {
     withSourcesJar()

gradle/libs.versions.toml

@@ -2,12 +2,20 @@
 honey = "1.0.0"
 apache-commons-lang3 = "3.16.0"
 allegro-opel = "1.1.14"
-iridium = "1.1.0"
+iridium = "2.0.0"
 parboiled = "1.4.1"
+adventure = "4.17.0"
 
 [libraries]
 honey = { module = "dev.shiza:honey", version.ref = "honey" }
 opel = { module = "pl.allegro.tech:opel", version.ref = "allegro-opel" }
 lang = { module = "org.apache.commons:commons-lang3", version.ref = "apache-commons-lang3" }
-iridium = { module = "com.iridium:IridiumColorAPI", version.ref = "iridium" }
-parboiled = { module = "org.parboiled:parboiled-java", version.ref = "parboiled" }
+iridium-colors = { module = "com.iridium:iridium-colors", version.ref = "iridium" }
+iridium-colors-adventure = { module = "com.iridium:iridium-colors-adventure", version.ref = "iridium" }
+parboiled = { module = "org.parboiled:parboiled-java", version.ref = "parboiled" }
+adventure-api = { module = "net.kyori:adventure-api", version.ref = "adventure" }
+adventure-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "adventure" }
+
+[bundles]
+iridium = ["iridium-colors", "iridium-colors-adventure"]
+adventure = ["adventure-api", "adventure-minimessage"]

honey-iridium/build.gradle.kts

@@ -5,8 +5,9 @@ plugins {
 }
 
 dependencies {
+    api(libs.bundles.iridium)
     compileOnly(libs.honey)
-    api(libs.iridium)
+    compileOnly(libs.bundles.adventure)
 }
 
 honeyPublish {

honey-iridium/src/dev/shiza/honey/iridium/IridiumMessageCompiler.java

@@ -1,22 +1,25 @@
 package dev.shiza.honey.iridium;
 
-import static com.iridium.iridiumcolorapi.IridiumColorAPI.process;
-import static com.iridium.iridiumcolorapi.IridiumColorAPI.stripColorFormatting;
+import static com.iridium.colors.IridiumColors.process;
+import static com.iridium.colors.IridiumColors.stripColorFormatting;
 
 import dev.shiza.honey.message.MessageCompiler;
 import dev.shiza.honey.placeholder.sanitizer.SanitizedPlaceholder;
 import java.util.List;
+import java.util.function.Function;
 
-class IridiumMessageCompiler implements MessageCompiler<String> {
+class IridiumMessageCompiler<T> implements MessageCompiler<T> {
 
   private static final char TAG_RESOLVER_INIT = '<';
   private static final char TAG_RESOLVER_STOP = '>';
+  private final Function<String, T> transformation;
 
-  IridiumMessageCompiler() {}
+  IridiumMessageCompiler(final Function<String, T> transformation) {
+    this.transformation = transformation;
+  }
 
   @Override
-  public String compile(
-      final String sanitizedContent, final List<SanitizedPlaceholder> placeholders) {
+  public T compile(final String sanitizedContent, final List<SanitizedPlaceholder> placeholders) {
     String processedContent = sanitizedContent;
     for (final SanitizedPlaceholder placeholder : placeholders) {
       final String evaluatedValue = placeholder.evaluatedValue().toString();
@@ -25,7 +28,7 @@ public String compile(
           processedContent.replace(getResolvableTag(placeholder.key()), sanitizedValue);
       processedContent = process(processedContent);
     }
-    return processedContent;
+    return transformation.apply(processedContent);
   }
 
   private String getResolvableTag(final String key) {

honey-iridium/src/dev/shiza/honey/iridium/IridiumMessageCompilerFactory.java

@@ -1,12 +1,23 @@
 package dev.shiza.honey.iridium;
 
+import static java.util.function.Function.identity;
+
 import dev.shiza.honey.message.MessageCompiler;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.legacy.IridiumComponentSerializer;
 
 public final class IridiumMessageCompilerFactory {
 
+  private static final IridiumComponentSerializer COMPONENT_SERIALIZER =
+      IridiumComponentSerializer.create();
+
   private IridiumMessageCompilerFactory() {}
 
   public static MessageCompiler<String> create() {
-    return new IridiumMessageCompiler();
+    return new IridiumMessageCompiler<>(identity());
+  }
+
+  public static MessageCompiler<Component> createAdventure() {
+    return new IridiumMessageCompiler<>(COMPONENT_SERIALIZER::deserialize);
   }
 }

honey-iridium/src/dev/shiza/honey/iridium/adventure/AdventureIridiumHoney.java

@@ -0,0 +1,30 @@
+package dev.shiza.honey.iridium.adventure;
+
+import dev.shiza.honey.Honey;
+import dev.shiza.honey.iridium.IridiumMessageCompilerFactory;
+import dev.shiza.honey.message.MessageCompiler;
+import dev.shiza.honey.placeholder.evaluator.PlaceholderEvaluator;
+import dev.shiza.honey.placeholder.resolver.PlaceholderResolver;
+import dev.shiza.honey.placeholder.sanitizer.PlaceholderSanitizer;
+import dev.shiza.honey.reflection.ReflectivePlaceholderEvaluatorFactory;
+import net.kyori.adventure.text.Component;
+
+public interface AdventureIridiumHoney extends Honey<Component> {
+
+  static AdventureIridiumHoney createReflective() {
+    return create(
+        IridiumMessageCompilerFactory.createAdventure(),
+        PlaceholderResolver.create(),
+        PlaceholderSanitizer.create(),
+        ReflectivePlaceholderEvaluatorFactory.create());
+  }
+
+  private static AdventureIridiumHoney create(
+      final MessageCompiler<Component> messageCompiler,
+      final PlaceholderResolver placeholderResolver,
+      final PlaceholderSanitizer placeholderSanitizer,
+      final PlaceholderEvaluator placeholderEvaluator) {
+    return new AdventureIridiumHoneyImpl(
+        messageCompiler, placeholderResolver, placeholderSanitizer, placeholderEvaluator);
+  }
+}

honey-iridium/src/dev/shiza/honey/iridium/adventure/AdventureIridiumHoneyImpl.java

@@ -0,0 +1,19 @@
+package dev.shiza.honey.iridium.adventure;
+
+import dev.shiza.honey.HoneyImpl;
+import dev.shiza.honey.message.MessageCompiler;
+import dev.shiza.honey.placeholder.evaluator.PlaceholderEvaluator;
+import dev.shiza.honey.placeholder.resolver.PlaceholderResolver;
+import dev.shiza.honey.placeholder.sanitizer.PlaceholderSanitizer;
+import net.kyori.adventure.text.Component;
+
+class AdventureIridiumHoneyImpl extends HoneyImpl<Component> implements AdventureIridiumHoney {
+
+  AdventureIridiumHoneyImpl(
+      final MessageCompiler<Component> messageCompiler,
+      final PlaceholderResolver placeholderResolver,
+      final PlaceholderSanitizer placeholderSanitizer,
+      final PlaceholderEvaluator placeholderEvaluator) {
+    super(messageCompiler, placeholderResolver, placeholderSanitizer, placeholderEvaluator);
+  }
+}