Merge pull request #21 from SLNE-Development/fix/fix-colors

fix: Enhance hex color argument validation and suggestions

Author: Keviro

surf-clan-paper/src/main/kotlin/dev/slne/clan/paper/commands/arguments/color/BaseHexColorArgument.kt

@@ -1,28 +1,59 @@
 package dev.slne.clan.paper.commands.arguments.color
 
+import dev.jorel.commandapi.arguments.ArgumentSuggestions
 import dev.jorel.commandapi.arguments.CustomArgument
 import dev.jorel.commandapi.arguments.TextArgument
 
 abstract class BaseHexColorArgument<T>(
     nodeName: String,
+    private val requiredLength: Int,
     private val factory: (String) -> T?
 ) : CustomArgument<T, String>(TextArgument(nodeName), { info ->
 
-    val normalized = HexColorParser.normalizeToRgba(info.currentInput())
-        ?: throw CustomArgumentException.fromMessageBuilder(
+    val input = info.currentInput().trim()
+
+    val regex = Regex("^[0-9a-fA-F]{$requiredLength}$")
+
+    if (!regex.matches(input)) {
+        throw CustomArgumentException.fromMessageBuilder(
             MessageBuilder()
-                .append("Failed to parse hex color code: ")
+                .append("Invalid hex color: ")
                 .appendArgInput()
         )
+    }
 
-    factory(normalized)
+    factory(input)
         ?: throw CustomArgumentException.fromMessageBuilder(
             MessageBuilder()
                 .append("Invalid hex color: ")
                 .appendArgInput()
         )
 }) {
     init {
-        replaceSuggestions(HexColorSuggestions.create())
+        replaceSuggestions(ArgumentSuggestions.stringCollection { _ ->
+            if (requiredLength == 6) {
+                listOf(
+                    "#FF6B6B",
+                    "#4ECDC4",
+                    "#1A1A2E",
+                    "#F7B801",
+                    "#6A4C93",
+                    "#00C2FF",
+                    "#2EC4B6",
+                    "#E71D36"
+                )
+            } else {
+                listOf(
+                    "#FF6B6BCC",
+                    "#4ECDC480",
+                    "#1A1A2ECC",
+                    "#F7B80199",
+                    "#6A4C93B3",
+                    "#00C2FF66",
+                    "#2EC4B6AA",
+                    "#E71D3688"
+                )
+            }
+        })
     }
 }

surf-clan-paper/src/main/kotlin/dev/slne/clan/paper/commands/arguments/color/ClanTagHexColorArgument.kt

@@ -2,4 +2,7 @@ package dev.slne.clan.paper.commands.arguments.color
 
 import net.kyori.adventure.text.format.TextColor
 
-class ClanTagHexColorArgument(nodeName: String) : BaseHexColorArgument<TextColor>(nodeName, TextColor::fromHexString)
+class ClanTagHexColorArgument(nodeName: String) :
+    BaseHexColorArgument<TextColor>(nodeName, 6, {
+        TextColor.fromHexString("#$it")
+    })

surf-clan-paper/src/main/kotlin/dev/slne/clan/paper/commands/arguments/color/ClanTagShadowHexColorArgument.kt

@@ -3,4 +3,6 @@ package dev.slne.clan.paper.commands.arguments.color
 import net.kyori.adventure.text.format.ShadowColor
 
 class ClanTagShadowHexColorArgument(nodeName: String) :
-    BaseHexColorArgument<ShadowColor>(nodeName, ShadowColor::fromHexString)
+    BaseHexColorArgument<ShadowColor>(nodeName, 8, {
+        ShadowColor.fromHexString("#$it")
+    })