Update v1.3

Author: FlyUltra

README.md

@@ -7,7 +7,7 @@
 [![badge](https://img.shields.io/discord/896466173166747650?label=discord)](https://discord.gg/2PpdrfxhD4)
 [![badge](https://img.shields.io/github/license/ForestTechMC/ForestColorAPI)](https://github.com/ForestTechMC/ForestColorAPI/blob/master/LICENSE.txt)
 
-**[JavaDoc 1.1](https://foresttechmc.github.io/ForestColorAPI/1.1/)**
+**[JavaDoc 1.3](https://foresttechmc.github.io/ForestColorAPI/1.3/)**
 
 Small and effective Color API for your plugins.\
 Only 1.16+ version of spigot support!
@@ -70,23 +70,23 @@ dependencies {
 
 ### Example of patterns
 
-If you want to use gradient you need to use pattern like `{/#b36000}Super gradient!{/#72cc00}`
+If you want to use gradient you need to use pattern like `{#b36000>}Super gradient!{#72cc00<}`
 For normal RGB `{#72cc00}Super color!`
 
 
 ### Using Color API
 
 ```java
 // Example of removing chars, legacy colors, and patterns
-String cleanMessage = ColorAPI.clear("{/#b36000}Super gradient{/#72cc00} &3Some color");
+String cleanMessage = ColorAPI.clear("{#b36000>}Super gradient{#72cc00<} &3Some color");
 // Output -> "Super gradient Some color" message without patterns, colors, chars...
 // You can use separate methods to clear only some kind of coloring
 
 // Example of universal usage for colorize
-player.sendMessage(ColorAPI.colorize("{/#b36000}Super gradient{/#72cc00} {#b36000}Super RGB color"));
+player.sendMessage(ColorAPI.colorize("{#b36000>}Super gradient{#72cc00<} {#b36000}Super RGB color"));
 
 // Example of gradient method
-player.sendMessage(ColorAPI.colorizeGradient("{/#b36000}Super gradient{/#72cc00}"));
+player.sendMessage(ColorAPI.colorizeGradient("{#b36000>}Super gradient{#72cc00<}"));
 
 // Example of RGB method
 player.sendMessage(ColorAPI.colorizeRGB("{#b36000}Super RGB color"));

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cz.foresttech</groupId>
     <artifactId>ForestColorAPI</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -16,16 +16,18 @@
 
 
     <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
     </repositories>
 
+
+
     <dependencies>
         <dependency>
             <groupId>net.md-5</groupId>

src/main/java/cz/foresttech/api/ColorAPI.java

@@ -15,7 +15,8 @@ public class ColorAPI {
     private static final List<String> legacyColors = Arrays.asList("&0", "&1", "&2", "&3", "&4", "&5", "&6", "&7", "&8", "&9", "&a", "&b", "&c", "&d", "&e", "§0", "§1", "§2", "§3", "§4", "§5", "§6", "§7", "§8", "§9", "§a", "§b", "§c", "§d", "§e");
     private static final List<String> specialChars = Arrays.asList("&l", "&n", "&o", "&k", "&m", "§l", "§n", "§o", "§k", "§m");
     private static final Pattern patternNormal = Pattern.compile("\\{#([0-9A-Fa-f]{6})\\}");
-    private static final Pattern patternGrad = Pattern.compile("\\{/#([0-9A-Fa-f]{6})\\}(.*?)\\{/#([0-9A-Fa-f]{6})\\}");
+    private static final Pattern patternGrad = Pattern.compile("\\{#([0-9A-Fa-f]{6})>\\}(.*?)\\{#([0-9A-Fa-f]{6})<\\}");
+    private static final Pattern patternOneFromTwo = Pattern.compile("\\{#([0-9A-Fa-f]{6})<>\\}");
     private static Matcher matcher;
 
     /**
@@ -97,7 +98,8 @@ public static String removeLegacyColors(String input) {
      * @return string without patterns
      */
     public static String removePatterns(String input) {
-        input = input.replaceAll("\\{/#([0-9A-Fa-f]{6})\\}", "");
+        input = input.replaceAll("\\{#([0-9A-Fa-f]{6})>\\}", "");
+        input = input.replaceAll("\\{#([0-9A-Fa-f]{6})<\\}", "");
         input = input.replaceAll("\\{#([0-9A-Fa-f]{6})\\}", "");
         return input;
     }
@@ -125,7 +127,6 @@ public static String colorizeClassic(String input) {
         return input;
     }
 
-
     /**
      *
      * Here we can call for gradient colorize
@@ -138,6 +139,16 @@ public static String colorizeClassic(String input) {
      * @return colored output with gradient
      */
     public static String colorizeGradient(String input) {
+        matcher = patternOneFromTwo.matcher(input);
+
+        StringBuffer output = new StringBuffer();
+
+        while (matcher.find()) {
+            String text = matcher.group(1);
+            matcher.appendReplacement(output, "{#" + text + "<}{#" + text + ">}");
+        }
+        input = String.valueOf(output);
+
         matcher = patternGrad.matcher(input);
         while (matcher.find()) {
             input = input.replace(matcher.group(), color(matcher.group(2), new Color(Integer.parseInt(matcher.group(1), 16)), new Color(Integer.parseInt(matcher.group(3), 16))));