Re-implement shadow color support

Un-reverts the shadow color support, but with adventure release v4.18.0
booky10 · Dec 10, 2024 · 7029571 · 7029571
1 parent 4b6bfbc
commit 7029571
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/...rc/main/java/com/github/retrooper/packetevents/util/adventure/AdventureNBTSerializer.java b/...rc/main/java/com/github/retrooper/packetevents/util/adventure/AdventureNBTSerializer.java
@@ -53,6 +53,7 @@
 import net.kyori.adventure.text.event.DataComponentValue;
 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;
@@ -330,11 +331,10 @@ public AdventureNBTSerializer(boolean downsampleColor) {
             if (color != null) style.color(color);
         });
         if (BackwardCompatUtil.IS_4_18_0_OR_NEWER) {
-            // FIXME adventure v4.18.0
-            // reader.useUTF("shadow_color", value -> {
-            //     ShadowColor color = ShadowColor.fromHexString(value);
-            //     if (color != null) style.shadowColor(color);
-            // });
+            reader.useUTF("shadow_color", value -> {
+                ShadowColor color = ShadowColor.fromHexString(value);
+                if (color != null) style.shadowColor(color);
+            });
         }
 
         for (String decorationKey : TextDecoration.NAMES.keys()) {
@@ -412,9 +412,8 @@ public AdventureNBTSerializer(boolean downsampleColor) {
         if (color != null) writer.writeUTF("color", this.serializeColor(color));
 
         if (BackwardCompatUtil.IS_4_18_0_OR_NEWER) {
-            // FIXME adventure v4.18.0
-            // ShadowColor shadowColor = style.shadowColor();
-            // if (shadowColor != null) writer.writeUTF("shadow_color", shadowColor.asHexString());
+            ShadowColor shadowColor = style.shadowColor();
+            if (shadowColor != null) writer.writeUTF("shadow_color", shadowColor.asHexString());
         }
 
         for (TextDecoration decoration : TextDecoration.NAMES.values()) {

diff --git a/libs.versions.toml b/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-adventure = "4.17.0" # FIXME adventure v4.18.0
+adventure = "4.18.0"
 examination = "1.3.0"
 netty = "4.1.72.Final"
 jetbrains-annotations = "23.0.0"

diff --git a/...lizer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/BackwardCompatUtil.java b/...lizer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/BackwardCompatUtil.java
@@ -77,9 +77,8 @@ public final class BackwardCompatUtil {
         boolean is4_18_0OrNewer = false;
         try {
             // shadow color support was added in 4.18.0
-            // FIXME adventure v4.18.0
-            // Style.empty().shadowColor();
-            // is4_18_0OrNewer = true;
+            Style.empty().shadowColor();
+            is4_18_0OrNewer = true;
         } catch (Throwable ignored) {
         }
         IS_4_18_0_OR_NEWER = is4_18_0OrNewer;