Exclude from relocation, not inclusion

GeyserMC · Aug 24, 2022 · dc29d99 · dc29d99
1 parent e35f378
commit dc29d99
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/bootstrap/spigot/build.gradle.kts b/bootstrap/spigot/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
 
 platformRelocate("it.unimi.dsi.fastutil")
 platformRelocate("com.fasterxml.jackson")
-platformRelocate("net.kyori")
+platformRelocate("net.kyori", "net.kyori.adventure.text.logger.slf4j.ComponentLogger")
 platformRelocate("org.objectweb.asm")
 platformRelocate("me.lucko.commodore")
 platformRelocate("io.netty.channel.kqueue")
@@ -65,6 +65,6 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
         exclude(dependency("com.mojang:.*"))
 
         // Adventure slf4j
-        exclude(dependency("net.kyori.adventure.text.logger.slf4j:ComponentLogger"))
+        //exclude(dependency("net.kyori.adventure.text.logger.slf4j:ComponentLogger"))
     }
 }
diff --git a/build-logic/src/main/kotlin/extensions.kt b/build-logic/src/main/kotlin/extensions.kt
@@ -43,9 +43,11 @@ fun Project.exclude(group: String) {
     }
 }
 
-fun Project.platformRelocate(pattern: String) {
+fun Project.platformRelocate(pattern: String, exclusion: String = "") {
     tasks.named<ShadowJar>("shadowJar") {
-        relocate(pattern, "org.geysermc.geyser.platform.${project.name}.shaded.$pattern")
+        relocate(pattern, "org.geysermc.geyser.platform.${project.name}.shaded.$pattern") {
+            exclude(exclusion)
+        }
     }
 }