Fix behavior on Enchanter NEI while holding shift (#88)

* Update buildscript & NEI version

* Add Fertilized Dirt from RandomThings to recognized farmland list for CustomSeedFarmer

.gitattributes

@@ -0,0 +1,45 @@
+* text eol=lf
+
+*.[jJ][aA][rR]          binary
+
+*.[pP][nN][gG]          binary
+*.[jJ][pP][gG]          binary
+*.[jJ][pP][eE][gG]      binary
+*.[gG][iI][fF]          binary
+*.[tT][iI][fF]          binary
+*.[tT][iI][fF][fF]      binary
+*.[iI][cC][oO]          binary
+*.[sS][vV][gG]          text
+*.[eE][pP][sS]          binary
+*.[xX][cC][fF]          binary
+
+*.[kK][aA][rR]          binary
+*.[mM]4[aA]             binary
+*.[mM][iI][dD]          binary
+*.[mM][iI][dD][iI]      binary
+*.[mM][pP]3             binary
+*.[oO][gG][gG]          binary
+*.[rR][aA]              binary
+
+*.7[zZ]                 binary
+*.[gG][zZ]              binary
+*.[tT][aA][rR]          binary
+*.[tT][gG][zZ]          binary
+*.[zZ][iI][pP]          binary
+
+*.[tT][cC][nN]          binary
+*.[sS][oO]              binary
+*.[dD][lL][lL]          binary
+*.[dD][yY][lL][iI][bB]  binary
+*.[pP][sS][dD]          binary
+*.[tT][tT][fF]          binary
+*.[oO][tT][fF]          binary
+*.[nN][bB][tT]          binary
+
+*.[pP][aA][tT][cC][hH]  -text
+
+*.[bB][aA][tT]          text eol=crlf
+*.[cC][mM][dD]          text eol=crlf
+*.[pP][sS]1             text eol=crlf
+
+*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary

README.md

@@ -8,11 +8,11 @@ Issues can be reported to the [GTNH tracker](https://github.com/GTNewHorizons/GT
 All code (excluding the bundled APIs from other mods, which are covered by their respective licenses) were released without restriction into the public domain under the CC0 1.0 license (http://creativecommons.org/publicdomain/zero/1.0/legalcode) FAQ (https://wiki.creativecommons.org/CC0_FAQ).
 Do what you want with it, as long as you smile while doing so.
 
-###GTNH Modifications:
+### GTNH Modifications:
 
 LGPL v3.0 or later. Feel free to use our changes, just give back any changes you make to the community as well!
 
-###Sound Credits
+### Sound Credits
 
 Most sound attributed under Creative Commons Attribution 3.0 Unported (CC BY 3.0)
 

build.gradle

@@ -1,13 +1,17 @@
-//version: 1658080040
+//version: 1671313514
 /*
  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.
+ Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/master/build.gradle for updates.
  */
 
 
 import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import com.matthewprenger.cursegradle.CurseArtifact
+import com.matthewprenger.cursegradle.CurseRelation
+import com.modrinth.minotaur.dependencies.ModDependency
+import com.modrinth.minotaur.dependencies.VersionDependency
 import org.gradle.internal.logging.text.StyledTextOutput.Style
 import org.gradle.internal.logging.text.StyledTextOutputFactory
 
@@ -26,6 +30,11 @@ buildscript {
             name 'forge'
             url 'https://maven.minecraftforge.net'
         }
+        maven {
+            // GTNH ForgeGradle and ASM Fork
+            name = "GTNH Maven"
+            url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+        }
         maven {
             name 'sonatype'
             url 'https://oss.sonatype.org/content/repositories/snapshots/'
@@ -34,32 +43,35 @@ buildscript {
             name 'Scala CI dependencies'
             url 'https://repo1.maven.org/maven2/'
         }
-        maven {
-            name 'jitpack'
-            url 'https://jitpack.io'
-        }
     }
     dependencies {
-        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
+        //Overwrite the current ASM version to fix shading newer than java 8 applicatations.
+        classpath 'org.ow2.asm:asm-debug-all-custom:5.0.3'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.13'
     }
 }
-
 plugins {
     id 'java-library'
     id 'idea'
     id 'eclipse'
     id 'scala'
     id 'maven-publish'
-    id 'org.jetbrains.kotlin.jvm'        version '1.5.30'       apply false
-    id 'org.jetbrains.kotlin.kapt'       version '1.5.30'       apply false
-    id 'com.google.devtools.ksp'         version '1.5.30-1.0.0' apply false
-    id 'org.ajoberstar.grgit'            version '4.1.1'
+    id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
+    id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false
+    id 'com.google.devtools.ksp' version '1.5.30-1.0.0' apply false
+    id 'org.ajoberstar.grgit' version '4.1.1'
     id 'com.github.johnrengelman.shadow' version '4.0.4'
-    id 'com.palantir.git-version'        version '0.13.0'       apply false
-    id 'de.undercouch.download'          version '5.0.1'
-    id 'com.github.gmazzo.buildconfig'   version '3.0.3'        apply false
-    id "com.diffplug.spotless"           version "6.7.2"
+    id 'com.palantir.git-version' version '0.13.0' apply false
+    id 'de.undercouch.download' version '5.0.1'
+    id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false
+    id 'com.diffplug.spotless' version '6.7.2' apply false
+    id 'com.modrinth.minotaur' version '2.+' apply false
+    id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
 }
+boolean settingsupdated = verifySettingsGradle()
+settingsupdated = verifyGitAttributes() || settingsupdated
+if (settingsupdated)
+    throw new GradleException("Settings has been updated, please re-run task.")
 
 dependencies {
     implementation 'com.diffplug:blowdryer:1.6.0'
@@ -90,9 +102,15 @@ idea {
         downloadSources = true
     }
 }
-apply from: Blowdryer.file('spotless.gradle')
 
-if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
+boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false
+
+if (!disableSpotless) {
+    apply plugin: 'com.diffplug.spotless'
+    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())
 }
 
@@ -117,67 +135,79 @@ checkPropertyExists("containsMixinsAndOrCoreModOnly")
 checkPropertyExists("usesShadowedDependencies")
 checkPropertyExists("developmentEnvironmentUserName")
 
-boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
-boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean()
-boolean forceEnableMixins = project.findProperty('forceEnableMixins') ? project.forceEnableMixins.toBoolean() : false
-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/'
+propertyDefaultIfUnset("noPublishedSources", false)
+propertyDefaultIfUnset("usesMixinDebug", project.usesMixins)
+propertyDefaultIfUnset("forceEnableMixins", false)
+propertyDefaultIfUnset("channel", "stable")
+propertyDefaultIfUnset("mappingsVersion", "12")
+propertyDefaultIfUnset("modrinthProjectId", "")
+propertyDefaultIfUnset("modrinthRelations", "")
+propertyDefaultIfUnset("curseForgeProjectId", "")
+propertyDefaultIfUnset("curseForgeRelations", "")
 
 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("\\.", "/")
-String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/")
-if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+
+final String modGroupPath = modGroup.toString().replaceAll("\\.", "/")
+final String apiPackagePath = apiPackage.toString().replaceAll("\\.", "/")
+
+String targetPackageJava = javaSourceDir + modGroupPath
+String targetPackageScala = scalaSourceDir + modGroupPath
+String targetPackageKotlin = kotlinSourceDir + modGroupPath
+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) {
-    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+if (apiPackage) {
+    targetPackageJava = javaSourceDir + modGroupPath + "/" + apiPackagePath
+    targetPackageScala = scalaSourceDir + modGroupPath + "/" + apiPackagePath
+    targetPackageKotlin = kotlinSourceDir + modGroupPath + "/" + apiPackagePath
+    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(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
-        throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
+if (usesMixins.toBoolean()) {
+    if (mixinsPackage.isEmpty()) {
+        throw new GradleException("\"usesMixins\" requires \"mixinsPackage\" to be set!")
+    }
+    final String mixinPackagePath = mixinsPackage.toString().replaceAll("\\.", "/")
+    final String mixinPluginPath = mixinPlugin.toString().replaceAll("\\.", "/")
+
+    targetPackageJava = javaSourceDir + modGroupPath + "/" + mixinPackagePath
+    targetPackageScala = scalaSourceDir + modGroupPath + "/" + mixinPackagePath
+    targetPackageKotlin = kotlinSourceDir + modGroupPath + "/" + mixinPackagePath
+    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)
     }
 
-    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    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"
-    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".kt"
-    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 (!mixinPlugin.isEmpty()) {
+        String targetFileJava = javaSourceDir + modGroupPath + "/" + mixinPluginPath + ".java"
+        String targetFileScala = scalaSourceDir + modGroupPath + "/" + mixinPluginPath + ".scala"
+        String targetFileScalaJava = scalaSourceDir + modGroupPath + "/" + mixinPluginPath + ".java"
+        String targetFileKotlin = kotlinSourceDir + modGroupPath + "/" + mixinPluginPath + ".kt"
+        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) {
-    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"
-    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".kt"
-    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
+if (coreModClass) {
+    final String coreModPath = coreModClass.toString().replaceAll("\\.", "/")
+    String targetFileJava = javaSourceDir + modGroupPath + "/" + coreModPath + ".java"
+    String targetFileScala = scalaSourceDir + modGroupPath + "/" + coreModPath + ".scala"
+    String targetFileScalaJava = scalaSourceDir + modGroupPath + "/" + coreModPath + ".java"
+    String targetFileKotlin = kotlinSourceDir + modGroupPath + "/" + coreModPath + ".kt"
+    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)
     }
 }
@@ -218,22 +248,21 @@ ext {
     modVersion = identifiedVersion
 }
 
-if(identifiedVersion == versionOverride) {
+if (identifiedVersion == versionOverride) {
     out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
 }
 
 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() || forceEnableMixins) {
+if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
     arguments += [
         "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
     ]
@@ -251,17 +280,19 @@ minecraft {
     runDir = 'run'
 
     if (replaceGradleTokenInFile) {
-        replaceIn replaceGradleTokenInFile
-        if(gradleTokenModId) {
+        for (f in replaceGradleTokenInFile.split(',')) {
+            replaceIn f
+        }
+        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
         }
     }
@@ -270,7 +301,7 @@ minecraft {
         args(arguments)
         jvmArgs(jvmArguments)
 
-        if(developmentEnvironmentUserName) {
+        if (developmentEnvironmentUserName) {
             args("--username", developmentEnvironmentUserName)
         }
     }
@@ -281,7 +312,7 @@ minecraft {
     }
 }
 
-if(file('addon.gradle').exists()) {
+if (file('addon.gradle').exists()) {
     apply from: 'addon.gradle'
 }
 
@@ -298,35 +329,32 @@ repositories {
         name 'Overmind forge repo mirror'
         url 'https://gregtech.overminddl1.com/'
     }
-    if(usesMixins.toBoolean() || forceEnableMixins) {
+    if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
         maven {
-            name 'sponge'
-            url 'https://repo.spongepowered.org/repository/maven-public'
+            name = "GTNH Maven"
+            url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
         }
-        maven {
-            url 'https://jitpack.io'
+        if (usesMixinDebug.toBoolean()) {
+            maven {
+                name = "Fabric Maven"
+                url = "https://maven.fabricmc.net/"
+            }
         }
     }
 }
 
 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')
-        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
-            exclude module: 'launchwrapper'
-            exclude module: 'guava'
-            exclude module: 'gson'
-            exclude module: 'commons-io'
-            exclude module: 'log4j-core'
+        annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.3:processor')
+        if (usesMixinDebug.toBoolean()) {
+            runtimeOnly('org.jetbrains:intellij-fernflower:1.2.1.16')
         }
-        compile('com.github.GTNewHorizons:SpongeMixins:1.5.0')
+    }
+    if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
+        compile('com.gtnewhorizon:gtnhmixins:2.1.3')
     }
 }
 
@@ -338,13 +366,18 @@ def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
 
 task generateAssets {
     if (usesMixins.toBoolean()) {
-        def mixinConfigFile = getFile("/src/main/resources/mixins." + modId + ".json");
+        def mixinConfigFile = getFile("/src/main/resources/mixins." + modId + ".json")
         if (!mixinConfigFile.exists()) {
+            def mixinPluginLine = ""
+            if(!mixinPlugin.isEmpty()) {
+                // We might not have a mixin plugin if we're using early/late mixins
+                mixinPluginLine +=   """\n  "plugin": "${modGroup}.${mixinPlugin}", """
+            }
+
             mixinConfigFile.text = """{
   "required": true,
-  "minVersion": "0.7.11",
-  "package": "${modGroup}.${mixinsPackage}",
-  "plugin": "${modGroup}.${mixinPlugin}",
+  "minVersion": "0.8.5-GTNH",
+  "package": "${modGroup}.${mixinsPackage}",${mixinPluginLine}
   "refmap": "${mixingConfigRefMap}",
   "target": "@env(DEFAULT)",
   "compatibilityLevel": "JAVA_8",
@@ -392,20 +425,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}",
@@ -420,7 +453,7 @@ afterEvaluate {
 }
 
 runClient {
-    if(developmentEnvironmentUserName) {
+    if (developmentEnvironmentUserName) {
         arguments += [
             "--username",
             developmentEnvironmentUserName
@@ -461,7 +494,7 @@ processResources {
         "modName": modName
     }
 
-    if(usesMixins.toBoolean()) {
+    if (usesMixins.toBoolean()) {
         from refMap
     }
 
@@ -474,31 +507,31 @@ processResources {
 
 def getManifestAttributes() {
     def manifestAttributes = [:]
-    if(!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
+    if (!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
         manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
     }
 
-    if(accessTransformersFile) {
-        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
+    if (accessTransformersFile) {
+        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",
-            "MixinConfigs" : "mixins." + modId + ".json",
-            "ForceLoadAsMod" : !containsMixinsAndOrCoreModOnly.toBoolean()
+            "TweakClass"    : "org.spongepowered.asm.launch.MixinTweaker",
+            "MixinConfigs"  : "mixins." + modId + ".json",
+            "ForceLoadAsMod": !containsMixinsAndOrCoreModOnly.toBoolean()
         ]
     }
     return manifestAttributes
 }
 
 task sourcesJar(type: Jar) {
-    from (sourceSets.main.allSource)
-    from (file("$projectDir/LICENSE"))
+    from(sourceSets.main.allSource)
+    from(file("$projectDir/LICENSE"))
     getArchiveClassifier().set('sources')
 }
 
@@ -548,22 +581,22 @@ task devJar(type: Jar) {
         attributes(getManifestAttributes())
     }
 
-    if(usesShadowedDependencies.toBoolean()) {
+    if (usesShadowedDependencies.toBoolean()) {
         dependsOn(circularResolverJar)
         enabled = false
     }
 }
 
 task apiJar(type: Jar) {
-    from (sourceSets.main.allSource) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    from(sourceSets.main.allSource) {
+        include modGroupPath + "/" + apiPackagePath + '/**'
     }
 
-    from (sourceSets.main.output) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    from(sourceSets.main.output) {
+        include modGroupPath + "/" + apiPackagePath + '/**'
     }
 
-    from (sourceSets.main.resources.srcDirs) {
+    from(sourceSets.main.resources.srcDirs) {
         include("LICENSE")
     }
 
@@ -571,11 +604,11 @@ task apiJar(type: Jar) {
 }
 
 artifacts {
-    if(!noPublishedSources) {
+    if (!noPublishedSources) {
         archives sourcesJar
     }
     archives devJar
-    if(apiPackage) {
+    if (apiPackage) {
         archives apiJar
     }
 }
@@ -593,10 +626,10 @@ publishing {
     publications {
         maven(MavenPublication) {
             from components.java
-            if(usesShadowedDependencies.toBoolean()) {
+            if (usesShadowedDependencies.toBoolean()) {
                 artifact source: shadowJar, classifier: ""
             }
-            if(!noPublishedSources) {
+            if (!noPublishedSources) {
                 artifact source: sourcesJar, classifier: "sources"
             }
             artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
@@ -611,7 +644,7 @@ publishing {
 
             // remove extra garbage from minecraft and minecraftDeps configuration
             pom.withXml {
-                def badArtifacts = [:].withDefault {[] as Set<String>}
+                def badArtifacts = [:].withDefault { [] as Set<String> }
                 for (configuration in [
                             projectConfigs.minecraft,
                             projectConfigs.minecraftDeps
@@ -644,6 +677,124 @@ publishing {
     }
 }
 
+if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) {
+    apply plugin: 'com.modrinth.minotaur'
+
+    File changelogFile = new File(System.getenv("CHANGELOG_FILE") ?: "CHANGELOG.md")
+
+    modrinth {
+        token = System.getenv("MODRINTH_TOKEN")
+        projectId = modrinthProjectId
+        versionNumber = identifiedVersion
+        versionType = identifiedVersion.endsWith("-pre") ? "beta" : "release"
+        changelog = changelogFile.exists() ? changelogFile.getText("UTF-8") : ""
+        uploadFile = jar
+        additionalFiles = getSecondaryArtifacts()
+        gameVersions = [minecraftVersion]
+        loaders = ["forge"]
+        debugMode = false
+    }
+
+    if (modrinthRelations.size() != 0) {
+        String[] deps = modrinthRelations.split(";")
+        deps.each { dep ->
+            if (dep.size() == 0) {
+                return
+            }
+            String[] parts = dep.split(":")
+            String[] qual = parts[0].split("-")
+            addModrinthDep(qual[0], qual[1], parts[1])
+        }
+    }
+    if (usesMixins.toBoolean()) {
+        addModrinthDep("required", "project", "gtnhmixins")
+    }
+    tasks.modrinth.dependsOn(build)
+    tasks.publish.dependsOn(tasks.modrinth)
+}
+
+if (curseForgeProjectId.size() != 0 && System.getenv("CURSEFORGE_TOKEN") != null) {
+    apply plugin: 'com.matthewprenger.cursegradle'
+
+    File changelogFile = new File(System.getenv("CHANGELOG_FILE") ?: "CHANGELOG.md")
+
+    curseforge {
+        apiKey = System.getenv("CURSEFORGE_TOKEN")
+        project {
+            id = curseForgeProjectId
+            if (changelogFile.exists()) {
+                changelogType = "markdown"
+                changelog = changelogFile
+            }
+            releaseType = identifiedVersion.endsWith("-pre") ? "beta" : "release"
+            addGameVersion minecraftVersion
+            addGameVersion "Forge"
+            mainArtifact jar
+            for (artifact in getSecondaryArtifacts()) addArtifact artifact
+        }
+
+        options {
+            javaIntegration = false
+            forgeGradleIntegration = false
+            debug = false
+        }
+    }
+
+    if (curseForgeRelations.size() != 0) {
+        String[] deps = curseForgeRelations.split(";")
+        deps.each { dep ->
+            if (dep.size() == 0) {
+                return
+            }
+            String[] parts = dep.split(":")
+            addCurseForgeRelation(parts[0], parts[1])
+        }
+    }
+    if (usesMixins.toBoolean()) {
+        addCurseForgeRelation("requiredDependency", "gtnhmixins")
+    }
+    tasks.curseforge.dependsOn(build)
+    tasks.publish.dependsOn(tasks.curseforge)
+}
+
+def addModrinthDep(scope, type, name) {
+    com.modrinth.minotaur.dependencies.Dependency dep;
+    if (!(scope in [
+                "required",
+                "optional",
+                "incompatible",
+                "embedded"
+            ])) {
+        throw new Exception("Invalid modrinth dependency scope: " + scope)
+    }
+    switch (type) {
+        case "project":
+            dep = new ModDependency(name, scope)
+            break
+        case "version":
+            dep = new VersionDependency(name, scope)
+            break
+        default:
+            throw new Exception("Invalid modrinth dependency type: " + type)
+    }
+    project.modrinth.dependencies.add(dep)
+}
+
+def addCurseForgeRelation(type, name) {
+    if (!(type in [
+                "requiredDependency",
+                "embeddedLibrary",
+                "optionalDependency",
+                "tool",
+                "incompatible"
+            ])) {
+        throw new Exception("Invalid CurseForge relation type: " + type)
+    }
+    CurseArtifact artifact = project.curseforge.curseProjects[0].mainArtifact
+    CurseRelation rel = (artifact.curseRelations ?: (artifact.curseRelations = new CurseRelation()))
+    rel."$type"(name)
+}
+
 // Updating
 task updateBuildScript {
     doLast {
@@ -653,7 +804,7 @@ task updateBuildScript {
     }
 }
 
-if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
+if (!project.getGradle().startParameter.isOffline() && isNewBuildScriptVersionAvailable(projectDir.toString())) {
     if (autoUpdateBuildScript.toBoolean()) {
         performBuildScriptUpdate(projectDir.toString())
     } else {
@@ -662,7 +813,40 @@ if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
 }
 
 static URL availableBuildScriptUrl() {
-    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
+    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/build.gradle")
+}
+
+static URL exampleSettingsGradleUrl() {
+    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/settings.gradle.example")
+}
+
+static URL exampleGitAttributesUrl() {
+    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/.gitattributes")
+}
+
+
+boolean verifyGitAttributes() {
+    def gitattributesFile = getFile(".gitattributes")
+    if (!gitattributesFile.exists()) {
+        println("Downloading default .gitattributes")
+        exampleGitAttributesUrl().withInputStream { i -> gitattributesFile.withOutputStream { it << i } }
+        exec {
+            workingDir '.'
+            commandLine 'git', 'add', '--renormalize', '.'
+        }
+        return true
+    }
+    return false
+}
+
+boolean verifySettingsGradle() {
+    def settingsFile = getFile("settings.gradle")
+    if (!settingsFile.exists()) {
+        println("Downloading default settings.gradle")
+        exampleSettingsGradleUrl().withInputStream { i -> settingsFile.withOutputStream { it << i } }
+        return true
+    }
+    return false
 }
 
 boolean performBuildScriptUpdate(String projectDir) {
@@ -670,6 +854,10 @@ boolean performBuildScriptUpdate(String 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!")
+        boolean settingsupdated = verifySettingsGradle()
+        settingsupdated = verifyGitAttributes() || settingsupdated
+        if (settingsupdated)
+            throw new GradleException("Settings has been updated, please re-run task.")
         return true
     }
     return false
@@ -689,7 +877,7 @@ boolean isNewBuildScriptVersionAvailable(String projectDir) {
 
 static String getVersionHash(String buildScriptContent) {
     String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
-    if(versionLine != null) {
+    if (versionLine != null) {
         return versionLine.split(": ").last()
     }
     return ""
@@ -715,16 +903,16 @@ task deobfParams {
             overwrite false
         }
 
-        if(!file(paramsCSV).exists()) {
+        if (!file(paramsCSV).exists()) {
             println("Extracting MCP archive ...")
             unzip(mcpZIP, mcpDir)
         }
 
         println("Parsing params.csv ...")
         Map<String, String> params = new HashMap<>()
-        Files.lines(Paths.get(paramsCSV)).forEach{line ->
+        Files.lines(Paths.get(paramsCSV)).forEach { line ->
             String[] cells = line.split(",")
-            if(cells.length > 2 && cells[0].matches("p_i?\\d+_\\d+_")) {
+            if (cells.length > 2 && cells[0].matches("p_i?\\d+_\\d+_")) {
                 params.put(cells[0], cells[1])
             }
         }
@@ -737,8 +925,8 @@ task deobfParams {
 static int replaceParams(File file, Map<String, String> params) {
 int fileCount = 0
 
-if(file.isDirectory()) {
-    for(File f : file.listFiles()) {
+if (file.isDirectory()) {
+    for (File f : file.listFiles()) {
         fileCount += replaceParams(f, params)
     }
     return fileCount
@@ -747,14 +935,14 @@ println("Visiting ${file.getName()} ...")
 try {
     String content = new String(Files.readAllBytes(file.toPath()))
     int hash = content.hashCode()
-    params.forEach{key, value ->
+    params.forEach { key, value ->
         content = content.replaceAll(key, value)
     }
-    if(hash != content.hashCode()) {
+    if (hash != content.hashCode()) {
         Files.write(file.toPath(), content.getBytes("UTF-8"))
         return 1
     }
-} catch(Exception e) {
+} catch (Exception e) {
     e.printStackTrace()
 }
 return 0
@@ -805,16 +993,16 @@ try {
 
     //get rid of directories:
     int lastSlash = fileName.lastIndexOf("/")
-    if(lastSlash > 0) {
+    if (lastSlash > 0) {
         fileName = fileName.substring(lastSlash + 1)
     }
     //get rid of extension:
-    if(fileName.endsWith(".jar") || fileName.endsWith(".litemod")) {
+    if (fileName.endsWith(".jar") || fileName.endsWith(".litemod")) {
         fileName = fileName.substring(0, fileName.lastIndexOf("."))
     }
 
     String hostName = url.getHost()
-    if(hostName.startsWith("www.")) {
+    if (hostName.startsWith("www.")) {
         hostName = hostName.substring(4)
     }
     List parts = Arrays.asList(hostName.split("\\."))
@@ -822,7 +1010,7 @@ try {
     hostName = String.join(".", parts)
 
     return deobf(sourceURL, "$hostName/$fileName")
-} catch(Exception e) {
+} catch (Exception e) {
     return deobf(sourceURL, "deobf/${sourceURL.hashCode()}")
 }
 }
@@ -837,12 +1025,13 @@ 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()) {
+if (file(deobfFile).exists()) {
     return files(deobfFile)
 }
 
 String mappingsVer
-if(remoteMappings) {
+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"
 
@@ -878,7 +1067,7 @@ return files(deobfFile)
 
 def zipMappings(String zipPath, String url, String bon2Dir) {
 File zipFile = new File(zipPath)
-if(zipFile.exists()) {
+if (zipFile.exists()) {
     return
 }
 
@@ -918,6 +1107,21 @@ if (!project.hasProperty(propertyName)) {
 }
 }
 
+def propertyDefaultIfUnset(String propertyName, defaultValue) {
+if (!project.hasProperty(propertyName) || project.property(propertyName) == "") {
+    project.ext.setProperty(propertyName, defaultValue)
+}
+}
+
 def getFile(String relativePath) {
 return new File(projectDir, relativePath)
 }
+
+def getSecondaryArtifacts() {
+// Because noPublishedSources from the beginning of the script is somehow not visible here...
+boolean noPublishedSources = project.hasProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
+def secondaryArtifacts = [devJar]
+if (!noPublishedSources) secondaryArtifacts += [sourcesJar]
+if (apiPackage) secondaryArtifacts += [apiJar]
+return secondaryArtifacts
+}

dependencies.gradle

@@ -3,7 +3,7 @@
 dependencies {
     compile('com.github.GTNewHorizons:EnderCore:0.2.9:dev')
     compile('com.github.GTNewHorizons:ForestryMC:4.4.6:dev')
-    compile('com.github.GTNewHorizons:NotEnoughItems:2.2.15-GTNH:dev')
+    compile('com.github.GTNewHorizons:NotEnoughItems:2.3.7-GTNH:dev')
     compile('com.github.GTNewHorizons:BuildCraft:7.1.27:dev')
     compile('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')

gradle.properties

@@ -62,6 +62,9 @@ coreModClass =
 # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
 containsMixinsAndOrCoreModOnly = false
 
+# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
+forceEnableMixins = false
+
 # If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
 # responsibility check the licence and request permission for distribution, if required.
 usesShadowedDependencies = true

src/main/java/crazypants/enderio/EnderIO.java

@@ -150,6 +150,7 @@ import crazypants.enderio.material.endergy.ItemAlloyEndergy;
 import crazypants.enderio.material.endergy.ItemGrindingBallEndergy;
 import crazypants.enderio.network.PacketHandler;
 import crazypants.enderio.rail.BlockEnderRail;
+import crazypants.enderio.teleport.ItemInfiniteTravelStaff;
 import crazypants.enderio.teleport.ItemTravelStaff;
 import crazypants.enderio.teleport.TeleportRecipes;
 import crazypants.enderio.teleport.TravelController;
@@ -228,6 +229,7 @@ public class EnderIO {
     public static BlockTelePad blockTelePad;
     public static ItemCoordSelector itemCoordSelector;
     public static ItemTravelStaff itemTravelStaff;
+    public static ItemInfiniteTravelStaff itemInfiniteTravelStaff;
 
     // Painter
     public static BlockPainter blockPainter;
@@ -479,6 +481,7 @@ public class EnderIO {
         itemYetaWench = ItemYetaWrench.create();
         itemEnderface = ItemEnderface.create();
         itemTravelStaff = ItemTravelStaff.create();
+        itemInfiniteTravelStaff = ItemInfiniteTravelStaff.create();
         itemConduitProbe = ItemConduitProbe.create();
 
         itemXpTransfer = ItemXpTransfer.create();

src/main/java/crazypants/enderio/ModObject.java

@@ -120,7 +120,9 @@ public enum ModObject {
 
     blockEnderRail,
 
-    itemEnderFood;
+    itemEnderFood,
+
+    itemInfiniteTravelStaff;
 
     public final String unlocalisedName;
 

src/main/java/crazypants/enderio/api/teleport/TravelSource.java

@@ -1,5 +1,7 @@
 package crazypants.enderio.api.teleport;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.teleport.TravelController;
@@ -41,6 +43,7 @@ public enum TravelSource {
         return STAFF.getMaxDistanceTravelledSq();
     }
 
+    @SideOnly(Side.CLIENT)
     public static int getMaxDistanceSq() {
         EntityPlayer player = Minecraft.getMinecraft().thePlayer;
 

src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java

@@ -167,7 +167,11 @@ public class BlockConduitBundle extends BlockEio
 
         IIcon tex = null;
 
-        TileConduitBundle cb = (TileConduitBundle) world.getTileEntity(target.blockX, target.blockY, target.blockZ);
+        TileEntity cbe = world.getTileEntity(target.blockX, target.blockY, target.blockZ);
+        if (!(cbe instanceof TileConduitBundle)) {
+            return false;
+        }
+        TileConduitBundle cb = (TileConduitBundle) cbe;
         if (ConduitUtil.isSolidFacadeRendered(cb, Minecraft.getMinecraft().thePlayer)) {
             if (cb.getFacadeId() != null) {
                 tex = cb.getFacadeId().getIcon(target.sideHit, cb.getFacadeMetadata());
@@ -258,7 +262,7 @@ public class BlockConduitBundle extends BlockEio
             World world = EnderIO.proxy.getClientWorld();
             BlockCoord bc = new BlockCoord(snd.getXPosF(), snd.getYPosF(), snd.getZPosF());
             TileEntity te = bc.getTileEntity(world);
-            if (te != null && te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
+            if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
                 Block facade = getFacade(world, bc.x, bc.y, bc.z, -1);
                 ConduitUtil.playHitSound(facade.stepSound, world, bc.x, bc.y, bc.z);
             } else {
@@ -275,7 +279,7 @@ public class BlockConduitBundle extends BlockEio
         if ("EnderIO:silence.step".equals(path) && world.isRemote) {
             BlockCoord bc = new BlockCoord(event.entity.posX, event.entity.posY - 2, event.entity.posZ);
             TileEntity te = bc.getTileEntity(world);
-            if (te != null && te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
+            if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
                 Block facade = getFacade(world, bc.x, bc.y, bc.z, -1);
                 ConduitUtil.playStepSound(facade.stepSound, world, bc.x, bc.y, bc.z);
             } else {
@@ -306,7 +310,11 @@ public class BlockConduitBundle extends BlockEio
         }
         if (ret == null && target != null && target.hitInfo instanceof CollidableComponent) {
             CollidableComponent cc = (CollidableComponent) target.hitInfo;
-            TileConduitBundle bundle = (TileConduitBundle) world.getTileEntity(x, y, z);
+            TileEntity te = world.getTileEntity(x, y, z);
+            if (!(te instanceof TileConduitBundle)) {
+                return null;
+            }
+            TileConduitBundle bundle = (TileConduitBundle) te;
             IConduit conduit = bundle.getConduit(cc.conduitType);
             if (conduit != null) {
                 ret = conduit.createItem();
@@ -410,8 +418,10 @@ public class BlockConduitBundle extends BlockEio
 
     @Override
     public float getBlockHardness(World world, int x, int y, int z) {
-        IConduitBundle te = (IConduitBundle) world.getTileEntity(x, y, z);
-        return te != null && te.getFacadeType() == FacadeType.HARDENED ? blockHardness * 10 : blockHardness;
+        TileEntity te = world.getTileEntity(x, y, z);
+        return te instanceof IConduitBundle && ((IConduitBundle) te).getFacadeType() == FacadeType.HARDENED
+                ? blockHardness * 10
+                : blockHardness;
     }
 
     @Override
@@ -425,8 +435,10 @@ public class BlockConduitBundle extends BlockEio
             double explosionY,
             double explosionZ) {
         float resist = getExplosionResistance(par1Entity);
-        IConduitBundle te = (IConduitBundle) world.getTileEntity(x, y, z);
-        return te != null && te.getFacadeType() == FacadeType.HARDENED ? resist * 10 : resist;
+        TileEntity te = world.getTileEntity(x, y, z);
+        return te instanceof IConduitBundle && ((IConduitBundle) te).getFacadeType() == FacadeType.HARDENED
+                ? resist * 10
+                : resist;
     }
 
     @SubscribeEvent
@@ -485,10 +497,11 @@ public class BlockConduitBundle extends BlockEio
 
     @Override
     public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) {
-        IConduitBundle te = (IConduitBundle) world.getTileEntity(x, y, z);
-        if (te == null) {
+        TileEntity rte = world.getTileEntity(x, y, z);
+        if (!(rte instanceof IConduitBundle)) {
             return true;
         }
+        IConduitBundle te = (IConduitBundle) rte;
 
         boolean breakBlock = true;
         List<ItemStack> drop = new ArrayList<ItemStack>();
@@ -609,10 +622,11 @@ public class BlockConduitBundle extends BlockEio
     public boolean onBlockActivated(
             World world, int x, int y, int z, EntityPlayer player, int side, float par7, float par8, float par9) {
 
-        IConduitBundle bundle = (IConduitBundle) world.getTileEntity(x, y, z);
-        if (bundle == null) {
+        TileEntity te = world.getTileEntity(x, y, z);
+        if (!(te instanceof IConduitBundle)) {
             return false;
         }
+        IConduitBundle bundle = (IConduitBundle) te;
 
         ItemStack stack = player.getCurrentEquippedItem();
         if (stack != null && stack.getItem() == EnderIO.itemConduitFacade) {
@@ -805,10 +819,11 @@ public class BlockConduitBundle extends BlockEio
 
     @Override
     public boolean tryRotateFacade(World world, int x, int y, int z, ForgeDirection axis) {
-        IConduitBundle bundle = (IConduitBundle) world.getTileEntity(x, y, z);
-        if (bundle == null) {
+        TileEntity te = world.getTileEntity(x, y, z);
+        if (!(te instanceof IConduitBundle)) {
             return false;
         }
+        IConduitBundle bundle = (IConduitBundle) te;
 
         int oldMeta = bundle.getFacadeMetadata();
         int newMeta = PainterUtil.rotateFacadeMetadata(bundle.getFacadeId(), oldMeta, axis);

src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java

@@ -71,8 +71,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
 
                         RenderUtil.bindBlockTexture();
 
-                        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
-                        GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
+                        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT);
                         GL11.glEnable(GL12.GL_RESCALE_NORMAL);
                         GL11.glEnable(GL11.GL_BLEND);
                         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
@@ -94,7 +93,6 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
             GL11.glShadeModel(GL11.GL_FLAT);
             GL11.glPopMatrix();
             GL11.glPopAttrib();
-            GL11.glPopAttrib();
         }
     }
 

src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java

@@ -282,11 +282,9 @@ public class GuiCapBank extends GuiContainerBaseEIO {
     @SuppressWarnings("rawtypes")
     @Override
     public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) {
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
-        GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT);
         super.drawHoveringText(par1List, par2 + 24, par3, font);
         GL11.glPopAttrib();
-        GL11.glPopAttrib();
     }
 
     @Override

src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java

@@ -44,6 +44,10 @@ public class CustomSeedFarmer implements IFarmerJoe {
         if (ztonesSoil != null) {
             addTilledBlock(ztonesSoil);
         }
+        Block rtSoil = GameRegistry.findBlock("RandomThings", "fertilizedDirt_tilled");
+        if (rtSoil != null) {
+            addTilledBlock(rtSoil);
+        }
     }
 
     public void addTilledBlock(Block block) {

src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java

@@ -405,11 +405,9 @@ public class GuiHyperCube extends GuiContainerBaseEIO {
 
     @Override
     public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) {
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
-        GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT);
         super.drawHoveringText(par1List, par2, par3, font);
         GL11.glPopAttrib();
-        GL11.glPopAttrib();
     }
 
     @Override

src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java

@@ -295,11 +295,9 @@ public class GuiCapacitorBank extends GuiContainerBaseEIO {
 
     @Override
     public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) {
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
-        GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT);
         super.drawHoveringText(par1List, par2 + 24, par3, font);
         GL11.glPopAttrib();
-        GL11.glPopAttrib();
     }
 
     @Override

src/main/java/crazypants/enderio/machine/recipe/RecipeConfig.java

@@ -136,14 +136,8 @@ public class RecipeConfig {
                 }
                 for (RecipeElement recipe : group.recipes.values()) {
                     if (recipe.isValid()) {
-                        if (modifyGroup.recipes.containsKey(recipe.name)) {
-                            Log.debug("Replacing core recipe " + recipe.name + "  with user defined recipe.");
-                        } else {
-                            Log.debug("Added user defined recipe " + recipe.name);
-                        }
                         modifyGroup.addRecipe(recipe);
                     } else {
-                        Log.debug("Removed recipe " + recipe.name + " due to user config.");
                         modifyGroup.recipes.remove(recipe.name);
                     }
                 }

src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java

@@ -164,7 +164,7 @@ public class EnchanterRecipeHandler extends TemplateRecipeHandler {
             int maxLevel = recipe.getEnchantment().getMaxLevel();
             if (maxLevel > 1) {
                 int level = cycle % maxLevel + 1;
-                input.get(1).item.stackSize *= level;
+                input.get(1).item.stackSize = recipe.getItemsPerLevel() * level;
             }
             return input;
         }

src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java

@@ -52,6 +52,7 @@ public class NEIEnderIOConfig implements IConfigureNEI {
         }
         if (!Config.travelAnchorEnabled) {
             API.hideItem(new ItemStack(EnderIO.itemTravelStaff));
+            API.hideItem(new ItemStack(EnderIO.itemInfiniteTravelStaff));
         }
         if (!Config.reinforcedObsidianEnabled) {
             API.hideItem(new ItemStack(EnderIO.blockReinforcedObsidian));

src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java

@@ -124,7 +124,7 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler {
     }
 
     @Override
-    public List<String> handleItemTooltip(GuiRecipe gui, ItemStack stack, List<String> currenttip, int recipeIndex) {
+    public List<String> handleItemTooltip(GuiRecipe<?> gui, ItemStack stack, List<String> currenttip, int recipeIndex) {
         MillRecipe recipe = (MillRecipe) arecipes.get(recipeIndex);
         float chance = recipe.getChanceForOutput(stack);
         if (chance > 0 && chance < 1) {

src/main/java/crazypants/enderio/nei/VatRecipeHandler.java

@@ -189,12 +189,12 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
     }
 
     @Override
-    public List<String> handleItemTooltip(GuiRecipe gui, ItemStack stack, List<String> currenttip, int recipeIndex) {
+    public List<String> handleItemTooltip(GuiRecipe<?> gui, ItemStack stack, List<String> currenttip, int recipeIndex) {
         return currenttip;
     }
 
     @Override
-    public List<String> handleTooltip(GuiRecipe gui, List<String> currenttip, int recipeIndex) {
+    public List<String> handleTooltip(GuiRecipe<?> gui, List<String> currenttip, int recipeIndex) {
         InnerVatRecipe rec = (InnerVatRecipe) arecipes.get(recipeIndex);
         Point pos = GuiDraw.getMousePosition();
         Point offset = gui.getRecipePosition(recipeIndex);

src/main/java/crazypants/enderio/teleport/ItemInfiniteTravelStaff.java

@@ -0,0 +1,89 @@
+package crazypants.enderio.teleport;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import crazypants.enderio.EnderIO;
+import crazypants.enderio.ModObject;
+import crazypants.enderio.machine.power.PowerDisplayUtil;
+import java.util.List;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class ItemInfiniteTravelStaff extends ItemTravelStaff {
+
+    protected ItemInfiniteTravelStaff() {
+        super();
+        setUnlocalizedName(ModObject.itemInfiniteTravelStaff.name());
+    }
+
+    public static ItemInfiniteTravelStaff create() {
+        ItemInfiniteTravelStaff result = new ItemInfiniteTravelStaff();
+        result.init();
+        return result;
+    }
+
+    public static boolean isEquipped(EntityPlayer ep) {
+        if (ep == null || ep.getCurrentEquippedItem() == null) {
+            return false;
+        }
+        return ep.getCurrentEquippedItem().getItem() == EnderIO.itemInfiniteTravelStaff;
+    }
+
+    @Override
+    protected void init() {
+        GameRegistry.registerItem(this, ModObject.itemInfiniteTravelStaff.unlocalisedName);
+    }
+
+    @Override
+    public void onCreated(ItemStack itemStack, World world, EntityPlayer entityPlayer) {
+        setFull(itemStack);
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister IIconRegister) {
+        itemIcon = IIconRegister.registerIcon("enderio:itemInfiniteTravelStaff");
+    }
+
+    @Override
+    public void extractInternal(ItemStack item, int powerUse) {
+        return;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+        ItemStack is = new ItemStack(this);
+        setFull(is);
+        par3List.add(is);
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
+        super.addInformation(itemStack, par2EntityPlayer, list, par4);
+        String str = "Infinite " + PowerDisplayUtil.abrevation();
+        list.set(list.size() - 1, str); // Changing charge indicator to infinite RF
+    }
+
+    @Override
+    public String getUnlocalizedNameForTooltip(ItemStack stack) {
+        return getUnlocalizedName();
+    }
+
+    @Override
+    public boolean isActive(EntityPlayer ep, ItemStack equipped) {
+        return isEquipped(ep);
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public boolean isFull3D() {
+        return true;
+    }
+}

src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java

@@ -80,8 +80,7 @@ public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer {
         Minecraft.getMinecraft().entityRenderer.disableLightmap(0);
 
         RenderUtil.bindBlockTexture();
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
-        GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT);
 
         GL11.glEnable(GL12.GL_RESCALE_NORMAL);
 
@@ -115,7 +114,6 @@ public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer {
 
         renderLabel(tileentity, x, y, z, ta, sf);
 
-        GL11.glPopAttrib();
         GL11.glPopAttrib();
 
         Minecraft.getMinecraft().entityRenderer.enableLightmap(0);

src/main/java/crazypants/util/IFacade.java

@@ -2,8 +2,12 @@ package crazypants.util;
 
 import cofh.api.block.IBlockAppearance;
 import cpw.mods.fml.common.Optional;
+import net.minecraft.block.Block;
+import net.minecraft.world.IBlockAccess;
 
 @Optional.Interface(modid = "chisel", iface = "com.cricketcraft.chisel.api.IFacade")
 public interface IFacade extends com.cricketcraft.chisel.api.IFacade, IBlockAppearance {
-    // :(
+    Block getFacade(IBlockAccess world, int x, int y, int z, int side);
+
+    int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side);
 }

src/main/resources/assets/enderio/lang/en_US.lang

@@ -726,6 +726,12 @@ item.itemTravelStaff.tooltip.detailed.line4=Shift-R-Click will teleport the
 item.itemTravelStaff.tooltip.detailed.line5=player a short distance
 enderio.itemTravelStaff.notEnoughPower=Not enough power
 
+item.itemInfiniteTravelStaff.name=Creative Staff of Traveling
+item.itemInfiniteTravelStaff.tooltip.detailed.line1=When held Travel Anchors and EnderIO
+item.itemInfiniteTravelStaff.tooltip.detailed.line2=blocks become visible and can be
+item.itemInfiniteTravelStaff.tooltip.detailed.line3=activated by R-Click
+item.itemInfiniteTravelStaff.tooltip.detailed.line4=Shift-R-Click will teleport the
+item.itemInfiniteTravelStaff.tooltip.detailed.line5=player a short distance
 item.itemCoordSelector.name=Coordinate Selector
 item.itemCoordSelector.tooltip.detailed.line1=Stores coordinates of a block.
 item.itemCoordSelector.tooltip.detailed.line2=Right click at block to select

src/main/resources/assets/enderio/lang/zh_CN.lang

@@ -136,7 +136,7 @@ enderio.itemMEConduit.channelsUsed=第{0,number}频道, 共{1,number}频道
 enderio.itemOCConduit.name=网络导管(OC)
 
 #Entity
-entity.witherSkeleton.name=凋零骷髅
+entity.witherSkeleton.name=凋灵骷髅
 
 #Materials
 enderio.itemMaterial.name=材料
@@ -243,7 +243,7 @@ enderio.darkGrindingBall.tooltip.detailed.line4=功率降低
 enderio.darkSteelRod.name=玄钢杆
 
 tile.blockReinforcedObsidian.name=强化黑曜石
-tile.blockReinforcedObsidian.tooltip.common.line1=能抵挡凋零
+tile.blockReinforcedObsidian.tooltip.common.line1=能抵挡凋灵
 
 #Quartz / Glass
 tile.blockFusedQuartz.name=石英玻璃
@@ -1023,12 +1023,14 @@ enderio.gui.machine.button.storelevels=储存10级
 enderio.gui.machine.tooltip.storelevels=玩家XP
 enderio.gui.machine.button.storeall=储存玩家
 enderio.gui.machine.tooltip.storeall=全部XP
+
 enderio.gui.machine.button.retrievelevel=取出1级
 enderio.gui.machine.tooltip.retrievelevel=玩家XP等级
 enderio.gui.machine.button.retrievelevels=取出10级
 enderio.gui.machine.tooltip.retrievelevels=玩家XP等级
 enderio.gui.machine.button.retrieveall=取出全部
 enderio.gui.machine.tooltip.retrieveall=玩家XP等级
+
 enderio.gui.machine.ioMode.overlay.tooltip=配置IO
 enderio.gui.machine.ioMode.overlay.tooltip.visible.line1=Shift点击会重置各面
 enderio.gui.machine.ioMode.overlay.tooltip.visible.line2=至默认设置
@@ -1156,6 +1158,9 @@ enderio.gui.travelAccessable.ok=已授权
 enderio.gui.travelAccessable.skipLocked=跳过锁定锚, 使用定向传送.
 enderio.gui.travelAccessable.skipObstructed=跳过不通畅锚.
 enderio.gui.travelAccessable.skipPrivate=跳过私有锚.
+enderio.gui.travelAccessable.tooltip.visible=可见性
+enderio.gui.travelAccessable.tooltip.visible.desc1=关闭时,无法透过其他方块看到此方块.
+enderio.gui.travelAccessable.tooltip.visible.desc2=用作电梯时比较实用.
 
 enderio.gui.telepad.configure.travel=旅行设置
 enderio.gui.telepad.configure.telepad=传送台设置
@@ -1166,6 +1171,83 @@ enderio.gui.spawnGurad.showRange=显示范围
 enderio.gui.spawnGurad.hideRange=隐藏范围
 enderio.gui.spawnGurad.range=范围:
 
+# Filters
+enderio.gui.item_filter.damage.disabled=忽略耐久
+enderio.gui.item_filter.damage.damage_00_25=至多25%耐久损失
+enderio.gui.item_filter.damage.damage_25_00=超过25%耐久损失
+enderio.gui.item_filter.damage.damage_00_50=至多50%耐久损失
+enderio.gui.item_filter.damage.damage_50_00=超过50%耐久损失
+enderio.gui.item_filter.damage.damage_00_75=至多75%耐久损失
+enderio.gui.item_filter.damage.damage_75_00=超过75%耐久损失
+enderio.gui.item_filter.damage.damage_00_00=无耐久损失
+enderio.gui.item_filter.damage.damage_01_00=有耐久损失
+enderio.gui.item_filter.damage.damage_yes=可以损失耐久
+enderio.gui.item_filter.damage.damage_not=无法损失耐久
+
+enderio.gui.edit_item_filter=编辑过滤器设置
+enderio.gui.item_filter.close=关闭过滤器
+enderio.gui.item_filter.close2=返回上一个库存
+
+enderio.gui.item_filter.whitelist=白名单
+enderio.gui.item_filter.blacklist=黑名单
+enderio.gui.item_filter.match_meta=匹配Meta数据
+enderio.gui.item_filter.ignore_meta=忽略Meta数据
+enderio.gui.item_filter.sticky_enabled=启用粘滞模式
+enderio.gui.item_filter.sticky_enabled2=选中的物品只会被送往粘滞输出端
+enderio.gui.item_filter.sticky_disabled=禁用粘滞模式
+enderio.gui.item_filter.ore_dic_enabled=启用矿物辞典
+enderio.gui.item_filter.ore_dic_disabled=禁用矿物辞典
+enderio.gui.item_filter.match_nbt=匹配NBT
+enderio.gui.item_filter.ignore_nbt=忽略NBT
+
+enderio.gui.existing.item_filter.snapshot=快照
+enderio.gui.existing.item_filter.merge=合并
+enderio.gui.existing.item_filter.clear=清除
+enderio.gui.existing.item_filter.show=显示
+enderio.gui.existing.item_filter.snapshot2=可选：如果还未设置快照,库存内容将被作为过滤内容
+enderio.gui.existing.item_filter.merge2=将一个新的快照合并到当前快照
+enderio.gui.existing.item_filter.clear2=清除快照
+enderio.gui.existing.item_filter.show2=显示当前快照
+enderio.item.item_existing_item_filter.filter_not_updated=过滤器未更新
+enderio.item.item_existing_item_filter.filter_updated=过滤器已更新
+
+enderio.gui.basic_item_filter=基础物品过滤器
+enderio.gui.advanced_item_filter=高级物品过滤器
+enderio.gui.limited_item_filter=限制物品过滤器
+enderio.gui.big_item_filter=大型物品过滤器
+# Note big_advanced_item_filter doesn't have enough space for the full name
+enderio.gui.big_advanced_item_filter=高级大型物品过滤器
+enderio.gui.existing_item_filter=现有物品过滤器
+enderio.gui.mod_item_filter=模组物品过滤器
+enderio.gui.power_item_filter=充能物品过滤器
+enderio.gui.species_item_filter=物种物品过滤器
+enderio.gui.soul_filter_normal=灵魂物品过滤器
+enderio.gui.soul_filter_big=大型灵魂物品过滤器
+enderio.gui.enchantment_filter_normal=附魔物品过滤器
+enderio.gui.enchantment_filter_big=大型附魔物品过滤器
+
+enderio.gui.fluid_filter=基础流体过滤器
+
+enderio.gui.redstone_filter.and=与门红石过滤器
+enderio.gui.redstone_filter.or=或门红石过滤器
+enderio.gui.redstone_filter.nor=或非门红石过滤器
+enderio.gui.redstone_filter.nand=与非门红石过滤器
+enderio.gui.redstone_filter.xor=异或门红石过滤器
+enderio.gui.redstone_filter.xnor=同或门红石过滤器
+enderio.gui.redstone_filter.counting=计次红石过滤器
+enderio.gui.redstone_filter.timer=计时红石过滤器
+
+enderio.gui.mod.item_filter.delete=删除
+enderio.gui.mod.item_filter.slot=输入槽
+
+enderio.gui.power.item_filter.compare=比较模式
+enderio.gui.power.item_filter.percent=充能百分比
+
+enderio.gui.redstone_filter.signal_color=红石信号颜色
+enderio.gui.redstone_filter.input_signal=输入信号
+enderio.gui.redstone_filter.count=计数
+enderio.gui.redstone_filter.time=计时
+
 #conduits
 enderio.gui.conduit.ioMode=模式
 enderio.gui.conduit.ioMode.inOut=输入图/输出
@@ -1238,7 +1320,7 @@ enderio.weatherObelisk.fuelTank=大气通量仓
 
 #Enchants
 enchantment.enderio.soulBound=灵魂绑定
-description.enchantment.enderio.soulBound=该附魔使物品免于死亡掉落
+description.enchantment.enderio.soulBound=附魔有灵魂绑定的物品/工具/装备在玩家死亡后仍然留在物品栏中,不会掉落.
 
 #Configuration
 enderio.config.title=末影接口配置文件
@@ -1309,5 +1391,4 @@ enderio.tooltip.oredict=矿物辞典:
 enderio.tooltip.meta=Meta:
 enderio.tooltip.uid=UID:
 enderio.tooltip.anvilupgrades=铁砧升级:
-enderio.waila.config.hiddenfacades=隐形栅栏
-
+enderio.waila.config.hiddenfacades=隐形栅栏