deps: upgradle

build.gradle

@@ -1,21 +1,3 @@
-/*
- * 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>.
- */
-
 apply plugin: 'forge'
 apply plugin: 'maven-publish'
 
@@ -43,7 +25,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') {
+            changing = true
+        }
     }
 }
 
@@ -100,24 +84,28 @@ sourceSets {
 
         resources {
             srcDir "src/main/resources/"
-            include "assets/appliedenergistics2/recipes/**/*.recipe",
+            include(
-                    "assets/appliedenergistics2/recipes/README.html",
+                "assets/appliedenergistics2/recipes/**/*.recipe",
-                    "assets/appliedenergistics2/lang/*.lang",
+                "assets/appliedenergistics2/recipes/README.html",
-                    "assets/appliedenergistics2/textures/blocks/*",
+                "assets/appliedenergistics2/lang/*.lang",
-                    "assets/appliedenergistics2/textures/guis/*",
+                "assets/appliedenergistics2/textures/blocks/*",
-                    "assets/appliedenergistics2/textures/models/*",
+                "assets/appliedenergistics2/textures/guis/*",
-                    "assets/appliedenergistics2/textures/items/*",
+                "assets/appliedenergistics2/textures/models/*",
-                    "assets/appliedenergistics2/meta/*",
+                "assets/appliedenergistics2/textures/items/*",
-                    "mcmod.info",
+                "assets/appliedenergistics2/meta/*",
-                    "pack.mcmeta"
+                "mcmod.info",
+                "pack.mcmeta"
+            )
         }
     }
 }
 
 processResources {
-    // replace stuff in mcmod.info, nothing else
+    inputs.property "version", project.version
-    from(sourceSets.main.resources.srcDirs) {
+    inputs.property "mcversion", project.minecraft.version
-        include 'mcmod.info'
+
-        expand 'version': project.version, 'mcversion': minecraft_version
+    filesMatching('mcmod.info') {
+        expand 'version':project.version, 'mcversion':project.minecraft.version
     }
 }
+ 

gradle/scripts/dependencies.gradle

@@ -1,24 +1,3 @@
-
-/*
- * 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>.
- */
-
-
-
 repositories {
     mavenLocal()
 //    ChickenBones' maven repo is unavailable now...
@@ -30,36 +9,54 @@ repositories {
     maven {
         name "Mobius"
         url "http://mobiusstrip.eu/maven"
+        metadataSources {
+            artifact()
+        }  
     }
 
     maven {
         name = "Player"
         url = "http://maven.ic2.player.to/"
+        metadataSources {
+            artifact()
+        }  
     }
 
     maven {
         name = "Tterrag"
         url = "http://maven.tterrag.com/"
+        metadataSources {
+            artifact()
+        }  
     }
 
     maven {
         name "OpenComputers Repo"
         url = "http://maven.cil.li/"
+        metadataSources {
+            artifact()
+        }  
     }
 
     maven {
         name = "MM repo"
         url = "http://maven.k-4u.nl/"
+        metadataSources {
+            artifact()
+        }  
     }
 
     maven {
         name = "tilera"
-        url = "https://data.tilera.xyz/maven/"
+        url = "https://maven.tilera.xyz/"
     }
 
     ivy {
         name "BuildCraft"
         artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
+        metadataSources {
+            artifact()
+        }  
     }
 
     ivy {
@@ -67,6 +64,9 @@ repositories {
         layout "pattern", {
             artifact "[revision]/artifact/build/libs/[artifact]-0.9.3.[revision](-[classifier]).[ext]"
         }
+        metadataSources {
+            artifact()
+        }  
     }
 
 //  CurseForge DNS for TE is not available or I am just being unlucky, code part can stay since this is applicable to any other curseforge mod though
@@ -106,7 +106,7 @@ dependencies {
 //    mods "net.mcft.copy.betterstorage:BetterStorage:${minecraft_version}-${betterstorage_version}:deobf"
     mods "inventorytweaks:InventoryTweaks:${invtweaks_version}:deobf"
     mods "li.cil.oc:OpenComputers:MC${minecraft_version}-${opencomputers_version}:dev"
-    compile "logisticspipes:logisticspipes:${logisticspipes_build}:dev"
+    implementation "logisticspipes:logisticspipes:${logisticspipes_build}:dev"
 
 //    mods name: 'CoFHLib', version: "[${minecraft_version}]${cofhlib_version}-dev", ext: 'jar'
 //    mods name: 'CoFHCore', version: "[${minecraft_version}]${cofhcore_version}-dev", ext: 'jar'
@@ -122,27 +122,27 @@ dependencies {
     compileOnly files("lib/CodeChickenCore-${minecraft_version}-${code_chicken_core_version}-dev.jar")
     compileOnly files("lib/NotEnoughItems-${minecraft_version}-${nei_version}-dev.jar")
 
-    compile files("lib/buildcraft-${bc_version}-dev.jar")
+    implementation files("lib/buildcraft-${bc_version}-dev.jar")
-    compile files("lib/PneumaticCraft-${minecraft_version}-${pneumaticcraft_version}-api.jar")
+    implementation files("lib/PneumaticCraft-${minecraft_version}-${pneumaticcraft_version}-api.jar")
 
     // provided APIs
-    compile files("lib/OpenComputers-MC${minecraft_version}-${opencomputers_version}-api.jar")
+    implementation files("lib/OpenComputers-MC${minecraft_version}-${opencomputers_version}-api.jar")
-    compile files("lib/industrialcraft-2-${ic2_version}-experimental-api.jar")
+    implementation files("lib/industrialcraft-2-${ic2_version}-experimental-api.jar")
-    compile files("lib/BetterStorage-${minecraft_version}-${betterstorage_version}-api.jar")
+    implementation files("lib/BetterStorage-${minecraft_version}-${betterstorage_version}-api.jar")
 
     // self compiled APIs
-    compile "appeng:Waila:${waila_version}_${minecraft_version}:api"
+    implementation "appeng:Waila:${waila_version}_${minecraft_version}:api"
-    compile "appeng:RotaryCraft:${rotarycraft_version}:api"
+    implementation "appeng:RotaryCraft:${rotarycraft_version}:api"
-    compile "appeng:mekanism:${minecraft_version}-${mekansim_version}:api"
+    implementation "appeng:mekanism:${minecraft_version}-${mekansim_version}:api"
-    compile "appeng:InventoryTweaks:${invtweaks_version}:api"
+    implementation "appeng:InventoryTweaks:${invtweaks_version}:api"
 
     // self compiled stubs
-    compile(group: 'api', name: 'coloredlightscore', version: "${api_coloredlightscore_version}")
+    implementation(group: 'api', name: 'coloredlightscore', version: "${api_coloredlightscore_version}")
-    compile(group: 'api', name: 'craftguide', version: "${api_craftguide_version}")
+    implementation(group: 'api', name: 'craftguide', version: "${api_craftguide_version}")
-    compile(group: 'api', name: 'immibis', version: "${api_immibis_version}")
+    implementation(group: 'api', name: 'immibis', version: "${api_immibis_version}")
-    compile(group: 'api', name: 'mfr', version: "${api_mfr_version}")
+    implementation(group: 'api', name: 'mfr', version: "${api_mfr_version}")
-    compile(group: 'api', name: 'railcraft', version: "${api_railcraft_version}")
+    implementation(group: 'api', name: 'railcraft', version: "${api_railcraft_version}")
-    compile(group: 'api', name: 'rf', version: "${api_rf_version}")
+    implementation(group: 'api', name: 'rf', version: "${api_rf_version}")
 
-    testCompile "junit:junit:4.12"
+    testImplementation "junit:junit:4.12"
 }

gradle/scripts/optional.gradle

@@ -1,7 +1,3 @@
-task wrapper(type: Wrapper) {
-    gradleVersion = "2.4"
-}
-
 // WAILA
 task installWaila(type: Copy, dependsOn: "deinstallWaila") {
     from { configurations.mods }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip