Merge 1.16 into 1.18

Author: embeddedt

build.gradle

@@ -182,6 +182,20 @@ configure(subprojects.findAll {it.name == "forge" || it.name == "fabric"}) {
     apply plugin: 'com.matthewprenger.cursegradle'
     apply plugin: 'com.modrinth.minotaur'
 
+    def copyJarNameConsistent = tasks.register('copyJarNameConsistent', Copy) {
+        from remapJar // shortcut for createJar.outputs.files
+        into project.file("build/libs")
+        rename { name -> "modernfix-" + project.name + "-latest.jar" }
+    }
+
+    def copyJarToBin = tasks.register('copyJarToBin', Copy) {
+        from remapJar // shortcut for createJar.outputs.files
+        into rootProject.file("bin")
+        mustRunAfter "copyJarNameConsistent"
+    }
+
+    tasks.build.dependsOn(copyJarToBin, copyJarNameConsistent)
+
     def isBeta = project.version.toString().contains("beta")
 
     curseforge {

fabric/build.gradle

@@ -65,13 +65,6 @@ remapJar {
     classifier null
 }
 
-task copyJarToBin(type: Copy) {
-    from remapJar // shortcut for createJar.outputs.files
-    into rootProject.file("bin")
-}
-
-tasks.build.dependsOn(copyJarToBin)
-
 jar {
     classifier "dev"
 }

forge/build.gradle

@@ -70,13 +70,6 @@ remapJar {
     classifier null
 }
 
-task copyJarToBin(type: Copy) {
-    from remapJar // shortcut for createJar.outputs.files
-    into rootProject.file("bin")
-}
-
-tasks.build.dependsOn(copyJarToBin)
-
 jar {
     classifier "dev"
     manifest {