feat(color): 渐变色支持在其中添加额外格式代码 #9

base/color/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easyplugin-parent</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

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

@@ -162,9 +162,14 @@ public class ColorParser {
                 startColor.getBlue() + bStep * i * bDirection
         )).toArray(String[]::new);
 
-        return IntStream.range(0, characters.length)
+        StringBuilder sb = new StringBuilder();
-                .mapToObj(i -> colorText(characters[i], extraFormats.get(i), buildHexColor(hexes[i])))
+        String extra = null;
-                .collect(Collectors.joining());
+        for (int i = 0; i < characters.length; i++) {
+            extra = buildExtraFormat(extra, extraFormats.get(i));
+            String s = colorText(characters[i], extra, buildHexColor(hexes[i]));
+            sb.append(s);
+        }
+        return sb.toString();
     }
 
     protected static String gradientText(@NotNull String text, @Nullable String startHex, @Nullable String endHex) {
@@ -205,4 +210,13 @@ public class ColorParser {
                 .collect(Collectors.joining("", '§' + "x", ""));
     }
 
+    protected static String buildExtraFormat(String current, String extra) {
+        if (extra != null) current = (current == null ? "" : current) + extra;
+        return isResetCode(current) ? null : current;
+    }
+
+    protected static boolean isResetCode(String input) {
+        return input != null && (input.toLowerCase().endsWith("&r") || input.toLowerCase().endsWith("§r"));
+    }
+
 }

base/color/src/test/java/ColorParseTest.java

@@ -15,7 +15,7 @@ public class ColorParseTest {
         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&m我真的&o尊的&r真的&<#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。"));
 

base/command-alias/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easyplugin-parent</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

base/command/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.5.7</version>
+        <version>1.5.8</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.5.7</version>
+        <version>1.5.8</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.5.7</version>
+        <version>1.5.8</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

base/messages/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easyplugin-parent</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

base/storage/pom.xml

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

base/user/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easyplugin-parent</artifactId>
-        <version>1.5.7</version>
+        <version>1.5.8</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

base/utils/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.5.7</version>
+        <version>1.5.8</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.5.7</version>
+        <version>1.5.8</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.5.7</version>
+        <version>1.5.8</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.5.7</version>
+        <version>1.5.8</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.5.7</version>
+        <version>1.5.8</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.5.7</version>
+        <version>1.5.8</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.5.7</version>
+        <version>1.5.8</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.5.7</version>
+    <version>1.5.8</version>
     <modules>
         <module>base/color</module>
         <module>base/utils</module>