From ee20abd93460f27bc626ba5a51d1d285ab5a377e Mon Sep 17 00:00:00 2001
From: booky10 <boooky10@gmail.com>
Date: Sat, 22 Jun 2024 03:48:57 +0200
Subject: [PATCH] Work around relocation of adventure breaking on velocity with
 #842

Caused by only serializer implementations being shaded on velocity
On spigot, the entirety of adventure is shaded into the final jar
---
 .../main/kotlin/packetevents.shadow-conventions.gradle.kts  | 1 -
 spigot/build.gradle.kts                                     | 3 +++
 velocity/build.gradle.kts                                   | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/packetevents.shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/packetevents.shadow-conventions.gradle.kts
index 93314be4a1..099df7aa70 100644
--- a/buildSrc/src/main/kotlin/packetevents.shadow-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/packetevents.shadow-conventions.gradle.kts
@@ -11,7 +11,6 @@ tasks {
         archiveFileName = "packetevents-${project.name}-${project.version}.jar"
         archiveClassifier = null
 
-        relocate("net.kyori.adventure.text.serializer", "io.github.retrooper.packetevents.adventure.serializer")
         relocate("net.kyori.option", "io.github.retrooper.packetevents.adventure.option")
         dependencies {
             exclude(dependency("com.google.code.gson:gson:.*"))
diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
index f1c4f19abb..5bb3b1d283 100644
--- a/spigot/build.gradle.kts
+++ b/spigot/build.gradle.kts
@@ -27,6 +27,9 @@ tasks {
         manifest {
             attributes["paperweight-mappings-namespace"] = "mojang"
         }
+
+        relocate("net.kyori.adventure.text.serializer",
+            "io.github.retrooper.packetevents.adventure.serializer")
     }
 
     // 1.8.8 - 1.16.5 = Java 8
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
index 4102f5bd52..c4fbf96e5c 100644
--- a/velocity/build.gradle.kts
+++ b/velocity/build.gradle.kts
@@ -28,4 +28,10 @@ tasks {
             languageVersion = JavaLanguageVersion.of(21)
         }
     }
+
+    shadowJar {
+        sequenceOf("gson", "json", "legacy").forEach {
+            relocate("net.kyori.adventure.text.serializer.$it", "io.github.retrooper.packetevents.adventure.serializer.$it")
+        }
+    }
 }
\ No newline at end of file