Underground fluid NEI (#20)

* Underground fluid NEI

* updateBuildScript

21 files changed, 685 insertions, 248 deletions

diff --git a/build.gradle b/build.gradle
index e182c451c6..ec6cfc966c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,9 @@
-//version: 1656760175
+//version: 1659365110
 /*
-DO NOT CHANGE THIS FILE!
-
-Also, you may replace this file at any time if there is an update available.
-Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
-*/
+ DO NOT CHANGE THIS FILE!
+ Also, you may replace this file at any time if there is an update available.
+ Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
+ */
 
 
 import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
@@ -21,6 +20,8 @@ import java.util.zip.ZipOutputStream
 
 buildscript {
     repositories {
+        mavenCentral()
+
         maven {
             name 'forge'
             url 'https://maven.minecraftforge.net'
@@ -42,7 +43,6 @@ buildscript {
         classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
     }
 }
-
 plugins {
     id 'java-library'
     id 'idea'
@@ -59,6 +59,13 @@ plugins {
     id 'com.github.gmazzo.buildconfig'   version '3.0.3'        apply false
     id "com.diffplug.spotless"           version "6.7.2"
 }
+verifySettingsGradle()
+
+dependencies {
+    implementation 'com.diffplug:blowdryer:1.6.0'
+}
+
+apply plugin: 'com.diffplug.blowdryer'
 
 if (project.file('.git/HEAD').isFile()) {
     apply plugin: 'com.palantir.git-version'
@@ -83,37 +90,7 @@ idea {
         downloadSources = true
     }
 }
-
-// Spotless autoformatter
-// See https://github.com/diffplug/spotless/tree/main/plugin-gradle
-// Can be locally toggled via spotless:off/spotless:on comments
-spotless {
-    encoding 'UTF-8'
-
-    format 'misc', {
-        target '.gitignore'
-
-        trimTrailingWhitespace()
-        indentWithSpaces(4)
-        endWithNewline()
-    }
-    java {
-        toggleOffOn()
-        importOrder()
-        removeUnusedImports()
-        palantirJavaFormat('1.1.0') // last version supporting jvm 8
-    }
-    kotlin {
-        toggleOffOn()
-        ktfmt('0.39')
-    }
-    groovyGradle {
-        toggleOffOn()
-        importOrder()
-        target '*.gradle'
-        greclipse('4.19.0') // last version supporting jvm 8
-    }
-}
+apply from: Blowdryer.file('spotless.gradle')
 
 if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
     throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
@@ -140,12 +117,11 @@ checkPropertyExists("containsMixinsAndOrCoreModOnly")
 checkPropertyExists("usesShadowedDependencies")
 checkPropertyExists("developmentEnvironmentUserName")
 
-boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
-boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean()
-String channel = project.findProperty('channel') ? project.channel : 'stable'
-String mappingsVersion = project.findProperty('mappingsVersion') ? project.mappingsVersion : '12'
-String remoteMappings = project.findProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/'
-
+boolean noPublishedSources = project.hasProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
+boolean usesMixinDebug = project.hasProperty('usesMixinDebug') ?: project.usesMixins.toBoolean()
+boolean forceEnableMixins = project.hasProperty('forceEnableMixins') ? project.forceEnableMixins.toBoolean() : false
+String channel = project.hasProperty('channel') ? project.channel : 'stable'
+String mappingsVersion = project.hasProperty('mappingsVersion') ? project.mappingsVersion : '12'
 String javaSourceDir = "src/main/java/"
 String scalaSourceDir = "src/main/scala/"
 String kotlinSourceDir = "src/main/kotlin/"
@@ -228,10 +204,10 @@ try {
 }
 catch (Exception ignored) {
     out.style(Style.Failure).text(
-        'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' +
-        'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' +
-        'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)'
-    )
+            'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' +
+            'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' +
+            'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)'
+            )
     versionOverride = 'NO-GIT-TAG-SET'
     identifiedVersion = versionOverride
 }
@@ -255,7 +231,7 @@ else {
 def arguments = []
 def jvmArguments = []
 
-if (usesMixins.toBoolean()) {
+if (usesMixins.toBoolean() || forceEnableMixins) {
     arguments += [
         "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
     ]
@@ -320,7 +296,7 @@ repositories {
         name 'Overmind forge repo mirror'
         url 'https://gregtech.overminddl1.com/'
     }
-    if(usesMixins.toBoolean()) {
+    if(usesMixins.toBoolean() || forceEnableMixins) {
         maven {
             name 'sponge'
             url 'https://repo.spongepowered.org/repository/maven-public'
@@ -337,6 +313,8 @@ dependencies {
         annotationProcessor('com.google.guava:guava:24.1.1-jre')
         annotationProcessor('com.google.code.gson:gson:2.8.6')
         annotationProcessor('org.spongepowered:mixin:0.8-SNAPSHOT')
+    }
+    if(usesMixins.toBoolean() || forceEnableMixins) {
         // using 0.8 to workaround a issue in 0.7 which fails mixin application
         compile('com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH') {
             // Mixin includes a lot of dependencies that are too up-to-date
@@ -394,7 +372,10 @@ shadowJar {
     }
 
     minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+    configurations = [
+        project.configurations.shadowImplementation,
+        project.configurations.shadowCompile
+    ]
     dependsOn(relocateShadowJar)
 }
 
@@ -425,12 +406,12 @@ afterEvaluate {
     if(usesMixins.toBoolean()) {
         tasks.compileJava {
             options.compilerArgs += [
-                    "-AreobfSrgFile=${tasks.reobf.srg}",
-                    "-AoutSrgFile=${mixinSrg}",
-                    "-AoutRefMapFile=${refMap}",
-                    // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
-                    "-XDenableSunApiLintControl",
-                    "-XDignore.symbol.file"
+                "-AreobfSrgFile=${tasks.reobf.srg}",
+                "-AoutSrgFile=${mixinSrg}",
+                "-AoutRefMapFile=${refMap}",
+                // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
+                "-XDenableSunApiLintControl",
+                "-XDignore.symbol.file"
             ]
         }
     }
@@ -439,8 +420,8 @@ afterEvaluate {
 runClient {
     if(developmentEnvironmentUserName) {
         arguments += [
-                "--username",
-                developmentEnvironmentUserName
+            "--username",
+            developmentEnvironmentUserName
         ]
     }
 
@@ -458,13 +439,14 @@ tasks.withType(JavaExec).configureEach {
             javaToolchains.launcherFor {
                 languageVersion = projectJavaVersion
             }
-    )
+            )
 }
 
 processResources {
     // this will ensure that this task is redone when the versions change.
     inputs.property "version", project.version
     inputs.property "mcversion", project.minecraft.version
+    exclude("spotless.gradle")
 
     // replace stuff in mcmod.info, nothing else
     from(sourceSets.main.resources.srcDirs) {
@@ -472,9 +454,9 @@ processResources {
 
         // replace modVersion and minecraftVersion
         expand "minecraftVersion": project.minecraft.version,
-            "modVersion": modVersion,
-            "modId": modId,
-            "modName": modName
+        "modVersion": modVersion,
+        "modId": modId,
+        "modName": modName
     }
 
     if(usesMixins.toBoolean()) {
@@ -484,6 +466,7 @@ processResources {
     // copy everything else that's not the mcmod.info
     from(sourceSets.main.resources.srcDirs) {
         exclude 'mcmod.info'
+        exclude 'spotless.gradle'
     }
 }
 
@@ -503,9 +486,9 @@ def getManifestAttributes() {
 
     if(usesMixins.toBoolean()) {
         manifestAttributes += [
-                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
-                "MixinConfigs" : "mixins." + modId + ".json",
-                "ForceLoadAsMod" : !containsMixinsAndOrCoreModOnly.toBoolean()
+            "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
+            "MixinConfigs" : "mixins." + modId + ".json",
+            "ForceLoadAsMod" : !containsMixinsAndOrCoreModOnly.toBoolean()
         ]
     }
     return manifestAttributes
@@ -532,7 +515,10 @@ task shadowDevJar(type: ShadowJar) {
     }
 
     minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+    configurations = [
+        project.configurations.shadowImplementation,
+        project.configurations.shadowCompile
+    ]
 }
 
 task relocateShadowDevJar(type: ConfigureShadowRelocation) {
@@ -624,7 +610,10 @@ publishing {
             // remove extra garbage from minecraft and minecraftDeps configuration
             pom.withXml {
                 def badArtifacts = [:].withDefault {[] as Set<String>}
-                for (configuration in [projectConfigs.minecraft, projectConfigs.minecraftDeps]) {
+                for (configuration in [
+                            projectConfigs.minecraft,
+                            projectConfigs.minecraftDeps
+                        ]) {
                     for (dependency in configuration.allDependencies) {
                         badArtifacts[dependency.group == null ? "" : dependency.group] += dependency.name
                     }
@@ -658,7 +647,7 @@ task updateBuildScript {
     doLast {
         if (performBuildScriptUpdate(projectDir.toString())) return
 
-        print("Build script already up-to-date!")
+            print("Build script already up-to-date!")
     }
 }
 
@@ -673,12 +662,26 @@ if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
 static URL availableBuildScriptUrl() {
     new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
 }
+static URL exampleSettingsGradleUrl() {
+    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/settings.gradle.example")
+}
+
+
+def verifySettingsGradle() {
+    def settingsFile = getFile("settings.gradle")
+    if (!settingsFile.exists()) {
+        println("Downloading default settings.gradle")
+        exampleSettingsGradleUrl().withInputStream { i -> settingsFile.withOutputStream { it << i } }
+        throw new GradleException("Settings.gradle has been updated, please re-run task.")
+    }
+}
 
 boolean performBuildScriptUpdate(String projectDir) {
     if (isNewBuildScriptVersionAvailable(projectDir)) {
         def buildscriptFile = getFile("build.gradle")
         availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
         out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
+        verifySettingsGradle()
         return true
     }
     return false
@@ -739,194 +742,195 @@ task deobfParams {
         }
 
         out.style(Style.Success).println("Modified ${replaceParams(file("$projectDir/src/main/java"), params)} files!")
-        out.style(Style.Failure).println("Don't forget to verify that the code still works as before!\n It could be broken due to duplicate variables existing now\n or parameters taking priority over other variables.")
-    }
+    out.style(Style.Failure).println("Don't forget to verify that the code still works as before!\n It could be broken due to duplicate variables existing now\n or parameters taking priority over other variables.")
+}
 }
 
 static int replaceParams(File file, Map<String, String> params) {
-    int fileCount = 0
+int fileCount = 0
 
-    if(file.isDirectory()) {
-        for(File f : file.listFiles()) {
-            fileCount += replaceParams(f, params)
-        }
-        return fileCount
-    }
-    println("Visiting ${file.getName()} ...")
-    try {
-        String content = new String(Files.readAllBytes(file.toPath()))
-        int hash = content.hashCode()
-        params.forEach{key, value ->
-            content = content.replaceAll(key, value)
-        }
-        if(hash != content.hashCode()) {
-            Files.write(file.toPath(), content.getBytes("UTF-8"))
-            return 1
-        }
-    } catch(Exception e) {
-        e.printStackTrace()
+if(file.isDirectory()) {
+    for(File f : file.listFiles()) {
+        fileCount += replaceParams(f, params)
     }
-    return 0
+    return fileCount
+}
+println("Visiting ${file.getName()} ...")
+try {
+    String content = new String(Files.readAllBytes(file.toPath()))
+    int hash = content.hashCode()
+    params.forEach{key, value ->
+        content = content.replaceAll(key, value)
+    }
+    if(hash != content.hashCode()) {
+        Files.write(file.toPath(), content.getBytes("UTF-8"))
+        return 1
+    }
+} catch(Exception e) {
+    e.printStackTrace()
+}
+return 0
 }
 
 // Credit: bitsnaps (https://gist.github.com/bitsnaps/00947f2dce66f4bbdabc67d7e7b33681)
 static unzip(String zipFileName, String outputDir) {
-    byte[] buffer = new byte[16384]
-    ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFileName))
-    ZipEntry zipEntry = zis.getNextEntry()
-    while (zipEntry != null) {
-         File newFile = new File(outputDir + File.separator, zipEntry.name)
-         if (zipEntry.isDirectory()) {
-             if (!newFile.isDirectory() && !newFile.mkdirs()) {
-                 throw new IOException("Failed to create directory $newFile")
-             }
-         } else {
-             // fix for Windows-created archives
-             File parent = newFile.parentFile
-             if (!parent.isDirectory() && !parent.mkdirs()) {
-                 throw new IOException("Failed to create directory $parent")
-             }
-             // write file content
-             FileOutputStream fos = new FileOutputStream(newFile)
-             int len = 0
-             while ((len = zis.read(buffer)) > 0) {
-                 fos.write(buffer, 0, len)
-             }
-             fos.close()
-         }
-     zipEntry = zis.getNextEntry()
-     }
-    zis.closeEntry()
-    zis.close()
+byte[] buffer = new byte[16384]
+ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFileName))
+ZipEntry zipEntry = zis.getNextEntry()
+while (zipEntry != null) {
+    File newFile = new File(outputDir + File.separator, zipEntry.name)
+    if (zipEntry.isDirectory()) {
+        if (!newFile.isDirectory() && !newFile.mkdirs()) {
+            throw new IOException("Failed to create directory $newFile")
+        }
+    } else {
+        // fix for Windows-created archives
+        File parent = newFile.parentFile
+        if (!parent.isDirectory() && !parent.mkdirs()) {
+            throw new IOException("Failed to create directory $parent")
+        }
+        // write file content
+        FileOutputStream fos = new FileOutputStream(newFile)
+        int len = 0
+        while ((len = zis.read(buffer)) > 0) {
+            fos.write(buffer, 0, len)
+        }
+        fos.close()
+    }
+    zipEntry = zis.getNextEntry()
+}
+zis.closeEntry()
+zis.close()
 }
 
 configure(deobfParams) {
-    group = 'forgegradle'
-    description = 'Rename all obfuscated parameter names inherited from Minecraft classes'
+group = 'forgegradle'
+description = 'Rename all obfuscated parameter names inherited from Minecraft classes'
 }
 
 // Dependency 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.endsWith(".litemod")) {
-            fileName = fileName.substring(0, fileName.lastIndexOf("."))
-        }
+try {
+    URL url = new URL(sourceURL)
+    String fileName = url.getFile()
 
-        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)
+    //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.endsWith(".litemod")) {
+        fileName = fileName.substring(0, fileName.lastIndexOf("."))
+    }
 
-        return deobf(sourceURL, "$hostName/$fileName")
-    } catch(Exception e) {
-        return deobf(sourceURL, "deobf/${sourceURL.hashCode()}")
+    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/${sourceURL.hashCode()}")
+}
 }
 
 // The method above is to be preferred. Use this method if the filename is not at the end of the URL.
 def deobf(String sourceURL, String rawFileName) {
-    String bon2Version = "2.5.1"
-    String fileName = URLDecoder.decode(rawFileName, "UTF-8")
-    String cacheDir = "$project.gradle.gradleUserHomeDir/caches"
-    String bon2Dir = "$cacheDir/forge_gradle/deobf"
-    String bon2File = "$bon2Dir/BON2-${bon2Version}.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)
-    }
+String bon2Version = "2.5.1"
+String fileName = URLDecoder.decode(rawFileName, "UTF-8")
+String cacheDir = "$project.gradle.gradleUserHomeDir/caches"
+String bon2Dir = "$cacheDir/forge_gradle/deobf"
+String bon2File = "$bon2Dir/BON2-${bon2Version}.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)
+}
 
-    String mappingsVer
-    if(remoteMappings) {
-        String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion"
-        String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip"
+String mappingsVer
+String remoteMappings = project.hasProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/'
+if(remoteMappings) {
+    String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion"
+    String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip"
 
-        zipMappings(mappingsZIP, remoteMappings, bon2Dir)
+    zipMappings(mappingsZIP, remoteMappings, bon2Dir)
 
-        mappingsVer = "snapshot_$id"
-    } else {
-        mappingsVer = "${channel}_$mappingsVersion"
-    }
+    mappingsVer = "snapshot_$id"
+} else {
+    mappingsVer = "${channel}_$mappingsVersion"
+}
 
-    download.run {
-        src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
-        dest bon2File
-        quiet true
-        overwrite false
-    }
+download.run {
+    src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
+    dest bon2File
+    quiet true
+    overwrite false
+}
 
-    download.run {
-        src sourceURL
-        dest obfFile
-        quiet true
-        overwrite false
-    }
+download.run {
+    src sourceURL
+    dest obfFile
+    quiet true
+    overwrite false
+}
 
-    exec {
-        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
-        workingDir bon2Dir
-        standardOutput = new FileOutputStream("${deobfFile}.log")
-    }
+exec {
+    commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
+    workingDir bon2Dir
+    standardOutput = new FileOutputStream("${deobfFile}.log")
+}
 
-    return files(deobfFile)
+return files(deobfFile)
 }
 
 def zipMappings(String zipPath, String url, String bon2Dir) {
-    File zipFile = new File(zipPath)
-    if(zipFile.exists()) {
-        return
-    }
+File zipFile = new File(zipPath)
+if(zipFile.exists()) {
+    return
+}
 
-    String fieldsCache = "$bon2Dir/data/fields.csv"
-    String methodsCache = "$bon2Dir/data/methods.csv"
+String fieldsCache = "$bon2Dir/data/fields.csv"
+String methodsCache = "$bon2Dir/data/methods.csv"
 
-    download.run {
-        src "${url}fields.csv"
-        dest fieldsCache
-        quiet true
-    }
-    download.run {
-        src "${url}methods.csv"
-        dest methodsCache
-        quiet true
-    }
+download.run {
+    src "${url}fields.csv"
+    dest fieldsCache
+    quiet true
+}
+download.run {
+    src "${url}methods.csv"
+    dest methodsCache
+    quiet true
+}
 
-    zipFile.getParentFile().mkdirs()
-    ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))
+zipFile.getParentFile().mkdirs()
+ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))
 
-    zos.putNextEntry(new ZipEntry("fields.csv"))
-    Files.copy(Paths.get(fieldsCache), zos)
-    zos.closeEntry()
+zos.putNextEntry(new ZipEntry("fields.csv"))
+Files.copy(Paths.get(fieldsCache), zos)
+zos.closeEntry()
 
-    zos.putNextEntry(new ZipEntry("methods.csv"))
-    Files.copy(Paths.get(methodsCache), zos)
-    zos.closeEntry()
+zos.putNextEntry(new ZipEntry("methods.csv"))
+Files.copy(Paths.get(methodsCache), zos)
+zos.closeEntry()
 
-    zos.close()
+zos.close()
 }
 
 // Helper methods
 
 def checkPropertyExists(String propertyName) {
-    if (!project.hasProperty(propertyName)) {
-        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")
-    }
+if (!project.hasProperty(propertyName)) {
+    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")
+}
 }
 
 def getFile(String relativePath) {
-    return new File(projectDir, relativePath)
+return new File(projectDir, relativePath)
 }
diff --git a/dependencies.gradle b/dependencies.gradle
index a94333541e..18093d7d3d 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,10 +1,10 @@
 // Add your dependencies here
 
 dependencies {
-	compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.39:dev')
-	compile('com.github.GTNewHorizons:NotEnoughItems:2.2.19-GTNH:dev')
+    compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.39:dev')
+    compile('com.github.GTNewHorizons:NotEnoughItems:2.2.19-GTNH:dev')
 
-	compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
+    compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
 
-	compileOnly('com.opencsv:opencsv:4.0')
+    compileOnly('com.opencsv:opencsv:4.0')
 }
diff --git a/repositories.gradle b/repositories.gradle
index f67e7c627d..e850975183 100644
--- a/repositories.gradle
+++ b/repositories.gradle
@@ -1,22 +1,22 @@
 // Add any additional repositiroes for your dependencies here
 
 repositories {
-	maven {
-		name 'GTNH Maven'
-		url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
-	}
-	maven {
-		name 'ic2'
-		url 'http://maven.ic2.player.to/'
-		metadataSources {
-			mavenPom()
-			artifact()
-		}
-	}
-	maven {
-		url 'https://cursemaven.com'
-		content {
-			includeGroup 'curse.maven'
-		}
-	}
+    maven {
+        name 'GTNH Maven'
+        url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
+    }
+    maven {
+        name 'ic2'
+        url 'http://maven.ic2.player.to/'
+        metadataSources {
+            mavenPom()
+            artifact()
+        }
+    }
+    maven {
+        url 'https://cursemaven.com'
+        content {
+            includeGroup 'curse.maven'
+        }
+    }
 }
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000000..97d8f71c52
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,10 @@
+plugins {
+    id 'com.diffplug.blowdryerSetup' version '1.6.0'
+}
+
+apply plugin: 'com.diffplug.blowdryerSetup'
+
+blowdryerSetup {
+    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.1.4')
+    //devLocal '.' // Use this when testing config updates locally
+}
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
index 55a8680555..9876e07276 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
@@ -11,9 +11,11 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import pers.gwyog.gtneioreplugin.plugin.IMCForNEI;
 import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks;
 import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper;
 import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper;
+import pers.gwyog.gtneioreplugin.util.GT5UndergroundFluidHelper;
 import pers.gwyog.gtneioreplugin.util.GuiRecipeHelper;
 
 @Mod(
@@ -75,6 +77,7 @@ public class GTNEIOrePlugin {
     @EventHandler
     public void init(FMLInitializationEvent event) {
         ModBlocks.init();
+        IMCForNEI.IMCSender();
     }
 
     @EventHandler
@@ -82,6 +85,7 @@ public class GTNEIOrePlugin {
         if (event.getSide() == Side.CLIENT) {
             new GT5OreLayerHelper();
             new GT5OreSmallHelper();
+            new GT5UndergroundFluidHelper();
             new GuiRecipeHelper();
             if (csv) {
                 new pers.gwyog.gtneioreplugin.util.CSVMaker().run();
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/IMCForNEI.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/IMCForNEI.java
new file mode 100644
index 0000000000..bcba2eed1a
--- /dev/null
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/IMCForNEI.java
@@ -0,0 +1,57 @@
+package pers.gwyog.gtneioreplugin.plugin;
+
+import cpw.mods.fml.common.event.FMLInterModComms;
+import net.minecraft.nbt.NBTTagCompound;
+import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
+
+public class IMCForNEI {
+    public static void IMCSender() {
+        // Though these 2 are already registered in NEI jar, we need to re-register
+        // because new DimensionDisplayItems made tabs a bit taller.
+        sendHandler("pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5VeinStat", "gregtech:gt.blockores:386");
+
+        sendHandler("pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5SmallOreStat", "gregtech:gt.blockores:85");
+
+        sendHandler(
+                "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
+                "gregtech:gt.metaitem.01:32619");
+        sendCatalyst(
+                "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
+                "gregtech:gt.blockmachines:1157");
+        sendCatalyst(
+                "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
+                "gregtech:gt.blockmachines:141");
+        sendCatalyst(
+                "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
+                "gregtech:gt.blockmachines:142");
+        sendCatalyst(
+                "pers.gwyog.gtneioreplugin.plugin.gregtech5.PluginGT5UndergroundFluid",
+                "gregtech:gt.blockmachines:148");
+    }
+
+    private static void sendHandler(String name, String itemStack) {
+        NBTTagCompound aNBT = new NBTTagCompound();
+        aNBT.setString("handler", name);
+        aNBT.setString("modName", GTNEIOrePlugin.NAME);
+        aNBT.setString("modId", GTNEIOrePlugin.MODID);
+        aNBT.setBoolean("modRequired", true);
+        aNBT.setString("itemName", itemStack);
+        aNBT.setInteger("handlerHeight", 160);
+        aNBT.setInteger("handlerWidth", 166);
+        aNBT.setInteger("maxRecipesPerPage", 2);
+        aNBT.setInteger("yShift", 0);
+        FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
+    }
+
+    private static void sendCatalyst(String name, String itemStack, int priority) {
+        NBTTagCompound aNBT = new NBTTagCompound();
+        aNBT.setString("handlerID", name);
+        aNBT.setString("itemName", itemStack);
+        aNBT.setInteger("priority", priority);
+        FMLInterModComms.sendMessage("NotEnoughItems", "registerCatalystInfo", aNBT);
+    }
+
+    private static void sendCatalyst(String name, String itemStack) {
+        sendCatalyst(name, itemStack, 0);
+    }
+}
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java
index ee76cff2d2..17193b07fe 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/NEIPluginConfig.java
@@ -4,6 +4,7 @@ impor