Use better method for telling loom to remap api artifacts

This reverts commit c5a6fe98c2.

buildSrc/src/main/kotlin/com/jozufozu/gradle/jarset/JarTaskSet.kt

@@ -67,6 +67,14 @@ class JarTaskSet(
         remapSources.configure(action)
     }
 
+    /**
+     * Configure the jar tasks with the given action.
+     */
+    fun configureJar(action: Action<Jar>) {
+        jar.configure(action)
+        sources.configure(action)
+    }
+
     /**
      * Create a new JarTaskSet with the same base jars but new tasks for remapping.
      */

buildSrc/src/main/kotlin/com/jozufozu/gradle/platform/PlatformExtension.kt

@@ -75,9 +75,7 @@ open class PlatformExtension(val project: Project) {
                     source(commonSourceSet.allJava)
                 }
                 named<ProcessResources>(it.processResourcesTaskName).configure {
-                    from(commonSourceSet.resources) {
+                    from(commonSourceSet.resources)
-                        exclude("fabric.mod.json")
-                    }
                 }
             }
         }

common/build.gradle.kts

@@ -49,6 +49,12 @@ jarSets {
         addToAssemble()
         publish("flywheel-common-intermediary-api-${property("artifact_minecraft_version")}")
 
+        configureJar {
+            manifest {
+                attributes("Fabric-Loom-Remap" to "true")
+            }
+        }
+
         // Don't publish the un-remapped jars because they don't have the correct manifest populated by Loom.
         forkRemap("apiMojmap").apply {
             addToAssemble()

common/src/lib/resources/fabric.mod.json

@@ -1,31 +0,0 @@
-{
-  "__comment": "This is to make sure api artifacts get remapped properly",
-  "schemaVersion": 1,
-  "id": "${mod_id}",
-  "version": "${mod_version}",
-  "name": "${mod_name}",
-  "description": "${mod_description}",
-  "authors": [
-    "Jozufozu",
-    "PepperCode1"
-  ],
-  "contact": {
-    "homepage": "${mod_homepage}",
-    "sources": "${mod_sources}",
-    "issues": "${mod_issues}"
-  },
-  "license": "${mod_license}",
-  "icon": "logo.png",
-  "environment": "client",
-  "entrypoints": {
-  },
-  "mixins": [
-  ],
-  "depends": {
-    "minecraft": "${minecraft_semver_version_range}",
-    "fabric-api": "${fabric_api_version_range}"
-  },
-  "breaks": {
-    "sodium": "<0.5.0"
-  }
-}

fabric/build.gradle.kts

@@ -47,6 +47,12 @@ jarSets {
     create("api", api, lib).apply {
         addToAssemble()
         publish(platform.apiArtifactId)
+
+        configureJar {
+            manifest {
+                attributes("Fabric-Loom-Remap" to "true")
+            }
+        }
     }
 }
 

forge/build.gradle.kts

@@ -47,6 +47,12 @@ jarSets {
     create("api", api, lib).apply {
         addToAssemble()
         publish(platform.apiArtifactId)
+
+        configureJar {
+            manifest {
+                attributes("Fabric-Loom-Remap" to "true")
+            }
+        }
     }
 }