Replace home-made legacy hover event serializer with Adventure's impl…

…ementation This technically can break backwards compatibility, but this seems to be very unlikely to be the practice in reality. (The Velocity implementation probably wasn't correct, anyway.)
PaperMC · Oct 27, 2024 · 08a42b3 · 08a42b3
1 parent dc40e16
commit 08a42b3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 130 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,7 +12,8 @@ spotless = "com.diffplug.spotless:6.25.0"
 
 [libraries]
 adventure-bom = "net.kyori:adventure-bom:4.17.0"
-adventure-facet = "net.kyori:adventure-platform-facet:4.3.2"
+adventure-text-serializer-json-legacy-impl = "net.kyori:adventure-text-serializer-json-legacy-impl:4.17.0"
+adventure-facet = "net.kyori:adventure-platform-facet:4.3.4"
 asm = "org.ow2.asm:asm:9.6"
 auto-service = "com.google.auto.service:auto-service:1.0.1"
 auto-service-annotations = "com.google.auto.service:auto-service-annotations:1.0.1"

diff --git a/proxy/build.gradle.kts b/proxy/build.gradle.kts
@@ -127,7 +127,7 @@ dependencies {
     runtimeOnly(libs.disruptor)
     implementation(libs.fastutil)
     implementation(platform(libs.adventure.bom))
-    implementation("net.kyori:adventure-nbt")
+    implementation(libs.adventure.text.serializer.json.legacy.impl)
     implementation(libs.adventure.facet)
     implementation(libs.completablefutures)
     implementation(libs.nightconfig)

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java
@@ -25,7 +25,6 @@
 import com.velocitypowered.api.util.GameProfile;
 import com.velocitypowered.proxy.crypto.IdentifiedKeyImpl;
 import com.velocitypowered.proxy.protocol.netty.MinecraftDecoder;
-import com.velocitypowered.proxy.protocol.util.VelocityLegacyHoverEventSerializer;
 import com.velocitypowered.proxy.util.except.QuietDecoderException;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufInputStream;
@@ -47,6 +46,7 @@
 import net.kyori.adventure.nbt.CompoundBinaryTag;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.kyori.adventure.text.serializer.json.JSONOptions;
+import net.kyori.adventure.text.serializer.json.legacyimpl.NBTLegacyHoverEventSerializer;
 import net.kyori.option.OptionState;
 
 /**
@@ -58,8 +58,7 @@ public enum ProtocolUtils {
   private static final GsonComponentSerializer PRE_1_16_SERIALIZER =
       GsonComponentSerializer.builder()
           .downsampleColors()
-          .emitLegacyHoverEvent()
-          .legacyHoverEventSerializer(VelocityLegacyHoverEventSerializer.INSTANCE)
+          .legacyHoverEventSerializer(NBTLegacyHoverEventSerializer.get())
           .options(
               OptionState.optionState()
               // before 1.16
@@ -74,7 +73,7 @@ public enum ProtocolUtils {
           .build();
   private static final GsonComponentSerializer PRE_1_20_3_SERIALIZER =
           GsonComponentSerializer.builder()
-          .legacyHoverEventSerializer(VelocityLegacyHoverEventSerializer.INSTANCE)
+          .legacyHoverEventSerializer(NBTLegacyHoverEventSerializer.get())
           .options(
               OptionState.optionState()
               // after 1.16
@@ -89,7 +88,7 @@ public enum ProtocolUtils {
           .build();
   private static final GsonComponentSerializer MODERN_SERIALIZER =
       GsonComponentSerializer.builder()
-          .legacyHoverEventSerializer(VelocityLegacyHoverEventSerializer.INSTANCE)
+          .legacyHoverEventSerializer(NBTLegacyHoverEventSerializer.get())
           .options(
               OptionState.optionState()
               // after 1.16

diff --git a/...main/java/com/velocitypowered/proxy/protocol/util/VelocityLegacyHoverEventSerializer.java b/...main/java/com/velocitypowered/proxy/protocol/util/VelocityLegacyHoverEventSerializer.java