1.21.5 support for platform-bukkit

Author: MiniDigger

build.gradle

@@ -13,7 +13,7 @@ plugins {
 }
 
 // Adventure version
-ext.adventure = "4.13.1"
+ext.adventure = "4.21.0"
 
 group = 'net.kyori'
 version = '4.3.5-SNAPSHOT'

platform-bukkit/src/main/java/net/kyori/adventure/platform/bukkit/BukkitComponentSerializer.java

@@ -28,7 +28,8 @@
 import net.kyori.adventure.platform.facet.FacetComponentFlattener;
 import net.kyori.adventure.text.flattener.ComponentFlattener;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
-import net.kyori.adventure.text.serializer.gson.legacyimpl.NBTLegacyHoverEventSerializer;
+import net.kyori.adventure.text.serializer.json.JSONOptions;
+import net.kyori.adventure.text.serializer.json.legacyimpl.NBTLegacyHoverEventSerializer;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -46,6 +47,7 @@ public final class BukkitComponentSerializer {
   private BukkitComponentSerializer() {
   }
 
+  private static final boolean IS_1_13 = findEnum(Material.class, "BLUE_ICE") != null;
   private static final boolean IS_1_16 = findEnum(Material.class, "NETHERITE_PICKAXE") != null;
 
   private static final Collection<FacetComponentFlattener.Translator<Server>> TRANSLATORS = Facet.of(
@@ -58,25 +60,29 @@ private BukkitComponentSerializer() {
 
   static {
     FLATTENER = FacetComponentFlattener.get(Bukkit.getServer(), TRANSLATORS);
+
+    if (IS_1_13) {
+      GSON_SERIALIZER = GsonComponentSerializer.builder()
+              .options(JSONOptions.byDataVersion().at(Bukkit.getUnsafe().getDataVersion()))
+              .build();
+    } else {
+      GSON_SERIALIZER = GsonComponentSerializer.builder()
+              .legacyHoverEventSerializer(NBTLegacyHoverEventSerializer.get())
+              .options(JSONOptions.byDataVersion().at(0))
+              .build();
+    }
+
     if (IS_1_16) {
       LEGACY_SERIALIZER = LegacyComponentSerializer.builder()
         .hexColors()
         .useUnusualXRepeatedCharacterHexFormat()
         .flattener(FLATTENER)
         .build();
-      GSON_SERIALIZER = GsonComponentSerializer.builder()
-        .legacyHoverEventSerializer(NBTLegacyHoverEventSerializer.get())
-        .build();
     } else {
       LEGACY_SERIALIZER = LegacyComponentSerializer.builder()
         .character(LegacyComponentSerializer.SECTION_CHAR)
         .flattener(FLATTENER)
         .build();
-      GSON_SERIALIZER = GsonComponentSerializer.builder()
-        .legacyHoverEventSerializer(NBTLegacyHoverEventSerializer.get())
-        .emitLegacyHoverEvent()
-        .downsampleColors()
-        .build();
     }
   }