--- a/net/minecraft/network/chat/ChatHexColor.java
+++ b/net/minecraft/network/chat/ChatHexColor.java
@@ -12,7 +12,7 @@
 
     private static final String CUSTOM_COLOR_PREFIX = "#";
     private static final Map<EnumChatFormat, ChatHexColor> LEGACY_FORMAT_TO_COLOR = (Map) Stream.of(EnumChatFormat.values()).filter(EnumChatFormat::d).collect(ImmutableMap.toImmutableMap(Function.identity(), (enumchatformat) -> {
-        return new ChatHexColor(enumchatformat.e(), enumchatformat.f());
+        return new ChatHexColor(enumchatformat.e(), enumchatformat.f(), enumchatformat); // CraftBukkit
     }));
     private static final Map<String, ChatHexColor> NAMED_COLORS = (Map) ChatHexColor.LEGACY_FORMAT_TO_COLOR.values().stream().collect(ImmutableMap.toImmutableMap((chathexcolor) -> {
         return chathexcolor.name;
@@ -20,16 +20,22 @@
     private final int value;
     @Nullable
     public final String name;
+    // CraftBukkit start
+    @Nullable
+    public final EnumChatFormat format;
 
-    private ChatHexColor(int i, String s) {
+    private ChatHexColor(int i, String s, EnumChatFormat format) {
         this.value = i;
         this.name = s;
+        this.format = format;
     }
 
     private ChatHexColor(int i) {
         this.value = i;
         this.name = null;
+        this.format = null;
     }
+    // CraftBukkit end
 
     public int a() {
         return this.value;
