Upgraded buildscripts for minecraft 1.15.2

gradle/scripts/artifacts.gradle

@@ -28,40 +28,54 @@ javadoc {
 	options.charSet = 'UTF-8'
 }
 
-task javadocs(type: Javadoc) {
-	source = sourceSets.api.java
-	include "appeng/api/**"
+jar {
+    from sourceSets.main.output.classesDirs
+    from sourceSets.api.output.classesDirs
+    from sourceSets.main.output.resourcesDir
+    from sourceSets.api.output.resourcesDir
 
-	// Due to ForgeGradle having to be a special snowflake,
-	// we have to add some custom configurations to the normal compile configuration and hope it does not break.
-	classpath = configurations.compile + configurations.forgeGradleMc + configurations.forgeGradleMcDeps 
+    manifest {
+        attributes([
+                "Specification-Title": "Applied Energistics 2",
+                "Specification-Vendor": "TeamAppliedEnergistics",
+                "Specification-Version": "${project.version}",
+                "Implementation-Title": "${project.name}",
+                "Implementation-Version": "${project.version}",
+                "Implementation-Vendor" :"TeamAppliedEnergistics",
+                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+        ])
+    }
 }
 
-task javadocJar(type: Jar, dependsOn: javadocs) {
-	from javadoc.destinationDir
+task javadocs(type: Javadoc) {
+    source = sourceSets.api.java
+    include "appeng/api/**"
+}
 
-	classifier = 'javadoc'
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = "javadoc"
+    from javadoc.destinationDir
+}
+
+task sourcesJar(type: Jar) {
+    classifier = "sources"
+    from sourceSets.main.allJava
+    from sourceSets.api.allJava
 }
 
 task apiJar(type: Jar) {
-	from sourceSets.api.java
-	include "appeng/api/**"
+    classifier = "api"
+    from sourceSets.api.output
+    include "appeng/api/**"
 
-	from sourceSets.api.output
-	include "appeng/api/**"
-
-	classifier = 'api'
-}
-
-task sourceJar(type: Jar, overwrite: true) {
-	from sourceSets.api.allSource
-	from sourceSets.main.allSource
-
-	classifier = 'sources'
+    // 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 apiJar
-	archives javadocJar
-	archives sourceJar
+    archives javadocJar
+    archives sourcesJar
+    archives apiJar
 }

gradle/scripts/dependencies.gradle

@@ -64,10 +64,10 @@ repositories {
         url "http://maven.blamejared.com/"
     }
 
-    //maven { // modmaven, maven proxy
-    //    name 'modmaven'
-    //    url "https://modmaven.k-4u.nl/"
-    //}
+    maven { // modmaven, maven proxy
+        name 'modmaven'
+        url "https://modmaven.k-4u.nl/"
+    }
 
     maven {
 		name = "CurseForge"
@@ -80,25 +80,26 @@ configurations {
 }
 
 dependencies {
-    // installable runtime dependencies
-    mods "mcp.mobius.waila:Hwyla:${hwyla_version}"
-    mods "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
-    mods "mcjty.theoneprobe:TheOneProbe-${minecraft_version}:${top_version}"
+    minecraft([
+        group  : "net.minecraftforge",
+        name   : "forge",
+        version: "${project.minecraft_version}-${project.forge_version}"
+    ])
 
     // compile against provided APIs
-    compileOnly "mezz.jei:jei_${minecraft_version}:${jei_version}:api"
-    compileOnly "mcp.mobius.waila:Hwyla:${hwyla_version}"
-    compileOnly "net.darkhax.tesla:Tesla-1.12.2:${tesla_version}"
-    compileOnly "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
-    compileOnly "mcjty.theoneprobe:TheOneProbe-1.12:${top_version}:api"
-    compileOnly "cofh:CoFHCore:${cofhcore_version}:deobf"
-    compileOnly "CraftTweaker2:CraftTweaker2-API:${crafttweaker_version}"
-	compileOnly "inventory-tweaks:InventoryTweaks:${inventorytweaks_version}:api"
-    compileOnly "team.chisel.ctm:CTM:${ctm_version}"
+    compileOnly "mezz.jei:jei-${minecraft_version}:${jei_version}:api"
+    //compileOnly "mcp.mobius.waila:Hwyla:${hwyla_version}"
+    //compileOnly "net.darkhax.tesla:Tesla-1.12.2:${tesla_version}"
+    //compileOnly "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
+    compileOnly "mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}:api"
+    //compileOnly "cofh:CoFHCore:${cofhcore_version}:deobf"
+    //compileOnly "CraftTweaker2:CraftTweaker2-API:${crafttweaker_version}"
+	//compileOnly "inventory-tweaks:InventoryTweaks:${inventorytweaks_version}:api"
+    //compileOnly "team.chisel.ctm:CTM:${ctm_version}"
 
     // at runtime, use the full JEI jar
-    runtime "mezz.jei:jei_${minecraft_version}:${jei_version}"
+    runtime "mezz.jei:jei-${minecraft_version}:${jei_version}"
 
     // unit test dependencies
-    testCompile "junit:junit:4.12"
+    testCompile "junit:junit:4.13"
 }

gradle/scripts/optional.gradle

@@ -1,55 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
- 
-task wrapper(type: Wrapper) {
-    gradleVersion = "2.14"
-}
-
-// HWYLA
-task installHwyla(type: Copy, dependsOn: "deinstallHwyla") {
-    from { configurations.mods }
-    include "**/*Hwyla*.jar"
-    into file(minecraft.runDir + "/mods")
-}
-
-task deinstallHwyla(type: Delete) {
-    delete fileTree(dir: minecraft.runDir + "/mods", include: "*Hwyla*.jar")
-}
-
-// IC2
-task installIC2(type: Copy, dependsOn: "deinstallIC2") {
-    from { configurations.mods }
-    include "**/*industrialcraft-2*.jar"
-    into file(minecraft.runDir + "/mods")
-}
-
-task deinstallIC2(type: Delete) {
-    delete fileTree(dir: minecraft.runDir + "/mods", include: "*industrialcraft-2*.jar")
-}
-
-// TOP
-task installTop(type: Copy, dependsOn: ["deinstallTop"]) {
-    from { configurations.mods }
-    include "**/*TheOneProbe*.jar"
-    into file(minecraft.runDir + "/mods")
-}
-
-task deinstallTop(type: Delete) {
-    delete fileTree(dir: minecraft.runDir + "/mods", include: "*TheOneProbe*.jar")
-}
-