From a151352e200df4b69206417ac4d348212a75173a Mon Sep 17 00:00:00 2001
From: Riley Park <rileysebastianpark@gmail.com>
Date: Thu, 31 Oct 2024 23:46:45 -0700
Subject: [PATCH 01/15] feat: initial work for shadow colors

---
 .../text/AbstractComponentBuilder.java        | 15 +++++
 .../net/kyori/adventure/text/Component.java   | 33 +++++++++++
 .../kyori/adventure/text/ScopedComponent.java | 13 +++++
 .../adventure/text/format/ShadowColor.java    | 41 +++++++++++++
 .../text/format/ShadowColorImpl.java          | 37 ++++++++++++
 .../adventure/text/format/StyleGetter.java    |  8 +++
 .../adventure/text/format/StyleImpl.java      | 57 +++++++++++++++----
 .../adventure/text/format/StyleSetter.java    | 18 ++++++
 .../serializer/gson/SerializerFactory.java    |  4 ++
 .../gson/ShadowColorSerializer.java           | 49 ++++++++++++++++
 .../text/serializer/gson/StyleSerializer.java |  8 +++
 .../json/JSONComponentConstants.java          |  1 +
 12 files changed, 274 insertions(+), 10 deletions(-)
 create mode 100644 api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
 create mode 100644 api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java
 create mode 100644 text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShadowColorSerializer.java

diff --git a/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java b/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java
index 44de2449b..25ce1eb48 100644
--- a/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java
+++ b/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java
@@ -33,6 +33,7 @@
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEventSource;
+import net.kyori.adventure.text.format.ShadowColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
@@ -236,6 +237,20 @@ private void prepareChildren() {
     return (B) this;
   }
 
+  @Override
+  @SuppressWarnings("unchecked")
+  public @NotNull B shadowColor(final @Nullable ShadowColor color) {
+    this.styleBuilder().shadowColor(color);
+    return (B) this;
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public @NotNull B shadowColorIfAbsent(final @Nullable ShadowColor color) {
+    this.styleBuilder().shadowColorIfAbsent(color);
+    return (B) this;
+  }
+
   @Override
   @SuppressWarnings("unchecked")
   public @NotNull B decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) {
diff --git a/api/src/main/java/net/kyori/adventure/text/Component.java b/api/src/main/java/net/kyori/adventure/text/Component.java
index e120afe07..8ddec4eaf 100644
--- a/api/src/main/java/net/kyori/adventure/text/Component.java
+++ b/api/src/main/java/net/kyori/adventure/text/Component.java
@@ -45,6 +45,7 @@
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.event.HoverEventSource;
+import net.kyori.adventure.text.format.ShadowColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.StyleBuilderApplicable;
 import net.kyori.adventure.text.format.StyleGetter;
@@ -2189,6 +2190,11 @@ default void detectCycle(final @NotNull Component that) {
     return this.style().color();
   }
 
+  @Override
+  default @Nullable ShadowColor shadowColor() {
+    return this.style().shadowColor();
+  }
+
   /**
    * Sets the color of this component.
    *
@@ -2216,6 +2222,33 @@ default void detectCycle(final @NotNull Component that) {
     return this;
   }
 
+  /**
+   * Sets the shadow color of this component.
+   *
+   * @param color the color
+   * @return a component
+   * @since 4.18.0
+   */
+  @Contract(pure = true)
+  @Override
+  default @NotNull Component shadowColor(final @Nullable ShadowColor color) {
+    return this.style(this.style().shadowColor(color));
+  }
+
+  /**
+   * Sets the shadow color if there isn't one set already.
+   *
+   * @param color the color
+   * @return a component
+   * @since 4.18.0
+   */
+  @Contract(pure = true)
+  @Override
+  default @NotNull Component shadowColorIfAbsent(final @Nullable ShadowColor color) {
+    if (this.shadowColor() == null) return this.shadowColorIfAbsent(color);
+    return this;
+  }
+
   /**
    * Tests if this component has a decoration.
    *
diff --git a/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java b/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java
index d9d123939..315ba57fe 100644
--- a/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java
+++ b/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java
@@ -28,6 +28,7 @@
 import java.util.function.Consumer;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEventSource;
+import net.kyori.adventure.text.format.ShadowColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
@@ -107,6 +108,18 @@ public interface ScopedComponent<C extends Component> extends Component {
     return (C) Component.super.colorIfAbsent(color);
   }
 
+  @Override
+  @SuppressWarnings("unchecked")
+  default @NotNull C shadowColor(final @Nullable ShadowColor color) {
+    return (C) Component.super.shadowColor(color);
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  default @NotNull C shadowColorIfAbsent(final @Nullable ShadowColor color) {
+    return (C) Component.super.shadowColorIfAbsent(color);
+  }
+
   @Override
   @SuppressWarnings("unchecked")
   default @NotNull C decorate(final @NotNull TextDecoration decoration) {
diff --git a/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java b/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
new file mode 100644
index 000000000..08bcc33ce
--- /dev/null
+++ b/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
@@ -0,0 +1,41 @@
+/*
+ * This file is part of adventure, licensed under the MIT License.
+ *
+ * Copyright (c) 2017-2023 KyoriPowered
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package net.kyori.adventure.text.format;
+
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+
+public interface ShadowColor extends StyleBuilderApplicable {
+  @Contract(pure = true)
+  static ShadowColor shadowColor(final int value) {
+    return new ShadowColorImpl(value);
+  }
+
+  int value();
+
+  @Override
+  default void styleApply(final Style.@NotNull Builder style) {
+    style.color(this);
+  }
+}
diff --git a/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java b/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java
new file mode 100644
index 000000000..7e58b4e79
--- /dev/null
+++ b/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java
@@ -0,0 +1,37 @@
+/*
+ * This file is part of adventure, licensed under the MIT License.
+ *
+ * Copyright (c) 2017-2023 KyoriPowered
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package net.kyori.adventure.text.format;
+
+final class ShadowColorImpl implements ShadowColor {
+  private final int value;
+
+  ShadowColorImpl(final int value) {
+    this.value = value;
+  }
+
+  @Override
+  public int value() {
+    return this.value;
+  }
+}
diff --git a/api/src/main/java/net/kyori/adventure/text/format/StyleGetter.java b/api/src/main/java/net/kyori/adventure/text/format/StyleGetter.java
index f05f0a0a7..41457e436 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/StyleGetter.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/StyleGetter.java
@@ -58,6 +58,14 @@ public interface StyleGetter {
    */
   @Nullable TextColor color();
 
+  /**
+   * Gets the shadow color.
+   *
+   * @return the shadow color
+   * @since 4.18.0
+   */
+  @Nullable ShadowColor shadowColor();
+
   /**
    * Tests if this stylable has a decoration.
    *
diff --git a/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java b/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java
index 6bc5efc08..6c529fc3f 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java
@@ -40,10 +40,11 @@
 import static java.util.Objects.requireNonNull;
 
 final class StyleImpl implements Style {
-  static final StyleImpl EMPTY = new StyleImpl(null, null, DecorationMap.EMPTY, null, null, null);
+  static final StyleImpl EMPTY = new StyleImpl(null, null, null, DecorationMap.EMPTY, null, null, null);
   // visible to avoid generating accessors when creating a builder
   final @Nullable Key font;
   final @Nullable TextColor color;
+  final @Nullable ShadowColor shadowColor;
   final @NotNull DecorationMap decorations;
   final @Nullable ClickEvent clickEvent;
   final @Nullable HoverEvent<?> hoverEvent;
@@ -52,6 +53,7 @@ final class StyleImpl implements Style {
   StyleImpl(
     final @Nullable Key font,
     final @Nullable TextColor color,
+    final @Nullable ShadowColor shadowColor,
     final @NotNull Map<TextDecoration, TextDecoration.State> decorations,
     final @Nullable ClickEvent clickEvent,
     final @Nullable HoverEvent<?> hoverEvent,
@@ -59,6 +61,7 @@ final class StyleImpl implements Style {
   ) {
     this.font = font;
     this.color = color;
+    this.shadowColor = shadowColor;
     this.decorations = DecorationMap.fromMap(decorations);
     this.clickEvent = clickEvent;
     this.hoverEvent = hoverEvent;
@@ -73,7 +76,7 @@ final class StyleImpl implements Style {
   @Override
   public @NotNull Style font(final @Nullable Key font) {
     if (Objects.equals(this.font, font)) return this;
-    return new StyleImpl(font, this.color, this.decorations, this.clickEvent, this.hoverEvent, this.insertion);
+    return new StyleImpl(font, this.color, this.shadowColor, this.decorations, this.clickEvent, this.hoverEvent, this.insertion);
   }
 
   @Override
@@ -84,7 +87,7 @@ final class StyleImpl implements Style {
   @Override
   public @NotNull Style color(final @Nullable TextColor color) {
     if (Objects.equals(this.color, color)) return this;
-    return new StyleImpl(this.font, color, this.decorations, this.clickEvent, this.hoverEvent, this.insertion);
+    return new StyleImpl(this.font, color, this.shadowColor, this.decorations, this.clickEvent, this.hoverEvent, this.insertion);
   }
 
   @Override
@@ -95,6 +98,25 @@ final class StyleImpl implements Style {
     return this;
   }
 
+  @Override
+  public @Nullable ShadowColor shadowColor() {
+    return this.shadowColor;
+  }
+
+  @Override
+  public @NotNull Style shadowColor(final @Nullable ShadowColor color) {
+    if (Objects.equals(this.shadowColor, color)) return this;
+    return new StyleImpl(this.font, this.color, color, this.decorations, this.clickEvent, this.hoverEvent, this.insertion);
+  }
+
+  @Override
+  public @NotNull Style shadowColorIfAbsent(final @Nullable ShadowColor color) {
+    if (this.shadowColor == null) {
+      return this.shadowColor(color);
+    }
+    return this;
+  }
+
   @Override
   public TextDecoration.@NotNull State decoration(final @NotNull TextDecoration decoration) {
     // null -> null
@@ -109,7 +131,7 @@ final class StyleImpl implements Style {
   public @NotNull Style decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) {
     requireNonNull(state, "state");
     if (this.decoration(decoration) == state) return this;
-    return new StyleImpl(this.font, this.color, this.decorations.with(decoration, state), this.clickEvent, this.hoverEvent, this.insertion);
+    return new StyleImpl(this.font, this.color, this.shadowColor, this.decorations.with(decoration, state), this.clickEvent, this.hoverEvent, this.insertion);
   }
 
   @Override
@@ -117,7 +139,7 @@ final class StyleImpl implements Style {
     requireNonNull(state, "state");
     final TextDecoration.@Nullable State oldState = this.decorations.get(decoration);
     if (oldState == TextDecoration.State.NOT_SET) {
-      return new StyleImpl(this.font, this.color, this.decorations.with(decoration, state), this.clickEvent, this.hoverEvent, this.insertion);
+      return new StyleImpl(this.font, this.color, this.shadowColor, this.decorations.with(decoration, state), this.clickEvent, this.hoverEvent, this.insertion);
     }
     if (oldState != null) {
       return this;
@@ -132,7 +154,7 @@ final class StyleImpl implements Style {
 
   @Override
   public @NotNull Style decorations(final @NotNull Map<TextDecoration, TextDecoration.State> decorations) {
-    return new StyleImpl(this.font, this.color, DecorationMap.merge(decorations, this.decorations), this.clickEvent, this.hoverEvent, this.insertion);
+    return new StyleImpl(this.font, this.color, this.shadowColor, DecorationMap.merge(decorations, this.decorations), this.clickEvent, this.hoverEvent, this.insertion);
   }
 
   @Override
@@ -142,7 +164,7 @@ final class StyleImpl implements Style {
 
   @Override
   public @NotNull Style clickEvent(final @Nullable ClickEvent event) {
-    return new StyleImpl(this.font, this.color, this.decorations, event, this.hoverEvent, this.insertion);
+    return new StyleImpl(this.font, this.color, this.shadowColor, this.decorations, event, this.hoverEvent, this.insertion);
   }
 
   @Override
@@ -152,7 +174,7 @@ final class StyleImpl implements Style {
 
   @Override
   public @NotNull Style hoverEvent(final @Nullable HoverEventSource<?> source) {
-    return new StyleImpl(this.font, this.color, this.decorations, this.clickEvent, HoverEventSource.unbox(source), this.insertion);
+    return new StyleImpl(this.font, this.color, this.shadowColor, this.decorations, this.clickEvent, HoverEventSource.unbox(source), this.insertion);
   }
 
   @Override
@@ -163,7 +185,7 @@ final class StyleImpl implements Style {
   @Override
   public @NotNull Style insertion(final @Nullable String insertion) {
     if (Objects.equals(this.insertion, insertion)) return this;
-    return new StyleImpl(this.font, this.color, this.decorations, this.clickEvent, this.hoverEvent, insertion);
+    return new StyleImpl(this.font, this.color, this.shadowColor, this.decorations, this.clickEvent, this.hoverEvent, insertion);
   }
 
   @Override
@@ -286,6 +308,7 @@ public int hashCode() {
   static final class BuilderImpl implements Builder {
     @Nullable Key font;
     @Nullable TextColor color;
+    @Nullable ShadowColor shadowColor;
     final Map<TextDecoration, TextDecoration.State> decorations;
     @Nullable ClickEvent clickEvent;
     @Nullable HoverEvent<?> hoverEvent;
@@ -324,6 +347,20 @@ static final class BuilderImpl implements Builder {
       return this;
     }
 
+    @Override
+    public @NotNull Builder shadowColor(final @Nullable ShadowColor color) {
+      this.shadowColor = color;
+      return this;
+    }
+
+    @Override
+    public @NotNull Builder shadowColorIfAbsent(final @Nullable ShadowColor color) {
+      if (this.shadowColor == null) {
+        this.shadowColor = color;
+      }
+      return this;
+    }
+
     @Override
     public @NotNull Builder decoration(final @NotNull TextDecoration decoration, final TextDecoration.@NotNull State state) {
       requireNonNull(state, "state");
@@ -438,7 +475,7 @@ static final class BuilderImpl implements Builder {
       if (this.isEmpty()) {
         return EMPTY;
       }
-      return new StyleImpl(this.font, this.color, this.decorations, this.clickEvent, this.hoverEvent, this.insertion);
+      return new StyleImpl(this.font, this.color, this.shadowColor, this.decorations, this.clickEvent, this.hoverEvent, this.insertion);
     }
 
     private boolean isEmpty() {
diff --git a/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java b/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java
index a9aa4f888..64c4c5bf9 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java
@@ -73,6 +73,24 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    */
   @NotNull T colorIfAbsent(final @Nullable TextColor color);
 
+  /**
+   * Sets the shadow color.
+   *
+   * @param color the color
+   * @return an object ({@code T})
+   * @since 4.18.0
+   */
+  @NotNull T shadowColor(final @Nullable ShadowColor color);
+
+  /**
+   * Sets the shadow color if there isn't one set already.
+   *
+   * @param color the color
+   * @return an object ({@code T})
+   * @since 4.18.0
+   */
+  @NotNull T shadowColorIfAbsent(final @Nullable ShadowColor color);
+
   /**
    * Sets the state of {@code decoration} to {@link TextDecoration.State#TRUE}.
    *
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java
index 7f8e66c93..f4de4249e 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java
@@ -34,6 +34,7 @@
 import net.kyori.adventure.text.TranslationArgument;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
+import net.kyori.adventure.text.format.ShadowColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
@@ -52,6 +53,7 @@ final class SerializerFactory implements TypeAdapterFactory {
   static final Class<String> STRING_TYPE = String.class;
   static final Class<TextColorWrapper> COLOR_WRAPPER_TYPE = TextColorWrapper.class;
   static final Class<TextColor> COLOR_TYPE = TextColor.class;
+  static final Class<ShadowColor> SHADOW_COLOR_TYPE = ShadowColor.class;
   static final Class<TextDecoration> TEXT_DECORATION_TYPE = TextDecoration.class;
   static final Class<BlockNBTComponent.Pos> BLOCK_NBT_POS_TYPE = BlockNBTComponent.Pos.class;
   static final Class<UUID> UUID_TYPE = UUID.class;
@@ -87,6 +89,8 @@ public <T> TypeAdapter<T> create(final Gson gson, final TypeToken<T> type) {
       return (TypeAdapter<T>) TextColorWrapper.Serializer.INSTANCE;
     } else if (COLOR_TYPE.isAssignableFrom(rawType)) {
       return (TypeAdapter<T>) (this.features.value(JSONOptions.EMIT_RGB) ? TextColorSerializer.INSTANCE : TextColorSerializer.DOWNSAMPLE_COLOR);
+    } else if (SHADOW_COLOR_TYPE.isAssignableFrom(rawType)) {
+      return (TypeAdapter<T>) ShadowColorSerializer.INSTANCE;
     } else if (TEXT_DECORATION_TYPE.isAssignableFrom(rawType)) {
       return (TypeAdapter<T>) TextDecorationSerializer.INSTANCE;
     } else if (BLOCK_NBT_POS_TYPE.isAssignableFrom(rawType)) {
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShadowColorSerializer.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShadowColorSerializer.java
new file mode 100644
index 000000000..a1d30de1e
--- /dev/null
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShadowColorSerializer.java
@@ -0,0 +1,49 @@
+/*
+ * This file is part of adventure, licensed under the MIT License.
+ *
+ * Copyright (c) 2017-2024 KyoriPowered
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package net.kyori.adventure.text.serializer.gson;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import net.kyori.adventure.text.format.ShadowColor;
+
+final class ShadowColorSerializer extends TypeAdapter<ShadowColor> {
+  static final TypeAdapter<ShadowColor> INSTANCE = new ShadowColorSerializer().nullSafe();
+
+  @Override
+  public void write(final JsonWriter out, final ShadowColor value) throws IOException {
+    out.value(value.value());
+  }
+
+  @Override
+  public ShadowColor read(final JsonReader in) throws IOException {
+    if (in.peek() == JsonToken.BEGIN_ARRAY) {
+      throw new UnsupportedOperationException(); // TODO
+    }
+
+    return ShadowColor.shadowColor(in.nextInt());
+  }
+}
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java
index 7c4fd2f9b..8cd6f945e 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java
@@ -40,6 +40,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
+import net.kyori.adventure.text.format.ShadowColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
@@ -58,6 +59,7 @@
 import static net.kyori.adventure.text.serializer.json.JSONComponentConstants.HOVER_EVENT_CONTENTS;
 import static net.kyori.adventure.text.serializer.json.JSONComponentConstants.HOVER_EVENT_VALUE;
 import static net.kyori.adventure.text.serializer.json.JSONComponentConstants.INSERTION;
+import static net.kyori.adventure.text.serializer.json.JSONComponentConstants.SHADOW_COLOR;
 
 final class StyleSerializer extends TypeAdapter<Style> {
   @SuppressWarnings("checkstyle:NoWhitespaceAfter")
@@ -266,6 +268,12 @@ public void write(final JsonWriter out, final Style value) throws IOException {
       this.gson.toJson(color, SerializerFactory.COLOR_TYPE, out);
     }
 
+    final @Nullable ShadowColor shadowColor = value.shadowColor();
+    if (shadowColor != null) {
+      out.name(SHADOW_COLOR);
+      this.gson.toJson(shadowColor, SerializerFactory.SHADOW_COLOR_TYPE, out);
+    }
+
     final @Nullable String insertion = value.insertion();
     if (insertion != null) {
       out.name(INSERTION);
diff --git a/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/JSONComponentConstants.java b/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/JSONComponentConstants.java
index a353820a6..3683fb17b 100644
--- a/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/JSONComponentConstants.java
+++ b/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/JSONComponentConstants.java
@@ -51,6 +51,7 @@ public final class JSONComponentConstants {
   public static final String SEPARATOR = "separator";
   public static final String FONT = "font";
   public static final String COLOR = "color";
+  public static final String SHADOW_COLOR = "shadow_color";
   public static final String INSERTION = "insertion";
   public static final String CLICK_EVENT = "clickEvent";
   public static final String CLICK_EVENT_ACTION = "action";

From df0180111a15cb75e9e1a917690419d00f9beb0c Mon Sep 17 00:00:00 2001
From: MiniDigger | Martin <admin@benndorf.dev>
Date: Fri, 1 Nov 2024 11:11:45 +0100
Subject: [PATCH 02/15] add hex support to ShadowColor

---
 .../adventure/text/format/ShadowColor.java    | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java b/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
index 08bcc33ce..70ee8c967 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
@@ -32,10 +32,39 @@ static ShadowColor shadowColor(final int value) {
     return new ShadowColorImpl(value);
   }
 
+  @Contract(pure = true)
+  static ShadowColor fromHexString(String value) {
+    if (value.startsWith("#")) {
+      value = value.substring(1);
+    }
+    if (value.length() != 8) {
+      return null;
+    }
+    try {
+      int r = Integer.parseInt(value.substring(0, 2), 16);
+      int g = Integer.parseInt(value.substring(2, 4), 16);
+      int b = Integer.parseInt(value.substring(4, 6), 16);
+      int a = Integer.parseInt(value.substring(6, 8), 16);
+      return new ShadowColorImpl((a << 24) | (r << 16) | (g << 8) | b);
+    } catch (NumberFormatException ignored) {
+      return null;
+    }
+  }
+
+  @NotNull
+  default String asHexString() {
+    int argb = value();
+    int a = (argb >> 24) & 0xFF;
+    int r = (argb >> 16) & 0xFF;
+    int g = (argb >> 8) & 0xFF;
+    int b = argb & 0xFF;
+    return String.format("#%02X%02X%02X%02X", r, g, b, a);
+  }
+
   int value();
 
   @Override
   default void styleApply(final Style.@NotNull Builder style) {
-    style.color(this);
+    style.shadowColor(this);
   }
 }

From bc0ef7ac6c958a3defb307644e3cef213eed9623 Mon Sep 17 00:00:00 2001
From: MiniDigger | Martin <admin@benndorf.dev>
Date: Fri, 1 Nov 2024 11:12:16 +0100
Subject: [PATCH 03/15] feat: add shadow tag to minimessage, closes #1120

---
 .../tag/standard/ShadowColorTagResolver.java  | 49 +++++++++++++++++++
 .../tag/standard/StandardTags.java            | 15 +++++-
 .../tag/standard/ShadowTagTest.java           | 31 ++++++++++++
 3 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagResolver.java
 create mode 100644 text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowTagTest.java

diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagResolver.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagResolver.java
new file mode 100644
index 000000000..e660f1105
--- /dev/null
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagResolver.java
@@ -0,0 +1,49 @@
+package net.kyori.adventure.text.minimessage.tag.standard;
+
+import net.kyori.adventure.text.format.ShadowColor;
+import net.kyori.adventure.text.format.Style;
+import net.kyori.adventure.text.minimessage.Context;
+import net.kyori.adventure.text.minimessage.ParsingException;
+import net.kyori.adventure.text.minimessage.internal.serializer.SerializableResolver;
+import net.kyori.adventure.text.minimessage.internal.serializer.StyleClaim;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+class ShadowColorTagResolver implements TagResolver, SerializableResolver.Single {
+  private static final String SHADOW_COLOR = "shadow";
+
+  static final TagResolver INSTANCE = new ShadowColorTagResolver();
+  private static final StyleClaim<ShadowColor> STYLE = StyleClaim.claim(SHADOW_COLOR, Style::shadowColor, (color, emitter) -> {
+      emitter.tag(SHADOW_COLOR).argument(color.asHexString());
+  });
+
+  ShadowColorTagResolver() {
+  }
+
+  @Override
+  public @Nullable Tag resolve(final @NotNull String name, final @NotNull ArgumentQueue args, final @NotNull Context ctx) throws ParsingException {
+    if (!this.has(name)) {
+      return null;
+    }
+
+    final String colorString = args.popOr("Expected to find a color parameter: #RRGGBBAA").lowerValue();
+    final ShadowColor color = ShadowColor.fromHexString(colorString);
+    if (color == null) {
+      throw ctx.newException(String.format("Unable to parse a shadow color from '%s'. Please use #RRGGBBAA formatting.", colorString));
+    }
+    return Tag.styling(color);
+  }
+
+  @Override
+  public boolean has(final @NotNull String name) {
+    return name.equals(SHADOW_COLOR);
+  }
+
+  @Override
+  public @Nullable StyleClaim<?> claimStyle() {
+    return STYLE;
+  }
+}
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java
index 1a63d1607..39bab58f5 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java
@@ -64,7 +64,8 @@ private StandardTags() {
         SelectorTag.RESOLVER,
         ScoreTag.RESOLVER,
         NbtTag.RESOLVER,
-        PrideTag.RESOLVER
+        PrideTag.RESOLVER,
+        ShadowColorTagResolver.INSTANCE
       )
       .build();
 
@@ -275,6 +276,18 @@ public static TagResolver transition() {
     return PrideTag.RESOLVER;
   }
 
+  /**
+   * Get a resolver for the {@value ShadowColorTagResolver#SHADOW_COLOR} tags.
+   *
+   * <p>This tag support both hex string</p>
+   *
+   * @return a resolver for the {@value ShadowColorTagResolver#SHADOW_COLOR} tags
+   * @since 4.10.0
+   */
+  public static @NotNull TagResolver shadowColor() {
+    return ShadowColorTagResolver.INSTANCE;
+  }
+
   /**
    * Get a resolver that handles all default standard tags.
    *
diff --git a/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowTagTest.java b/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowTagTest.java
new file mode 100644
index 000000000..327fa50bc
--- /dev/null
+++ b/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowTagTest.java
@@ -0,0 +1,31 @@
+package net.kyori.adventure.text.minimessage.tag.standard;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.ShadowColor;
+import net.kyori.adventure.text.minimessage.AbstractTest;
+import org.junit.jupiter.api.Test;
+
+class ShadowTagTest extends AbstractTest {
+
+  @Test
+  void testSerializeShadow() {
+    final String expected = "<shadow:#054D79FF>This is a test";
+
+    final Component builder = Component.text("This is a test").shadowColor(ShadowColor.shadowColor(-16429703));
+
+    this.assertSerializedEquals(expected, builder);
+    this.assertParsedEquals(builder, expected);
+  }
+
+  @Test
+  void testSerializeShadowClosing() {
+    final String expected = "<shadow:#054D79FF>This is a</shadow> test";
+
+    final Component builder = Component.text()
+      .append(Component.text("This is a").shadowColor(ShadowColor.shadowColor(-16429703)))
+      .append(Component.text(" test")).asComponent();
+
+    this.assertSerializedEquals(expected, builder);
+    this.assertParsedEquals(builder, expected);
+  }
+}

From 8856286e0ee83c64c881b8432f2be06e6da6452e Mon Sep 17 00:00:00 2001
From: zml <zml@stellardrift.ca>
Date: Thu, 5 Dec 2024 19:38:16 -0800
Subject: [PATCH 04/15] shadow color: style issues

---
 .../adventure/text/format/ShadowColor.java    | 66 +++++++++++++++----
 .../text/format/ShadowColorImpl.java          |  2 +-
 .../tag/standard/ShadowColorTagResolver.java  | 25 ++++++-
 .../tag/standard/ShadowTagTest.java           | 23 +++++++
 4 files changed, 100 insertions(+), 16 deletions(-)

diff --git a/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java b/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
index 70ee8c967..c9c7b53c4 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of adventure, licensed under the MIT License.
  *
- * Copyright (c) 2017-2023 KyoriPowered
+ * Copyright (c) 2017-2024 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,15 +25,40 @@
 
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+/**
+ * A shadow color which may be applied to a {@link Style}.
+ *
+ * <p>Similar to {@link TextColor}, except that shadows contain alpha information.</p>
+ *
+ * @since 4.18.0
+ * @sinceMinecraft 1.21.4
+ */
 public interface ShadowColor extends StyleBuilderApplicable {
+  /**
+   * Create a new shadow color from the ARGB value packed in an int.
+   *
+   * @param value the int-packed ARGB value
+   * @return a new shadow colour
+   * @since 4.18.0
+   */
   @Contract(pure = true)
-  static ShadowColor shadowColor(final int value) {
+  static @NotNull ShadowColor shadowColor(final int value) {
     return new ShadowColorImpl(value);
   }
 
+  /**
+   * Attempt to parse a shadow colour from a {@code #}-prefixed hex string.
+   *
+   * <p>This string should be in the format {@code #RRGGBBAA}</p>
+   *
+   * @param value the input value
+   * @return a shadow color if possible, or null if any components are invalid
+   * @since 4.18.0
+   */
   @Contract(pure = true)
-  static ShadowColor fromHexString(String value) {
+  static @Nullable ShadowColor fromHexString(@NotNull String value) {
     if (value.startsWith("#")) {
       value = value.substring(1);
     }
@@ -41,26 +66,39 @@ static ShadowColor fromHexString(String value) {
       return null;
     }
     try {
-      int r = Integer.parseInt(value.substring(0, 2), 16);
-      int g = Integer.parseInt(value.substring(2, 4), 16);
-      int b = Integer.parseInt(value.substring(4, 6), 16);
-      int a = Integer.parseInt(value.substring(6, 8), 16);
+      final int r = Integer.parseInt(value.substring(0, 2), 16);
+      final int g = Integer.parseInt(value.substring(2, 4), 16);
+      final int b = Integer.parseInt(value.substring(4, 6), 16);
+      final int a = Integer.parseInt(value.substring(6, 8), 16);
       return new ShadowColorImpl((a << 24) | (r << 16) | (g << 8) | b);
     } catch (NumberFormatException ignored) {
       return null;
     }
   }
 
-  @NotNull
-  default String asHexString() {
-    int argb = value();
-    int a = (argb >> 24) & 0xFF;
-    int r = (argb >> 16) & 0xFF;
-    int g = (argb >> 8) & 0xFF;
-    int b = argb & 0xFF;
+  /**
+   * Represent this shadow color as a {@code #}-prefixed hex string.
+   *
+   * <p>This string will be in the format {@code #RRGGBBAA}</p>
+   *
+   * @return the hex string representation of this shadow colour
+   * @since 4.18.0
+   */
+  default @NotNull String asHexString() {
+    final int argb = this.value();
+    final int a = (argb >> 24) & 0xFF;
+    final int r = (argb >> 16) & 0xFF;
+    final int g = (argb >> 8) & 0xFF;
+    final int b = argb & 0xFF;
     return String.format("#%02X%02X%02X%02X", r, g, b, a);
   }
 
+  /**
+   * The int-packed ARGB value of this shadow colour.
+   *
+   * @return the shadow colour value
+   * @since 4.18.0
+   */
   int value();
 
   @Override
diff --git a/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java b/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java
index 7e58b4e79..b31fffe63 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of adventure, licensed under the MIT License.
  *
- * Copyright (c) 2017-2023 KyoriPowered
+ * Copyright (c) 2017-2024 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagResolver.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagResolver.java
index e660f1105..93d59e480 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagResolver.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagResolver.java
@@ -1,3 +1,26 @@
+/*
+ * This file is part of adventure, licensed under the MIT License.
+ *
+ * Copyright (c) 2017-2024 KyoriPowered
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 package net.kyori.adventure.text.minimessage.tag.standard;
 
 import net.kyori.adventure.text.format.ShadowColor;
@@ -17,7 +40,7 @@ class ShadowColorTagResolver implements TagResolver, SerializableResolver.Single
 
   static final TagResolver INSTANCE = new ShadowColorTagResolver();
   private static final StyleClaim<ShadowColor> STYLE = StyleClaim.claim(SHADOW_COLOR, Style::shadowColor, (color, emitter) -> {
-      emitter.tag(SHADOW_COLOR).argument(color.asHexString());
+    emitter.tag(SHADOW_COLOR).argument(color.asHexString());
   });
 
   ShadowColorTagResolver() {
diff --git a/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowTagTest.java b/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowTagTest.java
index 327fa50bc..0e2a1b5a3 100644
--- a/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowTagTest.java
+++ b/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowTagTest.java
@@ -1,3 +1,26 @@
+/*
+ * This file is part of adventure, licensed under the MIT License.
+ *
+ * Copyright (c) 2017-2024 KyoriPowered
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 package net.kyori.adventure.text.minimessage.tag.standard;
 
 import net.kyori.adventure.text.Component;

From 00702cf185f3e843e510b2e071b7fde01f7f48fc Mon Sep 17 00:00:00 2001
From: zml <zml@stellardrift.ca>
Date: Thu, 5 Dec 2024 19:53:02 -0800
Subject: [PATCH 05/15] shadow color: add ARGBLike plus some more overloads

---
 .../adventure/text/format/ShadowColor.java    | 83 ++++++++++++++++++-
 .../text/format/ShadowColorImpl.java          |  3 +
 .../net/kyori/adventure/util/ARGBLike.java    | 41 +++++++++
 3 files changed, 125 insertions(+), 2 deletions(-)
 create mode 100644 api/src/main/java/net/kyori/adventure/util/ARGBLike.java

diff --git a/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java b/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
index c9c7b53c4..de6c74949 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
@@ -23,9 +23,12 @@
  */
 package net.kyori.adventure.text.format;
 
+import net.kyori.adventure.util.ARGBLike;
+import net.kyori.adventure.util.RGBLike;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Range;
 
 /**
  * A shadow color which may be applied to a {@link Style}.
@@ -35,16 +38,48 @@
  * @since 4.18.0
  * @sinceMinecraft 1.21.4
  */
-public interface ShadowColor extends StyleBuilderApplicable {
+public interface ShadowColor extends StyleBuilderApplicable, ARGBLike {
+  /**
+   * Return a shadow colour that will disable the shadow on a component.
+   *
+   * @return a disabling shadow color
+   * @since 4.18.0
+   */
+  static @NotNull ShadowColor none() {
+    return ShadowColorImpl.NONE;
+  }
+
   /**
    * Create a new shadow color from the ARGB value packed in an int.
    *
    * @param value the int-packed ARGB value
+   * @return a shadow color
+   * @since 4.18.0
+   */
+  @Contract(pure = true)
+  static @NotNull ShadowColor shadowColor(final @Range(from = 0x00, to = 0xffffffffL) int value) {
+    if (value == ShadowColorImpl.NONE_VALUE) return none();
+
+    return new ShadowColorImpl(value);
+  }
+
+  /**
+   * Create a new shadow color from an existing colour plus an alpha value.
+   *
+   * @param color the existing color
+   * @param alpha the alpha
    * @return a new shadow colour
    * @since 4.18.0
    */
   @Contract(pure = true)
-  static @NotNull ShadowColor shadowColor(final int value) {
+  static @NotNull ShadowColor shadowColor(final @NotNull RGBLike color, final @Range(from = 0x0, to = 0xff) int alpha) {
+    final int value =
+      (alpha & 0xff) << 24
+        | (color.red() & 0xff) << 16
+        | (color.green() & 0xff) << 8
+        | (color.blue() & 0xff);
+
+    if (value == ShadowColorImpl.NONE_VALUE) return none();
     return new ShadowColorImpl(value);
   }
 
@@ -93,6 +128,50 @@ public interface ShadowColor extends StyleBuilderApplicable {
     return String.format("#%02X%02X%02X%02X", r, g, b, a);
   }
 
+  /**
+   * Get the red component of the shadow colour.
+   *
+   * @return the red component, in the range [0x0, 0xff]
+   * @since 4.18.0
+   */
+  @Override
+  default @Range(from = 0x0, to = 0xff) int red() {
+    return (this.value() >> 16) & 0xff;
+  }
+
+  /**
+   * Get the green component of the shadow colour.
+   *
+   * @return the green component, in the range [0x0, 0xff]
+   * @since 4.18.0
+   */
+  @Override
+  default @Range(from = 0x0, to = 0xff) int green() {
+    return (this.value() >> 8) & 0xff;
+  }
+
+  /**
+   * Get the blue component of the shadow colour.
+   *
+   * @return the blue component, in the range [0x0, 0xff]
+   * @since 4.18.0
+   */
+  @Override
+  default @Range(from = 0x0, to = 0xff) int blue() {
+    return this.value() & 0xff;
+  }
+
+  /**
+   * Get the alpha component of the shadow colour.
+   *
+   * @return the blue component, in the range [0x0, 0xff]
+   * @since 4.18.0
+   */
+  @Override
+  default @Range(from = 0x0, to = 0xff) int alpha() {
+    return (this.value() >> 24) & 0xff;
+  }
+
   /**
    * The int-packed ARGB value of this shadow colour.
    *
diff --git a/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java b/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java
index b31fffe63..dc7b6a26c 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java
@@ -24,6 +24,9 @@
 package net.kyori.adventure.text.format;
 
 final class ShadowColorImpl implements ShadowColor {
+  static final int NONE_VALUE = 0;
+  static final ShadowColorImpl NONE = new ShadowColorImpl(NONE_VALUE);
+
   private final int value;
 
   ShadowColorImpl(final int value) {
diff --git a/api/src/main/java/net/kyori/adventure/util/ARGBLike.java b/api/src/main/java/net/kyori/adventure/util/ARGBLike.java
new file mode 100644
index 000000000..22ee44c22
--- /dev/null
+++ b/api/src/main/java/net/kyori/adventure/util/ARGBLike.java
@@ -0,0 +1,41 @@
+/*
+ * This file is part of adventure, licensed under the MIT License.
+ *
+ * Copyright (c) 2017-2024 KyoriPowered
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package net.kyori.adventure.util;
+
+import org.jetbrains.annotations.Range;
+
+/**
+ * Something that can provide red, green, and blue, and alpha colour components.
+ *
+ * @since 4.18.0
+ */
+public interface ARGBLike extends RGBLike {
+  /**
+   * Gets the alpha component.
+   *
+   * @return the alpha component
+   * @since 4.18.0
+   */
+  @Range(from = 0x0, to = 0xff) int alpha();
+}

From d8075e0ebd3c79acf70039446546a97a442095f2 Mon Sep 17 00:00:00 2001
From: zml <zml@stellardrift.ca>
Date: Thu, 5 Dec 2024 20:02:34 -0800
Subject: [PATCH 06/15] shadow color: make api use ARGBLike

---
 .../text/AbstractComponentBuilder.java        |  6 +--
 .../net/kyori/adventure/text/Component.java   |  7 +--
 .../kyori/adventure/text/ScopedComponent.java |  6 +--
 .../adventure/text/format/ShadowColor.java    | 49 ++++++++++++++++---
 .../adventure/text/format/StyleImpl.java      | 15 +++---
 .../adventure/text/format/StyleSetter.java    |  5 +-
 6 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java b/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java
index 25ce1eb48..b60a9a9f1 100644
--- a/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java
+++ b/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java
@@ -33,10 +33,10 @@
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEventSource;
-import net.kyori.adventure.text.format.ShadowColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
+import net.kyori.adventure.util.ARGBLike;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -239,14 +239,14 @@ private void prepareChildren() {
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B shadowColor(final @Nullable ShadowColor color) {
+  public @NotNull B shadowColor(final @Nullable ARGBLike color) {
     this.styleBuilder().shadowColor(color);
     return (B) this;
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B shadowColorIfAbsent(final @Nullable ShadowColor color) {
+  public @NotNull B shadowColorIfAbsent(final @Nullable ARGBLike color) {
     this.styleBuilder().shadowColorIfAbsent(color);
     return (B) this;
   }
diff --git a/api/src/main/java/net/kyori/adventure/text/Component.java b/api/src/main/java/net/kyori/adventure/text/Component.java
index 8ddec4eaf..c5081b55b 100644
--- a/api/src/main/java/net/kyori/adventure/text/Component.java
+++ b/api/src/main/java/net/kyori/adventure/text/Component.java
@@ -54,6 +54,7 @@
 import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.serializer.ComponentSerializer;
 import net.kyori.adventure.translation.Translatable;
+import net.kyori.adventure.util.ARGBLike;
 import net.kyori.adventure.util.ForwardingIterator;
 import net.kyori.adventure.util.IntFunction2;
 import net.kyori.adventure.util.MonkeyBars;
@@ -2231,7 +2232,7 @@ default void detectCycle(final @NotNull Component that) {
    */
   @Contract(pure = true)
   @Override
-  default @NotNull Component shadowColor(final @Nullable ShadowColor color) {
+  default @NotNull Component shadowColor(final @Nullable ARGBLike color) {
     return this.style(this.style().shadowColor(color));
   }
 
@@ -2244,8 +2245,8 @@ default void detectCycle(final @NotNull Component that) {
    */
   @Contract(pure = true)
   @Override
-  default @NotNull Component shadowColorIfAbsent(final @Nullable ShadowColor color) {
-    if (this.shadowColor() == null) return this.shadowColorIfAbsent(color);
+  default @NotNull Component shadowColorIfAbsent(final @Nullable ARGBLike color) {
+    if (this.shadowColor() == null) return this.shadowColor(color);
     return this;
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java b/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java
index 315ba57fe..9f59855cc 100644
--- a/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java
+++ b/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java
@@ -28,10 +28,10 @@
 import java.util.function.Consumer;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEventSource;
-import net.kyori.adventure.text.format.ShadowColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
+import net.kyori.adventure.util.ARGBLike;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -110,13 +110,13 @@ public interface ScopedComponent<C extends Component> extends Component {
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C shadowColor(final @Nullable ShadowColor color) {
+  default @NotNull C shadowColor(final @Nullable ARGBLike color) {
     return (C) Component.super.shadowColor(color);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C shadowColorIfAbsent(final @Nullable ShadowColor color) {
+  default @NotNull C shadowColorIfAbsent(final @Nullable ARGBLike color) {
     return (C) Component.super.shadowColorIfAbsent(color);
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java b/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
index de6c74949..c20e750b4 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
@@ -64,25 +64,60 @@ public interface ShadowColor extends StyleBuilderApplicable, ARGBLike {
   }
 
   /**
-   * Create a new shadow color from an existing colour plus an alpha value.
+   * Create a new shadow color from individual red, green, blue, and alpha values.
    *
-   * @param color the existing color
+   * @param red the red value
+   * @param green the green value
+   * @param blue the blue value
    * @param alpha the alpha
-   * @return a new shadow colour
+   * @return a shadow colour
    * @since 4.18.0
    */
   @Contract(pure = true)
-  static @NotNull ShadowColor shadowColor(final @NotNull RGBLike color, final @Range(from = 0x0, to = 0xff) int alpha) {
+  static @NotNull ShadowColor shadowColor(
+    final @Range(from = 0x0, to = 0xff) int red,
+    final @Range(from = 0x0, to = 0xff) int green,
+    final @Range(from = 0x0, to = 0xff) int blue,
+    final @Range(from = 0x0, to = 0xff) int alpha
+  ) {
     final int value =
       (alpha & 0xff) << 24
-        | (color.red() & 0xff) << 16
-        | (color.green() & 0xff) << 8
-        | (color.blue() & 0xff);
+        | (red & 0xff) << 16
+        | (green & 0xff) << 8
+        | (blue & 0xff);
 
     if (value == ShadowColorImpl.NONE_VALUE) return none();
     return new ShadowColorImpl(value);
   }
 
+  /**
+   * Create a shadow color from an existing colour plus an alpha value.
+   *
+   * @param color the existing color
+   * @param alpha the alpha
+   * @return a shadow colour
+   * @since 4.18.0
+   */
+  @Contract(pure = true)
+  static @NotNull ShadowColor shadowColor(final @NotNull RGBLike color, final @Range(from = 0x0, to = 0xff) int alpha) {
+    return shadowColor(color.red(), color.green(), color.blue(), alpha);
+  }
+
+  /**
+   * Create a shadow color from an existing ARGB colour.
+   *
+   * @param argb the existing color
+   * @return a shadow colour
+   * @since 4.18.0
+   */
+  static @NotNull ShadowColor shadowColor(final @NotNull ARGBLike argb) {
+    if (argb instanceof ShadowColor) {
+      return (ShadowColor) argb;
+    }
+
+    return shadowColor(argb.red(), argb.green(), argb.blue(), argb.alpha());
+  }
+
   /**
    * Attempt to parse a shadow colour from a {@code #}-prefixed hex string.
    *
diff --git a/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java b/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java
index 6c529fc3f..dccf344ae 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java
@@ -33,6 +33,7 @@
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.event.HoverEventSource;
+import net.kyori.adventure.util.ARGBLike;
 import net.kyori.examination.ExaminableProperty;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -104,13 +105,13 @@ final class StyleImpl implements Style {
   }
 
   @Override
-  public @NotNull Style shadowColor(final @Nullable ShadowColor color) {
+  public @NotNull Style shadowColor(final @Nullable ARGBLike color) {
     if (Objects.equals(this.shadowColor, color)) return this;
-    return new StyleImpl(this.font, this.color, color, this.decorations, this.clickEvent, this.hoverEvent, this.insertion);
+    return new StyleImpl(this.font, this.color, color == null ? null : ShadowColor.shadowColor(color), this.decorations, this.clickEvent, this.hoverEvent, this.insertion);
   }
 
   @Override
-  public @NotNull Style shadowColorIfAbsent(final @Nullable ShadowColor color) {
+  public @NotNull Style shadowColorIfAbsent(final @Nullable ARGBLike color) {
     if (this.shadowColor == null) {
       return this.shadowColor(color);
     }
@@ -348,15 +349,15 @@ static final class BuilderImpl implements Builder {
     }
 
     @Override
-    public @NotNull Builder shadowColor(final @Nullable ShadowColor color) {
-      this.shadowColor = color;
+    public @NotNull Builder shadowColor(final @Nullable ARGBLike color) {
+      this.shadowColor = color == null ? null : ShadowColor.shadowColor(color);
       return this;
     }
 
     @Override
-    public @NotNull Builder shadowColorIfAbsent(final @Nullable ShadowColor color) {
+    public @NotNull Builder shadowColorIfAbsent(final @Nullable ARGBLike color) {
       if (this.shadowColor == null) {
-        this.shadowColor = color;
+        this.shadowColor = color == null ? null : ShadowColor.shadowColor(color);
       }
       return this;
     }
diff --git a/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java b/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java
index 64c4c5bf9..a1f71d3a4 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java
@@ -32,6 +32,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEventSource;
+import net.kyori.adventure.util.ARGBLike;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -80,7 +81,7 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    * @return an object ({@code T})
    * @since 4.18.0
    */
-  @NotNull T shadowColor(final @Nullable ShadowColor color);
+  @NotNull T shadowColor(final @Nullable ARGBLike color);
 
   /**
    * Sets the shadow color if there isn't one set already.
@@ -89,7 +90,7 @@ public interface StyleSetter<T extends StyleSetter<?>> {
    * @return an object ({@code T})
    * @since 4.18.0
    */
-  @NotNull T shadowColorIfAbsent(final @Nullable ShadowColor color);
+  @NotNull T shadowColorIfAbsent(final @Nullable ARGBLike color);
 
   /**
    * Sets the state of {@code decoration} to {@link TextDecoration.State#TRUE}.

From 572a93f1678290ecb0b8b92b0840cfab37dd7b5a Mon Sep 17 00:00:00 2001
From: zml <zml@stellardrift.ca>
Date: Fri, 6 Dec 2024 22:33:19 -0800
Subject: [PATCH 07/15] shadow color: try something fancier for MM syntax

---
 .../tag/standard/ShadowColorTagResolver.java  | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagResolver.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagResolver.java
index 93d59e480..da8f07d09 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagResolver.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagResolver.java
@@ -23,8 +23,10 @@
  */
 package net.kyori.adventure.text.minimessage.tag.standard;
 
+import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.ShadowColor;
 import net.kyori.adventure.text.format.Style;
+import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.minimessage.Context;
 import net.kyori.adventure.text.minimessage.ParsingException;
 import net.kyori.adventure.text.minimessage.internal.serializer.SerializableResolver;
@@ -37,10 +39,18 @@
 
 class ShadowColorTagResolver implements TagResolver, SerializableResolver.Single {
   private static final String SHADOW_COLOR = "shadow";
+  private static final float DEFAULT_ALPHA = 0.25f;
 
   static final TagResolver INSTANCE = new ShadowColorTagResolver();
   private static final StyleClaim<ShadowColor> STYLE = StyleClaim.claim(SHADOW_COLOR, Style::shadowColor, (color, emitter) -> {
-    emitter.tag(SHADOW_COLOR).argument(color.asHexString());
+    emitter.tag(SHADOW_COLOR);
+
+    final @Nullable NamedTextColor possibleMatch = NamedTextColor.namedColor(TextColor.color(color).value());
+    if (possibleMatch != null) {
+      emitter.argument(NamedTextColor.NAMES.key(possibleMatch)).argument(Float.toString((float) color.alpha() / 0xff));
+    } else {
+      emitter.argument(color.asHexString());
+    }
   });
 
   ShadowColorTagResolver() {
@@ -53,10 +63,18 @@ class ShadowColorTagResolver implements TagResolver, SerializableResolver.Single
     }
 
     final String colorString = args.popOr("Expected to find a color parameter: #RRGGBBAA").lowerValue();
-    final ShadowColor color = ShadowColor.fromHexString(colorString);
-    if (color == null) {
-      throw ctx.newException(String.format("Unable to parse a shadow color from '%s'. Please use #RRGGBBAA formatting.", colorString));
+    final ShadowColor color;
+    if (colorString.startsWith(TextColor.HEX_PREFIX) && colorString.length() == 9) {
+      color = ShadowColor.fromHexString(colorString);
+      if (color == null) {
+        throw ctx.newException(String.format("Unable to parse a shadow color from '%s'. Please use #RRGGBBAA formatting.", colorString));
+      }
+    } else {
+      final TextColor text = ColorTagResolver.resolveColor(colorString, ctx);
+      final float alpha = args.hasNext() ? (float) args.pop().asDouble().orElseThrow(() -> ctx.newException("Number was expected to be a double")) : DEFAULT_ALPHA;
+      color = ShadowColor.shadowColor(text, (int) (alpha * 0xff));
     }
+
     return Tag.styling(color);
   }
 

From 08a587505c5861481f61e52f38fa7b39fa6b4350 Mon Sep 17 00:00:00 2001
From: zml <zml@stellardrift.ca>
Date: Sat, 7 Dec 2024 13:04:23 -0800
Subject: [PATCH 08/15] shadow color: test coverage

---
 .../adventure/text/format/ShadowColor.java    | 57 +++++++++---
 .../text/format/ShadowColorImpl.java          | 34 ++++++-
 .../text/format/ShadowColorTest.java          | 90 +++++++++++++++++++
 .../tag/standard/ShadowTagTest.java           | 25 +++++-
 4 files changed, 189 insertions(+), 17 deletions(-)
 create mode 100644 api/src/test/java/net/kyori/adventure/text/format/ShadowColorTest.java

diff --git a/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java b/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
index c20e750b4..4cb14994d 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
@@ -25,6 +25,7 @@
 
 import net.kyori.adventure.util.ARGBLike;
 import net.kyori.adventure.util.RGBLike;
+import org.intellij.lang.annotations.Pattern;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -40,7 +41,36 @@
  */
 public interface ShadowColor extends StyleBuilderApplicable, ARGBLike {
   /**
-   * Return a shadow colour that will disable the shadow on a component.
+   * Linearly interpolates between {@code a} and {@code b} by {@code t}.
+   *
+   * <p>This returns a color blended between color {@code a}, at {@code t=0.0}, and color {@code b}, at {@code t=1.0}.</p>
+   *
+   * @param t the interpolation value, between {@code 0.0} and {@code 1.0} (both inclusive)
+   * @param a the lower bound ({@code t=0.0})
+   * @param b the upper bound ({@code t=1.0})
+   * @return the interpolated value, a color between the two input colors {@code a} and {@code b}
+   * @since 4.18.0
+   */
+  static @NotNull ShadowColor lerp(final float t, final @NotNull ARGBLike a, final @NotNull ARGBLike b) {
+    final float clampedT = Math.min(1.0f, Math.max(0.0f, t)); // clamp between 0 and 1
+    final int ar = a.red();
+    final int br = b.red();
+    final int ag = a.green();
+    final int bg = b.green();
+    final int ab = a.blue();
+    final int bb = b.blue();
+    final int aa = a.alpha();
+    final int ba = b.alpha();
+    return shadowColor(
+      Math.round(ar + clampedT * (br - ar)),
+      Math.round(ag + clampedT * (bg - ag)),
+      Math.round(ab + clampedT * (bb - ab)),
+      Math.round(aa + clampedT * (ba - aa))
+    );
+  }
+
+  /**
+   * Return a shadow color that will disable the shadow on a component.
    *
    * @return a disabling shadow color
    * @since 4.18.0
@@ -52,12 +82,14 @@ public interface ShadowColor extends StyleBuilderApplicable, ARGBLike {
   /**
    * Create a new shadow color from the ARGB value packed in an int.
    *
+   * <p>This int will be in the format {@code 0xAARRGGBB}</p>
+   *
    * @param value the int-packed ARGB value
    * @return a shadow color
    * @since 4.18.0
    */
   @Contract(pure = true)
-  static @NotNull ShadowColor shadowColor(final @Range(from = 0x00, to = 0xffffffffL) int value) {
+  static @NotNull ShadowColor shadowColor(final int value) {
     if (value == ShadowColorImpl.NONE_VALUE) return none();
 
     return new ShadowColorImpl(value);
@@ -121,25 +153,22 @@ public interface ShadowColor extends StyleBuilderApplicable, ARGBLike {
   /**
    * Attempt to parse a shadow colour from a {@code #}-prefixed hex string.
    *
-   * <p>This string should be in the format {@code #RRGGBBAA}</p>
+   * <p>This string must be in the format {@code #RRGGBBAA}</p>
    *
    * @param value the input value
    * @return a shadow color if possible, or null if any components are invalid
    * @since 4.18.0
    */
   @Contract(pure = true)
-  static @Nullable ShadowColor fromHexString(@NotNull String value) {
-    if (value.startsWith("#")) {
-      value = value.substring(1);
-    }
-    if (value.length() != 8) {
-      return null;
-    }
+  static @Nullable ShadowColor fromHexString(@Pattern("#[0-9a-fA-F]{8}") final @NotNull String value) {
+    if (value.length() != 9) return null;
+    if (!value.startsWith("#")) return null;
+
     try {
-      final int r = Integer.parseInt(value.substring(0, 2), 16);
-      final int g = Integer.parseInt(value.substring(2, 4), 16);
-      final int b = Integer.parseInt(value.substring(4, 6), 16);
-      final int a = Integer.parseInt(value.substring(6, 8), 16);
+      final int r = Integer.parseInt(value.substring(1, 3), 16);
+      final int g = Integer.parseInt(value.substring(3, 5), 16);
+      final int b = Integer.parseInt(value.substring(5, 7), 16);
+      final int a = Integer.parseInt(value.substring(7, 9), 16);
       return new ShadowColorImpl((a << 24) | (r << 16) | (g << 8) | b);
     } catch (NumberFormatException ignored) {
       return null;
diff --git a/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java b/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java
index dc7b6a26c..22fee2076 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java
@@ -23,7 +23,15 @@
  */
 package net.kyori.adventure.text.format;
 
-final class ShadowColorImpl implements ShadowColor {
+import java.util.Objects;
+import java.util.stream.Stream;
+import net.kyori.adventure.internal.Internals;
+import net.kyori.examination.Examinable;
+import net.kyori.examination.ExaminableProperty;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+final class ShadowColorImpl implements ShadowColor, Examinable {
   static final int NONE_VALUE = 0;
   static final ShadowColorImpl NONE = new ShadowColorImpl(NONE_VALUE);
 
@@ -37,4 +45,28 @@ final class ShadowColorImpl implements ShadowColor {
   public int value() {
     return this.value;
   }
+
+  @Override
+  public boolean equals(final @Nullable Object other) {
+    if (!(other instanceof ShadowColorImpl)) return false;
+    final ShadowColorImpl that = (ShadowColorImpl) other;
+    return this.value == that.value;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(this.value);
+  }
+
+  @Override
+  public String toString() {
+    return Internals.toString(this);
+  }
+
+  @Override
+  public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
+    return Stream.of(
+      ExaminableProperty.of("value", this.value)
+    );
+  }
 }
diff --git a/api/src/test/java/net/kyori/adventure/text/format/ShadowColorTest.java b/api/src/test/java/net/kyori/adventure/text/format/ShadowColorTest.java
new file mode 100644
index 000000000..4f54f3c4a
--- /dev/null
+++ b/api/src/test/java/net/kyori/adventure/text/format/ShadowColorTest.java
@@ -0,0 +1,90 @@
+/*
+ * This file is part of adventure, licensed under the MIT License.
+ *
+ * Copyright (c) 2017-2024 KyoriPowered
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package net.kyori.adventure.text.format;
+
+import com.google.common.testing.EqualsTester;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+class ShadowColorTest {
+  @Test
+  void testZeroIsNone() {
+    assertSame(ShadowColor.none(), ShadowColor.shadowColor(0));
+  }
+
+  @Test
+  void testRedComponent() {
+    final ShadowColor clr = ShadowColor.shadowColor(0xff, 0xbb, 0xcc, 0xdd);
+    assertEquals(0xff, clr.red());
+  }
+
+  @Test
+  void testGreenComponent() {
+    final ShadowColor clr = ShadowColor.shadowColor(0xaa, 0xff, 0xcc, 0xdd);
+    assertEquals(0xff, clr.green());
+  }
+
+  @Test
+  void testBlueComponent() {
+    final ShadowColor clr = ShadowColor.shadowColor(0xaa, 0xbb, 0xff, 0xdd);
+    assertEquals(0xff, clr.blue());
+  }
+
+  @Test
+  void testAlphaComponent() {
+    final ShadowColor clr = ShadowColor.shadowColor(0xaa, 0xbb, 0xcc, 0xff);
+    assertEquals(0xff, clr.alpha());
+  }
+
+  @Test
+  @SuppressWarnings("PatternValidation") // we are testing invalid inputs
+  void testInvalidHexIsNull() {
+    assertNull(ShadowColor.fromHexString("aabbccdd"));
+    assertNull(ShadowColor.fromHexString("#abc"));
+    assertNull(ShadowColor.fromHexString("#aabbccddtoomuch"));
+  }
+
+  @Test
+  void testEquality() {
+    new EqualsTester()
+      .addEqualityGroup(
+        ShadowColor.shadowColor(0xDDAABBCC),
+        ShadowColor.shadowColor(0xAA, 0xBB, 0xCC, 0xDD),
+        ShadowColor.fromHexString("#AABBCCDD")
+      )
+      .addEqualityGroup(
+        ShadowColor.shadowColor(0xFFFFFFFF),
+        ShadowColor.shadowColor(0xFF, 0xFF, 0xFF, 0xFF),
+        ShadowColor.fromHexString("#FFFFFFFF")
+      )
+      .addEqualityGroup(
+        ShadowColor.none(),
+        ShadowColor.shadowColor(0)
+      )
+      .testEquals();
+  }
+}
diff --git a/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowTagTest.java b/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowTagTest.java
index 0e2a1b5a3..b6d381b95 100644
--- a/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowTagTest.java
+++ b/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowTagTest.java
@@ -24,17 +24,37 @@
 package net.kyori.adventure.text.minimessage.tag.standard;
 
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.ShadowColor;
 import net.kyori.adventure.text.minimessage.AbstractTest;
 import org.junit.jupiter.api.Test;
 
 class ShadowTagTest extends AbstractTest {
+  @Test
+  void testRoundtripNamedShadow() {
+    final String input = "<shadow:red:0.8>i have a red shadow";
+    final Component expected = Component.text("i have a red shadow")
+      .shadowColor(ShadowColor.shadowColor(NamedTextColor.RED, 0xCC));
+
+    this.assertParsedEquals(expected, input);
+    this.assertSerializedEquals(input, expected);
+  }
+
+  @Test
+  void testParseHexComponentShadow() {
+    final String input = "<shadow:#FF0000:0.8>i have a redder shadow";
+    final Component expected = Component.text("i have a redder shadow")
+      .shadowColor(ShadowColor.shadowColor(0xFF, 0, 0, 0xCC));
+
+    this.assertParsedEquals(expected, input);
+  }
 
   @Test
   void testSerializeShadow() {
     final String expected = "<shadow:#054D79FF>This is a test";
 
-    final Component builder = Component.text("This is a test").shadowColor(ShadowColor.shadowColor(-16429703));
+    final Component builder = Component.text("This is a test")
+      .shadowColor(ShadowColor.shadowColor(0xff_05_4d_79));
 
     this.assertSerializedEquals(expected, builder);
     this.assertParsedEquals(builder, expected);
@@ -45,7 +65,8 @@ void testSerializeShadowClosing() {
     final String expected = "<shadow:#054D79FF>This is a</shadow> test";
 
     final Component builder = Component.text()
-      .append(Component.text("This is a").shadowColor(ShadowColor.shadowColor(-16429703)))
+      .append(Component.text("This is a")
+        .shadowColor(ShadowColor.shadowColor(0xff_05_4d_79)))
       .append(Component.text(" test")).asComponent();
 
     this.assertSerializedEquals(expected, builder);

From de37bf6cb61f3725f56e014cdb9c1efda44751f2 Mon Sep 17 00:00:00 2001
From: zml <zml@stellardrift.ca>
Date: Sat, 7 Dec 2024 13:57:20 -0800
Subject: [PATCH 09/15] shadow color: support in json serializer, fill in some
 style gaps

---
 .../kyori/adventure/text/format/Style.java    |  2 +-
 .../adventure/text/format/StyleImpl.java      | 16 ++++++
 .../serializer/gson/SerializerFactory.java    |  2 +-
 .../gson/ShadowColorSerializer.java           | 50 +++++++++++++++++--
 .../text/serializer/gson/StyleSerializer.java |  8 ++-
 .../text/serializer/json/JSONOptions.java     | 40 +++++++++++++++
 6 files changed, 112 insertions(+), 6 deletions(-)

diff --git a/api/src/main/java/net/kyori/adventure/text/format/Style.java b/api/src/main/java/net/kyori/adventure/text/format/Style.java
index 0c9882e86..efac65fda 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/Style.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/Style.java
@@ -562,7 +562,7 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    */
   enum Merge {
     /**
-     * Merges {@link Style#color()}.
+     * Merges {@link Style#color()} and {@link Style#shadowColor()}.
      *
      * @since 4.0.0
      */
diff --git a/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java b/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java
index dccf344ae..65d106565 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java
@@ -223,6 +223,10 @@ final class StyleImpl implements Style {
       builder.color(null);
     }
 
+    if (Objects.equals(this.shadowColor(), that.shadowColor())) {
+      builder.shadowColor(null);
+    }
+
     for (int i = 0, length = DecorationMap.DECORATIONS.length; i < length; i++) {
       final TextDecoration decoration = DecorationMap.DECORATIONS[i];
       if (this.decoration(decoration) == that.decoration(decoration)) {
@@ -269,6 +273,7 @@ public boolean isEmpty() {
       this.decorations.examinableProperties(),
       Stream.of(
         ExaminableProperty.of("color", this.color),
+        ExaminableProperty.of("shadowColor", this.shadowColor),
         ExaminableProperty.of("clickEvent", this.clickEvent),
         ExaminableProperty.of("hoverEvent", this.hoverEvent),
         ExaminableProperty.of("insertion", this.insertion),
@@ -289,6 +294,7 @@ public boolean equals(final @Nullable Object other) {
     final StyleImpl that = (StyleImpl) other;
     return Objects.equals(this.color, that.color)
       && this.decorations.equals(that.decorations)
+      && Objects.equals(this.shadowColor, that.shadowColor)
       && Objects.equals(this.clickEvent, that.clickEvent)
       && Objects.equals(this.hoverEvent, that.hoverEvent)
       && Objects.equals(this.insertion, that.insertion)
@@ -298,6 +304,7 @@ public boolean equals(final @Nullable Object other) {
   @Override
   public int hashCode() {
     int result = Objects.hashCode(this.color);
+    result = (31 * result) + Objects.hashCode(this.shadowColor);
     result = (31 * result) + this.decorations.hashCode();
     result = (31 * result) + Objects.hashCode(this.clickEvent);
     result = (31 * result) + Objects.hashCode(this.hoverEvent);
@@ -321,6 +328,7 @@ static final class BuilderImpl implements Builder {
 
     BuilderImpl(final @NotNull StyleImpl style) {
       this.color = style.color;
+      this.shadowColor = style.shadowColor;
       this.decorations = new EnumMap<>(style.decorations);
       this.clickEvent = style.clickEvent;
       this.hoverEvent = style.hoverEvent;
@@ -418,6 +426,13 @@ static final class BuilderImpl implements Builder {
             this.color(color);
           }
         }
+
+        final ShadowColor shadowColor = that.shadowColor();
+        if (shadowColor != null) {
+          if (strategy == Merge.Strategy.ALWAYS || (strategy == Merge.Strategy.IF_ABSENT_ON_TARGET && this.shadowColor == null)) {
+            this.shadowColor(shadowColor);
+          }
+        }
       }
 
       if (merges.contains(Merge.DECORATIONS)) {
@@ -481,6 +496,7 @@ static final class BuilderImpl implements Builder {
 
     private boolean isEmpty() {
       return this.color == null
+        && this.shadowColor == null
         && this.decorations.values().stream().allMatch(state -> state == TextDecoration.State.NOT_SET)
         && this.clickEvent == null
         && this.hoverEvent == null
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java
index f4de4249e..6d0fc3eff 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java
@@ -90,7 +90,7 @@ public <T> TypeAdapter<T> create(final Gson gson, final TypeToken<T> type) {
     } else if (COLOR_TYPE.isAssignableFrom(rawType)) {
       return (TypeAdapter<T>) (this.features.value(JSONOptions.EMIT_RGB) ? TextColorSerializer.INSTANCE : TextColorSerializer.DOWNSAMPLE_COLOR);
     } else if (SHADOW_COLOR_TYPE.isAssignableFrom(rawType)) {
-      return (TypeAdapter<T>) ShadowColorSerializer.INSTANCE;
+      return (TypeAdapter<T>) ShadowColorSerializer.create(this.features);
     } else if (TEXT_DECORATION_TYPE.isAssignableFrom(rawType)) {
       return (TypeAdapter<T>) TextDecorationSerializer.INSTANCE;
     } else if (BLOCK_NBT_POS_TYPE.isAssignableFrom(rawType)) {
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShadowColorSerializer.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShadowColorSerializer.java
index a1d30de1e..809772d2b 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShadowColorSerializer.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShadowColorSerializer.java
@@ -23,27 +23,71 @@
  */
 package net.kyori.adventure.text.serializer.gson;
 
+import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import net.kyori.adventure.text.format.ShadowColor;
+import net.kyori.adventure.text.serializer.json.JSONOptions;
+import net.kyori.option.OptionState;
 
 final class ShadowColorSerializer extends TypeAdapter<ShadowColor> {
-  static final TypeAdapter<ShadowColor> INSTANCE = new ShadowColorSerializer().nullSafe();
+  static TypeAdapter<ShadowColor> create(final OptionState options) {
+    return new ShadowColorSerializer(options.value(JSONOptions.SHADOW_COLOR_MODE) == JSONOptions.ShadowColorEmitMode.EMIT_ARRAY).nullSafe();
+  }
+
+  private final boolean emitArray;
+
+  private ShadowColorSerializer(final boolean emitArray) {
+    this.emitArray = emitArray;
+  }
 
   @Override
   public void write(final JsonWriter out, final ShadowColor value) throws IOException {
-    out.value(value.value());
+    if (this.emitArray) {
+      out.beginArray()
+        .value(componentAsFloat(value.red()))
+        .value(componentAsFloat(value.green()))
+        .value(componentAsFloat(value.blue()))
+        .value(componentAsFloat(value.alpha()))
+        .endArray();
+
+    } else {
+      out.value(value.value());
+    }
   }
 
   @Override
   public ShadowColor read(final JsonReader in) throws IOException {
     if (in.peek() == JsonToken.BEGIN_ARRAY) {
-      throw new UnsupportedOperationException(); // TODO
+      in.beginArray();
+      final double r = in.nextDouble();
+      final double g = in.nextDouble();
+      final double b = in.nextDouble();
+      final double a = in.nextDouble();
+      if (in.peek() != JsonToken.END_ARRAY) {
+        throw new JsonParseException("Failed to parse shadow colour at " + in.getPath() + ": expected end of 4-element array but got " + in.peek() + " instead.");
+      }
+      in.endArray();
+
+      return ShadowColor.shadowColor(
+        componentFromFloat(r),
+        componentFromFloat(g),
+        componentFromFloat(b),
+        componentFromFloat(a)
+      );
     }
 
     return ShadowColor.shadowColor(in.nextInt());
   }
+
+  static float componentAsFloat(final int element) {
+    return (float) element / 0xff;
+  }
+
+  static int componentFromFloat(final double element) {
+    return (int) ((float) element) * 0xff;
+  }
 }
diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java
index 8cd6f945e..a0331b3da 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java
@@ -91,6 +91,7 @@ static TypeAdapter<Style> create(final net.kyori.adventure.text.serializer.json.
       hoverMode == JSONOptions.HoverEventValueMode.LEGACY_ONLY || hoverMode == JSONOptions.HoverEventValueMode.BOTH,
       hoverMode == JSONOptions.HoverEventValueMode.MODERN_ONLY || hoverMode == JSONOptions.HoverEventValueMode.BOTH,
       features.value(JSONOptions.VALIDATE_STRICT_EVENTS),
+      features.value(JSONOptions.SHADOW_COLOR_MODE) != JSONOptions.ShadowColorEmitMode.NONE,
       gson
     ).nullSafe();
   }
@@ -99,6 +100,7 @@ static TypeAdapter<Style> create(final net.kyori.adventure.text.serializer.json.
   private final boolean emitLegacyHover;
   private final boolean emitModernHover;
   private final boolean strictEventValues;
+  private final boolean emitShadowColor;
   private final Gson gson;
 
   private StyleSerializer(
@@ -106,12 +108,14 @@ private StyleSerializer(
     final boolean emitLegacyHover,
     final boolean emitModernHover,
     final boolean strictEventValues,
+    final boolean emitShadowColor,
     final Gson gson
   ) {
     this.legacyHover = legacyHover;
     this.emitLegacyHover = emitLegacyHover;
     this.emitModernHover = emitModernHover;
     this.strictEventValues = strictEventValues;
+    this.emitShadowColor = emitShadowColor;
     this.gson = gson;
   }
 
@@ -131,6 +135,8 @@ public Style read(final JsonReader in) throws IOException {
         } else if (color.decoration != null) {
           style.decoration(color.decoration, TextDecoration.State.TRUE);
         }
+      } else if (fieldName.equals(SHADOW_COLOR)) {
+        style.shadowColor(this.gson.fromJson(in, SerializerFactory.SHADOW_COLOR_TYPE));
       } else if (TextDecoration.NAMES.keys().contains(fieldName)) {
         style.decoration(TextDecoration.NAMES.value(fieldName), GsonHacks.readBoolean(in));
       } else if (fieldName.equals(INSERTION)) {
@@ -269,7 +275,7 @@ public void write(final JsonWriter out, final Style value) throws IOException {
     }
 
     final @Nullable ShadowColor shadowColor = value.shadowColor();
-    if (shadowColor != null) {
+    if (shadowColor != null && this.emitShadowColor) {
       out.name(SHADOW_COLOR);
       this.gson.toJson(shadowColor, SerializerFactory.SHADOW_COLOR_TYPE, out);
     }
diff --git a/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/JSONOptions.java b/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/JSONOptions.java
index 05c1e1581..7d93e8334 100644
--- a/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/JSONOptions.java
+++ b/text-serializer-json/src/main/java/net/kyori/adventure/text/serializer/json/JSONOptions.java
@@ -42,6 +42,7 @@ private JSONOptions() {
   private static final int VERSION_1_16 = 2526; // 20w16a
   private static final int VERSION_1_20_3 = 3679; // 23w40a
   private static final int VERSION_1_20_5 = 3819; // 24w09a
+  private static final int VERSION_1_21_4 = 4174; // 24w44a
 
   /**
    * Whether to emit RGB text.
@@ -99,6 +100,13 @@ private JSONOptions() {
    */
   public static final Option<ShowItemHoverDataMode> SHOW_ITEM_HOVER_DATA_MODE = Option.enumOption(key("emit/show_item_hover_data"), ShowItemHoverDataMode.class, ShowItemHoverDataMode.EMIT_EITHER);
 
+  /**
+   * How to emit shadow colour data.
+   *
+   * @since 4.18.0
+   */
+  public static final Option<ShadowColorEmitMode> SHADOW_COLOR_MODE = Option.enumOption(key("emit/shadow_color"), ShadowColorEmitMode.class, ShadowColorEmitMode.EMIT_INTEGER);
+
   /**
    * Versioned by world data version.
    */
@@ -111,6 +119,7 @@ private JSONOptions() {
         .value(VALIDATE_STRICT_EVENTS, false)
         .value(EMIT_DEFAULT_ITEM_HOVER_QUANTITY, false)
         .value(SHOW_ITEM_HOVER_DATA_MODE, ShowItemHoverDataMode.EMIT_LEGACY_NBT)
+        .value(SHADOW_COLOR_MODE, ShadowColorEmitMode.NONE)
     )
     .version(
       VERSION_1_16,
@@ -128,6 +137,10 @@ private JSONOptions() {
       b -> b.value(EMIT_DEFAULT_ITEM_HOVER_QUANTITY, true)
         .value(SHOW_ITEM_HOVER_DATA_MODE, ShowItemHoverDataMode.EMIT_DATA_COMPONENTS)
     )
+    .version(
+      VERSION_1_21_4,
+      b -> b.value(SHADOW_COLOR_MODE, ShadowColorEmitMode.EMIT_INTEGER)
+    )
     .build();
 
   /**
@@ -141,6 +154,7 @@ private JSONOptions() {
     .value(EMIT_COMPACT_TEXT_COMPONENT, false)
     .value(VALIDATE_STRICT_EVENTS, false)
     .value(SHOW_ITEM_HOVER_DATA_MODE, ShowItemHoverDataMode.EMIT_EITHER)
+    .value(SHADOW_COLOR_MODE, ShadowColorEmitMode.EMIT_INTEGER)
     .build();
 
   private static String key(final String value) {
@@ -220,4 +234,30 @@ public enum ShowItemHoverDataMode {
      */
     EMIT_EITHER,
   }
+
+  /**
+   * How text shadow colors should be emitted.
+   *
+   * @since 4.18.0
+   * @sinceMinecraft 1.21.4
+   */
+  public enum ShadowColorEmitMode {
+    /**
+     * Do not emit shadow colours.
+     */
+    NONE,
+    /**
+     * Emit as a single packed integer value containing, in order, ARGB bytes.
+     *
+     * @since 4.18.0
+     */
+    EMIT_INTEGER,
+    /**
+     * Emit a colour as 4-element float array of the RGBA components of the colour.
+     *
+     * @since 4.18.0
+     */
+    EMIT_ARRAY
+
+  }
 }

From 2e7827fe6c5940620a8980e75ddbeab13f6dc345 Mon Sep 17 00:00:00 2001
From: zml <zml@stellardrift.ca>
Date: Sun, 8 Dec 2024 12:51:14 -0800
Subject: [PATCH 10/15] shadow color: incorporate many of riley's changes

---
 .../text/AbstractComponentBuilder.java        |  8 ++---
 .../net/kyori/adventure/text/Component.java   | 12 ++++----
 .../kyori/adventure/text/ScopedComponent.java |  8 ++---
 .../adventure/text/format/ShadowColor.java    | 30 +++++++++----------
 .../text/format/ShadowColorImpl.java          |  7 ++---
 .../kyori/adventure/text/format/Style.java    |  8 ++++-
 .../adventure/text/format/StyleImpl.java      | 20 +++++++------
 .../adventure/text/format/StyleSetter.java    |  8 ++---
 .../TranslatableComponentRenderer.java        | 10 ++++++-
 9 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java b/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java
index b60a9a9f1..7c9ca539f 100644
--- a/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java
+++ b/api/src/main/java/net/kyori/adventure/text/AbstractComponentBuilder.java
@@ -239,15 +239,15 @@ private void prepareChildren() {
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B shadowColor(final @Nullable ARGBLike color) {
-    this.styleBuilder().shadowColor(color);
+  public @NotNull B shadowColor(final @Nullable ARGBLike argb) {
+    this.styleBuilder().shadowColor(argb);
     return (B) this;
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  public @NotNull B shadowColorIfAbsent(final @Nullable ARGBLike color) {
-    this.styleBuilder().shadowColorIfAbsent(color);
+  public @NotNull B shadowColorIfAbsent(final @Nullable ARGBLike argb) {
+    this.styleBuilder().shadowColorIfAbsent(argb);
     return (B) this;
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/text/Component.java b/api/src/main/java/net/kyori/adventure/text/Component.java
index c5081b55b..b9d786c02 100644
--- a/api/src/main/java/net/kyori/adventure/text/Component.java
+++ b/api/src/main/java/net/kyori/adventure/text/Component.java
@@ -2226,27 +2226,27 @@ default void detectCycle(final @NotNull Component that) {
   /**
    * Sets the shadow color of this component.
    *
-   * @param color the color
+   * @param argb the color
    * @return a component
    * @since 4.18.0
    */
   @Contract(pure = true)
   @Override
-  default @NotNull Component shadowColor(final @Nullable ARGBLike color) {
-    return this.style(this.style().shadowColor(color));
+  default @NotNull Component shadowColor(final @Nullable ARGBLike argb) {
+    return this.style(this.style().shadowColor(argb));
   }
 
   /**
    * Sets the shadow color if there isn't one set already.
    *
-   * @param color the color
+   * @param argb the color
    * @return a component
    * @since 4.18.0
    */
   @Contract(pure = true)
   @Override
-  default @NotNull Component shadowColorIfAbsent(final @Nullable ARGBLike color) {
-    if (this.shadowColor() == null) return this.shadowColor(color);
+  default @NotNull Component shadowColorIfAbsent(final @Nullable ARGBLike argb) {
+    if (this.shadowColor() == null) return this.shadowColor(argb);
     return this;
   }
 
diff --git a/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java b/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java
index 9f59855cc..6cb0dca41 100644
--- a/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java
+++ b/api/src/main/java/net/kyori/adventure/text/ScopedComponent.java
@@ -110,14 +110,14 @@ public interface ScopedComponent<C extends Component> extends Component {
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C shadowColor(final @Nullable ARGBLike color) {
-    return (C) Component.super.shadowColor(color);
+  default @NotNull C shadowColor(final @Nullable ARGBLike argb) {
+    return (C) Component.super.shadowColor(argb);
   }
 
   @Override
   @SuppressWarnings("unchecked")
-  default @NotNull C shadowColorIfAbsent(final @Nullable ARGBLike color) {
-    return (C) Component.super.shadowColorIfAbsent(color);
+  default @NotNull C shadowColorIfAbsent(final @Nullable ARGBLike argb) {
+    return (C) Component.super.shadowColorIfAbsent(argb);
   }
 
   @Override
diff --git a/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java b/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
index 4cb14994d..aca0ac1dc 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/ShadowColor.java
@@ -84,15 +84,15 @@ public interface ShadowColor extends StyleBuilderApplicable, ARGBLike {
    *
    * <p>This int will be in the format {@code 0xAARRGGBB}</p>
    *
-   * @param value the int-packed ARGB value
+   * @param argb the int-packed ARGB value
    * @return a shadow color
    * @since 4.18.0
    */
   @Contract(pure = true)
-  static @NotNull ShadowColor shadowColor(final int value) {
-    if (value == ShadowColorImpl.NONE_VALUE) return none();
+  static @NotNull ShadowColor shadowColor(final int argb) {
+    if (argb == ShadowColorImpl.NONE_VALUE) return none();
 
-    return new ShadowColorImpl(value);
+    return new ShadowColorImpl(argb);
   }
 
   /**
@@ -125,14 +125,14 @@ public interface ShadowColor extends StyleBuilderApplicable, ARGBLike {
   /**
    * Create a shadow color from an existing colour plus an alpha value.
    *
-   * @param color the existing color
+   * @param rgb the existing color
    * @param alpha the alpha
    * @return a shadow colour
    * @since 4.18.0
    */
   @Contract(pure = true)
-  static @NotNull ShadowColor shadowColor(final @NotNull RGBLike color, final @Range(from = 0x0, to = 0xff) int alpha) {
-    return shadowColor(color.red(), color.green(), color.blue(), alpha);
+  static @NotNull ShadowColor shadowColor(final @NotNull RGBLike rgb, final @Range(from = 0x0, to = 0xff) int alpha) {
+    return shadowColor(rgb.red(), rgb.green(), rgb.blue(), alpha);
   }
 
   /**
@@ -155,20 +155,20 @@ public interface ShadowColor extends StyleBuilderApplicable, ARGBLike {
    *
    * <p>This string must be in the format {@code #RRGGBBAA}</p>
    *
-   * @param value the input value
+   * @param hex the input value
    * @return a shadow color if possible, or null if any components are invalid
    * @since 4.18.0
    */
   @Contract(pure = true)
-  static @Nullable ShadowColor fromHexString(@Pattern("#[0-9a-fA-F]{8}") final @NotNull String value) {
-    if (value.length() != 9) return null;
-    if (!value.startsWith("#")) return null;
+  static @Nullable ShadowColor fromHexString(@Pattern("#[0-9a-fA-F]{8}") final @NotNull String hex) {
+    if (hex.length() != 9) return null;
+    if (!hex.startsWith("#")) return null;
 
     try {
-      final int r = Integer.parseInt(value.substring(1, 3), 16);
-      final int g = Integer.parseInt(value.substring(3, 5), 16);
-      final int b = Integer.parseInt(value.substring(5, 7), 16);
-      final int a = Integer.parseInt(value.substring(7, 9), 16);
+      final int r = Integer.parseInt(hex.substring(1, 3), 16);
+      final int g = Integer.parseInt(hex.substring(3, 5), 16);
+      final int b = Integer.parseInt(hex.substring(5, 7), 16);
+      final int a = Integer.parseInt(hex.substring(7, 9), 16);
       return new ShadowColorImpl((a << 24) | (r << 16) | (g << 8) | b);
     } catch (NumberFormatException ignored) {
       return null;
diff --git a/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java b/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java
index 22fee2076..4783e5536 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/ShadowColorImpl.java
@@ -23,7 +23,6 @@
  */
 package net.kyori.adventure.text.format;
 
-import java.util.Objects;
 import java.util.stream.Stream;
 import net.kyori.adventure.internal.Internals;
 import net.kyori.examination.Examinable;
@@ -35,7 +34,7 @@ final class ShadowColorImpl implements ShadowColor, Examinable {
   static final int NONE_VALUE = 0;
   static final ShadowColorImpl NONE = new ShadowColorImpl(NONE_VALUE);
 
-  private final int value;
+  private final int value; // ARGB
 
   ShadowColorImpl(final int value) {
     this.value = value;
@@ -55,7 +54,7 @@ public boolean equals(final @Nullable Object other) {
 
   @Override
   public int hashCode() {
-    return Objects.hashCode(this.value);
+    return Integer.hashCode(this.value);
   }
 
   @Override
@@ -66,7 +65,7 @@ public String toString() {
   @Override
   public @NotNull Stream<? extends ExaminableProperty> examinableProperties() {
     return Stream.of(
-      ExaminableProperty.of("value", this.value)
+      ExaminableProperty.of("value", this.value) // todo: represent as hex?
     );
   }
 }
diff --git a/api/src/main/java/net/kyori/adventure/text/format/Style.java b/api/src/main/java/net/kyori/adventure/text/format/Style.java
index efac65fda..4fda92698 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/Style.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/Style.java
@@ -562,11 +562,17 @@ default boolean hasDecoration(final @NotNull TextDecoration decoration) {
    */
   enum Merge {
     /**
-     * Merges {@link Style#color()} and {@link Style#shadowColor()}.
+     * Merges {@link Style#color()}.
      *
      * @since 4.0.0
      */
     COLOR,
+    /**
+     * Merges {@link Style#shadowColor()}.
+     *
+     * @since 4.18.0
+     */
+    SHADOW_COLOR,
     /**
      * Merges {@link Style#decorations()}.
      *
diff --git a/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java b/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java
index 65d106565..044624c78 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/StyleImpl.java
@@ -105,15 +105,15 @@ final class StyleImpl implements Style {
   }
 
   @Override
-  public @NotNull Style shadowColor(final @Nullable ARGBLike color) {
-    if (Objects.equals(this.shadowColor, color)) return this;
-    return new StyleImpl(this.font, this.color, color == null ? null : ShadowColor.shadowColor(color), this.decorations, this.clickEvent, this.hoverEvent, this.insertion);
+  public @NotNull Style shadowColor(final @Nullable ARGBLike argb) {
+    if (Objects.equals(this.shadowColor, argb)) return this;
+    return new StyleImpl(this.font, this.color, argb == null ? null : ShadowColor.shadowColor(argb), this.decorations, this.clickEvent, this.hoverEvent, this.insertion);
   }
 
   @Override
-  public @NotNull Style shadowColorIfAbsent(final @Nullable ARGBLike color) {
+  public @NotNull Style shadowColorIfAbsent(final @Nullable ARGBLike argb) {
     if (this.shadowColor == null) {
-      return this.shadowColor(color);
+      return this.shadowColor(argb);
     }
     return this;
   }
@@ -357,15 +357,15 @@ static final class BuilderImpl implements Builder {
     }
 
     @Override
-    public @NotNull Builder shadowColor(final @Nullable ARGBLike color) {
-      this.shadowColor = color == null ? null : ShadowColor.shadowColor(color);
+    public @NotNull Builder shadowColor(final @Nullable ARGBLike argb) {
+      this.shadowColor = argb == null ? null : ShadowColor.shadowColor(argb);
       return this;
     }
 
     @Override
-    public @NotNull Builder shadowColorIfAbsent(final @Nullable ARGBLike color) {
+    public @NotNull Builder shadowColorIfAbsent(final @Nullable ARGBLike argb) {
       if (this.shadowColor == null) {
-        this.shadowColor = color == null ? null : ShadowColor.shadowColor(color);
+        this.shadowColor = argb == null ? null : ShadowColor.shadowColor(argb);
       }
       return this;
     }
@@ -426,7 +426,9 @@ static final class BuilderImpl implements Builder {
             this.color(color);
           }
         }
+      }
 
+      if (merges.contains(Merge.SHADOW_COLOR)) {
         final ShadowColor shadowColor = that.shadowColor();
         if (shadowColor != null) {
           if (strategy == Merge.Strategy.ALWAYS || (strategy == Merge.Strategy.IF_ABSENT_ON_TARGET && this.shadowColor == null)) {
diff --git a/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java b/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java
index a1f71d3a4..bdc28b22e 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java
@@ -77,20 +77,20 @@ public interface StyleSetter<T extends StyleSetter<?>> {
   /**
    * Sets the shadow color.
    *
-   * @param color the color
+   * @param argb the color
    * @return an object ({@code T})
    * @since 4.18.0
    */
-  @NotNull T shadowColor(final @Nullable ARGBLike color);
+  @NotNull T shadowColor(final @Nullable ARGBLike argb);
 
   /**
    * Sets the shadow color if there isn't one set already.
    *
-   * @param color the color
+   * @param argb the color
    * @return an object ({@code T})
    * @since 4.18.0
    */
-  @NotNull T shadowColorIfAbsent(final @Nullable ARGBLike color);
+  @NotNull T shadowColorIfAbsent(final @Nullable ARGBLike argb);
 
   /**
    * Sets the state of {@code decoration} to {@link TextDecoration.State#TRUE}.
diff --git a/api/src/main/java/net/kyori/adventure/text/renderer/TranslatableComponentRenderer.java b/api/src/main/java/net/kyori/adventure/text/renderer/TranslatableComponentRenderer.java
index 09b6dae80..3b9df3b82 100644
--- a/api/src/main/java/net/kyori/adventure/text/renderer/TranslatableComponentRenderer.java
+++ b/api/src/main/java/net/kyori/adventure/text/renderer/TranslatableComponentRenderer.java
@@ -26,6 +26,8 @@
 import java.text.AttributedCharacterIterator;
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
@@ -59,7 +61,13 @@
  * @since 4.0.0
  */
 public abstract class TranslatableComponentRenderer<C> extends AbstractComponentRenderer<C> {
-  private static final Set<Style.Merge> MERGES = Style.Merge.merges(Style.Merge.COLOR, Style.Merge.DECORATIONS, Style.Merge.INSERTION, Style.Merge.FONT);
+  private static final Set<Style.Merge> MERGES;
+
+  static {
+    final Set<Style.Merge> merges = EnumSet.allOf(Style.Merge.class);
+    merges.remove(Style.Merge.EVENTS);
+    MERGES = Collections.unmodifiableSet(merges);
+  }
 
   /**
    * Creates a {@link TranslatableComponentRenderer} using the {@link Translator} to translate.

From 0f7f2f811c935cfa063f102d2742f468fbde0ac3 Mon Sep 17 00:00:00 2001
From: zml <zml@stellardrift.ca>
Date: Sun, 8 Dec 2024 13:10:35 -0800
Subject: [PATCH 11/15] shadow color: tidy up tag implementation, add !shadow
 tag

---
 ...orTagResolver.java => ShadowColorTag.java} | 54 +++++++++----------
 .../tag/standard/StandardTags.java            |  8 +--
 ...owTagTest.java => ShadowColorTagTest.java} | 23 ++++++--
 3 files changed, 49 insertions(+), 36 deletions(-)
 rename text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/{ShadowColorTagResolver.java => ShadowColorTag.java} (80%)
 rename text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/{ShadowTagTest.java => ShadowColorTagTest.java} (78%)

diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagResolver.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTag.java
similarity index 80%
rename from text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagResolver.java
rename to text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTag.java
index da8f07d09..ea6adbe42 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagResolver.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTag.java
@@ -31,37 +31,28 @@
 import net.kyori.adventure.text.minimessage.ParsingException;
 import net.kyori.adventure.text.minimessage.internal.serializer.SerializableResolver;
 import net.kyori.adventure.text.minimessage.internal.serializer.StyleClaim;
+import net.kyori.adventure.text.minimessage.internal.serializer.TokenEmitter;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-class ShadowColorTagResolver implements TagResolver, SerializableResolver.Single {
+final class ShadowColorTag {
   private static final String SHADOW_COLOR = "shadow";
+  private static final String SHADOW_NONE = "!" + SHADOW_COLOR;
   private static final float DEFAULT_ALPHA = 0.25f;
 
-  static final TagResolver INSTANCE = new ShadowColorTagResolver();
-  private static final StyleClaim<ShadowColor> STYLE = StyleClaim.claim(SHADOW_COLOR, Style::shadowColor, (color, emitter) -> {
-    emitter.tag(SHADOW_COLOR);
-
-    final @Nullable NamedTextColor possibleMatch = NamedTextColor.namedColor(TextColor.color(color).value());
-    if (possibleMatch != null) {
-      emitter.argument(NamedTextColor.NAMES.key(possibleMatch)).argument(Float.toString((float) color.alpha() / 0xff));
-    } else {
-      emitter.argument(color.asHexString());
-    }
-  });
-
-  ShadowColorTagResolver() {
-  }
-
-  @Override
-  public @Nullable Tag resolve(final @NotNull String name, final @NotNull ArgumentQueue args, final @NotNull Context ctx) throws ParsingException {
-    if (!this.has(name)) {
-      return null;
-    }
+  static final TagResolver RESOLVER = TagResolver.resolver(
+    SerializableResolver.claimingStyle(
+      SHADOW_COLOR,
+      ShadowColorTag::create,
+      StyleClaim.claim(SHADOW_COLOR, Style::shadowColor, ShadowColorTag::emit)
+    ),
+    TagResolver.resolver(SHADOW_NONE, Tag.styling(ShadowColor.none()))
+  );
 
+  static Tag create(final @NotNull ArgumentQueue args, final @NotNull Context ctx) throws ParsingException {
     final String colorString = args.popOr("Expected to find a color parameter: #RRGGBBAA").lowerValue();
     final ShadowColor color;
     if (colorString.startsWith(TextColor.HEX_PREFIX) && colorString.length() == 9) {
@@ -78,13 +69,22 @@ class ShadowColorTagResolver implements TagResolver, SerializableResolver.Single
     return Tag.styling(color);
   }
 
-  @Override
-  public boolean has(final @NotNull String name) {
-    return name.equals(SHADOW_COLOR);
+  static void emit(final @NotNull ShadowColor color, final @NotNull TokenEmitter emitter) {
+    if (ShadowColor.none().equals(color)) {
+      emitter.tag(SHADOW_NONE);
+      return;
+    }
+
+    emitter.tag(SHADOW_COLOR);
+
+    final @Nullable NamedTextColor possibleMatch = NamedTextColor.namedColor(TextColor.color(color).value());
+    if (possibleMatch != null) {
+      emitter.argument(NamedTextColor.NAMES.key(possibleMatch)).argument(Float.toString((float) color.alpha() / 0xff));
+    } else {
+      emitter.argument(color.asHexString());
+    }
   }
 
-  @Override
-  public @Nullable StyleClaim<?> claimStyle() {
-    return STYLE;
+  private ShadowColorTag() {
   }
 }
diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java
index 39bab58f5..559ec2ba0 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java
@@ -65,7 +65,7 @@ private StandardTags() {
         ScoreTag.RESOLVER,
         NbtTag.RESOLVER,
         PrideTag.RESOLVER,
-        ShadowColorTagResolver.INSTANCE
+        ShadowColorTag.RESOLVER
       )
       .build();
 
@@ -277,15 +277,15 @@ public static TagResolver transition() {
   }
 
   /**
-   * Get a resolver for the {@value ShadowColorTagResolver#SHADOW_COLOR} tags.
+   * Get a resolver for the {@value ShadowColorTag#SHADOW_COLOR} tags.
    *
    * <p>This tag support both hex string</p>
    *
-   * @return a resolver for the {@value ShadowColorTagResolver#SHADOW_COLOR} tags
+   * @return a resolver for the {@value ShadowColorTag#SHADOW_COLOR} tags
    * @since 4.10.0
    */
   public static @NotNull TagResolver shadowColor() {
-    return ShadowColorTagResolver.INSTANCE;
+    return ShadowColorTag.RESOLVER;
   }
 
   /**
diff --git a/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowTagTest.java b/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagTest.java
similarity index 78%
rename from text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowTagTest.java
rename to text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagTest.java
index b6d381b95..19274ee35 100644
--- a/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowTagTest.java
+++ b/text-minimessage/src/test/java/net/kyori/adventure/text/minimessage/tag/standard/ShadowColorTagTest.java
@@ -26,15 +26,28 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.ShadowColor;
+import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.minimessage.AbstractTest;
 import org.junit.jupiter.api.Test;
 
-class ShadowTagTest extends AbstractTest {
+import static net.kyori.adventure.text.format.ShadowColor.shadowColor;
+
+class ShadowColorTagTest extends AbstractTest {
+  @Test
+  void testNoShadow() {
+    final String input = "now i'm here <!shadow>and now i'm not!";
+    final Component expected = Component.text("now i'm here ")
+      .append(Component.text("and now i'm not!", Style.style(ShadowColor.none())));
+
+    this.assertParsedEquals(expected, input);
+    this.assertSerializedEquals(input, expected);
+  }
+
   @Test
   void testRoundtripNamedShadow() {
     final String input = "<shadow:red:0.8>i have a red shadow";
     final Component expected = Component.text("i have a red shadow")
-      .shadowColor(ShadowColor.shadowColor(NamedTextColor.RED, 0xCC));
+      .shadowColor(shadowColor(NamedTextColor.RED, 0xCC));
 
     this.assertParsedEquals(expected, input);
     this.assertSerializedEquals(input, expected);
@@ -44,7 +57,7 @@ void testRoundtripNamedShadow() {
   void testParseHexComponentShadow() {
     final String input = "<shadow:#FF0000:0.8>i have a redder shadow";
     final Component expected = Component.text("i have a redder shadow")
-      .shadowColor(ShadowColor.shadowColor(0xFF, 0, 0, 0xCC));
+      .shadowColor(shadowColor(0xFF, 0, 0, 0xCC));
 
     this.assertParsedEquals(expected, input);
   }
@@ -54,7 +67,7 @@ void testSerializeShadow() {
     final String expected = "<shadow:#054D79FF>This is a test";
 
     final Component builder = Component.text("This is a test")
-      .shadowColor(ShadowColor.shadowColor(0xff_05_4d_79));
+      .shadowColor(shadowColor(0xff_05_4d_79));
 
     this.assertSerializedEquals(expected, builder);
     this.assertParsedEquals(builder, expected);
@@ -66,7 +79,7 @@ void testSerializeShadowClosing() {
 
     final Component builder = Component.text()
       .append(Component.text("This is a")
-        .shadowColor(ShadowColor.shadowColor(0xff_05_4d_79)))
+        .shadowColor(shadowColor(0xff_05_4d_79)))
       .append(Component.text(" test")).asComponent();
 
     this.assertSerializedEquals(expected, builder);

From 1896d8852082e61761cd5a1b2b6ecfb072fb42d1 Mon Sep 17 00:00:00 2001
From: zml <zml@stellardrift.ca>
Date: Sun, 8 Dec 2024 13:54:02 -0800
Subject: [PATCH 12/15] shadow color: test coverage + fixes for json serializer

---
 .../gson/ShadowColorSerializer.java           |  2 +-
 .../text/serializer/json/StyleTest.java       | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShadowColorSerializer.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShadowColorSerializer.java
index 809772d2b..baad6b95c 100644
--- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShadowColorSerializer.java
+++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ShadowColorSerializer.java
@@ -88,6 +88,6 @@ static float componentAsFloat(final int element) {
   }
 
   static int componentFromFloat(final double element) {
-    return (int) ((float) element) * 0xff;
+    return (int) (((float) element) * 0xff);
   }
 }
diff --git a/text-serializer-json/src/testFixtures/java/net/kyori/adventure/text/serializer/json/StyleTest.java b/text-serializer-json/src/testFixtures/java/net/kyori/adventure/text/serializer/json/StyleTest.java
index 00113b174..4a548d359 100644
--- a/text-serializer-json/src/testFixtures/java/net/kyori/adventure/text/serializer/json/StyleTest.java
+++ b/text-serializer-json/src/testFixtures/java/net/kyori/adventure/text/serializer/json/StyleTest.java
@@ -30,6 +30,7 @@
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.ShadowColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
@@ -105,6 +106,25 @@ void testDecoration() {
     });
   }
 
+  @Test
+  void testShadowColorInt() {
+    this.testStyle(Style.style(ShadowColor.shadowColor(0xCCFF0022)), json -> json.addProperty(JSONComponentConstants.SHADOW_COLOR, 0xCCFF0022));
+  }
+
+  @Test
+  void testShadowColorFloats() {
+    final JSONComponentSerializer floatSerial = JSONComponentSerializer.builder()
+      .editOptions(opts -> opts.value(JSONOptions.SHADOW_COLOR_MODE, JSONOptions.ShadowColorEmitMode.EMIT_ARRAY))
+      .build();
+
+    this.testStyle(floatSerial, Style.style(ShadowColor.shadowColor(0x80, 0x40, 0xcc, 0xff)), json -> json.add(JSONComponentConstants.SHADOW_COLOR, array(arr -> {
+      arr.add(0.501960813999176);
+      arr.add(0.250980406999588f);
+      arr.add(0.800000011920929f);
+      arr.add(1f);
+    })));
+  }
+
   @Test
   void testInsertion() {
     this.testStyle(Style.style().insertion("honk").build(), json -> json.addProperty(JSONComponentConstants.INSERTION, "honk"));

From 5fae082e75f7dcf02eac6934aa757afe18bbf72b Mon Sep 17 00:00:00 2001
From: zml <zml@stellardrift.ca>
Date: Sun, 8 Dec 2024 14:06:11 -0800
Subject: [PATCH 13/15] shadow color: serializer for configurate

---
 .../ConfigurateComponentSerializerImpl.java   |  2 +
 .../configurate4/ShadowColorSerializer.java   | 87 +++++++++++++++++++
 .../configurate4/StyleSerializer.java         |  7 ++
 .../configurate4/StyleSerializerTest.java     | 11 +++
 4 files changed, 107 insertions(+)
 create mode 100644 serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ShadowColorSerializer.java

diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ConfigurateComponentSerializerImpl.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ConfigurateComponentSerializerImpl.java
index 052154dfc..d5ff8038f 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ConfigurateComponentSerializerImpl.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ConfigurateComponentSerializerImpl.java
@@ -31,6 +31,7 @@
 import net.kyori.adventure.text.TranslationArgument;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
+import net.kyori.adventure.text.format.ShadowColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.serializer.ComponentSerializer;
@@ -108,6 +109,7 @@ private ConfigurateComponentSerializerImpl(final @NotNull Builder builder) {
       .registerExact(HoverEvent.ShowEntity.class, HoverEventShowEntitySerializer.INSTANCE)
       .registerExact(HoverEvent.ShowItem.class, HoverEventShowItemSerializer.INSTANCE)
       .register(ConfigurateDataComponentValue.class, ConfigurateDataComponentValueTypeSerializer.INSTANCE)
+      .register(ShadowColor.class, ShadowColorSerializer.INSTACE)
       .build();
   }
 
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ShadowColorSerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ShadowColorSerializer.java
new file mode 100644
index 000000000..5f863e7cb
--- /dev/null
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/ShadowColorSerializer.java
@@ -0,0 +1,87 @@
+/*
+ * This file is part of adventure, licensed under the MIT License.
+ *
+ * Copyright (c) 2017-2024 KyoriPowered
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package net.kyori.adventure.serializer.configurate4;
+
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.List;
+import net.kyori.adventure.text.format.ShadowColor;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.serialize.SerializationException;
+import org.spongepowered.configurate.serialize.TypeSerializer;
+
+final class ShadowColorSerializer implements TypeSerializer<ShadowColor> {
+  static final TypeSerializer<ShadowColor> INSTACE = new ShadowColorSerializer(false);
+
+  private boolean emitFloats;
+
+  private ShadowColorSerializer(final boolean emitFloats) {
+    this.emitFloats = emitFloats;
+  }
+
+  @Override
+  public ShadowColor deserialize(final Type type, final ConfigurationNode node) throws SerializationException {
+    if (node.isList()) {
+      final List<Float> floats = node.getList(Float.class);
+      if (floats.size() != 4) {
+        throw new SerializationException(node, ShadowColor.class, "Expected a 4-element float array ([R, G, B, A]), but got a " + floats.size() + "-long array instead.");
+      }
+      final int r = componentFromFloat(floats.get(0));
+      final int g = componentFromFloat(floats.get(1));
+      final int b = componentFromFloat(floats.get(2));
+      final int a = componentFromFloat(floats.get(3));
+
+      return ShadowColor.shadowColor(r, g, b, a);
+    } else {
+      return ShadowColor.shadowColor(node.getInt());
+    }
+  }
+
+  @Override
+  public void serialize(final Type type, final @Nullable ShadowColor obj, final ConfigurationNode node) throws SerializationException {
+    if (obj == null) {
+      node.raw(null);
+      return;
+    }
+
+    if (this.emitFloats) {
+      node.set(Collections.emptyList());
+      node.appendListNode().set(componentAsFloat(obj.red()));
+      node.appendListNode().set(componentAsFloat(obj.green()));
+      node.appendListNode().set(componentAsFloat(obj.blue()));
+      node.appendListNode().set(componentAsFloat(obj.alpha()));
+    } else {
+      node.set(obj.value());
+    }
+  }
+
+  static float componentAsFloat(final int element) {
+    return (float) element / 0xff;
+  }
+
+  static int componentFromFloat(final double element) {
+    return (int) (((float) element) * 0xff);
+  }
+}
diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/StyleSerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/StyleSerializer.java
index 1d2bae317..321746075 100644
--- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/StyleSerializer.java
+++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/StyleSerializer.java
@@ -29,6 +29,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
+import net.kyori.adventure.text.format.ShadowColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
@@ -46,6 +47,7 @@ final class StyleSerializer implements TypeSerializer<Style> {
 
   static final String FONT = "font";
   static final String COLOR = "color";
+  static final String SHADOW_COLOR = "shadow_color";
   static final String INSERTION = "insertion";
   static final String CLICK_EVENT = "clickEvent";
   static final String CLICK_EVENT_ACTION = "action";
@@ -75,6 +77,10 @@ private StyleSerializer() {
     if (color != null) {
       builder.color(color);
     }
+    final @Nullable ShadowColor shadowColor = value.node(SHADOW_COLOR).get(ShadowColor.class);
+    if (shadowColor != null) {
+      builder.shadowColor(shadowColor);
+    }
 
     for (final TextDecoration decoration : DECORATIONS) {
       final TextDecoration.State state = value.node(nonNull(TextDecoration.NAMES.key(decoration), "decoration")).get(TextDecoration.State.class);
@@ -132,6 +138,7 @@ public void serialize(final @NotNull Type type, @Nullable Style obj, final @NotN
     }
     value.node(FONT).set(Key.class, obj.font());
     value.node(COLOR).set(TextColor.class, obj.color());
+    value.node(SHADOW_COLOR).set(ShadowColor.class, obj.shadowColor());
     for (final TextDecoration decoration : DECORATIONS) {
       final ConfigurationNode decorationNode = value.node(nonNull(TextDecoration.NAMES.key(decoration), "decoration"));
       final TextDecoration.State state = obj.decoration(decoration);
diff --git a/serializer-configurate4/src/test/java/net/kyori/adventure/serializer/configurate4/StyleSerializerTest.java b/serializer-configurate4/src/test/java/net/kyori/adventure/serializer/configurate4/StyleSerializerTest.java
index 3ff0695e9..e5dc719b7 100644
--- a/serializer-configurate4/src/test/java/net/kyori/adventure/serializer/configurate4/StyleSerializerTest.java
+++ b/serializer-configurate4/src/test/java/net/kyori/adventure/serializer/configurate4/StyleSerializerTest.java
@@ -26,6 +26,7 @@
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.ShadowColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
 import org.junit.jupiter.api.Test;
@@ -84,6 +85,16 @@ void testSerializeNamedColor() {
     this.assertRoundtrippable(Style.class, style, node);
   }
 
+  @Test
+  void testSerializeShadowColor() {
+    final ConfigurationNode node = this.node(n -> {
+      n.node(StyleSerializer.SHADOW_COLOR).raw(0xCCFF0022);
+    });
+    final Style style = Style.style(ShadowColor.shadowColor(0xFF, 0x00, 0x22, 0xCC));
+
+    this.assertRoundtrippable(Style.class, style, node);
+  }
+
   @Test
   void testSerializeInsertion() {
     final ConfigurationNode node = this.node(n -> {

From 60c05c11dcd57f66123e18a9e34c31135dda8485 Mon Sep 17 00:00:00 2001
From: zml <zml@stellardrift.ca>
Date: Fri, 13 Dec 2024 22:06:45 -0800
Subject: [PATCH 14/15] correct since tag

Co-authored-by: Kezz <kieran.wallbanks@gmail.com>
---
 .../adventure/text/minimessage/tag/standard/StandardTags.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java
index 559ec2ba0..3b36e851f 100644
--- a/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java
+++ b/text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java
@@ -282,7 +282,7 @@ public static TagResolver transition() {
    * <p>This tag support both hex string</p>
    *
    * @return a resolver for the {@value ShadowColorTag#SHADOW_COLOR} tags
-   * @since 4.10.0
+   * @since 4.18.0
    */
   public static @NotNull TagResolver shadowColor() {
     return ShadowColorTag.RESOLVER;

From 2d41dde3eda2ea4fe641596c7f2e9a85b6e4a6ec Mon Sep 17 00:00:00 2001
From: zml <zml@stellardrift.ca>
Date: Fri, 13 Dec 2024 22:17:27 -0800
Subject: [PATCH 15/15] api: clarify the behaviour of setting a null shadow
 colour

---
 .../java/net/kyori/adventure/text/format/StyleSetter.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java b/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java
index bdc28b22e..d4a215613 100644
--- a/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java
+++ b/api/src/main/java/net/kyori/adventure/text/format/StyleSetter.java
@@ -77,6 +77,9 @@ public interface StyleSetter<T extends StyleSetter<?>> {
   /**
    * Sets the shadow color.
    *
+   * <p>Setting the color to {@code null} will reset the shadow color to default.
+   * To remove the shadow entirely, use {@link ShadowColor#none()}.</p>
+   *
    * @param argb the color
    * @return an object ({@code T})
    * @since 4.18.0
@@ -86,6 +89,9 @@ public interface StyleSetter<T extends StyleSetter<?>> {
   /**
    * Sets the shadow color if there isn't one set already.
    *
+   * <p>Setting the color to {@code null} will reset the shadow color to default.
+   * To remove the shadow entirely, use {@link ShadowColor#none()}.</p>
+   *
    * @param argb the color
    * @return an object ({@code T})
    * @since 4.18.0