feat(color): 继续完善渐变色解析。

feat(color): ColorParser RGB gradient color support.

base/command/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.15</version>
+        <version>1.4.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

base/conf/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.15</version>
+        <version>1.4.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

base/database/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.15</version>
+        <version>1.4.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

base/gui/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.15</version>
+        <version>1.4.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

base/listener/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.15</version>
+        <version>1.4.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

base/main/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.15</version>
+        <version>1.4.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

base/main/src/main/java/cc/carm/lib/easyplugin/EasyPlugin.java

@@ -22,6 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
 
 public abstract class EasyPlugin extends JavaPlugin {
 
@@ -145,6 +146,32 @@ public abstract class EasyPlugin extends JavaPlugin {
         if (isDebugging()) print("&8[DEBUG] &r", messages);
     }
 
+    /**
+     * 在主线程执行操作，并支持获取其结果。
+     *
+     * @param <T>    结果类型
+     * @param action 需要执行的内容
+     * @return CompletableFuture
+     */
+    public @NotNull <T> CompletableFuture<T> supplySync(@NotNull Supplier<T> action) {
+        CompletableFuture<T> future = new CompletableFuture<>();
+        getScheduler().run(() -> future.complete(action.get()));
+        return future;
+    }
+
+    /**
+     * 在异步线程中执行一个操作，并获取操作的结果。
+     *
+     * @param <T>    事件类型
+     * @param action 需要执行的内容
+     * @return CompletableFuture
+     */
+    public @NotNull <T> CompletableFuture<T> supplyAsync(@NotNull Supplier<T> action) {
+        CompletableFuture<T> future = new CompletableFuture<>();
+        getScheduler().runAsync(() -> future.complete(action.get()));
+        return future;
+    }
+
     /**
      * 在主线程唤起一个事件，并支持获取事件的结果。
      *
@@ -153,12 +180,10 @@ public abstract class EasyPlugin extends JavaPlugin {
      * @return CompletableFuture
      */
     public @NotNull <T extends Event> CompletableFuture<T> callSync(T event) {
-        CompletableFuture<T> future = new CompletableFuture<>();
-        getScheduler().run(() -> {
+        return supplySync(() -> {
             Bukkit.getPluginManager().callEvent(event);
-            future.complete(event);
+            return event;
         });
-        return future;
     }
 
     /**
@@ -169,12 +194,10 @@ public abstract class EasyPlugin extends JavaPlugin {
      * @return CompletableFuture
      */
     public @NotNull <T extends Event> CompletableFuture<T> callAsync(T event) {
-        CompletableFuture<T> future = new CompletableFuture<>();
-        getScheduler().runAsync(() -> {
+        return supplyAsync(() -> {
             Bukkit.getPluginManager().callEvent(event);
-            future.complete(event);
+            return event;
         });
-        return future;
     }
 
     protected void setMessageProvider(@NotNull EasyPluginMessageProvider provider) {

base/main/src/main/java/cc/carm/lib/easyplugin/utils/ColorParser.java

@@ -1,17 +1,32 @@
 package cc.carm.lib.easyplugin.utils;
 
-import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.awt.*;
 import java.util.List;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
+/**
+ * 颜色解析器。
+ * <br> 普通颜色 格式 {@code &+颜色代码 }，如 {@literal &c} 、{@literal &a}
+ * <br> RGB颜色(版本需要≥1.14) 格式 {@code &(#XXXXXX) }，如 {@literal &(#aaaaaa)}
+ * <br> 渐变RBG颜色(版本需要≥1.14) 格式 {@code &<#XXXXXX>FOOBAR&<#XXXXXX> }
+ * <p> 注意：当使用渐变RGB颜色时，普通颜色代码与RGB颜色代码将失效。
+ */
 public class ColorParser {
 
     public static final Pattern HEX_PATTERN = Pattern.compile("&\\(&?#([\\da-fA-F]{6})\\)");
+    public static final Pattern GRADIENT_PATTERN = Pattern.compile("&<&?#([\\da-fA-F]{6})>");
+    public static final Pattern COLOR_PATTERN = Pattern.compile("([&§][0-9a-fA-FrRxX])+"); // 会影响颜色的代码
+    public static final Pattern FORMAT_PATTERN = Pattern.compile("([&§][0-9a-fA-Fk-oK-OrRxX])+"); // MC可用的格式化代码
 
     public static String parse(String text) {
-        return parseBaseColor(parseHexColor(text));
+        return parseBaseColor(parseGradientColor(parseHexColor(text)));
     }
 
     public static String[] parse(String... texts) {
@@ -22,10 +37,23 @@ public class ColorParser {
         return texts.stream().map(ColorParser::parse).collect(Collectors.toList());
     }
 
+    /**
+     * 解析消息中的基本颜色代码格式 {@code &+颜色代码 }，如 {@literal &c} 、{@literal &a}
+     *
+     * @param text 消息内容
+     * @return RGB处理后的消息
+     * @see net.md_5.bungee.api.ChatColor
+     */
     public static String parseBaseColor(final String text) {
         return text.replaceAll("&", "§").replace("§§", "&");
     }
 
+    /**
+     * 解析消息中的RGB颜色代码(版本需要≥1.14) 格式 {@code &(#XXXXXX) }，如 {@literal &(#aaaaaa)}
+     *
+     * @param text 消息内容
+     * @return RGB处理后的消息
+     */
     public static String parseHexColor(String text) {
         Matcher matcher = HEX_PATTERN.matcher(text);
         while (matcher.find()) {
@@ -35,9 +63,114 @@ public class ColorParser {
         return text;
     }
 
-    private static String buildHexColor(String hexCode) {
-        return Arrays.stream(hexCode.split(""))
-                .map(s -> '§' + s)
+    /**
+     * 对一条消息进行RGB渐变处理(版本需要≥1.14)，格式 {@code &<#XXXXXX>FOOBAR&<#XXXXXX> }。
+     *
+     * @param text 消息内容
+     * @return RGB渐变处理后的消息
+     */
+    public static @NotNull String parseGradientColor(@NotNull String text) {
+        List<String> colors = new ArrayList<>();
+
+        Matcher matcher = ColorParser.GRADIENT_PATTERN.matcher(text);
+        while (matcher.find()) colors.add(matcher.group(1));
+
+        if (colors.isEmpty()) return text; // 无渐变颜色，直接跳出
+
+        String[] parts = ColorParser.GRADIENT_PATTERN.split(text);
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < parts.length; i++) {
+            String startHex = i - 1 >= 0 && colors.size() > i - 1 ? colors.get(i - 1) : null; // 本条消息的起始颜色
+            String endHex = colors.size() > i ? colors.get(i) : null; // 本条消息的结束颜色
+            builder.append(gradientText(parts[i], startHex, endHex));
+        }
+
+        return builder.toString();
+    }
+
+    public static @NotNull String gradientText(@NotNull String text,
+                                               @Nullable Color startColor, @Nullable Color endColor) {
+        Objects.requireNonNull(text, "Text to be gradient should not be null!");
+        if (startColor == null || endColor == null || text.isEmpty()) {
+            // 起始颜色有任一为空，则不进行渐变上色。
+            // 若有起始颜色，则代表其跟在某个渐变之后，应当添加"&r"阻断前面的渐变。
+            return (startColor != null ? "&r" : "") + text;
+        }
+
+        // 用于记录消息中特殊格式的位置
+        // 在渐变中，允许使用格式字符与颜色字符来改变其中某个字的颜色/格式，以支持更多形式内容。
+        LinkedHashMap<Integer, String> extraFormats = new LinkedHashMap<>();
+        Matcher matcher = ColorParser.FORMAT_PATTERN.matcher(text);
+        while (matcher.find()) {
+            extraFormats.put(matcher.start(), matcher.group());
+            text = matcher.replaceFirst("");
+            matcher.reset(text);
+        }
+
+        if (text.length() == 1) {
+            // 当只有一个实际字符时，无需进行渐变计算，直接返回 中间颜色+起始格式(如果有)+消息 即可。
+            return colorText(text, extraFormats.get(0), buildHexColor(mediumHex(startColor, endColor)));
+        }
+
+        String[] characters = text.split("");
+        int step = characters.length; // 变换次数
+
+        // 决定每种颜色变换的方向
+        int rDirection = startColor.getRed() < endColor.getRed() ? 1 : -1;
+        int gDirection = startColor.getGreen() < endColor.getGreen() ? 1 : -1;
+        int bDirection = startColor.getBlue() < endColor.getBlue() ? 1 : -1;
+
+        // 决定每种颜色每次变换的度
+        int rStep = Math.abs(startColor.getRed() - endColor.getRed()) / (step - 1);
+        int gStep = Math.abs(startColor.getGreen() - endColor.getGreen()) / (step - 1);
+        int bStep = Math.abs(startColor.getBlue() - endColor.getBlue()) / (step - 1);
+
+        String[] hexes = IntStream.range(0, step).mapToObj(i -> colorToHex(
+                startColor.getRed() + rStep * i * rDirection,
+                startColor.getGreen() + gStep * i * gDirection,
+                startColor.getBlue() + bStep * i * bDirection
+        )).toArray(String[]::new);
+
+        return IntStream.range(0, characters.length)
+                .mapToObj(i -> colorText(characters[i], extraFormats.get(i), buildHexColor(hexes[i])))
+                .collect(Collectors.joining());
+    }
+
+    protected static String gradientText(@NotNull String text, @Nullable String startHex, @Nullable String endHex) {
+        return gradientText(text,
+                startHex == null ? null : Color.decode("0x" + startHex),
+                endHex == null ? null : Color.decode("0x" + endHex)
+        );
+    }
+
+    private static String mediumHex(@NotNull Color start, @NotNull Color end) {
+        return colorToHex(
+                Math.abs(start.getRed() - end.getRed()) / 2,
+                Math.abs(start.getGreen() - end.getGreen()) / 2,
+                Math.abs(start.getBlue() - end.getBlue()) / 2
+        );
+    }
+
+    private static String colorText(String message, @Nullable String format, @Nullable String color) {
+        if (format != null && COLOR_PATTERN.matcher(format).find()) {
+            // format中存在影响颜色的内容，则当前消息的颜色会被覆盖。
+            // 为了减少最终消息的长度，故直接返回键入的FORMAT和对应消息的内容。
+            return format + message;
+        }
+        return (color == null ? "" : color) + (format == null ? "" : parseBaseColor(format)) + message;
+    }
+
+    protected static String colorToHex(Color color) {
+        return colorToHex(color.getRed(), color.getGreen(), color.getBlue());
+    }
+
+    protected static String colorToHex(int r, int g, int b) {
+        // 将R、G、B转换为16进制(若非2位则补0)输出
+        return String.format("%02X%02X%02X", r, g, b);
+    }
+
+    protected static String buildHexColor(String hexCode) {
+        return Arrays.stream(hexCode.split("")).map(s -> '§' + s)
                 .collect(Collectors.joining("", '§' + "x", ""));
     }
 

base/main/src/test/java/GradientTest.java

@@ -0,0 +1,50 @@
+import cc.carm.lib.easyplugin.utils.ColorParser;
+import org.junit.Test;
+
+import java.util.LinkedHashMap;
+import java.util.regex.Matcher;
+
+import static cc.carm.lib.easyplugin.utils.ColorParser.parse;
+import static cc.carm.lib.easyplugin.utils.ColorParser.parseGradientColor;
+
+public class GradientTest {
+
+
+    @Test
+    public void test() {
+        System.out.println(" ");
+        System.out.println(parseGradientColor("&<#AAAAAA>我真的&<#BBBBBB>爱死&<#111111>你&<#FFFFFF>！"));
+
+        // 测试穿插
+        System.out.println(parse("&<#AAAAAA>&l我&r真&b的&<#BBBBBB>&o爱死&<#111111>你&<#FFFFFF>了&r！"));
+        System.out.println(parse("&<#AAAAAA>&l我&r真&(#666666)的&<#BBBBBB>&o爱死&<#111111>你&<#FFFFFF>了&r！"));
+        System.out.println(parse("&r正常的颜色理应&c&l不受影响&r。"));
+
+    }
+
+    @Test
+    public void formatReadTest() {
+        LinkedHashMap<Integer, String> formats = new LinkedHashMap<>();
+        String text = "&k&l &m&1我&k爱你爱你爱你&o吗？";
+        Matcher matcher = ColorParser.FORMAT_PATTERN.matcher(text);
+        while (matcher.find()) {
+            String code = matcher.group();
+            formats.put(matcher.start(), code);
+            text = matcher.replaceFirst("");
+            matcher.reset(text);
+        }
+
+        formats.forEach((index, code) -> System.out.println(index + " -> " + code));
+
+        String[] parts = text.split("");
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < parts.length; i++) {
+            String format = formats.get(i);
+            if (format != null) builder.append(ColorParser.parseBaseColor(format));
+            builder.append(parts[i]);
+        }
+
+        System.out.println(builder);
+    }
+
+}

base/storage/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.15</version>
+        <version>1.4.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

collection/all/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.15</version>
+        <version>1.4.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

collection/bom/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.15</version>
+        <version>1.4.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

collection/common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.15</version>
+        <version>1.4.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

extension/gh-checker/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.15</version>
+        <version>1.4.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

extension/papi/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.15</version>
+        <version>1.4.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

extension/vault/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.4.15</version>
+        <version>1.4.17</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -15,7 +15,7 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyplugin-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.15</version>
+    <version>1.4.17</version>
     <modules>
 
         <module>base/main</module>