From d75cdc969650cc0e3935bb5ccf7380ad47d6328b Mon Sep 17 00:00:00 2001
From: shartte <sebastian@hartte.de>
Date: Sun, 6 Nov 2016 21:55:58 +0100
Subject: [PATCH] Gradle Source Set Changes (#2588)

Introduced separate source sets for "api" and "apis" (in preparation for source only 3rd party APIs).
---
 build.gradle                    | 28 +++++++++-------------------
 gradle/scripts/artifacts.gradle |  2 +-
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index baf5de13..54f06e5c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,6 +55,9 @@ jar {
         attributes 'FMLCorePluginContainsFMLMod': 'true'
     }
 
+    from sourceSets.api.output
+    dependsOn apiClasses
+
     // specify which files are really included, can control which APIs should be in
     include "appeng/**"
     include "assets/**"
@@ -81,26 +84,13 @@ minecraft {
 }
 
 sourceSets {
-    main {
-        java {
-            srcDirs += 'src/api/java'
-            srcDirs += 'src/main/java/'
-        }
 
-        resources {
-            srcDir "src/main/resources/"
-            include "assets/appliedenergistics2/recipes/**/*.recipe",
-                    "assets/appliedenergistics2/recipes/README.html",
-                    "assets/appliedenergistics2/lang/*.lang",
-                    "assets/appliedenergistics2/blockstates/**/*.json",
-                    "assets/appliedenergistics2/models/**/*.json",
-                    "assets/appliedenergistics2/textures/**/*.png",
-                    "assets/appliedenergistics2/textures/**/*.mcmeta",
-                    "assets/appliedenergistics2/meta/*",
-                    "mcmod.info",
-                    "pack.mcmeta"
-        }
-    }
+    api
+
+    thirdparty
+
+    main
+
 }
 
 processResources
diff --git a/gradle/scripts/artifacts.gradle b/gradle/scripts/artifacts.gradle
index 1d7ae23b..ccd9cd71 100644
--- a/gradle/scripts/artifacts.gradle
+++ b/gradle/scripts/artifacts.gradle
@@ -46,7 +46,7 @@ task apiJar(type: Jar) {
     from sourceSets.api.java
     include "appeng/api/**"
 
-    from sourceSets.main.output
+    from sourceSets.api.output
     include "appeng/api/**"
 
     classifier = 'api'