Fixbuild (#6)

* update deps

* fix version

CODEOWNERS

@@ -0,0 +1,3 @@
+# Any Github changes require admin approval
+/.github/** @GTNewHorizons/admin
+

README.md

@@ -36,23 +36,23 @@ This mod removes that functionality and allows the player to use NEI's transfer
 - [x]  IndustrialCraft2
 - [x]  Avaritia
 - [x]  EnderIO 
-- [x]  Forestry(Doesn't support Fermenter and Still,because they don't have an item output)
+- [x]  Forestry (Doesn't support Fermenter and Still,because they don't have an item output)
 - [x]  Thaumcraft NEI Plugin
-- [x]  Thaumic Energistics(Allows you to transfer ArcaneRecipe from NEI to Knowledge Inscriber, it requires Thaumcraft NEI Plugin)
+- [x]  Thaumic Energistics (Allows you to transfer ArcaneRecipe from NEI to Knowledge Inscriber, it requires Thaumcraft NEI Plugin)
 - [x]  ThermalExpansion
 - [x]  ImmersiveEngineering
 - [x]  Mekanism
 - [x]  BloodMagic
 - [x]  BuildCraft
-- [x]  Avaritiaddons(auto extreme crafting table support)
+- [x]  Avaritiaddons (auto extreme crafting table support)
 - [x]  GT++
 
-If you want other Mod support,see [RecipeProcessor](./src/main/java/com/github/vfyjxf/nee/processor/RecipeProcessor.java) and [Mod support Issue](https://github.com/vfyjxf/NotEnoughEnergistics/issues/1)
+If you want other Mod support, see [RecipeProcessor](./src/main/java/com/github/vfyjxf/nee/processor/RecipeProcessor.java) and [Mod support Issue](https://github.com/vfyjxf/NotEnoughEnergistics/issues/1)
 
 ## TODO
 
-- [x]  Add item blackList ,if item in the blacklist, it will not be transferred.
+- [x]  Add item blackList, if item in the blacklist, it will not be transferred.
-- [x]  Add item  priority list, if item in tne priority list, it will be transferred first.
+- [x]  Add item priority list, if item in tne priority list, it will be transferred first.
 - [x]  Combine like stacks in processing patterns.
 
 ## Credits

build.gradle

@@ -1,4 +1,4 @@
-//version: 1642484596
+//version: 1644194279
 /*
 DO NOT CHANGE THIS FILE!
 
@@ -32,17 +32,24 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.5'
+        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
     }
 }
 
 plugins {
     id 'idea'
+    id 'eclipse'
     id 'scala'
-    id("org.ajoberstar.grgit") version("3.1.1")
+    id('org.jetbrains.kotlin.jvm') version ('1.6.10') apply false
-    id("com.github.johnrengelman.shadow") version("4.0.4")
+    id('org.ajoberstar.grgit') version('4.1.1')
-    id("com.palantir.git-version") version("0.12.3")
+    id('com.github.johnrengelman.shadow') version('4.0.4')
-    id("maven-publish")
+    id('com.palantir.git-version') version('0.13.0') apply false
+    id('de.undercouch.download') version('5.0.1')
+    id('maven-publish')
+}
+
+if (project.file('.git/HEAD').isFile()) {
+    apply plugin: 'com.palantir.git-version'
 }
 
 apply plugin: 'forge'
@@ -63,7 +70,7 @@ idea {
     }
 }
 
-if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
     throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
 }
 
@@ -92,53 +99,59 @@ boolean noPublishedSources = project.findProperty("noPublishedSources") ? projec
 
 String javaSourceDir = "src/main/java/"
 String scalaSourceDir = "src/main/scala/"
+String kotlinSourceDir = "src/main/kotlin/"
 
 String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
 String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
-if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists())) {
+String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/")
-    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
 }
 
-if (apiPackage) {
+if(apiPackage) {
     targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
     targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists())) {
+    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
     }
 }
 
-if (accessTransformersFile) {
+if(accessTransformersFile) {
     String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
-    if (!getFile(targetFile).exists()) {
+    if(!getFile(targetFile).exists()) {
         throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
     }
 }
 
-if (usesMixins.toBoolean()) {
+if(usesMixins.toBoolean()) {
-    if (mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
+    if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
         throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
     }
 
     targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
     targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists())) {
+    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala  + " or " + targetPackageKotlin)
     }
 
     String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
     String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala"
     String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
-    if (!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists())) {
+    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".kt"
-        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
+        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
     }
 }
 
-if (coreModClass) {
+if(coreModClass) {
     String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
     String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala"
     String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
-    if (!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists())) {
+    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".kt"
-        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
+        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
     }
 }
 
@@ -150,37 +163,92 @@ configurations.all {
     System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
 }
 
-version = minecraftVersion + "-" + modVersion
+// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
+try {
+    'git config core.fileMode false'.execute()
+}
+catch (Exception e) {
+    logger.error("\u001B[31mgit isn't installed at all\u001B[0m")
+}
+
+// Pulls version first from the VERSION env and then git tag
+String identifiedVersion
+String versionOverride = System.getenv("VERSION") ?: null
+try {
+    identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
+}
+catch (Exception e) {
+    logger.error("\n\u001B[1;31mThis mod must be version controlled by Git AND the repository must provide at least one tag,\n" +
+                 "or the VERSION override must be set! \u001B[32m(Don't download from GitHub using the ZIP option, instead\n" +
+                 "clone the repository, see\u001B[33m https://gtnh.miraheze.org/wiki/Development \u001B[32mfor details.)\u001B[0m\n");
+    versionOverride = 'NO-GIT-TAG-SET'
+    identifiedVersion = versionOverride
+}
+version = minecraftVersion + '-' + identifiedVersion
+String modVersion = identifiedVersion
+
+if( identifiedVersion.equals(versionOverride) ) {
+    logger.error('\u001B[31m\u001B[7mWe hope you know what you\'re doing using\u001B[0m\u001B[1;34m ' + modVersion + '\u001B[0m\n');
+    logger.error('\7\u001B[31mGoing to blindly try to use\u001B[1;34m ' + modVersion + '\u001B[0m\u001B[31m, this probably won\'t work the way you expect!!\u001B[0m\n');
+}
 
 group = modGroup
-if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
+if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
     archivesBaseName = customArchiveBaseName
-} else {
+}
+else {
     archivesBaseName = modId
 }
 
+
+def arguments = []
+def jvmArguments = []
+
+if(usesMixins.toBoolean()) {
+    arguments += [
+            "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+    ]
+    jvmArguments += [
+            "-Dmixin.debug.countInjections=true", "-Dmixin.debug.verbose=true", "-Dmixin.debug.export=true"
+    ]
+}
+
 minecraft {
     version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
     runDir = "run"
 
     if (replaceGradleTokenInFile) {
         replaceIn replaceGradleTokenInFile
-        if (gradleTokenModId) {
+        if(gradleTokenModId) {
             replace gradleTokenModId, modId
         }
-        if (gradleTokenModName) {
+        if(gradleTokenModName) {
             replace gradleTokenModName, modName
         }
-        if (gradleTokenVersion) {
+        if(gradleTokenVersion) {
             replace gradleTokenVersion, modVersion
         }
-        if (gradleTokenGroupName) {
+        if(gradleTokenGroupName) {
             replace gradleTokenGroupName, modGroup
         }
     }
+
+    clientIntellijRun {
+        args(arguments)
+        jvmArgs(jvmArguments)
+
+        if(developmentEnvironmentUserName) {
+            args("--username", developmentEnvironmentUserName)
+        }
+    }
+
+    serverIntellijRun {
+        args(arguments)
+        jvmArgs(jvmArguments)
+    }
 }
 
-if (file("addon.gradle").exists()) {
+if(file("addon.gradle").exists()) {
     apply from: "addon.gradle"
 }
 
@@ -197,7 +265,7 @@ repositories {
         name = "Overmind forge repo mirror"
         url = "https://gregtech.overminddl1.com/"
     }
-    if (usesMixins.toBoolean()) {
+    if(usesMixins.toBoolean()) {
         maven {
             name = "sponge"
             url = "https://repo.spongepowered.org/repository/maven-public"
@@ -209,7 +277,7 @@ repositories {
 }
 
 dependencies {
-    if (usesMixins.toBoolean()) {
+    if(usesMixins.toBoolean()) {
         annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
         annotationProcessor("com.google.guava:guava:24.1.1-jre")
         annotationProcessor("com.google.code.gson:gson:2.8.6")
@@ -234,7 +302,7 @@ def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfig
 def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
 
 task generateAssets {
-    if (usesMixins.toBoolean()) {
+    if(usesMixins.toBoolean()) {
         getFile("/src/main/resources/mixins." + modId + ".json").text = """{
   "required": true,
   "minVersion": "0.7.11",
@@ -281,20 +349,20 @@ jar {
         attributes(getManifestAttributes())
     }
 
-    if (usesShadowedDependencies.toBoolean()) {
+    if(usesShadowedDependencies.toBoolean()) {
         dependsOn(shadowJar)
         enabled = false
     }
 }
 
 reobf {
-    if (usesMixins.toBoolean()) {
+    if(usesMixins.toBoolean()) {
         addExtraSrgFile mixinSrg
     }
 }
 
 afterEvaluate {
-    if (usesMixins.toBoolean()) {
+    if(usesMixins.toBoolean()) {
         tasks.compileJava {
             options.compilerArgs += [
                     "-AreobfSrgFile=${tasks.reobf.srg}",
@@ -309,16 +377,7 @@ afterEvaluate {
 }
 
 runClient {
-    def arguments = []
+    if(developmentEnvironmentUserName) {
-
-    if (usesMixins.toBoolean()) {
-        arguments += [
-                "--mods=../build/libs/$modId-${version}.jar",
-                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
-        ]
-    }
-
-    if (developmentEnvironmentUserName) {
         arguments += [
                 "--username",
                 developmentEnvironmentUserName
@@ -326,19 +385,12 @@ runClient {
     }
 
     args(arguments)
+    jvmArgs(jvmArguments)
 }
 
 runServer {
-    def arguments = []
-
-    if (usesMixins.toBoolean()) {
-        arguments += [
-                "--mods=../build/libs/$modId-${version}.jar",
-                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
-        ]
-    }
-
     args(arguments)
+    jvmArgs(jvmArguments)
 }
 
 tasks.withType(JavaExec).configureEach {
@@ -350,59 +402,59 @@ tasks.withType(JavaExec).configureEach {
 }
 
 processResources
-        {
+{
-            // this will ensure that this task is redone when the versions change.
+    // this will ensure that this task is redone when the versions change.
-            inputs.property "version", version
+    inputs.property "version", project.version
-            inputs.property "mcversion", project.minecraft.version
+    inputs.property "mcversion", project.minecraft.version
+    
+    // replace stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
 
-            // replace stuff in mcmod.info, nothing else
+        // replace version and mcversion
-            from(sourceSets.main.resources.srcDirs) {
+        expand "minecraftVersion": project.minecraft.version,
-                include 'mcmod.info'
+            "modVersion": modVersion,
+            "modId": modId,
+            "modName": modName
+    }
 
-                // replace version and mcversion
+    if(usesMixins.toBoolean()) {
-                expand "minecraftVersion": project.minecraft.version,
+        from refMap
-                        "modVersion": version,
+    }
-                        "modId": modId,
-                        "modName": modName
-            }
 
-            if (usesMixins.toBoolean()) {
+    // copy everything else, thats not the mcmod.info
-                from refMap
+    from(sourceSets.main.resources.srcDirs) {
-            }
+        exclude 'mcmod.info'
-
+    }
-            // copy everything else, thats not the mcmod.info
+}
-            from(sourceSets.main.resources.srcDirs) {
-                exclude 'mcmod.info'
-            }
-        }
 
 def getManifestAttributes() {
     def manifestAttributes = [:]
-    if (!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
+    if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) {
         manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
     }
 
-    if (accessTransformersFile) {
+    if(accessTransformersFile) {
-        manifestAttributes += ["FMLAT": accessTransformersFile.toString()]
+        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
     }
 
-    if (coreModClass) {
+    if(coreModClass) {
         manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
     }
 
-    if (usesMixins.toBoolean()) {
+    if(usesMixins.toBoolean()) {
         manifestAttributes += [
-                "TweakClass"    : "org.spongepowered.asm.launch.MixinTweaker",
+                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
-                "MixinConfigs"  : "mixins." + modId + ".json",
+                "MixinConfigs" : "mixins." + modId + ".json",
-                "ForceLoadAsMod": !containsMixinsAndOrCoreModOnly.toBoolean()
+                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
         ]
     }
     return manifestAttributes
 }
 
 task sourcesJar(type: Jar) {
-    from(sourceSets.main.allJava)
+    from (sourceSets.main.allJava)
-    from(file("$projectDir/LICENSE"))
+    from (file("$projectDir/LICENSE"))
     getArchiveClassifier().set('sources')
 }
 
@@ -449,22 +501,22 @@ task devJar(type: Jar) {
         attributes(getManifestAttributes())
     }
 
-    if (usesShadowedDependencies.toBoolean()) {
+    if(usesShadowedDependencies.toBoolean()) {
         dependsOn(circularResolverJar)
         enabled = false
     }
 }
 
 task apiJar(type: Jar) {
-    from(sourceSets.main.allJava) {
+    from (sourceSets.main.allJava) {
         include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
     }
 
-    from(sourceSets.main.output) {
+    from (sourceSets.main.output) {
         include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
     }
 
-    from(sourceSets.main.resources.srcDirs) {
+    from (sourceSets.main.resources.srcDirs) {
         include("LICENSE")
     }
 
@@ -472,21 +524,30 @@ task apiJar(type: Jar) {
 }
 
 artifacts {
-    if (!noPublishedSources) {
+    if(!noPublishedSources) {
         archives sourcesJar
     }
     archives devJar
-    if (apiPackage) {
+    if(apiPackage) {
         archives apiJar
     }
 }
 
+// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID), 
+// and isn't strictly needed with the POM so just disable it.
+tasks.withType(GenerateModuleMetadata) {
+    enabled = false
+}
+
+
 // publishing
-/*
 publishing {
     publications {
         maven(MavenPublication) {
-            artifact source: usesShadowedDependencies.toBoolean() ? shadowJar : jar, classifier: ""
+            from components.java
+            if(usesShadowedDependencies.toBoolean()) {
+                artifact source: shadowJar, classifier: ""
+            }
             if(!noPublishedSources) {
                 artifact source: sourcesJar, classifier: "src"
             }
@@ -499,6 +560,18 @@ publishing {
             artifactId = System.getenv("ARTIFACT_ID") ?: project.name
             // Using the identified version, not project.version as it has the prepended 1.7.10
             version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
+            
+            // Remove all non GTNH deps here.
+            // Original intention was to remove an invalid forgeBin being generated without a groupId (mandatory), but
+            // it also removes all of the MC deps
+            pom.withXml {
+                Node pomNode = asNode()
+                pomNode.dependencies.'*'.findAll() {
+                    it.groupId.text() != 'com.github.GTNewHorizons'
+                }.each() {
+                    it.parent().remove(it)
+                }
+            }
         }
     }
 
@@ -513,10 +586,7 @@ publishing {
     }
 }
 
- */
-
 // Updating
-/*
 task updateBuildScript {
     doLast {
         if (performBuildScriptUpdate(projectDir.toString())) return
@@ -572,12 +642,76 @@ configure(updateBuildScript) {
     description = 'Updates the build script to the latest version'
 }
 
- */
+// Deobfuscation
+
+def deobf(String sourceURL) {
+    try {
+        URL url = new URL(sourceURL)
+        String fileName = url.getFile()
+
+        //get rid of directories:
+        int lastSlash = fileName.lastIndexOf("/")
+        if(lastSlash > 0) {
+            fileName = fileName.substring(lastSlash + 1)
+        }
+        //get rid of extension:
+        if(fileName.endsWith(".jar")) {
+            fileName = fileName.substring(0, fileName.lastIndexOf("."))
+        }
+
+        String hostName = url.getHost()
+        if(hostName.startsWith("www.")) {
+            hostName = hostName.substring(4)
+        }
+        List parts = Arrays.asList(hostName.split("\\."))
+        Collections.reverse(parts)
+        hostName = String.join(".", parts)
+
+        return deobf(sourceURL, hostName + "/" + fileName)
+    } catch(Exception e) {
+        return deobf(sourceURL, "deobf/" + String.valueOf(sourceURL.hashCode()))
+    }
+}
+
+// The method above is to be prefered. Use this method if the filename is not at the end of the URL.
+def deobf(String sourceURL, String fileName) {
+    String cacheDir = System.getProperty("user.home") + "/.gradle/caches/"
+    String bon2Dir = cacheDir + "forge_gradle/deobf"
+    String bon2File  = bon2Dir + "/BON2-2.5.0.jar"
+    String obfFile = cacheDir + "modules-2/files-2.1/" + fileName + ".jar"
+    String deobfFile = cacheDir + "modules-2/files-2.1/" + fileName + "-deobf.jar"
+    
+    if(file(deobfFile).exists()) {
+        return files(deobfFile)
+    }
+
+    download {
+        src 'https://github.com/GTNewHorizons/BON2/releases/download/2.5.0/BON2-2.5.0.CUSTOM-all.jar'
+        dest bon2File
+        quiet true
+        overwrite false
+    }
+
+    download {
+        src sourceURL
+        dest obfFile
+        quiet true
+        overwrite false
+    }
+
+    exec {
+        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', '1.7.10', '--mappingsVer', 'stable_12', '--notch'
+        workingDir bon2Dir
+        standardOutput = new ByteArrayOutputStream()
+    }
+
+    return files(deobfFile)
+}
 
 // Helper methods
 
 def checkPropertyExists(String propertyName) {
-    if (!project.hasProperty(propertyName)) {
+    if (project.hasProperty(propertyName) == false) {
         throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
     }
 }

dependencies.gradle

@@ -1,15 +1,15 @@
 dependencies {
-    compile("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-70-GTNH:dev")
+    compile("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-75-GTNH:dev")
-    compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.1:dev")
+    compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev")
     compile("com.github.GTNewHorizons:CodeChickenCore:1.1.3:dev")
-    compile("com.github.GTNewHorizons:NotEnoughItems:2.1.22-GTNH:dev")
+    compile("com.github.GTNewHorizons:NotEnoughItems:2.2.5-GTNH:dev")
 
-    compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.5.2-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.5.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:BuildCraftCompat:7.1.9:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.27:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.29:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:ForestryMC:4.4.4:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:ForestryMC:4.4.5:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.18:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.31:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.24:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.27:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.3.16-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.8.3:dev") { transitive = false }
     compileOnly("com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev") { transitive = false }

gradle.properties

@@ -17,7 +17,7 @@ autoUpdateBuildScript = false
 minecraftVersion = 1.7.10
 forgeVersion = 10.13.4.1614
 
-# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you
+# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
 # restart Minecraft in development. Choose this dependent on your mod:
 # Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
 # Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
@@ -25,7 +25,7 @@ developmentEnvironmentUserName = Developer
 
 # Define a source file of your project with:
 # public static final String VERSION = "GRADLETOKEN_VERSION";
-# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's
+# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
 # version in @Mod([...], version = VERSION, [...])
 # Leave these properties empty to skip individual token replacements
 replaceGradleTokenInFile = NotEnoughEnergistics.java
@@ -39,7 +39,7 @@ gradleTokenGroupName =
 # Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
 apiPackage =
 
-# Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/
+# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
 # Example value: mymodid_at.cfg
 accessTransformersFile = neenergistics_at.cfg
 

repositories.gradle

@@ -3,14 +3,14 @@ repositories {
         name "GTNH Maven"
         url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
     }
-    maven {
-        name "Curse Maven"
-        url "https://cursemaven.com"
-    }
     maven {
         name "OvermindDL1 Maven"
         url "http://gregtech.overminddl1.com/"
     }
+    maven {
+        name "Curse Maven"
+        url "https://cursemaven.com"
+    }
     maven {
         name "Jitpack"
         url "https://jitpack.io"

src/main/java/com/github/vfyjxf/nee/NotEnoughEnergistics.java

@@ -28,7 +28,7 @@ import java.io.File;
 public class NotEnoughEnergistics {
     public static final String MODID = "neenergistics";
     public static final String NAME = "NotEnoughEnergistics";
-    public static final String VERSION = "@VERSION@";
+    public static final String VERSION = "GRADLETOKEN_VERSION";
     public static final String DEPENDENCIES = "required-after:NotEnoughItems;required-after:appliedenergistics2;after:ae2wct";
     public static final String GUI_FACTORY = "com.github.vfyjxf.nee.config.NEEConfigGuiFactory";
     public static final Logger logger = LogManager.getLogger("NotEnoughEnergistics");