From fcfc6c3fe8d6a037bf3f6ae4fc098c1d196c42aa Mon Sep 17 00:00:00 2001
From: caramel <admin@caramel.moe>
Date: Sun, 13 Jul 2025 00:41:21 +0900
Subject: [PATCH] Expose HexColor argument type (#12833)

---
 .../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 3e54a49a774..31b75b791f6 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.key.Key;
 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 final class ArgumentTypes {
         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 f5fba07b009..1a77c69a60a 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.key.Key;
 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 @@ interface VanillaArgumentProvider {
 
     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 4aa656df27c..80047ddf92f 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.key.Key;
 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.EntityArgument;
 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 class VanillaArgumentProviderImpl implements VanillaArgumentProvider {
         );
     }
 
+    @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);