Fix server startup, jar building and after-merge fixes.

gradle/scripts/artifacts.gradle

@@ -21,8 +21,7 @@ processResources {
 }
 
 jar {
-    finalizedBy 'reobfJar'
-    finalizedBy 'signJar'
+    finalizedBy 'remapJar'
 
     from sourceSets.main.output.classesDirs
     from sourceSets.api.output.classesDirs
@@ -57,25 +56,23 @@ task javadocJar(type: Jar, dependsOn: javadocs) {
     from javadoc.destinationDir
 }
 
-task sourcesJar(type: Jar) {
+// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+// if it is present.
+// If you remove this task, sources will not be generated.
+task sourcesJar(type: Jar, dependsOn: classes) {
     classifier = "sources"
-    from sourceSets.main.allJava
-    from sourceSets.api.allJava
+    from sourceSets.main.allSource
+    from sourceSets.api.allSource
 }
 
 task apiJar(type: Jar) {
     classifier = "api"
     from sourceSets.api.output
     include "appeng/api/**"
-
-    // TODO: when FG bug is fixed, remove allJava from the api jar.
-    // https://github.com/MinecraftForge/ForgeGradle/issues/369
-    // Gradle should be able to pull them from the -sources jar.
-    from sourceSets.api.allJava
 }
 
 artifacts {
     archives javadocJar
     archives sourcesJar
     archives apiJar
-}
+}