Work around relocation of adventure breaking on velocity with retroop…

…er#842 Caused by only serializer implementations being shaded on velocity On spigot, the entirety of adventure is shaded into the final jar
booky10 · Jun 22, 2024 · ee20abd · ee20abd
1 parent 68eb537
commit ee20abd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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")
+        }
+    }
 }