From 9b31616585b60367adc465fab69cf94ab2da45ee Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 27 Jun 2023 11:27:26 -0400
Subject: [PATCH] Clean up build script some more

---
 build.gradle        | 14 ++++++++++++++
 fabric/build.gradle |  7 -------
 forge/build.gradle  |  7 -------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index b3cb129e..5ec0bb15 100644
--- a/build.gradle
+++ b/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 {
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 2472d9f3..69002e2e 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -64,13 +64,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"
 }
diff --git a/forge/build.gradle b/forge/build.gradle
index 3534c738..18e81c6e 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -78,13 +78,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 {