Try build script fix.

toxicity188 · Jan 6, 2025 · b00df4d · b00df4d
1 parent b5d0127
commit b00df4d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 19 deletions.
diff --git a/bootstrap/bukkit/build.gradle.kts b/bootstrap/bukkit/build.gradle.kts
@@ -157,16 +157,12 @@ tasks.jar {
     manifest {
         attributes["paperweight-mappings-namespace"] = "spigot"
     }
-    setManifest()
-    doLast {
-        relocateAll()
-    }
 }
 
 
 modrinth {
     uploadFile.set(tasks.jar)
-    versionName = "BetterHud ${project.version} for bukkit"
+    versionName = "BetterHud ${project.version} for Bukkit"
     gameVersions = SUPPORTED_MINECRAFT_VERSION
     loaders = listOf("bukkit", "spigot", "paper", "folia", "purpur")
 }
diff --git a/bootstrap/fabric/build.gradle.kts b/bootstrap/fabric/build.gradle.kts
@@ -77,16 +77,12 @@ fabricModJson {
 tasks {
     jar {
         archiveClassifier = "dev"
-        doLast {
-            relocateAll()
-        }
     }
     remapJar {
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         archiveBaseName = "${rootProject.name}-fabric+$minecraft"
         destinationDirectory = rootProject.layout.buildDirectory.dir("libs")
         archiveClassifier = ""
-        setManifest()
     }
     runServer {
         enabled = false
@@ -96,7 +92,7 @@ tasks {
 
 modrinth {
     uploadFile.set(tasks.remapJar)
-    versionName = "BetterHud ${project.version} for fabric"
+    versionName = "BetterHud ${project.version} for Fabric"
     gameVersions = SUPPORTED_MINECRAFT_VERSION.subList(
         SUPPORTED_MINECRAFT_VERSION.indexOf(supportedVersion),
         SUPPORTED_MINECRAFT_VERSION.size

diff --git a/bootstrap/velocity/build.gradle.kts b/bootstrap/velocity/build.gradle.kts
@@ -27,16 +27,12 @@ dependencies {
 tasks.jar {
     archiveBaseName = "${rootProject.name}-velocity"
     destinationDirectory = rootProject.layout.buildDirectory.dir("libs")
-    setManifest()
-    doLast {
-        relocateAll()
-    }
 }
 
 
 modrinth {
     uploadFile.set(tasks.jar)
-    versionName = "BetterHud ${project.version} for velocity"
+    versionName = "BetterHud ${project.version} for Velocity"
     gameVersions = SUPPORTED_MINECRAFT_VERSION
-    loaders = listOf("bukkit", "spigot", "paper", "folia", "purpur")
+    loaders = listOf("velocity")
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,6 +8,8 @@ plugins {
     id("com.github.ben-manes.versions") version "0.51.0"
 }
 
+val minecraft = property("minecraft_version")!!.toString()
+
 dependencies {
     fun searchAll(target: Project) {
         val sub = target.subprojects
@@ -45,8 +47,17 @@ val bukkit = project("bootstrap:bukkit")
 val fabric = project("bootstrap:fabric")
 val velocity = project("bootstrap:velocity")
 
+tasks.register("pluginJar") {
+    dependsOn(bukkit.tasks.build)
+}
+tasks.register("fabricJar") {
+    dependsOn(fabric.tasks.build)
+}
+tasks.register("velocityJar") {
+    dependsOn(velocity.tasks.build)
+}
+
 tasks.register("modrinthPublish") {
-    dependsOn(tasks.build)
     finalizedBy(
         tasks.modrinthSyncBody,
         bukkit.tasks.modrinth,
@@ -57,7 +68,7 @@ tasks.register("modrinthPublish") {
 
 tasks {
     runServer {
-        version(project.property("minecraft_version")!!.toString())
+        version(minecraft)
         pluginJars(bukkit.tasks.jar.flatMap {
             it.archiveFile
         })
@@ -82,7 +93,6 @@ tasks {
     }
 }
 
-
 hangarPublish {
     publications.register("plugin") {
         version = project.version as String

diff --git a/buildSrc/src/main/kotlin/bootstrap-conventions.gradle.kts b/buildSrc/src/main/kotlin/bootstrap-conventions.gradle.kts
@@ -36,6 +36,10 @@ tasks {
         ) {
             exclude("META-INF/MANIFEST.MF")
         }
+        setManifest()
+        doLast {
+            relocateAll()
+        }
     }
 }
 
@@ -51,4 +55,8 @@ modrinth {
     token = System.getenv("MODRINTH_API_TOKEN")
     projectId = "betterhud2"
     versionNumber = project.version as String
+    additionalFiles = listOf(
+        rootProject.layout.buildDirectory.file("libs/${rootProject.name}-${rootProject.version}-sources.jar"),
+        rootProject.layout.buildDirectory.file("libs/${rootProject.name}-${rootProject.version}-javadoc.jar")
+    )
 }