From 28f73454c311ce3cd11962cd15876da60bb29775 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 2 May 2023 11:18:39 -0400
Subject: [PATCH] Universal output directory

---
 .github/workflows/gradle.yml | 8 ++------
 .gitignore                   | 1 -
 bin/.gitignore               | 1 +
 fabric/build.gradle          | 7 +++++++
 forge/build.gradle           | 7 +++++++
 5 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 bin/.gitignore

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index af3fe6c9..e14c3237 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -22,9 +22,5 @@ jobs:
         run: ./gradlew --no-daemon build
       - uses: actions/upload-artifact@v2
         with:
-          name: Forge
-          path: forge/build/libs
-      - uses: actions/upload-artifact@v2
-        with:
-          name: Fabric
-          path: fabric/build/libs
\ No newline at end of file
+          name: Package
+          path: bin
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index bcd10106..c70bdc40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,7 +77,6 @@ fabric.properties
 ### Eclipse ###
 *.pydevproject
 .metadata
-bin/
 tmp/
 *.tmp
 *.bak
diff --git a/bin/.gitignore b/bin/.gitignore
new file mode 100644
index 00000000..d392f0e8
--- /dev/null
+++ b/bin/.gitignore
@@ -0,0 +1 @@
+*.jar
diff --git a/fabric/build.gradle b/fabric/build.gradle
index e09df301..8cedb676 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -61,6 +61,13 @@ 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 a5d86be3..ec6202c7 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -80,6 +80,13 @@ 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 {