Skip to content

Commit d88453f

Browse files
authored
fix: properly include adventure in bridge jar (#1557)
### Motivation Our update to fabric loom 1.9.2 resulted in bridge jars without adventure shaded into it. ### Modification Moved our class copy to the jar task. ### Result Adventure is shaded again.
1 parent 8460c56 commit d88453f

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

modules/bridge/build.gradle.kts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,10 @@ tasks.withType<Jar> {
5252
manifest {
5353
attributes["paperweight-mappings-namespace"] = "mojang"
5454
}
55-
}
5655

57-
tasks.withType<RemapJarTask> {
5856
// depend on adventure helper jar task
5957
dependsOn(":ext:adventure-helper:jar")
60-
// base setup
61-
archiveFileName.set(Files.bridge)
58+
6259
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
6360
// includes all dependencies of runtimeImpl but excludes gson because we don't need it
6461
from(configurations.getByName("runtimeImpl").map { if (it.isDirectory) it else zipTree(it) })
@@ -67,6 +64,10 @@ tasks.withType<RemapJarTask> {
6764
}
6865
}
6966

67+
tasks.withType<RemapJarTask> {
68+
archiveFileName.set(Files.bridge)
69+
}
70+
7071
loom {
7172
accessWidenerPath.set(project.file("src/main/resources/cloudnet_bridge.accesswidener"))
7273
}

0 commit comments

Comments
 (0)