From 08b1ac049a979e3b5bd5ab07e02299b30a94353a Mon Sep 17 00:00:00 2001
From: Michael Hillcox <michaelhillcox@gmail.com>
Date: Fri, 20 Nov 2020 17:46:34 +0000
Subject: [PATCH] Attempt 2.2

---
 build.gradle | 53 +++++++++++++++++++++++-----------------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4593514a5..197ad544f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,9 +25,11 @@ if (System.getenv('BUILD_NUMBER') != null) {
 
 minecraft {
     version = "1.12.2-14.23.5.2836"
-    runDir = "run"
     mappings = "stable_39"
+
+    runDir = "run"
 	makeObfSourceJar = false
+
     replaceIn "ActuallyAdditions.java"
     replace "@VERSION@", project.version.toString()
 }
@@ -56,7 +58,6 @@ processResources {
 
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'
-
         expand 'version': project.version, 'mcversion': project.minecraft.version
     }
 
@@ -65,24 +66,19 @@ processResources {
     }
 }
 
-jar {
+jar {}
 
-}
 task deobfJar(type: Jar) {
-    from(sourceSets.main.output)
-    archiveName = "${baseName}-${version}-deobf.${extension}"
-}
-
-task sourcesJar(type: Jar) {
-    from(sourceSets.main.allSource)
-    archiveName = "${baseName}-${version}-sources.${extension}"
+    from sourceSets.main.output
+    from sourceSets.main.java
+    classifier = 'dev'
 }
 
 task apiJar(type: Jar) {
-    from(sourceSets.main.output)
-    from(sourceSets.main.java)
-    include("de/ellpeck/actuallyadditions/api/**")
-    archiveName = "${baseName}-${version}-api.${extension}"
+    from sourceSets.main.output
+    from sourceSets.main.java
+    classifier = 'api'
+    include 'de/ellpeck/actuallyadditions/api/**'
 }
 
 javadoc {
@@ -94,6 +90,11 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     classifier 'javadoc'
 }
 
+task sourcesJar(type: Jar) {
+    from sourceSets.main.java
+    classifier = 'sources'
+}
+
 artifacts {
     archives deobfJar
     archives sourcesJar
@@ -101,6 +102,8 @@ artifacts {
     archives javadocJar
 }
 
+apply plugin: 'maven-publish'
+
 publishing {
     publications {
         mavenJava(MavenPublication) {
@@ -109,21 +112,11 @@ publishing {
             version project.version
             from components.java
 
-            artifact deobfJar {
-                classifier 'deobf'
-            }
-            artifact sourcesJar {
-                classifier 'sources'
-            }
-            artifact apiJar {
-                classifier 'api'
-            }
-
-            pom.withXml {
-                def node = asNode()
-                if (node.dependencies.size() > 0)
-                    node.remove(node.dependencies)
-            }
+            artifact jar
+            artifact apiJar
+            artifact javadocJar
+            artifact sourcesJar
+            artifact deobfJar
         }
     }
     repositories {