refactor: produce only one jar

SettingDust · Apr 20, 2024 · 23bcff8 · 23bcff8
1 parent 13a8e0b
commit 23bcff8
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,6 @@
 )
 
 import net.fabricmc.loom.api.LoomGradleExtensionAPI
-import net.fabricmc.loom.task.RemapJarTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -32,12 +31,14 @@ val maven_group: String by project
 val archives_name: String by project
 val mod_name: String by rootProject
 
-project.version = "${semver.semVersion}+${catalog.versions.minecraft.get()}"
+project.version = "${semver.semVersion}"
 
 project.group = maven_group
 
 architectury { minecraft = catalog.versions.minecraft.get() }
 
+base { archivesName.set(archives_name) }
+
 subprojects {
     apply(plugin = "java")
     apply(plugin = "kotlin")
@@ -51,7 +52,7 @@ subprojects {
     group = maven_group
     version = rootProject.version
 
-    base { archivesName.set("$archives_name-${project.name}") }
+    base { archivesName.set("$archives_name${project.path.replace(":", "-")}") }
 
     configure<LoomGradleExtensionAPI> { silentMojangMappingsLicense() }
 
@@ -118,22 +119,20 @@ subprojects {
     }
 }
 
+dependencies {
+    shadow(project(":fabric")) { isTransitive = false }
+    shadow(project(":quilt")) { isTransitive = false }
+    shadow(project(":forge")) { isTransitive = false }
+}
+
 tasks {
     jar { enabled = false }
-    shadowJar {
-        val fabricJar = project(":fabric").tasks.named("remapJar")
-        val quiltJar = project(":quilt").tasks.named("remapJar")
-
-        from(fabricJar, quiltJar)
 
+    shadowJar {
+        configurations = listOf(project.configurations.shadow.get())
         mergeServiceFiles()
-
-        archiveBaseName.set("$archives_name-intermediary")
         archiveClassifier.set("")
     }
 
-    build {
-        val forgeJar = project(":forge").tasks.named<RemapJarTask>("remapJar")
-        dependsOn(shadowJar, forgeJar)
-    }
+    build { dependsOn(shadowJar) }
 }
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -11,14 +11,14 @@ val mod_name: String by rootProject
 
 version = rootProject.version
 
-base { archivesName.set("$archives_name-fabric") }
-
 architectury {
     platformSetupLoomIde()
     fabric()
 }
 
 loom {
+    mixin { add("main", "$archives_name.fabric.refmap.json") }
+
     mods {
         create(archives_name) {
             sourceSet("main")

diff --git a/fabric/src/main/resources/mod_sets.fabric.mixins.json b/fabric/src/main/resources/mod_sets.fabric.mixins.json
@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "settingdust.modsets.mixin.fabric",
-  "refmap": "${id}.refmap.json",
+  "refmap": "${id}.fabric.refmap.json",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
     "ModBadgeRendererMixin"

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -1,5 +1,4 @@
 import net.fabricmc.loom.task.AbstractRunTask
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.libsDirectory
 
 val archives_name: String by rootProject
 val mod_name: String by rootProject
@@ -70,7 +69,7 @@ tasks {
     jar { enabled = false }
 
     shadowJar {
-        configurations = listOf(project.configurations.getByName("shadow"))
+        configurations = listOf(project.configurations.shadow.get())
         destinationDirectory = project.layout.buildDirectory.dir("devlibs")
         archiveClassifier = "dev"
 
@@ -84,7 +83,6 @@ tasks {
     remapJar {
         dependsOn(shadowJar)
         inputFile = shadowJar.get().archiveFile
-        destinationDirectory = rootProject.libsDirectory
     }
 
     afterEvaluate { withType<AbstractRunTask> { dependsOn(shadowJar) } }

diff --git a/forge/ingame/build.gradle.kts b/forge/ingame/build.gradle.kts
@@ -1,3 +1,9 @@
 dependencies { forge(catalog.forge) }
 
-tasks { remapJar { inputFile.set(project(":common:ingame").tasks.jar.get().archiveFile) } }
+tasks {
+    remapJar {
+        val task = project(":common:ingame").tasks.jar
+        dependsOn(task)
+        inputFile.set(task.get().archiveFile)
+    }
+}