From d5f2115506a7a351c8f972d81869f13380b998c0 Mon Sep 17 00:00:00 2001
From: dags- <dags@dags.me>
Date: Wed, 26 Feb 2020 10:50:35 +0000
Subject: [PATCH] create fat api jar

---
 TerraForgedAPI/build.gradle | 17 +++++++++++++++++
 TerraForgedMod              |  2 +-
 build.gradle                | 12 ++----------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/TerraForgedAPI/build.gradle b/TerraForgedAPI/build.gradle
index 3fd113c..1a94a7c 100644
--- a/TerraForgedAPI/build.gradle
+++ b/TerraForgedAPI/build.gradle
@@ -32,7 +32,24 @@ minecraft {
     mappings channel: mcp_channel, version: mcp_version
 }
 
+task deobfApiJar(type: Jar) {
+    duplicatesStrategy = "EXCLUDE"
+    from("$buildDir/classes/java/main")
+    from(fileTree(project(":Noise2D").buildDir.getPath() + "/classes/java/main"))
+    from(fileTree(project(":FeatureManager").buildDir.getPath() + "/classes/java/main"))
+    from(fileTree(project(":TerraForgedCore").buildDir.getPath() + "/classes/java/main"))
+}
+
+jar {
+    enabled(false)
+}
+
+install {
+    dependsOn(deobfApiJar)
+}
+
 uploadArchives {
+    dependsOn(deobfApiJar)
     repositories {
         mavenDeployer {
             repository(url: "https://io.terraforged.com/repository/maven/") {
diff --git a/TerraForgedMod b/TerraForgedMod
index e012922..2e18fe6 160000
--- a/TerraForgedMod
+++ b/TerraForgedMod
@@ -1 +1 @@
-Subproject commit e0129220f77b071cce27bfb37ef8103e1a194230
+Subproject commit 2e18fe66d631773288b1e27db0246514ce74d681
diff --git a/build.gradle b/build.gradle
index 01c50d6..dbefd8d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,7 @@
 allprojects {
     apply plugin: "java"
     group = "com.terraforged"
-    version = "${version}${getBuildNumber()}"
+    version = "${version}"
 }
 
-jar.enabled(false)
-
-static def getBuildNumber() {
-    def buildNumber = System.getenv("BUILD_NUMBER")
-    if (buildNumber == null) {
-        return ""
-    }
-    return "-${buildNumber}"
-}
\ No newline at end of file
+jar.enabled(false)
\ No newline at end of file