Merge pull request #622 from rexlManu/2.0

Relocate only the gson and legacy
retrooper · Nov 16, 2023 · 4a2146d · 4a2146d
2 parents aec45f1 + 079a2fc
commit 4a2146d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/bungeecord/build.gradle b/bungeecord/build.gradle
@@ -6,9 +6,10 @@ dependencies {
 }
 
 shadowJar {
-    relocate 'net.kyori.adventure.text.serializer', 'io.github.retrooper.packetevents.adventure.serializer'
+    relocate 'net.kyori.adventure.text.serializer.gson', 'io.github.retrooper.packetevents.adventure.serializer.gson'
+    relocate 'net.kyori.adventure.text.serializer.legacy', 'io.github.retrooper.packetevents.adventure.serializer.legacy'
     relocate 'net.kyori.adventure.util.Codec', 'io.github.retrooper.packetevents.adventure.util.Codec'
     dependencies {
         exclude(dependency('com.google.code.gson:gson:2.8.0'))
     }
-}
+}
diff --git a/spigot/build.gradle b/spigot/build.gradle
@@ -8,7 +8,8 @@ java.sourceCompatibility = JavaVersion.VERSION_1_8
 java.targetCompatibility = JavaVersion.VERSION_1_8
 
 shadowJar {
-    relocate 'net.kyori.adventure.text.serializer', 'io.github.retrooper.packetevents.adventure.serializer'
+    relocate 'net.kyori.adventure.text.serializer.gson', 'io.github.retrooper.packetevents.adventure.serializer.gson'
+    relocate 'net.kyori.adventure.text.serializer.legacy', 'io.github.retrooper.packetevents.adventure.serializer.legacy'
     dependencies {
         exclude(dependency('com.google.code.gson:gson:2.8.0'))
         exclude(dependency('com.google.code.gson:gson:2.8.5'))
@@ -25,4 +26,4 @@ dependencies {
     compileOnly 'org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT'
     compileOnly 'com.viaversion:viaversion:4.5.0'
     compileOnly 'com.github.ProtocolSupport:ProtocolSupport:3d24efeda6'
-}
+}