From 7df2d65c5f89344b4b8cbff6cf083170481416ab Mon Sep 17 00:00:00 2001
From: LemonCaramel <admin@caramel.moe>
Date: Sat, 12 Jul 2025 20:41:05 +0900
Subject: [PATCH] Expose HexColor argument type

---
 .../command/brigadier/argument/ArgumentTypes.java      | 10 ++++++++++
 .../brigadier/argument/VanillaArgumentProvider.java    |  3 +++
 .../argument/VanillaArgumentProviderImpl.java          |  7 +++++++
 3 files changed, 20 insertions(+)

diff --git a/paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/ArgumentTypes.java b/paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/ArgumentTypes.java
index 3e54a49a7743..31b75b791f6a 100644
--- a/paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/ArgumentTypes.java
+++ b/paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/ArgumentTypes.java
@@ -18,6 +18,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;
+import net.kyori.adventure.text.format.TextColor;
 import org.bukkit.GameMode;
 import org.bukkit.HeightMap;
 import org.bukkit.NamespacedKey;
@@ -167,6 +168,15 @@ public static ArgumentType<NamedTextColor> namedColor() {
         return provider().namedColor();
     }
 
+    /**
+     * A hex color argument.
+     *
+     * @return argument
+     */
+    public static ArgumentType<TextColor> hexColor() {
+        return provider().hexColor();
+    }
+
     /**
      * A component argument.
      *
diff --git a/paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/VanillaArgumentProvider.java b/paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/VanillaArgumentProvider.java
index f5fba07b0097..1a77c69a60a1 100644
--- a/paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/VanillaArgumentProvider.java
+++ b/paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/VanillaArgumentProvider.java
@@ -20,6 +20,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;
+import net.kyori.adventure.text.format.TextColor;
 import org.bukkit.GameMode;
 import org.bukkit.HeightMap;
 import org.bukkit.NamespacedKey;
@@ -65,6 +66,8 @@ static VanillaArgumentProvider provider() {
 
     ArgumentType<NamedTextColor> namedColor();
 
+    ArgumentType<TextColor> hexColor();
+
     ArgumentType<Component> component();
 
     ArgumentType<Style> style();
diff --git a/paper-server/src/main/java/io/papermc/paper/command/brigadier/argument/VanillaArgumentProviderImpl.java b/paper-server/src/main/java/io/papermc/paper/command/brigadier/argument/VanillaArgumentProviderImpl.java
index 4aa656df27cc..80047ddf92f1 100644
--- a/paper-server/src/main/java/io/papermc/paper/command/brigadier/argument/VanillaArgumentProviderImpl.java
+++ b/paper-server/src/main/java/io/papermc/paper/command/brigadier/argument/VanillaArgumentProviderImpl.java
@@ -39,6 +39,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;
+import net.kyori.adventure.text.format.TextColor;
 import net.minecraft.advancements.critereon.MinMaxBounds;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.arguments.ColorArgument;
@@ -49,6 +50,7 @@
 import net.minecraft.commands.arguments.GameModeArgument;
 import net.minecraft.commands.arguments.GameProfileArgument;
 import net.minecraft.commands.arguments.HeightmapTypeArgument;
+import net.minecraft.commands.arguments.HexColorArgument;
 import net.minecraft.commands.arguments.MessageArgument;
 import net.minecraft.commands.arguments.ObjectiveCriteriaArgument;
 import net.minecraft.commands.arguments.RangeArgument;
@@ -205,6 +207,11 @@ public ArgumentType<NamedTextColor> namedColor() {
         );
     }
 
+    @Override
+    public ArgumentType<TextColor> hexColor() {
+        return this.wrap(HexColorArgument.hexColor(), TextColor::color);
+    }
+
     @Override
     public ArgumentType<Component> component() {
         return this.wrap(ComponentArgument.textComponent(PaperCommands.INSTANCE.getBuildContext()), PaperAdventure::asAdventure);