ObsidianMC/Obsidian
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Specify mainCapabilityAttribute for paper-api

Browse source 
Fixes the api being bundled into com.destroystokyo.paper as paper-mojangapi
This commit is contained in:
Jason Penilla 2024-09-28 21:02:40 -07:00
parent 6d7a438fad
commit 54f05e415c
No known key found for this signature in database
GPG key ID: 0E75A301420E48F8
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
patches/api/0466-Brigadier-based-command-API.patch
View file

@ -6,7 +6,7 @@ Subject: [PATCH] Brigadier based command API
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 4da053d427f3f9c5e7fc144408836ebef80026c6..540fe7e2c110e79c3742f229b3ed8c54b101d260 100644 index 4da053d427f3f9c5e7fc144408836ebef80026c6..a82bc1a12db5531c4c8ade8e6582cf2d5c35fd56 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -27,6 +27,7 @@ configurations.api { @@ -27,6 +27,7 @@ configurations.api {
@ -17,18 +17,22 @@ index 4da053d427f3f9c5e7fc144408836ebef80026c6..540fe7e2c110e79c3742f229b3ed8c54
// api dependencies are listed transitively to API consumers // api dependencies are listed transitively to API consumers
api("com.google.guava:guava:32.1.2-jre") api("com.google.guava:guava:32.1.2-jre")
api("com.google.code.gson:gson:2.10.1") api("com.google.code.gson:gson:2.10.1")
@@ -92,9 +93,29 @@ sourceSets { @@ -92,9 +93,33 @@ sourceSets {
} }
} }
// Paper end // Paper end
+// Paper start - brigadier API +// Paper start - brigadier API
+val outgoingVariants = arrayOf("runtimeElements", "apiElements", "sourcesElements", "javadocElements") +val outgoingVariants = arrayOf("runtimeElements", "apiElements", "sourcesElements", "javadocElements")
+val mainCapability = "${project.group}:${project.name}:${project.version}"
+configurations { +configurations {
+ val outgoing = outgoingVariants.map { named(it) } + val outgoing = outgoingVariants.map { named(it) }
+ for (config in outgoing) { + for (config in outgoing) {
+ config { + config {
+ attributes {
+ attribute(io.papermc.paperweight.util.mainCapabilityAttribute, mainCapability)
+ }
+ outgoing { + outgoing {
+ capability("${project.group}:${project.name}:${project.version}") + capability(mainCapability)
+ capability("io.papermc.paper:paper-mojangapi:${project.version}") + capability("io.papermc.paper:paper-mojangapi:${project.version}")
+ capability("com.destroystokyo.paper:paper-mojangapi:${project.version}") + capability("com.destroystokyo.paper:paper-mojangapi:${project.version}")
+ } + }