From 19177326f1e534933bab7d4475af3973b13f8eca Mon Sep 17 00:00:00 2001
From: Jared <jaredlll08@gmail.com>
Date: Thu, 16 Jun 2022 22:14:21 +0200
Subject: [PATCH] Revert moving to jar task as Annotation Processors do not
 process Common

---
 Fabric/build.gradle | 20 ++++----------------
 Forge/build.gradle  | 11 ++++-------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/Fabric/build.gradle b/Fabric/build.gradle
index 44abfe0..337a4a2 100644
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -16,12 +16,6 @@ dependencies {
 }
 
 loom {
-    mods {
-        register(mod_id) {
-            sourceSet sourceSets.main
-            sourceSet project(":Common").sourceSets.main
-        }
-    }
     runs {
         client {
             client()
@@ -38,7 +32,9 @@ loom {
     }
 }
 
+
 processResources {
+    from project(":Common").sourceSets.main.resources
     inputs.property "version", project.version
 
     filesMatching("fabric.mod.json") {
@@ -46,16 +42,8 @@ processResources {
     }
 }
 
-jar {
-    from project(":Common").sourceSets.main.output
-}
-
-javadoc {
-    source project(":Common").sourceSets.main.allJava
-}
-
-sourcesJar {
-    from project(":Common").sourceSets.main.allSource
+tasks.withType(JavaCompile) {
+    source(project(":Common").sourceSets.main.allSource)
 }
 
 publishing {
diff --git a/Forge/build.gradle b/Forge/build.gradle
index 64ab013..ab9c78e 100644
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -77,17 +77,14 @@ dependencies {
     compileOnly project(":Common")
 }
 
-jar {
-    from project(":Common").sourceSets.main.output
+tasks.withType(JavaCompile) {
+    source(project(":Common").sourceSets.main.allSource)
 }
 
-javadoc {
-    source project(":Common").sourceSets.main.allJava
+processResources {
+    from project(":Common").sourceSets.main.resources
 }
 
-sourcesJar {
-    from project(":Common").sourceSets.main.allSource
-}
 
 jar.finalizedBy('reobfJar')