fix: hide direction labels in the P2P Tunnel - ME Dual Interface GUI (#481)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Ignore spotlessApply reformat
+69a5c0e6ee71fe714eabe24002f9e39aae3b97be

.gitattributes

@@ -0,0 +1,44 @@
+* 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
+
+*.[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

.github/workflows/optimize-images.yml

@@ -0,0 +1,17 @@
+name: Optimize images
+
+on:
+  pull_request:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+  push:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+jobs:
+  optimize-images:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
+    secrets: inherit

.gitignore

@@ -1,8 +1,39 @@
-*.bat
-.gradle/
-.idea/
-out/
+.gradle
+.settings
+/.idea/
+/.vscode/
+/run/
+/build/
+/eclipse/
+.classpath
+.project
+/bin/
+/config/
+/crash-reports/
+/logs/
+options.txt
+/saves/
+usernamecache.json
+banned-ips.json
+banned-players.json
+eula.txt
+ops.json
+server.properties
+servers.dat
+usercache.json
+whitelist.json
+/out/
 *.iml
 *.ipr
 *.iws
-run/
+src/main/resources/mixins.*([!.]).json
+*.bat
+*.sh
+*.DS_Store
+!gradlew.bat
+.factorypath
+addon.local.gradle
+addon.local.gradle.kts
+addon.late.local.gradle
+addon.late.local.gradle.kts
+layout.json

build.gradle

@@ -1,747 +1,5 @@
-//version: 1650343995
-/*
-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
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.gradle.internal.logging.text.StyledTextOutput.Style
-import org.gradle.internal.logging.text.StyledTextOutputFactory
-
-import java.util.concurrent.TimeUnit
-
-buildscript {
-    repositories {
-        maven {
-            name 'forge'
-            url 'https://maven.minecraftforge.net'
-        }
-        maven {
-            name 'sonatype'
-            url 'https://oss.sonatype.org/content/repositories/snapshots/'
-        }
-        maven {
-            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.11'
-    }
-}
+//version: 1707058017
 
 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 '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
-}
-
-if (project.file('.git/HEAD').isFile()) {
-    apply plugin: 'com.palantir.git-version'
-}
-
-def out = services.get(StyledTextOutputFactory).create('an-output')
-
-apply plugin: 'forge'
-
-def projectJavaVersion = JavaLanguageVersion.of(8)
-
-java {
-    toolchain {
-        languageVersion.set(projectJavaVersion)
-    }
-}
-
-idea {
-    module {
-        inheritOutputDirs = true
-        downloadJavadoc = true
-        downloadSources = true
-    }
-}
-
-if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
-    throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
-}
-
-checkPropertyExists("modName")
-checkPropertyExists("modId")
-checkPropertyExists("modGroup")
-checkPropertyExists("autoUpdateBuildScript")
-checkPropertyExists("minecraftVersion")
-checkPropertyExists("forgeVersion")
-checkPropertyExists("replaceGradleTokenInFile")
-checkPropertyExists("gradleTokenModId")
-checkPropertyExists("gradleTokenModName")
-checkPropertyExists("gradleTokenVersion")
-checkPropertyExists("gradleTokenGroupName")
-checkPropertyExists("apiPackage")
-checkPropertyExists("accessTransformersFile")
-checkPropertyExists("usesMixins")
-checkPropertyExists("mixinPlugin")
-checkPropertyExists("mixinsPackage")
-checkPropertyExists("coreModClass")
-checkPropertyExists("containsMixinsAndOrCoreModOnly")
-checkPropertyExists("usesShadowedDependencies")
-checkPropertyExists("developmentEnvironmentUserName")
-
-boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
-boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean()
-
-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())) {
-    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())) {
-        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
-    }
-}
-
-if(accessTransformersFile) {
-    String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
-    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!")
-    }
-
-    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(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())) {
-        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
-    }
-}
-
-configurations.all {
-    resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
-
-    // Make sure GregTech build won't time out
-    System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String)
-    System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
-}
-
-// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
-try {
-    'git config core.fileMode false'.execute()
-}
-catch (Exception ignored) {
-    out.style(Style.Failure).println("git isn't installed at all")
-}
-
-// Pulls version first from the VERSION env and then git tag
-String identifiedVersion
-String versionOverride = System.getenv("VERSION") ?: null
-try {
-    identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
-}
-catch (Exception 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.)'
-    )
-    versionOverride = 'NO-GIT-TAG-SET'
-    identifiedVersion = versionOverride
-}
-version = minecraftVersion + '-' + identifiedVersion
-ext {
-    modVersion = identifiedVersion
-}
-
-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) {
-    archivesBaseName = customArchiveBaseName
-}
-else {
-    archivesBaseName = modId
-}
-
-def arguments = []
-def jvmArguments = []
-
-if (usesMixins.toBoolean()) {
-    arguments += [
-        "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
-    ]
-    if (usesMixinDebug.toBoolean()) {
-        jvmArguments += [
-            "-Dmixin.debug.countInjections=true",
-            "-Dmixin.debug.verbose=true",
-            "-Dmixin.debug.export=true"
-        ]
-    }
-}
-
-minecraft {
-    version = minecraftVersion + '-' + forgeVersion + '-' + minecraftVersion
-    runDir = 'run'
-
-    if (replaceGradleTokenInFile) {
-        replaceIn replaceGradleTokenInFile
-        if(gradleTokenModId) {
-            replace gradleTokenModId, modId
-        }
-        if(gradleTokenModName) {
-            replace gradleTokenModName, modName
-        }
-        if(gradleTokenVersion) {
-            replace gradleTokenVersion, modVersion
-        }
-        if(gradleTokenGroupName) {
-            replace gradleTokenGroupName, modGroup
-        }
-    }
-
-    clientIntellijRun {
-        args(arguments)
-        jvmArgs(jvmArguments)
-
-        if(developmentEnvironmentUserName) {
-            args("--username", developmentEnvironmentUserName)
-        }
-    }
-
-    serverIntellijRun {
-        args(arguments)
-        jvmArgs(jvmArguments)
-    }
-}
-
-if(file('addon.gradle').exists()) {
-    apply from: 'addon.gradle'
-}
-
-apply from: 'repositories.gradle'
-
-configurations {
-    implementation.extendsFrom(shadowImplementation)  // TODO: remove after all uses are refactored
-    implementation.extendsFrom(shadowCompile)
-    implementation.extendsFrom(shadeCompile)
-}
-
-repositories {
-    maven {
-        name 'Overmind forge repo mirror'
-        url 'https://gregtech.overminddl1.com/'
-    }
-    if(usesMixins.toBoolean()) {
-        maven {
-            name 'sponge'
-            url 'https://repo.spongepowered.org/repository/maven-public'
-        }
-        maven {
-            url 'https://jitpack.io'
-        }
-    }
-}
-
-dependencies {
-    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')
-        // 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'
-        }
-        compile('com.github.GTNewHorizons:SpongeMixins:1.5.0')
-    }
-}
-
-apply from: 'dependencies.gradle'
-
-def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
-def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
-def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
-
-task generateAssets {
-    if (usesMixins.toBoolean()) {
-        def mixinConfigFile = getFile("/src/main/resources/mixins." + modId + ".json");
-        if (!mixinConfigFile.exists()) {
-            mixinConfigFile.text = """{
-  "required": true,
-  "minVersion": "0.7.11",
-  "package": "${modGroup}.${mixinsPackage}",
-  "plugin": "${modGroup}.${mixinPlugin}",
-  "refmap": "${mixingConfigRefMap}",
-  "target": "@env(DEFAULT)",
-  "compatibilityLevel": "JAVA_8",
-  "mixins": [],
-  "client": [],
-  "server": []
-}
-"""
-        }
-    }
-}
-
-task relocateShadowJar(type: ConfigureShadowRelocation) {
-    target = tasks.shadowJar
-    prefix = modGroup + ".shadow"
-}
-
-shadowJar {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
-    dependsOn(relocateShadowJar)
-}
-
-jar {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    if(usesShadowedDependencies.toBoolean()) {
-        dependsOn(shadowJar)
-        enabled = false
-    }
-}
-
-reobf {
-    if(usesMixins.toBoolean()) {
-        addExtraSrgFile mixinSrg
-    }
-}
-
-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"
-            ]
-        }
-    }
-}
-
-runClient {
-    if(developmentEnvironmentUserName) {
-        arguments += [
-                "--username",
-                developmentEnvironmentUserName
-        ]
-    }
-
-    args(arguments)
-    jvmArgs(jvmArguments)
-}
-
-runServer {
-    args(arguments)
-    jvmArgs(jvmArguments)
-}
-
-tasks.withType(JavaExec).configureEach {
-    javaLauncher.set(
-            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
-
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-
-        // replace modVersion and minecraftVersion
-        expand "minecraftVersion": project.minecraft.version,
-            "modVersion": modVersion,
-            "modId": modId,
-            "modName": modName
-    }
-
-    if(usesMixins.toBoolean()) {
-        from refMap
-    }
-
-    // copy everything else that's not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
-}
-
-def getManifestAttributes() {
-    def manifestAttributes = [:]
-    if(!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
-        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
-    }
-
-    if(accessTransformersFile) {
-        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
-    }
-
-    if(coreModClass) {
-        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
-    }
-
-    if(usesMixins.toBoolean()) {
-        manifestAttributes += [
-                "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"))
-    getArchiveClassifier().set('sources')
-}
-
-task shadowDevJar(type: ShadowJar) {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    from sourceSets.main.output
-    getArchiveClassifier().set("dev")
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
-}
-
-task relocateShadowDevJar(type: ConfigureShadowRelocation) {
-    target = tasks.shadowDevJar
-    prefix = modGroup + ".shadow"
-}
-
-task circularResolverJar(type: Jar) {
-    dependsOn(relocateShadowDevJar)
-    dependsOn(shadowDevJar)
-    enabled = false
-}
-
-task devJar(type: Jar) {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    from sourceSets.main.output
-    getArchiveClassifier().set("dev")
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    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.output) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
-    }
-
-    from (sourceSets.main.resources.srcDirs) {
-        include("LICENSE")
-    }
-
-    getArchiveClassifier().set('api')
-}
-
-artifacts {
-    if(!noPublishedSources) {
-        archives sourcesJar
-    }
-    archives devJar
-    if(apiPackage) {
-        archives apiJar
-    }
-}
-
-// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID),
-// and isn't strictly needed with the POM so just disable it.
-tasks.withType(GenerateModuleMetadata) {
-    enabled = false
-}
-
-// workaround variable hiding in pom processing
-def projectConfigs = project.configurations
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-            if(usesShadowedDependencies.toBoolean()) {
-                artifact source: shadowJar, classifier: ""
-            }
-            if(!noPublishedSources) {
-                artifact source: sourcesJar, classifier: "sources"
-            }
-            artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
-            if (apiPackage) {
-                artifact source: apiJar, classifier: "api"
-            }
-
-            groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons"
-            artifactId = System.getenv("ARTIFACT_ID") ?: project.name
-            // Using the identified version, not project.version as it has the prepended 1.7.10
-            version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
-
-            // remove extra garbage from minecraft and minecraftDeps configuration
-            pom.withXml {
-                def badArtifacts = [:].withDefault {[] as Set<String>}
-                for (configuration in [projectConfigs.minecraft, projectConfigs.minecraftDeps]) {
-                    for (dependency in configuration.allDependencies) {
-                        badArtifacts[dependency.group == null ? "" : dependency.group] += dependency.name
-                    }
-                }
-                // example for specifying extra stuff to ignore
-                // badArtifacts["org.example.group"] += "artifactName"
-
-                Node pomNode = asNode()
-                pomNode.dependencies.'*'.findAll() {
-                    badArtifacts[it.groupId.text()].contains(it.artifactId.text())
-                }.each() {
-                    it.parent().remove(it)
-                }
-            }
-        }
-    }
-
-    repositories {
-        maven {
-            url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
-            credentials {
-                username = System.getenv("MAVEN_USER") ?: "NONE"
-                password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
-            }
-        }
-    }
-}
-
-// Updating
-task updateBuildScript {
-    doLast {
-        if (performBuildScriptUpdate(projectDir.toString())) return
-
-        print("Build script already up-to-date!")
-    }
-}
-
-if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
-    if (autoUpdateBuildScript.toBoolean()) {
-        performBuildScriptUpdate(projectDir.toString())
-    } else {
-        out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
-    }
-}
-
-static URL availableBuildScriptUrl() {
-    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
-}
-
-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!")
-        return true
-    }
-    return false
-}
-
-boolean isNewBuildScriptVersionAvailable(String projectDir) {
-    Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
-
-    String currentBuildScript = getFile("build.gradle").getText()
-    String currentBuildScriptHash = getVersionHash(currentBuildScript)
-    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
-    String availableBuildScriptHash = getVersionHash(availableBuildScript)
-
-    boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
-    return !isUpToDate
-}
-
-static String getVersionHash(String buildScriptContent) {
-    String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
-    if(versionLine != null) {
-        return versionLine.split(": ").last()
-    }
-    return ""
-}
-
-configure(updateBuildScript) {
-    group = 'forgegradle'
-    description = 'Updates the build script to the latest version'
-}
-
-// Deobfuscation
-
-def deobf(String sourceURL) {
-    try {
-        URL url = new URL(sourceURL)
-        String fileName = url.getFile()
-
-        //get rid of directories:
-        int lastSlash = fileName.lastIndexOf("/")
-        if(lastSlash > 0) {
-            fileName = fileName.substring(lastSlash + 1)
-        }
-        //get rid of extension:
-        if(fileName.endsWith(".jar")) {
-            fileName = fileName.substring(0, fileName.lastIndexOf("."))
-        }
-
-        String hostName = url.getHost()
-        if(hostName.startsWith("www.")) {
-            hostName = hostName.substring(4)
-        }
-        List parts = Arrays.asList(hostName.split("\\."))
-        Collections.reverse(parts)
-        hostName = String.join(".", parts)
-
-        return deobf(sourceURL, hostName + "/" + fileName)
-    } catch(Exception e) {
-        return deobf(sourceURL, "deobf/" + String.valueOf(sourceURL.hashCode()))
-    }
-}
-
-// The method above is to be preferred. Use this method if the filename is not at the end of the URL.
-def deobf(String sourceURL, String fileName) {
-    String cacheDir = System.getProperty("user.home") + "/.gradle/caches/"
-    String bon2Dir = cacheDir + "forge_gradle/deobf"
-    String bon2File  = bon2Dir + "/BON2-2.5.0.jar"
-    String obfFile = cacheDir + "modules-2/files-2.1/" + fileName + ".jar"
-    String deobfFile = cacheDir + "modules-2/files-2.1/" + fileName + "-deobf.jar"
-
-    if(file(deobfFile).exists()) {
-        return files(deobfFile)
-    }
-
-    download.run {
-        src 'https://github.com/GTNewHorizons/BON2/releases/download/2.5.0/BON2-2.5.0.CUSTOM-all.jar'
-        dest bon2File
-        quiet true
-        overwrite false
-    }
-
-    download.run {
-        src sourceURL
-        dest obfFile
-        quiet true
-        overwrite false
-    }
-
-    exec {
-        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', '1.7.10', '--mappingsVer', 'stable_12', '--notch'
-        workingDir bon2Dir
-        standardOutput = new ByteArrayOutputStream()
-    }
-
-    return files(deobfFile)
-}
-
-// Helper methods
-
-def checkPropertyExists(String propertyName) {
-    if (!project.hasProperty(propertyName)) {
-        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)
+    id 'com.gtnewhorizons.gtnhconvention'
 }

dependencies.gradle

@@ -1,26 +1,55 @@
-// Add your dependencies here
-
+/*
+ * Add your dependencies here. Supported configurations:
+ *  - api("group:name:version:classifier"): if you use the types from this dependency in the public API of this mod
+ *       Available at runtime and compiletime for mods depending on this mod
+ *  - implementation("g:n:v:c"): if you need this for internal implementation details of the mod, but none of it is visible via the public API
+ *       Available at runtime but not compiletime for mods depending on this mod
+ *  - compileOnly("g:n:v:c"): if the mod you're building doesn't need this dependency during runtime at all, e.g. for optional mods
+ *       Not available at all for mods depending on this mod, only visible at compiletime for this mod
+ *  - compileOnlyApi("g:n:v:c"): like compileOnly, but also visible at compiletime for mods depending on this mod
+ *       Available at compiletime but not runtime for mods depending on this mod
+ *  - runtimeOnlyNonPublishable("g:n:v:c"): if you want to include a mod in this mod's runClient/runServer runs, but not publish it as a dependency
+ *       Not available at all for mods depending on this mod, only visible at runtime for this mod
+ *  - devOnlyNonPublishable("g:n:v:c"): a combination of runtimeOnlyNonPublishable and compileOnly for dependencies present at both compiletime and runtime,
+ *       but not published as Maven dependencies - useful for RFG-deobfuscated dependencies or local testing
+ *  - runtimeOnly("g:n:v:c"): if you don't need this at compile time, but want it to be present at runtime
+ *       Available at runtime for mods depending on this mod
+ *  - annotationProcessor("g:n:v:c"): mostly for java compiler plugins, if you know you need this, use it, otherwise don't worry
+ *  - testCONFIG("g:n:v:c") - replace CONFIG by one of the above (except api), same as above but for the test sources instead of main
+ *
+ *  - shadowImplementation("g:n:v:c"): effectively the same as API, but the dependency is included in your jar under a renamed package name
+ *       Requires you to enable usesShadowedDependencies in gradle.properties
+ *
+ *  - compile("g:n:v:c"): deprecated, replace with "api" (works like the old "compile") or "implementation" (can be more efficient)
+ *
+ * You can exclude transitive dependencies (dependencies of the chosen dependency) by appending { transitive = false } if needed,
+ * but use this sparingly as it can break using your mod as another mod's dependency if you're not careful.
+ *
+ * To depend on obfuscated jars you can use `devOnlyNonPublishable(rfg.deobf("dep:spec:1.2.3"))` to fetch an obfuscated jar from maven,
+ * or `devOnlyNonPublishable(rfg.deobf(project.files("libs/my-mod-jar.jar")))` to use a file.
+ *
+ * Gradle names for some of the configuration can be misleading, compileOnlyApi and runtimeOnly both get published as dependencies in Maven, but compileOnly does not.
+ * The buildscript adds runtimeOnlyNonPublishable to also have a runtime dependency that's not published.
+ *
+ * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
+ */
 dependencies {
-    compile('com.github.GTNewHorizons:NotEnoughItems:2.3.10-GTNH:dev')
-    compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-117-GTNH:dev')
-    compile('curse.maven:cofh-core-69162:2388751')
-    compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.25:dev') { transitive = false }
-    compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.9.2:dev")
+    api('com.github.GTNewHorizons:NotEnoughItems:2.8.160-GTNH:dev')
+    api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-1078-GTNH:dev')
+    api('com.github.GTNewHorizons:waila:1.19.34:dev')
+    api("com.github.GTNewHorizons:GTNHLib:0.11.52:dev")
 
-    compileOnly('com.github.GTNewHorizons:ForestryMC:4.4.7:dev')
-    compileOnly('com.github.GTNewHorizons:EnderIO:2.3.1.27:dev')
-    compileOnly('com.github.GTNewHorizons:EnderCore:0.2.6:dev')
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.41:dev')
-    compileOnly('com.github.GTNewHorizons:StructureLib:1.0.15:dev')
-    compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
-    compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
-    compileOnly('com.github.GTNewHorizons:AppleCore:3.1.9:dev') { transitive = false }
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.27:dev') { transitive = false }
-    compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.7.5.23-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.3.19-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:EnderIO:2.3.1.29:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GTplusplus:1.7.49:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.25-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.64:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false }
+    compileOnly('com.github.GTNewHorizons:ForestryMC:4.11.39:dev')
+    compileOnly('com.github.GTNewHorizons:EnderIO:2.10.49:dev')
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.64-GTNH:dev') { transitive = false }
 
-    runtime('com.github.GTNewHorizons:Baubles:1.0.1.14:dev')
+    compileOnly("org.jetbrains:annotations:26.1.0")
+
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.4.6:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.16:dev") {
+        exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial'
+    }
 }

gradle.properties

@@ -1,67 +1,243 @@
-modName = Fluid Craft For AE2
+# ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable.
+# LOCAL to test local config updates.
+gtnh.settings.blowdryerTag = 0.2.0
 
-# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+# Human-readable mod name, available for mcmod.info population.
+modName = AE2 Fluid Crafting
+
+# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation.
+# Conventionally lowercase.
 modId = ae2fc
 
+# Root package of the mod, used to find various classes in other properties,
+# mcmod.info substitution, enabling assertions in run tasks, etc.
 modGroup = com.glodblock.github
 
-# WHY is there no version field?
-# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
-# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
+# Whether to use modGroup as the maven publishing group.
+# When false, com.github.GTNewHorizons is used.
+useModGroupForPublishing = false
 
-# Will update your build.gradle automatically whenever an update is available
+# Updates your build.gradle and settings.gradle automatically whenever an update is available.
 autoUpdateBuildScript = false
 
+# Version of Minecraft to target
 minecraftVersion = 1.7.10
+
+# Version of Minecraft Forge to target
 forgeVersion = 10.13.4.1614
 
-# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you
-# restart Minecraft in development. Choose this dependent on your mod:
-# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
-# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
+# Specify an MCP channel for dependency deobfuscation and the deobfParams task.
+channel = stable
+
+# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task.
+mappingsVersion = 12
+
+# Defines other MCP mappings for dependency deobfuscation.
+remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
+
+# Select a default username for testing your mod. You can always override this per-run by running
+# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
 developmentEnvironmentUserName = Developer
 
-# Define a source file of your project with:
+# Enables modern Java syntax support. Valid values:
+# - false: No modern syntax, Java 8 only
+# - jabel: Jabel syntax-only support, compiles to J8 bytecode
+# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
+# - modern: Native modern Java bytecode, no downgrading
+enableModernJavaSyntax = jabel
+
+# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
+# and should *not* be used in most situations. -1 disables this.
+# forceToolchainVersion = -1
+
+# Target JVM version for JVM Downgrader bytecode downgrading.
+# Only used when enableModernJavaSyntax = jvmDowngrader
+# downgradeTargetVersion = 8
+
+# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
+# Classes will be available in META-INF/versions/N/ for each version N in this list.
+# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
+# jvmDowngraderMultiReleaseVersions = 21,25
+
+# Specifies how JVM Downgrader API stubs are provided. Options:
+# - shade: Shade minimized stubs into the jar
+# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
+# - external: Another dependency provides stubs (no constraint, no warning)
+# - (empty): Warning reminding you to configure stubs
+# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
+# jvmDowngraderStubsProvider =
+
+# Enables injecting missing generics into the decompiled source code for a better coding experience.
+# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
+enableGenericInjection = true
+
+# Generate a class with a String field for the mod version named as defined below.
+# If generateGradleTokenClass is empty or not missing, no such class will be generated.
+# If gradleTokenVersion is empty or missing, the field will not be present in the class.
+generateGradleTokenClass = com.glodblock.github.FCTags
+
+# Name of the token containing the project's current version to generate/replace.
+gradleTokenVersion = VERSION
+
+# [DEPRECATED] Mod ID replacement token.
+gradleTokenModId =
+
+# [DEPRECATED] Mod name replacement token.
+gradleTokenModName =
+
+# [DEPRECATED] Mod Group replacement token.
+gradleTokenGroupName =
+
+# [DEPRECATED]
+# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
 # public static final String VERSION = "GRADLETOKEN_VERSION";
-# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's
-# version in @Mod([...], version = VERSION, [...])
-# Leave these properties empty to skip individual token replacements
-replaceGradleTokenInFile = FluidCraft.java
-gradleTokenModId = GRADLETOKEN_MODID
-gradleTokenModName = GRADLETOKEN_MODNAME
-gradleTokenVersion = GRADLETOKEN_VERSION
-gradleTokenGroupName = GRADLETOKEN_GROUPNAME
+# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
+# version in @Mod([...], version = VERSION, [...]).
+# Leave these properties empty to skip individual token replacements.
+replaceGradleTokenInFile =
 
 # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
 # leave this property empty.
-# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
-apiPackage =
+# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api
+apiPackage = api
 
-# Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/
-# Example value: mymodid_at.cfg
+# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
+# There can be multiple files in a space-separated list.
+# Example value: mymodid_at.cfg nei_at.cfg
 accessTransformersFile = ae2fc_at.cfg
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
+
+# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
+# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
+# Mixin classes will have access to "main" classes, but not the other way around.
+separateMixinSourceSet =
+
+# Adds some debug arguments like verbose output and class export.
+usesMixinDebug = false
+
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+
+# Specify the package that contains all of your Mixins. The package must exist or
+# the build will fail. If you have a package property defined in your mixins.<modid>.json,
+# it must match with this or the build will fail.
 mixinsPackage =
+
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
 # This parameter is for legacy compatibility only
-# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
-coreModClass = coremod.FluidCraftCore
+# Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin
+coreModClass =
+
 # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
 # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
 containsMixinsAndOrCoreModOnly = false
 
-# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated in your jar. It is your
-# responsibility check the licence and request permission for distribution, if required.
+# 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 'shadowCompile' for dependencies. They will be integrated into your jar. It is your
+# responsibility to check the license and request permission for distribution if required.
 usesShadowedDependencies = false
 
-# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
-# projects. New projects should not use this parameter.
-#customArchiveBaseName =
+# If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access
+# their own classes, making the minimization unreliable.
+minimizeShadowedDependencies = true
 
-# Optional parameter to prevent the source code from being published
-# noPublishedSources =
+# If disabled, won't rename the shadowed classes.
+relocateShadowedDependencies = true
+
+# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
+includeWellKnownRepositories = true
+
+# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
+# list of strings, with the acceptable keys being(case does not matter):
+# cursemaven
+# modrinth
+excludeWellKnownRepositories =
+
+# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
+# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
+# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
+usesMavenPublishing = true
+
+# Maven repository to publish the mod to.
+# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
+
+# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
+#
+# The project's ID on Modrinth. Can be either the slug or the ID.
+# Leave this empty if you don't want to publish to Modrinth.
+modrinthProjectId =
+
+# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
+# Syntax: scope1-type1:name1;scope2-type2:name2;...
+# Where scope can be one of [required, optional, incompatible, embedded],
+#       type can be one of [project, version],
+#       and the name is the Modrinth project or version slug/id of the other mod.
+# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
+modrinthRelations =
+
+# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
+#
+# The project's numeric ID on CurseForge. You can find this in the About Project box.
+# Leave this empty if you don't want to publish on CurseForge.
+curseForgeProjectId =
+
+# Comma-separated supported CurseForge environments: client, server (case-insensitive).
+# Use client or server for mods that only support one environment. Defaults to client,server.
+# These tags describe where the mod can run, not whether installation is required on both sides.
+curseForgeEnvironments = client,server
+
+# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
+# Syntax: type1:name1;type2:name2;...
+# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
+#       and the name is the CurseForge project slug of the other mod.
+# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
+curseForgeRelations =
+
+# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older
+# projects. New projects should not use this parameter.
+# customArchiveBaseName =
+
+# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
+# runClientWorkingDirectory = run/client
+
+# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
+# runServerWorkingDirectory = run/server
+
+# Optional parameter to have the build automatically fail if an illegal version is used.
+# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
+# The check is ONLY performed if the version is a git tag.
+# Note: the specified string must be escaped, so e.g. 1\\.1\\.\\d+ instead of 1\.1\.\d+
+# versionPattern =
+
+# Uncomment to prevent the source code from being published.
+# noPublishedSources = true
+
+# Uncomment this to disable Spotless checks.
+# This should only be uncommented to keep it easier to sync with upstream/other forks.
+# That is, if there is no other active fork/upstream, NEVER change this.
+# disableSpotless = true
+
+# Uncomment this to disable Checkstyle checks (currently wildcard import check).
+# disableCheckstyle = true
+
+# Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle"
+# (force use delegated build).
+# This is meant to be set in $HOME/.gradle/gradle.properties.
+# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be native build.
+# WARNING: If you do use this option, it will overwrite whatever you have in your existing projects. This might not be what you want!
+# Usually there is no need to uncomment this here as other developers do not necessarily use the same build type as you.
+# ideaOverrideBuildType = idea
+
+# Whether IDEA should run spotless checks when pressing the Build button.
+# This is meant to be set in $HOME/.gradle/gradle.properties.
+# ideaCheckSpotlessOnBuild = true
+
+# Non-GTNH properties
+org.gradle.configuration-cache = true
+org.gradle.parallel = true

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9064f22734b42ac03e85df04b632e167/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/4d0277c49991306ac78048580fe34bcf/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a9fa3b809e484a1e1ac4308a5dda661a/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/aa99913fa6d767d899ffc96082da01ca/redirect
+toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
+networkTimeout=10000
+retries=0
+retryBackOffMs=500
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,79 +1,128 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright © 2015 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   gradlew start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh gradlew
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
-warn ( ) {
+warn () {
     echo "$*"
-}
+} >&2
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -82,83 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,82 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  gradlew startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+"%COMSPEC%" /c exit 1
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+"%COMSPEC%" /c exit 1
+
+:execute
+@rem Setup the command line
+
+
+
+@rem Execute gradlew
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
+
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%

repositories.gradle

@@ -1,31 +1,5 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
-    maven {
-        name 'GTNH Maven'
-        url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
-        allowInsecureProtocol
-    }
-    maven {
-        name 'ic2'
-        url 'https://maven.ic2.player.to/'
-        metadataSources {
-            mavenPom()
-            artifact()
-        }
-
-    }
-    maven {
-        name 'gt'
-        url 'https://gregtech.overminddl1.com/'
-    }
-    maven {
-        url 'https://cursemaven.com'
-        content {
-            includeGroup 'curse.maven'
-        }
-    }
-    maven {
-        url 'https://jitpack.io'
-    }
+    mavenLocal()
 }

settings.gradle

@@ -0,0 +1,23 @@
+
+pluginManagement {
+    repositories {
+        maven {
+            // RetroFuturaGradle
+            name "GTNH Maven"
+            url "https://nexus.gtnewhorizons.com/repository/public/"
+            mavenContent {
+                includeGroup("com.gtnewhorizons")
+                includeGroupByRegex("com\\.gtnewhorizons\\..+")
+            }
+        }
+        gradlePluginPortal()
+        mavenCentral()
+        mavenLocal()
+    }
+}
+
+plugins {
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.34'
+}
+
+

src/main/java/com/glodblock/github/FluidCraft.java

@@ -1,16 +1,19 @@
 package com.glodblock.github;
 
-import appeng.api.AEApi;
-import appeng.api.config.Upgrades;
+import net.minecraft.util.ResourceLocation;
+
 import com.glodblock.github.common.Config;
-import com.glodblock.github.common.storage.FluidCellHandler;
 import com.glodblock.github.crossmod.opencomputers.OCDriverInit;
+import com.glodblock.github.crossmod.waila.WailaInit;
 import com.glodblock.github.inventory.InventoryHandler;
 import com.glodblock.github.loader.ChannelLoader;
 import com.glodblock.github.loader.ItemAndBlockHolder;
 import com.glodblock.github.loader.RecipeLoader;
 import com.glodblock.github.proxy.CommonProxy;
+import com.glodblock.github.util.FluidCellHandler;
 import com.glodblock.github.util.ModAndClassUtil;
+
+import appeng.api.AEApi;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -18,75 +21,69 @@ import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
 
-@Mod(modid = FluidCraft.MODID, version = FluidCraft.VERSION, name = FluidCraft.MODNAME, dependencies = "required-after:appliedenergistics2")
+@Mod(
+        modid = FluidCraft.MODID,
+        version = FluidCraft.VERSION,
+        name = FluidCraft.MODNAME,
+        dependencies = "required-after:appliedenergistics2@[rv3-beta-238,);after:waila;after:thaumicenergistics;after:ae2wct")
 public class FluidCraft {
 
-    public static final String MODID = "GRADLETOKEN_MODID";
-    public static final String VERSION = "GRADLETOKEN_VERSION";
-    public static final String MODNAME = "GRADLETOKEN_MODNAME";
+    public static final String MODID = "ae2fc";
+    public static final String VERSION = FCTags.VERSION;
+    public static final String MODNAME = "AE2 Fluid Crafting";
 
     @Mod.Instance(MODID)
     public static FluidCraft INSTANCE;
 
-    @SidedProxy(clientSide = "com.glodblock.github.proxy.ClientProxy", serverSide = "com.glodblock.github.proxy.CommonProxy")
+    @SidedProxy(
+            clientSide = "com.glodblock.github.proxy.ClientProxy",
+            serverSide = "com.glodblock.github.proxy.CommonProxy")
     public static CommonProxy proxy;
 
     @Mod.EventHandler
     public static void preInit(FMLPreInitializationEvent event) {
         Config.run();
-        (new ChannelLoader()).run();
+        ChannelLoader.INSTANCE.run();
         proxy.preInit(event);
     }
 
     @Mod.EventHandler
     public static void init(FMLInitializationEvent event) {
-        ModAndClassUtil.init();
         if (ModAndClassUtil.OC) {
             OCDriverInit.run();
         }
+        if (ModAndClassUtil.WAILA) {
+            WailaInit.run();
+        }
         proxy.init(event);
     }
 
     @Mod.EventHandler
     public static void postInit(FMLPostInitializationEvent event) {
         NetworkRegistry.INSTANCE.registerGuiHandler(FluidCraft.INSTANCE, new InventoryHandler());
-
         AEApi.instance().registries().cell().addCellHandler(new FluidCellHandler());
         ItemAndBlockHolder.loadSetting();
 
         if (!Config.removeRecipe) {
-            (new RecipeLoader()).run();
+            RecipeLoader.INSTANCE.run();
         }
-
-        if (ModAndClassUtil.isBigInterface) {
-            Upgrades.PATTERN_CAPACITY.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_INTERFACE), 3 );
-            Upgrades.PATTERN_CAPACITY.registerItem(new ItemStack(ItemAndBlockHolder.INTERFACE), 3 );
-        }
-        Upgrades.CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_INTERFACE), 1 );
-        Upgrades.CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.INTERFACE), 1 );
-
-        if (Config.fluidIOBus) {
-            Upgrades.CAPACITY.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 2 );
-            Upgrades.CAPACITY.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_IMPORT_BUS), 2 );
-            Upgrades.REDSTONE.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 1 );
-            Upgrades.REDSTONE.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_IMPORT_BUS), 1 );
-            Upgrades.SPEED.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 4 );
-            Upgrades.SPEED.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_IMPORT_BUS), 4 );
-            Upgrades.CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 1 );
+        if (!ModAndClassUtil.NEW_HORIZONS_CORE_MOD) {
+            RecipeLoader.addTerminalCards();
+            RecipeLoader.addInfiniteWaterCell();
         }
+        RecipeLoader.runTerminalRecipe();
+        RecipeLoader.addDisassembleRecipe();
 
         proxy.postInit(event);
     }
 
     @Mod.EventHandler
     public void onLoadComplete(FMLLoadCompleteEvent event) {
+        proxy.onLoadComplete(event);
     }
 
     public static ResourceLocation resource(String path) {
         return new ResourceLocation(MODID, path);
     }
-
 }

src/main/java/com/glodblock/github/api/FluidCraftAPI.java

@@ -0,0 +1,53 @@
+package com.glodblock.github.api;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import net.minecraftforge.fluids.Fluid;
+
+import com.glodblock.github.api.registries.ILevelTerminalRegistry;
+import com.glodblock.github.util.LevelTerminalRegistry;
+
+public final class FluidCraftAPI implements IFluidCraftAPI {
+
+    private static final FluidCraftAPI API = new FluidCraftAPI();
+
+    /**
+     * These fluids will not be allowed to be stored in fluid storage cells.
+     */
+    private final Set<Class<? extends Fluid>> blacklistedFluids = new HashSet<>();
+
+    /**
+     * These fluids will not be displayed in a fluid terminal.
+     */
+    private final Set<Class<? extends Fluid>> blacklistedDispFluids = new HashSet<>();
+
+    public static FluidCraftAPI instance() {
+        return API;
+    }
+
+    @Override
+    public void blacklistFluidInStorage(Class<? extends Fluid> fluid) {
+        blacklistedFluids.add(fluid);
+    }
+
+    @Override
+    public void blacklistFluidInDisplay(Class<? extends Fluid> fluid) {
+        blacklistedDispFluids.add(fluid);
+    }
+
+    @Override
+    public boolean isBlacklistedInStorage(Class<? extends Fluid> fluid) {
+        return blacklistedFluids.contains(fluid);
+    }
+
+    @Override
+    public boolean isBlacklistedInDisplay(Class<? extends Fluid> fluid) {
+        return blacklistedDispFluids.contains(fluid);
+    }
+
+    @Override
+    public ILevelTerminalRegistry levelTerminalRegistry() {
+        return LevelTerminalRegistry.instance();
+    }
+}

src/main/java/com/glodblock/github/api/IFluidCraftAPI.java

@@ -0,0 +1,34 @@
+package com.glodblock.github.api;
+
+import net.minecraftforge.fluids.Fluid;
+
+import com.glodblock.github.api.registries.ILevelTerminalRegistry;
+
+@SuppressWarnings("unused")
+public interface IFluidCraftAPI {
+
+    /**
+     * Blacklisted fluids will not be allowed to be added to a storage cell.
+     */
+    void blacklistFluidInStorage(Class<? extends Fluid> fluid);
+
+    /**
+     * Blacklisted fluids will not be displayed in fluid terminals.
+     */
+    void blacklistFluidInDisplay(Class<? extends Fluid> fluid);
+
+    /**
+     * Mostly for internal use; queries whether the fluid is blacklisted from storage cells.
+     */
+    boolean isBlacklistedInStorage(Class<? extends Fluid> fluid);
+
+    /**
+     * Mostly for internal use; queries whether the fluid is blacklisted from being displayed.
+     */
+    boolean isBlacklistedInDisplay(Class<? extends Fluid> fluid);
+
+    /**
+     * Get instance of `ILevelTerminalRegistry` to add new supported machines into terminal
+     */
+    ILevelTerminalRegistry levelTerminalRegistry();
+}

src/main/java/com/glodblock/github/api/ISide.java

@@ -0,0 +1,8 @@
+package com.glodblock.github.api;
+
+import net.minecraftforge.common.util.ForgeDirection;
+
+public interface ISide {
+
+    ForgeDirection getSide();
+}

src/main/java/com/glodblock/github/api/registries/ILevelTerminalRegistry.java

@@ -0,0 +1,21 @@
+package com.glodblock.github.api.registries;
+
+import java.util.Set;
+
+import appeng.api.features.ILevelViewable;
+import appeng.api.networking.IGridHost;
+
+public interface ILevelTerminalRegistry {
+
+    void register(Class<? extends ILevelViewable> clazz);
+
+    void register(Class<? extends IGridHost> aeClass, ILevelViewableAdapter adapter);
+
+    Set<Class<? extends ILevelViewable>> getSupportedClasses();
+
+    boolean isAdopted(Class<? extends ILevelViewable> clazz);
+
+    Class<? extends IGridHost> getAdopted(Class<? extends ILevelViewable> clazz);
+
+    ILevelViewableAdapter getAdapter(Class<? extends ILevelViewable> clazz);
+}

src/main/java/com/glodblock/github/api/registries/ILevelViewableAdapter.java

@@ -0,0 +1,9 @@
+package com.glodblock.github.api.registries;
+
+import appeng.api.features.ILevelViewable;
+import appeng.api.networking.IGridHost;
+
+public interface ILevelViewableAdapter extends ILevelViewable {
+
+    ILevelViewable adapt(IGridHost gridHost);
+}

src/main/java/com/glodblock/github/client/ClientHelper.java

@@ -1,21 +1,20 @@
 package com.glodblock.github.client;
 
-import com.glodblock.github.client.textures.FCPartsTexture;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.MinecraftForge;
 
+import com.glodblock.github.client.textures.FCPartsTexture;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+
 public class ClientHelper {
 
     @SubscribeEvent
-    public void updateTextureSheet( final TextureStitchEvent.Pre ev )
-    {
-        if( ev.map.getTextureType() == 0 )
-        {
-            for( final FCPartsTexture cb : FCPartsTexture.values() )
-            {
-                cb.registerIcon( ev.map );
+    public void updateTextureSheet(final TextureStitchEvent.Pre ev) {
+        if (ev.map.getTextureType() == 0) {
+            for (final FCPartsTexture cb : FCPartsTexture.values()) {
+                cb.registerIcon(ev.map);
             }
         }
     }
@@ -25,5 +24,4 @@ public class ClientHelper {
         MinecraftForge.EVENT_BUS.register(handler);
         FMLCommonHandler.instance().bus().register(handler);
     }
-
 }

src/main/java/com/glodblock/github/client/FluidInterfaceButtons.java

@@ -0,0 +1,98 @@
+package com.glodblock.github.client;
+
+import java.util.List;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.StatCollector;
+
+import org.lwjgl.input.Mouse;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.loader.ItemAndBlockHolder;
+import com.glodblock.github.network.CPacketCustomButtonUpdate;
+import com.glodblock.github.network.CPacketSwitchGuis;
+
+import appeng.api.config.Settings;
+import appeng.api.config.SidelessMode;
+import appeng.client.gui.widgets.GuiImgButton;
+import appeng.client.gui.widgets.GuiTabButton;
+import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.PacketConfigButton;
+import appeng.helpers.ICustomButtonDataObject;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+
+public class FluidInterfaceButtons implements ICustomButtonDataObject {
+
+    private GuiImgButton sidelessMode;
+    private GuiTabButton switcher;
+    private final boolean fullBlock;
+    public SidelessMode sidelessSate;
+
+    public FluidInterfaceButtons(final boolean fullBlock) {
+        this.fullBlock = fullBlock;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void initCustomButtons(int guiLeft, int guiTop, int xSize, int ySize, int xOffset, int yOffset,
+            List<GuiButton> buttonList) {
+        if (fullBlock) {
+            this.sidelessMode = new GuiImgButton(
+                    guiLeft - 18,
+                    guiTop + yOffset,
+                    Settings.SIDELESS_MODE,
+                    SidelessMode.SIDELESS);
+            buttonList.add(this.sidelessMode);
+        }
+
+        this.switcher = new GuiTabButton(
+                guiLeft + 132,
+                guiTop,
+                !fullBlock ? ItemAndBlockHolder.FLUID_INTERFACE.stack() : ItemAndBlockHolder.INTERFACE.stack(),
+                StatCollector.translateToLocal("ae2fc.tooltip.switch_fluid_interface"),
+                RenderItem.getInstance());
+        buttonList.add(this.switcher);
+
+        FluidCraft.proxy.netHandler.sendToServer(new CPacketCustomButtonUpdate());
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public boolean actionPerformedCustomButtons(final GuiButton btn) {
+        if (btn == this.switcher) {
+            FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis());
+            return true;
+        } else if (fullBlock && btn == this.sidelessMode) {
+            final boolean backwards = Mouse.isButtonDown(1);
+            NetworkHandler.instance.sendToServer(new PacketConfigButton(this.sidelessMode.getSetting(), backwards));
+            FluidCraft.proxy.netHandler.sendToServer(new CPacketCustomButtonUpdate());
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public void readData(NBTTagCompound tag) {}
+
+    @Override
+    public void writeData(NBTTagCompound tag) {}
+
+    @Override
+    public void readByte(ByteBuf buf) {
+        this.sidelessMode.set(SidelessMode.values()[buf.readInt()]);
+    }
+
+    @Override
+    public void writeByte(ByteBuf buf) {
+        buf.writeInt(this.sidelessSate.ordinal());
+    }
+
+    public void setSidelessMode(SidelessMode sm) {
+        this.sidelessSate = sm;
+    }
+}

src/main/java/com/glodblock/github/client/UltraTerminalButtons.java

@@ -0,0 +1,246 @@
+package com.glodblock.github.client;
+
+import static appeng.util.Platform.nextEnum;
+import static com.glodblock.github.common.item.ItemWirelessUltraTerminal.MODE;
+import static com.glodblock.github.inventory.item.WirelessMagnet.modeKey;
+
+import java.util.List;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.gui.GuiFCImgButton;
+import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
+import com.glodblock.github.inventory.item.WirelessMagnet;
+import com.glodblock.github.network.CPacketFluidPatternTermBtns;
+import com.glodblock.github.network.CPacketSwitchGuis;
+import com.glodblock.github.util.UltraTerminalModes;
+
+import appeng.helpers.ICustomButtonDataObject;
+import appeng.util.Platform;
+import io.netty.buffer.ByteBuf;
+
+public class UltraTerminalButtons implements ICustomButtonDataObject {
+
+    public static String restockItems = "restock";
+
+    private ItemStack terminal;
+
+    private GuiFCImgButton CraftingTerminal;
+    private GuiFCImgButton PatternTerminal;
+    private GuiFCImgButton InterfaceTerminal;
+    private GuiFCImgButton LevelTerminal;
+    private GuiFCImgButton PatternTerminalEx;
+
+    private GuiFCImgButton magnetOff;
+    private GuiFCImgButton magnetInv;
+    private GuiFCImgButton magnetME;
+
+    private GuiFCImgButton magnetFilter;
+
+    private GuiFCImgButton restockEnableBtn;
+    private GuiFCImgButton restockDisableBtn;
+
+    private WirelessMagnet.Mode magnetMode;
+    private boolean reStock;
+    public UltraTerminalModes terminalMode;
+
+    private int offset;
+
+    public UltraTerminalButtons(ItemStack terminal) {
+        this.terminal = terminal;
+    }
+
+    public void initCustomButtons(int guiLeft, int guiTop, int xSize, int ySize, int xOffset, int yOffset,
+            List<GuiButton> buttonList) {
+        this.offset = yOffset;
+        buttonList.add(
+                this.magnetOff = new GuiFCImgButton(guiLeft + xSize - 17, guiTop + ySize - 65, "MAGNET_CARD", "OFF"));
+        buttonList.add(
+                this.magnetInv = new GuiFCImgButton(guiLeft + xSize - 17, guiTop + ySize - 65, "MAGNET_CARD", "INV"));
+        buttonList.add(
+                this.magnetME = new GuiFCImgButton(guiLeft + xSize - 17, guiTop + ySize - 65, "MAGNET_CARD", "ME"));
+
+        buttonList.add(
+                this.magnetFilter = new GuiFCImgButton(
+                        guiLeft + xSize - 17,
+                        guiTop + ySize - 45,
+                        "MAGNET_CARD",
+                        "FILTER"));
+        buttonList.add(
+                this.restockEnableBtn = new GuiFCImgButton(
+                        guiLeft + xSize - 17,
+                        guiTop + ySize - 25,
+                        "RESTOCK",
+                        "ENABLE"));
+
+        buttonList.add(
+                this.restockDisableBtn = new GuiFCImgButton(
+                        guiLeft + xSize - 17,
+                        guiTop + ySize - 25,
+                        "RESTOCK",
+                        "DISABLE"));
+
+        buttonList.add(this.CraftingTerminal = new GuiFCImgButton(guiLeft - 18, yOffset, "CRAFT_TEM", "YES"));
+
+        buttonList.add(this.PatternTerminal = new GuiFCImgButton(guiLeft - 18, yOffset, "PATTERN_TEM", "YES"));
+
+        buttonList.add(this.PatternTerminalEx = new GuiFCImgButton(guiLeft - 18, yOffset, "PATTERN_EX_TEM", "YES"));
+
+        buttonList.add(this.InterfaceTerminal = new GuiFCImgButton(guiLeft - 18, yOffset, "INTERFACE_TEM", "YES"));
+
+        buttonList.add(this.LevelTerminal = new GuiFCImgButton(guiLeft - 18, yOffset, "LEVEL_TEM", "YES"));
+
+        toggleSwitchButtons();
+        toggleMagnetButtonsVisibility();
+        toggleRestockVisibility();
+    }
+
+    @Override
+    public boolean actionPerformedCustomButtons(final GuiButton btn) {
+        if (btn instanceof GuiFCImgButton) {
+            UltraTerminalModes mode = null;
+            if (btn == this.CraftingTerminal) {
+                mode = UltraTerminalModes.CRAFTING;
+            } else if (btn == this.PatternTerminal) {
+                mode = UltraTerminalModes.PATTERN;
+            } else if (btn == this.InterfaceTerminal) {
+                mode = UltraTerminalModes.INTERFACE;
+            } else if (btn == this.LevelTerminal) {
+                mode = UltraTerminalModes.LEVEL;
+            } else if (btn == this.PatternTerminalEx) {
+                mode = UltraTerminalModes.PATTERN_EX;
+            }
+            if (mode != null) {
+                ItemWirelessUltraTerminal.setMode(this.terminal, mode);
+                FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(mode, true));
+            }
+
+            if (btn == this.magnetOff || btn == this.magnetME || btn == this.magnetInv) {
+                FluidCraft.proxy.netHandler.sendToServer(
+                        new CPacketFluidPatternTermBtns(
+                                CPacketFluidPatternTermBtns.Command.MAGNET_MODE,
+                                this.magnetMode.ordinal()));
+            } else if (btn == this.magnetFilter) FluidCraft.proxy.netHandler.sendToServer(
+                    new CPacketFluidPatternTermBtns(CPacketFluidPatternTermBtns.Command.MAGNET_OPEN_FILTER, 0));
+            else if (btn == this.restockDisableBtn || btn == this.restockEnableBtn) {
+                FluidCraft.proxy.netHandler
+                        .sendToServer(new CPacketFluidPatternTermBtns(CPacketFluidPatternTermBtns.Command.RESTOCK, 1));
+            }
+
+            return true;
+        }
+        return false;
+    }
+
+    public void toggleRestock() {
+        this.reStock = !this.reStock;
+    }
+
+    public void toggleRestockVisibility() {
+        if (Platform.isClient()) {
+            if (this.reStock) {
+                this.restockEnableBtn.setVisibility(true);
+                this.restockDisableBtn.setVisibility(false);
+            } else {
+                this.restockEnableBtn.setVisibility(false);
+                this.restockDisableBtn.setVisibility(true);
+            }
+        }
+    }
+
+    public void toggleMagnetMode() {
+        this.magnetMode = nextEnum(this.magnetMode);
+    }
+
+    public void toggleMagnetButtonsVisibility() {
+        switch (this.magnetMode) {
+            case Off -> {
+                this.magnetME.setVisibility(false);
+                this.magnetInv.setVisibility(false);
+                this.magnetOff.setVisibility(true);
+            }
+            case ME -> {
+                this.magnetME.setVisibility(true);
+                this.magnetInv.setVisibility(false);
+                this.magnetOff.setVisibility(false);
+            }
+            case Inv -> {
+                this.magnetME.setVisibility(false);
+                this.magnetInv.setVisibility(true);
+                this.magnetOff.setVisibility(false);
+            }
+        }
+    }
+
+    public void toggleSwitchButtons() {
+        int offset = this.offset;
+
+        CraftingTerminal.setVisibility(false);
+        PatternTerminal.setVisibility(false);
+        InterfaceTerminal.setVisibility(false);
+        LevelTerminal.setVisibility(false);
+        PatternTerminalEx.setVisibility(false);
+
+        if (this.terminalMode != UltraTerminalModes.CRAFTING) {
+            this.CraftingTerminal.setVisibility(true);
+            this.CraftingTerminal.yPosition = offset;
+            offset += 20;
+        }
+        if (this.terminalMode != UltraTerminalModes.PATTERN) {
+            this.PatternTerminal.setVisibility(true);
+            this.PatternTerminal.yPosition = offset;
+            offset += 20;
+        }
+        if (this.terminalMode != UltraTerminalModes.PATTERN_EX) {
+            this.PatternTerminalEx.setVisibility(true);
+            this.PatternTerminalEx.yPosition = offset;
+            offset += 20;
+        }
+        if (this.terminalMode != UltraTerminalModes.INTERFACE) {
+            this.InterfaceTerminal.setVisibility(true);
+            this.InterfaceTerminal.yPosition = offset;
+            offset += 20;
+        }
+        if (this.terminalMode != UltraTerminalModes.LEVEL) {
+            this.LevelTerminal.setVisibility(true);
+            this.LevelTerminal.yPosition = offset;
+            offset += 20;
+        }
+    }
+
+    @Override
+    public void readData(NBTTagCompound tag) {
+        this.reStock = tag.getBoolean(restockItems);
+        this.magnetMode = WirelessMagnet.Mode.values()[tag.getInteger(modeKey)];
+        this.terminalMode = UltraTerminalModes.VALUES[tag.getInteger(MODE)];
+    }
+
+    @Override
+    public void writeData(NBTTagCompound tag) {
+        tag.setBoolean(restockItems, this.reStock);
+        tag.setInteger(modeKey, this.magnetMode.ordinal());
+        tag.setInteger(MODE, this.terminalMode.ordinal());
+    }
+
+    @Override
+    public void readByte(ByteBuf buf) {
+        this.reStock = buf.readBoolean();
+        this.magnetMode = WirelessMagnet.Mode.values()[buf.readInt()];
+        this.terminalMode = UltraTerminalModes.VALUES[buf.readInt()];
+        ItemWirelessUltraTerminal.setMode(this.terminal, this.terminalMode);
+
+        toggleMagnetButtonsVisibility();
+        toggleRestockVisibility();
+        toggleSwitchButtons();
+    }
+
+    @Override
+    public void writeByte(ByteBuf buf) {
+        buf.writeBoolean(this.reStock);
+        buf.writeInt(this.magnetMode.ordinal());
+        buf.writeInt(this.terminalMode.ordinal());
+    }
+}

src/main/java/com/glodblock/github/client/gui/FCGuiBaseButton.java

@@ -0,0 +1,87 @@
+
+package com.glodblock.github.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+
+// copy from WirelessCraftingTerminal WCTGuiButton
+public class FCGuiBaseButton extends GuiButton {
+
+    protected static final ResourceLocation buttonTextures = new ResourceLocation(
+            "minecraft",
+            "textures/gui/widgets.png");
+
+    public FCGuiBaseButton(int id, int xPosition, int yPosition, int width, int height, String displayString) {
+        super(id, xPosition, yPosition, width, height, displayString);
+        this.enabled = true;
+        this.visible = true;
+        this.id = id;
+        this.xPosition = xPosition;
+        this.yPosition = yPosition;
+        this.width = width;
+        this.height = height;
+        this.displayString = displayString;
+    }
+
+    @Override
+    public void drawButton(Minecraft mc, int mouseX, int mouseY) {
+        if (this.visible) {
+            FontRenderer fontrenderer = mc.fontRenderer;
+            mc.getTextureManager().bindTexture(buttonTextures);
+            GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+            this.field_146123_n = mouseX >= this.xPosition && mouseY >= this.yPosition
+                    && mouseX < this.xPosition + this.width
+                    && mouseY < this.yPosition + this.height;
+            int k = this.getHoverState(this.field_146123_n);
+            GL11.glEnable(GL11.GL_BLEND);
+            OpenGlHelper.glBlendFunc(770, 771, 1, 0);
+            GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+
+            this.drawTexturedModalRect(this.xPosition, this.yPosition, 0, 46 + k * 20, this.width / 2, this.height);
+            this.drawTexturedModalRect(
+                    this.xPosition + this.width / 2,
+                    this.yPosition,
+                    200 - this.width / 2,
+                    46 + k * 20,
+                    this.width / 2,
+                    this.height - 2);
+            this.drawTexturedModalRect(
+                    this.xPosition + 2,
+                    this.yPosition + (this.height - 2),
+                    200 - (this.width - 2),
+                    64 + k * 20,
+                    this.width - 2,
+                    2);
+            this.drawTexturedModalRect(
+                    this.xPosition,
+                    this.yPosition + (this.height - 1),
+                    200 - this.width,
+                    65 + k * 20,
+                    this.width,
+                    1);
+            this.mouseDragged(mc, mouseX, mouseY);
+
+            int l = 14737632;
+
+            if (packedFGColour != 0) {
+                l = packedFGColour;
+            } else if (!this.enabled) {
+                l = 10526880;
+            } else if (this.field_146123_n) {
+                l = 16777120;
+            }
+
+            this.drawCenteredString(
+                    fontrenderer,
+                    this.displayString,
+                    this.xPosition + this.width / 2,
+                    this.yPosition + (this.height - 8) / 2,
+                    l);
+        }
+    }
+}

src/main/java/com/glodblock/github/client/gui/FCGuiLineField.java

@@ -0,0 +1,26 @@
+package com.glodblock.github.client.gui;
+
+import net.minecraft.client.gui.FontRenderer;
+
+public class FCGuiLineField extends FCGuiTextField {
+
+    private final int _xPos;
+    private final int _yPos;
+
+    public FCGuiLineField(FontRenderer fontRenderer, int xPos, int yPos, int width) {
+        this(fontRenderer, xPos, yPos, width, 5);
+    }
+
+    public FCGuiLineField(FontRenderer fontRenderer, int xPos, int yPos, int width, int height) {
+        super(fontRenderer, xPos, yPos, width, height);
+        this._xPos = xPos;
+        this._yPos = yPos;
+    }
+
+    @Override
+    public void drawTextBox() {
+        if (this.getVisible()) {
+            drawRect(this._xPos, this._yPos, this.xPosition + this.width, this.yPosition + this.height, getColor());
+        }
+    }
+}

src/main/java/com/glodblock/github/client/gui/FCGuiTextField.java

@@ -1,10 +1,13 @@
 package com.glodblock.github.client.gui;
 
-import appeng.client.gui.widgets.ITooltip;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiTextField;
 
+import appeng.client.gui.AEBaseGui;
+import appeng.client.gui.widgets.ITooltip;
+
 public class FCGuiTextField extends GuiTextField {
+
     private static final int PADDING = 2;
     private final FontRenderer _fontRender;
     private String tooltip;
@@ -17,8 +20,7 @@ public class FCGuiTextField extends GuiTextField {
     private int _color;
 
     /**
-     * Uses the values to instantiate a padded version of a text field.
-     * Pays attention to the '_' caret.
+     * Uses the values to instantiate a padded version of a text field. Pays attention to the '_' caret.
      *
      * @param fontRenderer renderer for the strings
      * @param xPos         absolute left position
@@ -26,8 +28,14 @@ public class FCGuiTextField extends GuiTextField {
      * @param width        absolute width
      * @param height       absolute height
      */
-    public FCGuiTextField(final FontRenderer fontRenderer, final int xPos, final int yPos, final int width, final int height) {
-        super(fontRenderer, xPos + PADDING, yPos + PADDING, width - 2 * PADDING - fontRenderer.getCharWidth('_'), height - 2 * PADDING);
+    public FCGuiTextField(final FontRenderer fontRenderer, final int xPos, final int yPos, final int width,
+            final int height) {
+        super(
+                fontRenderer,
+                xPos + PADDING,
+                yPos + PADDING,
+                width - 2 * PADDING - fontRenderer.getCharWidth('_'),
+                height - 2 * PADDING);
 
         this._xPos = xPos;
         this._yPos = yPos;
@@ -40,13 +48,33 @@ public class FCGuiTextField extends GuiTextField {
     public void drawTextBox() {
         super.drawTextBox();
         if (this.getBorder() > 0 && this.getVisible()) {
-            GuiTextField.drawRect(
-                this._xPos - this.getBorder(),
-                this._yPos - this.getBorder(),
-                this._width - 2 * PADDING - this._fontRender.getCharWidth('_') + this.getBorder(),
-                this._height - 2 * PADDING + this.getBorder(),
-                this.getColor()
-            );
+            drawRect(
+                    this._xPos - getBorder(),
+                    this._yPos - getBorder(),
+                    this.xPosition + this.width + getBorder(),
+                    this.yPosition + this.height + getBorder(),
+                    this.getColor());
+        }
+    }
+
+    public void handleTooltip(int mouseX, int mouseY, AEBaseGui gui) {
+        this.handleTooltip(mouseX, mouseY, gui, 0);
+    }
+
+    public void handleTooltip(int mouseX, int mouseY, AEBaseGui gui, int offsetY) {
+        if (isMouseIn(mouseX, mouseY) && this.tooltip != null && !"".equals(this.tooltip)) {
+            int length = 0;
+            for (String s : this.getMessage().split("\n")) {
+                length = Math.max(this._fontRender.getStringWidth(s), length);
+            }
+            if (mouseY < 15) {
+                mouseY = 15;
+            }
+            if (mouseX + length + 20 >= gui.width) {
+                gui.drawTooltip(mouseX - length - 20, mouseY + 4 + offsetY, this.getMessage());
+            } else {
+                gui.drawTooltip(mouseX, mouseY + 4 + offsetY, this.getMessage());
+            }
         }
     }
 
@@ -100,13 +128,16 @@ public class FCGuiTextField extends GuiTextField {
         return withinXRange && withinYRange;
     }
 
-    public void setMessage(String t)
-    {
+    public void setMessage(String t) {
         tooltip = t;
     }
 
-    public class TooltipProvider implements ITooltip
-    {
+    public String getMessage() {
+        return tooltip;
+    }
+
+    public class TooltipProvider implements ITooltip {
+
         @Override
         public String getMessage() {
             return tooltip;
@@ -128,7 +159,9 @@ public class FCGuiTextField extends GuiTextField {
         }
 
         @Override
-        public int getWidth() { return _width; }
+        public int getWidth() {
+            return _width;
+        }
 
         @Override
         public boolean isVisible() {

src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminal.java

@@ -1,223 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import appeng.api.config.ActionItems;
-import appeng.api.config.ItemSubstitution;
-import appeng.api.config.Settings;
-import appeng.api.storage.ITerminalHost;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.container.slot.AppEngSlot;
-import appeng.core.localization.GuiText;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.FCBasePartContainer;
-import com.glodblock.github.network.CPacketFluidPatternTermBtns;
-import com.glodblock.github.util.ModAndClassUtil;
-import com.glodblock.github.util.NameConst;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
-import org.lwjgl.input.Keyboard;
-
-public class GuiBaseFluidPatternTerminal extends GuiFCBaseMonitor {
-
-    private static final String SUBSITUTION_DISABLE = "0";
-    private static final String SUBSITUTION_ENABLE = "1";
-
-    private static final String CRAFTMODE_CRFTING = "1";
-    private static final String CRAFTMODE_PROCESSING = "0";
-
-    public FCBasePartContainer container;
-
-    private GuiTabButton tabCraftButton;
-    private GuiTabButton tabProcessButton;
-    private GuiImgButton substitutionsEnabledBtn;
-    private GuiImgButton substitutionsDisabledBtn;
-    private GuiImgButton encodeBtn;
-    private GuiImgButton clearBtn;
-    private GuiImgButton doubleBtn;
-    private GuiImgButton beSubstitutionsEnabledBtn;
-    private GuiImgButton beSubstitutionsDisabledBtn;
-
-    private GuiFCImgButton combineEnableBtn;
-    private GuiFCImgButton combineDisableBtn;
-
-    public GuiBaseFluidPatternTerminal(final InventoryPlayer inventoryPlayer, final ITerminalHost te) {
-        super(inventoryPlayer, te, new FCBasePartContainer(inventoryPlayer, te));
-        this.container = (FCBasePartContainer) this.inventorySlots;
-        setReservedSpace(81);
-    }
-
-    @Override
-    protected void actionPerformed( final GuiButton btn )
-    {
-        super.actionPerformed( btn );
-
-        if( this.tabCraftButton == btn || this.tabProcessButton == btn )
-        {
-            FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminal.CraftMode", this.tabProcessButton == btn ? CRAFTMODE_CRFTING : CRAFTMODE_PROCESSING ) );
-        }
-        else if( this.encodeBtn == btn )
-        {
-            FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminal.Encode", (isCtrlKeyDown() ? 1 : 0) << 1 | (isShiftKeyDown() ? 1 : 0) ));
-        }
-        else if( this.clearBtn == btn )
-        {
-            FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminal.Clear", "1" ) );
-        }
-        else if( this.substitutionsEnabledBtn == btn || this.substitutionsDisabledBtn == btn )
-        {
-            FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminal.Substitute", this.substitutionsEnabledBtn == btn ? SUBSITUTION_DISABLE : SUBSITUTION_ENABLE ) );
-        }
-        else if( this.combineDisableBtn == btn || this.combineEnableBtn == btn )
-        {
-            FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminal.Combine", this.combineDisableBtn == btn ? "1" : "0" ) );
-        }
-        else if (ModAndClassUtil.isDoubleButton && doubleBtn == btn) {
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("PatternTerminal.Double", Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) ? "1" : "0"));
-        } else if (ModAndClassUtil.isBeSubstitutionsButton && beSubstitutionsDisabledBtn == btn) {
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("PatternTerminal.beSubstitute", "1"));
-        } else if (ModAndClassUtil.isBeSubstitutionsButton && beSubstitutionsEnabledBtn == btn) {
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("PatternTerminal.beSubstitute", "0"));
-        }
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void initGui()
-    {
-        super.initGui();
-        this.tabCraftButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.crafting_table ), GuiText.CraftingPattern.getLocal(), itemRender );
-        this.buttonList.add( this.tabCraftButton );
-
-        this.tabProcessButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.furnace ), GuiText.ProcessingPattern.getLocal(), itemRender );
-        this.buttonList.add( this.tabProcessButton );
-
-        this.substitutionsEnabledBtn = new GuiImgButton( this.guiLeft + 84, this.guiTop + this.ySize - 163, Settings.ACTIONS, ItemSubstitution.ENABLED );
-        this.substitutionsEnabledBtn.setHalfSize( true );
-        this.buttonList.add( this.substitutionsEnabledBtn );
-
-        this.substitutionsDisabledBtn = new GuiImgButton( this.guiLeft + 84, this.guiTop + this.ySize - 163, Settings.ACTIONS, ItemSubstitution.DISABLED );
-        this.substitutionsDisabledBtn.setHalfSize( true );
-        this.buttonList.add( this.substitutionsDisabledBtn );
-
-        this.clearBtn = new GuiImgButton( this.guiLeft + 74, this.guiTop + this.ySize - 163, Settings.ACTIONS, ActionItems.CLOSE );
-        this.clearBtn.setHalfSize( true );
-        this.buttonList.add( this.clearBtn );
-
-        this.encodeBtn = new GuiImgButton( this.guiLeft + 147, this.guiTop + this.ySize - 142, Settings.ACTIONS, ActionItems.ENCODE );
-        this.buttonList.add(this.encodeBtn);
-
-        int combineLeft = 74;
-        int combineTop = 153;
-        if (ModAndClassUtil.isDoubleButton) {
-            this.doubleBtn = new GuiImgButton(this.guiLeft + 74, this.guiTop + this.ySize - 153, Settings.ACTIONS, ActionItems.DOUBLE);
-            this.doubleBtn.setHalfSize(true);
-            this.buttonList.add(this.doubleBtn);
-            combineLeft = 84;
-        }
-//        if (ModAndClassUtil.isBeSubstitutionsButton) {
-//            combineLeft = 74;
-//            combineTop -= 11;
-//            this.beSubstitutionsEnabledBtn = new GuiImgButton(
-//                this.guiLeft + 84, this.guiTop + this.ySize - 153, Settings.ACTIONS, PatternBeSubstitution.ENABLED);
-//            this.beSubstitutionsEnabledBtn.setHalfSize(true);
-//            this.buttonList.add(this.beSubstitutionsEnabledBtn);
-//
-//            this.beSubstitutionsDisabledBtn = new GuiImgButton(
-//                this.guiLeft + 84, this.guiTop + this.ySize - 153, Settings.ACTIONS, PatternBeSubstitution.DISABLED);
-//            this.beSubstitutionsDisabledBtn.setHalfSize(true);
-//            this.buttonList.add(this.beSubstitutionsDisabledBtn);
-//        }
-        this.combineEnableBtn = new GuiFCImgButton(this.guiLeft + combineLeft, this.guiTop + this.ySize - combineTop, "FORCE_COMBINE", "DO_COMBINE");
-        this.combineEnableBtn.setHalfSize(true);
-        this.buttonList.add(this.combineEnableBtn);
-
-        this.combineDisableBtn = new GuiFCImgButton(this.guiLeft + combineLeft, this.guiTop + this.ySize - combineTop, "NOT_COMBINE", "DONT_COMBINE");
-        this.combineDisableBtn.setHalfSize(true);
-        this.buttonList.add(this.combineDisableBtn);
-    }
-
-    @Override
-    public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
-    {
-        if( !this.container.isCraftingMode() )
-        {
-            this.tabCraftButton.visible = false;
-            this.tabProcessButton.visible = true;
-            if (ModAndClassUtil.isDoubleButton)
-                this.doubleBtn.visible = true;
-        }
-        else
-        {
-            this.tabCraftButton.visible = true;
-            this.tabProcessButton.visible = false;
-            if (ModAndClassUtil.isDoubleButton)
-                this.doubleBtn.visible = false;
-        }
-
-        if( this.container.substitute )
-        {
-            this.substitutionsEnabledBtn.visible = true;
-            this.substitutionsDisabledBtn.visible = false;
-        }
-        else
-        {
-            this.substitutionsEnabledBtn.visible = false;
-            this.substitutionsDisabledBtn.visible = true;
-        }
-
-        if (!this.container.isCraftingMode())
-        {
-            if ( this.container.combine )
-            {
-                this.combineEnableBtn.visible = true;
-                this.combineDisableBtn.visible = false;
-            }
-            else {
-                this.combineEnableBtn.visible = false;
-                this.combineDisableBtn.visible = true;
-            }
-        } else {
-            this.combineEnableBtn.visible = false;
-            this.combineDisableBtn.visible = false;
-        }
-        if (ModAndClassUtil.isBeSubstitutionsButton) {
-            if (this.container.beSubstitute) {
-                this.beSubstitutionsEnabledBtn.visible = true;
-                this.beSubstitutionsDisabledBtn.visible = false;
-            } else {
-                this.beSubstitutionsEnabledBtn.visible = false;
-                this.beSubstitutionsDisabledBtn.visible = true;
-            }
-        }
-
-        super.drawFG(offsetX, offsetY, mouseX, mouseY);
-        this.fontRendererObj.drawString(StatCollector.translateToLocal(NameConst.GUI_FLUID_PATTERN_TERMINAL), 8, this.ySize - 96 + 2 - getReservedSpace(), 4210752);
-    }
-
-    @Override
-    protected String getBackground()
-    {
-        if( this.container.isCraftingMode() )
-        {
-            return "gui/pattern.png";
-        }
-        return "gui/pattern2.png";
-    }
-
-    @Override
-    protected void repositionSlot( final AppEngSlot s )
-    {
-        if( s.isPlayerSide() )
-        {
-            s.yDisplayPosition = s.getY() + this.ySize - 78 - 5;
-        }
-        else
-        {
-            s.yDisplayPosition = s.getY() + this.ySize - 78 - 3;
-        }
-    }
-
-}

src/main/java/com/glodblock/github/client/gui/GuiBaseFluidPatternTerminalEx.java

@@ -1,310 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import appeng.api.config.ActionItems;
-import appeng.api.config.ItemSubstitution;
-import appeng.api.config.PatternSlotConfig;
-import appeng.api.config.Settings;
-import appeng.api.storage.ITerminalHost;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.client.gui.widgets.GuiScrollbar;
-import appeng.container.slot.AppEngSlot;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.FCBasePartContainerEx;
-import com.glodblock.github.network.CPacketFluidPatternTermBtns;
-import com.glodblock.github.util.ModAndClassUtil;
-import com.glodblock.github.util.NameConst;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.StatCollector;
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-
-public class GuiBaseFluidPatternTerminalEx extends GuiFCBaseMonitor {
-
-    private static final String SUBSITUTION_DISABLE = "0";
-    private static final String SUBSITUTION_ENABLE = "1";
-    private static final String PRIORITY_DISABLE = "0";
-    private static final String PRIORITY_ENABLE = "1";
-
-    public FCBasePartContainerEx container;
-
-    private GuiImgButton substitutionsEnabledBtn;
-    private GuiImgButton substitutionsDisabledBtn;
-    private GuiFCImgButton fluidPrioritizedEnabledBtn;
-    private GuiFCImgButton fluidPrioritizedDisabledBtn;
-    private GuiImgButton encodeBtn;
-    private GuiImgButton invertBtn;
-    private GuiImgButton clearBtn;
-    private GuiImgButton doubleBtn;
-    private GuiImgButton beSubstitutionsEnabledBtn;
-    private GuiImgButton beSubstitutionsDisabledBtn;
-
-    private GuiFCImgButton combineEnableBtn;
-    private GuiFCImgButton combineDisableBtn;
-    private final GuiScrollbar processingScrollBar = new GuiScrollbar();
-
-    public GuiBaseFluidPatternTerminalEx(final InventoryPlayer inventoryPlayer, final ITerminalHost te) {
-        super(inventoryPlayer, te, new FCBasePartContainerEx(inventoryPlayer, te));
-        this.container = (FCBasePartContainerEx) this.inventorySlots;
-        setReservedSpace(81);
-
-        processingScrollBar.setHeight(70).setWidth(7).setLeft(6).setRange(0, 1, 1);
-        processingScrollBar.setTexture(FluidCraft.MODID, "gui/pattern3.png", 242, 0);
-    }
-
-    @Override
-    protected void actionPerformed( final GuiButton btn )
-    {
-        super.actionPerformed( btn );
-
-        if( this.encodeBtn == btn )
-        {
-            FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminalEx.Encode",(isCtrlKeyDown() ? 1 : 0) << 1 | (isShiftKeyDown() ? 1 : 0)) );
-        }
-        else if( this.clearBtn == btn )
-        {
-            FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminalEx.Clear", "1" ) );
-        }
-        else if( this.substitutionsEnabledBtn == btn || this.substitutionsDisabledBtn == btn )
-        {
-            FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminalEx.Substitute", this.substitutionsEnabledBtn == btn ? SUBSITUTION_DISABLE : SUBSITUTION_ENABLE ) );
-        }
-        else if( this.fluidPrioritizedEnabledBtn == btn || this.fluidPrioritizedDisabledBtn == btn )
-        {
-            FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminalEx.Prioritize", container.prioritize ? PRIORITY_DISABLE : PRIORITY_ENABLE ) );
-        }
-        else if( this.invertBtn == btn )
-        {
-            FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminalEx.Invert", container.inverted ? "0" : "1" ) );
-        }
-        else if( this.combineDisableBtn == btn || this.combineEnableBtn == btn )
-        {
-            FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "PatternTerminalEx.Combine", this.combineDisableBtn == btn ? "1" : "0" ) );
-        }
-        else if (ModAndClassUtil.isDoubleButton && doubleBtn == btn) {
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("PatternTerminalEx.Double", Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) ? "1" : "0"));
-        } else if (ModAndClassUtil.isBeSubstitutionsButton && beSubstitutionsDisabledBtn == btn) {
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("PatternTerminalEx.beSubstitute", "1"));
-        } else if (ModAndClassUtil.isBeSubstitutionsButton && beSubstitutionsEnabledBtn == btn) {
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("PatternTerminalEx.beSubstitute", "0"));
-        }
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void initGui()
-    {
-        super.initGui();
-
-        this.substitutionsEnabledBtn = new GuiImgButton( this.guiLeft + 97, this.guiTop + this.ySize - 163, Settings.ACTIONS, ItemSubstitution.ENABLED );
-        this.substitutionsEnabledBtn.setHalfSize( true );
-        this.buttonList.add( this.substitutionsEnabledBtn );
-
-        this.substitutionsDisabledBtn = new GuiImgButton( this.guiLeft + 97, this.guiTop + this.ySize - 163, Settings.ACTIONS, ItemSubstitution.DISABLED );
-        this.substitutionsDisabledBtn.setHalfSize( true );
-        this.buttonList.add( this.substitutionsDisabledBtn );
-
-        this.fluidPrioritizedEnabledBtn = new GuiFCImgButton(this.guiLeft + 97, this.guiTop + this.ySize - 114, "FORCE_PRIO", "DO_PRIO");
-        this.fluidPrioritizedEnabledBtn.setHalfSize(true);
-        this.buttonList.add( this.fluidPrioritizedEnabledBtn );
-
-        this.fluidPrioritizedDisabledBtn = new GuiFCImgButton(this.guiLeft + 97, this.guiTop + this.ySize - 114, "NOT_PRIO", "DONT_PRIO");
-        this.fluidPrioritizedDisabledBtn.setHalfSize(true);
-        this.buttonList.add( this.fluidPrioritizedDisabledBtn );
-
-        invertBtn = new GuiImgButton( this.guiLeft + 87, this.guiTop + this.ySize - 153, Settings.ACTIONS, container.inverted ? PatternSlotConfig.C_4_16 : PatternSlotConfig.C_16_4);
-        invertBtn.setHalfSize( true );
-        this.buttonList.add( this.invertBtn );
-
-        this.clearBtn = new GuiImgButton( this.guiLeft + 87, this.guiTop + this.ySize - 163, Settings.ACTIONS, ActionItems.CLOSE );
-        this.clearBtn.setHalfSize( true );
-        this.buttonList.add( this.clearBtn );
-
-        this.encodeBtn = new GuiImgButton( this.guiLeft + 147, this.guiTop + this.ySize - 142, Settings.ACTIONS, ActionItems.ENCODE );
-        this.buttonList.add( this.encodeBtn );
-
-        if (ModAndClassUtil.isDoubleButton) {
-            this.doubleBtn = new GuiImgButton( this.guiLeft + 97, this.guiTop + this.ySize - 153, Settings.ACTIONS, ActionItems.DOUBLE );
-            this.doubleBtn.setHalfSize( true );
-            this.buttonList.add(this.doubleBtn);
-        }
-
-        this.combineEnableBtn = new GuiFCImgButton(this.guiLeft + 87, this.guiTop + this.ySize - 114, "FORCE_COMBINE", "DO_COMBINE");
-        this.combineEnableBtn.setHalfSize(true);
-        this.buttonList.add(this.combineEnableBtn);
-
-        this.combineDisableBtn = new GuiFCImgButton(this.guiLeft + 87, this.guiTop + this.ySize - 114, "NOT_COMBINE", "DONT_COMBINE");
-        this.combineDisableBtn.setHalfSize(true);
-        this.buttonList.add(this.combineDisableBtn);
-//        if (ModAndClassUtil.isBeSubstitutionsButton) {
-//            this.beSubstitutionsEnabledBtn = new GuiImgButton(
-//                this.guiLeft + 87, this.guiTop + this.ySize - 103, Settings.ACTIONS, PatternBeSubstitution.ENABLED);
-//            this.beSubstitutionsEnabledBtn.setHalfSize(true);
-//            this.buttonList.add(this.beSubstitutionsEnabledBtn);
-//
-//            this.beSubstitutionsDisabledBtn = new GuiImgButton(
-//                this.guiLeft + 87, this.guiTop + this.ySize - 103, Settings.ACTIONS, PatternBeSubstitution.DISABLED);
-//            this.beSubstitutionsDisabledBtn.setHalfSize(true);
-//            this.buttonList.add(this.beSubstitutionsDisabledBtn);
-//        }
-        processingScrollBar.setTop(this.ySize - 164);
-    }
-
-    @Override
-    public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
-    {
-        if (ModAndClassUtil.isDoubleButton)
-            this.doubleBtn.visible = true;
-
-        if( this.container.substitute )
-        {
-            this.substitutionsEnabledBtn.visible = true;
-            this.substitutionsDisabledBtn.visible = false;
-        }
-        else
-        {
-            this.substitutionsEnabledBtn.visible = false;
-            this.substitutionsDisabledBtn.visible = true;
-        }
-        if( this.container.prioritize )
-        {
-            this.fluidPrioritizedEnabledBtn.visible = false;
-            this.fluidPrioritizedDisabledBtn.visible = true;
-        }
-        else
-        {
-            this.fluidPrioritizedEnabledBtn.visible = true;
-            this.fluidPrioritizedDisabledBtn.visible = false;
-        }
-
-        if (this.container.combine) {
-            this.combineEnableBtn.visible = true;
-            this.combineDisableBtn.visible = false;
-        } else {
-            this.combineEnableBtn.visible = false;
-            this.combineDisableBtn.visible = true;
-        }
-        if (ModAndClassUtil.isBeSubstitutionsButton) {
-            if (this.container.beSubstitute) {
-                this.beSubstitutionsEnabledBtn.visible = true;
-                this.beSubstitutionsDisabledBtn.visible = false;
-            } else {
-                this.beSubstitutionsEnabledBtn.visible = false;
-                this.beSubstitutionsDisabledBtn.visible = true;
-            }
-        }
-
-        super.drawFG(offsetX, offsetY, mouseX, mouseY);
-        this.fontRendererObj.drawString(StatCollector.translateToLocal(NameConst.GUI_FLUID_PATTERN_TERMINAL_EX), 8, this.ySize - 96 + 2 - getReservedSpace(), 4210752);
-        this.processingScrollBar.draw(this);
-    }
-
-    @Override
-    protected String getBackground()
-    {
-        return container.inverted ? "gui/pattern4.png" : "gui/pattern3.png";
-    }
-
-    @Override
-    protected void repositionSlot( final AppEngSlot s )
-    {
-        if( s.isPlayerSide() )
-        {
-            s.yDisplayPosition = s.getY() + this.ySize - 78 - 5;
-        }
-        else
-        {
-            s.yDisplayPosition = s.getY() + this.ySize - 78 - 3;
-        }
-    }
-
-    @Override
-    public void drawScreen( final int mouseX, final int mouseY, final float btn )
-    {
-
-        if (container.substitute) {
-            substitutionsEnabledBtn.visible = true;
-            substitutionsDisabledBtn.visible = false;
-        } else {
-            substitutionsEnabledBtn.visible = false;
-            substitutionsDisabledBtn.visible = true;
-        }
-        if (container.prioritize) {
-            fluidPrioritizedEnabledBtn.visible = true;
-            fluidPrioritizedDisabledBtn.visible = false;
-        } else {
-            fluidPrioritizedEnabledBtn.visible = false;
-            fluidPrioritizedDisabledBtn.visible = true;
-        }
-
-        final int offset = container.inverted? 18 * -3: 0;
-
-        substitutionsEnabledBtn.xPosition  = this.guiLeft + 97 + offset;
-        substitutionsDisabledBtn.xPosition = this.guiLeft + 97 + offset;
-        fluidPrioritizedEnabledBtn.xPosition = this.guiLeft + 97 + offset;
-        fluidPrioritizedDisabledBtn.xPosition = this.guiLeft + 97 + offset;
-        doubleBtn.xPosition = this.guiLeft + 97 + offset;
-        clearBtn.xPosition  = this.guiLeft + 87 + offset;
-        invertBtn.xPosition = this.guiLeft + 87 + offset;
-        combineEnableBtn.xPosition = this.guiLeft + 87 + offset;
-        combineDisableBtn.xPosition = this.guiLeft + 87 + offset;
-
-        processingScrollBar.setCurrentScroll(container.activePage);
-
-        super.drawScreen(mouseX, mouseY, btn);
-    }
-
-    @Override
-    protected void mouseClicked( final int xCoord, final int yCoord, final int btn )
-    {
-        final int currentScroll = this.processingScrollBar.getCurrentScroll();
-        this.processingScrollBar.click(this, xCoord - this.guiLeft, yCoord - this.guiTop);
-        super.mouseClicked(xCoord, yCoord, btn);
-
-        if (currentScroll != this.processingScrollBar.getCurrentScroll()) {
-            changeActivePage();
-        }
-    }
-
-    @Override
-    protected void mouseClickMove( final int x, final int y, final int c, final long d )
-    {
-        final int currentScroll = this.processingScrollBar.getCurrentScroll();
-        this.processingScrollBar.click(this, x - this.guiLeft, y - this.guiTop );
-        super.mouseClickMove(x, y, c, d);
-
-        if (currentScroll != this.processingScrollBar.getCurrentScroll()) {
-            changeActivePage();
-        }
-    }
-
-    @Override
-    public void handleMouseInput()
-    {
-        super.handleMouseInput();
-
-        final int wheel = Mouse.getEventDWheel();
-
-        if (wheel != 0) {
-            final int x = Mouse.getEventX() * this.width / this.mc.displayWidth;
-            final int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight;
-
-            if (this.processingScrollBar.contains(x - this.guiLeft, y - this.guiTop)) {
-                final int currentScroll = this.processingScrollBar.getCurrentScroll();
-                this.processingScrollBar.wheel(wheel);
-
-                if (currentScroll != this.processingScrollBar.getCurrentScroll()) {
-                    changeActivePage();
-                }
-
-            }
-        }
-
-    }
-
-    private void changeActivePage()
-    {
-        FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("PatternTerminalEx.ActivePage", String.valueOf(this.processingScrollBar.getCurrentScroll())));
-    }
-
-}

src/main/java/com/glodblock/github/client/gui/GuiBaseFluidTerminal.java

@@ -1,55 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import appeng.api.storage.ITerminalHost;
-import appeng.container.slot.AppEngSlot;
-import com.glodblock.github.client.gui.container.FCBaseFluidMonitorContain;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-
-
-public class GuiBaseFluidTerminal extends GuiFCBaseFluidMonitor {
-    protected EntityPlayer player;
-
-    public GuiBaseFluidTerminal(InventoryPlayer inventoryPlayer, ITerminalHost te, FCBaseFluidMonitorContain c) {
-        super(inventoryPlayer, te, new FCBaseFluidMonitorContain(inventoryPlayer, te));
-        player = inventoryPlayer.player;
-    }
-
-    @Override
-    protected String getBackground() {
-        return "gui/terminal.png";
-    }
-
-    @Override
-    protected void repositionSlot(final AppEngSlot s) {
-        if (s.isPlayerSide()) {
-            s.yDisplayPosition = s.getY() + this.ySize - 78 - 5;
-        } else {
-            s.yDisplayPosition = s.getY() + this.ySize - 78 - 3;
-        }
-    }
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        super.drawFG(offsetX, offsetY, mouseX, mouseY);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void initGui() {
-        super.initGui();
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        if (btn == craftingStatusBtn) {
-            InventoryHandler.switchGui(GuiType.FLUID_PAT_TERM_CRAFTING_STATUS);
-        } else {
-            super.actionPerformed(btn);
-        }
-    }
-
-}

src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java

@@ -1,141 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import appeng.api.config.InsertionMode;
-import appeng.api.config.Settings;
-import appeng.api.config.YesNo;
-import appeng.client.gui.implementations.GuiUpgradeable;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.client.gui.widgets.GuiToggleButton;
-import appeng.container.implementations.ContainerInterface;
-import appeng.core.localization.GuiText;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketConfigButton;
-import appeng.helpers.IInterfaceHost;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.parts.PartFluidInterface;
-import com.glodblock.github.common.tile.TileFluidInterface;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.network.CPacketSwitchGuis;
-import com.glodblock.github.util.ModAndClassUtil;
-import com.glodblock.github.util.NameConst;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.StatCollector;
-import org.lwjgl.input.Mouse;
-
-public class GuiDualInterface extends GuiUpgradeable {
-
-    private GuiTabButton priority;
-    private GuiTabButton switcher;
-    private GuiImgButton BlockMode;
-    private GuiToggleButton interfaceMode;
-    private GuiImgButton insertionMode;
-    private final IInterfaceHost host;
-
-    public GuiDualInterface(InventoryPlayer inventoryPlayer, IInterfaceHost te) {
-        super(new ContainerInterface(inventoryPlayer, te));
-        this.host = te;
-        this.ySize = 211;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    protected void addButtons()
-    {
-        this.priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender );
-        this.buttonList.add( this.priority );
-
-        this.switcher = new GuiTabButton( this.guiLeft + 132, this.guiTop, host instanceof PartFluidInterface ? ItemAndBlockHolder.FLUID_INTERFACE.stack() : ItemAndBlockHolder.INTERFACE.stack(), StatCollector.translateToLocal("ae2fc.tooltip.switch_fluid_interface"), itemRender );
-        this.buttonList.add( this.switcher );
-
-        this.BlockMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 8, Settings.BLOCK, YesNo.NO );
-        this.buttonList.add( this.BlockMode );
-
-        this.interfaceMode = new GuiToggleButton( this.guiLeft - 18, this.guiTop + 26, 84, 85, GuiText.InterfaceTerminal.getLocal(), GuiText.InterfaceTerminalHint.getLocal() );
-        this.buttonList.add( this.interfaceMode );
-
-        this.insertionMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 44,  Settings.INSERTION_MODE, InsertionMode.DEFAULT );
-        this.buttonList.add( this.insertionMode );
-    }
-
-    @Override
-    public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
-    {
-        if( this.BlockMode != null )
-        {
-            this.BlockMode.set( ( (ContainerInterface) this.cvb ).getBlockingMode() );
-        }
-
-        if( this.interfaceMode != null )
-        {
-            this.interfaceMode.setState( ( (ContainerInterface) this.cvb ).getInterfaceTerminalMode() == YesNo.YES );
-        }
-        if( this.insertionMode != null )
-        {
-            this.insertionMode.set( ( (ContainerInterface) this.cvb ).getInsertionMode());
-        }
-
-        this.fontRendererObj.drawString( getGuiDisplayName(StatCollector.translateToLocal(NameConst.GUI_FLUID_INTERFACE)), 8, 6, 4210752 );
-    }
-
-    @Override
-    protected String getBackground()
-    {
-        if (!ModAndClassUtil.isBigInterface)
-            return "guis/interface.png";
-        switch (((ContainerInterface) this.cvb).getPatternCapacityCardsInstalled())
-        {
-            case 1:
-                return "guis/interface2.png";
-            case 2:
-                return "guis/interface3.png";
-            case 3:
-                return "guis/interface4.png";
-        }
-        return "guis/interface.png";
-    }
-
-    @Override
-    protected void actionPerformed( final GuiButton btn )
-    {
-        super.actionPerformed( btn );
-
-        final boolean backwards = Mouse.isButtonDown( 1 );
-
-        if( btn == this.priority )
-        {
-            if (host instanceof TileFluidInterface) {
-                FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(GuiType.DUAL_INTERFACE_PRIORITY));
-            }
-            else if(host instanceof PartFluidInterface) {
-                FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(GuiType.DUAL_INTERFACE_PRIORITY_PART));
-            }
-        }
-
-        if( btn == this.switcher )
-        {
-            if (host instanceof TileFluidInterface) {
-                FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(GuiType.DUAL_INTERFACE_FLUID));
-            }
-            else if (host instanceof PartFluidInterface) {
-                FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(GuiType.DUAL_INTERFACE_FLUID_PART));
-            }
-        }
-
-        if( btn == this.interfaceMode )
-        {
-            NetworkHandler.instance.sendToServer( new PacketConfigButton( Settings.INTERFACE_TERMINAL, backwards ) );
-        }
-
-        if( btn == this.BlockMode )
-        {
-            NetworkHandler.instance.sendToServer( new PacketConfigButton( this.BlockMode.getSetting(), backwards ) );
-        }
-        if( btn == this.insertionMode )
-        {
-            NetworkHandler.instance.sendToServer( new PacketConfigButton( this.insertionMode.getSetting(), backwards ) );
-        }
-    }
-}

src/main/java/com/glodblock/github/client/gui/GuiFCBaseFluidMonitor.java

@@ -1,732 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import appeng.api.config.*;
-import appeng.api.implementations.tiles.IViewCellStorage;
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.util.IConfigManager;
-import appeng.api.util.IConfigurableObject;
-import appeng.client.gui.AEBaseMEGui;
-import appeng.client.gui.widgets.*;
-import appeng.client.me.InternalSlotME;
-import appeng.client.me.SlotDisconnected;
-import appeng.client.me.SlotME;
-import appeng.container.AEBaseContainer;
-import appeng.container.slot.*;
-import appeng.core.AEConfig;
-import appeng.core.AELog;
-import appeng.core.localization.ButtonToolTips;
-import appeng.core.localization.GuiText;
-import appeng.core.sync.GuiBridge;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketInventoryAction;
-import appeng.core.sync.packets.PacketSwitchGuis;
-import appeng.core.sync.packets.PacketValueConfig;
-import appeng.helpers.InventoryAction;
-import appeng.integration.IntegrationRegistry;
-import appeng.integration.IntegrationType;
-import appeng.util.IConfigManagerHost;
-import appeng.util.Platform;
-import appeng.util.item.AEItemStack;
-import codechicken.nei.LayoutManager;
-import codechicken.nei.util.TextHistory;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.FCBaseFluidMonitorContain;
-import com.glodblock.github.client.me.FluidRepo;
-import com.glodblock.github.common.item.ItemFluidDrop;
-import com.glodblock.github.network.CPacketInventoryAction;
-import com.glodblock.github.util.Ae2ReflectClient;
-import com.glodblock.github.util.ModAndClassUtil;
-import com.glodblock.github.util.NameConst;
-import com.glodblock.github.util.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.List;
-
-public class GuiFCBaseFluidMonitor extends AEBaseMEGui implements ISortSource, IConfigManagerHost, IDropToFillTextField {
-
-    public static int craftingGridOffsetX;
-    public static int craftingGridOffsetY;
-
-    private static String memoryText = "";
-    private final FluidRepo repo;
-    private final int offsetX = 9;
-    private final int lowerTextureOffset = 0;
-    private final boolean viewCell;
-    private final ItemStack[] myCurrentViewCells = new ItemStack[5];
-    public IConfigManager configSrc;
-    public FCBaseFluidMonitorContain monitorableContainer;
-    public GuiTabButton craftingStatusBtn;
-    private GuiImgButton craftingStatusImgBtn;
-    private FCGuiTextField searchField;
-    private int perRow = 9;
-    private int reservedSpace = 0;
-    private boolean customSortOrder = true;
-    private int rows = 0;
-    private int maxRows = Integer.MAX_VALUE;
-    private int standardSize;
-    private GuiImgButton ViewBox;
-    private GuiImgButton SortByBox;
-    private GuiImgButton SortDirBox;
-    private GuiImgButton searchBoxSettings;
-    private GuiImgButton terminalStyleBox;
-    private GuiImgButton searchStringSave;
-
-    public GuiFCBaseFluidMonitor(final InventoryPlayer inventoryPlayer, final ITerminalHost te, final FCBaseFluidMonitorContain c) {
-
-        super(c);
-
-        final GuiScrollbar scrollbar = new GuiScrollbar();
-        this.setScrollBar(scrollbar);
-        this.repo = new FluidRepo(scrollbar, this);
-
-        this.xSize = 195;
-        this.ySize = 204;
-
-        this.standardSize = this.xSize;
-
-        this.configSrc = ((IConfigurableObject) this.inventorySlots).getConfigManager();
-        (this.monitorableContainer = (FCBaseFluidMonitorContain) this.inventorySlots).setGui(this);
-
-        this.viewCell = te instanceof IViewCellStorage;
-
-    }
-
-    public void postUpdate(final List<IAEFluidStack> list) {
-        for (final IAEFluidStack is : list) {
-            IAEItemStack stack = AEItemStack.create(ItemFluidDrop.newDisplayStack(is.getFluidStack()));
-            stack.setStackSize(is.getStackSize());
-            this.repo.postUpdate(stack);
-        }
-
-        this.repo.updateView();
-        this.setScrollBar();
-    }
-
-    private void setScrollBar() {
-        this.getScrollBar().setTop(18).setLeft(175).setHeight(this.rows * 18 - 2);
-        this.getScrollBar().setRange(0, (this.repo.size() + this.perRow - 1) / this.perRow - this.rows, Math.max(1, this.rows / 6));
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-
-        if (btn == this.craftingStatusBtn || btn == this.craftingStatusImgBtn) {
-            NetworkHandler.instance.sendToServer(new PacketSwitchGuis(GuiBridge.GUI_CRAFTING_STATUS));
-        }
-
-        if (btn instanceof GuiImgButton) {
-            final boolean backwards = Mouse.isButtonDown(1);
-
-            final GuiImgButton iBtn = (GuiImgButton) btn;
-            if (iBtn.getSetting() != Settings.ACTIONS) {
-                final Enum<?> cv = iBtn.getCurrentValue();
-                final Enum<?> next = Platform.rotateEnum(cv, backwards, iBtn.getSetting().getPossibleValues());
-
-                if (btn == this.terminalStyleBox) {
-                    AEConfig.instance.settings.putSetting(iBtn.getSetting(), next);
-                } else if (btn == this.searchBoxSettings) {
-                    AEConfig.instance.settings.putSetting(iBtn.getSetting(), next);
-                } else if (ModAndClassUtil.isSaveText && btn == this.searchStringSave) {
-                    AEConfig.instance.preserveSearchBar = next == YesNo.YES;
-                } else {
-                    try {
-                        NetworkHandler.instance.sendToServer(new PacketValueConfig(iBtn.getSetting().name(), next.name()));
-                    } catch (final IOException e) {
-                        AELog.debug(e);
-                    }
-                }
-
-                iBtn.set(next);
-
-                if (next.getClass() == SearchBoxMode.class || next.getClass() == TerminalStyle.class) {
-                    this.reinitalize();
-                }
-            }
-        }
-    }
-
-    private void reinitalize() {
-        this.buttonList.clear();
-        this.initGui();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void initGui() {
-        Keyboard.enableRepeatEvents(true);
-
-        this.maxRows = this.getMaxRows();
-        this.perRow = AEConfig.instance.getConfigManager().getSetting(Settings.TERMINAL_STYLE) != TerminalStyle.FULL ? 9 : 9 + ((this.width - this.standardSize) / 18);
-
-        final boolean hasNEI = IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.NEI);
-
-        final int NEI = hasNEI ? 0 : 0;
-        int top = hasNEI ? 22 : 0;
-
-        final int magicNumber = 114 + 1;
-        final int extraSpace = this.height - magicNumber - NEI - top - this.reservedSpace;
-
-        this.rows = (int) Math.floor(extraSpace / 18.0);
-        if (this.rows > this.maxRows) {
-            top += (this.rows - this.maxRows) * 18 / 2;
-            this.rows = this.maxRows;
-        }
-
-        if (hasNEI) {
-            this.rows--;
-        }
-
-        if (this.rows < 3) {
-            this.rows = 3;
-        }
-
-        this.getMeSlots().clear();
-        for (int y = 0; y < this.rows; y++) {
-            for (int x = 0; x < this.perRow; x++) {
-                this.getMeSlots().add(new InternalSlotME(this.repo, x + y * this.perRow, this.offsetX + x * 18, 18 + y * 18));
-            }
-        }
-
-        if (AEConfig.instance.getConfigManager().getSetting(Settings.TERMINAL_STYLE) != TerminalStyle.FULL) {
-            this.xSize = this.standardSize + ((this.perRow - 9) * 18);
-        } else {
-            this.xSize = this.standardSize;
-        }
-
-        super.initGui();
-        // full size : 204
-        // extra slots : 72
-        // slot 18
-
-        this.ySize = magicNumber + this.rows * 18 + this.reservedSpace;
-        // this.guiTop = top;
-        final int unusedSpace = this.height - this.ySize;
-        this.guiTop = (int) Math.floor(unusedSpace / (unusedSpace < 0 ? 3.8f : 2.0f));
-
-        int offset = this.guiTop + 8;
-
-        if (this.customSortOrder) {
-            this.buttonList.add(this.SortByBox = new GuiImgButton(this.guiLeft - 18, offset, Settings.SORT_BY, this.configSrc.getSetting(Settings.SORT_BY)));
-            offset += 20;
-        }
-
-//        this.buttonList.add( this.ViewBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.VIEW_MODE, this.configSrc.getSetting( Settings.VIEW_MODE ) ) );
-//        offset += 20;
-
-        this.buttonList.add(this.SortDirBox = new GuiImgButton(this.guiLeft - 18, offset, Settings.SORT_DIRECTION, this.configSrc.getSetting(Settings.SORT_DIRECTION)));
-        offset += 20;
-
-        this.buttonList.add(this.searchBoxSettings = new GuiImgButton(this.guiLeft - 18, offset, Settings.SEARCH_MODE, AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE)));
-        offset += 20;
-
-        if (ModAndClassUtil.isSaveText) {
-            this.buttonList.add(this.searchStringSave = new GuiImgButton(this.guiLeft - 18, offset, Settings.SAVE_SEARCH, AEConfig.instance.preserveSearchBar ? YesNo.YES : YesNo.NO));
-            offset += 20;
-        }
-
-        this.buttonList.add(this.terminalStyleBox = new GuiImgButton(this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, AEConfig.instance.settings.getSetting(Settings.TERMINAL_STYLE)));
-        offset += 20;
-
-        this.searchField = new FCGuiTextField(this.fontRendererObj, this.guiLeft + Math.max(80, this.offsetX), this.guiTop + 4, 90, 12);
-        this.searchField.setEnableBackgroundDrawing(false);
-        this.searchField.setMaxStringLength(25);
-        this.searchField.setTextColor(0xFFFFFF);
-        this.searchField.setVisible(true);
-        if (ModAndClassUtil.isSearchStringTooltip)
-            searchField.setMessage(ButtonToolTips.SearchStringTooltip.getLocal());
-
-        if (this.viewCell) {
-            if (ModAndClassUtil.isCraftStatus && AEConfig.instance.getConfigManager().getSetting(Settings.CRAFTING_STATUS).equals(CraftingStatus.BUTTON)) {
-                this.buttonList.add(this.craftingStatusImgBtn = new GuiImgButton(this.guiLeft - 18, offset, Settings.CRAFTING_STATUS, AEConfig.instance.settings.getSetting(Settings.CRAFTING_STATUS)));
-            } else {
-                this.buttonList.add(this.craftingStatusBtn = new GuiTabButton(this.guiLeft + 170, this.guiTop - 4, 2 + 11 * 16, GuiText.CraftingStatus.getLocal(), itemRender));
-                this.craftingStatusBtn.setHideEdge(13); // GuiTabButton implementation //
-            }
-        }
-
-        // Enum setting = AEConfig.INSTANCE.getSetting( "Terminal", SearchBoxMode.class, SearchBoxMode.AUTOSEARCH );
-        final Enum<?> setting = AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE);
-        this.searchField.setFocused(SearchBoxMode.AUTOSEARCH == setting || SearchBoxMode.NEI_AUTOSEARCH == setting);
-
-        if (ModAndClassUtil.isSearchBar && (AEConfig.instance.preserveSearchBar || this.isSubGui())) {
-            setSearchString(memoryText, false);
-        }
-        if (this.isSubGui()) {
-            this.repo.updateView();
-            this.setScrollBar();
-        }
-
-        craftingGridOffsetX = Integer.MAX_VALUE;
-        craftingGridOffsetY = Integer.MAX_VALUE;
-
-        for (final Object s : this.inventorySlots.inventorySlots) {
-            if (s instanceof AppEngSlot) {
-                if (((Slot) s).xDisplayPosition < 195) {
-                    this.repositionSlot((AppEngSlot) s);
-                }
-            }
-
-            if (s instanceof SlotCraftingMatrix || s instanceof SlotFakeCraftingMatrix) {
-                final Slot g = (Slot) s;
-                if (g.xDisplayPosition > 0 && g.yDisplayPosition > 0) {
-                    craftingGridOffsetX = Math.min(craftingGridOffsetX, g.xDisplayPosition);
-                    craftingGridOffsetY = Math.min(craftingGridOffsetY, g.yDisplayPosition);
-                }
-            }
-        }
-
-        craftingGridOffsetX -= 25;
-        craftingGridOffsetY -= 6;
-    }
-
-    public void setSearchString(String memoryText, boolean updateView) {
-        this.searchField.setText(memoryText);
-        this.repo.setSearchString(memoryText);
-        if (updateView) {
-            this.repo.updateView();
-            this.setScrollBar();
-        }
-    }
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        this.fontRendererObj.drawString(this.getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_TERMINAL)), 8, 6, 4210752);
-        this.fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752);
-    }
-
-    @Override
-    protected void mouseClicked(final int xCoord, final int yCoord, final int btn) {
-        final Enum<?> searchMode = AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE);
-        if (searchMode != SearchBoxMode.AUTOSEARCH && searchMode != SearchBoxMode.NEI_AUTOSEARCH) {
-            this.searchField.mouseClicked(xCoord, yCoord, btn);
-        }
-        if (btn == 1 && this.searchField.isMouseIn(xCoord, yCoord)) {
-            setSearchString("", true);
-        }
-
-        super.mouseClicked(xCoord, yCoord, btn);
-    }
-
-    @Override
-    public void handleMouseInput() {
-        final int wheel = Mouse.getEventDWheel();
-        final int x = Mouse.getEventX() * this.width / this.mc.displayWidth;
-        final int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight;
-
-        if (wheel != 0 && this.searchField.isMouseIn(x, y) && isCtrlKeyDown()) {
-            final Enum<?> searchMode = AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE);
-            if (searchMode == SearchBoxMode.NEI_MANUAL_SEARCH || searchMode == SearchBoxMode.NEI_AUTOSEARCH) {
-                try {
-                    Field cls = LayoutManager.searchField.getClass().getDeclaredField("history");
-                    cls.setAccessible(true);
-                    TextHistory history = ((TextHistory) cls.get("get"));
-                    TextHistory.Direction direction;
-                    if (wheel > 0) {
-                        direction = TextHistory.Direction.PREVIOUS;
-                    } else {
-                        direction = TextHistory.Direction.NEXT;
-                    }
-                    history.get(direction, this.searchField.getText())
-                        .map(newText -> {
-                            setSearchString(newText, true);
-                            return true;
-                        })
-                        .orElse(false);
-                    return;
-                } catch (NoSuchFieldException | IllegalAccessException e) {
-                }
-            }
-        }
-        super.handleMouseInput();
-    }
-
-    @Override
-    protected void handleMouseClick(final Slot slot, final int slotIdx, final int ctrlDown, final int mouseButton) {
-        final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-
-        if (mouseButton == 3) {
-            if (slot instanceof OptionalSlotFake || slot instanceof SlotFakeCraftingMatrix) {
-                if (slot.getHasStack()) {
-                    InventoryAction action = InventoryAction.valueOf("SET_PATTERN_VALUE");
-                    IAEItemStack stack = AEItemStack.create(slot.getStack());
-
-                    ((AEBaseContainer) this.inventorySlots).setTargetStack(stack);
-                    FluidCraft.proxy.netHandler.sendToServer(new CPacketInventoryAction(action, Ae2ReflectClient.getInventorySlots(this).size(), 0, stack));
-                    return;
-                }
-            }
-        }
-
-        if (slot instanceof SlotFake) {
-            InventoryAction action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
-
-            if (Keyboard.isKeyDown(Keyboard.KEY_LMENU) || Keyboard.isKeyDown(Keyboard.KEY_RMENU)) {
-                if (action == InventoryAction.SPLIT_OR_PLACE_SINGLE) {
-                    action = InventoryAction.MOVE_REGION;
-                } else {
-                    action = InventoryAction.PICKUP_SINGLE;
-                }
-            }
-
-            if (Ae2ReflectClient.getDragClick(this).size() > 1) {
-                return;
-            }
-
-            final PacketInventoryAction p = new PacketInventoryAction(action, slotIdx, 0);
-            NetworkHandler.instance.sendToServer(p);
-
-            return;
-        }
-
-        if (slot instanceof SlotPatternTerm) {
-            if (mouseButton == 6) {
-                return; // prevent weird double clicks..
-            }
-
-            try {
-                NetworkHandler.instance.sendToServer(((SlotPatternTerm) slot).getRequest(isShiftKeyDown()));
-            } catch (final IOException e) {
-                AELog.debug(e);
-            }
-        } else if (slot instanceof SlotCraftingTerm) {
-            if (mouseButton == 6) {
-                return; // prevent weird double clicks..
-            }
-
-            InventoryAction action;
-            if (isShiftKeyDown()) {
-                action = InventoryAction.CRAFT_SHIFT;
-            } else {
-                // Craft stack on right-click, craft single on left-click
-                action = (mouseButton == 1) ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM;
-            }
-
-            final PacketInventoryAction p = new PacketInventoryAction(action, slotIdx, 0);
-            NetworkHandler.instance.sendToServer(p);
-
-            return;
-        }
-
-        if (Keyboard.isKeyDown(Keyboard.KEY_SPACE)) {
-            if (this.enableSpaceClicking() && !(slot instanceof SlotPatternTerm)) {
-                IAEItemStack stack = null;
-                if (slot instanceof SlotME) {
-                    stack = ((SlotME) slot).getAEStack();
-                }
-
-                int slotNum = Ae2ReflectClient.getInventorySlots(this).size();
-
-                if (!(slot instanceof SlotME) && slot != null) {
-                    slotNum = slot.slotNumber;
-                }
-
-                ((AEBaseContainer) this.inventorySlots).setTargetStack(stack);
-                final PacketInventoryAction p = new PacketInventoryAction(InventoryAction.MOVE_REGION, slotNum, 0);
-                NetworkHandler.instance.sendToServer(p);
-                return;
-            }
-        }
-
-        if (slot instanceof SlotDisconnected) {
-            if (Ae2ReflectClient.getDragClick(this).size() > 1) {
-                return;
-            }
-
-            InventoryAction action = null;
-
-            switch (mouseButton) {
-                case 0: // pickup / set-down.
-                {
-                    ItemStack heldStack = player.inventory.getItemStack();
-                    if (slot.getStack() == null && heldStack != null)
-                        action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
-                    else if (slot.getStack() != null && (heldStack == null || heldStack.stackSize <= 1))
-                        action = InventoryAction.PICKUP_OR_SET_DOWN;
-                }
-                break;
-                case 1:
-                    action = ctrlDown == 1 ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
-                    break;
-
-                case 3: // creative dupe:
-
-                    if (player.capabilities.isCreativeMode) {
-                        action = InventoryAction.CREATIVE_DUPLICATE;
-                    }
-
-                    break;
-
-                default:
-                case 4: // drop item:
-                case 6:
-            }
-
-            if (action != null) {
-                final PacketInventoryAction p = new PacketInventoryAction(action, slot.getSlotIndex(), ((SlotDisconnected) slot).getSlot().getId());
-                NetworkHandler.instance.sendToServer(p);
-            }
-
-            return;
-        }
-
-        if (slot instanceof SlotME) {
-            InventoryAction action = null;
-            IAEItemStack stack = null;
-
-            switch (mouseButton) {
-                case 0: // pickup / set-down.
-                    action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
-                    stack = ((SlotME) slot).getAEStack();
-
-                    if (stack != null && action == InventoryAction.PICKUP_OR_SET_DOWN && stack.getStackSize() == 0 && player.inventory.getItemStack() == null) {
-                        action = InventoryAction.AUTO_CRAFT;
-                    }
-
-                    break;
-                case 1:
-                    action = ctrlDown == 1 ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
-                    stack = ((SlotME) slot).getAEStack();
-                    break;
-
-                case 3: // creative dupe:
-
-                    stack = ((SlotME) slot).getAEStack();
-                    if (stack.getItem() instanceof ItemFluidDrop) {
-                        stack = ItemFluidDrop.newAeStack(ItemFluidDrop.getAeFluidStack(stack));
-                    }
-                    if (stack != null && stack.isCraftable()) {
-                        action = InventoryAction.AUTO_CRAFT;
-                    } else if (player.capabilities.isCreativeMode) {
-                        final IAEItemStack slotItem = ((SlotME) slot).getAEStack();
-                        if (slotItem != null) {
-                            action = InventoryAction.CREATIVE_DUPLICATE;
-                        }
-                    }
-                    break;
-
-                default:
-                case 4: // drop item:
-                case 6:
-            }
-
-            if (action == InventoryAction.AUTO_CRAFT) {
-                ((AEBaseContainer) this.inventorySlots).setTargetStack(stack);
-                FluidCraft.proxy.netHandler.sendToServer(new CPacketInventoryAction(action, Ae2ReflectClient.getInventorySlots(this).size(), 0, stack));
-            } else if (action != null) {
-                ((AEBaseContainer) this.inventorySlots).setTargetStack(stack);
-                final PacketInventoryAction p = new PacketInventoryAction(action, Ae2ReflectClient.getInventorySlots(this).size(), 0);
-                NetworkHandler.instance.sendToServer(p);
-            }
-
-            return;
-        }
-
-        super.handleMouseClick(slot, slotIdx, ctrlDown, mouseButton);
-    }
-
-    @Override
-    public void onGuiClosed() {
-        super.onGuiClosed();
-        Keyboard.enableRepeatEvents(false);
-        memoryText = this.searchField.getText();
-    }
-
-    public void bindTextureBack(final String file) {
-        final ResourceLocation loc = new ResourceLocation(FluidCraft.MODID, "textures/" + file);
-        this.mc.getTextureManager().bindTexture(loc);
-    }
-
-    @Override
-    public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-
-        this.bindTextureBack(this.getBackground());
-        final int x_width = 195;
-        this.drawTexturedModalRect(offsetX, offsetY, 0, 0, x_width, 18);
-
-        if (this.viewCell) {
-            this.drawTexturedModalRect(offsetX + x_width, offsetY, x_width, 0, 46, 128);
-        }
-
-        for (int x = 0; x < this.rows; x++) {
-            this.drawTexturedModalRect(offsetX, offsetY + 18 + x * 18, 0, 18, x_width, 18);
-        }
-
-        this.drawTexturedModalRect(offsetX, offsetY + 16 + this.rows * 18 + this.lowerTextureOffset, 0, 106 - 18 - 18, x_width, 99 + this.reservedSpace - this.lowerTextureOffset);
-
-        if (this.viewCell) {
-            boolean update = false;
-
-            for (int i = 0; i < 5; i++) {
-                if (this.myCurrentViewCells[i] != this.monitorableContainer.getCellViewSlot(i).getStack()) {
-                    update = true;
-                    this.myCurrentViewCells[i] = this.monitorableContainer.getCellViewSlot(i).getStack();
-                }
-            }
-
-            if (update) {
-                this.repo.setViewCell(this.myCurrentViewCells);
-            }
-        }
-
-        if (this.searchField != null) {
-            this.searchField.drawTextBox();
-        }
-    }
-
-    protected String getBackground() {
-        return "gui/terminal.png";
-    }
-
-    @Override
-    protected boolean isPowered() {
-        return this.repo.hasPower();
-    }
-
-    int getMaxRows() {
-        return AEConfig.instance.getConfigManager().getSetting(Settings.TERMINAL_STYLE) == TerminalStyle.SMALL ? 6 : Integer.MAX_VALUE;
-    }
-
-    protected void repositionSlot(final AppEngSlot s) {
-        s.yDisplayPosition = s.getY() + this.ySize - 78 - 5;
-    }
-
-    @Override
-    protected void keyTyped(final char character, final int key) {
-        if (!this.checkHotbarKeys(key)) {
-            if (character == ' ' && this.searchField.getText().isEmpty()) {
-                return;
-            }
-
-            if (this.searchField.textboxKeyTyped(character, key)) {
-                this.repo.setSearchString(this.searchField.getText());
-                this.repo.updateView();
-                this.setScrollBar();
-            } else {
-                super.keyTyped(character, key);
-            }
-        }
-    }
-
-    @Override
-    public void updateScreen() {
-        this.repo.setPower(this.monitorableContainer.isPowered());
-        super.updateScreen();
-    }
-
-    @Override
-    public Enum<?> getSortBy() {
-        return this.configSrc.getSetting(Settings.SORT_BY);
-    }
-
-    @Override
-    public Enum<?> getSortDir() {
-        return this.configSrc.getSetting(Settings.SORT_DIRECTION);
-    }
-
-    @Override
-    public Enum<?> getSortDisplay() {
-        return this.configSrc.getSetting(Settings.VIEW_MODE);
-    }
-
-    @Override
-    public void updateSetting(final IConfigManager manager, final Enum settingName, final Enum newValue) {
-        if (this.SortByBox != null) {
-            this.SortByBox.set(this.configSrc.getSetting(Settings.SORT_BY));
-        }
-
-        if (this.SortDirBox != null) {
-            this.SortDirBox.set(this.configSrc.getSetting(Settings.SORT_DIRECTION));
-        }
-
-        if (this.ViewBox != null) {
-            this.ViewBox.set(this.configSrc.getSetting(Settings.VIEW_MODE));
-        }
-
-        this.repo.updateView();
-    }
-
-    public int getReservedSpace() {
-        return this.reservedSpace;
-    }
-
-    public void setReservedSpace(final int reservedSpace) {
-        this.reservedSpace = reservedSpace;
-    }
-
-    public boolean isCustomSortOrder() {
-        return this.customSortOrder;
-    }
-
-    public void setCustomSortOrder(final boolean customSortOrder) {
-        this.customSortOrder = customSortOrder;
-    }
-
-    public int getStandardSize() {
-        return this.standardSize;
-    }
-
-    public void setStandardSize(final int standardSize) {
-        this.standardSize = standardSize;
-    }
-
-    @Override
-    public void drawScreen(final int mouseX, final int mouseY, final float btn) {
-        super.drawScreen(mouseX, mouseY, btn);
-        if (ModAndClassUtil.isSearchBar && AEConfig.instance.preserveSearchBar && searchField != null)
-            handleTooltip(mouseX, mouseY, searchField.new TooltipProvider());
-    }
-
-    public boolean isOverSearchField(int x, int y) {
-        return searchField.isMouseIn(x, y);
-    }
-
-    public boolean hideItemPanelSlot(int tx, int ty, int tw, int th) {
-
-        if (this.viewCell) {
-            int rw = 33;
-            int rh = 14 + myCurrentViewCells.length * 18;
-
-            if (rw <= 0 || rh <= 0 || tw <= 0 || th <= 0) {
-                return false;
-            }
-
-            int rx = this.guiLeft + this.xSize;
-            int ry = this.guiTop + 0;
-
-            rw += rx;
-            rh += ry;
-            tw += tx;
-            th += ty;
-
-            //      overflow || intersect
-            return (rw < rx || rw > tx) && (rh < ry || rh > ty) && (tw < tx || tw > rx) && (th < ty || th > ry);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean isOverTextField(int mousex, int mousey) {
-        return searchField.isMouseIn(mousex, mousey);
-    }
-
-    @Override
-    public void setTextFieldValue(String displayName, int mousex, int mousey, ItemStack stack) {
-        if (Util.getFluidFromItem(stack) != null) {
-            setSearchString(Util.getFluidFromItem(stack).getFluid().getLocalizedName(), true);
-        }
-    }
-}

src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java

@@ -1,830 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import appeng.api.config.*;
-import appeng.api.implementations.tiles.IViewCellStorage;
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.util.IConfigManager;
-import appeng.api.util.IConfigurableObject;
-import appeng.client.gui.AEBaseMEGui;
-import appeng.client.gui.widgets.*;
-import appeng.client.me.InternalSlotME;
-import appeng.client.me.ItemRepo;
-import appeng.client.me.SlotDisconnected;
-import appeng.client.me.SlotME;
-import appeng.container.AEBaseContainer;
-import appeng.container.slot.*;
-import appeng.core.AEConfig;
-import appeng.core.AELog;
-import appeng.core.localization.ButtonToolTips;
-import appeng.core.localization.GuiText;
-import appeng.core.sync.GuiBridge;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketInventoryAction;
-import appeng.core.sync.packets.PacketSwitchGuis;
-import appeng.core.sync.packets.PacketValueConfig;
-import appeng.helpers.InventoryAction;
-import appeng.integration.IntegrationRegistry;
-import appeng.integration.IntegrationType;
-import appeng.util.IConfigManagerHost;
-import appeng.util.Platform;
-import appeng.util.item.AEItemStack;
-import codechicken.nei.LayoutManager;
-import codechicken.nei.util.TextHistory;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.FCBaseMonitorContain;
-import com.glodblock.github.network.CPacketInventoryAction;
-import com.glodblock.github.util.Ae2ReflectClient;
-import com.glodblock.github.util.ModAndClassUtil;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.List;
-
-public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfigManagerHost, IDropToFillTextField {
-
-    public static int craftingGridOffsetX;
-    public static int craftingGridOffsetY;
-
-    private static String memoryText = "";
-    private final ItemRepo repo;
-    private final int offsetX = 9;
-    private final int lowerTextureOffset = 0;
-    public IConfigManager configSrc;
-    private final boolean viewCell;
-    private final ItemStack[] myCurrentViewCells = new ItemStack[5];
-    public FCBaseMonitorContain monitorableContainer;
-    public GuiTabButton craftingStatusBtn;
-    private GuiImgButton craftingStatusImgBtn;
-    private FCGuiTextField searchField;
-    private int perRow = 9;
-    private int reservedSpace = 0;
-    private boolean customSortOrder = true;
-    private int rows = 0;
-    private int maxRows = Integer.MAX_VALUE;
-    private int standardSize;
-    private GuiImgButton ViewBox;
-    private GuiImgButton SortByBox;
-    private GuiImgButton SortDirBox;
-    private GuiImgButton searchBoxSettings;
-    private GuiImgButton terminalStyleBox;
-    private GuiImgButton searchStringSave;
-
-    public GuiFCBaseMonitor( final InventoryPlayer inventoryPlayer, final ITerminalHost te, final FCBaseMonitorContain c )
-    {
-
-        super( c );
-
-        final GuiScrollbar scrollbar = new GuiScrollbar();
-        this.setScrollBar( scrollbar );
-        this.repo = new ItemRepo( scrollbar, this );
-
-        this.xSize = 195;
-        this.ySize = 204;
-
-        this.standardSize = this.xSize;
-
-        this.configSrc = ( (IConfigurableObject) this.inventorySlots ).getConfigManager();
-        ( this.monitorableContainer = (FCBaseMonitorContain) this.inventorySlots ).setGui( this );
-
-        this.viewCell = te instanceof IViewCellStorage;
-
-    }
-
-    public void postUpdate( final List<IAEItemStack> list )
-    {
-        for( final IAEItemStack is : list )
-        {
-            this.repo.postUpdate( is );
-        }
-
-        this.repo.updateView();
-        this.setScrollBar();
-    }
-
-    private void setScrollBar()
-    {
-        this.getScrollBar().setTop( 18 ).setLeft( 175 ).setHeight( this.rows * 18 - 2 );
-        this.getScrollBar().setRange( 0, ( this.repo.size() + this.perRow - 1 ) / this.perRow - this.rows, Math.max( 1, this.rows / 6 ) );
-    }
-
-    @Override
-    protected void actionPerformed( final GuiButton btn )
-    {
-
-        if(  btn == this.craftingStatusBtn || btn == this.craftingStatusImgBtn )
-        {
-            NetworkHandler.instance.sendToServer( new PacketSwitchGuis( GuiBridge.GUI_CRAFTING_STATUS ) );
-        }
-
-        if( btn instanceof GuiImgButton )
-        {
-            final boolean backwards = Mouse.isButtonDown( 1 );
-
-            final GuiImgButton iBtn = (GuiImgButton) btn;
-            if( iBtn.getSetting() != Settings.ACTIONS )
-            {
-                final Enum<?> cv = iBtn.getCurrentValue();
-                final Enum<?> next = Platform.rotateEnum( cv, backwards, iBtn.getSetting().getPossibleValues() );
-
-                if( btn == this.terminalStyleBox )
-                {
-                    AEConfig.instance.settings.putSetting( iBtn.getSetting(), next );
-                }
-                else if( btn == this.searchBoxSettings )
-                {
-                    AEConfig.instance.settings.putSetting( iBtn.getSetting(), next );
-                }
-                else if( ModAndClassUtil.isSaveText && btn == this.searchStringSave )
-                {
-                    AEConfig.instance.preserveSearchBar = next == YesNo.YES;
-                }
-                else
-                {
-                    try
-                    {
-                        NetworkHandler.instance.sendToServer( new PacketValueConfig( iBtn.getSetting().name(), next.name() ) );
-                    }
-                    catch( final IOException e )
-                    {
-                        AELog.debug( e );
-                    }
-                }
-
-                iBtn.set( next );
-
-                if( next.getClass() == SearchBoxMode.class || next.getClass() == TerminalStyle.class )
-                {
-                    this.reinitalize();
-                }
-            }
-        }
-    }
-
-    private void reinitalize()
-    {
-        this.buttonList.clear();
-        this.initGui();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void initGui()
-    {
-        Keyboard.enableRepeatEvents( true );
-
-        this.maxRows = this.getMaxRows();
-        this.perRow = AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) != TerminalStyle.FULL ? 9 : 9 + ( ( this.width - this.standardSize ) / 18 );
-
-        final boolean hasNEI = IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.NEI );
-
-        final int NEI = hasNEI ? 0 : 0;
-        int top = hasNEI ? 22 : 0;
-
-        final int magicNumber = 114 + 1;
-        final int extraSpace = this.height - magicNumber - NEI - top - this.reservedSpace;
-
-        this.rows = (int) Math.floor( extraSpace / 18.0 );
-        if( this.rows > this.maxRows )
-        {
-            top += ( this.rows - this.maxRows ) * 18 / 2;
-            this.rows = this.maxRows;
-        }
-
-        if( hasNEI )
-        {
-            this.rows--;
-        }
-
-        if( this.rows < 3 )
-        {
-            this.rows = 3;
-        }
-
-        this.getMeSlots().clear();
-        for( int y = 0; y < this.rows; y++ )
-        {
-            for( int x = 0; x < this.perRow; x++ )
-            {
-                this.getMeSlots().add( new InternalSlotME( this.repo, x + y * this.perRow, this.offsetX + x * 18, 18 + y * 18 ) );
-            }
-        }
-
-        if( AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) != TerminalStyle.FULL )
-        {
-            this.xSize = this.standardSize + ( ( this.perRow - 9 ) * 18 );
-        }
-        else
-        {
-            this.xSize = this.standardSize;
-        }
-
-        super.initGui();
-        // full size : 204
-        // extra slots : 72
-        // slot 18
-
-        this.ySize = magicNumber + this.rows * 18 + this.reservedSpace;
-        // this.guiTop = top;
-        final int unusedSpace = this.height - this.ySize;
-        this.guiTop = (int) Math.floor( unusedSpace / ( unusedSpace < 0 ? 3.8f : 2.0f ) );
-
-        int offset = this.guiTop + 8;
-
-        if( this.customSortOrder )
-        {
-            this.buttonList.add( this.SortByBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.SORT_BY, this.configSrc.getSetting( Settings.SORT_BY ) ) );
-            offset += 20;
-        }
-
-        this.buttonList.add( this.ViewBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.VIEW_MODE, this.configSrc.getSetting( Settings.VIEW_MODE ) ) );
-        offset += 20;
-
-        this.buttonList.add( this.SortDirBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.SORT_DIRECTION, this.configSrc.getSetting( Settings.SORT_DIRECTION ) ) );
-        offset += 20;
-
-        this.buttonList.add( this.searchBoxSettings = new GuiImgButton( this.guiLeft - 18, offset, Settings.SEARCH_MODE, AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE ) ) );
-        offset += 20;
-
-        if (ModAndClassUtil.isSaveText) {
-            this.buttonList.add( this.searchStringSave = new GuiImgButton( this.guiLeft - 18, offset, Settings.SAVE_SEARCH, AEConfig.instance.preserveSearchBar ? YesNo.YES : YesNo.NO ) );
-            offset += 20;
-        }
-
-        this.buttonList.add( this.terminalStyleBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, AEConfig.instance.settings.getSetting( Settings.TERMINAL_STYLE ) ) );
-        offset += 20;
-
-        this.searchField = new FCGuiTextField( this.fontRendererObj, this.guiLeft + Math.max( 80, this.offsetX ), this.guiTop + 4, 90, 12 );
-        this.searchField.setEnableBackgroundDrawing( false );
-        this.searchField.setMaxStringLength( 25 );
-        this.searchField.setTextColor( 0xFFFFFF );
-        this.searchField.setVisible( true );
-        if (ModAndClassUtil.isSearchStringTooltip)
-            searchField.setMessage(ButtonToolTips.SearchStringTooltip.getLocal());
-
-        if( this.viewCell)
-        {
-            if (ModAndClassUtil.isCraftStatus && AEConfig.instance.getConfigManager().getSetting(Settings.CRAFTING_STATUS).equals(CraftingStatus.BUTTON)) {
-                this.buttonList.add(this.craftingStatusImgBtn = new GuiImgButton(this.guiLeft - 18, offset, Settings.CRAFTING_STATUS, AEConfig.instance.settings.getSetting(Settings.CRAFTING_STATUS)));
-            } else {
-                this.buttonList.add(this.craftingStatusBtn = new GuiTabButton(this.guiLeft + 170, this.guiTop - 4, 2 + 11 * 16, GuiText.CraftingStatus.getLocal(), itemRender));
-                this.craftingStatusBtn.setHideEdge( 13 ); // GuiTabButton implementation //
-            }
-        }
-
-        // Enum setting = AEConfig.INSTANCE.getSetting( "Terminal", SearchBoxMode.class, SearchBoxMode.AUTOSEARCH );
-        final Enum<?> setting = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE );
-        this.searchField.setFocused( SearchBoxMode.AUTOSEARCH == setting || SearchBoxMode.NEI_AUTOSEARCH == setting );
-
-        if (ModAndClassUtil.isSearchBar && (AEConfig.instance.preserveSearchBar || this.isSubGui()))
-        {
-            setSearchString(memoryText, false);
-        }
-        if( this.isSubGui() )
-        {
-            this.repo.updateView();
-            this.setScrollBar();
-        }
-
-        craftingGridOffsetX = Integer.MAX_VALUE;
-        craftingGridOffsetY = Integer.MAX_VALUE;
-
-        for( final Object s : this.inventorySlots.inventorySlots )
-        {
-            if( s instanceof AppEngSlot)
-            {
-                if( ( (Slot) s ).xDisplayPosition < 195 )
-                {
-                    this.repositionSlot( (AppEngSlot) s );
-                }
-            }
-
-            if( s instanceof SlotCraftingMatrix || s instanceof SlotFakeCraftingMatrix)
-            {
-                final Slot g = (Slot) s;
-                if( g.xDisplayPosition > 0 && g.yDisplayPosition > 0 )
-                {
-                    craftingGridOffsetX = Math.min( craftingGridOffsetX, g.xDisplayPosition );
-                    craftingGridOffsetY = Math.min( craftingGridOffsetY, g.yDisplayPosition );
-                }
-            }
-        }
-
-        craftingGridOffsetX -= 25;
-        craftingGridOffsetY -= 6;
-    }
-
-    public void setSearchString(String memoryText, boolean updateView)
-    {
-        this.searchField.setText(memoryText);
-        this.repo.setSearchString(memoryText);
-        if (updateView)
-        {
-            this.repo.updateView();
-            this.setScrollBar();
-        }
-    }
-
-    @Override
-    public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
-    {
-        this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.Terminal.getLocal() ), 8, 6, 4210752 );
-        this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
-    }
-
-    @Override
-    protected void mouseClicked( final int xCoord, final int yCoord, final int btn ) {
-        final Enum<?> searchMode = AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE);
-        final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-        ItemStack is = player.inventory.getItemStack();
-        if (searchMode != SearchBoxMode.AUTOSEARCH && searchMode != SearchBoxMode.NEI_AUTOSEARCH) {
-            this.searchField.mouseClicked(xCoord, yCoord, btn);
-        }
-        if (btn == 1 && this.searchField.isMouseIn(xCoord, yCoord)) {
-            setSearchString("", true);
-        }
-
-        super.mouseClicked(xCoord, yCoord, btn);
-    }
-
-    @Override
-    public void handleMouseInput() {
-        final int wheel = Mouse.getEventDWheel();
-        final int x = Mouse.getEventX() * this.width / this.mc.displayWidth;
-        final int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight;
-
-        if (wheel != 0 && this.searchField.isMouseIn(x, y) && isCtrlKeyDown()) {
-            final Enum<?> searchMode = AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE);
-            if (searchMode == SearchBoxMode.NEI_MANUAL_SEARCH || searchMode == SearchBoxMode.NEI_AUTOSEARCH) {
-                try {
-                    Field cls = LayoutManager.searchField.getClass().getDeclaredField("history");
-                    cls.setAccessible(true);
-                    TextHistory history = ((TextHistory) cls.get("get"));
-                    TextHistory.Direction direction;
-                    if (wheel > 0) {
-                        direction = TextHistory.Direction.PREVIOUS;
-                    } else {
-                        direction = TextHistory.Direction.NEXT;
-                    }
-                    history.get(direction, this.searchField.getText())
-                        .map(newText -> {
-                            setSearchString(newText, true);
-                            return true;
-                        })
-                        .orElse(false);
-                    return;
-                } catch (NoSuchFieldException | IllegalAccessException e) {
-                }
-            }
-        }
-        super.handleMouseInput();
-    }
-
-    @Override
-    protected void handleMouseClick(final Slot slot, final int slotIdx, final int ctrlDown, final int mouseButton) {
-        final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-
-        if (mouseButton == 3) {
-            if (slot instanceof OptionalSlotFake || slot instanceof SlotFakeCraftingMatrix) {
-                if (slot.getHasStack()) {
-                    InventoryAction action = InventoryAction.valueOf("SET_PATTERN_VALUE");
-                    IAEItemStack stack = AEItemStack.create(slot.getStack());
-
-                    ((AEBaseContainer) this.inventorySlots).setTargetStack(stack);
-                    FluidCraft.proxy.netHandler.sendToServer(new CPacketInventoryAction(action, Ae2ReflectClient.getInventorySlots(this).size(), 0, stack));
-                    return;
-                }
-            }
-        }
-
-        if( slot instanceof SlotFake)
-        {
-            InventoryAction action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
-
-            if (Keyboard.isKeyDown(Keyboard.KEY_LMENU) || Keyboard.isKeyDown(Keyboard.KEY_RMENU)) {
-                if (action == InventoryAction.SPLIT_OR_PLACE_SINGLE) {
-                    action = InventoryAction.MOVE_REGION;
-                }
-                else {
-                    action = InventoryAction.PICKUP_SINGLE;
-                }
-            }
-
-            if( Ae2ReflectClient.getDragClick(this).size() > 1 )
-            {
-                return;
-            }
-
-            final PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
-            NetworkHandler.instance.sendToServer( p );
-
-            return;
-        }
-
-        if( slot instanceof SlotPatternTerm)
-        {
-            if( mouseButton == 6 )
-            {
-                return; // prevent weird double clicks..
-            }
-
-            try
-            {
-                NetworkHandler.instance.sendToServer( ( (SlotPatternTerm) slot ).getRequest( isShiftKeyDown() ) );
-            }
-            catch( final IOException e )
-            {
-                AELog.debug( e );
-            }
-        }
-        else if( slot instanceof SlotCraftingTerm )
-        {
-            if( mouseButton == 6 )
-            {
-                return; // prevent weird double clicks..
-            }
-
-            InventoryAction action;
-            if( isShiftKeyDown() )
-            {
-                action = InventoryAction.CRAFT_SHIFT;
-            }
-            else
-            {
-                // Craft stack on right-click, craft single on left-click
-                action = ( mouseButton == 1 ) ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM;
-            }
-
-            final PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
-            NetworkHandler.instance.sendToServer( p );
-
-            return;
-        }
-
-        if( Keyboard.isKeyDown( Keyboard.KEY_SPACE ) )
-        {
-            if( this.enableSpaceClicking() && !( slot instanceof SlotPatternTerm ) )
-            {
-                IAEItemStack stack = null;
-                if( slot instanceof SlotME )
-                {
-                    stack = ( (SlotME) slot ).getAEStack();
-                }
-
-                int slotNum = Ae2ReflectClient.getInventorySlots(this).size();
-
-                if( !( slot instanceof SlotME ) && slot != null )
-                {
-                    slotNum = slot.slotNumber;
-                }
-
-                ( (AEBaseContainer) this.inventorySlots ).setTargetStack( stack );
-                final PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, slotNum, 0 );
-                NetworkHandler.instance.sendToServer( p );
-                return;
-            }
-        }
-
-        if( slot instanceof SlotDisconnected)
-        {
-            if( Ae2ReflectClient.getDragClick(this).size() > 1 )
-            {
-                return;
-            }
-
-            InventoryAction action = null;
-
-            switch( mouseButton )
-            {
-                case 0: // pickup / set-down.
-                {
-                    ItemStack heldStack = player.inventory.getItemStack();
-                    if (slot.getStack() == null && heldStack != null)
-                        action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
-                    else if (slot.getStack() != null && (heldStack == null || heldStack.stackSize <= 1))
-                        action = InventoryAction.PICKUP_OR_SET_DOWN;
-                }
-                break;
-                case 1:
-                    action = ctrlDown == 1 ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
-                    break;
-
-                case 3: // creative dupe:
-
-                    if( player.capabilities.isCreativeMode )
-                    {
-                        action = InventoryAction.CREATIVE_DUPLICATE;
-                    }
-
-                    break;
-
-                default:
-                case 4: // drop item:
-                case 6:
-            }
-
-            if( action != null )
-            {
-                final PacketInventoryAction p = new PacketInventoryAction( action, slot.getSlotIndex(), ( (SlotDisconnected) slot ).getSlot().getId() );
-                NetworkHandler.instance.sendToServer( p );
-            }
-
-            return;
-        }
-
-        if( slot instanceof SlotME )
-        {
-            InventoryAction action = null;
-            IAEItemStack stack = null;
-
-            switch( mouseButton )
-            {
-                case 0: // pickup / set-down.
-                    action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
-                    stack = ( (SlotME) slot ).getAEStack();
-
-                    if( stack != null && action == InventoryAction.PICKUP_OR_SET_DOWN && stack.getStackSize() == 0 && player.inventory.getItemStack() == null )
-                    {
-                        action = InventoryAction.AUTO_CRAFT;
-                    }
-
-                    break;
-                case 1:
-                    action = ctrlDown == 1 ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
-                    stack = ( (SlotME) slot ).getAEStack();
-                    break;
-
-                case 3: // creative dupe:
-
-                    stack = ( (SlotME) slot ).getAEStack();
-                    if( stack != null && stack.isCraftable() )
-                    {
-                        action = InventoryAction.AUTO_CRAFT;
-                    }
-                    else if( player.capabilities.isCreativeMode )
-                    {
-                        final IAEItemStack slotItem = ( (SlotME) slot ).getAEStack();
-                        if( slotItem != null )
-                        {
-                            action = InventoryAction.CREATIVE_DUPLICATE;
-                        }
-                    }
-                    break;
-
-                default:
-                case 4: // drop item:
-                case 6:
-            }
-
-            if (action == InventoryAction.AUTO_CRAFT) {
-                ((AEBaseContainer) this.inventorySlots).setTargetStack( stack );
-                FluidCraft.proxy.netHandler.sendToServer(new CPacketInventoryAction(action, Ae2ReflectClient.getInventorySlots(this).size(), 0, stack));
-            }
-            else if( action != null )
-            {
-                ( (AEBaseContainer) this.inventorySlots ).setTargetStack( stack );
-                final PacketInventoryAction p = new PacketInventoryAction( action, Ae2ReflectClient.getInventorySlots(this).size(), 0 );
-                NetworkHandler.instance.sendToServer( p );
-            }
-
-            return;
-        }
-
-        super.handleMouseClick( slot, slotIdx, ctrlDown, mouseButton );
-    }
-
-    @Override
-    public void onGuiClosed()
-    {
-        super.onGuiClosed();
-        Keyboard.enableRepeatEvents( false );
-        memoryText = this.searchField.getText();
-    }
-
-    public void bindTextureBack( final String file )
-    {
-        final ResourceLocation loc = new ResourceLocation( FluidCraft.MODID, "textures/" + file );
-        this.mc.getTextureManager().bindTexture( loc );
-    }
-
-    @Override
-    public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
-    {
-
-        this.bindTextureBack( this.getBackground() );
-        final int x_width = 195;
-        this.drawTexturedModalRect( offsetX, offsetY, 0, 0, x_width, 18 );
-
-        if( this.viewCell )
-        {
-            this.drawTexturedModalRect( offsetX + x_width, offsetY, x_width, 0, 46, 128 );
-        }
-
-        for( int x = 0; x < this.rows; x++ )
-        {
-            this.drawTexturedModalRect( offsetX, offsetY + 18 + x * 18, 0, 18, x_width, 18 );
-        }
-
-        this.drawTexturedModalRect( offsetX, offsetY + 16 + this.rows * 18 + this.lowerTextureOffset, 0, 106 - 18 - 18, x_width, 99 + this.reservedSpace - this.lowerTextureOffset );
-
-        if( this.viewCell )
-        {
-            boolean update = false;
-
-            for( int i = 0; i < 5; i++ )
-            {
-                if( this.myCurrentViewCells[i] != this.monitorableContainer.getCellViewSlot( i ).getStack() )
-                {
-                    update = true;
-                    this.myCurrentViewCells[i] = this.monitorableContainer.getCellViewSlot( i ).getStack();
-                }
-            }
-
-            if( update )
-            {
-                this.repo.setViewCell( this.myCurrentViewCells );
-            }
-        }
-
-        if( this.searchField != null )
-        {
-            this.searchField.drawTextBox();
-        }
-    }
-
-    protected String getBackground()
-    {
-        return "gui/terminal.png";
-    }
-
-    @Override
-    protected boolean isPowered()
-    {
-        return this.repo.hasPower();
-    }
-
-    int getMaxRows()
-    {
-        return AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) == TerminalStyle.SMALL ? 6 : Integer.MAX_VALUE;
-    }
-
-    protected void repositionSlot( final AppEngSlot s )
-    {
-        s.yDisplayPosition = s.getY() + this.ySize - 78 - 5;
-    }
-
-    @Override
-    protected void keyTyped( final char character, final int key )
-    {
-        if( !this.checkHotbarKeys( key ) )
-        {
-            if( character == ' ' && this.searchField.getText().isEmpty() )
-            {
-                return;
-            }
-
-            if( this.searchField.textboxKeyTyped( character, key ) )
-            {
-                this.repo.setSearchString( this.searchField.getText() );
-                this.repo.updateView();
-                this.setScrollBar();
-            }
-            else
-            {
-                super.keyTyped( character, key );
-            }
-        }
-    }
-
-    @Override
-    public void updateScreen()
-    {
-        this.repo.setPower( this.monitorableContainer.isPowered() );
-        super.updateScreen();
-    }
-
-    @Override
-    public Enum<?> getSortBy()
-    {
-        return this.configSrc.getSetting( Settings.SORT_BY );
-    }
-
-    @Override
-    public Enum<?> getSortDir()
-    {
-        return this.configSrc.getSetting( Settings.SORT_DIRECTION );
-    }
-
-    @Override
-    public Enum<?> getSortDisplay()
-    {
-        return this.configSrc.getSetting( Settings.VIEW_MODE );
-    }
-
-    @Override
-    public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
-    {
-        if( this.SortByBox != null )
-        {
-            this.SortByBox.set( this.configSrc.getSetting( Settings.SORT_BY ) );
-        }
-
-        if( this.SortDirBox != null )
-        {
-            this.SortDirBox.set( this.configSrc.getSetting( Settings.SORT_DIRECTION ) );
-        }
-
-        if( this.ViewBox != null )
-        {
-            this.ViewBox.set( this.configSrc.getSetting( Settings.VIEW_MODE ) );
-        }
-
-        this.repo.updateView();
-    }
-
-    public int getReservedSpace()
-    {
-        return this.reservedSpace;
-    }
-
-    public void setReservedSpace( final int reservedSpace )
-    {
-        this.reservedSpace = reservedSpace;
-    }
-
-    public boolean isCustomSortOrder()
-    {
-        return this.customSortOrder;
-    }
-
-    public void setCustomSortOrder( final boolean customSortOrder )
-    {
-        this.customSortOrder = customSortOrder;
-    }
-
-    public int getStandardSize()
-    {
-        return this.standardSize;
-    }
-
-    public void setStandardSize( final int standardSize )
-    {
-        this.standardSize = standardSize;
-    }
-
-    @Override
-    public void drawScreen( final int mouseX, final int mouseY, final float btn ) {
-        super.drawScreen(mouseX, mouseY, btn);
-        if (ModAndClassUtil.isSearchBar && AEConfig.instance.preserveSearchBar && searchField != null)
-            handleTooltip(mouseX, mouseY, searchField.new TooltipProvider());
-    }
-    public boolean isOverSearchField(int x, int y)
-    {
-        return searchField.isMouseIn(x,y);
-    }
-
-    public boolean hideItemPanelSlot(int tx, int ty, int tw, int th)
-    {
-
-        if (this.viewCell) {
-            int rw = 33;
-            int rh = 14 + myCurrentViewCells.length * 18;
-
-            if (rw <= 0 || rh <= 0 || tw <= 0 || th <= 0) {
-                return false;
-            }
-
-            int rx = this.guiLeft + this.xSize;
-            int ry = this.guiTop + 0;
-
-            rw += rx;
-            rh += ry;
-            tw += tx;
-            th += ty;
-
-            //      overflow || intersect
-            return (rw < rx || rw > tx) && (rh < ry || rh > ty) && (tw < tx || tw > rx) && (th < ty || th > ry);
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean isOverTextField(int mousex, int mousey) {
-        return searchField.isMouseIn(mousex, mousey);
-    }
-
-    @Override
-    public void setTextFieldValue(String displayName, int mousex, int mousey, ItemStack stack) {
-        setSearchString(displayName, true);
-    }
-}

src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java

@@ -1,31 +1,40 @@
 package com.glodblock.github.client.gui;
 
-import appeng.client.gui.widgets.ITooltip;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.util.NameConst;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.util.StatCollector;
-import org.lwjgl.opengl.GL11;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Pattern;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.util.StatCollector;
+
+import org.lwjgl.opengl.GL11;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.util.NameConst;
+
+import appeng.client.gui.widgets.ITooltip;
+
 public class GuiFCImgButton extends GuiButton implements ITooltip {
 
-    private static final Pattern COMPILE = Pattern.compile( "%s" );
-    private static final Pattern PATTERN_NEW_LINE = Pattern.compile( "\\n", Pattern.LITERAL );
+    private static final Pattern COMPILE = Pattern.compile("%s");
+    private static final Pattern PATTERN_NEW_LINE = Pattern.compile("\\n", Pattern.LITERAL);
     private static Map<EnumPair, ButtonAppearance> appearances;
     private final String buttonSetting;
     private boolean halfSize = false;
+    private boolean threeFourths = false;
     private String fillVar;
     private String currentValue;
+    private final boolean background;
     private static final String prefix = NameConst.TT_KEY;
 
-    public GuiFCImgButton( final int x, final int y, final String idx, final String val ) {
-        super(0, 0, 16, "");
+    public GuiFCImgButton(final int x, final int y, final String idx, final String val) {
+        this(x, y, idx, val, true);
+    }
 
+    public GuiFCImgButton(final int x, final int y, final String idx, final String val, boolean background) {
+        super(0, 0, 16, "");
+        this.background = background;
         this.buttonSetting = idx;
         this.currentValue = val;
         this.xPosition = x;
@@ -33,19 +42,45 @@ public class GuiFCImgButton extends GuiButton implements ITooltip {
         this.width = 16;
         this.height = 16;
 
-        if( appearances == null ) {
+        if (appearances == null) {
             appearances = new HashMap<>();
             this.registerApp(0, "NOT_COMBINE", "DONT_COMBINE", "not_combine");
             this.registerApp(1, "FORCE_COMBINE", "DO_COMBINE", "combine");
             this.registerApp(2, "FORCE_PRIO", "DO_PRIO", "prio");
             this.registerApp(3, "NOT_PRIO", "DONT_PRIO", "not_prio");
             this.registerApp(4, "SUBMIT", "SUBMIT", "submit");
+            this.registerApp(5, "RENAME", "YES", "rename");
             this.registerApp(6, "DISABLE", "DISABLE", "disable");
             this.registerApp(7, "ENABLE", "ENABLE", "enable");
+            this.registerApp(10, "FLUID_TEM", "YES", "fluid_terminal_w");
+            this.registerApp(11, "CRAFT_TEM", "YES", "craft_terminal_w");
+            this.registerApp(12, "PATTERN_TEM", "YES", "pattern_terminal_w");
+            this.registerApp(13, "ESSENTIA_TEM", "YES", "essentia_terminal_w");
+            this.registerApp(14, "INTERFACE_TEM", "YES", "interface_terminal_w");
+            this.registerApp(15, "PATTERN_EX_TEM", "YES", "pattern_terminal_ex_w");
+            this.registerApp(16, "FILL_PATTERN", "DO_FILL", "fill_pattern");
+            this.registerApp(17, "NOT_FILL_PATTERN", "DONT_FILL", "not_fill_pattern");
+            this.registerApp(20, "LEVEL_TEM", "YES", "level_terminal_w");
+            this.registerApp(21, "SWITCH", "ON", "edit");
+            this.registerApp(22, "SWITCH", "OFF", "view");
+            this.registerApp(21, "SWITCH", "ENABLE", "enable");
+            this.registerApp(22, "SWITCH", "DISABLE", "disable");
+            this.registerApp(23, "OPEN_GUI", "YES", "open_gui");
+            this.registerApp(24, "HIGHLIGHT", "YES", "block_highlight");
+            this.registerApp(26, "stock mode button", "normalMode", "Normal.mode");
+            this.registerApp(27, "stock mode button", "fullstockMode", "Full-stock.mode");
+            this.registerApp(30, "MAGNET_CARD", "INV", "magnet_card.inv");
+            this.registerApp(30, "MAGNET_CARD", "ME", "magnet_card.me");
+            this.registerApp(30, "MAGNET_CARD", "FILTER", "magnet_card.filter");
+            this.registerApp(31, "MAGNET_CARD", "OFF", "magnet_card.off");
+            this.registerApp(32, "ENABLE_12x", "ENABLE", "enable");
+            this.registerApp(33, "DISABLE_12x", "DISABLE", "disable");
+            this.registerApp(34, "RESTOCK", "ENABLE", "restock.on");
+            this.registerApp(35, "RESTOCK", "DISABLE", "restock.off");
         }
     }
 
-    private void registerApp(final int iconIndex, final String setting, final String val, final String title ) {
+    private void registerApp(final int iconIndex, final String setting, final String val, final String title) {
         final ButtonAppearance a = new ButtonAppearance();
         a.displayName = StatCollector.translateToLocal(prefix + title);
         if (StatCollector.translateToLocal(prefix + title + ".hint").equals(prefix + title + ".hint")) {
@@ -53,23 +88,20 @@ public class GuiFCImgButton extends GuiButton implements ITooltip {
         } else {
             a.displayValue = StatCollector.translateToLocal(prefix + title + ".hint");
         }
-        a.index = iconIndex;
+        a.index = iconIndex % 10;
+        a.page = iconIndex / 10;
         appearances.put(new EnumPair(setting, val), a);
     }
 
-    public void setVisibility( final boolean vis )
-    {
+    public void setVisibility(final boolean vis) {
         this.visible = vis;
         this.enabled = vis;
     }
 
-    private int getIconIndex()
-    {
-        if( this.buttonSetting != null && this.currentValue != null )
-        {
-            final ButtonAppearance app = appearances.get(new EnumPair( this.buttonSetting, this.currentValue ));
-            if( app == null )
-            {
+    private int getIconIndex() {
+        if (this.buttonSetting != null && this.currentValue != null) {
+            final ButtonAppearance app = appearances.get(new EnumPair(this.buttonSetting, this.currentValue));
+            if (app == null) {
                 return 8;
             }
             return app.index;
@@ -77,92 +109,100 @@ public class GuiFCImgButton extends GuiButton implements ITooltip {
         return 8;
     }
 
-    public String getSetting()
-    {
+    private int getIconPage() {
+        if (this.buttonSetting != null && this.currentValue != null) {
+            final ButtonAppearance app = appearances.get(new EnumPair(this.buttonSetting, this.currentValue));
+            if (app == null) {
+                return 0;
+            }
+            return app.page;
+        }
+        return 0;
+    }
+
+    public String getSetting() {
         return this.buttonSetting;
     }
 
-    public String getCurrentValue()
-    {
+    public String getCurrentValue() {
         return this.currentValue;
     }
 
-    public void set( final String e )
-    {
-        if(!this.currentValue.equals(e))
-        {
+    public boolean getMouseIn() {
+        return this.field_146123_n;
+    }
+
+    public void set(final String e) {
+        if (!this.currentValue.equals(e)) {
             this.currentValue = e;
         }
     }
 
-    public boolean isHalfSize()
-    {
+    public boolean isHalfSize() {
         return this.halfSize;
     }
 
-    public void setHalfSize( final boolean halfSize )
-    {
+    public void setHalfSize(final boolean halfSize) {
         this.halfSize = halfSize;
     }
 
-    public String getFillVar()
-    {
+    public boolean isThreeFourths() {
+        return threeFourths;
+    }
+
+    public void setThreeFourths(boolean threeFourths) {
+        this.threeFourths = threeFourths;
+    }
+
+    public String getFillVar() {
         return this.fillVar;
     }
 
-    public void setFillVar( final String fillVar )
-    {
+    public void setFillVar(final String fillVar) {
         this.fillVar = fillVar;
     }
 
     @Override
-    public int xPos()
-    {
+    public int xPos() {
         return this.xPosition;
     }
 
     @Override
-    public int yPos()
-    {
+    public int yPos() {
         return this.yPosition;
     }
 
     @Override
-    public int getWidth()
-    {
-        return this.halfSize ? 8 : 16;
+    public int getWidth() {
+        return this.halfSize ? 8 : threeFourths ? 12 : 16;
     }
 
     @Override
-    public int getHeight()
-    {
-        return this.halfSize ? 8 : 16;
+    public int getHeight() {
+        return this.halfSize ? 8 : threeFourths ? 12 : 16;
     }
 
     @Override
-    public boolean isVisible()
-    {
+    public boolean isVisible() {
         return this.visible;
     }
 
     @Override
-    public String getMessage()
-    {
+    public String getMessage() {
         String displayName = null;
         String displayValue = null;
 
-        if( this.buttonSetting != null && this.currentValue != null )
-        {
-            final ButtonAppearance buttonAppearance = appearances.get( new EnumPair( this.buttonSetting, this.currentValue ) );
-            if( buttonAppearance == null )
-            {
+        if (this.buttonSetting != null && this.currentValue != null) {
+            final ButtonAppearance buttonAppearance = appearances
+                    .get(new EnumPair(this.buttonSetting, this.currentValue));
+            if (buttonAppearance == null) {
                 return "No Such Message";
             }
             displayName = buttonAppearance.displayName;
             displayValue = buttonAppearance.displayValue;
         }
 
-        if( displayName != null ) {
+        if (displayName != null) {
             String name = StatCollector.translateToLocal(displayName);
             if (name == null || name.isEmpty()) {
                 name = displayName;
@@ -192,93 +232,75 @@ public class GuiFCImgButton extends GuiButton implements ITooltip {
     }
 
     @Override
-    public void drawButton(final Minecraft par1Minecraft, final int par2, final int par3 )
-    {
-        if( this.visible )
-        {
+    public void drawButton(final Minecraft par1Minecraft, final int par2, final int par3) {
+        if (this.visible) {
             final int iconIndex = this.getIconIndex();
+            final int iconPage = this.getIconPage();
+            this.width = getWidth();
+            this.height = getHeight();
+            float scaleFactor = halfSize ? 3 : threeFourths ? 4.5f : 6;
 
-            if( this.halfSize )
-            {
-                this.width = 8;
-                this.height = 8;
+            GL11.glPushMatrix();
+            GL11.glTranslatef(this.xPosition, this.yPosition, 0.0F);
+            GL11.glScalef(0.5f / 16 * scaleFactor, 0.5f / 16 * scaleFactor, 0.5f / 16 * scaleFactor);
 
-                GL11.glPushMatrix();
-                GL11.glTranslatef( this.xPosition, this.yPosition, 0.0F );
-                GL11.glScalef( 0.5f / 16 * 3, 0.5f / 16 * 3, 0.5f / 16 * 3 );
-
-                if( this.enabled )
-                {
-                    GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
-                }
-                else
-                {
-                    GL11.glColor4f( 0.5f, 0.5f, 0.5f, 1.0f );
-                }
-
-                par1Minecraft.renderEngine.bindTexture( FluidCraft.resource("textures/gui/states.png") );
-                this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
-
-                final int uv_y = (int) Math.floor(iconIndex / 3.0);
-                final int uv_x = iconIndex - uv_y * 3;
-
-                this.drawTexturedModalRect(0, 0, Math.round(32F * 16F / 3F), Math.round(32F * 16F / 3F), Math.round(16F * 16F / 3F), Math.round(16F * 16F / 3F));
-                this.drawTexturedModalRect(0, 0, Math.round(uv_x * 16F * 16F / 3F), Math.round(uv_y * 16F * 16F / 3F), Math.round(16F * 16F / 3F), Math.round(16F * 16F / 3F));
-                this.mouseDragged(par1Minecraft, par2, par3);
-
-                GL11.glPopMatrix();
+            if (this.enabled) {
+                GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
             } else {
-                GL11.glPushMatrix();
-                GL11.glTranslatef(this.xPosition, this.yPosition, 0.0F);
-                GL11.glScalef(0.5f / 16 * 6, 0.5f / 16 * 6, 0.5f / 16 * 6);
-                if (this.enabled) {
-                    GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-                } else {
-                    GL11.glColor4f(0.5f, 0.5f, 0.5f, 1.0f);
-                }
-
-                par1Minecraft.renderEngine.bindTexture(FluidCraft.resource("textures/gui/states.png"));
-                this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
-
-                final int uv_y = (int) Math.floor(iconIndex / 3.0);
-                final int uv_x = iconIndex - uv_y * 3;
-
-                this.drawTexturedModalRect(0, 0, Math.round(32F * 16F / 3F), Math.round(32F * 16F / 3F), Math.round(16F * 16F / 3F), Math.round(16F * 16F / 3F));
-                this.drawTexturedModalRect(0, 0, Math.round(uv_x * 16F * 16F / 3F), Math.round(uv_y * 16F * 16F / 3F), Math.round(16F * 16F / 3F), Math.round(16F * 16F / 3F));
-                this.mouseDragged(par1Minecraft, par2, par3);
-                GL11.glPopMatrix();
+                GL11.glColor4f(0.5f, 0.5f, 0.5f, 1.0f);
             }
+
+            par1Minecraft.renderEngine.bindTexture(FluidCraft.resource("textures/gui/states" + iconPage + ".png"));
+            this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition
+                    && par2 < this.xPosition + this.width
+                    && par3 < this.yPosition + this.height;
+
+            final int uv_y = (int) Math.floor(iconIndex / 3.0);
+            final int uv_x = iconIndex - uv_y * 3;
+            if (this.background) {
+                this.drawTexturedModalRect(
+                        0,
+                        0,
+                        Math.round(32F * 16F / 3F),
+                        Math.round(32F * 16F / 3F),
+                        Math.round(16F * 16F / 3F),
+                        Math.round(16F * 16F / 3F));
+            }
+            this.drawTexturedModalRect(
+                    0,
+                    0,
+                    Math.round(uv_x * 16F * 16F / 3F),
+                    Math.round(uv_y * 16F * 16F / 3F),
+                    Math.round(16F * 16F / 3F),
+                    Math.round(16F * 16F / 3F));
+
+            this.mouseDragged(par1Minecraft, par2, par3);
+            GL11.glPopMatrix();
         }
-        GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
+        GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
     }
 
-    private static final class EnumPair
-    {
+    private static final class EnumPair {
 
         final String setting;
         final String value;
 
-        EnumPair( final String a, final String b )
-        {
+        EnumPair(final String a, final String b) {
             this.setting = a;
             this.value = b;
         }
 
         @Override
-        public int hashCode()
-        {
+        public int hashCode() {
             return this.setting.hashCode() ^ this.value.hashCode();
         }
 
         @Override
-        public boolean equals( final Object obj )
-        {
-            if( obj == null )
-            {
+        public boolean equals(final Object obj) {
+            if (obj == null) {
                 return false;
             }
-            if( this.getClass() != obj.getClass() )
-            {
+            if (this.getClass() != obj.getClass()) {
                 return false;
             }
             final EnumPair other = (EnumPair) obj;
@@ -286,12 +308,11 @@ public class GuiFCImgButton extends GuiButton implements ITooltip {
         }
     }
 
+    private static class ButtonAppearance {
 
-    private static class ButtonAppearance
-    {
         public int index;
+        public int page;
         public String displayName;
         public String displayValue;
     }
-
 }

src/main/java/com/glodblock/github/client/gui/GuiFCPriority.java

@@ -1,219 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import appeng.client.gui.AEBaseGui;
-import appeng.client.gui.widgets.GuiNumberBox;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.container.AEBaseContainer;
-import appeng.container.implementations.ContainerPriority;
-import appeng.core.AEConfig;
-import appeng.core.AELog;
-import appeng.core.localization.GuiText;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketValueConfig;
-import appeng.helpers.IPriorityHost;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.parts.PartFluidInterface;
-import com.glodblock.github.common.tile.TileFluidInterface;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.network.CPacketSwitchGuis;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-
-import java.io.IOException;
-
-public class GuiFCPriority extends AEBaseGui
-{
-
-    private GuiNumberBox priority;
-    private GuiTabButton originalGuiBtn;
-
-    private GuiButton plus1;
-    private GuiButton plus10;
-    private GuiButton plus100;
-    private GuiButton plus1000;
-    private GuiButton minus1;
-    private GuiButton minus10;
-    private GuiButton minus100;
-    private GuiButton minus1000;
-
-    private GuiType OriginalGui;
-
-    public GuiFCPriority( final InventoryPlayer inventoryPlayer, final IPriorityHost te )
-    {
-        super( new ContainerPriority( inventoryPlayer, te ) );
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void initGui()
-    {
-        super.initGui();
-
-        final int a = AEConfig.instance.priorityByStacksAmounts( 0 );
-        final int b = AEConfig.instance.priorityByStacksAmounts( 1 );
-        final int c = AEConfig.instance.priorityByStacksAmounts( 2 );
-        final int d = AEConfig.instance.priorityByStacksAmounts( 3 );
-
-        this.buttonList.add( this.plus1 = new GuiButton( 0, this.guiLeft + 20, this.guiTop + 32, 22, 20, "+" + a ) );
-        this.buttonList.add( this.plus10 = new GuiButton( 0, this.guiLeft + 48, this.guiTop + 32, 28, 20, "+" + b ) );
-        this.buttonList.add( this.plus100 = new GuiButton( 0, this.guiLeft + 82, this.guiTop + 32, 32, 20, "+" + c ) );
-        this.buttonList.add( this.plus1000 = new GuiButton( 0, this.guiLeft + 120, this.guiTop + 32, 38, 20, "+" + d ) );
-
-
-        this.buttonList.add( this.minus1 = new GuiButton( 0, this.guiLeft + 20, this.guiTop + 69, 22, 20, "-" + a ) );
-        this.buttonList.add( this.minus10 = new GuiButton( 0, this.guiLeft + 48, this.guiTop + 69, 28, 20, "-" + b ) );
-        this.buttonList.add( this.minus100 = new GuiButton( 0, this.guiLeft + 82, this.guiTop + 69, 32, 20, "-" + c ) );
-        this.buttonList.add( this.minus1000 = new GuiButton( 0, this.guiLeft + 120, this.guiTop + 69, 38, 20, "-" + d ) );
-
-        ItemStack myIcon = null;
-        final Object target = ( (AEBaseContainer) this.inventorySlots ).getTarget();
-
-        if( target instanceof TileFluidInterface)
-        {
-            myIcon = ItemAndBlockHolder.INTERFACE.stack();
-            this.OriginalGui = GuiType.DUAL_INTERFACE;
-        }
-        else if (target instanceof PartFluidInterface)
-        {
-            myIcon = ItemAndBlockHolder.FLUID_INTERFACE.stack();
-            this.OriginalGui = GuiType.DUAL_INTERFACE_FLUID_PART;
-        }
-
-        if( this.OriginalGui != null && myIcon != null )
-        {
-            this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), itemRender ) );
-        }
-
-        this.priority = new GuiNumberBox( this.fontRendererObj, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRendererObj.FONT_HEIGHT, Long.class );
-        this.priority.setEnableBackgroundDrawing( false );
-        this.priority.setMaxStringLength( 16 );
-        this.priority.setTextColor( 0xFFFFFF );
-        this.priority.setVisible( true );
-        this.priority.setFocused( true );
-        ( (ContainerPriority) this.inventorySlots ).setTextField( this.priority );
-    }
-
-    @Override
-    public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
-    {
-        this.fontRendererObj.drawString( GuiText.Priority.getLocal(), 8, 6, 4210752 );
-    }
-
-    @Override
-    public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
-    {
-        this.bindTexture( getBackground() );
-        this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
-
-        this.priority.drawTextBox();
-    }
-
-    @Override
-    protected void actionPerformed( final GuiButton btn )
-    {
-        super.actionPerformed( btn );
-
-        if( btn == this.originalGuiBtn )
-        {
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(this.OriginalGui));
-        }
-
-        final boolean isPlus = btn == this.plus1 || btn == this.plus10 || btn == this.plus100 || btn == this.plus1000;
-        final boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000;
-
-        if( isPlus || isMinus )
-        {
-            this.addQty( this.getQty( btn ) );
-        }
-    }
-
-    private void addQty( final int i )
-    {
-        try
-        {
-            String out = this.priority.getText();
-
-            boolean fixed = false;
-            while( out.startsWith( "0" ) && out.length() > 1 )
-            {
-                out = out.substring( 1 );
-                fixed = true;
-            }
-
-            if( fixed )
-            {
-                this.priority.setText( out );
-            }
-
-            if( out.isEmpty() )
-            {
-                out = "0";
-            }
-
-            long result = Long.parseLong( out );
-            result += i;
-
-            this.priority.setText( out = Long.toString( result ) );
-
-            NetworkHandler.instance.sendToServer( new PacketValueConfig( "PriorityHost.Priority", out ) );
-        }
-        catch( final NumberFormatException e )
-        {
-            // nope..
-            this.priority.setText( "0" );
-        }
-        catch( final IOException e )
-        {
-            AELog.debug( e );
-        }
-    }
-
-    @Override
-    protected void keyTyped( final char character, final int key )
-    {
-        if( !this.checkHotbarKeys( key ) )
-        {
-            if( ( key == 211 || key == 205 || key == 203 || key == 14 || character == '-' || Character.isDigit( character ) ) && this.priority.textboxKeyTyped( character, key ) )
-            {
-                try
-                {
-                    String out = this.priority.getText();
-
-                    boolean fixed = false;
-                    while( out.startsWith( "0" ) && out.length() > 1 )
-                    {
-                        out = out.substring( 1 );
-                        fixed = true;
-                    }
-
-                    if( fixed )
-                    {
-                        this.priority.setText( out );
-                    }
-
-                    if( out.isEmpty() )
-                    {
-                        out = "0";
-                    }
-
-                    NetworkHandler.instance.sendToServer( new PacketValueConfig( "PriorityHost.Priority", out ) );
-                }
-                catch( final IOException e )
-                {
-                    AELog.debug( e );
-                }
-            }
-            else
-            {
-                super.keyTyped( character, key );
-            }
-        }
-    }
-
-    protected String getBackground()
-    {
-        return "guis/priority.png";
-    }
-}

src/main/java/com/glodblock/github/client/gui/GuiFluidAutoFiller.java

@@ -0,0 +1,43 @@
+package com.glodblock.github.client.gui;
+
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.gui.container.ContainerFluidAutoFiller;
+import com.glodblock.github.common.tile.TileFluidAutoFiller;
+import com.glodblock.github.util.FCGuiColors;
+import com.glodblock.github.util.NameConst;
+
+import appeng.client.gui.AEBaseGui;
+import appeng.core.localization.GuiText;
+
+public class GuiFluidAutoFiller extends AEBaseGui {
+
+    protected EntityPlayer player;
+    private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/fluid_auto_filler.png");
+
+    public GuiFluidAutoFiller(InventoryPlayer ipl, TileFluidAutoFiller tile) {
+        super(new ContainerFluidAutoFiller(ipl, tile));
+        this.player = ipl.player;
+    }
+
+    @Override
+    public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) {
+        mc.getTextureManager().bindTexture(TEX_BG);
+        drawTexturedModalRect(offsetX, offsetY, 0, 0, 176, ySize);
+    }
+
+    @Override
+    public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
+        fontRendererObj.drawString(
+                getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_AUTO_FILLER)),
+                8,
+                6,
+                FCGuiColors.guiTextColorGray.getColor());
+        fontRendererObj
+                .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor());
+    }
+}

src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java

@@ -1,261 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import appeng.api.AEApi;
-import appeng.api.definitions.IDefinitions;
-import appeng.api.definitions.IParts;
-import appeng.api.storage.ITerminalHost;
-import appeng.client.gui.AEBaseGui;
-import appeng.client.gui.widgets.GuiNumberBox;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.container.AEBaseContainer;
-import appeng.container.implementations.ContainerCraftAmount;
-import appeng.core.AEConfig;
-import appeng.core.localization.GuiText;
-import appeng.helpers.Reflected;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.common.parts.PartFluidTerminal;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.network.CPacketCraftRequest;
-import com.glodblock.github.network.CPacketSwitchGuis;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-
-public class GuiFluidCraftAmount extends AEBaseGui
-{
-    private GuiNumberBox amountToCraft;
-    private GuiTabButton originalGuiBtn;
-
-    private GuiButton next;
-
-    private GuiButton plus1;
-    private GuiButton plus10;
-    private GuiButton plus100;
-    private GuiButton plus1000;
-    private GuiButton minus1;
-    private GuiButton minus10;
-    private GuiButton minus100;
-    private GuiButton minus1000;
-
-    private GuiType originalGui;
-
-    @Reflected
-    public GuiFluidCraftAmount(final InventoryPlayer inventoryPlayer, final ITerminalHost te )
-    {
-        super( new ContainerCraftAmount( inventoryPlayer, te ) );
-    }
-
-    @Override
-    public void initGui()
-    {
-        super.initGui();
-
-        final int a = AEConfig.instance.craftItemsByStackAmounts( 0 );
-        final int b = AEConfig.instance.craftItemsByStackAmounts( 1 );
-        final int c = AEConfig.instance.craftItemsByStackAmounts( 2 );
-        final int d = AEConfig.instance.craftItemsByStackAmounts( 3 );
-
-        this.buttonList.add( this.plus1 = new GuiButton( 0, this.guiLeft + 20, this.guiTop + 26, 22, 20, "+" + a ) );
-        this.buttonList.add( this.plus10 = new GuiButton( 0, this.guiLeft + 48, this.guiTop + 26, 28, 20, "+" + b ) );
-        this.buttonList.add( this.plus100 = new GuiButton( 0, this.guiLeft + 82, this.guiTop + 26, 32, 20, "+" + c ) );
-        this.buttonList.add( this.plus1000 = new GuiButton( 0, this.guiLeft + 120, this.guiTop + 26, 38, 20, "+" + d ) );
-
-        this.buttonList.add( this.minus1 = new GuiButton( 0, this.guiLeft + 20, this.guiTop + 75, 22, 20, "-" + a ) );
-        this.buttonList.add( this.minus10 = new GuiButton( 0, this.guiLeft + 48, this.guiTop + 75, 28, 20, "-" + b ) );
-        this.buttonList.add( this.minus100 = new GuiButton( 0, this.guiLeft + 82, this.guiTop + 75, 32, 20, "-" + c ) );
-        this.buttonList.add( this.minus1000 = new GuiButton( 0, this.guiLeft + 120, this.guiTop + 75, 38, 20, "-" + d ) );
-
-        this.buttonList.add( this.next = new GuiButton( 0, this.guiLeft + 128, this.guiTop + 51, 38, 20, GuiText.Next.getLocal() ) );
-
-        ItemStack myIcon = null;
-        final Object target = ( (AEBaseContainer) this.inventorySlots ).getTarget();
-        final IDefinitions definitions = AEApi.instance().definitions();
-        final IParts parts = definitions.parts();
-
-        if (target instanceof PartFluidPatternTerminal) {
-            myIcon = new ItemStack(ItemAndBlockHolder.FLUID_TERMINAL, 1);
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL;
-        }
-        if (target instanceof PartFluidPatternTerminalEx) {
-            myIcon = new ItemStack(ItemAndBlockHolder.FLUID_TERMINAL_EX, 1);
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX;
-        }
-        if (target instanceof PartFluidTerminal) {
-            myIcon = new ItemStack(ItemAndBlockHolder.FLUID_TERM, 1);
-            this.originalGui = GuiType.FLUID_TERMINAL;
-        }
-
-        if (this.originalGui != null && myIcon != null) {
-            this.buttonList.add(this.originalGuiBtn = new GuiTabButton(this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), itemRender));
-        }
-
-        this.amountToCraft = new GuiNumberBox(this.fontRendererObj, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRendererObj.FONT_HEIGHT, Integer.class);
-        this.amountToCraft.setEnableBackgroundDrawing(false);
-        this.amountToCraft.setMaxStringLength(16);
-        this.amountToCraft.setTextColor(0xFFFFFF);
-        this.amountToCraft.setVisible( true );
-        this.amountToCraft.setFocused( true );
-        this.amountToCraft.setText( "1" );
-        this.amountToCraft.setSelectionPos(0);
-    }
-
-    @Override
-    public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
-    {
-        this.fontRendererObj.drawString( GuiText.SelectAmount.getLocal(), 8, 6, 4210752 );
-    }
-
-    @Override
-    public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
-    {
-        this.next.displayString = isShiftKeyDown() ? GuiText.Start.getLocal() : GuiText.Next.getLocal();
-
-        this.bindTexture( "guis/craftAmt.png" );
-        this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
-
-        try
-        {
-            Long.parseLong( this.amountToCraft.getText() );
-            this.next.enabled = this.amountToCraft.getText().length() > 0;
-        }
-        catch( final NumberFormatException e )
-        {
-            this.next.enabled = false;
-        }
-
-        this.amountToCraft.drawTextBox();
-    }
-
-    @Override
-    protected void keyTyped( final char character, final int key )
-    {
-        if( !this.checkHotbarKeys( key ) )
-        {
-            if( key == 28 )
-            {
-                this.actionPerformed( this.next );
-            }
-            if( ( key == 211 || key == 205 || key == 203 || key == 14 || character == '-' || Character.isDigit( character ) ) && this.amountToCraft.textboxKeyTyped( character, key ) )
-            {
-                try
-                {
-                    String out = this.amountToCraft.getText();
-
-                    boolean fixed = false;
-                    while( out.startsWith( "0" ) && out.length() > 1 )
-                    {
-                        out = out.substring( 1 );
-                        fixed = true;
-                    }
-
-                    if( fixed )
-                    {
-                        this.amountToCraft.setText( out );
-                    }
-
-                    if( out.isEmpty() )
-                    {
-                        out = "0";
-                    }
-
-                    final long result = Long.parseLong( out );
-                    if( result < 0 )
-                    {
-                        this.amountToCraft.setText( "1" );
-                    }
-                }
-                catch( final NumberFormatException e )
-                {
-                    // :P
-                }
-            }
-            else
-            {
-                super.keyTyped( character, key );
-            }
-        }
-    }
-
-    @Override
-    protected void actionPerformed( final GuiButton btn )
-    {
-        super.actionPerformed( btn );
-
-        try
-        {
-
-            if( btn == this.originalGuiBtn )
-            {
-                FluidCraft.proxy.netHandler.sendToServer( new CPacketSwitchGuis( this.originalGui ) );
-            }
-
-            if( btn == this.next )
-            {
-                FluidCraft.proxy.netHandler.sendToServer( new CPacketCraftRequest( Integer.parseInt( this.amountToCraft.getText() ), isShiftKeyDown() ) );
-            }
-        }
-        catch( final NumberFormatException e )
-        {
-            // nope..
-            this.amountToCraft.setText( "1" );
-        }
-
-        final boolean isPlus = btn == this.plus1 || btn == this.plus10 || btn == this.plus100 || btn == this.plus1000;
-        final boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000;
-
-        if( isPlus || isMinus )
-        {
-            this.addQty( this.getQty( btn ) );
-        }
-    }
-
-    private void addQty( final int i )
-    {
-        try
-        {
-            String out = this.amountToCraft.getText();
-
-            boolean fixed = false;
-            while( out.startsWith( "0" ) && out.length() > 1 )
-            {
-                out = out.substring( 1 );
-                fixed = true;
-            }
-
-            if( fixed )
-            {
-                this.amountToCraft.setText( out );
-            }
-
-            if( out.isEmpty() )
-            {
-                out = "0";
-            }
-
-            long result = Integer.parseInt( out );
-
-            if( result == 1 && i > 1 )
-            {
-                result = 0;
-            }
-
-            result += i;
-            if( result < 1 )
-            {
-                result = 1;
-            }
-
-            out = Long.toString( result );
-            Integer.parseInt( out );
-            this.amountToCraft.setText( out );
-        }
-        catch( final NumberFormatException e )
-        {
-            // :P
-        }
-    }
-
-}

src/main/java/com/glodblock/github/client/gui/GuiFluidCraftConfirm.java

@@ -1,559 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import appeng.api.AEApi;
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.storage.data.IItemList;
-import appeng.client.gui.AEBaseGui;
-import appeng.client.gui.widgets.GuiScrollbar;
-import appeng.core.AELog;
-import appeng.core.localization.GuiText;
-import appeng.util.Platform;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.ContainerFluidCraftConfirm;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.coremod.hooker.CoreModHooks;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.network.CPacketFluidPatternTermBtns;
-import com.glodblock.github.network.CPacketSwitchGuis;
-import com.glodblock.github.util.ModAndClassUtil;
-import com.google.common.base.Joiner;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import org.lwjgl.input.Mouse;
-import org.lwjgl.opengl.GL11;
-
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-public class GuiFluidCraftConfirm extends AEBaseGui {
-
-    private final ContainerFluidCraftConfirm ccc;
-
-    private final int rows = 5;
-
-    private final IItemList<IAEItemStack> storage = AEApi.instance().storage().createItemList();
-    private final IItemList<IAEItemStack> pending = AEApi.instance().storage().createItemList();
-    private final IItemList<IAEItemStack> missing = AEApi.instance().storage().createItemList();
-
-    private final List<IAEItemStack> visual = new ArrayList<IAEItemStack>();
-
-    private GuiType OriginalGui;
-    private GuiButton cancel;
-    private GuiButton start;
-    private GuiButton selectCPU;
-    private int tooltip = -1;
-    private ItemStack hoveredStack;
-
-    public GuiFluidCraftConfirm(final InventoryPlayer inventoryPlayer, final ITerminalHost te )
-    {
-        super( new ContainerFluidCraftConfirm( inventoryPlayer, te ) );
-        this.xSize = 238;
-        this.ySize = 206;
-
-        final GuiScrollbar scrollbar = new GuiScrollbar();
-        this.setScrollBar( scrollbar );
-
-        this.ccc = (ContainerFluidCraftConfirm) this.inventorySlots;
-
-        if( te instanceof PartFluidPatternTerminal)
-        {
-            this.OriginalGui = GuiType.FLUID_PATTERN_TERMINAL;
-        }
-        if( te instanceof PartFluidPatternTerminalEx)
-        {
-            this.OriginalGui = GuiType.FLUID_PATTERN_TERMINAL_EX;
-        }
-    }
-
-    boolean isAutoStart()
-    {
-        return ( (ContainerFluidCraftConfirm) this.inventorySlots ).isAutoStart();
-    }
-
-    @Override
-    public void initGui()
-    {
-        super.initGui();
-
-        this.start = new GuiButton( 0, this.guiLeft + 162, this.guiTop + this.ySize - 25, 50, 20, GuiText.Start.getLocal() );
-        this.start.enabled = false;
-        this.buttonList.add( this.start );
-
-        this.selectCPU = new GuiButton( 0, this.guiLeft + ( 219 - 180 ) / 2, this.guiTop + this.ySize - 68, 180, 20, GuiText.CraftingCPU.getLocal() + ": " + GuiText.Automatic );
-        this.selectCPU.enabled = false;
-        this.buttonList.add( this.selectCPU );
-
-        if( this.OriginalGui != null )
-        {
-            this.cancel = new GuiButton( 0, this.guiLeft + 6, this.guiTop + this.ySize - 25, 50, 20, GuiText.Cancel.getLocal() );
-        }
-
-        this.buttonList.add( this.cancel );
-    }
-
-    @Override
-    public void drawScreen( final int mouseX, final int mouseY, final float btn )
-    {
-        this.updateCPUButtonText();
-
-        this.start.enabled = !( this.ccc.hasNoCPU() || this.isSimulation() );
-        this.selectCPU.enabled = !this.isSimulation();
-
-        final int gx = ( this.width - this.xSize ) / 2;
-        final int gy = ( this.height - this.ySize ) / 2;
-
-        this.tooltip = -1;
-
-        final int offY = 23;
-        int y = 0;
-        int x = 0;
-        for( int z = 0; z <= 4 * 5; z++ )
-        {
-            final int minX = gx + 9 + x * 67;
-            final int minY = gy + 22 + y * offY;
-
-            if( minX < mouseX && minX + 67 > mouseX )
-            {
-                if( minY < mouseY && minY + offY - 2 > mouseY )
-                {
-                    this.tooltip = z;
-                    break;
-                }
-            }
-
-            x++;
-
-            if( x > 2 )
-            {
-                y++;
-                x = 0;
-            }
-        }
-
-        super.drawScreen( mouseX, mouseY, btn );
-    }
-
-    private void updateCPUButtonText()
-    {
-        String btnTextText = GuiText.CraftingCPU.getLocal() + ": " + GuiText.Automatic.getLocal();
-        if( this.ccc.getSelectedCpu() >= 0 )// && status.selectedCpu < status.cpus.size() )
-        {
-            if( this.ccc.getName().length() > 0 )
-            {
-                final String name = this.ccc.getName().substring( 0, Math.min( 20, this.ccc.getName().length() ) );
-                btnTextText = GuiText.CraftingCPU.getLocal() + ": " + name;
-            }
-            else
-            {
-                btnTextText = GuiText.CraftingCPU.getLocal() + ": #" + this.ccc.getSelectedCpu();
-            }
-        }
-
-        if( this.ccc.hasNoCPU() )
-        {
-            btnTextText = GuiText.NoCraftingCPUs.getLocal();
-        }
-
-        this.selectCPU.displayString = btnTextText;
-    }
-
-    private boolean isSimulation()
-    {
-        return ( (ContainerFluidCraftConfirm) this.inventorySlots ).isSimulation();
-    }
-
-    @Override
-    public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
-    {
-        final long BytesUsed = this.ccc.getUsedBytes();
-        final String byteUsed = NumberFormat.getInstance().format( BytesUsed );
-        final String Add = BytesUsed > 0 ? ( byteUsed + ' ' + GuiText.BytesUsed.getLocal() ) : GuiText.CalculatingWait.getLocal();
-        this.fontRendererObj.drawString( GuiText.CraftingPlan.getLocal() + " - " + Add, 8, 7, 4210752 );
-
-        String dsp = null;
-
-        if( this.isSimulation() )
-        {
-            dsp = GuiText.Simulation.getLocal();
-        }
-        else
-        {
-            dsp = this.ccc.getCpuAvailableBytes() > 0 ? ( GuiText.Bytes.getLocal() + ": " + this.ccc.getCpuAvailableBytes() + " : " + GuiText.CoProcessors.getLocal() + ": " + this.ccc.getCpuCoProcessors() ) : GuiText.Bytes.getLocal() + ": N/A : " + GuiText.CoProcessors.getLocal() + ": N/A";
-        }
-
-        final int offset = ( 219 - this.fontRendererObj.getStringWidth( dsp ) ) / 2;
-        this.fontRendererObj.drawString( dsp, offset, 165, 4210752 );
-
-        final int sectionLength = 67;
-
-        int x = 0;
-        int y = 0;
-        final int xo = 9;
-        final int yo = 22;
-        final int viewStart = this.getScrollBar().getCurrentScroll() * 3;
-        final int viewEnd = viewStart + 3 * this.rows;
-
-        String dspToolTip = "";
-        final List<String> lineList = new LinkedList<String>();
-        int toolPosX = 0;
-        int toolPosY = 0;
-        hoveredStack = null;
-        final int offY = 23;
-
-        for( int z = viewStart; z < Math.min( viewEnd, this.visual.size() ); z++ )
-        {
-            final IAEItemStack refStack = this.visual.get( z );// repo.getReferenceItem( z );
-            if( refStack != null )
-            {
-                GL11.glPushMatrix();
-                GL11.glScaled( 0.5, 0.5, 0.5 );
-
-                final IAEItemStack stored = this.storage.findPrecise( refStack );
-                final IAEItemStack pendingStack = this.pending.findPrecise( refStack );
-                final IAEItemStack missingStack = this.missing.findPrecise( refStack );
-
-                int lines = 0;
-
-                if( stored != null && stored.getStackSize() > 0 )
-                {
-                    lines++;
-                }
-                if( pendingStack != null && pendingStack.getStackSize() > 0 )
-                {
-                    lines++;
-                }
-                if( pendingStack != null && pendingStack.getStackSize() > 0 )
-                {
-                    lines++;
-                }
-
-                final int negY = ( ( lines - 1 ) * 5 ) / 2;
-                int downY = 0;
-
-                if( stored != null && stored.getStackSize() > 0 )
-                {
-                    String str = Long.toString( stored.getStackSize() );
-                    if( stored.getStackSize() >= 10000 )
-                    {
-                        str = Long.toString( stored.getStackSize() / 1000 ) + 'k';
-                    }
-                    if( stored.getStackSize() >= 10000000 )
-                    {
-                        str = Long.toString( stored.getStackSize() / 1000000 ) + 'm';
-                    }
-
-                    str = GuiText.FromStorage.getLocal() + ": " + str;
-                    final int w = 4 + this.fontRendererObj.getStringWidth( str );
-                    this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
-
-                    if( this.tooltip == z - viewStart )
-                    {
-                        lineList.add( GuiText.FromStorage.getLocal() + ": " + stored.getStackSize());
-                    }
-
-                    downY += 5;
-                }
-
-                boolean red = false;
-                if( missingStack != null && missingStack.getStackSize() > 0 )
-                {
-                    String str = Long.toString( missingStack.getStackSize() );
-                    if( missingStack.getStackSize() >= 10000 )
-                    {
-                        str = Long.toString( missingStack.getStackSize() / 1000 ) + 'k';
-                    }
-                    if( missingStack.getStackSize() >= 10000000 )
-                    {
-                        str = Long.toString( missingStack.getStackSize() / 1000000 ) + 'm';
-                    }
-
-                    str = GuiText.Missing.getLocal() + ": " + str;
-                    final int w = 4 + this.fontRendererObj.getStringWidth( str );
-                    this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
-
-                    if( this.tooltip == z - viewStart )
-                    {
-                        lineList.add( GuiText.Missing.getLocal() + ": " + missingStack.getStackSize());
-                    }
-
-                    red = true;
-                    downY += 5;
-                }
-
-                if( pendingStack != null && pendingStack.getStackSize() > 0 )
-                {
-                    String str = Long.toString( pendingStack.getStackSize() );
-                    if( pendingStack.getStackSize() >= 10000 )
-                    {
-                        str = Long.toString( pendingStack.getStackSize() / 1000 ) + 'k';
-                    }
-                    if( pendingStack.getStackSize() >= 10000000 )
-                    {
-                        str = Long.toString( pendingStack.getStackSize() / 1000000 ) + 'm';
-                    }
-
-                    str = GuiText.ToCraft.getLocal() + ": " + str;
-                    final int w = 4 + this.fontRendererObj.getStringWidth( str );
-                    this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
-
-                    if( this.tooltip == z - viewStart )
-                    {
-                        lineList.add( GuiText.ToCraft.getLocal() + ": " + Long.toString( pendingStack.getStackSize() ) );
-                    }
-                }
-
-                GL11.glPopMatrix();
-                final int posX = x * ( 1 + sectionLength ) + xo + sectionLength - 19;
-                final int posY = y * offY + yo;
-
-                final ItemStack is = CoreModHooks.displayFluid(refStack.copy());
-
-                if( this.tooltip == z - viewStart )
-                {
-                    dspToolTip = Platform.getItemDisplayName( is );
-                    if( lineList.size() > 0 )
-                    {
-                        addItemTooltip(is, lineList);
-                        dspToolTip = dspToolTip +  '\n' + Joiner.on( "\n" ).join( lineList );
-                    }
-
-                    toolPosX = x * ( 1 + sectionLength ) + xo + sectionLength - 8;
-                    toolPosY = y * offY + yo;
-                    hoveredStack = is;
-                }
-
-                this.drawItem( posX, posY, is );
-
-                if( red )
-                {
-                    final int startX = x * ( 1 + sectionLength ) + xo;
-                    final int startY = posY - 4;
-                    drawRect( startX, startY, startX + sectionLength, startY + offY, 0x1AFF0000 );
-                }
-
-                x++;
-
-                if( x > 2 )
-                {
-                    y++;
-                    x = 0;
-                }
-            }
-        }
-
-        if( this.tooltip >= 0 && dspToolTip.length() > 0 )
-        {
-            this.drawTooltip( toolPosX, toolPosY + 10, 0, dspToolTip );
-        }
-    }
-
-    @Override
-    public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
-    {
-        this.setScrollBar();
-        this.bindTexture( "guis/craftingreport.png" );
-        this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
-    }
-
-    private void setScrollBar()
-    {
-        final int size = this.visual.size();
-
-        this.getScrollBar().setTop( 19 ).setLeft( 218 ).setHeight( 114 );
-        this.getScrollBar().setRange( 0, ( size + 2 ) / 3 - this.rows, 1 );
-    }
-
-    public void postUpdate( final List<IAEItemStack> list, final byte ref )
-    {
-        switch( ref )
-        {
-            case 0:
-                for( final IAEItemStack l : list )
-                {
-                    this.handleInput( this.storage, l );
-                }
-                break;
-
-            case 1:
-                for( final IAEItemStack l : list )
-                {
-                    this.handleInput( this.pending, l );
-                }
-                break;
-
-            case 2:
-                for( final IAEItemStack l : list )
-                {
-                    this.handleInput( this.missing, l );
-                }
-                break;
-        }
-
-        for( final IAEItemStack l : list )
-        {
-            final long amt = this.getTotal( l );
-
-            if( amt <= 0 )
-            {
-                this.deleteVisualStack( l );
-            }
-            else
-            {
-                final IAEItemStack is = this.findVisualStack( l );
-                is.setStackSize( amt );
-            }
-        }
-
-        this.setScrollBar();
-    }
-
-    private void handleInput( final IItemList<IAEItemStack> s, final IAEItemStack l )
-    {
-        IAEItemStack a = s.findPrecise( l );
-
-        if( l.getStackSize() <= 0 )
-        {
-            if( a != null )
-            {
-                a.reset();
-            }
-        }
-        else
-        {
-            if( a == null )
-            {
-                s.add( l.copy() );
-                a = s.findPrecise( l );
-            }
-
-            if( a != null )
-            {
-                a.setStackSize( l.getStackSize() );
-            }
-        }
-    }
-
-    private long getTotal( final IAEItemStack is )
-    {
-        final IAEItemStack a = this.storage.findPrecise( is );
-        final IAEItemStack c = this.pending.findPrecise( is );
-        final IAEItemStack m = this.missing.findPrecise( is );
-
-        long total = 0;
-
-        if( a != null )
-        {
-            total += a.getStackSize();
-        }
-
-        if( c != null )
-        {
-            total += c.getStackSize();
-        }
-
-        if( m != null )
-        {
-            total += m.getStackSize();
-        }
-
-        return total;
-    }
-
-    private void deleteVisualStack( final IAEItemStack l )
-    {
-        final Iterator<IAEItemStack> i = this.visual.iterator();
-        while( i.hasNext() )
-        {
-            final IAEItemStack o = i.next();
-            if( o.equals( l ) )
-            {
-                i.remove();
-                return;
-            }
-        }
-    }
-
-    private IAEItemStack findVisualStack( final IAEItemStack l )
-    {
-        for( final IAEItemStack o : this.visual )
-        {
-            if( o.equals( l ) )
-            {
-                return o;
-            }
-        }
-
-        final IAEItemStack stack = l.copy();
-        this.visual.add( stack );
-        return stack;
-    }
-
-    @Override
-    protected void keyTyped( final char character, final int key )
-    {
-        if( !this.checkHotbarKeys( key ) )
-        {
-            if( key == 28 )
-            {
-                this.actionPerformed( this.start );
-            }
-            super.keyTyped( character, key );
-        }
-    }
-
-    @Override
-    protected void actionPerformed( final GuiButton btn )
-    {
-        super.actionPerformed( btn );
-
-        final boolean backwards = Mouse.isButtonDown( 1 );
-
-        if( btn == this.selectCPU )
-        {
-            FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "Terminal.Cpu", backwards ? "Prev" : "Next" ) );
-        }
-
-        if( btn == this.cancel )
-        {
-            FluidCraft.proxy.netHandler.sendToServer( new CPacketSwitchGuis( this.OriginalGui ) );
-        }
-
-        if( btn == this.start )
-        {
-            try
-            {
-                FluidCraft.proxy.netHandler.sendToServer( new CPacketFluidPatternTermBtns( "Terminal.Start", "Start" ) );
-            }
-            catch( final Throwable e )
-            {
-                AELog.debug( e );
-            }
-        }
-    }
-
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    protected void addItemTooltip(ItemStack is, List<String> lineList)
-    {
-        if (isShiftKeyDown())
-        {
-            List l = is.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips);
-            if (!l.isEmpty())
-                l.remove(0);
-            lineList.addAll(l);
-        }
-        else if (ModAndClassUtil.isShiftTooltip)
-        {
-            lineList.add(GuiText.HoldShiftForTooltip.getLocal());
-        }
-    }
-
-    public ItemStack getHoveredStack() {
-        return hoveredStack;
-    }
-}

src/main/java/com/glodblock/github/client/gui/GuiFluidIO.java

@@ -1,60 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.client.gui.implementations.GuiUpgradeable;
-import appeng.core.localization.GuiText;
-import com.glodblock.github.client.gui.container.ContainerFluidIO;
-import com.glodblock.github.common.parts.PartFluidImportBus;
-import com.glodblock.github.common.parts.PartSharedFluidBus;
-import com.glodblock.github.util.NameConst;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.InventoryPlayer;
-
-public class GuiFluidIO extends GuiUpgradeable
-{
-    private final PartSharedFluidBus bus;
-
-    public GuiFluidIO(InventoryPlayer inventoryPlayer, PartSharedFluidBus te )
-    {
-        super( new ContainerFluidIO( inventoryPlayer, te ) );
-        this.bus = te;
-    }
-
-
-    @Override
-    protected GuiText getName()
-    {
-        return this.bus instanceof PartFluidImportBus ? GuiText.ImportBus : GuiText.ExportBus;
-    }
-
-    public void update(int id, IAEFluidStack stack) {
-        ((ContainerFluidIO)this.cvb).getBus().setFluidInSlot(id, stack);
-    }
-
-    @Override
-    public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
-    {
-        this.fontRendererObj.drawString( this.getGuiDisplayName(I18n.format(this.bus instanceof PartFluidImportBus ? NameConst.GUI_FLUID_IMPORT : NameConst.GUI_FLUID_EXPORT)), 8, 6, 4210752 );
-        this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
-
-        if( this.redstoneMode != null )
-        {
-            this.redstoneMode.set( this.cvb.getRedStoneMode() );
-        }
-
-        if( this.fuzzyMode != null )
-        {
-            this.fuzzyMode.set( this.cvb.getFuzzyMode() );
-        }
-
-        if( this.craftMode != null )
-        {
-            this.craftMode.set( this.cvb.getCraftingMode() );
-        }
-
-        if( this.schedulingMode != null )
-        {
-            this.schedulingMode.set( this.cvb.getSchedulingMode() );
-        }
-    }
-}

src/main/java/com/glodblock/github/client/gui/GuiFluidInterface.java

@@ -1,84 +1,87 @@
 package com.glodblock.github.client.gui;
 
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.client.gui.AEBaseGui;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.core.localization.GuiText;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.ContainerFluidInterface;
-import com.glodblock.github.common.parts.PartFluidInterface;
-import com.glodblock.github.common.tile.TileFluidInterface;
-import com.glodblock.github.inventory.IAEFluidTank;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.network.CPacketSwitchGuis;
-import com.glodblock.github.util.NameConst;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.ForgeDirection;
+
 import org.lwjgl.opengl.GL11;
 
-import javax.annotation.Nullable;
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.gui.container.ContainerFluidInterface;
+import com.glodblock.github.inventory.IAEFluidTank;
+import com.glodblock.github.inventory.IDualHost;
+import com.glodblock.github.inventory.gui.MouseRegionManager;
+import com.glodblock.github.inventory.gui.TankMouseHandler;
+import com.glodblock.github.util.FCGuiColors;
+import com.glodblock.github.util.NameConst;
+import com.glodblock.github.util.RenderUtil;
 
-public class GuiFluidInterface extends AEBaseGui {
+import appeng.api.parts.IPart;
+import appeng.api.storage.data.IAEFluidStack;
+import appeng.client.gui.GuiSub;
+import appeng.core.localization.GuiText;
+
+public class GuiFluidInterface extends GuiSub {
 
     private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/interface_fluid.png");
     private static final int TANK_X = 35, TANK_X_OFF = 18, TANK_Y = 53;
     private static final int TANK_WIDTH = 16, TANK_HEIGHT = 68;
-
     private final ContainerFluidInterface cont;
 
-    private GuiTabButton switcher;
+    private final MouseRegionManager mouseRegions = new MouseRegionManager(this);
 
-    public GuiFluidInterface(InventoryPlayer ipl, TileFluidInterface tile) {
+    public GuiFluidInterface(InventoryPlayer ipl, IDualHost tile) {
         super(new ContainerFluidInterface(ipl, tile));
         this.cont = (ContainerFluidInterface) inventorySlots;
         this.ySize = 231;
+        this.addMouseRegin();
     }
 
-    public GuiFluidInterface(InventoryPlayer ipl, PartFluidInterface tile) {
-        super(new ContainerFluidInterface(ipl, tile));
-        this.cont = (ContainerFluidInterface) inventorySlots;
-        this.ySize = 231;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void initGui()
-    {
-        super.initGui();
-        this.switcher = new GuiTabButton( this.guiLeft + 154, this.guiTop, isPart() ? ItemAndBlockHolder.FLUID_INTERFACE.stack() : ItemAndBlockHolder.INTERFACE.stack(), StatCollector.translateToLocal("ae2fc.tooltip.switch_fluid_interface"), itemRender );
-        this.buttonList.add( this.switcher );
+    private void addMouseRegin() {
+        for (int i = 0; i < 6; i++) {
+            mouseRegions.addRegion(
+                    TANK_X + TANK_X_OFF * i,
+                    TANK_Y,
+                    TANK_WIDTH,
+                    TANK_HEIGHT,
+                    new TankMouseHandler(cont.getTile().getInternalFluid(), i));
+        }
     }
 
     @Override
     public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
-        fontRendererObj.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_INTERFACE)), 8, 6, 0x404040);
-        fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040);
+        fontRendererObj.drawString(
+                getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_INTERFACE)),
+                8,
+                6,
+                FCGuiColors.guiTextColorGray.getColor());
+        fontRendererObj
+                .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor());
         GL11.glColor4f(1F, 1F, 1F, 1F);
 
-        IAEFluidTank fluidInv;
-        if (isPart()) {
-            fluidInv = ((PartFluidInterface) cont.getTile()).getInternalFluid();
-        } else {
-            fluidInv = ((TileFluidInterface) cont.getTile()).getInternalFluid();
-        }
-
+        IAEFluidTank fluidInv = cont.getTile().getInternalFluid();
         mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
         for (int i = 0; i < 6; i++) {
             if (!isPart()) {
-                fontRendererObj.drawString(dirName(i), TANK_X + i * TANK_X_OFF + 5, 22, 0x404040);
+                fontRendererObj.drawString(
+                        dirName(i),
+                        TANK_X + i * TANK_X_OFF + 5,
+                        22,
+                        FCGuiColors.guiTextColorGray.getColor());
             }
-            renderFluidIntoGui(TANK_X + i * TANK_X_OFF, TANK_Y, TANK_WIDTH, TANK_HEIGHT,
-                fluidInv.getFluidInSlot(i), fluidInv.getTankInfo(ForgeDirection.UNKNOWN)[i].capacity);
+            RenderUtil.renderFluidIntoGui(
+                    this,
+                    TANK_X + i * TANK_X_OFF,
+                    TANK_Y,
+                    TANK_WIDTH,
+                    TANK_HEIGHT,
+                    fluidInv.getFluidInSlot(i),
+                    fluidInv.getTankInfo(ForgeDirection.UNKNOWN)[i].capacity);
         }
         GL11.glColor4f(1F, 1F, 1F, 1F);
+        mouseRegions.render(mouseX, mouseY);
     }
 
     public String dirName(int face) {
@@ -91,55 +94,15 @@ public class GuiFluidInterface extends AEBaseGui {
         drawTexturedModalRect(offsetX, offsetY, 0, 0, 176, ySize);
     }
 
-    public void renderFluidIntoGui(int x, int y, int width, int height,
-                                   @Nullable IAEFluidStack aeFluidStack, int capacity) {
-        if (aeFluidStack != null) {
-            GL11.glDisable(2896);
-            GL11.glColor3f(1.0F, 1.0F, 1.0F);
-            int hi = (int) (height * ((double) aeFluidStack.getStackSize() / capacity));
-            if (aeFluidStack.getStackSize() > 0 && hi > 0) {
-                Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
-                IIcon fluidIcon = aeFluidStack.getFluid().getStillIcon();
-                GL11.glColor3f((float)(aeFluidStack.getFluid().getColor() >> 16 & 255) / 255.0F, (float)(aeFluidStack.getFluid().getColor() >> 8 & 255) / 255.0F, (float)(aeFluidStack.getFluid().getColor() & 255) / 255.0F);
-                for (int th = 0; th <= hi; th += 16) {
-                    if (hi - th <= 0) break;
-                    this.drawTexturedModelRectFromIcon(x, y + height - Math.min(16, hi - th) - th, fluidIcon, width, Math.min(16, hi - th));
-                }
-                GL11.glColor3f(1.0F, 1.0F, 1.0F);
-            }
-        }
-    }
-
-    @Override
-    protected void actionPerformed( final GuiButton btn )
-    {
-        super.actionPerformed(btn);
-        if (btn == this.switcher) {
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(isPart() ? GuiType.DUAL_INTERFACE_PART : GuiType.DUAL_INTERFACE));
-        }
-    }
-
     public void update(int id, IAEFluidStack stack) {
         if (id >= 100) {
-            id -= 100;
-            if (isPart()) {
-                ((PartFluidInterface) cont.getTile()).setConfig(id, stack);
-            } else {
-                ((TileFluidInterface) cont.getTile()).setConfig(id, stack);
-            }
-        }
-        else {
-            if(isPart()) {
-                ((PartFluidInterface) cont.getTile()).setFluidInv(id, stack);
-            } else {
-                ((TileFluidInterface) cont.getTile()).setFluidInv(id, stack);
-            }
+            cont.getTile().setConfig(id - 100, stack);
+        } else {
+            cont.getTile().setFluidInv(id, stack);
         }
     }
 
     private boolean isPart() {
-        return this.cont.getTile() instanceof PartFluidInterface;
+        return this.cont.getTile() instanceof IPart;
     }
-
 }
-

src/main/java/com/glodblock/github/client/gui/GuiFluidPacketDecoder.java

@@ -1,15 +1,18 @@
 package com.glodblock.github.client.gui;
 
-import appeng.client.gui.AEBaseGui;
-import appeng.core.localization.GuiText;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.ContainerFluidPacketDecoder;
-import com.glodblock.github.common.tile.TileFluidPacketDecoder;
-import com.glodblock.github.util.NameConst;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
 
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.gui.container.ContainerFluidPacketDecoder;
+import com.glodblock.github.common.tile.TileFluidPacketDecoder;
+import com.glodblock.github.util.FCGuiColors;
+import com.glodblock.github.util.NameConst;
+
+import appeng.client.gui.AEBaseGui;
+import appeng.core.localization.GuiText;
+
 public class GuiFluidPacketDecoder extends AEBaseGui {
 
     private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/fluid_packet_decoder.png");
@@ -26,8 +29,12 @@ public class GuiFluidPacketDecoder extends AEBaseGui {
 
     @Override
     public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
-        fontRendererObj.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_PACKET_DECODER)), 8, 6, 0x404040);
-        fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040);
+        fontRendererObj.drawString(
+                getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_PACKET_DECODER)),
+                8,
+                6,
+                FCGuiColors.guiTextColorGray.getColor());
+        fontRendererObj
+                .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor());
     }
-
 }

src/main/java/com/glodblock/github/client/gui/GuiFluidPatternEncoder.java

@@ -1,19 +1,9 @@
 package com.glodblock.github.client.gui;
 
-import appeng.api.storage.data.IAEItemStack;
-import appeng.client.gui.AEBaseGui;
-import appeng.client.render.AppEngRenderItem;
-import appeng.core.localization.GuiText;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.ContainerFluidPatternEncoder;
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.common.tile.TileFluidPatternEncoder;
-import com.glodblock.github.inventory.gui.MouseRegionManager;
-import com.glodblock.github.inventory.slot.SlotFluid;
-import com.glodblock.github.inventory.slot.SlotSingleItem;
-import com.glodblock.github.network.CPacketEncodePattern;
-import com.glodblock.github.util.Ae2ReflectClient;
-import com.glodblock.github.util.NameConst;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -23,9 +13,21 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.FluidStack;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import org.lwjgl.opengl.GL11;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.gui.container.ContainerFluidPatternEncoder;
+import com.glodblock.github.common.item.ItemFluidPacket;
+import com.glodblock.github.common.tile.TileFluidPatternEncoder;
+import com.glodblock.github.inventory.gui.MouseRegionManager;
+import com.glodblock.github.inventory.slot.ISlotFluid;
+import com.glodblock.github.inventory.slot.SlotSingleItem;
+import com.glodblock.github.util.FCGuiColors;
+import com.glodblock.github.util.NameConst;
+
+import appeng.api.storage.data.IAEItemStack;
+import appeng.client.gui.AEBaseGui;
+import appeng.core.localization.GuiText;
 
 public class GuiFluidPatternEncoder extends AEBaseGui {
 
@@ -33,12 +35,12 @@ public class GuiFluidPatternEncoder extends AEBaseGui {
 
     private final ContainerFluidPatternEncoder cont;
     private final MouseRegionManager mouseRegions = new MouseRegionManager(this);
-    private final AppEngRenderItem stackSizeRenderer = Ae2ReflectClient.getStackSizeRenderer(this);
 
     public GuiFluidPatternEncoder(InventoryPlayer ipl, TileFluidPatternEncoder tile) {
         super(new ContainerFluidPatternEncoder(ipl, tile));
-        this.cont = (ContainerFluidPatternEncoder)inventorySlots;
+        this.cont = (ContainerFluidPatternEncoder) inventorySlots;
         mouseRegions.addRegion(141, 38, 10, 10, new MouseRegionManager.Handler() {
+
             @Override
             public List<String> getTooltip() {
                 return Collections.singletonList(I18n.format(NameConst.TT_ENCODE_PATTERN));
@@ -48,7 +50,7 @@ public class GuiFluidPatternEncoder extends AEBaseGui {
             public boolean onClick(int button) {
                 if (button == 0) {
                     if (cont.canEncodePattern()) {
-                        FluidCraft.proxy.netHandler.sendToServer(new CPacketEncodePattern());
+                        // FluidCraft.proxy.netHandler.sendToServer(new CPacketEncodePattern());
                     }
                     return true;
                 }
@@ -72,20 +74,24 @@ public class GuiFluidPatternEncoder extends AEBaseGui {
 
     @Override
     public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
-        fontRendererObj.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_PATTERN_ENCODER)), 8, 6, 0x404040);
-        fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040);
+        fontRendererObj.drawString(
+                getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_PATTERN_ENCODER)),
+                8,
+                6,
+                FCGuiColors.guiTextColorGray.getColor());
+        fontRendererObj
+                .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor());
         mouseRegions.render(mouseX, mouseY);
     }
 
     @Override
-    public void func_146977_a( final Slot s )
-    {
-        this.drawSlot0( s );
+    public void func_146977_a(final Slot s) {
+        this.drawSlot0(s);
     }
 
     public void drawSlot0(Slot slot) {
-        if (slot instanceof SlotFluid) {
-            IAEItemStack stack = ((SlotFluid)slot).getAeStack();
+        if (slot instanceof ISlotFluid) {
+            IAEItemStack stack = ((ISlotFluid) slot).getAeStack();
             super.func_146977_a(new SlotSingleItem(slot));
             if (stack == null) return;
             IAEItemStack fake = stack.copy();
@@ -93,43 +99,45 @@ public class GuiFluidPatternEncoder extends AEBaseGui {
                 if (ItemFluidPacket.getFluidStack(stack) != null && ItemFluidPacket.getFluidStack(stack).amount > 0)
                     fake.setStackSize(ItemFluidPacket.getFluidStack(stack).amount);
             }
-            stackSizeRenderer.setAeStack(fake);
-            stackSizeRenderer.renderItemOverlayIntoGUI(fontRendererObj, mc.getTextureManager(), stack.getItemStack(), slot.xDisplayPosition, slot.yDisplayPosition);
+            aeRenderItem.setAeStack(fake);
+            GL11.glTranslatef(0.0f, 0.0f, 200.0f);
+            aeRenderItem.renderItemOverlayIntoGUI(
+                    fontRendererObj,
+                    mc.getTextureManager(),
+                    stack.getItemStack(),
+                    slot.xDisplayPosition,
+                    slot.yDisplayPosition);
+            GL11.glTranslatef(0.0f, 0.0f, -200.0f);
         } else {
             super.func_146977_a(slot);
         }
     }
 
     @Override
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    protected void renderToolTip(ItemStack stack, int x, int y) {
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public void renderToolTip(ItemStack stack, int x, int y) {
         List list;
         if (stack.getItem() instanceof ItemFluidPacket) {
             FluidStack fluid = ItemFluidPacket.getFluidStack(stack);
             if (fluid != null) {
-                list = Arrays.asList(fluid.getLocalizedName(), String.format(EnumChatFormatting.GRAY + "%,d mB", fluid.amount));
-            }
-            else {
+                list = Arrays.asList(
+                        fluid.getLocalizedName(),
+                        String.format(EnumChatFormatting.GRAY + "%,d mB", fluid.amount));
+            } else {
                 list = stack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips);
             }
-        }
-        else {
+        } else {
             list = stack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips);
         }
 
-        for (int k = 0; k < list.size(); ++k)
-        {
-            if (k == 0)
-            {
-                list.set(k, stack.getRarity().rarityColor + (String)list.get(k));
-            }
-            else
-            {
-                list.set(k, EnumChatFormatting.GRAY + (String)list.get(k));
+        for (int k = 0; k < list.size(); ++k) {
+            if (k == 0) {
+                list.set(k, stack.getRarity().rarityColor + (String) list.get(k));
+            } else {
+                list.set(k, EnumChatFormatting.GRAY + (String) list.get(k));
             }
         }
         FontRenderer font = stack.getItem().getFontRenderer(stack);
         drawHoveringText(list, x, y, (font == null ? fontRendererObj : font));
     }
-
 }

src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminal.java

@@ -1,75 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.client.render.AppEngRenderItem;
-import appeng.container.slot.SlotFake;
-import appeng.util.item.AEItemStack;
-import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminal;
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.slot.SlotSingleItem;
-import com.glodblock.github.util.Ae2ReflectClient;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-
-public class GuiFluidPatternTerminal extends GuiBaseFluidPatternTerminal {
-
-    private GuiTabButton craftingStatusBtn;
-    private final AppEngRenderItem stackSizeRenderer = Ae2ReflectClient.getStackSizeRenderer(this);
-
-    public GuiFluidPatternTerminal(InventoryPlayer inventoryPlayer, ITerminalHost te) {
-        super(inventoryPlayer, te);
-        ContainerFluidPatternTerminal container = new ContainerFluidPatternTerminal(inventoryPlayer, te);
-        container.setGui(this);
-        this.inventorySlots = container;
-        this.container = container;
-        this.monitorableContainer = container;
-        this.configSrc = container.getConfigManager();
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-        craftingStatusBtn = super.craftingStatusBtn;
-    }
-
-    @Override
-    public void func_146977_a( final Slot s )
-    {
-        if (drawSlot0(s))
-            super.func_146977_a( s );
-    }
-
-    public boolean drawSlot0(Slot slot) {
-        if (slot instanceof SlotFake && !this.container.isCraftingMode()) {
-            AEItemStack stack = AEItemStack.create(slot.getStack());
-            super.func_146977_a(new SlotSingleItem(slot));
-            if (stack == null) return true;
-            IAEItemStack fake = stack.copy();
-            if (fake.getItemStack().getItem() instanceof ItemFluidPacket) {
-                if (ItemFluidPacket.getFluidStack(stack) != null && ItemFluidPacket.getFluidStack(stack).amount > 0)
-                    fake.setStackSize(ItemFluidPacket.getFluidStack(stack).amount);
-            }
-            else
-                return true;
-            stackSizeRenderer.setAeStack(fake);
-            stackSizeRenderer.renderItemOverlayIntoGUI(fontRendererObj, mc.getTextureManager(), stack.getItemStack(), slot.xDisplayPosition, slot.yDisplayPosition);
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        if (btn == craftingStatusBtn) {
-            InventoryHandler.switchGui(GuiType.FLUID_PAT_TERM_CRAFTING_STATUS);
-        } else {
-            super.actionPerformed(btn);
-        }
-    }
-
-}

src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalCraftingStatus.java

@@ -1,54 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import appeng.api.storage.ITerminalHost;
-import appeng.client.gui.implementations.GuiCraftingStatus;
-import appeng.client.gui.widgets.GuiTabButton;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.common.parts.PartFluidTerminal;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.util.Ae2ReflectClient;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-
-public class GuiFluidPatternTerminalCraftingStatus extends GuiCraftingStatus {
-
-    private GuiTabButton originalGuiBtn;
-    private final ITerminalHost host;
-
-    public GuiFluidPatternTerminalCraftingStatus(InventoryPlayer inventoryPlayer, ITerminalHost te) {
-        super(inventoryPlayer, te);
-        host = te;
-    }
-
-    @Override
-    public void initGui() {
-        if (host instanceof PartFluidPatternTerminal)
-            Ae2ReflectClient.rewriteIcon(this, new ItemStack(ItemAndBlockHolder.FLUID_TERMINAL, 1));
-        else if (host instanceof PartFluidPatternTerminalEx)
-            Ae2ReflectClient.rewriteIcon(this, new ItemStack(ItemAndBlockHolder.FLUID_TERMINAL_EX, 1));
-        else if (host instanceof PartFluidTerminal) {
-            Ae2ReflectClient.rewriteIcon(this, new ItemStack(ItemAndBlockHolder.FLUID_TERM, 1));
-        }
-        super.initGui();
-        originalGuiBtn = Ae2ReflectClient.getOriginalGuiButton(this);
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        if (btn == originalGuiBtn) {
-            if (host instanceof PartFluidPatternTerminal)
-                InventoryHandler.switchGui(GuiType.FLUID_PATTERN_TERMINAL);
-            else if (host instanceof PartFluidPatternTerminalEx)
-                InventoryHandler.switchGui(GuiType.FLUID_PATTERN_TERMINAL_EX);
-            else if (host instanceof PartFluidTerminal)
-                InventoryHandler.switchGui(GuiType.FLUID_TERMINAL);
-        } else {
-            super.actionPerformed(btn);
-        }
-    }
-
-}

src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalEx.java

@@ -1,75 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.client.render.AppEngRenderItem;
-import appeng.container.slot.SlotFake;
-import appeng.util.item.AEItemStack;
-import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminalEx;
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.slot.SlotSingleItem;
-import com.glodblock.github.util.Ae2ReflectClient;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-
-public class GuiFluidPatternTerminalEx extends GuiBaseFluidPatternTerminalEx {
-
-    private GuiTabButton craftingStatusBtn;
-    private final AppEngRenderItem stackSizeRenderer = Ae2ReflectClient.getStackSizeRenderer(this);
-
-    public GuiFluidPatternTerminalEx(InventoryPlayer inventoryPlayer, ITerminalHost te) {
-        super(inventoryPlayer, te);
-        ContainerFluidPatternTerminalEx container = new ContainerFluidPatternTerminalEx(inventoryPlayer, te);
-        container.setGui(this);
-        this.inventorySlots = container;
-        this.container = container;
-        this.monitorableContainer = container;
-        this.configSrc = container.getConfigManager();
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-        craftingStatusBtn = super.craftingStatusBtn;
-    }
-
-    @Override
-    public void func_146977_a( final Slot s )
-    {
-        if (drawSlot0(s))
-            super.func_146977_a( s );
-    }
-
-    public boolean drawSlot0(Slot slot) {
-        if (slot instanceof SlotFake) {
-            AEItemStack stack = AEItemStack.create(slot.getStack());
-            super.func_146977_a(new SlotSingleItem(slot));
-            if (stack == null) return true;
-            IAEItemStack fake = stack.copy();
-            if (fake.getItemStack().getItem() instanceof ItemFluidPacket) {
-                if (ItemFluidPacket.getFluidStack(stack) != null && ItemFluidPacket.getFluidStack(stack).amount > 0)
-                    fake.setStackSize(ItemFluidPacket.getFluidStack(stack).amount);
-            }
-            else
-                return true;
-            stackSizeRenderer.setAeStack(fake);
-            stackSizeRenderer.renderItemOverlayIntoGUI(fontRendererObj, mc.getTextureManager(), stack.getItemStack(), slot.xDisplayPosition, slot.yDisplayPosition);
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        if (btn == craftingStatusBtn) {
-            InventoryHandler.switchGui(GuiType.FLUID_PAT_TERM_CRAFTING_STATUS);
-        } else {
-            super.actionPerformed(btn);
-        }
-    }
-
-}

src/main/java/com/glodblock/github/client/gui/GuiFluidTerminal.java

@@ -1,94 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.client.me.SlotME;
-import appeng.client.render.AppEngRenderItem;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.ContainerFluidTerminal;
-import com.glodblock.github.client.gui.container.FCBaseFluidMonitorContain;
-import com.glodblock.github.common.item.ItemFluidDrop;
-import com.glodblock.github.network.CPacketFluidUpdate;
-import com.glodblock.github.util.Ae2ReflectClient;
-import com.glodblock.github.util.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import org.lwjgl.opengl.GL11;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class GuiFluidTerminal extends GuiBaseFluidTerminal {
-    private final AppEngRenderItem stackSizeRenderer = Ae2ReflectClient.getStackSizeRenderer(this);
-    public ContainerFluidTerminal container;
-
-    public GuiFluidTerminal(InventoryPlayer inventoryPlayer, ITerminalHost te) {
-        super(inventoryPlayer, te, new FCBaseFluidMonitorContain(inventoryPlayer, te));
-        this.container = new ContainerFluidTerminal(inventoryPlayer, te);
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-    }
-
-    @Override
-    public void func_146977_a(final Slot s) {
-        if (drawSlot0(s))
-            super.func_146977_a(s);
-    }
-
-
-    public boolean drawSlot0(Slot slot) {
-        if (slot instanceof SlotME) {
-            IAEItemStack stack = ((SlotME) slot).getAEStack();
-            if (stack == null) return true;
-            FluidStack fluidStack = ItemFluidDrop.getFluidStack(slot.getStack());
-            this.drawWidget(slot.xDisplayPosition, slot.yDisplayPosition, fluidStack.getFluid());
-            stackSizeRenderer.setAeStack(stack);
-            stackSizeRenderer.renderItemOverlayIntoGUI(fontRendererObj, mc.getTextureManager(), stack.getItemStack(), slot.xDisplayPosition, slot.yDisplayPosition);
-            return false;
-        }
-        return true;
-    }
-
-    private void drawWidget(int posX, int posY, Fluid fluid) {
-        Minecraft.getMinecraft().renderEngine
-            .bindTexture(TextureMap.locationBlocksTexture);
-        GL11.glDisable(GL11.GL_LIGHTING);
-        GL11.glEnable(GL11.GL_BLEND);
-        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-        GL11.glColor3f(1, 1, 1);
-        if (fluid != null && fluid.getIcon() != null) {
-            GL11.glColor3f((fluid.getColor() >> 16 & 0xFF) / 255.0F, (fluid.getColor() >> 8 & 0xFF) / 255.0F, (fluid.getColor() & 0xFF) / 255.0F);
-            drawTexturedModelRectFromIcon(posX, posY,
-                fluid.getIcon(), 16, 16);
-        }
-        GL11.glEnable(GL11.GL_LIGHTING);
-        GL11.glDisable(GL11.GL_BLEND);
-    }
-
-    @Override
-    protected void handleMouseClick(final Slot slot, final int slotIdx, final int ctrlDown, final int mouseButton) {
-        if (slot instanceof SlotME && Util.FluidUtil.isFluidContainer(player.inventory.getItemStack())) {
-            Map<Integer, IAEFluidStack> tmp = new HashMap<>();
-            ItemStack itemStack = this.player.inventory.getItemStack().copy();
-            tmp.put(0, ItemFluidDrop.getAeFluidStack(((SlotME) slot).getAEStack()));
-            if (!isShiftKeyDown()) {
-                itemStack.stackSize = 1;
-            }
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidUpdate(tmp, itemStack));
-        }
-        super.handleMouseClick(slot, slotIdx, ctrlDown, mouseButton);
-    }
-
-    public void update(ItemStack itemStack) {
-        this.player.inventory.setItemStack(itemStack);
-    }
-}

src/main/java/com/glodblock/github/client/gui/GuiIngredientBuffer.java

@@ -1,8 +1,13 @@
 package com.glodblock.github.client.gui;
 
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.client.gui.AEBaseGui;
-import appeng.core.localization.GuiText;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.common.util.ForgeDirection;
+
+import org.lwjgl.opengl.GL11;
+
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.client.gui.container.ContainerIngredientBuffer;
 import com.glodblock.github.common.tile.TileIngredientBuffer;
@@ -10,17 +15,13 @@ import com.glodblock.github.inventory.IAEFluidTank;
 import com.glodblock.github.inventory.gui.ButtonMouseHandler;
 import com.glodblock.github.inventory.gui.MouseRegionManager;
 import com.glodblock.github.inventory.gui.TankMouseHandler;
+import com.glodblock.github.util.FCGuiColors;
 import com.glodblock.github.util.NameConst;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.util.ForgeDirection;
-import org.lwjgl.opengl.GL11;
+import com.glodblock.github.util.RenderUtil;
 
-import javax.annotation.Nullable;
+import appeng.api.storage.data.IAEFluidStack;
+import appeng.client.gui.AEBaseGui;
+import appeng.core.localization.GuiText;
 
 public class GuiIngredientBuffer extends AEBaseGui {
 
@@ -36,10 +37,18 @@ public class GuiIngredientBuffer extends AEBaseGui {
         this.cont = (ContainerIngredientBuffer) inventorySlots;
         this.ySize = 222;
         for (int i = 0; i < 4; i++) {
-            mouseRegions.addRegion(TANK_X + TANK_X_OFF * i, TANK_Y, TANK_WIDTH, TANK_HEIGHT,
-                new TankMouseHandler(cont.getTile().getFluidInventory(), i));
-            mouseRegions.addRegion(TANK_X + 10 + 22 * i, TANK_Y + TANK_HEIGHT + 2, 7, 7,
-                ButtonMouseHandler.dumpTank(cont, i));
+            mouseRegions.addRegion(
+                    TANK_X + TANK_X_OFF * i,
+                    TANK_Y,
+                    TANK_WIDTH,
+                    TANK_HEIGHT,
+                    new TankMouseHandler(cont.getTile().getInternalFluid(), i));
+            mouseRegions.addRegion(
+                    TANK_X + 10 + 22 * i,
+                    TANK_Y + TANK_HEIGHT + 2,
+                    7,
+                    7,
+                    ButtonMouseHandler.dumpTank(cont, i));
         }
     }
 
@@ -58,42 +67,32 @@ public class GuiIngredientBuffer extends AEBaseGui {
 
     @Override
     public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
-        fontRendererObj.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_INGREDIENT_BUFFER)), 8, 6, 0x404040);
-        fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040);
+        fontRendererObj.drawString(
+                getGuiDisplayName(I18n.format(NameConst.GUI_INGREDIENT_BUFFER)),
+                8,
+                6,
+                FCGuiColors.guiTextColorGray.getColor());
+        fontRendererObj
+                .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor());
         GL11.glColor4f(1F, 1F, 1F, 1F);
 
-        IAEFluidTank fluidInv = cont.getTile().getFluidInventory();
+        IAEFluidTank fluidInv = cont.getTile().getInternalFluid();
         mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
         for (int i = 0; i < 4; i++) {
-            renderFluidIntoGui(TANK_X + i * TANK_X_OFF, TANK_Y, TANK_WIDTH, TANK_HEIGHT,
-                fluidInv.getFluidInSlot(i), fluidInv.getTankInfo(ForgeDirection.UNKNOWN)[i].capacity);
+            RenderUtil.renderFluidIntoGui(
+                    this,
+                    TANK_X + i * TANK_X_OFF,
+                    TANK_Y,
+                    TANK_WIDTH,
+                    TANK_HEIGHT,
+                    fluidInv.getFluidInSlot(i),
+                    fluidInv.getTankInfo(ForgeDirection.UNKNOWN)[i].capacity);
         }
         GL11.glColor4f(1F, 1F, 1F, 1F);
-
         mouseRegions.render(mouseX, mouseY);
     }
 
-    public void renderFluidIntoGui(int x, int y, int width, int height,
-                                   @Nullable IAEFluidStack aeFluidStack, int capacity) {
-        if (aeFluidStack != null) {
-            GL11.glDisable(2896);
-            GL11.glColor3f(1.0F, 1.0F, 1.0F);
-            int hi = (int) (height * ((double) aeFluidStack.getStackSize() / capacity));
-            if (aeFluidStack.getStackSize() > 0 && hi > 0) {
-                Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
-                IIcon fluidIcon = aeFluidStack.getFluid().getStillIcon();
-                GL11.glColor3f((float)(aeFluidStack.getFluid().getColor() >> 16 & 255) / 255.0F, (float)(aeFluidStack.getFluid().getColor() >> 8 & 255) / 255.0F, (float)(aeFluidStack.getFluid().getColor() & 255) / 255.0F);
-                for (int th = 0; th <= hi; th += 16) {
-                    if (hi - th <= 0) break;
-                    this.drawTexturedModelRectFromIcon(x, y + height - Math.min(16, hi - th) - th, fluidIcon, width, Math.min(16, hi - th));
-                }
-                GL11.glColor3f(1.0F, 1.0F, 1.0F);
-            }
-        }
-    }
-
     public void update(int slot, IAEFluidStack aeFluidStack) {
-        cont.getTile().getFluidInventory().setFluidInSlot(slot, aeFluidStack);
+        cont.getTile().getInternalFluid().setFluidInSlot(slot, aeFluidStack);
     }
-
 }

src/main/java/com/glodblock/github/client/gui/GuiLargeIngredientBuffer.java

@@ -1,8 +1,13 @@
 package com.glodblock.github.client.gui;
 
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.client.gui.AEBaseGui;
-import appeng.core.localization.GuiText;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.common.util.ForgeDirection;
+
+import org.lwjgl.opengl.GL11;
+
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.client.gui.container.ContainerLargeIngredientBuffer;
 import com.glodblock.github.common.tile.TileLargeIngredientBuffer;
@@ -10,17 +15,13 @@ import com.glodblock.github.inventory.IAEFluidTank;
 import com.glodblock.github.inventory.gui.ButtonMouseHandler;
 import com.glodblock.github.inventory.gui.MouseRegionManager;
 import com.glodblock.github.inventory.gui.TankMouseHandler;
+import com.glodblock.github.util.FCGuiColors;
 import com.glodblock.github.util.NameConst;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.util.ForgeDirection;
-import org.lwjgl.opengl.GL11;
+import com.glodblock.github.util.RenderUtil;
 
-import javax.annotation.Nullable;
+import appeng.api.storage.data.IAEFluidStack;
+import appeng.client.gui.AEBaseGui;
+import appeng.core.localization.GuiText;
 
 public class GuiLargeIngredientBuffer extends AEBaseGui {
 
@@ -36,10 +37,18 @@ public class GuiLargeIngredientBuffer extends AEBaseGui {
         this.cont = (ContainerLargeIngredientBuffer) inventorySlots;
         this.ySize = 222;
         for (int i = 0; i < 7; i++) {
-            mouseRegions.addRegion(TANK_X + TANK_X_OFF * i, TANK_Y, TANK_WIDTH, TANK_HEIGHT,
-                new TankMouseHandler(cont.getTile().getFluidInventory(), i));
-            mouseRegions.addRegion(TANK_X + 10 + 22 * i, TANK_Y + TANK_HEIGHT + 2, 7, 7,
-                ButtonMouseHandler.dumpTank(cont, i));
+            mouseRegions.addRegion(
+                    TANK_X + TANK_X_OFF * i,
+                    TANK_Y,
+                    TANK_WIDTH,
+                    TANK_HEIGHT,
+                    new TankMouseHandler(cont.getTile().getInternalFluid(), i));
+            mouseRegions.addRegion(
+                    TANK_X + 10 + 22 * i,
+                    TANK_Y + TANK_HEIGHT + 2,
+                    7,
+                    7,
+                    ButtonMouseHandler.dumpTank(cont, i));
         }
     }
 
@@ -58,42 +67,32 @@ public class GuiLargeIngredientBuffer extends AEBaseGui {
 
     @Override
     public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
-        fontRendererObj.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_LARGE_INGREDIENT_BUFFER)), 8, 6, 0x404040);
-        fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040);
+        fontRendererObj.drawString(
+                getGuiDisplayName(I18n.format(NameConst.GUI_LARGE_INGREDIENT_BUFFER)),
+                8,
+                6,
+                FCGuiColors.guiTextColorGray.getColor());
+        fontRendererObj
+                .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor());
         GL11.glColor4f(1F, 1F, 1F, 1F);
 
-        IAEFluidTank fluidInv = cont.getTile().getFluidInventory();
+        IAEFluidTank fluidInv = cont.getTile().getInternalFluid();
         mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
         for (int i = 0; i < 7; i++) {
-            renderFluidIntoGui(TANK_X + i * TANK_X_OFF, TANK_Y, TANK_WIDTH, TANK_HEIGHT,
-                fluidInv.getFluidInSlot(i), fluidInv.getTankInfo(ForgeDirection.UNKNOWN)[i].capacity);
+            RenderUtil.renderFluidIntoGui(
+                    this,
+                    TANK_X + i * TANK_X_OFF,
+                    TANK_Y,
+                    TANK_WIDTH,
+                    TANK_HEIGHT,
+                    fluidInv.getFluidInSlot(i),
+                    fluidInv.getTankInfo(ForgeDirection.UNKNOWN)[i].capacity);
         }
         GL11.glColor4f(1F, 1F, 1F, 1F);
-
         mouseRegions.render(mouseX, mouseY);
     }
 
-    public void renderFluidIntoGui(int x, int y, int width, int height,
-                                   @Nullable IAEFluidStack aeFluidStack, int capacity) {
-        if (aeFluidStack != null) {
-            GL11.glDisable(2896);
-            GL11.glColor3f(1.0F, 1.0F, 1.0F);
-            int hi = (int) (height * ((double) aeFluidStack.getStackSize() / capacity));
-            if (aeFluidStack.getStackSize() > 0 && hi > 0) {
-                Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
-                IIcon fluidIcon = aeFluidStack.getFluid().getStillIcon();
-                GL11.glColor3f((float)(aeFluidStack.getFluid().getColor() >> 16 & 255) / 255.0F, (float)(aeFluidStack.getFluid().getColor() >> 8 & 255) / 255.0F, (float)(aeFluidStack.getFluid().getColor() & 255) / 255.0F);
-                for (int th = 0; th <= hi; th += 16) {
-                    if (hi - th <= 0) break;
-                    this.drawTexturedModelRectFromIcon(x, y + height - Math.min(16, hi - th) - th, fluidIcon, width, Math.min(16, hi - th));
-                }
-                GL11.glColor3f(1.0F, 1.0F, 1.0F);
-            }
-        }
-    }
-
     public void update(int slot, IAEFluidStack aeFluidStack) {
-        cont.getTile().getFluidInventory().setFluidInSlot(slot, aeFluidStack);
+        cont.getTile().getInternalFluid().setFluidInSlot(slot, aeFluidStack);
     }
-
 }

src/main/java/com/glodblock/github/client/gui/GuiLevelEmitterProxy.java

@@ -0,0 +1,48 @@
+package com.glodblock.github.client.gui;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.entity.player.InventoryPlayer;
+
+import appeng.api.parts.ILevelEmitter;
+import appeng.client.gui.IGuiSub;
+import appeng.client.gui.implementations.GuiLevelEmitter;
+import appeng.client.gui.widgets.GuiTabButton;
+import appeng.container.interfaces.IContainerSubGui;
+import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.PacketSwitchGuis;
+
+public class GuiLevelEmitterProxy extends GuiLevelEmitter implements IGuiSub {
+
+    protected final IContainerSubGui container;
+    protected GuiTabButton originalGuiBtn;;
+
+    public GuiLevelEmitterProxy(final InventoryPlayer inventoryPlayer, final ILevelEmitter te) {
+        super(inventoryPlayer, te);
+        this.container = (IContainerSubGui) inventorySlots;
+        this.container.setGuiLink(this);
+    }
+
+    @Override
+    public void initGui() {
+        super.initGui();
+        if (container.getPrimaryGuiIcon() != null) initPrimaryGuiButton();
+    }
+
+    public void initPrimaryGuiButton() {
+        this.buttonList.add(
+                this.originalGuiBtn = new GuiTabButton(
+                        this.guiLeft + this.xSize - 57,
+                        this.guiTop,
+                        container.getPrimaryGuiIcon(),
+                        container.getPrimaryGuiIcon().getDisplayName(),
+                        itemRender));
+    }
+
+    @Override
+    protected void actionPerformed(GuiButton btn) {
+        super.actionPerformed(btn);
+        if (btn == this.originalGuiBtn) {
+            NetworkHandler.instance.sendToServer(new PacketSwitchGuis());
+        }
+    }
+}

src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java

@@ -1,101 +1,134 @@
 package com.glodblock.github.client.gui;
 
-import appeng.api.storage.data.IAEItemStack;
-import appeng.client.gui.AEBaseGui;
-import appeng.client.render.AppEngRenderItem;
-import appeng.container.slot.SlotFake;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketNEIDragClick;
-import codechicken.nei.VisiblityData;
-import codechicken.nei.api.INEIGuiHandler;
-import codechicken.nei.api.TaggedInventoryArea;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+
+import org.jetbrains.annotations.Nullable;
+import org.lwjgl.input.Keyboard;
+
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.client.gui.container.ContainerLevelMaintainer;
 import com.glodblock.github.common.tile.TileLevelMaintainer;
 import com.glodblock.github.inventory.gui.MouseRegionManager;
-import com.glodblock.github.inventory.slot.SlotSingleItem;
 import com.glodblock.github.network.CPacketLevelMaintainer;
-import com.glodblock.github.util.Ae2ReflectClient;
-import com.glodblock.github.util.ModAndClassUtil;
+import com.glodblock.github.network.CPacketLevelMaintainer.Action;
+import com.glodblock.github.util.FCGuiColors;
 import com.glodblock.github.util.NameConst;
-import cpw.mods.fml.common.Optional;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.input.Keyboard;
 
-import java.awt.*;
-import java.util.Collections;
-import java.util.List;
+import appeng.api.features.LevelState;
+import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IAEStackType;
+import appeng.client.gui.GuiSub;
+import appeng.client.gui.slots.VirtualMEPhantomSlot;
+import appeng.client.gui.widgets.GuiTabButton;
+import appeng.client.gui.widgets.GuiToggleButton;
+import appeng.core.localization.GuiText;
+import appeng.util.calculators.ArithHelper;
+import appeng.util.calculators.Calculator;
 
-@Optional.Interface(modid = "NotEnoughItems", iface = "codechicken.nei.api.INEIGuiHandler")
-public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
+public class GuiLevelMaintainer extends GuiSub {
 
     private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/level_maintainer.png");
     private final ContainerLevelMaintainer cont;
     private final Component[] component = new Component[TileLevelMaintainer.REQ_COUNT];
     private final MouseRegionManager mouseRegions = new MouseRegionManager(this);
-    private final AppEngRenderItem stackSizeRenderer = Ae2ReflectClient.getStackSizeRenderer(this);
-    private TileLevelMaintainer tile;
-    private FCGuiTextField input;
+    private Widget focusedWidget;
+    private final FontRenderer render;
+    private GuiToggleButton liteMode;
 
     public GuiLevelMaintainer(InventoryPlayer ipl, TileLevelMaintainer tile) {
         super(new ContainerLevelMaintainer(ipl, tile));
         this.cont = (ContainerLevelMaintainer) inventorySlots;
         this.xSize = 195;
         this.ySize = 214;
-        this.tile = tile;
-    }
-
-    public void postUpdate(List<IAEItemStack> list) {
-        for (IAEItemStack is : list) {
-            long size = is.getItemStack().getTagCompound().getLong("Batch");
-            int i = is.getItemStack().getTagCompound().getInteger("Index");
-            boolean isEnable = is.getItemStack().getTagCompound().getBoolean("Enable");
-            component[i].getQty().textField.setText(String.valueOf(is.getStackSize()));
-            component[i].getBatch().textField.setText(String.valueOf(size));
-            component[i].setEnable(isEnable);
-        }
-    }
-
-    public void drawScreen(final int mouseX, final int mouseY, final float btn) {
-        super.drawScreen(mouseX, mouseY, btn);
-        if (ModAndClassUtil.isSearchBar) {
-            for (Component com : this.component) {
-                handleTooltip(mouseX, mouseY, com.getQty().textField.new TooltipProvider());
-                handleTooltip(mouseX, mouseY, com.getBatch().textField.new TooltipProvider());
-            }
-        }
+        this.render = new FontRenderer(
+                Minecraft.getMinecraft().gameSettings,
+                TEX_BG,
+                Minecraft.getMinecraft().getTextureManager(),
+                true);
     }
 
+    @Override
     public void initGui() {
         super.initGui();
+
+        for (int i = 0; i < TileLevelMaintainer.REQ_COUNT; i++) {
+            VirtualMEPhantomSlot slot = new VirtualMEPhantomSlot(
+                    27,
+                    20 + i * 19,
+                    this.cont.getTile().getAEStackInventory(),
+                    i,
+                    GuiLevelMaintainer::acceptType);
+            slot.setShowAmount(true);
+            slot.setShowAmountAlways(true);
+            this.registerVirtualSlots(slot);
+        }
+
         for (int i = 0; i < TileLevelMaintainer.REQ_COUNT; i++) {
             component[i] = new Component(
-                new Widget(
-                    new FCGuiTextField(this.fontRendererObj, guiLeft + 37, guiTop + 21 + 20 * i, 52, 16),
-                    new GuiFCImgButton(guiLeft + 37 + 47, guiTop + 20 + 20 * i, "SUBMIT", "SUBMIT"), I18n.format(NameConst.TT_REQUEST_SIZE),
-                    i, "TileLevelMaintainer.Quantity"),
-                new Widget(
-                    new FCGuiTextField(this.fontRendererObj, guiLeft + 100, guiTop + 21 + 20 * i, 52, 16),
-                    new GuiFCImgButton(guiLeft + 100 + 47, guiTop + 20 + 20 * i, "SUBMIT", "SUBMIT"), I18n.format(NameConst.TT_BATCH_SIZE),
-                    i, "TileLevelMaintainer.Batch"),
-                new GuiFCImgButton(guiLeft + 4, guiTop + 23 + 20 * i, "ENABLE", "ENABLE"),
-                new GuiFCImgButton(guiLeft + 4, guiTop + 23 + 20 * i, "DISABLE", "DISABLE"),
-                this.buttonList
-            );
+                    new Widget(
+                            new FCGuiTextField(this.fontRendererObj, guiLeft + 46, guiTop + 19 + 19 * i, 52, 14),
+                            NameConst.TT_LEVEL_MAINTAINER_REQUEST_SIZE,
+                            i,
+                            Action.Quantity),
+                    new Widget(
+                            new FCGuiTextField(this.fontRendererObj, guiLeft + 100, guiTop + 19 + 19 * i, 52, 14),
+                            NameConst.TT_LEVEL_MAINTAINER_BATCH_SIZE,
+                            i,
+                            Action.Batch),
+                    new GuiFCImgButton(guiLeft + 105 + 47, guiTop + 17 + 19 * i, "SUBMIT", "SUBMIT", false),
+                    new GuiFCImgButton(guiLeft + 9, guiTop + 20 + 19 * i, "ENABLE", "ENABLE", false),
+                    new GuiFCImgButton(guiLeft + 9, guiTop + 20 + 19 * i, "DISABLE", "DISABLE", false),
+                    new FCGuiLineField(fontRendererObj, guiLeft + 47, guiTop + 33 + 19 * i, 120),
+                    this.buttonList,
+                    this.cont);
+        }
+        this.buttonList.add(
+                this.liteMode = new GuiToggleButton(
+                        guiLeft - 18,
+                        guiTop + 2,
+                        178,
+                        194,
+                        GuiText.CraftingModeLite.getLocal(),
+                        NameConst.TT_LEVEL_MAINTAINER_LITE_CRAFT_DESC));
+        this.liteMode.setState(false);
+    }
+
+    @Override
+    public void initPrimaryGuiButton() {
+        this.originalGuiBtn = new GuiTabButton(
+                this.guiLeft + 151,
+                this.guiTop - 4,
+                this.cont.getPrimaryGuiIcon(),
+                this.cont.getPrimaryGuiIcon().getDisplayName(),
+                itemRender);
+        this.originalGuiBtn.setHideEdge(13);
+        this.buttonList.add(originalGuiBtn);
+    }
+
+    @Override
+    public void drawScreen(final int mouseX, final int mouseY, final float btn) {
+        super.drawScreen(mouseX, mouseY, btn);
+        for (Component com : this.component) {
+            com.getQty().textField.handleTooltip(mouseX, mouseY, this);
+            com.getBatch().textField.handleTooltip(mouseX, mouseY, this);
+            com.getLine().handleTooltip(mouseX, mouseY, this);
         }
-        FluidCraft.proxy.netHandler.sendToServer(new CPacketLevelMaintainer("TileLevelMaintainer.refresh"));
     }
 
     @Override
     public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) {
         mc.getTextureManager().bindTexture(TEX_BG);
         drawTexturedModalRect(offsetX, offsetY, 0, 0, 176, ySize);
+
         for (int i = 0; i < TileLevelMaintainer.REQ_COUNT; i++) {
             this.component[i].draw();
         }
@@ -103,206 +136,215 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
 
     @Override
     public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
-        fontRendererObj.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_LEVEL_MAINTAINER)), 8, 6, 0x404040);
+        fontRendererObj.drawString(
+                getGuiDisplayName(NameConst.i18n(NameConst.GUI_LEVEL_MAINTAINER)),
+                8,
+                6,
+                FCGuiColors.guiTextColorGray.getColor());
         mouseRegions.render(mouseX, mouseY);
     }
 
-    @Override
-    public void func_146977_a(final Slot s) {
-        if (drawSlot0(s))
-            super.func_146977_a(s);
-    }
-
-    public boolean drawSlot0(Slot slot) {
-        if (slot instanceof SlotFake) {
-            IAEItemStack stack = ((ContainerLevelMaintainer.FakeSlot) slot).getAeStack();
-            super.func_146977_a(new SlotSingleItem(slot));
-            if (stack == null) return true;
-            IAEItemStack fake = stack.copy();
-            if (this.component[slot.getSlotIndex()].getQty().textField.getText().matches("[0-9]+")) {
-                fake.setStackSize(Long.parseLong(this.component[slot.getSlotIndex()].getQty().textField.getText()));
-            } else {
-                fake.setStackSize(0);
-            }
-            stackSizeRenderer.setAeStack(fake);
-            stackSizeRenderer.renderItemOverlayIntoGUI(fontRendererObj, mc.getTextureManager(), stack.getItemStack(), slot.xDisplayPosition, slot.yDisplayPosition);
-            return false;
-        }
-        return true;
-    }
-
     @Override
     protected void mouseClicked(final int xCoord, final int yCoord, final int btn) {
         if (btn == 0) {
-            if (input != null) {
-                input.setFocused(false);
-            }
             for (Component com : this.component) {
-                FCGuiTextField textField = com.isMouseIn(xCoord, yCoord);
+                Widget textField = com.isMouseIn(xCoord, yCoord);
                 if (textField != null) {
-                    textField.setFocused(true);
-                    this.input = textField;
+                    this.focusWidget(textField);
                     super.mouseClicked(xCoord, yCoord, btn);
                     return;
                 }
             }
-            this.input = null;
+            this.focusWidget(null);
         }
         super.mouseClicked(xCoord, yCoord, btn);
     }
 
     @Override
     protected void keyTyped(final char character, final int key) {
-        if (this.input == null) {
+        if (this.focusedWidget == null) {
             super.keyTyped(character, key);
             return;
         }
         if (!this.checkHotbarKeys(key)) {
-            if (!((character == ' ') && this.input.getText().isEmpty())) {
-                this.input.textboxKeyTyped(character, key);
+            if (!((character == ' ') && this.focusedWidget.textField.getText().isEmpty())) {
+                this.focusedWidget.textField.textboxKeyTyped(character, key);
             }
             super.keyTyped(character, key);
-            if (!this.input.getText().matches("^[0-9]+")) {
-                this.input.setTextColor(0xFF0000);
-            } else {
-                this.input.setTextColor(0xFFFFFF);
+
+            this.focusedWidget.validate();
+
+            if (key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER) {
+                this.component[this.focusedWidget.componentIndex].submit();
+                this.focusWidget(null);
             }
-            if (key == Keyboard.KEY_RETURN) {
-                this.input.setFocused(false);
-                this.input = null;
+
+            if (key == Keyboard.KEY_TAB) {
+                this.focusAdjacentWidget(isShiftKeyDown());
             }
         }
     }
 
-    @Override
-    protected void handleMouseClick(final Slot slot, final int slotIdx, final int ctrlDown, final int mouseButton) {
-        if (slot instanceof ContainerLevelMaintainer.FakeSlot && this.cont.getPlayerInv().getItemStack() != null) {
-            this.component[slot.getSlotIndex()].getQty().textField.setText(String.valueOf(this.cont.getPlayerInv().getItemStack().stackSize));
-            return;
+    private void focusWidget(@Nullable Widget widget) {
+        if (this.focusedWidget != null) {
+            this.focusedWidget.textField.setFocused(false);
+        }
+        this.focusedWidget = widget;
+        if (this.focusedWidget != null) {
+            this.focusedWidget.textField.setFocused(true);
         }
-        super.handleMouseClick(slot, slotIdx, ctrlDown, mouseButton);
     }
 
-    public void updateAmount(int idx, int stackSize) {
-        this.component[idx].getQty().textField.setText(String.valueOf(stackSize));
+    private void focusAdjacentWidget(boolean backwards) {
+        this.focusedWidget.validate();
+        this.focusWidget(this.getAdjacentWidget(backwards));
     }
 
+    private Widget getAdjacentWidget(boolean backwards) {
+        int index = this.focusedWidget.componentIndex;
+        boolean isBatch = this.focusedWidget.action == Action.Batch;
+
+        if (backwards) {
+            if (isBatch) {
+                return this.component[index].getQty();
+            }
+            return this.component[(index + TileLevelMaintainer.REQ_COUNT - 1) % TileLevelMaintainer.REQ_COUNT]
+                    .getBatch();
+        }
+
+        if (isBatch) {
+            return this.component[(index + 1) % TileLevelMaintainer.REQ_COUNT].getQty();
+        }
+        return this.component[index].getBatch();
+    }
 
     @Override
     protected void actionPerformed(final GuiButton btn) {
-        super.actionPerformed(btn);
         for (Component com : this.component) {
             if (com.sendToServer(btn)) {
-                break;
+                return;
             }
         }
-    }
-
-    @Override
-    public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) {
-        return currentVisibility;
-    }
-
-    @Override
-    public Iterable<Integer> getItemSpawnSlots(GuiContainer gui, ItemStack item) {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui) {
-        return null;
-    }
-
-    private Rectangle getSlotArea(SlotFake slot) {
-        return new Rectangle(guiLeft + slot.getX(), guiTop + slot.getY(), 16, 16);
-    }
-
-    @Override
-    public boolean handleDragNDrop(GuiContainer gui, int mouseX, int mouseY, ItemStack draggedStack, int button) {
-        for (ContainerLevelMaintainer.FakeSlot slot : this.cont.getRequestSlots()) {
-            if (getSlotArea(slot).contains(mouseX, mouseY)) {
-                slot.putStack(draggedStack);
-                NetworkHandler.instance.sendToServer(new PacketNEIDragClick(draggedStack, slot.getSlotIndex()));
-                if (draggedStack != null) {
-                    this.updateAmount(slot.getSlotIndex(), draggedStack.stackSize);
-                    draggedStack.stackSize = 0;
-                }
-                return true;
+        if (btn == this.liteMode) {
+            if (isShiftKeyDown()) {
+                FluidCraft.proxy.netHandler.sendToServer(new CPacketLevelMaintainer(Action.ClearLiteMode));
+            } else {
+                FluidCraft.proxy.netHandler.sendToServer(new CPacketLevelMaintainer(Action.ToggleLiteMode));
             }
+            return;
         }
-        if (draggedStack != null) {
-            draggedStack.stackSize = 0;
-        }
-        return false;
+        super.actionPerformed(btn);
     }
 
-    @Override
-    public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) {
-        return false;
+    public void updateComponent(int index, long quantity, long batchSize, boolean isEnabled, LevelState state) {
+        if (index < 0 || index >= TileLevelMaintainer.REQ_COUNT) return;
+        component[index].setEnable(isEnabled);
+        component[index].setState(state);
+        component[index].getQty().textField.setText(String.valueOf(quantity));
+        component[index].getBatch().textField.setText(String.valueOf(batchSize));
+        component[index].getQty().validate();
+        component[index].getBatch().validate();
+    }
+
+    public void updateComponent(int index, LevelState state) {
+        if (index < 0 || index >= TileLevelMaintainer.REQ_COUNT) return;
+        component[index].setState(state);
+    }
+
+    public void updateComponent(boolean isLiteMode) {
+        this.liteMode.setState(isLiteMode);
+    }
+
+    private static boolean acceptType(VirtualMEPhantomSlot slot, IAEStackType<?> type, int mouseButton) {
+        return true;
     }
 
     private class Component {
-        public boolean isEnable = true;
-        private Widget qty;
-        private Widget batch;
-        private GuiFCImgButton disable;
-        private GuiFCImgButton enable;
 
-        public Component(Widget qtyInput, Widget batchInput, GuiFCImgButton enableBtn, GuiFCImgButton disableBtn, List buttonList) {
+        public boolean isEnable = false;
+        private final Widget qty;
+        private final Widget batch;
+        private final GuiFCImgButton disable;
+        private final GuiFCImgButton enable;
+        private final GuiFCImgButton submit;
+        private final FCGuiLineField line;
+        private LevelState state;
+        private final ContainerLevelMaintainer container;
+
+        public Component(Widget qtyInput, Widget batchInput, GuiFCImgButton submitBtn, GuiFCImgButton enableBtn,
+                GuiFCImgButton disableBtn, FCGuiLineField line, List<GuiButton> buttonList,
+                ContainerLevelMaintainer container) {
             this.qty = qtyInput;
             this.batch = batchInput;
             this.enable = enableBtn;
             this.disable = disableBtn;
-            this.enable.setHalfSize(true);
-            this.disable.setHalfSize(true);
-            buttonList.add(this.qty.button);
-            buttonList.add(this.batch.button);
+            this.submit = submitBtn;
+            this.line = line;
+            this.state = LevelState.None;
+            this.container = container;
+            buttonList.add(this.submit);
             buttonList.add(this.enable);
             buttonList.add(this.disable);
         }
 
         public int getIndex() {
-            return this.getQty().idx;
+            return this.qty.componentIndex;
         }
 
         public void setEnable(boolean enable) {
             this.isEnable = enable;
         }
 
-        private boolean send(Widget widget) {
-            if (((ContainerLevelMaintainer.FakeSlot) cont.inventorySlots.get(widget.idx)).getHasStack()) {
-                if (!widget.textField.getText().isEmpty() && widget.textField.getText().matches("^[0-9]+")) {
-                    String str = widget.textField.getText().replaceAll("^(0+)", "");
-                    widget.textField.setText(str.isEmpty() ? "0" : str);
-                    FluidCraft.proxy.netHandler.sendToServer(new CPacketLevelMaintainer(widget.action, widget.idx, widget.textField.getText()));
-                    widget.textField.setTextColor(0xFFFFFF);
-                    return true;
-                } else {
-                    widget.textField.setTextColor(0xFF0000);
-                    return false;
-                }
+        public IAEStack<?> getStack() {
+            return this.container.getTile().getAEStackInventory().getAEStackInSlot(this.getIndex());
+        }
+
+        private void send(Widget widget) {
+            if (this.getStack() != null && widget.getAmount() != null) {
+                FluidCraft.proxy.netHandler.sendToServer(
+                        new CPacketLevelMaintainer(widget.action, widget.componentIndex, widget.getAmount()));
             }
-            return false;
+        }
+
+        public void submit() {
+            this.sendToServer(this.submit);
         }
 
         protected boolean sendToServer(GuiButton btn) {
-            if (this.getQty().button == btn) {
-                return this.send(this.getQty());
-            }
-            if (this.getBatch().button == btn) {
-                return this.send(this.getBatch());
-            }
-            if (this.enable == btn) {
-                FluidCraft.proxy.netHandler.sendToServer(new CPacketLevelMaintainer("TileLevelMaintainer.Enable", this.getIndex()));
+            boolean didSomething = false;
+            if (this.submit == btn) {
+                final Widget qty = this.getQty();
+                final Widget batch = this.getBatch();
+                qty.validate();
+                batch.validate();
+                if (qty.getAmount() != null) {
+                    this.send(qty);
+                    qty.textField.setText(String.valueOf(qty.getAmount()));
+                }
+                if (batch.getAmount() != null) {
+                    this.send(batch);
+                    batch.textField.setText(String.valueOf(batch.getAmount()));
+                }
+
+                didSomething = true;
+            } else if (this.enable == btn) {
+                this.setEnable(false);
+                FluidCraft.proxy.netHandler.sendToServer(new CPacketLevelMaintainer(Action.Enable, this.getIndex()));
+                didSomething = true;
             } else if (this.disable == btn) {
-                FluidCraft.proxy.netHandler.sendToServer(new CPacketLevelMaintainer("TileLevelMaintainer.Disable", this.getIndex()));
+                if (this.getStack() != null) {
+                    this.setEnable(true);
+                    FluidCraft.proxy.netHandler
+                            .sendToServer(new CPacketLevelMaintainer(Action.Disable, this.getIndex()));
+                    didSomething = true;
+                }
             }
-            return false;
+            return didSomething;
         }
 
-        public FCGuiTextField isMouseIn(final int xCoord, final int yCoord) {
-            if (this.getQty().textField.isMouseIn(xCoord, yCoord)) return this.getQty().textField;
-            if (this.getBatch().textField.isMouseIn(xCoord, yCoord)) return this.getBatch().textField;
+        public Widget isMouseIn(final int xCoord, final int yCoord) {
+            if (this.qty.textField.isMouseIn(xCoord, yCoord)) return this.getQty();
+            if (this.batch.textField.isMouseIn(xCoord, yCoord)) return this.getBatch();
             return null;
         }
 
@@ -314,9 +356,79 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
             return this.batch;
         }
 
+        public FCGuiLineField getLine() {
+            return this.line;
+        }
+
         public void draw() {
-            this.getQty().draw();
-            this.getBatch().draw();
+            this.qty.draw();
+            this.batch.draw();
+            ArrayList<String> message = new ArrayList<>();
+            message.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_TITLE) + "\n");
+            switch (this.state) {
+                case Idle -> {
+                    this.line.setColor(FCGuiColors.stateIdle.getColor());
+                    message.add(
+                            NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " "
+                                    + NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_IDLE));
+                }
+                case Craft -> {
+                    this.line.setColor(FCGuiColors.stateCraft.getColor());
+                    message.add(
+                            NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " "
+                                    + NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_LINK));
+                }
+                case Export -> {
+                    this.line.setColor(FCGuiColors.stateExport.getColor());
+                    message.add(
+                            NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " "
+                                    + NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_EXPORT));
+                }
+                case Error -> {
+                    this.line.setColor(FCGuiColors.stateError.getColor());
+                    message.add(
+                            NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " "
+                                    + NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_ERROR));
+                }
+                case NotFound -> {
+                    this.line.setColor(FCGuiColors.stateError.getColor());
+                    message.add(
+                            NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " "
+                                    + NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_NOT_FOUND));
+                }
+                case CantCraft -> {
+                    this.line.setColor(FCGuiColors.stateError.getColor());
+                    message.add(
+                            NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " "
+                                    + NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CANT_CRAFT));
+                }
+                default -> {
+                    this.line.setColor(FCGuiColors.stateNone.getColor());
+                    message.add(
+                            NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " "
+                                    + NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_NONE));
+                }
+            }
+            message.add("");
+            if (isShiftKeyDown()) {
+                message.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_IDLE));
+                message.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_IDLE_DESC) + "\n");
+                message.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_LINK));
+                message.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_LINK_DESC) + "\n");
+                message.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_EXPORT));
+                message.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_EXPORT_DESC) + "\n");
+                message.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_ERROR));
+                message.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_ERROR_DESC) + "\n");
+                message.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_NOT_FOUND));
+                message.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_NOT_FOUND_DESC) + "\n");
+                message.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CANT_CRAFT));
+                message.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CANT_CRAFT_DESC));
+            } else {
+                message.add(NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE));
+            }
+            this.line.setMessage(
+                    render.wrapFormattedStringToWidth(String.join("\n", message), (int) Math.floor(xSize * 0.8)));
+            this.line.drawTextBox();
             if (this.isEnable) {
                 this.enable.visible = true;
                 this.disable.visible = false;
@@ -326,37 +438,78 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
             }
         }
 
+        public void setState(LevelState state) {
+            this.state = state;
+        }
     }
 
     private class Widget {
-        public final int idx;
-        public final String action;
-        private FCGuiTextField textField;
-        private GuiFCImgButton button;
 
-        public Widget(FCGuiTextField textField, GuiFCImgButton button, String tooltip, int idx, String action) {
+        public final int componentIndex;
+        public final Action action;
+        public final FCGuiTextField textField;
+        private final String tooltip;
+        private Long amount;
+
+        public Widget(FCGuiTextField textField, String tooltip, int componentIndex, Action action) {
             this.textField = textField;
-            this.textField.setMessage(tooltip);
             this.textField.setEnableBackgroundDrawing(false);
             this.textField.setText("0");
-            this.textField.setMaxStringLength(10); // it's enough to useful
-            this.button = button;
-            this.idx = idx;
+            this.textField.setMaxStringLength(16); // this length is enough to be useful
+            this.componentIndex = componentIndex;
             this.action = action;
+            this.tooltip = tooltip;
         }
 
         public void draw() {
+            String current = amount != null
+                    ? StatCollector.translateToLocal(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " "
+                            + NumberFormat.getNumberInstance().format(amount)
+                            + "\n"
+                    : "";
+            if (isShiftKeyDown()) {
+                this.setTooltip(
+                        render.wrapFormattedStringToWidth(
+                                StatCollector.translateToLocal(this.tooltip) + "\n"
+                                        + current
+                                        + "\n"
+                                        + StatCollector.translateToLocal(this.tooltip + ".hint"),
+                                xSize / 2));
+            } else {
+                this.setTooltip(
+                        render.wrapFormattedStringToWidth(
+                                NameConst.i18n(this.tooltip, "\n", false) + "\n"
+                                        + current
+                                        + NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE),
+                                (int) Math.floor(xSize * 0.8)));
+            }
             this.textField.drawTextBox();
         }
 
-        public GuiFCImgButton btn() {
-            return this.button;
-        }
-
         public void setTooltip(String message) {
             this.textField.setMessage(message);
         }
 
-    }
+        public void validate() {
+            final double result = Calculator.conversion(this.textField.getText());
+            if (Double.isNaN(result) || result < 0) {
+                this.amount = null;
+                this.textField.setTextColor(FCGuiColors.guiLevelMaintainerError.getColor());
+            } else {
+                this.amount = (long) ArithHelper.round(result, 0);
+                this.textField.setTextColor(FCGuiColors.guiTextColorGray.getColor());
+            }
 
+            IAEStack<?> stack = component[this.componentIndex].getStack();
+            if (stack != null) {
+                Long amount = component[this.componentIndex].getQty().getAmount();
+                stack.setStackSize(amount != null ? amount : 0);
+            }
+        }
+
+        @Nullable
+        public Long getAmount() {
+            return this.amount;
+        }
+    }
 }

src/main/java/com/glodblock/github/client/gui/GuiLevelWireless.java

@@ -0,0 +1,24 @@
+package com.glodblock.github.client.gui;
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import com.glodblock.github.client.gui.container.ContainerLevelWireless;
+import com.glodblock.github.inventory.item.IWirelessTerminal;
+
+import appeng.container.slot.AppEngSlot;
+
+public class GuiLevelWireless extends GuiLevelTerminal {
+
+    public GuiLevelWireless(final InventoryPlayer inventoryPlayer, final IWirelessTerminal te) {
+        super(inventoryPlayer, new ContainerLevelWireless(inventoryPlayer, te));
+    }
+
+    @Override
+    protected void repositionSlots() {
+        for (final Object obj : this.inventorySlots.inventorySlots) {
+            if (obj instanceof final AppEngSlot slot) {
+                slot.yDisplayPosition = this.ySize + slot.getY() - 78 - 4;
+            }
+        }
+    }
+}

src/main/java/com/glodblock/github/client/gui/GuiMagnetFilter.java

@@ -0,0 +1,218 @@
+package com.glodblock.github.client.gui;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.input.Keyboard;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.gui.container.ContainerMagnetFilter;
+import com.glodblock.github.inventory.item.WirelessMagnet;
+import com.glodblock.github.network.CPacketFluidPatternTermBtns;
+import com.glodblock.github.util.FCGuiColors;
+import com.glodblock.github.util.NameConst;
+
+import appeng.api.config.ActionItems;
+import appeng.api.config.Settings;
+import appeng.api.storage.ITerminalHost;
+import appeng.client.gui.GuiSub;
+import appeng.client.gui.widgets.GuiImgButton;
+import appeng.client.gui.widgets.MEGuiTextField;
+
+public class GuiMagnetFilter extends GuiSub {
+
+    protected FCGuiBaseButton listModeBtn;
+    protected ContainerMagnetFilter cont;
+    private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/magnet_filter.png");
+
+    protected Component[] components = new Component[4];
+    protected MEGuiTextField oreDict;
+    protected GuiImgButton clearBtn;
+
+    public GuiMagnetFilter(InventoryPlayer ip, ITerminalHost container) {
+        super(new ContainerMagnetFilter(ip, container));
+        this.xSize = 176;
+        this.ySize = 214;
+        this.cont = (ContainerMagnetFilter) this.inventorySlots;
+        oreDict = new MEGuiTextField(149, 12, NameConst.i18n(NameConst.TT_MAGNET_CARD_OREDICT));
+    }
+
+    private class Component {
+
+        private final GuiFCImgButton enable;
+        private final GuiFCImgButton disable;
+        private final CPacketFluidPatternTermBtns.Command action;
+        private boolean var;
+
+        public Component(int x, int y, boolean var, CPacketFluidPatternTermBtns.Command action) {
+            this.enable = new GuiFCImgButton(x, y, "ENABLE_12x", "ENABLE", false);
+            this.disable = new GuiFCImgButton(x, y, "DISABLE_12x", "DISABLE", false);
+            this.var = var;
+            this.action = action;
+            enable.setThreeFourths(true);
+            disable.setThreeFourths(true);
+            buttonList.add(this.enable);
+            buttonList.add(this.disable);
+        }
+
+        public boolean sameBtn(GuiButton btn) {
+            return btn == this.enable || btn == this.disable;
+        }
+
+        public boolean getVar() {
+            return this.var;
+        }
+
+        public void setVar(boolean var) {
+            this.var = var;
+        }
+
+        public void send() {
+            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns(this.action, !this.getVar()));
+        }
+
+        public void draw() {
+            if (var) {
+                this.enable.visible = true;
+                this.disable.visible = false;
+            } else {
+                this.enable.visible = false;
+                this.disable.visible = true;
+            }
+        }
+    }
+
+    @Override
+    public void initGui() {
+        super.initGui();
+        this.buttonList.clear();
+
+        this.buttonList.add(
+                this.listModeBtn = new FCGuiBaseButton(
+                        0,
+                        this.guiLeft + 86,
+                        this.guiTop + 4,
+                        64,
+                        14,
+                        NameConst.i18n(
+                                this.cont.listMode == WirelessMagnet.ListMode.WhiteList
+                                        ? NameConst.GUI_MAGNET_CARD_WhiteList
+                                        : NameConst.GUI_MAGNET_CARD_BlackList)));
+        this.components[0] = new Component(
+                this.guiLeft + 157,
+                this.guiTop + 18,
+                this.cont.nbt,
+                CPacketFluidPatternTermBtns.Command.MAGNET_FILTER_NBT);
+        this.components[1] = new Component(
+                this.guiLeft + 157,
+                this.guiTop + 31,
+                this.cont.meta,
+                CPacketFluidPatternTermBtns.Command.MAGNET_FILTER_META);
+        this.components[2] = new Component(
+                this.guiLeft + 157,
+                this.guiTop + 44,
+                this.cont.ore,
+                CPacketFluidPatternTermBtns.Command.MAGNET_FILTER_ORE);
+        this.components[3] = new Component(
+                this.guiLeft + 157,
+                this.guiTop + 112,
+                this.cont.oreDict,
+                CPacketFluidPatternTermBtns.Command.MAGNET_FILTER_OREDICT_STATE);
+
+        oreDict.x = this.guiLeft + 7;
+        oreDict.y = this.guiTop + 112;
+        oreDict.setText(this.cont.oreDictFilter);
+
+        this.clearBtn = new GuiImgButton(this.guiLeft + 7, this.guiTop + 48, Settings.ACTIONS, ActionItems.CLOSE);
+        this.clearBtn.setHalfSize(true);
+        this.buttonList.add(this.clearBtn);
+    }
+
+    @Override
+    public void drawScreen(int mouseX, int mouseY, float btn) {
+        handleTooltip(mouseX, mouseY, oreDict);
+        super.drawScreen(mouseX, mouseY, btn);
+    }
+
+    @Override
+    public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
+        this.fontRendererObj
+                .drawString(NameConst.i18n(NameConst.GUI_MAGNET_CARD), 8, 6, FCGuiColors.guiTextColorGray.getColor());
+        this.fontRendererObj.drawString(
+                NameConst.i18n(NameConst.GUI_MAGNET_CARD_NBT),
+                61,
+                22,
+                FCGuiColors.guiTextColorGray.getColor());
+        this.fontRendererObj.drawString(
+                NameConst.i18n(NameConst.GUI_MAGNET_CARD_META),
+                61,
+                34,
+                FCGuiColors.guiTextColorGray.getColor());
+        this.fontRendererObj.drawString(
+                NameConst.i18n(NameConst.GUI_MAGNET_CARD_ORE),
+                61,
+                46,
+                FCGuiColors.guiTextColorGray.getColor());
+        this.components[0].setVar(this.cont.nbt);
+        this.components[1].setVar(this.cont.meta);
+        this.components[2].setVar(this.cont.ore);
+        this.components[3].setVar(this.cont.oreDict);
+        // the synced value arrives after initGui, so re-apply it while the field is not being edited
+        if (!oreDict.isFocused() && this.cont.oreDictFilter != null
+                && !this.cont.oreDictFilter.equals(oreDict.getText())) {
+            oreDict.setText(this.cont.oreDictFilter, true);
+        }
+        for (Component c : components) {
+            c.draw();
+        }
+        this.listModeBtn.displayString = NameConst.i18n(
+                this.cont.listMode == WirelessMagnet.ListMode.WhiteList ? NameConst.GUI_MAGNET_CARD_WhiteList
+                        : NameConst.GUI_MAGNET_CARD_BlackList);
+    }
+
+    @Override
+    public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) {
+        bindTexture(TEX_BG);
+        drawTexturedModalRect(offsetX, offsetY, 0, 0, xSize, ySize);
+        oreDict.drawTextBox();
+    }
+
+    @Override
+    protected void keyTyped(char typedChar, int keyCode) {
+        if (oreDict.isFocused() && (Keyboard.KEY_NUMPADENTER == keyCode || Keyboard.KEY_RETURN == keyCode)) {
+            FluidCraft.proxy.netHandler.sendToServer(
+                    new CPacketFluidPatternTermBtns(
+                            CPacketFluidPatternTermBtns.Command.MAGNET_FILTER_OREDICT_FILTER,
+                            oreDict.getText()));
+        }
+
+        if (!oreDict.textboxKeyTyped(typedChar, keyCode)) super.keyTyped(typedChar, keyCode);
+    }
+
+    @Override
+    protected void mouseClicked(int xCoord, int yCoord, int btn) {
+        oreDict.mouseClicked(xCoord, yCoord, btn);
+        super.mouseClicked(xCoord, yCoord, btn);
+    }
+
+    @Override
+    protected void actionPerformed(GuiButton btn) {
+        for (Component c : components) {
+            if (c.sameBtn(btn)) {
+                c.send();
+                break;
+            }
+        }
+        if (btn == this.listModeBtn) {
+            FluidCraft.proxy.netHandler.sendToServer(
+                    new CPacketFluidPatternTermBtns(
+                            CPacketFluidPatternTermBtns.Command.MAGNET_FILTER_MODE,
+                            this.cont.listMode != WirelessMagnet.ListMode.WhiteList));
+        } else if (btn == this.clearBtn) {
+            FluidCraft.proxy.netHandler.sendToServer(
+                    new CPacketFluidPatternTermBtns(CPacketFluidPatternTermBtns.Command.MAGNET_FILTER_CLEAR, 1));
+        }
+        super.actionPerformed(btn);
+    }
+}

src/main/java/com/glodblock/github/client/gui/GuiOCPatternEditor.java

@@ -1,15 +1,18 @@
 package com.glodblock.github.client.gui;
 
-import appeng.client.gui.AEBaseGui;
-import appeng.core.localization.GuiText;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.ContainerOCPatternEditor;
-import com.glodblock.github.common.tile.TileOCPatternEditor;
-import com.glodblock.github.util.NameConst;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
 
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.gui.container.ContainerOCPatternEditor;
+import com.glodblock.github.common.tile.TileOCPatternEditor;
+import com.glodblock.github.util.FCGuiColors;
+import com.glodblock.github.util.NameConst;
+
+import appeng.client.gui.AEBaseGui;
+import appeng.core.localization.GuiText;
+
 public class GuiOCPatternEditor extends AEBaseGui {
 
     private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/oc_pattern_editor.png");
@@ -27,7 +30,12 @@ public class GuiOCPatternEditor extends AEBaseGui {
 
     @Override
     public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
-        fontRendererObj.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_OC_PATTERN_EDITOR)), 8, 6, 0x404040);
-        fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040);
+        fontRendererObj.drawString(
+                getGuiDisplayName(I18n.format(NameConst.GUI_OC_PATTERN_EDITOR)),
+                8,
+                6,
+                FCGuiColors.guiTextColorGray.getColor());
+        fontRendererObj
+                .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor());
     }
 }

src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java

@@ -1,240 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import appeng.api.AEApi;
-import appeng.api.definitions.IDefinitions;
-import appeng.api.definitions.IParts;
-import appeng.api.storage.ITerminalHost;
-import appeng.client.gui.AEBaseGui;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.container.AEBaseContainer;
-import appeng.core.AEConfig;
-import appeng.core.localization.GuiText;
-import appeng.helpers.Reflected;
-import appeng.util.calculators.ArithHelper;
-import appeng.util.calculators.Calculator;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.ContainerPatternValueAmount;
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.network.CPacketPatternValueSet;
-import com.glodblock.github.network.CPacketSwitchGuis;
-import com.glodblock.github.util.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiTextField;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-public class GuiPatternValueAmount extends AEBaseGui {
-
-    private GuiTextField amountToSet;
-    private GuiTabButton originalGuiBtn;
-
-    private GuiButton set;
-
-    private GuiButton plus1;
-    private GuiButton plus10;
-    private GuiButton plus100;
-    private GuiButton plus1000;
-    private GuiButton minus1;
-    private GuiButton minus10;
-    private GuiButton minus100;
-    private GuiButton minus1000;
-
-    private GuiType originalGui;
-    private final int valueIndex;
-    private final int originalAmount;
-
-    @Reflected
-    public GuiPatternValueAmount(final InventoryPlayer inventoryPlayer, final ITerminalHost te) {
-        super(new ContainerPatternValueAmount(inventoryPlayer, te));
-        GuiContainer gui = (GuiContainer) Minecraft.getMinecraft().currentScreen;
-        if (gui != null && gui.theSlot != null && gui.theSlot.getHasStack()) {
-            Slot slot = gui.theSlot;
-            originalAmount = this.getOriginalAmount(slot.getStack());
-            valueIndex = slot.slotNumber;
-        } else {
-            valueIndex = -1;
-            originalAmount = 0;
-        }
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-
-        final int a = AEConfig.instance.craftItemsByStackAmounts(0);
-        final int b = AEConfig.instance.craftItemsByStackAmounts(1);
-        final int c = AEConfig.instance.craftItemsByStackAmounts(2);
-        final int d = AEConfig.instance.craftItemsByStackAmounts(3);
-
-        this.buttonList.add(this.plus1 = new GuiButton(0, this.guiLeft + 20, this.guiTop + 26, 22, 20, "+" + a));
-        this.buttonList.add(this.plus10 = new GuiButton(0, this.guiLeft + 48, this.guiTop + 26, 28, 20, "+" + b));
-        this.buttonList.add(this.plus100 = new GuiButton(0, this.guiLeft + 82, this.guiTop + 26, 32, 20, "+" + c));
-        this.buttonList.add(this.plus1000 = new GuiButton(0, this.guiLeft + 120, this.guiTop + 26, 38, 20, "+" + d));
-
-        this.buttonList.add(this.minus1 = new GuiButton(0, this.guiLeft + 20, this.guiTop + 75, 22, 20, "-" + a));
-        this.buttonList.add(this.minus10 = new GuiButton(0, this.guiLeft + 48, this.guiTop + 75, 28, 20, "-" + b));
-        this.buttonList.add(this.minus100 = new GuiButton(0, this.guiLeft + 82, this.guiTop + 75, 32, 20, "-" + c));
-        this.buttonList.add(this.minus1000 = new GuiButton(0, this.guiLeft + 120, this.guiTop + 75, 38, 20, "-" + d));
-
-        this.buttonList.add(this.set = new GuiButton(0, this.guiLeft + 128, this.guiTop + 51, 38, 20, GuiText.Next.getLocal()));
-
-
-        ItemStack myIcon = null;
-        final Object target = ((AEBaseContainer) this.inventorySlots).getTarget();
-        final IDefinitions definitions = AEApi.instance().definitions();
-        final IParts parts = definitions.parts();
-
-        if (target instanceof PartFluidPatternTerminal) {
-            myIcon = new ItemStack(ItemAndBlockHolder.FLUID_TERMINAL, 1);
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL;
-        }
-
-        if (target instanceof PartFluidPatternTerminalEx) {
-            myIcon = new ItemStack(ItemAndBlockHolder.FLUID_TERMINAL_EX, 1);
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX;
-        }
-
-        if (this.originalGui != null && myIcon != null) {
-            this.buttonList.add(this.originalGuiBtn = new GuiTabButton(this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), itemRender));
-        }
-
-        this.amountToSet = new GuiTextField(this.fontRendererObj, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRendererObj.FONT_HEIGHT);
-        this.amountToSet.setEnableBackgroundDrawing(false);
-        this.amountToSet.setMaxStringLength(16);
-        this.amountToSet.setTextColor(0xFFFFFF);
-        this.amountToSet.setVisible(true);
-        this.amountToSet.setFocused(true);
-        this.amountToSet.setText(String.valueOf(originalAmount));
-        this.amountToSet.setSelectionPos(0);
-
-    }
-
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        this.fontRendererObj.drawString(GuiText.SelectAmount.getLocal(), 8, 6, 0x404040);
-    }
-
-    @Override
-    public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        this.set.displayString = I18n.format("ae2fc.gui.button.set");
-        this.set.enabled = valueIndex >= 0;
-
-        this.bindTexture("guis/craftAmt.png");
-        this.drawTexturedModalRect(offsetX, offsetY, 0, 0, this.xSize, this.ySize);
-
-        try {
-            String out = this.amountToSet.getText();
-
-            double resultD = Calculator.conversion(out);
-            int resultI;
-
-            if (resultD <= 0 || Double.isNaN(resultD)) {
-                resultI = 0;
-            } else {
-                resultI = (int) ArithHelper.round(resultD, 0);
-            }
-
-            this.set.enabled = resultI > 0;
-        } catch (final NumberFormatException e) {
-            this.set.enabled = false;
-        }
-
-        this.amountToSet.drawTextBox();
-    }
-
-    @Override
-    protected void keyTyped(final char character, final int key) {
-        if (!this.checkHotbarKeys(key)) {
-            if (key == 28) {
-                this.actionPerformed(this.set);
-            }
-            this.amountToSet.textboxKeyTyped(character, key);
-            super.keyTyped(character, key);
-        }
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        super.actionPerformed(btn);
-
-        try {
-
-            if (btn == this.originalGuiBtn) {
-                FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(this.originalGui));
-            }
-
-            if (btn == this.set && btn.enabled) {
-                double resultD = Calculator.conversion(this.amountToSet.getText());
-                int resultI;
-
-                if (resultD <= 0 || Double.isNaN(resultD)) {
-                    resultI = 1;
-                } else {
-                    resultI = (int) ArithHelper.round(resultD, 0);
-                }
-
-                FluidCraft.proxy.netHandler.sendToServer(new CPacketPatternValueSet(originalGui.ordinal(), resultI, valueIndex));
-            }
-        } catch (final NumberFormatException e) {
-            // nope..
-            this.amountToSet.setText("1");
-        }
-
-        final boolean isPlus = btn == this.plus1 || btn == this.plus10 || btn == this.plus100 || btn == this.plus1000;
-        final boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000;
-
-        if (isPlus || isMinus) {
-            this.addQty(this.getQty(btn));
-        }
-    }
-
-    private void addQty(final int i) {
-        try {
-            String out = this.amountToSet.getText();
-
-            double resultD = Calculator.conversion(out);
-            int resultI;
-
-            if (resultD <= 0 || Double.isNaN(resultD)) {
-                resultI = 0;
-            } else {
-                resultI = (int) ArithHelper.round(resultD, 0);
-            }
-
-            if (resultI == 1 && i > 1) {
-                resultI = 0;
-            }
-
-            resultI += i;
-            if (resultI < 1) {
-                resultI = 1;
-            }
-
-            out = Integer.toString(resultI);
-
-            this.amountToSet.setText(out);
-        } catch (final NumberFormatException e) {
-            // :P
-        }
-    }
-
-    private int getOriginalAmount(ItemStack stack) {
-        if (Util.isFluidPacket(stack)) {
-            FluidStack fluidStack = ItemFluidPacket.getFluidStack(stack);
-            return fluidStack.amount;
-        } else {
-            return stack.stackSize;
-        }
-    }
-
-}

src/main/java/com/glodblock/github/client/gui/GuiSuperStockReplenisher.java

@@ -0,0 +1,165 @@
+package com.glodblock.github.client.gui;
+
+import java.text.DecimalFormat;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.gui.container.ContainerSuperStockReplenisher;
+import com.glodblock.github.common.tile.TileSuperStockReplenisher;
+import com.glodblock.github.util.FCGuiColors;
+
+import appeng.api.storage.StorageName;
+import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IAEStackType;
+import appeng.client.gui.AEBaseGui;
+import appeng.client.gui.slots.VirtualMEPhantomSlot;
+import appeng.client.gui.slots.VirtualMEPhantomSlotPrecise;
+import appeng.core.localization.GuiText;
+import appeng.util.item.AEFluidStackType;
+import appeng.util.item.AEItemStackType;
+
+public class GuiSuperStockReplenisher extends AEBaseGui {
+
+    private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/superStockReplenisher.png");
+    private final DecimalFormat df = new DecimalFormat("#.#");
+    private Map<Integer, IAEStack<?>> list = new HashMap<>();
+    private final ContainerSuperStockReplenisher containerSuperStockReplenisher;
+    private final TileSuperStockReplenisher tileSuperStockReplenisher;
+
+    private final VirtualMEPhantomSlotPrecise[] configFluidsSlots = new VirtualMEPhantomSlotPrecise[9];
+    private final VirtualMEPhantomSlotPrecise[] configItemsSlots = new VirtualMEPhantomSlotPrecise[63];
+
+    private GuiFCImgButton StockModeButton;
+
+    public GuiSuperStockReplenisher(InventoryPlayer ipl, TileSuperStockReplenisher tile) {
+        super(new ContainerSuperStockReplenisher(ipl, tile));
+
+        this.containerSuperStockReplenisher = (ContainerSuperStockReplenisher) inventorySlots;
+        this.tileSuperStockReplenisher = tile;
+
+        this.ySize = 251;
+        this.xSize = 216;
+    }
+
+    @Override
+    public void initGui() {
+        super.initGui();
+
+        this.StockModeButton = new GuiFCImgButton(
+                guiLeft - 18,
+                guiTop + 8,
+                "stock mode button",
+                this.containerSuperStockReplenisher.isFullStockMode() ? "fullstockMode" : "normalMode",
+                true);
+        this.containerSuperStockReplenisher.setModeButton(this.StockModeButton);
+        buttonList.add(this.StockModeButton);
+        this.initSlots();
+    }
+
+    private void initSlots() {
+
+        final int xo = 8;
+        final int yo = 8;
+
+        for (int i = 0; i < 9; i++) {
+            VirtualMEPhantomSlotPrecise slot = new VirtualMEPhantomSlotPrecise(
+                    xo + i * 18,
+                    yo,
+                    this.containerSuperStockReplenisher.configFluidsSlots,
+                    i,
+                    this::acceptType);
+            this.configFluidsSlots[i] = slot;
+            this.registerVirtualSlots(slot);
+        }
+
+        final int iyo = 29;
+        for (int y = 0; y < 7; y++) {
+            for (int ix = 0; ix < 9; ix++) {
+                VirtualMEPhantomSlotPrecise slot = new VirtualMEPhantomSlotPrecise(
+                        xo + ix * 18,
+                        iyo + y * 18,
+                        this.containerSuperStockReplenisher.configItemsSlots,
+                        y * 9 + ix,
+                        this::acceptType);
+                this.configItemsSlots[y * 9 + ix] = slot;
+                this.registerVirtualSlots(slot);
+            }
+        }
+    }
+
+    private void drawFillStatus(VirtualMEPhantomSlotPrecise virtualSlot) {
+        final int offsetX = virtualSlot.getX() - 8;
+        final int offsetY = virtualSlot.getY() - 12;
+        final IAEStack<?> aes = virtualSlot.getAEStack();
+        final long stackSize = aes != null ? aes.getStackSize() : 0;
+        final int slotIndex = virtualSlot.getStorageName() == StorageName.NONE ? virtualSlot.getSlotIndex()
+                : virtualSlot.getSlotIndex() + 100;
+
+        if (stackSize != 0) {
+            String s = "0%";
+            IAEStack<?> aeStack = list.get(slotIndex);
+
+            if (aeStack != null) s = df.format((float) aeStack.getStackSize() / stackSize * 100) + "%";
+
+            float scale = 0.5f;
+            float shiftX = 2;
+            float shiftY = 1;
+            final float inverseScaleFactor = 1.0f / scale;
+
+            final int X = (int) (((float) offsetX - shiftX + 10.0f) * inverseScaleFactor) + 1;
+            final int Y = (int) (((float) offsetY - shiftY + 16.0f - 7.0f * scale) * inverseScaleFactor) + 2;
+            GL11.glTranslatef(0.0f, 0.0f, 200.0f);
+            GL11.glScaled(scale, scale, scale);
+            this.fontRendererObj.drawStringWithShadow(s, X, Y, 16777215);
+            GL11.glScaled(inverseScaleFactor, inverseScaleFactor, inverseScaleFactor);
+            GL11.glTranslatef(0.0f, 0.0f, -200.0f);
+        }
+    }
+
+    private void drawVirtualSlots() {
+        for (VirtualMEPhantomSlotPrecise slot : this.configFluidsSlots) this.drawFillStatus(slot);
+        for (VirtualMEPhantomSlotPrecise slot : this.configItemsSlots) this.drawFillStatus(slot);
+    }
+
+    @Override
+    public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
+        fontRendererObj
+                .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor());
+        this.drawVirtualSlots();
+    }
+
+    @Override
+    public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) {
+        this.bindTexture(TEX_BG);
+        this.drawTexturedModalRect(offsetX, offsetY, 0, 0, xSize, ySize);
+    }
+
+    @Override
+    protected void actionPerformed(final GuiButton btn) {
+        if (actionPerformedCustomButtons(btn)) return;
+        if (btn == StockModeButton) {
+            boolean newMode = !containerSuperStockReplenisher.isFullStockMode();
+            this.containerSuperStockReplenisher.setFullStockMode(newMode);
+            StockModeButton.set(newMode ? "fullstockMode" : "normalMode");
+
+            this.flushPendingSync();
+        }
+        super.actionPerformed(btn);
+    }
+
+    public void update(Map<Integer, IAEStack<?>> map) {
+        this.list = map;
+    }
+
+    private boolean acceptType(VirtualMEPhantomSlot slot, IAEStackType<?> type, int mouseButton) {
+        if (slot.getStorageName() == StorageName.NONE) return type == AEFluidStackType.FLUID_STACK_TYPE;
+        else return type == AEItemStackType.ITEM_STACK_TYPE;
+    }
+}

src/main/java/com/glodblock/github/client/gui/ITankDump.java

@@ -1,9 +1,8 @@
 package com.glodblock.github.client.gui;
 
-public interface TankDumpable {
+public interface ITankDump {
 
     boolean canDumpTank(int index);
 
     void dumpTank(int index);
-
 }

src/main/java/com/glodblock/github/client/gui/base/FCBaseMEGui.java

@@ -0,0 +1,40 @@
+package com.glodblock.github.client.gui.base;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+
+import appeng.client.gui.AEBaseGui;
+
+public abstract class FCBaseMEGui extends AEBaseGui {
+
+    public FCBaseMEGui(final InventoryPlayer inventoryPlayer, Container container) {
+        super(container);
+    }
+
+    @Override
+    public void onGuiClosed() {
+        super.onGuiClosed();
+    }
+
+    private boolean scheduleGuiResize;
+
+    @Override
+    protected void mouseClicked(int xCoord, int yCoord, int btn) {
+        super.mouseClicked(xCoord, yCoord, btn);
+        if (scheduleGuiResize) {
+            // in the GuiScreen class, the implementation of super.mouseClicked
+            // ends up looping on the button list and execute the action for any
+            // button below the mouse.
+            // Therefore, if we initGui() the terminal in the actionPerformed method below
+            // it will run the actionPerformed a second time for the new button
+            // that will end up being below the mouse (if any) after the initGui()
+            buttonList.clear();
+            initGui();
+            scheduleGuiResize = false;
+        }
+    }
+
+    protected final void scheduleGuiResize() {
+        scheduleGuiResize = true;
+    }
+}

src/main/java/com/glodblock/github/client/gui/container/ContainerFluidAutoFiller.java

@@ -0,0 +1,64 @@
+package com.glodblock.github.client.gui.container;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+
+import org.apache.commons.lang3.tuple.MutablePair;
+
+import com.glodblock.github.common.tile.TileFluidAutoFiller;
+import com.glodblock.github.util.Util;
+
+import appeng.container.AEBaseContainer;
+import appeng.container.slot.SlotFake;
+
+public class ContainerFluidAutoFiller extends AEBaseContainer {
+
+    public static class FakeSlot extends SlotFake {
+
+        public FakeSlot(IInventory inv, int idx, int x, int y) {
+            super(inv, idx, x, y);
+        }
+
+        @Override
+        public void putStack(ItemStack is) {
+            MutablePair<Boolean, ItemStack> result = ContainerFluidAutoFiller.isItemValid(is);
+            if (result.left) {
+                if (super.getHasStack()) super.clearStack();
+                hasChange = true;
+                super.putStack(result.right);
+            }
+        }
+    }
+
+    private final TileFluidAutoFiller tile;
+    private static boolean hasChange;
+
+    public ContainerFluidAutoFiller(InventoryPlayer ipl, TileFluidAutoFiller tile) {
+        super(ipl, tile);
+        this.tile = tile;
+        addSlotToContainer(new FakeSlot(tile.getInventory(), 0, 80, 35));
+        bindPlayerInventory(ipl, 0, 84);
+    }
+
+    public static MutablePair<Boolean, ItemStack> isItemValid(ItemStack itemStack) {
+        boolean result = Util.FluidUtil.isFluidContainer(itemStack);
+        if (!result) return new MutablePair<>(false, null);
+        ItemStack tank = itemStack.copy();
+        tank.stackSize = 1;
+        if (Util.FluidUtil.isFilled(tank)) {
+            return new MutablePair<>(true, Util.FluidUtil.clearFluid(tank));
+        } else {
+            return new MutablePair<>(true, tank);
+        }
+    }
+
+    @Override
+    public void detectAndSendChanges() {
+        super.detectAndSendChanges();
+        if (hasChange) {
+            tile.updatePattern();
+            hasChange = false;
+        }
+    }
+}

src/main/java/com/glodblock/github/client/gui/container/ContainerFluidConfigurable.java

@@ -1,146 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import appeng.api.config.Upgrades;
-import appeng.api.implementations.IUpgradeableHost;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.container.implementations.ContainerUpgradeable;
-import appeng.container.slot.AppEngSlot;
-import appeng.tile.inventory.AppEngInternalAEInventory;
-import appeng.util.Platform;
-import appeng.util.item.AEFluidStack;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.inventory.slot.OptionalFluidSlotFakeTypeOnly;
-import com.glodblock.github.network.SPacketFluidUpdate;
-import com.glodblock.github.util.Ae2Reflect;
-import com.glodblock.github.util.Util;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public abstract class ContainerFluidConfigurable extends ContainerUpgradeable {
-
-    public ContainerFluidConfigurable(InventoryPlayer ip, IUpgradeableHost te)
-    {
-        super( ip, te );
-    }
-
-    public abstract AppEngInternalAEInventory getFakeFluidInv();
-
-    @Override
-    public ItemStack transferStackInSlot(final EntityPlayer p, final int idx )
-    {
-        AppEngSlot clickSlot = (AppEngSlot)this.inventorySlots.get(idx);
-        if (clickSlot == null || !clickSlot.getHasStack()) return null;
-
-        ItemStack tis = clickSlot.getStack();
-        FluidStack fs = Util.getFluidFromItem(tis);
-        if( fs != null )
-        {
-            final AppEngInternalAEInventory inv = this.getFakeFluidInv();
-            final IAEFluidStack stack = AEFluidStack.create( fs );
-            for( int i = 0; i < inv.getSizeInventory(); ++i )
-            {
-                if( inv.getStackInSlot(i) == null && this.isValidForConfig( i, stack ) )
-                {
-                    ItemStack tmp = ItemFluidPacket.newStack(fs);
-                    if (tmp != null) {
-                        tmp.setStackDisplayName(fs.getLocalizedName());
-                    }
-                    inv.setInventorySlotContents( i, tmp );
-                    break;
-                }
-            }
-            this.standardDetectAndSendChanges();
-            return null;
-        } else {
-            if(idx < this.availableUpgrades()){
-                if(!mergeItemStack(tis, this.getFakeFluidInv().getSizeInventory()+this.availableUpgrades(), this.inventorySlots.size(), false)) return null;
-            }else if(idx>=this.getFakeFluidInv().getSizeInventory()+this.availableUpgrades()){
-                if(!mergeItemStack(tis, 0, this.availableUpgrades(), false)) return null;
-            }
-            if (tis.stackSize == 0) {
-                clickSlot.putStack(null);
-            } else {
-                clickSlot.onSlotChanged();
-            }
-            this.standardDetectAndSendChanges();
-            return tis;
-        }
-    }
-
-    protected void setupConfig()
-    {
-        this.setupUpgrades();
-
-        final IInventory inv = Ae2Reflect.getUpgradeList(this).getInventoryByName( "config" );
-        final int y = 40;
-        final int x = 80;
-        this.addSlotToContainer( new OptionalFluidSlotFakeTypeOnly( inv, null, this, 0, x, y, 0, 0, 0 ) );
-        if( this.supportCapacity() )
-        {
-            this.addSlotToContainer( new OptionalFluidSlotFakeTypeOnly( inv, null, this, 1, x, y, -1, 0, 1 ) );
-            this.addSlotToContainer( new OptionalFluidSlotFakeTypeOnly( inv, null, this, 2, x, y, 1, 0, 1 ) );
-            this.addSlotToContainer( new OptionalFluidSlotFakeTypeOnly( inv, null, this, 3, x, y, 0, -1, 1 ) );
-            this.addSlotToContainer( new OptionalFluidSlotFakeTypeOnly( inv, null, this, 4, x, y, 0, 1, 1 ) );
-
-            this.addSlotToContainer( new OptionalFluidSlotFakeTypeOnly( inv, null, this, 5, x, y, -1, -1, 2 ) );
-            this.addSlotToContainer( new OptionalFluidSlotFakeTypeOnly( inv, null, this, 6, x, y, 1, -1, 2 ) );
-            this.addSlotToContainer( new OptionalFluidSlotFakeTypeOnly( inv, null, this, 7, x, y, -1, 1, 2 ) );
-            this.addSlotToContainer( new OptionalFluidSlotFakeTypeOnly( inv, null, this, 8, x, y, 1, 1, 2 ) );
-        }
-    }
-
-    protected boolean isValidForConfig( int slot, IAEFluidStack fs )
-    {
-        if( this.supportCapacity() )
-        {
-            // assumes 4 slots per upgrade
-            final int upgrades = Ae2Reflect.getUpgradeList(this).getInstalledUpgrades( Upgrades.CAPACITY );
-
-            if( slot > 0 && upgrades < 1 )
-            {
-                return false;
-            }
-            return slot <= 4 || upgrades >= 2;
-        }
-
-        return true;
-    }
-
-    @Override
-    protected void standardDetectAndSendChanges()
-    {
-        if( Platform.isServer() )
-        {
-            // clear out config items that are no longer valid (eg capacity upgrade removed)
-            final AppEngInternalAEInventory inv = this.getFakeFluidInv();
-            final Map<Integer, IAEFluidStack> tmp = new HashMap<>();
-            for( int i = 0; i < inv.getSizeInventory(); ++i )
-            {
-                if( inv.getStackInSlot( i ) != null && !this.isValidForConfig( i, AEFluidStack.create(ItemFluidPacket.getFluidStack(inv.getStackInSlot( i )))) )
-                {
-                    inv.setInventorySlotContents( i, null );
-                }
-                tmp.put(i, AEFluidStack.create(ItemFluidPacket.getFluidStack(inv.getStackInSlot( i ))));
-            }
-            for( final Object g : this.crafters )
-            {
-                if( g instanceof EntityPlayer)
-                {
-                    FluidCraft.proxy.netHandler.sendTo(new SPacketFluidUpdate(tmp), (EntityPlayerMP) g);
-                }
-            }
-        }
-        super.standardDetectAndSendChanges();
-    }
-
-}

src/main/java/com/glodblock/github/client/gui/container/ContainerFluidCraftConfirm.java

@@ -1,444 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import appeng.api.AEApi;
-import appeng.api.config.Actionable;
-import appeng.api.config.SecurityPermissions;
-import appeng.api.networking.IGrid;
-import appeng.api.networking.crafting.ICraftingCPU;
-import appeng.api.networking.crafting.ICraftingGrid;
-import appeng.api.networking.crafting.ICraftingJob;
-import appeng.api.networking.crafting.ICraftingLink;
-import appeng.api.networking.security.BaseActionSource;
-import appeng.api.networking.security.IActionHost;
-import appeng.api.networking.security.PlayerSource;
-import appeng.api.networking.storage.IStorageGrid;
-import appeng.api.storage.IMEInventory;
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.storage.data.IItemList;
-import appeng.container.AEBaseContainer;
-import appeng.container.guisync.GuiSync;
-import appeng.container.implementations.CraftingCPURecord;
-import appeng.core.AELog;
-import appeng.util.Platform;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.network.SPacketMEInventoryUpdate;
-import com.glodblock.github.util.Ae2Reflect;
-import com.glodblock.github.util.BlockPos;
-import com.glodblock.github.util.Util;
-import com.google.common.collect.ImmutableSet;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.ICrafting;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.world.World;
-
-import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Objects;
-import java.util.concurrent.Future;
-
-public class ContainerFluidCraftConfirm extends AEBaseContainer {
-
-    private final ArrayList<CraftingCPURecord> cpus = new ArrayList<CraftingCPURecord>();
-    private Future<ICraftingJob> job;
-    private ICraftingJob result;
-    @GuiSync( 0 )
-    public long bytesUsed;
-    @GuiSync( 1 )
-    public long cpuBytesAvail;
-    @GuiSync( 2 )
-    public int cpuCoProcessors;
-    @GuiSync( 3 )
-    public boolean autoStart = false;
-    @GuiSync( 4 )
-    public boolean simulation = true;
-    @GuiSync( 5 )
-    public int selectedCpu = -1;
-    @GuiSync( 6 )
-    public boolean noCPU = true;
-    @GuiSync( 7 )
-    public String myName = "";
-
-    public ContainerFluidCraftConfirm(final InventoryPlayer ip, final ITerminalHost te )
-    {
-        super( ip, te );
-    }
-
-    public void cycleCpu( final boolean next )
-    {
-        if( next )
-        {
-            this.setSelectedCpu( this.getSelectedCpu() + 1 );
-        }
-        else
-        {
-            this.setSelectedCpu( this.getSelectedCpu() - 1 );
-        }
-
-        if( this.getSelectedCpu() < -1 )
-        {
-            this.setSelectedCpu( this.cpus.size() - 1 );
-        }
-        else if( this.getSelectedCpu() >= this.cpus.size() )
-        {
-            this.setSelectedCpu( -1 );
-        }
-
-        if( this.getSelectedCpu() == -1 )
-        {
-            this.setCpuAvailableBytes( 0 );
-            this.setCpuCoProcessors( 0 );
-            this.setName( "" );
-        }
-        else
-        {
-            this.setName(Ae2Reflect.getName(this.cpus.get(this.getSelectedCpu())));
-            this.setCpuAvailableBytes(Ae2Reflect.getSize(this.cpus.get(this.getSelectedCpu())));
-            this.setCpuCoProcessors(Ae2Reflect.getProcessors(this.cpus.get(this.getSelectedCpu())));
-        }
-    }
-
-    @Override
-    public void detectAndSendChanges()
-    {
-        if( Platform.isClient() )
-        {
-            return;
-        }
-        if (getGrid() == null)
-            return;
-
-        final ICraftingGrid cc = this.getGrid().getCache( ICraftingGrid.class );
-        final ImmutableSet<ICraftingCPU> cpuSet = cc.getCpus();
-
-        int matches = 0;
-        boolean changed = false;
-        for( final ICraftingCPU c : cpuSet )
-        {
-            boolean found = false;
-            for( final CraftingCPURecord ccr : this.cpus )
-            {
-                if( Ae2Reflect.getCPU(ccr) == c )
-                {
-                    found = true;
-                }
-            }
-
-            final boolean matched = this.cpuMatches( c );
-
-            if( matched )
-            {
-                matches++;
-            }
-
-            if( found == !matched )
-            {
-                changed = true;
-            }
-        }
-
-        if( changed || this.cpus.size() != matches )
-        {
-            this.cpus.clear();
-            for( final ICraftingCPU c : cpuSet )
-            {
-                if( this.cpuMatches( c ) )
-                {
-                    this.cpus.add( new CraftingCPURecord( c.getAvailableStorage(), c.getCoProcessors(), c ) );
-                }
-            }
-
-            this.sendCPUs();
-        }
-
-        this.setNoCPU( this.cpus.isEmpty() );
-
-        super.detectAndSendChanges();
-
-        if( this.getJob() != null && this.getJob().isDone() )
-        {
-            try
-            {
-                this.result = this.getJob().get();
-
-                if( !this.result.isSimulation() )
-                {
-                    this.setSimulation( false );
-                    if( this.isAutoStart() )
-                    {
-                        this.startJob();
-                        return;
-                    }
-                }
-                else
-                {
-                    this.setSimulation( true );
-                }
-
-                final SPacketMEInventoryUpdate a = new SPacketMEInventoryUpdate( (byte) 0 );
-                final SPacketMEInventoryUpdate b = new SPacketMEInventoryUpdate( (byte) 1 );
-                final SPacketMEInventoryUpdate c = this.result.isSimulation() ? new SPacketMEInventoryUpdate( (byte) 2 ) : null;
-
-                final IItemList<IAEItemStack> plan = AEApi.instance().storage().createItemList();
-                this.result.populatePlan( plan );
-
-                this.setUsedBytes( this.result.getByteTotal() );
-
-                for( final IAEItemStack out : plan )
-                {
-
-                    IAEItemStack o = out.copy();
-                    o.reset();
-                    o.setStackSize( out.getStackSize() );
-
-                    final IAEItemStack p = out.copy();
-                    p.reset();
-                    p.setStackSize( out.getCountRequestable() );
-
-                    final IStorageGrid sg = this.getGrid().getCache( IStorageGrid.class );
-                    final IMEInventory<IAEItemStack> items = sg.getItemInventory();
-
-                    IAEItemStack m = null;
-                    if( c != null && this.result.isSimulation() )
-                    {
-                        m = o.copy();
-                        o = items.extractItems( o, Actionable.SIMULATE, this.getActionSource() );
-
-                        if( o == null )
-                        {
-                            o = m.copy();
-                            o.setStackSize( 0 );
-                        }
-
-                        m.setStackSize( m.getStackSize() - o.getStackSize() );
-                    }
-
-                    if( o.getStackSize() > 0 )
-                    {
-                        a.appendItem( o );
-                    }
-
-                    if( p.getStackSize() > 0 )
-                    {
-                        b.appendItem( p );
-                    }
-
-                    if( c != null && m != null && m.getStackSize() > 0 )
-                    {
-                        c.appendItem( m );
-                    }
-                }
-
-                for( final Object g : this.crafters )
-                {
-                    if( g instanceof EntityPlayer)
-                    {
-                        FluidCraft.proxy.netHandler.sendTo( a, (EntityPlayerMP) g );
-                        FluidCraft.proxy.netHandler.sendTo( b, (EntityPlayerMP) g );
-                        if( c != null )
-                        {
-                            FluidCraft.proxy.netHandler.sendTo( c, (EntityPlayerMP) g );
-                        }
-                    }
-                }
-            }
-            catch( final Throwable e )
-            {
-                this.getPlayerInv().player.addChatMessage( new ChatComponentText( "Error: " + e.toString() ) );
-                AELog.debug( e );
-                this.setValidContainer( false );
-                this.result = null;
-            }
-
-            this.setJob( null );
-        }
-        this.verifyPermissions( SecurityPermissions.CRAFT, false );
-    }
-
-    private IGrid getGrid()
-    {
-        final IActionHost h = ( (IActionHost) this.getTarget() );
-        if (h == null || h.getActionableNode() == null)
-            return null;
-        return h.getActionableNode().getGrid();
-    }
-
-    private boolean cpuMatches( final ICraftingCPU c )
-    {
-        return c.getAvailableStorage() >= this.getUsedBytes() && !c.isBusy();
-    }
-
-    private void sendCPUs()
-    {
-        Collections.sort( this.cpus );
-
-        if( this.getSelectedCpu() >= this.cpus.size() )
-        {
-            this.setSelectedCpu( -1 );
-            this.setCpuAvailableBytes( 0 );
-            this.setCpuCoProcessors( 0 );
-            this.setName( "" );
-        }
-        else if( this.getSelectedCpu() != -1 )
-        {
-            this.setName(Ae2Reflect.getName(this.cpus.get(this.getSelectedCpu())));
-            this.setCpuAvailableBytes(Ae2Reflect.getSize(this.cpus.get(this.getSelectedCpu())));
-            this.setCpuCoProcessors(Ae2Reflect.getProcessors(this.cpus.get(this.getSelectedCpu())));
-        }
-    }
-
-    public void startJob()
-    {
-        GuiType originalGui = null;
-
-        final IActionHost ah = this.getActionHost();
-        if( ah instanceof PartFluidPatternTerminal)
-        {
-            originalGui = GuiType.FLUID_PATTERN_TERMINAL;
-        }
-        if( ah instanceof PartFluidPatternTerminalEx)
-        {
-            originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX;
-        }
-
-        if( this.result != null && !this.isSimulation() && getGrid() != null)
-        {
-            final ICraftingGrid cc = this.getGrid().getCache( ICraftingGrid.class );
-            final ICraftingLink g = cc.submitJob( this.result, null, this.getSelectedCpu() == -1 ? null : Ae2Reflect.getCPU(this.cpus.get(this.getSelectedCpu())), true, this.getActionSrc() );
-            this.setAutoStart( false );
-            if( g != null && originalGui != null && this.getOpenContext() != null )
-            {
-                InventoryHandler.openGui(this.getInventoryPlayer().player, getWorld(), new BlockPos(this.getOpenContext().getTile()), Objects.requireNonNull(Util.from(this.getOpenContext().getSide())), originalGui);
-            }
-        }
-    }
-
-    private BaseActionSource getActionSrc()
-    {
-        return new PlayerSource( this.getPlayerInv().player, (IActionHost) this.getTarget() );
-    }
-
-    @Override
-    public void removeCraftingFromCrafters( final ICrafting c )
-    {
-        super.removeCraftingFromCrafters( c );
-        if( this.getJob() != null )
-        {
-            this.getJob().cancel( true );
-            this.setJob( null );
-        }
-    }
-
-    @Override
-    public void onContainerClosed( final EntityPlayer par1EntityPlayer )
-    {
-        super.onContainerClosed( par1EntityPlayer );
-        if( this.getJob() != null )
-        {
-            this.getJob().cancel( true );
-            this.setJob( null );
-        }
-    }
-
-    public World getWorld()
-    {
-        return this.getPlayerInv().player.worldObj;
-    }
-
-    public boolean isAutoStart()
-    {
-        return this.autoStart;
-    }
-
-    public void setAutoStart( final boolean autoStart )
-    {
-        this.autoStart = autoStart;
-    }
-
-    public long getUsedBytes()
-    {
-        return this.bytesUsed;
-    }
-
-    private void setUsedBytes( final long bytesUsed )
-    {
-        this.bytesUsed = bytesUsed;
-    }
-
-    public long getCpuAvailableBytes()
-    {
-        return this.cpuBytesAvail;
-    }
-
-    private void setCpuAvailableBytes( final long cpuBytesAvail )
-    {
-        this.cpuBytesAvail = cpuBytesAvail;
-    }
-
-    public int getCpuCoProcessors()
-    {
-        return this.cpuCoProcessors;
-    }
-
-    private void setCpuCoProcessors( final int cpuCoProcessors )
-    {
-        this.cpuCoProcessors = cpuCoProcessors;
-    }
-
-    public int getSelectedCpu()
-    {
-        return this.selectedCpu;
-    }
-
-    private void setSelectedCpu( final int selectedCpu )
-    {
-        this.selectedCpu = selectedCpu;
-    }
-
-    public String getName()
-    {
-        return this.myName;
-    }
-
-    private void setName( @Nonnull final String myName )
-    {
-        this.myName = myName;
-    }
-
-    public boolean hasNoCPU()
-    {
-        return this.noCPU;
-    }
-
-    private void setNoCPU( final boolean noCPU )
-    {
-        this.noCPU = noCPU;
-    }
-
-    public boolean isSimulation()
-    {
-        return this.simulation;
-    }
-
-    private void setSimulation( final boolean simulation )
-    {
-        this.simulation = simulation;
-    }
-
-    private Future<ICraftingJob> getJob()
-    {
-        return this.job;
-    }
-
-    public void setJob( final Future<ICraftingJob> job )
-    {
-        this.job = job;
-    }
-}

src/main/java/com/glodblock/github/client/gui/container/ContainerFluidIO.java

@@ -1,38 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import appeng.api.config.Settings;
-import appeng.api.config.YesNo;
-import appeng.api.util.IConfigManager;
-import appeng.tile.inventory.AppEngInternalAEInventory;
-import com.glodblock.github.common.parts.PartFluidExportBus;
-import com.glodblock.github.common.parts.PartSharedFluidBus;
-import com.glodblock.github.util.Ae2Reflect;
-import net.minecraft.entity.player.InventoryPlayer;
-
-public class ContainerFluidIO extends ContainerFluidConfigurable
-{
-    private final PartSharedFluidBus bus;
-
-    public ContainerFluidIO(InventoryPlayer ip, PartSharedFluidBus te )
-    {
-        super( ip, te );
-        this.bus = te;
-    }
-
-    public PartSharedFluidBus getBus() {
-        return this.bus;
-    }
-
-    @Override
-    public AppEngInternalAEInventory getFakeFluidInv() {
-        return (AppEngInternalAEInventory) this.bus.getInventoryByName("config");
-    }
-
-    @Override
-    protected void loadSettingsFromHost(IConfigManager cm) {
-        super.loadSettingsFromHost(cm);
-        if (Ae2Reflect.getUpgradeableHost(this) instanceof PartFluidExportBus) {
-            this.setCraftingMode((YesNo)cm.getSetting(Settings.CRAFT_ONLY));
-        }
-    }
-}

src/main/java/com/glodblock/github/client/gui/container/ContainerFluidInterface.java

@@ -1,52 +1,42 @@
 package com.glodblock.github.client.gui.container;
 
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.container.AEBaseContainer;
-import appeng.container.slot.IOptionalSlotHost;
-import appeng.util.item.AEFluidStack;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.common.parts.PartFluidInterface;
-import com.glodblock.github.common.tile.TileFluidInterface;
-import com.glodblock.github.inventory.slot.OptionalFluidSlotFakeTypeOnly;
-import com.glodblock.github.network.SPacketFluidUpdate;
+import java.util.HashMap;
+import java.util.Map;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
 
-import java.util.HashMap;
-import java.util.Map;
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.common.item.ItemFluidPacket;
+import com.glodblock.github.inventory.IDualHost;
+import com.glodblock.github.inventory.slot.OptionalFluidSlotFakeTypeOnly;
+import com.glodblock.github.network.SPacketFluidUpdate;
 
-public class ContainerFluidInterface extends AEBaseContainer implements IOptionalSlotHost {
+import appeng.api.storage.data.IAEFluidStack;
+import appeng.container.ContainerSubGui;
+import appeng.container.slot.IOptionalSlotHost;
+import appeng.util.item.AEFluidStack;
 
-    private final Object tile;
+public class ContainerFluidInterface extends ContainerSubGui implements IOptionalSlotHost {
 
-    public ContainerFluidInterface(InventoryPlayer ipl, TileFluidInterface tile) {
+    private final IDualHost tile;
+
+    public ContainerFluidInterface(InventoryPlayer ipl, IDualHost tile) {
         super(ipl, tile);
         this.tile = tile;
         IInventory inv = tile.getConfig();
         final int y = 35;
         final int x = 35;
         for (int i = 0; i < 6; i++) {
-            addSlotToContainer(new OptionalFluidSlotFakeTypeOnly(inv, tile.getDualityFluid().getConfig(), this, i, x, y, i, 0, 0));
+            addSlotToContainer(
+                    new OptionalFluidSlotFakeTypeOnly(inv, tile.getDualityFluid().getConfig(), this, i, x, y, i, 0, 0));
         }
         bindPlayerInventory(ipl, 0, 149);
     }
 
-    public ContainerFluidInterface(InventoryPlayer ipl, PartFluidInterface tile) {
-        super(ipl, tile);
-        this.tile = tile;
-        IInventory inv = tile.getConfig();
-        final int y = 35;
-        final int x = 35;
-        for (int i = 0; i < 6; i++) {
-            addSlotToContainer(new OptionalFluidSlotFakeTypeOnly(inv, tile.getDualityFluid().getConfig(), this, i, x, y, i, 0, 0));
-        }
-        bindPlayerInventory(ipl, 0, 149);
-    }
-
-    public Object getTile() {
+    public IDualHost getTile() {
         return tile;
     }
 
@@ -59,30 +49,16 @@ public class ContainerFluidInterface extends AEBaseContainer implements IOptiona
     public void detectAndSendChanges() {
         super.detectAndSendChanges();
         Map<Integer, IAEFluidStack> tmp = new HashMap<>();
-        if (tile instanceof TileFluidInterface) {
-            for (int i = 0; i < ((TileFluidInterface) tile).getInternalFluid().getSlots(); i ++) {
-                tmp.put(i, ((TileFluidInterface) tile).getInternalFluid().getFluidInSlot(i));
-            }
-            for (int i = 0; i < ((TileFluidInterface) tile).getConfig().getSizeInventory(); i ++) {
-                tmp.put(i + 100, AEFluidStack.create(ItemFluidPacket.getFluidStack(((TileFluidInterface) tile).getConfig().getStackInSlot( i ))));
-            }
+        for (int i = 0; i < tile.getInternalFluid().getSlots(); i++) {
+            tmp.put(i, tile.getInternalFluid().getFluidInSlot(i));
         }
-        else {
-            for (int i = 0; i < ((PartFluidInterface) tile).getInternalFluid().getSlots(); i ++) {
-                tmp.put(i, ((PartFluidInterface) tile).getInternalFluid().getFluidInSlot(i));
-            }
-            for (int i = 0; i < ((PartFluidInterface) tile).getConfig().getSizeInventory(); i ++) {
-                tmp.put(i + 100, AEFluidStack.create(ItemFluidPacket.getFluidStack(((PartFluidInterface) tile).getConfig().getStackInSlot( i ))));
-            }
+        for (int i = 0; i < tile.getConfig().getSizeInventory(); i++) {
+            tmp.put(i + 100, AEFluidStack.create(ItemFluidPacket.getFluidStack(tile.getConfig().getStackInSlot(i))));
         }
-
-        for( final Object g : this.crafters )
-        {
-            if( g instanceof EntityPlayer)
-            {
+        for (final Object g : this.crafters) {
+            if (g instanceof EntityPlayer) {
                 FluidCraft.proxy.netHandler.sendTo(new SPacketFluidUpdate(tmp), (EntityPlayerMP) g);
             }
         }
     }
-
 }

src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPacketDecoder.java

@@ -1,16 +1,29 @@
 package com.glodblock.github.client.gui.container;
 
-import appeng.container.AEBaseContainer;
-import appeng.container.slot.SlotNormal;
-import com.glodblock.github.common.tile.TileFluidPacketDecoder;
+import static com.glodblock.github.loader.ItemAndBlockHolder.DROP;
+import static com.glodblock.github.loader.ItemAndBlockHolder.PACKET;
+
+import java.util.Arrays;
+
 import net.minecraft.entity.player.InventoryPlayer;
 
+import com.glodblock.github.common.tile.TileFluidPacketDecoder;
+import com.glodblock.github.inventory.slot.FCSlotRestrictedInput;
+
+import appeng.container.AEBaseContainer;
+
 public class ContainerFluidPacketDecoder extends AEBaseContainer {
 
     public ContainerFluidPacketDecoder(InventoryPlayer ipl, TileFluidPacketDecoder tile) {
         super(ipl, tile);
-        addSlotToContainer(new SlotNormal(tile.getInventory(), 0, 80, 35));
+        addSlotToContainer(
+                new FCSlotRestrictedInput(
+                        Arrays.asList(PACKET.stack(), DROP.stack()),
+                        tile.getInventory(),
+                        0,
+                        80,
+                        35,
+                        ipl));
         bindPlayerInventory(ipl, 0, 84);
     }
-
 }

src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternEncoder.java

@@ -1,37 +1,33 @@
 package com.glodblock.github.client.gui.container;
 
-import appeng.api.AEApi;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.container.AEBaseContainer;
-import appeng.container.slot.SlotFake;
-import appeng.container.slot.SlotRestrictedInput;
-import appeng.helpers.InventoryAction;
-import appeng.util.item.AEItemStack;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
 import com.glodblock.github.common.item.ItemFluidDrop;
 import com.glodblock.github.common.item.ItemFluidEncodedPattern;
 import com.glodblock.github.common.item.ItemFluidPacket;
 import com.glodblock.github.common.tile.TileFluidPatternEncoder;
 import com.glodblock.github.inventory.AeItemStackHandler;
 import com.glodblock.github.inventory.AeStackInventory;
-import com.glodblock.github.inventory.PatternConsumer;
-import com.glodblock.github.inventory.slot.SlotFluid;
+import com.glodblock.github.inventory.IPatternConsumer;
+import com.glodblock.github.inventory.slot.SlotFluidConvertingFake;
 import com.glodblock.github.loader.ItemAndBlockHolder;
 import com.glodblock.github.util.FluidPatternDetails;
 import com.glodblock.github.util.Util;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidContainerItem;
 
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import appeng.api.AEApi;
+import appeng.api.storage.data.IAEItemStack;
+import appeng.container.AEBaseContainer;
+import appeng.container.slot.SlotRestrictedInput;
+import appeng.helpers.InventoryAction;
 
-public class ContainerFluidPatternEncoder extends AEBaseContainer implements PatternConsumer {
+public class ContainerFluidPatternEncoder extends AEBaseContainer implements IPatternConsumer {
 
     private final TileFluidPatternEncoder tile;
 
@@ -46,10 +42,22 @@ public class ContainerFluidPatternEncoder extends AEBaseContainer implements Pat
             }
             addSlotToContainer(new SlotFluidConvertingFake(output, y, 113, 17 + y * 18));
         }
-        addSlotToContainer(new SlotRestrictedInput(
-            SlotRestrictedInput.PlacableItemType.BLANK_PATTERN, tile.getInventory(), 0, 138, 20, ipl));
-        addSlotToContainer(new SlotRestrictedInput(
-            SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, tile.getInventory(), 1, 138, 50, ipl));
+        addSlotToContainer(
+                new SlotRestrictedInput(
+                        SlotRestrictedInput.PlacableItemType.BLANK_PATTERN,
+                        tile.getInventory(),
+                        0,
+                        138,
+                        20,
+                        ipl));
+        addSlotToContainer(
+                new SlotRestrictedInput(
+                        SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN,
+                        tile.getInventory(),
+                        1,
+                        138,
+                        50,
+                        ipl));
         bindPlayerInventory(ipl, 0, 84);
     }
 
@@ -57,12 +65,17 @@ public class ContainerFluidPatternEncoder extends AEBaseContainer implements Pat
         return tile;
     }
 
+    private static boolean isNotPattern(ItemStack stack) {
+        return stack == null || !(AEApi.instance().definitions().materials().blankPattern().isSameAs(stack)
+                || (stack.getItem() instanceof ItemFluidEncodedPattern));
+    }
+
     public boolean canEncodePattern() {
-        if (isNotPattern(tile.getInventory().getStackInSlot(0)) && isNotPattern(tile.getInventory().getStackInSlot(1))) {
+        if (isNotPattern(tile.getInventory().getStackInSlot(0))
+                && isNotPattern(tile.getInventory().getStackInSlot(1))) {
             return false;
         }
-        find_input:
-        {
+        find_input: {
             for (IAEItemStack stack : tile.getCraftingSlots()) {
                 if (stack != null && stack.getStackSize() > 0) {
                     break find_input;
@@ -78,11 +91,6 @@ public class ContainerFluidPatternEncoder extends AEBaseContainer implements Pat
         return false;
     }
 
-    private static boolean isNotPattern(ItemStack stack) {
-        return stack == null || !(AEApi.instance().definitions().materials().blankPattern().isSameAs(stack)
-            || (stack.getItem() instanceof ItemFluidEncodedPattern));
-    }
-
     public void encodePattern() {
         if (canEncodePattern()) {
             // if there is an encoded pattern, overwrite it; otherwise, consume a blank
@@ -98,7 +106,10 @@ public class ContainerFluidPatternEncoder extends AEBaseContainer implements Pat
     }
 
     private static IAEItemStack[] collectAeInventory(AeStackInventory<IAEItemStack> inv) {
-        // see note at top of DensePatternDetails
+        /*
+         * AE2 API documentation says the input/output arrays can contain nulls, but their use of the API directly
+         * contradicts that, so we just go by behaviour and filter out nulls.
+         */
         List<IAEItemStack> acc = new ArrayList<>();
         for (IAEItemStack stack : inv) {
             if (stack != null) {
@@ -122,33 +133,39 @@ public class ContainerFluidPatternEncoder extends AEBaseContainer implements Pat
         if (slot instanceof SlotFluidConvertingFake) {
             final ItemStack stack = player.inventory.getItemStack();
             switch (action) {
-                case PICKUP_OR_SET_DOWN:
+                case PICKUP_OR_SET_DOWN -> {
                     if (stack == null) {
                         slot.putStack(null);
                     } else {
-                        ((SlotFluidConvertingFake)slot).putConvertedStack(stack.copy());
+                        ((SlotFluidConvertingFake) slot).putConvertedStack(stack.copy());
                     }
-                    break;
-                case PLACE_SINGLE:
+                }
+                case PLACE_SINGLE -> {
                     if (stack != null) {
-                        ((SlotFluidConvertingFake)slot).putConvertedStack(Objects.requireNonNull(Util.copyStackWithSize(stack, 1)));
+                        ((SlotFluidConvertingFake) slot)
+                                .putConvertedStack(Objects.requireNonNull(Util.copyStackWithSize(stack, 1)));
                     }
-                    break;
-                case SPLIT_OR_PLACE_SINGLE:
+                }
+                case SPLIT_OR_PLACE_SINGLE -> {
                     ItemStack inSlot = slot.getStack();
                     if (inSlot != null) {
                         if (stack == null) {
                             slot.putStack(Util.copyStackWithSize(inSlot, Math.max(1, inSlot.stackSize - 1)));
                         } else if (stack.isItemEqual(inSlot)) {
-                            slot.putStack(Util.copyStackWithSize(inSlot,
-                                Math.min(inSlot.getMaxStackSize(), inSlot.stackSize + 1)));
+                            slot.putStack(
+                                    Util.copyStackWithSize(
+                                            inSlot,
+                                            Math.min(inSlot.getMaxStackSize(), inSlot.stackSize + 1)));
                         } else {
-                            ((SlotFluidConvertingFake)slot).putConvertedStack(Objects.requireNonNull(Util.copyStackWithSize(stack, 1)));
+                            ((SlotFluidConvertingFake) slot)
+                                    .putConvertedStack(Objects.requireNonNull(Util.copyStackWithSize(stack, 1)));
                         }
                     } else if (stack != null) {
-                        ((SlotFluidConvertingFake)slot).putConvertedStack(Objects.requireNonNull(Util.copyStackWithSize(stack, 1)));
+                        ((SlotFluidConvertingFake) slot)
+                                .putConvertedStack(Objects.requireNonNull(Util.copyStackWithSize(stack, 1)));
                     }
-                    break;
+                }
+                default -> {}
             }
         } else {
             super.doAction(player, action, slotId, id);
@@ -167,60 +184,4 @@ public class ContainerFluidPatternEncoder extends AEBaseContainer implements Pat
             dest.setStack(i, src[i]);
         }
     }
-
-    public static class SlotFluidConvertingFake extends SlotFake implements SlotFluid {
-
-        private final AeStackInventory<IAEItemStack> inv;
-
-        public SlotFluidConvertingFake(AeItemStackHandler inv, int idx, int x, int y) {
-            super(inv, idx, x, y);
-            this.inv = inv.getAeInventory();
-        }
-
-        @Override
-        public void putStack(ItemStack stack) {
-            inv.setStack(getSlotIndex(), AEItemStack.create(stack));
-        }
-
-        @Override
-        public void setAeStack(@Nullable IAEItemStack stack, boolean sync) {
-            inv.setStack(getSlotIndex(), stack);
-        }
-
-        public void putConvertedStack(ItemStack stack) {
-            if (stack == null) {
-                setAeStack(null, false);
-                return;
-            } else if (stack.getItem() instanceof IFluidContainerItem) {
-                FluidStack fluid = ((IFluidContainerItem) stack.getItem()).getFluid(stack);
-                if (fluid != null) {
-                    fluid.amount *= stack.stackSize;
-                    IAEItemStack aeStack = ItemFluidPacket.newAeStack(fluid);
-                    if (aeStack != null) {
-                        setAeStack(aeStack, false);
-                        return;
-                    }
-                }
-            } else if (FluidContainerRegistry.isContainer(stack)) {
-                FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(stack);
-                if (fluid != null) {
-                    fluid.amount *= stack.stackSize;
-                    IAEItemStack aeStack = ItemFluidPacket.newAeStack(fluid);
-                    if (aeStack != null) {
-                        setAeStack(aeStack, false);
-                        return;
-                    }
-                }
-            }
-            putStack(stack);
-        }
-
-        @Nullable
-        @Override
-        public IAEItemStack getAeStack() {
-            return inv.getStack(getSlotIndex());
-        }
-
-    }
-
 }

src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java

@@ -1,217 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import appeng.api.AEApi;
-import appeng.api.definitions.IDefinitions;
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.container.slot.SlotFakeCraftingMatrix;
-import appeng.container.slot.SlotPatternOutputs;
-import appeng.helpers.InventoryAction;
-import appeng.items.misc.ItemEncodedPattern;
-import appeng.util.item.AEItemStack;
-import com.glodblock.github.common.item.ItemFluidDrop;
-import com.glodblock.github.common.item.ItemFluidEncodedPattern;
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.inventory.PatternConsumer;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.util.FluidPatternDetails;
-import com.glodblock.github.util.Util;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidContainerItem;
-
-public class ContainerFluidPatternTerminal extends FCBasePartContainer implements PatternConsumer {
-
-    public ContainerFluidPatternTerminal(InventoryPlayer ip, ITerminalHost monitorable) {
-        super(ip, monitorable);
-    }
-
-    public void encodeAllItemAndMoveToInventory(){
-        encode();
-        ItemStack output = this.patternSlotOUT.getStack();
-        if(output != null){
-            if(this.patternSlotIN.getStack() != null) output.stackSize += this.patternSlotIN.getStack().stackSize;
-            if (!getPlayerInv().addItemStackToInventory( output )){
-                getPlayerInv().player.entityDropItem(output, 0);
-            }
-            this.patternSlotOUT.putStack( null );
-            this.patternSlotIN.putStack(null);
-        }
-    }
-
-    @Override
-    public void encode() {
-        if (!checkHasFluidPattern()) {
-            super.encode();
-            return;
-        }
-        ItemStack stack = this.patternSlotOUT.getStack();
-        if (stack == null) {
-            stack = this.patternSlotIN.getStack();
-            if (!isPattern(stack)) {
-                return;
-            }
-            if (stack.stackSize == 1) {
-                this.patternSlotIN.putStack(null);
-            } else {
-                stack.stackSize --;
-            }
-            encodeFluidPattern();
-        } else if (isPattern(stack)) {
-            encodeFluidPattern();
-        }
-    }
-
-    private static boolean isPattern(final ItemStack output) {
-        if (output == null) {
-            return false;
-        }
-        if (output.getItem() instanceof ItemFluidEncodedPattern) {
-            return true;
-        }
-        final IDefinitions defs = AEApi.instance().definitions();
-        return defs.items().encodedPattern().isSameAs(output) || defs.materials().blankPattern().isSameAs(output);
-    }
-
-    private boolean checkHasFluidPattern() {
-        if (this.craftingMode) {
-            return false;
-        }
-        boolean hasFluid = false, search = false;
-        for (Slot craftingSlot : this.craftingSlots) {
-            final ItemStack crafting = craftingSlot.getStack();
-            if (crafting == null) {
-                continue;
-            }
-            search = true;
-            if (crafting.getItem() instanceof ItemFluidPacket) {
-                hasFluid = true;
-                break;
-            }
-        }
-        if (!search) { // search=false -> inputs were empty
-            return false;
-        }
-        // `search` should be true at this point
-        for (Slot outputSlot : this.outputSlots) {
-            final ItemStack out = outputSlot.getStack();
-            if (out == null) {
-                continue;
-            }
-            search = false;
-            if (hasFluid) {
-                break;
-            } else if (out.getItem() instanceof ItemFluidPacket) {
-                hasFluid = true;
-                break;
-            }
-        }
-        return hasFluid && !search; // search=true -> outputs were empty
-    }
-
-    private void encodeFluidPattern() {
-        ItemStack patternStack = new ItemStack(ItemAndBlockHolder.PATTERN);
-        FluidPatternDetails pattern = new FluidPatternDetails(patternStack);
-        pattern.setInputs(collectInventory(craftingSlots));
-        pattern.setOutputs(collectInventory(outputSlots));
-//        pattern.setCanBeSubstitute(this.beSubstitute ? 1 : 0);
-        patternSlotOUT.putStack(pattern.writeToStack());
-    }
-
-    private static IAEItemStack[] collectInventory(Slot[] slots) {
-        // see note at top of FluidPatternDetails
-        IAEItemStack[] stacks = new IAEItemStack[slots.length];
-        for (int i = 0; i < stacks.length; i++) {
-            ItemStack stack = slots[i].getStack();
-            if (stack != null) {
-                if (stack.getItem() instanceof ItemFluidPacket) {
-                    IAEItemStack dropStack = ItemFluidDrop.newAeStack(ItemFluidPacket.getFluidStack(stack));
-                    if (dropStack != null) {
-                        stacks[i] = dropStack;
-                        continue;
-                    }
-                }
-            }
-            IAEItemStack aeStack = AEItemStack.create(stack);
-            stacks[i] = aeStack;
-        }
-        return stacks;
-    }
-
-    @Override
-    public void acceptPattern(IAEItemStack[] inputs, IAEItemStack[] outputs) {
-        if (getPatternTerminal() != null) {
-            getPatternTerminal().onChangeCrafting(inputs, outputs);
-        }
-    }
-
-    @Override
-    public void doAction(EntityPlayerMP player, InventoryAction action, int slotId, long id) {
-        if (this.isCraftingMode()) {
-            super.doAction(player, action, slotId, id);
-            return;
-        }
-        if (slotId < 0 || slotId >= this.inventorySlots.size()) {
-            super.doAction(player, action, slotId, id);
-            return;
-        }
-        if (action == InventoryAction.MOVE_REGION) {
-            super.doAction(player, InventoryAction.SPLIT_OR_PLACE_SINGLE, slotId, id);
-            return;
-        }
-        if (action == InventoryAction.PICKUP_SINGLE) {
-            super.doAction(player, InventoryAction.PICKUP_OR_SET_DOWN, slotId, id);
-            return;
-        }
-        Slot slot = getSlot(slotId);
-        ItemStack stack = player.inventory.getItemStack();
-        if (Util.getFluidFromItem(stack) == null || Util.getFluidFromItem(stack).amount <= 0) {
-            super.doAction(player, action, slotId, id);
-            return;
-        }
-        if ((slot instanceof SlotFakeCraftingMatrix || slot instanceof SlotPatternOutputs) && (stack.getItem() instanceof IFluidContainerItem || FluidContainerRegistry.isContainer(stack))) {
-            FluidStack fluid = null;
-            switch (action) {
-                case PICKUP_OR_SET_DOWN:
-                    fluid = Util.getFluidFromItem(stack);
-                    slot.putStack(ItemFluidPacket.newStack(fluid));
-                    break;
-                case SPLIT_OR_PLACE_SINGLE:
-                    fluid = Util.getFluidFromItem(Util.copyStackWithSize(stack, 1));
-                    FluidStack origin = ItemFluidPacket.getFluidStack(slot.getStack());
-                    if (fluid != null && fluid.equals(origin)) {
-                        fluid.amount += origin.amount;
-                        if (fluid.amount <= 0) fluid = null;
-                    }
-                    slot.putStack(ItemFluidPacket.newStack(fluid));
-                    break;
-            }
-            if (fluid == null) {
-                super.doAction(player, action, slotId, id);
-                return;
-            }
-            return;
-        }
-        super.doAction(player, action, slotId, id);
-    }
-
-    @Override
-    public ItemStack transferStackInSlot(EntityPlayer p, int idx) {
-        Slot clickSlot = (Slot) this.inventorySlots.get(idx);
-        ItemStack is = clickSlot.getStack();
-        if (is != null && !patternSlotOUT.getHasStack() && is.stackSize == 1 && (is.getItem() instanceof ItemFluidEncodedPattern || is.getItem() instanceof ItemEncodedPattern)) {
-            ItemStack output = is.copy();
-            patternSlotOUT.putStack(output);
-            p.inventory.setInventorySlotContents(clickSlot.getSlotIndex(), null);
-            this.detectAndSendChanges();
-            return null;
-        } else {
-            return super.transferStackInSlot(p, idx);
-        }
-    }
-}

src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminalEx.java

@@ -1,215 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import appeng.api.AEApi;
-import appeng.api.definitions.IDefinitions;
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.container.slot.OptionalSlotFake;
-import appeng.helpers.InventoryAction;
-import appeng.items.misc.ItemEncodedPattern;
-import appeng.util.item.AEItemStack;
-import com.glodblock.github.common.item.ItemFluidDrop;
-import com.glodblock.github.common.item.ItemFluidEncodedPattern;
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.inventory.PatternConsumer;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.util.FluidPatternDetails;
-import com.glodblock.github.util.Util;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidContainerItem;
-
-public class ContainerFluidPatternTerminalEx extends FCBasePartContainerEx implements PatternConsumer {
-
-    public ContainerFluidPatternTerminalEx(InventoryPlayer ip, ITerminalHost monitorable) {
-        super(ip, monitorable);
-    }
-
-    public void encodeAllItemAndMoveToInventory(){
-        encode();
-        ItemStack output = this.patternSlotOUT.getStack();
-        if(output != null){
-            if(this.patternSlotIN.getStack() != null) output.stackSize += this.patternSlotIN.getStack().stackSize;
-            if (!getPlayerInv().addItemStackToInventory( output )){
-                getPlayerInv().player.entityDropItem(output, 0);
-            }
-            this.patternSlotOUT.putStack( null );
-            this.patternSlotIN.putStack(null);
-        }
-    }
-
-    @Override
-    public void encode() {
-        if (!checkHasFluidPattern()) {
-            super.encode();
-            return;
-        }
-        ItemStack stack = this.patternSlotOUT.getStack();
-        if (stack == null) {
-            stack = this.patternSlotIN.getStack();
-            if (!isPattern(stack)) {
-                return;
-            }
-            if (stack.stackSize == 1) {
-                this.patternSlotIN.putStack(null);
-            } else {
-                stack.stackSize --;
-            }
-            encodeFluidPattern();
-        } else if (isPattern(stack)) {
-            encodeFluidPattern();
-        }
-    }
-
-    private static boolean isPattern(final ItemStack output) {
-        if (output == null) {
-            return false;
-        }
-        if (output.getItem() instanceof ItemFluidEncodedPattern) {
-            return true;
-        }
-        final IDefinitions defs = AEApi.instance().definitions();
-        return defs.items().encodedPattern().isSameAs(output) || defs.materials().blankPattern().isSameAs(output);
-    }
-
-    private boolean checkHasFluidPattern() {
-        boolean hasFluid = false, search = false;
-        for (Slot craftingSlot : this.craftingSlots) {
-            final ItemStack crafting = craftingSlot.getStack();
-            if (crafting == null) {
-                continue;
-            }
-            search = true;
-            if (crafting.getItem() instanceof ItemFluidPacket) {
-                hasFluid = true;
-                break;
-            }
-        }
-        if (!search) { // search=false -> inputs were empty
-            return false;
-        }
-        // `search` should be true at this point
-        for (Slot outputSlot : this.outputSlots) {
-            final ItemStack out = outputSlot.getStack();
-            if (out == null) {
-                continue;
-            }
-            search = false;
-            if (hasFluid) {
-                break;
-            } else if (out.getItem() instanceof ItemFluidPacket) {
-                hasFluid = true;
-                break;
-            }
-        }
-        return hasFluid && !search; // search=true -> outputs were empty
-    }
-
-    private void encodeFluidPattern() {
-        ItemStack patternStack = new ItemStack(ItemAndBlockHolder.PATTERN);
-        FluidPatternDetails pattern = new FluidPatternDetails(patternStack);
-        pattern.setCombine(this.combine ? 1:0);
-        pattern.setInputs(collectInventory(craftingSlots));
-        pattern.setOutputs(collectInventory(outputSlots));
-//        pattern.setCanBeSubstitute(this.beSubstitute ? 1 : 0);
-        patternSlotOUT.putStack(pattern.writeToStack());
-    }
-
-    private static IAEItemStack[] collectInventory(Slot[] slots) {
-        // see note at top of FluidPatternDetails
-        IAEItemStack[] stacks = new IAEItemStack[slots.length];
-        for (int i = 0; i < stacks.length; i++) {
-            ItemStack stack = slots[i].getStack();
-            if (stack != null) {
-                if (stack.getItem() instanceof ItemFluidPacket) {
-                    IAEItemStack dropStack = ItemFluidDrop.newAeStack(ItemFluidPacket.getFluidStack(stack));
-                    if (dropStack != null) {
-                        stacks[i] = dropStack;
-                        continue;
-                    }
-                }
-            }
-            IAEItemStack aeStack = AEItemStack.create(stack);
-            stacks[i] = aeStack;
-        }
-        return stacks;
-    }
-
-    @Override
-    public void acceptPattern(IAEItemStack[] inputs, IAEItemStack[] outputs) {
-        if (getPatternTerminal() != null) {
-            getPatternTerminal().onChangeCrafting(inputs, outputs);
-        }
-    }
-
-    @Override
-    public void doAction(EntityPlayerMP player, InventoryAction action, int slotId, long id) {
-        if (slotId < 0 || slotId >= this.inventorySlots.size()) {
-            super.doAction(player, action, slotId, id);
-            return;
-        }
-        if (action == InventoryAction.MOVE_REGION) {
-            super.doAction(player, InventoryAction.SPLIT_OR_PLACE_SINGLE, slotId, id);
-            return;
-        }
-        if (action == InventoryAction.PICKUP_SINGLE) {
-            super.doAction(player, InventoryAction.PICKUP_OR_SET_DOWN, slotId, id);
-            return;
-        }
-        Slot slot = getSlot(slotId);
-        ItemStack stack = player.inventory.getItemStack();
-        if (Util.getFluidFromItem(stack) == null || Util.getFluidFromItem(stack).amount <= 0) {
-            super.doAction(player, action, slotId, id);
-            return;
-        }
-        if ((slot instanceof OptionalSlotFake) && stack != null && (stack.getItem() instanceof IFluidContainerItem || FluidContainerRegistry.isContainer(stack))) {
-            FluidStack fluid = null;
-            switch (action) {
-                case PICKUP_OR_SET_DOWN:
-                    fluid = Util.getFluidFromItem(stack);
-                    slot.putStack(ItemFluidPacket.newStack(fluid));
-                    break;
-                case SPLIT_OR_PLACE_SINGLE:
-                    fluid = Util.getFluidFromItem(Util.copyStackWithSize(stack, 1));
-                    FluidStack origin = ItemFluidPacket.getFluidStack(slot.getStack());
-                    if (fluid != null && fluid.equals(origin)) {
-                        fluid.amount += origin.amount;
-                        if (fluid.amount <= 0) fluid = null;
-                    }
-                    slot.putStack(ItemFluidPacket.newStack(fluid));
-                    break;
-            }
-            if (fluid == null) {
-                super.doAction(player, action, slotId, id);
-                return;
-            }
-            return;
-        }
-        if (action == InventoryAction.SPLIT_OR_PLACE_SINGLE) {
-            if (stack == null && slot.getStack() != null && slot.getStack().getItem() instanceof ItemFluidPacket) {
-                return;
-            }
-        }
-        super.doAction(player, action, slotId, id);
-    }
-
-    @Override
-    public ItemStack transferStackInSlot(EntityPlayer p, int idx) {
-        Slot clickSlot = (Slot) this.inventorySlots.get(idx);
-        ItemStack is = clickSlot.getStack();
-        if (is != null && !patternSlotOUT.getHasStack() && is.stackSize == 1 && (is.getItem() instanceof ItemFluidEncodedPattern || is.getItem() instanceof ItemEncodedPattern)) {
-            ItemStack output = is.copy();
-            patternSlotOUT.putStack(output);
-            p.inventory.setInventorySlotContents(clickSlot.getSlotIndex(), null);
-            this.detectAndSendChanges();
-            return null;
-        } else {
-            return super.transferStackInSlot(p, idx);
-        }
-    }
-}

src/main/java/com/glodblock/github/client/gui/container/ContainerFluidTerminal.java

@@ -1,10 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import appeng.api.storage.ITerminalHost;
-import net.minecraft.entity.player.InventoryPlayer;
-
-public class ContainerFluidTerminal extends FCBaseFluidMonitorContain {
-    public ContainerFluidTerminal(InventoryPlayer ip, ITerminalHost monitorable) {
-        super(ip, monitorable);
-    }
-}

src/main/java/com/glodblock/github/client/gui/container/ContainerIngredientBuffer.java

@@ -1,21 +1,23 @@
 package com.glodblock.github.client.gui.container;
 
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.container.AEBaseContainer;
-import appeng.container.slot.SlotNormal;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.TankDumpable;
-import com.glodblock.github.common.tile.TileIngredientBuffer;
-import com.glodblock.github.network.SPacketFluidUpdate;
+import java.util.HashMap;
+import java.util.Map;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
 
-import java.util.HashMap;
-import java.util.Map;
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.gui.ITankDump;
+import com.glodblock.github.common.tile.TileIngredientBuffer;
+import com.glodblock.github.network.SPacketFluidUpdate;
 
-public class ContainerIngredientBuffer extends AEBaseContainer implements TankDumpable {
+import appeng.api.storage.data.IAEFluidStack;
+import appeng.container.AEBaseContainer;
+import appeng.container.slot.SlotNormal;
+
+public class ContainerIngredientBuffer extends AEBaseContainer implements ITankDump {
 
     private final TileIngredientBuffer tile;
 
@@ -23,10 +25,14 @@ public class ContainerIngredientBuffer extends AEBaseContainer implements TankDu
         super(ipl, tile);
         this.tile = tile;
         IInventory inv = tile.getInternalInventory();
+        addSlots(inv);
+        bindPlayerInventory(ipl, 0, 140);
+    }
+
+    protected void addSlots(IInventory inv) {
         for (int i = 0; i < 9; i++) {
             addSlotToContainer(new SlotNormal(inv, i, 8 + 18 * i, 108));
         }
-        bindPlayerInventory(ipl, 0, 140);
     }
 
     public TileIngredientBuffer getTile() {
@@ -35,28 +41,25 @@ public class ContainerIngredientBuffer extends AEBaseContainer implements TankDu
 
     @Override
     public boolean canDumpTank(int index) {
-        return tile.getFluidInventory().getFluidInSlot(index) != null;
+        return tile.getInternalFluid().getFluidInSlot(index) != null;
     }
 
     @Override
     public void dumpTank(int index) {
-        if (index >= 0 && index < tile.getFluidInventory().getSlots()) {
-            tile.getFluidInventory().setFluidInSlot(index, null);
+        if (index >= 0 && index < tile.getInternalFluid().getSlots()) {
+            tile.getInternalFluid().setFluidInSlot(index, null);
         }
     }
 
     @Override
-    public void detectAndSendChanges()
-    {
+    public void detectAndSendChanges() {
         super.detectAndSendChanges();
         Map<Integer, IAEFluidStack> tmp = new HashMap<>();
-        for (int i = 0; i < tile.getFluidInventory().getSlots(); i ++) {
-            tmp.put(i, tile.getFluidInventory().getFluidInSlot(i));
+        for (int i = 0; i < tile.getInternalFluid().getSlots(); i++) {
+            tmp.put(i, tile.getInternalFluid().getFluidInSlot(i));
         }
-        for( final Object g : this.crafters )
-        {
-            if( g instanceof EntityPlayer)
-            {
+        for (final Object g : this.crafters) {
+            if (g instanceof EntityPlayer) {
                 FluidCraft.proxy.netHandler.sendTo(new SPacketFluidUpdate(tmp), (EntityPlayerMP) g);
             }
         }

src/main/java/com/glodblock/github/client/gui/container/ContainerLargeIngredientBuffer.java

@@ -1,67 +1,23 @@
 package com.glodblock.github.client.gui.container;
 
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.container.AEBaseContainer;
-import appeng.container.slot.SlotNormal;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.TankDumpable;
-import com.glodblock.github.common.tile.TileLargeIngredientBuffer;
-import com.glodblock.github.network.SPacketFluidUpdate;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
 
-import java.util.HashMap;
-import java.util.Map;
+import com.glodblock.github.common.tile.TileLargeIngredientBuffer;
 
-public class ContainerLargeIngredientBuffer extends AEBaseContainer implements TankDumpable {
+import appeng.container.slot.SlotNormal;
 
-    private final TileLargeIngredientBuffer tile;
+public class ContainerLargeIngredientBuffer extends ContainerIngredientBuffer {
 
     public ContainerLargeIngredientBuffer(InventoryPlayer ipl, TileLargeIngredientBuffer tile) {
         super(ipl, tile);
-        this.tile = tile;
-        IInventory inv = tile.getInternalInventory();
+    }
+
+    protected void addSlots(IInventory inv) {
         for (int i = 0; i < 3; i++) {
             for (int j = 0; j < 9; j++) {
                 addSlotToContainer(new SlotNormal(inv, i * 9 + j, 8 + 18 * j, 72 + 18 * i));
             }
         }
-        bindPlayerInventory(ipl, 0, 140);
     }
-
-    public TileLargeIngredientBuffer getTile() {
-        return tile;
-    }
-
-    @Override
-    public boolean canDumpTank(int index) {
-        return tile.getFluidInventory().getFluidInSlot(index) != null;
-    }
-
-    @Override
-    public void dumpTank(int index) {
-        if (index >= 0 && index < tile.getFluidInventory().getSlots()) {
-            tile.getFluidInventory().setFluidInSlot(index, null);
-        }
-    }
-
-    @Override
-    public void detectAndSendChanges()
-    {
-        super.detectAndSendChanges();
-        Map<Integer, IAEFluidStack> tmp = new HashMap<>();
-        for (int i = 0; i < tile.getFluidInventory().getSlots(); i ++) {
-            tmp.put(i, tile.getFluidInventory().getFluidInSlot(i));
-        }
-        for( final Object g : this.crafters )
-        {
-            if( g instanceof EntityPlayer)
-            {
-                FluidCraft.proxy.netHandler.sendTo(new SPacketFluidUpdate(tmp), (EntityPlayerMP) g);
-            }
-        }
-    }
-
 }

src/main/java/com/glodblock/github/client/gui/container/ContainerLevelMaintainer.java

@@ -1,55 +1,134 @@
 package com.glodblock.github.client.gui.container;
 
-import appeng.container.AEBaseContainer;
-import appeng.util.item.AEItemStack;
-import com.glodblock.github.common.tile.TileLevelMaintainer;
-import com.glodblock.github.inventory.AeItemStackHandler;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.common.tile.TileLevelMaintainer;
+import com.glodblock.github.inventory.slot.SlotFluidConvertingFake;
+import com.glodblock.github.network.SPacketLevelMaintainerGuiUpdate;
+
+import appeng.api.config.SecurityPermissions;
+import appeng.api.storage.StorageName;
+import appeng.api.storage.data.IAEStack;
+import appeng.container.ContainerSubGui;
+import appeng.container.interfaces.IVirtualSlotHolder;
+import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.PacketVirtualSlot;
+import appeng.helpers.InventoryAction;
+import appeng.tile.inventory.IAEStackInventory;
+import appeng.util.Platform;
+import appeng.util.item.AEItemStack;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
+public class ContainerLevelMaintainer extends ContainerSubGui implements IVirtualSlotHolder {
 
-public class ContainerLevelMaintainer extends AEBaseContainer {
     private final TileLevelMaintainer tile;
-    private final FakeSlot[] requestSlots = new FakeSlot[TileLevelMaintainer.REQ_COUNT];
+
+    private static final int UPDATE_INTERVAL = 20;
+    private boolean isFirstUpdate = true;
+    private int updateCount = UPDATE_INTERVAL;
 
     public ContainerLevelMaintainer(InventoryPlayer ipl, TileLevelMaintainer tile) {
         super(ipl, tile);
         this.tile = tile;
-        AeItemStackHandler request = new AeItemStackHandler(tile.getRequestSlots());
-        for (int y = 0; y < TileLevelMaintainer.REQ_COUNT; y++) {
-            FakeSlot slot = new FakeSlot(request, y, 17, 19 + y * 20);
-            addSlotToContainer(slot);
-            requestSlots[y] = slot;
-        }
-        bindPlayerInventory(ipl, 0, 132);
+
+        bindPlayerInventory(ipl, 0, 130);
     }
 
     public TileLevelMaintainer getTile() {
         return tile;
     }
 
-    public FakeSlot[] getRequestSlots() {
-        return this.requestSlots;
+    @Override
+    public void doAction(EntityPlayerMP player, InventoryAction action, int slotId, long id) {
+        if (getSlot(slotId) instanceof SlotFluidConvertingFake slot) {
+            final ItemStack stack = player.inventory.getItemStack();
+            switch (action) {
+                case PICKUP_OR_SET_DOWN, PLACE_SINGLE, SPLIT_OR_PLACE_SINGLE -> {
+                    if (stack == null) {
+                        slot.putStack(null);
+                    } else {
+                        slot.putConvertedStack(stack);
+                    }
+                }
+                default -> {}
+            }
+        } else {
+            super.doAction(player, action, slotId, id);
+        }
     }
 
     @Override
     public ItemStack transferStackInSlot(EntityPlayer player, int idx) {
-        for (FakeSlot slot : this.getRequestSlots()) {
-            if (!slot.getHasStack()) {
-                slot.setAeStack(AEItemStack.create(((Slot) this.inventorySlots.get(idx)).getStack()), true);
-                break;
+        if (Platform.isClient()) {
+            return null;
+        }
+
+        ItemStack clickedStack = this.inventorySlots.get(idx).getStack();
+        if (clickedStack != null) {
+            IAEStackInventory inventory = this.getTile().getAEStackInventory();
+            for (int i = 0; i < inventory.getSizeInventory(); i++) {
+                IAEStack<?> stack = inventory.getAEStackInSlot(i);
+                if (stack == null) {
+                    tile.updateStack(i, AEItemStack.create(clickedStack));
+                    break;
+                }
             }
         }
+
         this.detectAndSendChanges();
         return null;
     }
 
-    public static class FakeSlot extends ContainerFluidPatternEncoder.SlotFluidConvertingFake {
+    @Override
+    public void detectAndSendChanges() {
+        super.detectAndSendChanges();
+        if (Platform.isClient()) {
+            return;
+        }
 
-        public FakeSlot(AeItemStackHandler inv, int idx, int x, int y) {
-            super(inv, idx, x, y);
+        this.verifyPermissions(SecurityPermissions.BUILD, false);
+
+        if (this.updateCount++ >= UPDATE_INTERVAL) {
+            this.updateGui();
+        }
+    }
+
+    public void updateGui() {
+        if (this.isFirstUpdate) {
+            Int2ObjectMap<IAEStack<?>> list = new Int2ObjectOpenHashMap<>();
+            for (int i = 0; i < this.tile.requests.length; i++) {
+                TileLevelMaintainer.RequestInfo info = this.tile.requests[i];
+                list.put(i, info != null ? info.getAEStack() : null);
+            }
+            NetworkHandler.instance.sendTo(
+                    new PacketVirtualSlot(StorageName.NONE, list),
+                    (EntityPlayerMP) this.getInventoryPlayer().player);
+        }
+        FluidCraft.proxy.netHandler.sendTo(
+                new SPacketLevelMaintainerGuiUpdate(this.tile.requests, !this.isFirstUpdate, this.tile.isLiteMode()),
+                (EntityPlayerMP) this.getInventoryPlayer().player);
+        this.isFirstUpdate = false;
+        this.updateCount = 0;
+    }
+
+    @Override
+    public void receiveSlotStacks(StorageName invName, Int2ObjectMap<IAEStack<?>> slotStacks) {
+        for (var entry : slotStacks.int2ObjectEntrySet()) {
+            this.tile.updateStack(entry.getIntKey(), entry.getValue());
+        }
+        if (!this.tile.getWorldObj().isRemote) {
+            for (var player : this.crafters) {
+                NetworkHandler.instance
+                        .sendTo(new PacketVirtualSlot(StorageName.NONE, slotStacks), (EntityPlayerMP) player);
+                FluidCraft.proxy.netHandler.sendTo(
+                        new SPacketLevelMaintainerGuiUpdate(this.tile.requests, false, this.tile.isLiteMode()),
+                        (EntityPlayerMP) player);
+            }
         }
     }
 }

src/main/java/com/glodblock/github/client/gui/container/ContainerLevelTerminal.java

@@ -0,0 +1,255 @@
+package com.glodblock.github.client.gui.container;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraftforge.common.util.ForgeDirection;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.gui.container.base.FCBaseContainer;
+import com.glodblock.github.common.parts.PartLevelTerminal;
+import com.glodblock.github.inventory.gui.GuiType;
+import com.glodblock.github.inventory.item.IWirelessTerminal;
+import com.glodblock.github.loader.ItemAndBlockHolder;
+import com.glodblock.github.network.SPacketLevelTerminalUpdate;
+import com.glodblock.github.util.FluidPrimaryGui;
+import com.glodblock.github.util.LevelTerminalRegistry;
+
+import appeng.api.features.ILevelViewable;
+import appeng.api.features.LevelItemInfo;
+import appeng.api.networking.IGrid;
+import appeng.api.networking.IGridHost;
+import appeng.api.networking.IGridNode;
+import appeng.api.networking.security.IActionHost;
+import appeng.api.storage.ITerminalHost;
+import appeng.api.util.DimensionalCoord;
+import appeng.container.ContainerOpenContext;
+import appeng.container.PrimaryGui;
+import appeng.util.Platform;
+
+public class ContainerLevelTerminal extends FCBaseContainer {
+
+    /**
+     * this stuff is all server side
+     */
+    private int nextId = 0;
+
+    private final Map<IGridHost, ContainerLevelTerminal.InvTracker> tracked = new HashMap<>();
+    private final Map<Long, ContainerLevelTerminal.InvTracker> trackedById = new HashMap<>();
+
+    private IGrid grid;
+    private SPacketLevelTerminalUpdate updatePacket;
+    private boolean isPacketDirty;
+    private boolean wasOff;
+    private int ticks = 0;
+
+    public ContainerLevelTerminal(final InventoryPlayer ip, final ITerminalHost monitorable) {
+        super(ip, monitorable);
+        if (Platform.isServer()) {
+            if (monitorable instanceof PartLevelTerminal terminal) {
+                grid = terminal.getActionableNode().getGrid();
+            } else if (monitorable instanceof IWirelessTerminal wirelessTerminal) {
+                grid = wirelessTerminal.getActionableNode().getGrid();
+            }
+
+            updatePacket = this.updateList();
+            if (updatePacket != null) {
+                this.isPacketDirty = true;
+            } else {
+                updatePacket = new SPacketLevelTerminalUpdate();
+                this.isPacketDirty = false;
+            }
+        }
+
+        this.bindPlayerInventory(ip, 14, 0);
+    }
+
+    @Override
+    public void detectAndSendChanges() {
+        if (Platform.isClient()) {
+            return;
+        }
+
+        super.detectAndSendChanges();
+
+        if (this.grid == null) {
+            return;
+        }
+
+        final IActionHost host = this.getActionHost();
+
+        if (!host.getActionableNode().isActive()) {
+            if (!wasOff) {
+                SPacketLevelTerminalUpdate update = new SPacketLevelTerminalUpdate();
+
+                update.addDisconnectEntry();
+                wasOff = true;
+                FluidCraft.proxy.netHandler.sendTo(update, (EntityPlayerMP) this.getPlayerInv().player);
+            }
+            return;
+        }
+        wasOff = false;
+
+        if (isPacketDirty) {
+            FluidCraft.proxy.netHandler.sendTo(updatePacket, (EntityPlayerMP) this.getPlayerInv().player);
+            updatePacket = new SPacketLevelTerminalUpdate();
+            isPacketDirty = false;
+        } else if (++ticks % 20 == 0) {
+            ticks = 0;
+            SPacketLevelTerminalUpdate updateNew = this.updateList();
+            if (updateNew != null) {
+                FluidCraft.proxy.netHandler.sendTo(updateNew, (EntityPlayerMP) this.getPlayerInv().player);
+            }
+        }
+    }
+
+    @Nullable
+    private SPacketLevelTerminalUpdate updateList() {
+        SPacketLevelTerminalUpdate update = null;
+        var supported = LevelTerminalRegistry.instance().getSupportedClasses();
+        Set<IGridHost> visited = new HashSet<>();
+
+        for (Class<? extends ILevelViewable> clz : supported) {
+            boolean isAdopted = LevelTerminalRegistry.instance().isAdopted(clz);
+            Class<? extends IGridHost> machineClass = isAdopted ? LevelTerminalRegistry.instance().getAdopted(clz)
+                    : clz;
+            for (IGridNode gridNode : grid.getMachines(machineClass)) {
+                final IGridHost gridHost = gridNode.getMachine();
+                final ILevelViewable machine = isAdopted
+                        ? LevelTerminalRegistry.instance().getAdapter(clz).adapt(gridHost)
+                        : (ILevelViewable) gridHost;
+                visited.add(gridHost);
+
+                /* First check if we are already tracking this node */
+                if (tracked.containsKey(gridHost)) {
+                    ContainerLevelTerminal.InvTracker knownTracker = tracked.get(gridHost);
+
+                    /* Name changed? */
+                    String name = machine.getCustomName();
+                    if (!Objects.equals(knownTracker.name, name)) {
+                        knownTracker.name = name;
+                        if (update == null) update = new SPacketLevelTerminalUpdate();
+                        update.addRenameEntry(knownTracker.id, name);
+                    }
+
+                    LevelItemInfo[] prev = knownTracker.infoList;
+                    LevelItemInfo[] curr = machine.getLevelItemInfoList();
+                    if (prev.length == curr.length) {
+                        for (int i = 0; i < prev.length; i++) {
+                            if (prev[i] == null && curr[i] == null) continue;
+
+                            if (prev[i] == null) {
+                                knownTracker.infoList[i] = curr[i];
+                                if (update == null) update = new SPacketLevelTerminalUpdate();
+                                update.addOverwriteSlotEntry(knownTracker.id, i, curr[i]);
+                            } else if (curr[i] == null) {
+                                knownTracker.infoList[i] = null;
+                                if (update == null) update = new SPacketLevelTerminalUpdate();
+                                update.addOverwriteSlotEntry(knownTracker.id, i, null);
+                            } else if (!Platform.isStacksIdentical(prev[i].stack, curr[i].stack)
+                                    || prev[i].quantity != curr[i].quantity
+                                    || prev[i].batchSize != curr[i].batchSize
+                                    || prev[i].state != curr[i].state) {
+                                        knownTracker.infoList[i] = curr[i];
+                                        if (update == null) update = new SPacketLevelTerminalUpdate();
+                                        update.addOverwriteSlotEntry(knownTracker.id, i, curr[i]);
+                                    }
+                        }
+                    } else {
+                        knownTracker.infoList = curr;
+                        if (update == null) update = new SPacketLevelTerminalUpdate();
+                        update.addOverwriteAllSlotEntry(knownTracker.id, curr);
+                    }
+                } else {
+                    /* Add a new entry */
+                    if (update == null) update = new SPacketLevelTerminalUpdate();
+                    ContainerLevelTerminal.InvTracker entry = new ContainerLevelTerminal.InvTracker(nextId++, machine);
+
+                    update.addNewEntry(
+                            entry.id,
+                            entry.x,
+                            entry.y,
+                            entry.z,
+                            entry.dim,
+                            entry.side.ordinal(),
+                            entry.rows,
+                            entry.rowSize,
+                            entry.name,
+                            entry.infoList);
+                    tracked.put(gridHost, entry);
+                    trackedById.put(entry.id, entry);
+                }
+            }
+        }
+
+        /* Now find any entries that we need to remove */
+        Iterator<Map.Entry<IGridHost, ContainerLevelTerminal.InvTracker>> it = tracked.entrySet().iterator();
+        while (it.hasNext()) {
+            var entry = it.next();
+            if (visited.contains(entry.getKey())) {
+                continue;
+            }
+
+            if (update == null) update = new SPacketLevelTerminalUpdate();
+            update.addRemoveEntry(entry.getValue().id);
+            trackedById.remove(entry.getValue().id);
+            it.remove();
+        }
+        return update;
+    }
+
+    @Override
+    protected boolean isWirelessTerminal() {
+        return false;
+    }
+
+    private static class InvTracker {
+
+        private final long id;
+        private String name;
+        private final int rowSize;
+        private final int rows;
+        private final int x;
+        private final int y;
+        private final int z;
+        private final int dim;
+        private final ForgeDirection side;
+
+        private LevelItemInfo[] infoList;
+
+        public InvTracker(long id, ILevelViewable machine) {
+
+            DimensionalCoord location = machine.getLocation();
+
+            this.id = id;
+            this.name = machine.getCustomName();
+            this.rowSize = machine.rowSize();
+            this.rows = machine.rows();
+            this.x = location.x;
+            this.y = location.y;
+            this.z = location.z;
+            this.dim = location.getDimension();
+            this.side = machine.getSide();
+
+            this.infoList = machine.getLevelItemInfoList();
+        }
+    }
+
+    @Override
+    public PrimaryGui createPrimaryGui() {
+        ContainerOpenContext context = getOpenContext();
+        return new FluidPrimaryGui(
+                GuiType.LEVEL_TERMINAL,
+                ItemAndBlockHolder.LEVEL_TERMINAL.stack(),
+                context.getTile(),
+                context.getSide());
+    }
+}

src/main/java/com/glodblock/github/client/gui/container/ContainerLevelWireless.java

@@ -0,0 +1,35 @@
+package com.glodblock.github.client.gui.container;
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import com.glodblock.github.inventory.gui.GuiType;
+import com.glodblock.github.inventory.item.IWirelessTerminal;
+import com.glodblock.github.loader.ItemAndBlockHolder;
+import com.glodblock.github.util.FluidPrimaryGui;
+
+import appeng.container.ContainerOpenContext;
+import appeng.container.PrimaryGui;
+
+public class ContainerLevelWireless extends ContainerLevelTerminal {
+
+    public ContainerLevelWireless(InventoryPlayer ip, IWirelessTerminal monitorable) {
+        super(ip, monitorable);
+    }
+
+    @Override
+    protected boolean isWirelessTerminal() {
+        return true;
+    }
+
+    @Override
+    public PrimaryGui createPrimaryGui() {
+        ContainerOpenContext context = getOpenContext();
+        PrimaryGui primaryGui = new FluidPrimaryGui(
+                GuiType.WIRELESS_LEVEL_TERMINAL,
+                ItemAndBlockHolder.WIRELESS_LEVEL_TERM.stack(),
+                context.getTile(),
+                context.getSide());
+        primaryGui.setSlotIndex(getTargetSlotIndex());
+        return primaryGui;
+    }
+}

src/main/java/com/glodblock/github/client/gui/container/ContainerMagnetFilter.java

@@ -0,0 +1,103 @@
+package com.glodblock.github.client.gui.container;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+
+import com.glodblock.github.inventory.item.IWirelessMagnetFilter;
+import com.glodblock.github.inventory.item.WirelessMagnet;
+import com.glodblock.github.inventory.item.WirelessMagnetCardFilterInventory;
+
+import appeng.api.storage.ITerminalHost;
+import appeng.container.ContainerSubGui;
+import appeng.container.guisync.GuiSync;
+import appeng.container.slot.AppEngSlot;
+import appeng.container.slot.IOptionalSlotHost;
+import appeng.container.slot.OptionalSlotFake;
+import appeng.container.slot.SlotFake;
+import appeng.container.slot.SlotPatternOutputs;
+import appeng.util.Platform;
+
+public class ContainerMagnetFilter extends ContainerSubGui implements IOptionalSlotHost {
+
+    @GuiSync(101)
+    public WirelessMagnet.ListMode listMode;
+
+    @GuiSync(102)
+    public boolean nbt;
+
+    @GuiSync(103)
+    public boolean meta;
+
+    @GuiSync(104)
+    public boolean ore;
+
+    @GuiSync(105)
+    public boolean oreDict;
+
+    @GuiSync(106)
+    public String oreDictFilter;
+
+    protected OptionalSlotFake[] filterSlots;
+    protected final IInventory filter;
+    private final IWirelessMagnetFilter object;
+
+    public ContainerMagnetFilter(InventoryPlayer ip, ITerminalHost monitorable) {
+        super(ip, monitorable);
+        this.object = (WirelessMagnetCardFilterInventory) monitorable;
+        this.filter = object.getInventoryByName("config");
+        this.filterSlots = new OptionalSlotFake[27];
+        oreDictFilter = object.getOreDictFilter();
+        for (int y = 0; y < 3; y++) {
+            for (int x = 0; x < 9; x++) {
+                this.addSlotToContainer(
+                        this.filterSlots[x + y * 9] = new SlotPatternOutputs(
+                                this.filter,
+                                this,
+                                x + y * 9,
+                                8 + x * 18,
+                                58 + y * 18,
+                                0,
+                                0,
+                                1));
+                this.filterSlots[x + y * 9].setRenderDisabled(false);
+            }
+        }
+        this.lockPlayerInventorySlot(this.object.getInventorySlot());
+        bindPlayerInventory(ip, 0, 126);
+    }
+
+    @Override
+    public ItemStack transferStackInSlot(EntityPlayer p, int idx) {
+        AppEngSlot clickSlot = (AppEngSlot) this.inventorySlots.get(idx);
+        if (clickSlot == null || !clickSlot.getHasStack()) return null;
+        ItemStack tis = clickSlot.getStack();
+        for (SlotFake slot : this.filterSlots) {
+            if (!slot.getHasStack()) {
+                slot.putStack(tis);
+                detectAndSendChanges();
+                break;
+            }
+        }
+        return super.transferStackInSlot(p, idx);
+    }
+
+    @Override
+    public void detectAndSendChanges() {
+        if (Platform.isServer()) {
+            this.listMode = this.object.getListMode();
+            this.meta = this.object.getMetaMode();
+            this.nbt = this.object.getNBTMode();
+            this.ore = this.object.getOreMode();
+            this.oreDict = this.object.getOreDictMode();
+            this.oreDictFilter = this.object.getOreDictFilter();
+        }
+        super.detectAndSendChanges();
+    }
+
+    @Override
+    public boolean isSlotEnabled(int idx) {
+        return true;
+    }
+}

src/main/java/com/glodblock/github/client/gui/container/ContainerOCPatternEditor.java

@@ -1,23 +1,28 @@
 package com.glodblock.github.client.gui.container;
 
+import net.minecraft.entity.player.InventoryPlayer;
+
+import com.glodblock.github.common.tile.TileOCPatternEditor;
+
 import appeng.container.AEBaseContainer;
 import appeng.container.slot.SlotRestrictedInput;
-import com.glodblock.github.common.tile.TileOCPatternEditor;
-import net.minecraft.entity.player.InventoryPlayer;
 
 public class ContainerOCPatternEditor extends AEBaseContainer {
 
     public ContainerOCPatternEditor(InventoryPlayer ipl, TileOCPatternEditor tile) {
         super(ipl, tile);
-        for (int i = 0; i < 4; i ++) {
-            for (int j = 0; j < 4; j ++) {
-                addSlotToContainer(new SlotRestrictedInput(
-                    SlotRestrictedInput.PlacableItemType.PATTERN, tile.getInternalInventory(),
-                    j * 4 + i, 55 + i * 18, 17 + j * 18, ipl
-                ));
+        for (int i = 0; i < 4; i++) {
+            for (int j = 0; j < 4; j++) {
+                addSlotToContainer(
+                        new SlotRestrictedInput(
+                                SlotRestrictedInput.PlacableItemType.PATTERN,
+                                tile.getInternalInventory(),
+                                j * 4 + i,
+                                55 + i * 18,
+                                17 + j * 18,
+                                ipl));
             }
         }
         bindPlayerInventory(ipl, 0, 104);
     }
-
 }

src/main/java/com/glodblock/github/client/gui/container/ContainerPatternValueAmount.java

@@ -1,45 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import appeng.api.config.SecurityPermissions;
-import appeng.api.storage.ITerminalHost;
-import appeng.container.AEBaseContainer;
-import appeng.container.slot.SlotInaccessible;
-import appeng.tile.inventory.AppEngInternalInventory;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-
-public class ContainerPatternValueAmount extends AEBaseContainer {
-
-
-    private final Slot patternValue;
-    private int valueIndex;
-
-    public ContainerPatternValueAmount(final InventoryPlayer ip, final ITerminalHost te )
-    {
-        super( ip, te );
-        this.patternValue = new SlotInaccessible( new AppEngInternalInventory( null, 1 ), 0, 34, 53 );
-        this.addSlotToContainer( patternValue );
-    }
-
-    @Override
-    public void detectAndSendChanges()
-    {
-        super.detectAndSendChanges();
-        this.verifyPermissions( SecurityPermissions.CRAFT, false );
-    }
-
-    public Slot getPatternValue()
-    {
-        return patternValue;
-    }
-
-    public int getValueIndex()
-    {
-        return valueIndex;
-    }
-
-    public void setValueIndex( int valueIndex )
-    {
-        this.valueIndex = valueIndex;
-    }
-}

src/main/java/com/glodblock/github/client/gui/container/ContainerSuperStockReplenisher.java

@@ -0,0 +1,190 @@
+package com.glodblock.github.client.gui.container;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.gui.GuiFCImgButton;
+import com.glodblock.github.common.tile.TileSuperStockReplenisher;
+import com.glodblock.github.inventory.gui.GuiType;
+import com.glodblock.github.loader.ItemAndBlockHolder;
+import com.glodblock.github.network.SPacketSuperStockReplenisherUpdate;
+import com.glodblock.github.util.FluidPrimaryGui;
+
+import appeng.api.implementations.items.IStorageCell;
+import appeng.api.storage.StorageName;
+import appeng.api.storage.data.IAEStack;
+import appeng.container.AEBaseContainer;
+import appeng.container.ContainerOpenContext;
+import appeng.container.PrimaryGui;
+import appeng.container.interfaces.IVirtualSlotSource;
+import appeng.container.slot.SlotRestrictedInput;
+import appeng.container.sync.SyncManager;
+import appeng.container.sync.handlers.AEStackInventorySyncHandler;
+import appeng.container.sync.handlers.BooleanSyncHandler;
+import appeng.tile.inventory.IAEStackInventory;
+import appeng.util.Platform;
+import appeng.util.item.AEItemStack;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class ContainerSuperStockReplenisher extends AEBaseContainer implements IVirtualSlotSource {
+
+    private final TileSuperStockReplenisher tile;
+
+    private int lastUpdated = 1337;
+
+    private final IAEStackInventory configFluids;
+    public final AEStackInventorySyncHandler configFluidsSlots;
+
+    private final IAEStackInventory configItems;
+    public final AEStackInventorySyncHandler configItemsSlots;
+
+    public final BooleanSyncHandler fullStockModeSync;
+
+    @SideOnly(Side.CLIENT)
+    private GuiFCImgButton modeButton;
+
+    public ContainerSuperStockReplenisher(InventoryPlayer ipl, TileSuperStockReplenisher tile) {
+        super(ipl, tile);
+        this.tile = tile;
+        this.configFluids = tile.getConfigFluids();
+        this.configItems = tile.getConfigItems();
+        final IInventory cell = tile.getCell();
+
+        final SyncManager sm = this.getSyncManager();
+        this.configFluidsSlots = sm.root().aeStackInventory("fluidConfig", this.configFluids);
+        this.configItemsSlots = sm.root().aeStackInventory("itemConfig", this.configItems);
+        this.fullStockModeSync = sm.root().booleanSync("fullstockMode").onClientChange((oldValue, newValue) -> {
+            if (this.modeButton != null) {
+                this.modeButton.set(newValue ? "fullstockMode" : "normalMode");
+            }
+        }).onServerChange((oldValue, newValue) -> this.tile.setFullStockMode(newValue));
+
+        this.addSlotToContainer(
+                new SlotRestrictedInput(
+                        SlotRestrictedInput.PlacableItemType.WORKBENCH_CELL,
+                        cell,
+                        0,
+                        173,
+                        8,
+                        this.getInventoryPlayer()));
+
+        bindPlayerInventory(ipl, 0, 251 - 82);
+    }
+
+    @SideOnly(Side.CLIENT)
+    public void setModeButton(GuiFCImgButton button) {
+        this.modeButton = button;
+    }
+
+    @Override
+    public ItemStack slotClick(int slotId, int clickedButton, int mode, EntityPlayer player) {
+        if (slotId == 0 && player.inventory.getItemStack() == null && isConfigurated()) return null;
+        return super.slotClick(slotId, clickedButton, mode, player);
+    }
+
+    @Override
+    public void detectAndSendChanges() {
+        super.detectAndSendChanges();
+        if (Platform.isClient()) return;
+
+        if (this.lastUpdated > 20) {
+            this.lastUpdated = 0;
+            Map<Integer, IAEStack<?>> tmp = new HashMap<>();
+
+            for (int i = 0; i < this.tile.getInternalFluid().getSlots(); i++) {
+                tmp.put(i, this.tile.getInternalFluid().getFluidInSlot(i));
+            }
+
+            for (int i = 0; i < this.tile.getInternalInventory().getSizeInventory(); i++) {
+                tmp.put(i + 100, AEItemStack.create(this.tile.getInternalInventory().getStackInSlot(i)));
+            }
+
+            for (final Object g : this.crafters) {
+                if (g instanceof EntityPlayer) {
+                    FluidCraft.proxy.netHandler.sendTo(new SPacketSuperStockReplenisherUpdate(tmp), (EntityPlayerMP) g);
+                }
+            }
+
+            if (Platform.isServer()) this.setFullStockMode(this.tile.isFullStockMode());
+
+        }
+
+        this.lastUpdated++;
+    }
+
+    private boolean isConfigurated() {
+        for (int i = 0; i < this.configItems.getSizeInventory(); i++)
+            if (this.configItems.getAEStackInSlot(i) != null) return true;
+
+        for (int i = 0; i < this.configFluids.getSizeInventory(); i++)
+            if (this.configFluids.getAEStackInSlot(i) != null) return true;
+        return false;
+    }
+
+    @Override
+    public boolean isValidForSlot(Slot s, ItemStack is) {
+        if (s.slotNumber == 0 && s.getHasStack() && isConfigurated()) {
+            long currentBytes = 0;
+            long newBytes = -1;
+
+            if (s.getStack().getItem() instanceof IStorageCell isc) currentBytes = isc.getBytesLong(is);
+
+            if (is.getItem() instanceof IStorageCell isc) newBytes = isc.getBytesLong(is);
+
+            if (currentBytes > newBytes) {
+                return false;
+            }
+        }
+        return super.isValidForSlot(s, is);
+    }
+
+    @Override
+    public PrimaryGui createPrimaryGui() {
+        ContainerOpenContext context = getOpenContext();
+        return new FluidPrimaryGui(
+                GuiType.GUI_SUPER_STOCK_REPLENISHER,
+                ItemAndBlockHolder.SUPER_STOCK_RERPLENISHER.stack(),
+                context.getTile(),
+                context.getSide());
+    }
+
+    @Override
+    public void updateVirtualSlot(StorageName invName, int slotId, IAEStack<?> aes) {
+        if (aes != null && aes.getStackSize() > Integer.MAX_VALUE) aes.setStackSize(Integer.MAX_VALUE);
+        switch (invName) {
+            case NONE -> {
+                this.configFluids.putAEStackInSlot(slotId, aes);
+                this.configFluidsSlots.markDirty();
+            }
+            case CONFIG -> {
+                this.configItems.putAEStackInSlot(slotId, aes);
+                this.configItemsSlots.markDirty();
+            }
+        }
+    }
+
+    public TileSuperStockReplenisher getTile() {
+        return this.tile;
+    }
+
+    public boolean isFullStockMode() {
+        return this.fullStockModeSync.get();
+    }
+
+    public void setFullStockMode(final boolean fullStockMode) {
+        this.fullStockModeSync.set(fullStockMode);
+    }
+
+    public void markDirty() {
+        this.fullStockModeSync.markDirty();
+    }
+}

src/main/java/com/glodblock/github/client/gui/container/FCBaseFluidMonitorContain.java

@@ -1,454 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import appeng.api.AEApi;
-import appeng.api.config.*;
-import appeng.api.implementations.guiobjects.IPortableCell;
-import appeng.api.implementations.tiles.IMEChest;
-import appeng.api.implementations.tiles.IViewCellStorage;
-import appeng.api.networking.IGrid;
-import appeng.api.networking.IGridHost;
-import appeng.api.networking.IGridNode;
-import appeng.api.networking.energy.IEnergyGrid;
-import appeng.api.networking.energy.IEnergySource;
-import appeng.api.networking.security.BaseActionSource;
-import appeng.api.networking.storage.IBaseMonitor;
-import appeng.api.parts.IPart;
-import appeng.api.storage.IMEMonitor;
-import appeng.api.storage.IMEMonitorHandlerReceiver;
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.storage.data.IItemList;
-import appeng.api.util.IConfigManager;
-import appeng.api.util.IConfigurableObject;
-import appeng.container.AEBaseContainer;
-import appeng.container.guisync.GuiSync;
-import appeng.container.slot.SlotPlayerHotBar;
-import appeng.container.slot.SlotPlayerInv;
-import appeng.container.slot.SlotRestrictedInput;
-import appeng.core.AELog;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketValueConfig;
-import appeng.helpers.WirelessTerminalGuiObject;
-import appeng.me.helpers.ChannelPowerSrc;
-import appeng.util.ConfigManager;
-import appeng.util.IConfigManagerHost;
-import appeng.util.Platform;
-import appeng.util.item.AEFluidStack;
-import appeng.util.item.AEItemStack;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.item.ItemFluidDrop;
-import com.glodblock.github.network.CPacketFluidUpdate;
-import com.glodblock.github.network.SPacketFluidUpdate;
-import com.glodblock.github.network.SPacketMEInventoryUpdate;
-import com.glodblock.github.util.Util;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.ICrafting;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.IFluidContainerItem;
-import org.apache.commons.lang3.tuple.MutablePair;
-
-import javax.annotation.Nonnull;
-import java.io.IOException;
-import java.nio.BufferOverflowException;
-import java.util.HashMap;
-import java.util.Map;
-
-public class FCBaseFluidMonitorContain extends AEBaseContainer implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver<IAEFluidStack> {
-    private final SlotRestrictedInput[] cellView = new SlotRestrictedInput[5];
-    private final IMEMonitor<IAEFluidStack> monitor;
-    private final IItemList<IAEFluidStack> items = AEApi.instance().storage().createFluidList();
-    private final IConfigManager clientCM;
-    private final ITerminalHost host;
-    @GuiSync(99)
-    public boolean canAccessViewCells = false;
-    @GuiSync(98)
-    public boolean hasPower = false;
-    private IConfigManagerHost gui;
-    private IConfigManager serverCM;
-    private IGridNode networkNode;
-
-    public FCBaseFluidMonitorContain(final InventoryPlayer ip, final ITerminalHost monitorable) {
-        this(ip, monitorable, true);
-    }
-
-    protected FCBaseFluidMonitorContain(final InventoryPlayer ip, final ITerminalHost monitorable, final boolean bindInventory) {
-        super(ip, monitorable instanceof TileEntity ? (TileEntity) monitorable : null, monitorable instanceof IPart ? (IPart) monitorable : null);
-        this.host = monitorable;
-        this.clientCM = new ConfigManager(this);
-
-        this.clientCM.registerSetting(Settings.SORT_BY, SortOrder.NAME);
-        this.clientCM.registerSetting(Settings.VIEW_MODE, ViewItems.ALL);
-        this.clientCM.registerSetting(Settings.SORT_DIRECTION, SortDir.ASCENDING);
-        if (Platform.isServer()) {
-            this.serverCM = monitorable.getConfigManager();
-
-            this.monitor = monitorable.getFluidInventory();
-            if (this.monitor != null) {
-                this.monitor.addListener(this, null);
-
-//                this.setCellInventory( this.monitor );
-
-                if (monitorable instanceof IPortableCell) {
-                    this.setPowerSource((IEnergySource) monitorable);
-                } else if (monitorable instanceof IMEChest) {
-                    this.setPowerSource((IEnergySource) monitorable);
-                } else if (monitorable instanceof IGridHost) {
-                    final IGridNode node = ((IGridHost) monitorable).getGridNode(ForgeDirection.UNKNOWN);
-                    if (node != null) {
-                        this.networkNode = node;
-                        final IGrid g = node.getGrid();
-                        if (g != null) {
-                            this.setPowerSource(new ChannelPowerSrc(this.networkNode, g.getCache(IEnergyGrid.class)));
-                        }
-                    }
-                }
-            } else {
-                this.setValidContainer(false);
-            }
-        } else {
-            this.monitor = null;
-        }
-
-        this.canAccessViewCells = false;
-        if (monitorable instanceof IViewCellStorage) {
-            for (int y = 0; y < 5; y++) {
-                this.cellView[y] = new SlotRestrictedInput(SlotRestrictedInput.PlacableItemType.VIEW_CELL, ((IViewCellStorage) monitorable).getViewCellStorage(), y, 206, y * 18 + 8, this.getInventoryPlayer());
-                this.cellView[y].setAllowEdit(this.canAccessViewCells);
-                this.addSlotToContainer(this.cellView[y]);
-            }
-        }
-
-        if (bindInventory) {
-            this.bindPlayerInventory(ip, 0, 0);
-        }
-    }
-
-    public IGridNode getNetworkNode() {
-        return this.networkNode;
-    }
-
-    @Override
-    public ItemStack transferStackInSlot(final EntityPlayer p, final int idx) {
-        if (Platform.isClient()) {
-            Slot clickSlot = (Slot) this.inventorySlots.get(idx);
-            if ((clickSlot instanceof SlotPlayerInv || clickSlot instanceof SlotPlayerHotBar) && clickSlot.getHasStack() && Util.FluidUtil.isFluidContainer(clickSlot.getStack())) {
-                ItemStack tis = clickSlot.getStack();
-                Map<Integer, IAEFluidStack> tmp = new HashMap<>();
-                tmp.put(0, ItemFluidDrop.getAeFluidStack(AEItemStack.create(tis)));
-                int index = Util.findItemInPlayerInvSlot(p, clickSlot.getStack());
-                FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidUpdate(tmp, tis, index));
-            }
-        }
-        return super.transferStackInSlot(p, idx);
-    }
-
-    @Override
-    public void detectAndSendChanges() {
-        if (Platform.isServer()) {
-            if (this.monitor != this.host.getFluidInventory()) {
-                this.setValidContainer(false);
-            }
-
-            for (final Settings set : this.serverCM.getSettings()) {
-                final Enum<?> sideLocal = this.serverCM.getSetting(set);
-                final Enum<?> sideRemote = this.clientCM.getSetting(set);
-
-                if (sideLocal != sideRemote) {
-                    this.clientCM.putSetting(set, sideLocal);
-                    for (final Object crafter : this.crafters) {
-                        try {
-                            NetworkHandler.instance.sendTo(new PacketValueConfig(set.name(), sideLocal.name()), (EntityPlayerMP) crafter);
-                        } catch (final IOException e) {
-                            AELog.debug(e);
-                        }
-                    }
-                }
-            }
-
-            if (!this.items.isEmpty()) {
-                final IItemList<IAEFluidStack> monitorCache = this.monitor.getStorageList();
-
-                final SPacketMEInventoryUpdate piu = new SPacketMEInventoryUpdate(true);
-
-                for (final IAEFluidStack is : this.items) {
-                    final IAEFluidStack send = monitorCache.findPrecise(is);
-                    if (send == null) {
-                        is.setStackSize(0);
-                        piu.appendFluid(is);
-                    } else {
-                        piu.appendFluid(send);
-                    }
-                }
-
-                if (!piu.isEmpty()) {
-                    this.items.resetStatus();
-
-                    for (final Object c : this.crafters) {
-                        if (c instanceof EntityPlayer) {
-                            FluidCraft.proxy.netHandler.sendTo(piu, (EntityPlayerMP) c);
-                        }
-                    }
-                }
-            }
-
-            this.updatePowerStatus();
-
-            final boolean oldAccessible = this.canAccessViewCells;
-            this.canAccessViewCells =
-                this.host instanceof WirelessTerminalGuiObject
-                    || this.hasAccess(SecurityPermissions.BUILD, false);
-            if (this.canAccessViewCells != oldAccessible) {
-                for (int y = 0; y < 5; y++) {
-                    if (this.cellView[y] != null) {
-                        this.cellView[y].setAllowEdit(this.canAccessViewCells);
-                    }
-                }
-            }
-            super.detectAndSendChanges();
-        }
-    }
-
-    protected void updatePowerStatus() {
-        try {
-            if (this.networkNode != null) {
-                this.setPowered(this.networkNode.isActive());
-            } else if (this.getPowerSource() instanceof IEnergyGrid) {
-                this.setPowered(((IEnergyGrid) this.getPowerSource()).isNetworkPowered());
-            } else {
-                this.setPowered(this.getPowerSource().extractAEPower(1, Actionable.SIMULATE, PowerMultiplier.CONFIG) > 0.8);
-            }
-        } catch (final Throwable t) {
-            // :P
-        }
-    }
-
-    @Override
-    public void onUpdate(final String field, final Object oldValue, final Object newValue) {
-        if (field.equals("canAccessViewCells")) {
-            for (int y = 0; y < 5; y++) {
-                if (this.cellView[y] != null) {
-                    this.cellView[y].setAllowEdit(this.canAccessViewCells);
-                }
-            }
-        }
-
-        super.onUpdate(field, oldValue, newValue);
-    }
-
-    @Override
-    public void addCraftingToCrafters(final ICrafting c) {
-        super.addCraftingToCrafters(c);
-        this.queueInventory(c);
-    }
-
-    private void queueInventory(final ICrafting c) {
-        if (Platform.isServer() && c instanceof EntityPlayer && this.monitor != null) {
-            SPacketMEInventoryUpdate piu = new SPacketMEInventoryUpdate(true);
-            final IItemList<IAEFluidStack> monitorCache = this.monitor.getStorageList();
-
-            for (final IAEFluidStack send : monitorCache) {
-                try {
-                    piu.appendFluid(send);
-                } catch (final BufferOverflowException boe) {
-                    FluidCraft.proxy.netHandler.sendTo(piu, (EntityPlayerMP) c);
-
-                    piu = new SPacketMEInventoryUpdate(true);
-                    piu.appendFluid(send);
-                }
-            }
-            FluidCraft.proxy.netHandler.sendTo(piu, (EntityPlayerMP) c);
-        }
-    }
-
-    @Override
-    public void onContainerClosed(final EntityPlayer player) {
-        super.onContainerClosed(player);
-        if (this.monitor != null) {
-            this.monitor.removeListener(this);
-        }
-    }
-
-    @Override
-    public IConfigManager getConfigManager() {
-        if (Platform.isServer()) {
-            return this.serverCM;
-        }
-        return this.clientCM;
-    }
-
-    public ItemStack[] getViewCells() {
-        final ItemStack[] list = new ItemStack[this.cellView.length];
-
-        for (int x = 0; x < this.cellView.length; x++) {
-            list[x] = this.cellView[x].getStack();
-        }
-
-        return list;
-    }
-
-    public SlotRestrictedInput getCellViewSlot(final int index) {
-        return this.cellView[index];
-    }
-
-    public boolean isPowered() {
-        return this.hasPower;
-    }
-
-    private void setPowered(final boolean isPowered) {
-        this.hasPower = isPowered;
-    }
-
-    private IConfigManagerHost getGui() {
-        return this.gui;
-    }
-
-    public void setGui(@Nonnull final IConfigManagerHost gui) {
-        this.gui = gui;
-    }
-
-    @Override
-    public boolean isValid(Object verificationToken) {
-        return true;
-    }
-
-    @Override
-    public void postChange(IBaseMonitor<IAEFluidStack> monitor, Iterable<IAEFluidStack> change, BaseActionSource actionSource) {
-        for (final IAEFluidStack is : change) {
-            this.items.add(is);
-        }
-    }
-
-    private void dropItem(ItemStack is) {
-        if (is.stackSize <= 0) return;
-        ItemStack itemStack = is.copy();
-        int i = itemStack.getMaxStackSize();
-        while (itemStack.stackSize > 0) {
-            if (i > itemStack.stackSize) {
-                if (!getPlayerInv().addItemStackToInventory(itemStack.copy())) {
-                    getPlayerInv().player.entityDropItem(itemStack.copy(), 0);
-                }
-                break;
-            } else {
-                itemStack.stackSize -= i;
-                ItemStack item = itemStack.copy();
-                item.stackSize = i;
-                if (!getPlayerInv().addItemStackToInventory(item)) {
-                    getPlayerInv().player.entityDropItem(item, 0);
-                }
-            }
-        }
-    }
-
-    private void dropItem(ItemStack itemStack, int stackSize) {
-        if (itemStack.stackSize <= 0) return;
-        ItemStack is = itemStack.copy();
-        is.stackSize = stackSize;
-        this.dropItem(is);
-    }
-
-    public void postChange(Iterable<IAEFluidStack> change, ItemStack fluidContainer, EntityPlayer player, int slotIndex) {
-        for (IAEFluidStack fluid : change) {
-            IAEFluidStack nfluid = this.monitor.getStorageList().findPrecise(fluid);
-            ItemStack out = fluidContainer.copy();
-            out.stackSize = 1;
-            if (Util.FluidUtil.isEmpty(fluidContainer) && fluid != null) {
-//              add fluid to tanks
-                if (nfluid.getStackSize() <= 0) continue;
-                final IAEFluidStack toExtract = nfluid.copy();
-                MutablePair<Integer, ItemStack> fillStack = Util.FluidUtil.fillStack(out, toExtract.getFluidStack());
-                if (fillStack.right == null || fillStack.left <= 0) continue;
-                toExtract.setStackSize((long) fillStack.left * fluidContainer.stackSize);
-                IAEFluidStack tmp = this.host.getFluidInventory().extractItems(toExtract, Actionable.SIMULATE, this.getActionSource());
-                fillStack.right.stackSize = (int) (tmp.getStackSize() / fillStack.left);
-                this.dropItem(fillStack.right);
-                out.stackSize = fillStack.right.stackSize;
-                if (fillStack.right.getItem() instanceof IFluidContainerItem) {
-                    this.host.getFluidInventory().extractItems(toExtract, Actionable.MODULATE, this.getActionSource());
-                    if ((int) (tmp.getStackSize() % fillStack.left) > 0) {
-                        ((IFluidContainerItem) fillStack.right.getItem()).drain(fillStack.right, fillStack.left - (int) (tmp.getStackSize() % fillStack.left), true);
-                        this.dropItem(fillStack.right, 1);
-                        out.stackSize++;
-                    }
-                } else if (FluidContainerRegistry.isContainer(fillStack.right)) {
-                    toExtract.setStackSize((long) fillStack.right.stackSize * fillStack.left);
-                    this.host.getFluidInventory().extractItems(toExtract, Actionable.MODULATE, this.getActionSource());
-                }
-            } else if (!Util.FluidUtil.isEmpty(fluidContainer)) {
-//              add fluid to ae network
-                AEFluidStack fluidStack = Util.getAEFluidFromItem(fluidContainer);
-                final IAEFluidStack aeFluidStack = fluidStack.copy();
-                // simulate result is incorrect. so I'm using other solution and ec2 both mod have same issues
-                final IAEFluidStack notInserted = this.host.getFluidInventory().injectItems(aeFluidStack, Actionable.MODULATE, this.getActionSource());
-                MutablePair<Integer, ItemStack> drainStack = Util.FluidUtil.drainStack(out.copy(), aeFluidStack.getFluidStack());
-                if (notInserted != null && notInserted.getStackSize() > 0) {
-                    if (fluidStack.getStackSize() == notInserted.getStackSize()) continue;
-                    aeFluidStack.decStackSize(notInserted.getStackSize());
-
-                    if (drainStack.left > aeFluidStack.getStackSize() && FluidContainerRegistry.isContainer(drainStack.right)) {
-                        aeFluidStack.setStackSize(drainStack.left - aeFluidStack.getStackSize());
-                        this.host.getFluidInventory().extractItems(aeFluidStack, Actionable.MODULATE, this.getActionSource());
-                        continue;
-                    }
-
-                    this.dropItem(drainStack.right, (int) (aeFluidStack.getStackSize() / drainStack.left)); // drop empty item
-                    out.stackSize = (int) (notInserted.getStackSize() / drainStack.left);
-                    if (drainStack.right.getItem() instanceof IFluidContainerItem) {
-                        if (notInserted.getStackSize() % drainStack.left > 0) {
-                            fluidStack.setStackSize((notInserted.getStackSize() % drainStack.left));
-                            ((IFluidContainerItem) drainStack.right.getItem()).fill(drainStack.right, fluidStack.getFluidStack(), true);
-                            this.dropItem(drainStack.right, 1);
-                        }
-                    } else if (FluidContainerRegistry.isContainer(drainStack.right)) {
-                        if (notInserted.getStackSize() % drainStack.left > 0) {
-                            aeFluidStack.setStackSize(aeFluidStack.getStackSize() % drainStack.left);
-                            this.host.getFluidInventory().extractItems(aeFluidStack, Actionable.MODULATE, this.getActionSource());
-                            out.stackSize++;
-                        }
-                    }
-                    if (slotIndex == -1) out.stackSize = fluidContainer.stackSize - out.stackSize;
-                } else {
-                    out.stackSize = (int) (fluidContainer.stackSize - (aeFluidStack.getStackSize() / drainStack.left));
-                    this.dropItem(drainStack.right, fluidContainer.stackSize); // drop empty item
-                    if (slotIndex == -1) out.stackSize++;
-                }
-            } else {
-                continue;
-            }
-            if (slotIndex == -1) {
-                player.inventory.getItemStack().stackSize = player.inventory.getItemStack().stackSize - out.stackSize;
-                if (player.inventory.getItemStack().stackSize > 0) {
-                    FluidCraft.proxy.netHandler.sendTo(new SPacketFluidUpdate(new HashMap<>(), player.inventory.getItemStack()), (EntityPlayerMP) player);
-                } else {
-                    player.inventory.setItemStack(null);
-                    FluidCraft.proxy.netHandler.sendTo(new SPacketFluidUpdate(new HashMap<>()), (EntityPlayerMP) player);
-                }
-            } else {
-                player.inventory.setInventorySlotContents(slotIndex, out.stackSize > 0 ? out : null);
-            }
-        }
-        this.detectAndSendChanges();
-    }
-
-    @Override
-    public void onListUpdate() {
-        for (final Object c : this.crafters) {
-            if (c instanceof ICrafting) {
-                final ICrafting cr = (ICrafting) c;
-                this.queueInventory(cr);
-            }
-        }
-    }
-
-    @Override
-    public void updateSetting(final IConfigManager manager, final Enum settingName, final Enum newValue) {
-        if (this.getGui() != null) {
-            this.getGui().updateSetting(manager, settingName, newValue);
-        }
-    }
-}

src/main/java/com/glodblock/github/client/gui/container/FCBaseMonitorContain.java

@@ -1,408 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import appeng.api.AEApi;
-import appeng.api.config.*;
-import appeng.api.implementations.guiobjects.IPortableCell;
-import appeng.api.implementations.tiles.IMEChest;
-import appeng.api.implementations.tiles.IViewCellStorage;
-import appeng.api.networking.IGrid;
-import appeng.api.networking.IGridHost;
-import appeng.api.networking.IGridNode;
-import appeng.api.networking.energy.IEnergyGrid;
-import appeng.api.networking.energy.IEnergySource;
-import appeng.api.networking.security.BaseActionSource;
-import appeng.api.networking.storage.IBaseMonitor;
-import appeng.api.parts.IPart;
-import appeng.api.storage.IMEMonitor;
-import appeng.api.storage.IMEMonitorHandlerReceiver;
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.storage.data.IItemList;
-import appeng.api.util.IConfigManager;
-import appeng.api.util.IConfigurableObject;
-import appeng.container.AEBaseContainer;
-import appeng.container.guisync.GuiSync;
-import appeng.container.slot.SlotRestrictedInput;
-import appeng.core.AELog;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketValueConfig;
-import appeng.helpers.WirelessTerminalGuiObject;
-import appeng.me.helpers.ChannelPowerSrc;
-import appeng.util.ConfigManager;
-import appeng.util.IConfigManagerHost;
-import appeng.util.Platform;
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.network.SPacketMEInventoryUpdate;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.ICrafting;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import javax.annotation.Nonnull;
-import java.io.IOException;
-import java.nio.BufferOverflowException;
-
-public class FCBaseMonitorContain extends AEBaseContainer implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver<IAEItemStack>
-{
-
-    private final SlotRestrictedInput[] cellView = new SlotRestrictedInput[5];
-    private final IMEMonitor<IAEItemStack> monitor;
-    private final IItemList<IAEItemStack> items = AEApi.instance().storage().createItemList();
-    private final IConfigManager clientCM;
-    private final ITerminalHost host;
-    @GuiSync( 99 )
-    public boolean canAccessViewCells = false;
-    @GuiSync( 98 )
-    public boolean hasPower = false;
-    private IConfigManagerHost gui;
-    private IConfigManager serverCM;
-    private IGridNode networkNode;
-
-    public FCBaseMonitorContain(final InventoryPlayer ip, final ITerminalHost monitorable )
-    {
-        this( ip, monitorable, true );
-    }
-
-    protected FCBaseMonitorContain( final InventoryPlayer ip, final ITerminalHost monitorable, final boolean bindInventory )
-    {
-        super( ip, monitorable instanceof TileEntity ? (TileEntity) monitorable : null, monitorable instanceof IPart ? (IPart) monitorable : null );
-
-        this.host = monitorable;
-        this.clientCM = new ConfigManager( this );
-
-        this.clientCM.registerSetting( Settings.SORT_BY, SortOrder.NAME );
-        this.clientCM.registerSetting( Settings.VIEW_MODE, ViewItems.ALL );
-        this.clientCM.registerSetting( Settings.SORT_DIRECTION, SortDir.ASCENDING );
-
-        if( Platform.isServer() )
-        {
-            this.serverCM = monitorable.getConfigManager();
-
-            this.monitor = monitorable.getItemInventory();
-            if( this.monitor != null )
-            {
-                this.monitor.addListener( this, null );
-
-                this.setCellInventory( this.monitor );
-
-                if( monitorable instanceof IPortableCell)
-                {
-                    this.setPowerSource( (IEnergySource) monitorable );
-                }
-                else if( monitorable instanceof IMEChest)
-                {
-                    this.setPowerSource( (IEnergySource) monitorable );
-                }
-                else if( monitorable instanceof IGridHost)
-                {
-                    final IGridNode node = ( (IGridHost) monitorable ).getGridNode( ForgeDirection.UNKNOWN );
-                    if( node != null )
-                    {
-                        this.networkNode = node;
-                        final IGrid g = node.getGrid();
-                        if( g != null )
-                        {
-                            this.setPowerSource( new ChannelPowerSrc( this.networkNode, (IEnergySource) g.getCache( IEnergyGrid.class ) ) );
-                        }
-                    }
-                }
-            }
-            else
-            {
-                this.setValidContainer( false );
-            }
-        }
-        else
-        {
-            this.monitor = null;
-        }
-
-        this.canAccessViewCells = false;
-        if( monitorable instanceof IViewCellStorage)
-        {
-            for( int y = 0; y < 5; y++ )
-            {
-                this.cellView[y] = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.VIEW_CELL, ( (IViewCellStorage) monitorable ).getViewCellStorage(), y, 206, y * 18 + 8, this.getInventoryPlayer() );
-                this.cellView[y].setAllowEdit( this.canAccessViewCells );
-                this.addSlotToContainer( this.cellView[y] );
-            }
-        }
-
-        if( bindInventory )
-        {
-            this.bindPlayerInventory( ip, 0, 0 );
-        }
-    }
-
-    public IGridNode getNetworkNode()
-    {
-        return this.networkNode;
-    }
-
-    @Override
-    public void detectAndSendChanges()
-    {
-        if( Platform.isServer() )
-        {
-            if( this.monitor != this.host.getItemInventory() )
-            {
-                this.setValidContainer( false );
-            }
-
-            for( final Settings set : this.serverCM.getSettings() )
-            {
-                final Enum<?> sideLocal = this.serverCM.getSetting( set );
-                final Enum<?> sideRemote = this.clientCM.getSetting( set );
-
-                if( sideLocal != sideRemote )
-                {
-                    this.clientCM.putSetting( set, sideLocal );
-                    for( final Object crafter : this.crafters )
-                    {
-                        try
-                        {
-                            NetworkHandler.instance.sendTo( new PacketValueConfig( set.name(), sideLocal.name() ), (EntityPlayerMP) crafter );
-                        }
-                        catch( final IOException e )
-                        {
-                            AELog.debug( e );
-                        }
-                    }
-                }
-            }
-
-            if( !this.items.isEmpty() )
-            {
-                final IItemList<IAEItemStack> monitorCache = this.monitor.getStorageList();
-
-                final SPacketMEInventoryUpdate piu = new SPacketMEInventoryUpdate();
-
-                for( final IAEItemStack is : this.items )
-                {
-                    final IAEItemStack send = monitorCache.findPrecise( is );
-                    if( send == null )
-                    {
-                        is.setStackSize( 0 );
-                        piu.appendItem( is );
-                    }
-                    else
-                    {
-                        piu.appendItem( send );
-                    }
-                }
-
-                if( !piu.isEmpty() )
-                {
-                    this.items.resetStatus();
-
-                    for( final Object c : this.crafters )
-                    {
-                        if( c instanceof EntityPlayer)
-                        {
-                            FluidCraft.proxy.netHandler.sendTo(piu, (EntityPlayerMP) c);
-                        }
-                    }
-                }
-            }
-
-            this.updatePowerStatus();
-
-            final boolean oldAccessible = this.canAccessViewCells;
-            this.canAccessViewCells =
-                this.host instanceof WirelessTerminalGuiObject
-                    || this.hasAccess( SecurityPermissions.BUILD, false );
-            if( this.canAccessViewCells != oldAccessible )
-            {
-                for( int y = 0; y < 5; y++ )
-                {
-                    if( this.cellView[y] != null )
-                    {
-                        this.cellView[y].setAllowEdit( this.canAccessViewCells );
-                    }
-                }
-            }
-
-            super.detectAndSendChanges();
-        }
-    }
-
-    protected void updatePowerStatus()
-    {
-        try
-        {
-            if( this.networkNode != null )
-            {
-                this.setPowered( this.networkNode.isActive() );
-            }
-            else if( this.getPowerSource() instanceof IEnergyGrid )
-            {
-                this.setPowered( ( (IEnergyGrid) this.getPowerSource() ).isNetworkPowered() );
-            }
-            else
-            {
-                this.setPowered( this.getPowerSource().extractAEPower( 1, Actionable.SIMULATE, PowerMultiplier.CONFIG ) > 0.8 );
-            }
-        }
-        catch( final Throwable t )
-        {
-            // :P
-        }
-    }
-
-    @Override
-    public void onUpdate( final String field, final Object oldValue, final Object newValue )
-    {
-        if( field.equals( "canAccessViewCells" ) )
-        {
-            for( int y = 0; y < 5; y++ )
-            {
-                if( this.cellView[y] != null )
-                {
-                    this.cellView[y].setAllowEdit( this.canAccessViewCells );
-                }
-            }
-        }
-
-        super.onUpdate( field, oldValue, newValue );
-    }
-
-    @Override
-    public void addCraftingToCrafters( final ICrafting c )
-    {
-        super.addCraftingToCrafters( c );
-        this.queueInventory( c );
-    }
-
-    private void queueInventory( final ICrafting c )
-    {
-        if( Platform.isServer() && c instanceof EntityPlayer && this.monitor != null )
-        {
-            SPacketMEInventoryUpdate piu = new SPacketMEInventoryUpdate();
-            final IItemList<IAEItemStack> monitorCache = this.monitor.getStorageList();
-
-            for( final IAEItemStack send : monitorCache )
-            {
-                try
-                {
-                    piu.appendItem( send );
-                }
-                catch( final BufferOverflowException boe )
-                {
-                    FluidCraft.proxy.netHandler.sendTo( piu, (EntityPlayerMP) c );
-
-                    piu = new SPacketMEInventoryUpdate();
-                    piu.appendItem( send );
-                }
-            }
-            FluidCraft.proxy.netHandler.sendTo( piu, (EntityPlayerMP) c );
-        }
-    }
-
-    @Override
-    public void removeCraftingFromCrafters( final ICrafting c )
-    {
-        super.removeCraftingFromCrafters( c );
-
-        if( this.crafters.isEmpty() && this.monitor != null )
-        {
-            this.monitor.removeListener( this );
-        }
-    }
-
-    @Override
-    public void onContainerClosed( final EntityPlayer player )
-    {
-        super.onContainerClosed( player );
-        if( this.monitor != null )
-        {
-            this.monitor.removeListener( this );
-        }
-    }
-
-    @Override
-    public boolean isValid( final Object verificationToken )
-    {
-        return true;
-    }
-
-    @Override
-    public void postChange(final IBaseMonitor<IAEItemStack> monitor, final Iterable<IAEItemStack> change, final BaseActionSource source )
-    {
-        for( final IAEItemStack is : change )
-        {
-            this.items.add( is );
-        }
-    }
-
-    @Override
-    public void onListUpdate()
-    {
-        for( final Object c : this.crafters )
-        {
-            if( c instanceof ICrafting )
-            {
-                final ICrafting cr = (ICrafting) c;
-                this.queueInventory( cr );
-            }
-        }
-    }
-
-    @Override
-    public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
-    {
-        if( this.getGui() != null )
-        {
-            this.getGui().updateSetting( manager, settingName, newValue );
-        }
-    }
-
-    @Override
-    public IConfigManager getConfigManager()
-    {
-        if( Platform.isServer() )
-        {
-            return this.serverCM;
-        }
-        return this.clientCM;
-    }
-
-    public ItemStack[] getViewCells()
-    {
-        final ItemStack[] list = new ItemStack[this.cellView.length];
-
-        for( int x = 0; x < this.cellView.length; x++ )
-        {
-            list[x] = this.cellView[x].getStack();
-        }
-
-        return list;
-    }
-
-    public SlotRestrictedInput getCellViewSlot( final int index )
-    {
-        return this.cellView[index];
-    }
-
-    public boolean isPowered()
-    {
-        return this.hasPower;
-    }
-
-    private void setPowered( final boolean isPowered )
-    {
-        this.hasPower = isPowered;
-    }
-
-    private IConfigManagerHost getGui()
-    {
-        return this.gui;
-    }
-
-    public void setGui( @Nonnull final IConfigManagerHost gui )
-    {
-        this.gui = gui;
-    }
-}

src/main/java/com/glodblock/github/client/gui/container/FCBasePartContainer.java

@@ -1,642 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import appeng.api.AEApi;
-import appeng.api.config.Actionable;
-import appeng.api.definitions.IDefinitions;
-import appeng.api.networking.security.MachineSource;
-import appeng.api.storage.IMEMonitor;
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.storage.data.IItemList;
-import appeng.container.ContainerNull;
-import appeng.container.guisync.GuiSync;
-import appeng.container.slot.*;
-import appeng.core.sync.packets.PacketPatternSlot;
-import appeng.helpers.IContainerCraftingPacket;
-import appeng.items.storage.ItemViewCell;
-import appeng.tile.inventory.AppEngInternalInventory;
-import appeng.tile.inventory.IAEAppEngInventory;
-import appeng.tile.inventory.InvOperation;
-import appeng.util.InventoryAdaptor;
-import appeng.util.Platform;
-import appeng.util.inv.AdaptorPlayerHand;
-import appeng.util.item.AEItemStack;
-import com.glodblock.github.common.item.ItemFluidEncodedPattern;
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.util.Util;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.*;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class FCBasePartContainer extends FCBaseMonitorContain implements IAEAppEngInventory, IOptionalSlotHost, IContainerCraftingPacket {
-
-    private final PartFluidPatternTerminal patternTerminal;
-    private final AppEngInternalInventory cOut = new AppEngInternalInventory( null, 1 );
-    private final IInventory crafting;
-    protected final SlotFakeCraftingMatrix[] craftingSlots = new SlotFakeCraftingMatrix[9];
-    protected final OptionalSlotFake[] outputSlots = new OptionalSlotFake[3];
-    protected final SlotPatternTerm craftSlot;
-    protected final SlotRestrictedInput patternSlotIN;
-    protected final SlotRestrictedInput patternSlotOUT;
-    @GuiSync(97)
-    public boolean craftingMode = true;
-    @GuiSync(96)
-    public boolean substitute = false;
-    @GuiSync(95)
-    public boolean combine = false;
-    @GuiSync(94)
-    public boolean beSubstitute = false;
-
-
-    public FCBasePartContainer(final InventoryPlayer ip, final ITerminalHost monitorable) {
-        super(ip, monitorable, false);
-        this.patternTerminal = (PartFluidPatternTerminal) monitorable;
-
-        final IInventory patternInv = this.getPatternTerminal().getInventoryByName("pattern");
-        final IInventory output = this.getPatternTerminal().getInventoryByName("output");
-
-        this.crafting = this.getPatternTerminal().getInventoryByName( "crafting" );
-
-        for( int y = 0; y < 3; y++ )
-        {
-            for( int x = 0; x < 3; x++ )
-            {
-                this.addSlotToContainer( this.craftingSlots[x + y * 3] = new SlotFakeCraftingMatrix( this.crafting, x + y * 3, 18 + x * 18, -76 + y * 18 ) );
-            }
-        }
-
-        this.addSlotToContainer( this.craftSlot = new SlotPatternTerm( ip.player, this.getActionSource(), this.getPowerSource(), monitorable, this.crafting, patternInv, this.cOut, 110, -76 + 18, this, 2, this ) );
-        this.craftSlot.setIIcon( -1 );
-
-        for( int y = 0; y < 3; y++ )
-        {
-            this.addSlotToContainer( this.outputSlots[y] = new SlotPatternOutputs( output, this, y, 110, -76 + y * 18, 0, 0, 1 ) );
-            this.outputSlots[y].setRenderDisabled( false );
-        }
-
-        this.addSlotToContainer( this.patternSlotIN = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BLANK_PATTERN, patternInv, 0, 147, -72 - 9, this.getInventoryPlayer() ) );
-        this.addSlotToContainer( this.patternSlotOUT = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, patternInv, 1, 147, -72 + 34, this.getInventoryPlayer() ) );
-
-        this.patternSlotOUT.setStackLimit( 1 );
-
-        this.bindPlayerInventory( ip, 0, 0 );
-        this.updateOrderOfOutputSlots();
-    }
-
-    private void updateOrderOfOutputSlots()
-    {
-        if( !this.isCraftingMode() )
-        {
-            this.craftSlot.xDisplayPosition = -9000;
-
-            for( int y = 0; y < 3; y++ )
-            {
-                this.outputSlots[y].xDisplayPosition = this.outputSlots[y].getX();
-            }
-        }
-        else
-        {
-            this.craftSlot.xDisplayPosition = this.craftSlot.getX();
-
-            for( int y = 0; y < 3; y++ )
-            {
-                this.outputSlots[y].xDisplayPosition = -9000;
-            }
-        }
-    }
-
-    @Override
-    public void putStackInSlot( final int par1, final ItemStack par2ItemStack )
-    {
-        super.putStackInSlot( par1, par2ItemStack );
-        this.getAndUpdateOutput();
-    }
-
-    @Override
-    public void putStacksInSlots( final ItemStack[] par1ArrayOfItemStack )
-    {
-        super.putStacksInSlots( par1ArrayOfItemStack );
-        this.getAndUpdateOutput();
-    }
-
-    private ItemStack getAndUpdateOutput()
-    {
-        final InventoryCrafting ic = new InventoryCrafting( this, 3, 3 );
-
-        for( int x = 0; x < ic.getSizeInventory(); x++ )
-        {
-            ic.setInventorySlotContents( x, this.crafting.getStackInSlot( x ) );
-        }
-
-        final ItemStack is = CraftingManager.getInstance().findMatchingRecipe( ic, this.getPlayerInv().player.worldObj );
-        this.cOut.setInventorySlotContents( 0, is );
-        return is;
-    }
-
-    @Override
-    public void saveChanges()
-    {
-
-    }
-
-    @Override
-    public void onChangeInventory(final IInventory inv, final int slot, final InvOperation mc, final ItemStack removedStack, final ItemStack newStack )
-    {
-
-    }
-
-    public void encodeAndMoveToInventory()
-    {
-        encode();
-        ItemStack output = this.patternSlotOUT.getStack();
-        if ( output != null )
-        {
-            if (!getPlayerInv().addItemStackToInventory( output )){
-                getPlayerInv().player.entityDropItem(output, 0);
-            }
-            this.patternSlotOUT.putStack( null );
-        }
-    }
-
-    public void encode()
-    {
-        ItemStack output = this.patternSlotOUT.getStack();
-
-        final ItemStack[] in = this.getInputs();
-        final ItemStack[] out = this.getOutputs();
-
-        // if there is no input, this would be silly.
-        if( in == null || out == null )
-        {
-            return;
-        }
-
-        // first check the output slots, should either be null, or a pattern
-        if( output != null && !this.isPattern( output ) )
-        {
-            return;
-        }// if nothing is there we should snag a new pattern.
-        else if( output == null )
-        {
-            output = this.patternSlotIN.getStack();
-            if (!this.isPattern( output ))
-            {
-                return; // no blanks.
-            }
-
-            // remove one, and clear the input slot.
-            output.stackSize--;
-            if( output.stackSize == 0 )
-            {
-                this.patternSlotIN.putStack( null );
-            }
-
-            // add a new encoded pattern.
-            for( final ItemStack encodedPatternStack : AEApi.instance().definitions().items().encodedPattern().maybeStack( 1 ).asSet() )
-            {
-                output = encodedPatternStack;
-                this.patternSlotOUT.putStack( output );
-            }
-        } else if ( output.getItem() instanceof ItemFluidEncodedPattern ) {
-            for( final ItemStack encodedPatternStack : AEApi.instance().definitions().items().encodedPattern().maybeStack( 1 ).asSet() )
-            {
-                output = encodedPatternStack;
-                this.patternSlotOUT.putStack( output );
-            }
-        }
-
-        // encode the slot.
-        final NBTTagCompound encodedValue = new NBTTagCompound();
-
-        final NBTTagList tagIn = new NBTTagList();
-        final NBTTagList tagOut = new NBTTagList();
-
-        for( final ItemStack i : in )
-        {
-            tagIn.appendTag( this.createItemTag( i ) );
-        }
-
-        for( final ItemStack i : out )
-        {
-            tagOut.appendTag( this.createItemTag( i ) );
-        }
-
-        encodedValue.setTag( "in", tagIn );
-        encodedValue.setTag( "out", tagOut );
-        encodedValue.setBoolean( "crafting", this.isCraftingMode() );
-        encodedValue.setBoolean("substitute", this.isSubstitute());
-        encodedValue.setBoolean("beSubstitute", this.canBeSubstitute());
-        output.setTagCompound(encodedValue);
-    }
-
-    private ItemStack[] getInputs()
-    {
-        final ItemStack[] input = new ItemStack[9];
-        boolean hasValue = false;
-
-        for( int x = 0; x < this.craftingSlots.length; x++ )
-        {
-            input[x] = this.craftingSlots[x].getStack();
-            if( input[x] != null )
-            {
-                hasValue = true;
-            }
-        }
-
-        if( hasValue )
-        {
-            return input;
-        }
-
-        return null;
-    }
-
-    private ItemStack[] getOutputs()
-    {
-        if( this.isCraftingMode() )
-        {
-            final ItemStack out = this.getAndUpdateOutput();
-
-            if( out != null && out.stackSize > 0 )
-            {
-                return new ItemStack[] { out };
-            }
-        }
-        else
-        {
-            final List<ItemStack> list = new ArrayList<>( 3 );
-            boolean hasValue = false;
-
-            for( final OptionalSlotFake outputSlot : this.outputSlots )
-            {
-                final ItemStack out = outputSlot.getStack();
-
-                if( out != null && out.stackSize > 0 )
-                {
-                    list.add( out );
-                    hasValue = true;
-                }
-            }
-
-            if( hasValue )
-            {
-                return list.toArray( new ItemStack[list.size()] );
-            }
-        }
-
-        return null;
-    }
-
-    private boolean isPattern( final ItemStack output )
-    {
-        if( output == null )
-        {
-            return false;
-        }
-        if (output.getItem() instanceof ItemFluidEncodedPattern) {
-            return true;
-        }
-        final IDefinitions definitions = AEApi.instance().definitions();
-
-        boolean isPattern = definitions.items().encodedPattern().isSameAs( output );
-        isPattern |= definitions.materials().blankPattern().isSameAs( output );
-
-        return isPattern;
-    }
-
-    private NBTBase createItemTag(final ItemStack i )
-    {
-        final NBTTagCompound c = new NBTTagCompound();
-
-        if( i != null )
-        {
-            i.writeToNBT( c );
-        }
-
-        return c;
-    }
-
-    @Override
-    public boolean isSlotEnabled( final int idx )
-    {
-        if( idx == 1 )
-        {
-            return Platform.isServer() ? !this.getPatternTerminal().isCraftingRecipe() : !this.isCraftingMode();
-        }
-        else if( idx == 2 )
-        {
-            return Platform.isServer() ? this.getPatternTerminal().isCraftingRecipe() : this.isCraftingMode();
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    public void craftOrGetItem( final PacketPatternSlot packetPatternSlot )
-    {
-        if( packetPatternSlot.slotItem != null && this.getCellInventory() != null )
-        {
-            final IAEItemStack out = packetPatternSlot.slotItem.copy();
-            InventoryAdaptor inv = new AdaptorPlayerHand( this.getPlayerInv().player );
-            final InventoryAdaptor playerInv = InventoryAdaptor.getAdaptor( this.getPlayerInv().player, ForgeDirection.UNKNOWN );
-
-            if( packetPatternSlot.shift )
-            {
-                inv = playerInv;
-            }
-
-            if( inv.simulateAdd( out.getItemStack() ) != null )
-            {
-                return;
-            }
-
-            final IAEItemStack extracted = Platform.poweredExtraction( this.getPowerSource(), this.getCellInventory(), out, this.getActionSource() );
-            final EntityPlayer p = this.getPlayerInv().player;
-
-            if( extracted != null )
-            {
-                inv.addItems( extracted.getItemStack() );
-                if( p instanceof EntityPlayerMP)
-                {
-                    this.updateHeld( (EntityPlayerMP) p );
-                }
-                this.detectAndSendChanges();
-                return;
-            }
-
-            final InventoryCrafting ic = new InventoryCrafting( new ContainerNull(), 3, 3 );
-            final InventoryCrafting real = new InventoryCrafting( new ContainerNull(), 3, 3 );
-
-            for( int x = 0; x < 9; x++ )
-            {
-                ic.setInventorySlotContents( x, packetPatternSlot.pattern[x] == null ? null : packetPatternSlot.pattern[x].getItemStack() );
-            }
-
-            final IRecipe r = Platform.findMatchingRecipe( ic, p.worldObj );
-
-            if( r == null )
-            {
-                return;
-            }
-
-            final IMEMonitor<IAEItemStack> storage = this.getPatternTerminal().getItemInventory();
-            final IItemList<IAEItemStack> all = storage.getStorageList();
-
-            final ItemStack is = r.getCraftingResult( ic );
-
-            for( int x = 0; x < ic.getSizeInventory(); x++ )
-            {
-                if( ic.getStackInSlot( x ) != null )
-                {
-                    final ItemStack pulled = Platform.extractItemsByRecipe( this.getPowerSource(), this.getActionSource(), storage, p.worldObj, r, is, ic, ic.getStackInSlot( x ), x, all, Actionable.MODULATE, ItemViewCell.createFilter( this.getViewCells() ) );
-                    real.setInventorySlotContents( x, pulled );
-                }
-            }
-
-            final IRecipe rr = Platform.findMatchingRecipe( real, p.worldObj );
-
-            if( rr == r && Platform.isSameItemPrecise( rr.getCraftingResult( real ), is ) )
-            {
-                final SlotCrafting sc = new SlotCrafting( p, real, this.cOut, 0, 0, 0 );
-                sc.onPickupFromSlot( p, is );
-
-                for( int x = 0; x < real.getSizeInventory(); x++ )
-                {
-                    final ItemStack failed = playerInv.addItems( real.getStackInSlot( x ) );
-
-                    if( failed != null )
-                    {
-                        p.dropPlayerItemWithRandomChoice( failed, false );
-                    }
-                }
-
-                inv.addItems( is );
-                if( p instanceof EntityPlayerMP )
-                {
-                    this.updateHeld( (EntityPlayerMP) p );
-                }
-                this.detectAndSendChanges();
-            }
-            else
-            {
-                for( int x = 0; x < real.getSizeInventory(); x++ )
-                {
-                    final ItemStack failed = real.getStackInSlot( x );
-                    if( failed != null )
-                    {
-                        this.getCellInventory().injectItems( AEItemStack.create( failed ), Actionable.MODULATE, new MachineSource( this.getPatternTerminal() ) );
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public void detectAndSendChanges()
-    {
-        super.detectAndSendChanges();
-        if( Platform.isServer() )
-        {
-            if( this.isCraftingMode() != this.getPatternTerminal().isCraftingRecipe() )
-            {
-                this.setCraftingMode( this.getPatternTerminal().isCraftingRecipe() );
-                this.updateOrderOfOutputSlots();
-            }
-
-            this.substitute = this.patternTerminal.isSubstitution();
-            this.combine = this.patternTerminal.shouldCombine();
-            this.beSubstitute = this.patternTerminal.canBeSubstitute();
-        }
-    }
-
-    @Override
-    public void onUpdate( final String field, final Object oldValue, final Object newValue )
-    {
-        super.onUpdate( field, oldValue, newValue );
-
-        if( field.equals( "craftingMode" ) )
-        {
-            this.getAndUpdateOutput();
-            this.updateOrderOfOutputSlots();
-        }
-    }
-
-    @Override
-    public void onSlotChange( final Slot s )
-    {
-        if( s == this.patternSlotOUT && Platform.isServer() )
-        {
-            for( final Object crafter : this.crafters )
-            {
-                final ICrafting icrafting = (ICrafting) crafter;
-
-                for( final Object g : this.inventorySlots )
-                {
-                    if( g instanceof OptionalSlotFake || g instanceof SlotFakeCraftingMatrix )
-                    {
-                        final Slot sri = (Slot) g;
-                        icrafting.sendSlotContents( this, sri.slotNumber, sri.getStack() );
-                    }
-                }
-                ( (EntityPlayerMP) icrafting ).isChangingQuantityOnly = false;
-            }
-            this.detectAndSendChanges();
-        }
-    }
-
-    public void clear()
-    {
-        for( final Slot s : this.craftingSlots )
-        {
-            s.putStack( null );
-        }
-
-        for( final Slot s : this.outputSlots )
-        {
-            s.putStack( null );
-        }
-
-        this.detectAndSendChanges();
-        this.getAndUpdateOutput();
-    }
-
-    @Override
-    public IInventory getInventoryByName( final String name )
-    {
-        if( name.equals( "player" ) )
-        {
-            return this.getInventoryPlayer();
-        }
-        return this.getPatternTerminal().getInventoryByName( name );
-    }
-
-    @Override
-    public boolean useRealItems()
-    {
-        return false;
-    }
-
-    public void toggleSubstitute()
-    {
-        this.substitute = !this.substitute;
-
-        this.detectAndSendChanges();
-        this.getAndUpdateOutput();
-    }
-
-    public boolean isCraftingMode()
-    {
-        return this.craftingMode;
-    }
-
-    private void setCraftingMode(final boolean craftingMode) {
-        this.craftingMode = craftingMode;
-    }
-
-    public PartFluidPatternTerminal getPatternTerminal() {
-        return this.patternTerminal;
-    }
-
-    private boolean canBeSubstitute() {
-        return this.beSubstitute;
-    }
-
-    private boolean isSubstitute() {
-        return this.substitute;
-    }
-
-    public void setSubstitute(final boolean substitute) {
-        this.substitute = substitute;
-    }
-
-    static boolean canDoubleStacks(SlotFake[] slots)
-    {
-        List<SlotFake> enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList());
-        long emptyStots = enabledSlots.stream().filter(s -> s.getStack() == null).count();
-        long fullSlots = enabledSlots.stream().filter(s-> s.getStack() != null && s.getStack().stackSize * 2 > 127).count();
-        return fullSlots <= emptyStots && emptyStots < enabledSlots.size();
-    }
-
-    static void doubleStacksInternal(SlotFake[] slots)
-    {
-        List<ItemStack> overFlowStacks = new ArrayList<>();
-        List<SlotFake> enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList());
-        for (final Slot s : enabledSlots)
-        {
-            ItemStack st = s.getStack();
-            if (st == null)
-                continue;
-            if (Util.isFluidPacket(st)) {
-                FluidStack fluidStack = ItemFluidPacket.getFluidStack(st);
-                if (fluidStack != null) {
-                    fluidStack = ItemFluidPacket.getFluidStack(st).copy();
-                    if (fluidStack.amount < Integer.MAX_VALUE / 2)
-                        fluidStack.amount *= 2;
-                }
-                s.putStack(ItemFluidPacket.newStack(fluidStack));
-            }
-            else if (st.stackSize * 2 > 127)
-            {
-                overFlowStacks.add(st.copy());
-            }
-            else
-            {
-                st.stackSize *= 2;
-                s.putStack(st);
-            }
-        }
-        Iterator<ItemStack> ow = overFlowStacks.iterator();
-        for (final Slot s : enabledSlots) {
-            if (!ow.hasNext())
-                break;
-            if (s.getStack() != null)
-                continue;
-            s.putStack(ow.next());
-        }
-        assert !ow.hasNext();
-    }
-
-    static boolean containsItem(SlotFake[] slots) {
-        List<SlotFake> enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList());
-        long item = enabledSlots.stream().filter(s -> s.getStack() != null && !Util.isFluidPacket(s.getStack())).count();
-        return item > 0;
-    }
-
-    static boolean containsFluid(SlotFake[] slots) {
-        List<SlotFake> enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList());
-        long fluid = enabledSlots.stream().filter(s -> Util.isFluidPacket(s.getStack())).count();
-        return fluid > 0;
-    }
-
-    public void doubleStacks(boolean isShift) {
-        if (!isCraftingMode() && canDoubleStacks(craftingSlots) && canDoubleStacks(outputSlots)) {
-            doubleStacksInternal(this.craftingSlots);
-            doubleStacksInternal(this.outputSlots);
-            if (isShift && (containsItem(outputSlots) || containsItem(craftingSlots))) {
-                while (canDoubleStacks(craftingSlots) && canDoubleStacks(outputSlots)) {
-                    doubleStacksInternal(this.craftingSlots);
-                    doubleStacksInternal(this.outputSlots);
-                }
-            }
-            this.detectAndSendChanges();
-        }
-    }
-
-}

src/main/java/com/glodblock/github/client/gui/container/FCBasePartContainerEx.java

@@ -1,488 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import appeng.api.AEApi;
-import appeng.api.definitions.IDefinitions;
-import appeng.api.storage.ITerminalHost;
-import appeng.container.guisync.GuiSync;
-import appeng.container.slot.IOptionalSlotHost;
-import appeng.container.slot.OptionalSlotFake;
-import appeng.container.slot.SlotFake;
-import appeng.container.slot.SlotRestrictedInput;
-import appeng.helpers.IContainerCraftingPacket;
-import appeng.tile.inventory.IAEAppEngInventory;
-import appeng.tile.inventory.InvOperation;
-import appeng.util.Platform;
-import com.glodblock.github.common.item.ItemFluidEncodedPattern;
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.util.Util;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.ICrafting;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraftforge.fluids.FluidStack;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class FCBasePartContainerEx extends FCBaseMonitorContain implements IAEAppEngInventory, IOptionalSlotHost, IContainerCraftingPacket {
-
-    private static final int CRAFTING_GRID_PAGES = 2;
-    private static final int CRAFTING_GRID_WIDTH = 4;
-    private static final int CRAFTING_GRID_HEIGHT = 4;
-    private static final int CRAFTING_GRID_SLOTS = CRAFTING_GRID_WIDTH * CRAFTING_GRID_HEIGHT;
-
-    private static class ProcessingSlotFake extends OptionalSlotFake {
-
-        private static final int POSITION_SHIFT = 9000;
-        private boolean hidden = false;
-
-        public ProcessingSlotFake(IInventory inv, IOptionalSlotHost containerBus, int idx, int x, int y, int offX, int offY, int groupNum) {
-            super(inv, containerBus, idx, x, y, offX, offY, groupNum);
-            this.setRenderDisabled(false);
-        }
-
-        public void setHidden(boolean hide) {
-            if (this.hidden != hide) {
-                this.hidden = hide;
-                this.xDisplayPosition += (hide ? -1 : 1) * POSITION_SHIFT;
-            }
-        }
-    }
-
-    private final PartFluidPatternTerminalEx patternTerminal;
-    protected final ProcessingSlotFake[] craftingSlots = new ProcessingSlotFake[CRAFTING_GRID_SLOTS * CRAFTING_GRID_PAGES];
-    protected final ProcessingSlotFake[] outputSlots = new ProcessingSlotFake[CRAFTING_GRID_SLOTS * CRAFTING_GRID_PAGES];
-    protected final SlotRestrictedInput patternSlotIN;
-    protected final SlotRestrictedInput patternSlotOUT;
-    @GuiSync(96 + (17 - 9) + 11)
-    public boolean combine = false;
-    @GuiSync(96 + (17 - 9) + 12)
-    public boolean substitute = false;
-    @GuiSync(96 + (17 - 9) + 16)
-    public boolean inverted;
-    @GuiSync(96 + (17 - 9) + 17)
-    public int activePage = 0;
-    @GuiSync(96 + (17 - 9) + 13)
-    public boolean prioritize = false;
-    @GuiSync(96 + (17 - 9) + 14)
-    public boolean beSubstitute = false;
-
-    public FCBasePartContainerEx(final InventoryPlayer ip, final ITerminalHost monitorable) {
-        super(ip, monitorable, false);
-        this.patternTerminal = (PartFluidPatternTerminalEx) monitorable;
-        this.inverted = patternTerminal.isInverted();
-
-        final IInventory patternInv = this.getPatternTerminal().getInventoryByName("pattern");
-        final IInventory output = this.getPatternTerminal().getInventoryByName("output");
-        IInventory crafting = this.getPatternTerminal().getInventoryByName("crafting");
-
-        for (int page = 0; page < CRAFTING_GRID_PAGES; page++) {
-            for (int y = 0; y < CRAFTING_GRID_HEIGHT; y++) {
-                for (int x = 0; x < CRAFTING_GRID_WIDTH; x++) {
-                    this.addSlotToContainer(this.craftingSlots[x + y * CRAFTING_GRID_WIDTH + page * CRAFTING_GRID_SLOTS] = new ProcessingSlotFake(crafting, this, x + y * CRAFTING_GRID_WIDTH + page * CRAFTING_GRID_SLOTS, 15, -83, x, y, x + 4));
-                }
-            }
-            for (int x = 0; x < CRAFTING_GRID_WIDTH; x++) {
-                for (int y = 0; y < CRAFTING_GRID_HEIGHT; y++) {
-                    this.addSlotToContainer(this.outputSlots[x * CRAFTING_GRID_HEIGHT + y + page * CRAFTING_GRID_SLOTS] = new ProcessingSlotFake(output, this, x * CRAFTING_GRID_HEIGHT + y + page * CRAFTING_GRID_SLOTS, 112, -83, -x, y, x));
-                }
-            }
-        }
-
-        this.addSlotToContainer( this.patternSlotIN = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BLANK_PATTERN, patternInv, 0, 147, -72 - 9, this.getInventoryPlayer() ) );
-        this.addSlotToContainer( this.patternSlotOUT = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, patternInv, 1, 147, -72 + 34, this.getInventoryPlayer() ) );
-
-        this.patternSlotOUT.setStackLimit( 1 );
-
-        this.bindPlayerInventory( ip, 0, 0 );
-    }
-
-    @Override
-    public void saveChanges()
-    {
-
-    }
-
-    public void clear()
-    {
-        for( final Slot s : this.craftingSlots )
-        {
-            s.putStack( null );
-        }
-
-        for( final Slot s : this.outputSlots )
-        {
-            s.putStack( null );
-        }
-
-        this.detectAndSendChanges();
-    }
-
-    @Override
-    public void onChangeInventory(final IInventory inv, final int slot, final InvOperation mc, final ItemStack removedStack, final ItemStack newStack )
-    {
-
-    }
-
-    public void encodeAndMoveToInventory()
-    {
-        encode();
-        ItemStack output = this.patternSlotOUT.getStack();
-        if ( output != null )
-        {
-            if (!getPlayerInv().addItemStackToInventory( output )){
-                getPlayerInv().player.entityDropItem(output, 0);
-            }
-            this.patternSlotOUT.putStack( null );
-        }
-    }
-
-    public void encode()
-    {
-        ItemStack output = this.patternSlotOUT.getStack();
-
-        final ItemStack[] in = this.getInputs();
-        final ItemStack[] out = this.getOutputs();
-
-        // if there is no input, this would be silly.
-        if( in == null || out == null )
-        {
-            return;
-        }
-
-        // first check the output slots, should either be null, or a pattern
-        if( output != null && !this.isPattern( output ) )
-        {
-            return;
-        }// if nothing is there we should snag a new pattern.
-        else if( output == null )
-        {
-            output = this.patternSlotIN.getStack();
-            if (!this.isPattern( output ))
-            {
-                return; // no blanks.
-            }
-
-            // remove one, and clear the input slot.
-            output.stackSize--;
-            if( output.stackSize == 0 )
-            {
-                this.patternSlotIN.putStack( null );
-            }
-
-            // add a new encoded pattern.
-            for( final ItemStack encodedPatternStack : AEApi.instance().definitions().items().encodedPattern().maybeStack( 1 ).asSet() )
-            {
-                output = encodedPatternStack;
-                this.patternSlotOUT.putStack( output );
-            }
-        } else if ( output.getItem() instanceof ItemFluidEncodedPattern ) {
-            for( final ItemStack encodedPatternStack : AEApi.instance().definitions().items().encodedPattern().maybeStack( 1 ).asSet() )
-            {
-                output = encodedPatternStack;
-                this.patternSlotOUT.putStack( output );
-            }
-        }
-
-        // encode the slot.
-        final NBTTagCompound encodedValue = new NBTTagCompound();
-
-        final NBTTagList tagIn = new NBTTagList();
-        final NBTTagList tagOut = new NBTTagList();
-
-        for( final ItemStack i : in )
-        {
-            tagIn.appendTag( this.createItemTag( i ) );
-        }
-
-        for( final ItemStack i : out )
-        {
-            tagOut.appendTag( this.createItemTag( i ) );
-        }
-
-        encodedValue.setTag( "in", tagIn );
-        encodedValue.setTag( "out", tagOut );
-        encodedValue.setBoolean("substitute", this.isSubstitute());
-        encodedValue.setBoolean("beSubstitute", this.canBeSubstitute());
-        encodedValue.setTag("in", tagIn);
-        encodedValue.setTag( "out", tagOut );
-        encodedValue.setBoolean( "prioritize", this.isPrioritize() );
-
-        output.setTagCompound( encodedValue );
-    }
-
-    private ItemStack[] getInputs()
-    {
-        final ItemStack[] input = new ItemStack[CRAFTING_GRID_SLOTS * CRAFTING_GRID_PAGES];
-        boolean hasValue = false;
-
-        for( int x = 0; x < this.craftingSlots.length; x++ )
-        {
-            input[x] = this.craftingSlots[x].getStack();
-            if( input[x] != null )
-            {
-                hasValue = true;
-            }
-        }
-
-        if( hasValue )
-        {
-            return input;
-        }
-
-        return null;
-    }
-
-    private ItemStack[] getOutputs()
-    {
-        final List<ItemStack> list = new ArrayList<>( CRAFTING_GRID_SLOTS * CRAFTING_GRID_PAGES );
-        boolean hasValue = false;
-
-        for( final OptionalSlotFake outputSlot : this.outputSlots )
-        {
-            final ItemStack out = outputSlot.getStack();
-
-            if( out != null && out.stackSize > 0 )
-            {
-                list.add( out );
-                hasValue = true;
-            }
-        }
-
-        if( hasValue )
-        {
-            return list.toArray(new ItemStack[0]);
-        }
-
-        return null;
-    }
-
-    private boolean isPattern( final ItemStack output )
-    {
-        if( output == null )
-        {
-            return false;
-        }
-        if (output.getItem() instanceof ItemFluidEncodedPattern) {
-            return true;
-        }
-        final IDefinitions definitions = AEApi.instance().definitions();
-
-        boolean isPattern = definitions.items().encodedPattern().isSameAs( output );
-        isPattern |= definitions.materials().blankPattern().isSameAs( output );
-
-        return isPattern;
-    }
-
-    private NBTBase createItemTag(final ItemStack i )
-    {
-        final NBTTagCompound c = new NBTTagCompound();
-
-        if( i != null )
-        {
-            i.writeToNBT( c );
-        }
-
-        return c;
-    }
-
-    @Override
-    public boolean isSlotEnabled( final int idx )
-    {
-        if (idx < 4) // outputs
-        {
-            return inverted || idx == 0;
-        }
-        else
-        {
-            return !inverted || idx == 4;
-        }
-    }
-
-    @Override
-    public void detectAndSendChanges()
-    {
-        super.detectAndSendChanges();
-        if( Platform.isServer() )
-        {
-            this.substitute = this.patternTerminal.isSubstitution();
-            this.combine = this.patternTerminal.shouldCombine(); //Check out
-            this.beSubstitute = this.patternTerminal.canBeSubstitute();
-            this.prioritize = this.patternTerminal.isPrioritize();
-            if (inverted != patternTerminal.isInverted() || activePage != patternTerminal.getActivePage()) {
-                inverted = patternTerminal.isInverted();
-                activePage = patternTerminal.getActivePage();
-                offsetSlots();
-            }
-        }
-    }
-
-    private void offsetSlots()
-    {
-        for (int page = 0; page < CRAFTING_GRID_PAGES; page++) {
-            for (int y = 0; y < CRAFTING_GRID_HEIGHT; y++) {
-                for (int x = 0; x < CRAFTING_GRID_WIDTH; x++) {
-                    this.craftingSlots[x + y * CRAFTING_GRID_WIDTH + page * CRAFTING_GRID_SLOTS].setHidden(page != activePage || x > 0 && inverted);
-                    this.outputSlots[x * CRAFTING_GRID_HEIGHT + y + page * CRAFTING_GRID_SLOTS].setHidden(page != activePage || x > 0 && !inverted);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onUpdate(String field, Object oldValue, Object newValue) {
-        super.onUpdate( field, oldValue, newValue );
-
-        if (field.equals( "inverted" ) || field.equals( "activePage" )) {
-            offsetSlots();
-        }
-    }
-
-    @Override
-    public void onSlotChange( final Slot s )
-    {
-        if( s == this.patternSlotOUT && Platform.isServer() )
-        {
-            inverted = patternTerminal.isInverted();
-
-            for( final Object crafter : this.crafters )
-            {
-                final ICrafting icrafting = (ICrafting) crafter;
-
-                for( final Object g : this.inventorySlots )
-                {
-                    if( g instanceof OptionalSlotFake )
-                    {
-                        final Slot sri = (Slot) g;
-                        icrafting.sendSlotContents( this, sri.slotNumber, sri.getStack() );
-                    }
-                }
-                ( (EntityPlayerMP) icrafting ).isChangingQuantityOnly = false;
-            }
-            this.detectAndSendChanges();
-        }
-    }
-
-    @Override
-    public IInventory getInventoryByName( final String name )
-    {
-        if( name.equals( "player" ) )
-        {
-            return this.getInventoryPlayer();
-        }
-        return this.getPatternTerminal().getInventoryByName( name );
-    }
-
-    @Override
-    public boolean useRealItems()
-    {
-        return false;
-    }
-
-    public PartFluidPatternTerminalEx getPatternTerminal()
-    {
-        return this.patternTerminal;
-    }
-
-    private boolean isSubstitute()
-    {
-        return this.substitute;
-    }
-
-    private boolean isPrioritize() { return this.prioritize; }
-
-    static boolean canDoubleStacks(SlotFake[] slots)
-    {
-        List<SlotFake> enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList());
-        long emptyStots = enabledSlots.stream().filter(s -> s.getStack() == null).count();
-        long fullSlots = enabledSlots.stream().filter(s-> s.getStack() != null && s.getStack().stackSize * 2 > 127).count();
-        return fullSlots <= emptyStots;
-    }
-
-    static void doubleStacksInternal(SlotFake[] slots)
-    {
-        List<ItemStack> overFlowStacks = new ArrayList<>();
-        List<SlotFake> enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList());
-        for (final Slot s : enabledSlots)
-        {
-            ItemStack st = s.getStack();
-            if (st == null)
-                continue;
-            if (Util.isFluidPacket(st)) {
-                FluidStack fluidStack = ItemFluidPacket.getFluidStack(st);
-                if (fluidStack != null) {
-                    fluidStack = ItemFluidPacket.getFluidStack(st).copy();
-                    if (fluidStack.amount < Integer.MAX_VALUE / 2)
-                        fluidStack.amount *= 2;
-                }
-                s.putStack(ItemFluidPacket.newStack(fluidStack));
-            }
-            else if (st.stackSize * 2 > 127)
-            {
-                overFlowStacks.add(st.copy());
-            }
-            else
-            {
-                st.stackSize *= 2;
-                s.putStack(st);
-            }
-        }
-        Iterator<ItemStack> ow = overFlowStacks.iterator();
-        for (final Slot s : enabledSlots) {
-            if (!ow.hasNext())
-                break;
-            if (s.getStack() != null)
-                continue;
-            s.putStack(ow.next());
-        }
-        assert !ow.hasNext();
-    }
-
-    static boolean containsItem(SlotFake[] slots) {
-        List<SlotFake> enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList());
-        long item = enabledSlots.stream().filter(s -> s.getStack() != null && !Util.isFluidPacket(s.getStack())).count();
-        return item > 0;
-    }
-
-    private boolean canBeSubstitute() {
-        return this.beSubstitute;
-    }
-
-    static boolean containsFluid(SlotFake[] slots) {
-        List<SlotFake> enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList());
-        long fluid = enabledSlots.stream().filter(s -> Util.isFluidPacket(s.getStack())).count();
-        return fluid > 0;
-    }
-
-    public void doubleStacks(boolean isShift) {
-        if (canDoubleStacks(craftingSlots) && canDoubleStacks(outputSlots)) {
-            doubleStacksInternal(this.craftingSlots);
-            doubleStacksInternal(this.outputSlots);
-            if (isShift && (containsItem(outputSlots) || containsItem(craftingSlots))) {
-                while (canDoubleStacks(craftingSlots) && canDoubleStacks(outputSlots)) {
-                    doubleStacksInternal(this.craftingSlots);
-                    doubleStacksInternal(this.outputSlots);
-                }
-            }
-            this.detectAndSendChanges();
-        }
-    }
-
-    public void setActivePage(final int activePage) {
-        this.activePage = activePage;
-    }
-
-    public int getActivePage() {
-        return this.activePage;
-    }
-
-}

src/main/java/com/glodblock/github/client/gui/container/FluidPrioritization.java

@@ -1,12 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-
-import akka.actor.Status;
-
-import java.lang.reflect.Type;
-
-public enum FluidPrioritization {
-    ENABLED,
-    DISABLED;
-
-}

src/main/java/com/glodblock/github/client/gui/container/base/FCBaseContainer.java

@@ -0,0 +1,81 @@
+package com.glodblock.github.client.gui.container.base;
+
+import net.minecraft.entity.player.InventoryPlayer;
+
+import com.glodblock.github.inventory.item.IFluidPortableCell;
+import com.glodblock.github.inventory.item.WirelessMagnet;
+import com.glodblock.github.util.Util;
+
+import appeng.api.storage.ITerminalHost;
+import appeng.container.AEBaseContainer;
+import appeng.container.guisync.GuiSync;
+import appeng.util.Platform;
+
+public abstract class FCBaseContainer extends AEBaseContainer {
+
+    private int ticks;
+    private final double powerMultiplier = 0.5;
+    private ITerminalHost host;
+    private int slot = -1;
+    private final InventoryPlayer ip;
+
+    @GuiSync(105)
+    public boolean restock = false;
+
+    @GuiSync(106)
+    public WirelessMagnet.Mode mode = WirelessMagnet.Mode.Off;
+
+    public FCBaseContainer(InventoryPlayer ip, ITerminalHost monitorable) {
+        super(ip, monitorable);
+        this.ip = ip;
+        this.host = monitorable;
+        if (isWirelessTerminal()) {
+            this.slot = lockSlot();
+        }
+    }
+
+    private int lockSlot() {
+        if (isWirelessTerminal()) {
+            if (this.host instanceof IFluidPortableCell) {
+                final int slotIndex = ((IFluidPortableCell) this.host).getInventorySlot();
+                if (slotIndex <= Platform.baublesSlotsOffset) {
+                    this.lockPlayerInventorySlot(slotIndex);
+                }
+                return slotIndex;
+            } else {
+                this.lockPlayerInventorySlot(ip.currentItem);
+            }
+        }
+        return -1;
+    }
+
+    protected abstract boolean isWirelessTerminal();
+
+    public void detectAndSendChanges() {
+        if (isWirelessTerminal()) {
+            this.ticks = Util.drainItemPower(
+                    this,
+                    this.getPlayerInv(),
+                    this.slot,
+                    this.ticks,
+                    this.getPowerMultiplier(),
+                    ((IFluidPortableCell) this.host));
+        }
+        super.detectAndSendChanges();
+    }
+
+    public double getPowerMultiplier() {
+        return this.powerMultiplier;
+    }
+
+    public ITerminalHost getHost() {
+        return this.host;
+    }
+
+    public IFluidPortableCell getPortableCell() {
+        if (this.host instanceof IFluidPortableCell fpc) {
+            return fpc;
+        }
+        return null;
+    }
+}

src/main/java/com/glodblock/github/client/gui/container/base/FCContainerFluidConfigurable.java

@@ -0,0 +1,119 @@
+package com.glodblock.github.client.gui.container.base;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.common.item.ItemFluidPacket;
+import com.glodblock.github.inventory.slot.OptionalFluidSlotFakeTypeOnly;
+import com.glodblock.github.network.SPacketFluidUpdate;
+import com.glodblock.github.util.Util;
+
+import appeng.api.config.Upgrades;
+import appeng.api.implementations.IUpgradeableHost;
+import appeng.api.storage.data.IAEFluidStack;
+import appeng.container.implementations.ContainerUpgradeable;
+import appeng.container.slot.AppEngSlot;
+import appeng.tile.inventory.AppEngInternalAEInventory;
+import appeng.util.Platform;
+import appeng.util.item.AEFluidStack;
+
+public abstract class FCContainerFluidConfigurable extends ContainerUpgradeable {
+
+    public FCContainerFluidConfigurable(InventoryPlayer ip, IUpgradeableHost te) {
+        super(ip, te);
+    }
+
+    public abstract AppEngInternalAEInventory getFakeFluidInv();
+
+    @Override
+    public ItemStack transferStackInSlot(final EntityPlayer p, final int idx) {
+        AppEngSlot clickSlot = (AppEngSlot) this.inventorySlots.get(idx);
+        if (clickSlot == null || !clickSlot.getHasStack()) return null;
+
+        ItemStack tis = clickSlot.getStack();
+        FluidStack fs = Util.getFluidFromItem(tis);
+        if (fs != null) {
+            final AppEngInternalAEInventory inv = this.getFakeFluidInv();
+            final IAEFluidStack stack = AEFluidStack.create(fs);
+            for (int i = 0; i < inv.getSizeInventory(); ++i) {
+                if (inv.getStackInSlot(i) == null && this.isValidForConfig(i, stack)) {
+                    ItemStack tmp = ItemFluidPacket.newStack(fs);
+                    if (tmp != null) {
+                        tmp.setStackDisplayName(fs.getLocalizedName());
+                    }
+                    inv.setInventorySlotContents(i, tmp);
+                    break;
+                }
+            }
+            this.standardDetectAndSendChanges();
+            return null;
+        } else {
+            return super.transferStackInSlot(p, idx);
+        }
+    }
+
+    protected void setupConfig() {
+        this.setupUpgrades();
+
+        final IInventory inv = getUpgradeable().getInventoryByName("config");
+        final int y = 40;
+        final int x = 80;
+        this.addSlotToContainer(new OptionalFluidSlotFakeTypeOnly(inv, null, this, 0, x, y, 0, 0, 0));
+        if (this.supportCapacity()) {
+            this.addSlotToContainer(new OptionalFluidSlotFakeTypeOnly(inv, null, this, 1, x, y, -1, 0, 1));
+            this.addSlotToContainer(new OptionalFluidSlotFakeTypeOnly(inv, null, this, 2, x, y, 1, 0, 1));
+            this.addSlotToContainer(new OptionalFluidSlotFakeTypeOnly(inv, null, this, 3, x, y, 0, -1, 1));
+            this.addSlotToContainer(new OptionalFluidSlotFakeTypeOnly(inv, null, this, 4, x, y, 0, 1, 1));
+
+            this.addSlotToContainer(new OptionalFluidSlotFakeTypeOnly(inv, null, this, 5, x, y, -1, -1, 2));
+            this.addSlotToContainer(new OptionalFluidSlotFakeTypeOnly(inv, null, this, 6, x, y, 1, -1, 2));
+            this.addSlotToContainer(new OptionalFluidSlotFakeTypeOnly(inv, null, this, 7, x, y, -1, 1, 2));
+            this.addSlotToContainer(new OptionalFluidSlotFakeTypeOnly(inv, null, this, 8, x, y, 1, 1, 2));
+        }
+    }
+
+    protected boolean isValidForConfig(int slot, IAEFluidStack fs) {
+        if (this.supportCapacity()) {
+            // assumes 4 slots per upgrade
+            final int upgrades = getUpgradeable().getInstalledUpgrades(Upgrades.CAPACITY);
+
+            if (slot > 0 && upgrades < 1) {
+                return false;
+            }
+            return slot <= 4 || upgrades >= 2;
+        }
+
+        return true;
+    }
+
+    @Override
+    protected void standardDetectAndSendChanges() {
+        if (Platform.isServer()) {
+            // clear out config items that are no longer valid (for instance, capacity upgrade removed)
+            final AppEngInternalAEInventory inv = this.getFakeFluidInv();
+            final Map<Integer, IAEFluidStack> tmp = new HashMap<>();
+            for (int i = 0; i < inv.getSizeInventory(); ++i) {
+                if (inv.getStackInSlot(i) != null && !this.isValidForConfig(
+                        i,
+                        AEFluidStack.create(ItemFluidPacket.getFluidStack(inv.getStackInSlot(i))))) {
+                    inv.setInventorySlotContents(i, null);
+                }
+                tmp.put(i, AEFluidStack.create(ItemFluidPacket.getFluidStack(inv.getStackInSlot(i))));
+            }
+            for (final Object g : this.crafters) {
+                if (g instanceof EntityPlayer) {
+                    FluidCraft.proxy.netHandler.sendTo(new SPacketFluidUpdate(tmp), (EntityPlayerMP) g);
+                }
+            }
+        }
+        super.standardDetectAndSendChanges();
+    }
+}

src/main/java/com/glodblock/github/client/me/FluidRepo.java

@@ -1,246 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package com.glodblock.github.client.me;
-
-import appeng.api.AEApi;
-import appeng.api.config.*;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.storage.data.IItemList;
-import appeng.client.gui.widgets.IScrollSource;
-import appeng.client.gui.widgets.ISortSource;
-import appeng.client.me.ItemRepo;
-import appeng.core.AEConfig;
-import appeng.items.storage.ItemViewCell;
-import appeng.util.item.AEItemStack;
-import appeng.util.prioitylist.IPartitionList;
-import com.glodblock.github.common.item.ItemFluidDrop;
-import com.glodblock.github.util.FluidSorters;
-import com.glodblock.github.util.Util;
-import cpw.mods.fml.relauncher.ReflectionHelper;
-import net.minecraft.item.ItemStack;
-
-import javax.annotation.Nonnull;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.regex.Pattern;
-
-
-public class FluidRepo extends ItemRepo {
-
-    private final IItemList<IAEItemStack> list = AEApi.instance().storage().createItemList();
-    private final ArrayList<IAEItemStack> view = new ArrayList<IAEItemStack>();
-    private final ArrayList<ItemStack> dsp = new ArrayList<ItemStack>();
-    private final IScrollSource src;
-    private final ISortSource sortSrc;
-
-    private int rowSize = 9;
-
-    private String searchString = "";
-    private IPartitionList<IAEItemStack> myPartitionList;
-    private String innerSearch = "";
-    private String NEIWord = null;
-    private boolean hasPower;
-
-    public FluidRepo(final IScrollSource src, final ISortSource sortSrc) {
-        super(src, sortSrc);
-        this.src = src;
-        this.sortSrc = sortSrc;
-    }
-
-    public IAEItemStack getReferenceItem(int idx) {
-        idx += this.src.getCurrentScroll() * this.rowSize;
-
-        if (idx >= this.view.size()) {
-            return null;
-        }
-        return this.view.get(idx);
-    }
-
-    public ItemStack getItem(int idx) {
-        idx += this.src.getCurrentScroll() * this.rowSize;
-
-        if (idx >= this.dsp.size()) {
-            return null;
-        }
-        return this.dsp.get(idx);
-    }
-
-    void setSearch(final String search) {
-        this.searchString = search == null ? "" : search;
-    }
-
-    public void postUpdate(final IAEItemStack is) {
-        final IAEItemStack st = this.list.findPrecise(is);
-        if (st != null) {
-            st.reset();
-            st.add(is);
-        } else {
-            this.list.add(is);
-        }
-    }
-
-    public void setViewCell(final ItemStack[] list) {
-        this.myPartitionList = ItemViewCell.createFilter(list);
-        this.updateView();
-    }
-
-    public void updateView() {
-        this.view.clear();
-        this.dsp.clear();
-
-        this.view.ensureCapacity(this.list.size());
-        this.dsp.ensureCapacity(this.list.size());
-
-        final Enum viewMode = this.sortSrc.getSortDisplay();
-        final Enum searchMode = AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE);
-        if (searchMode == SearchBoxMode.NEI_AUTOSEARCH || searchMode == SearchBoxMode.NEI_MANUAL_SEARCH) {
-            this.updateNEI(this.searchString);
-        }
-
-        this.innerSearch = this.searchString;
-        final boolean terminalSearchToolTips =
-            AEConfig.instance.settings.getSetting(Settings.SEARCH_TOOLTIPS) != YesNo.NO;
-        // boolean terminalSearchMods = Configuration.INSTANCE.settings.getSetting( Settings.SEARCH_MODS ) != YesNo.NO;
-
-        boolean searchMod = false;
-        if (this.innerSearch.startsWith("@")) {
-            searchMod = true;
-            this.innerSearch = this.innerSearch.substring(1);
-        }
-
-        Pattern m = null;
-        try {
-            m = Pattern.compile(this.innerSearch.toLowerCase(), Pattern.CASE_INSENSITIVE);
-        } catch (final Throwable ignore) {
-            try {
-                m = Pattern.compile(Pattern.quote(this.innerSearch.toLowerCase()), Pattern.CASE_INSENSITIVE);
-            } catch (final Throwable __) {
-                return;
-            }
-        }
-
-        boolean notDone = false;
-        for (IAEItemStack is : this.list) {
-            if (this.myPartitionList != null) {
-                if (!this.myPartitionList.isListed(is)) {
-                    continue;
-                }
-            }
-
-            if (viewMode == ViewItems.CRAFTABLE && !is.isCraftable()) {
-                continue;
-            }
-
-            if (viewMode == ViewItems.CRAFTABLE) {
-                is = is.copy();
-                is.setStackSize(0);
-            }
-
-            if (viewMode == ViewItems.STORED && is.getStackSize() == 0) {
-                continue;
-            }
-
-            final String dspName = searchMod ? Util.getFluidModID(ItemFluidDrop.getAeFluidStack(is).getFluid()) : ItemFluidDrop.getAeFluidStack(is).getFluid().getLocalizedName();
-
-            if (m.matcher(dspName.toLowerCase()).find()) {
-                this.view.add(is);
-            }
-
-            /*
-             * if ( terminalSearchMods && notDone ) { if ( m.matcher( Platform.getMod( is.getItemStack() ) ).find() ) {
-             * view.add( is ); notDone = false; } }
-             */
-        }
-
-        final Enum SortBy = this.sortSrc.getSortBy();
-        final Enum SortDir = this.sortSrc.getSortDir();
-
-        FluidSorters.setDirection((appeng.api.config.SortDir) SortDir);
-        FluidSorters.init();
-
-        if (SortBy == SortOrder.MOD) {
-            Collections.sort(this.view, FluidSorters.CONFIG_BASED_SORT_BY_MOD);
-        } else if (SortBy == SortOrder.AMOUNT) {
-            Collections.sort(this.view, FluidSorters.CONFIG_BASED_SORT_BY_SIZE);
-        } else if (SortBy == SortOrder.INVTWEAKS) {
-            Collections.sort(this.view, FluidSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS);
-        } else {
-            Collections.sort(this.view, FluidSorters.CONFIG_BASED_SORT_BY_NAME);
-        }
-
-        for (final IAEItemStack is : this.view) {
-            this.dsp.add(is.getItemStack());
-        }
-    }
-
-    private void updateNEI(final String filter) {
-        try {
-            if (this.NEIWord == null || !this.NEIWord.equals(filter)) {
-                final Class c =
-                    ReflectionHelper.getClass(this.getClass().getClassLoader(), "codechicken.nei.LayoutManager");
-                final Field fldSearchField = c.getField("searchField");
-                final Object searchField = fldSearchField.get(c);
-
-                final Method a = searchField.getClass().getMethod("setText", String.class);
-                final Method b = searchField.getClass().getMethod("onTextChange", String.class);
-
-                this.NEIWord = filter;
-                a.invoke(searchField, filter);
-                b.invoke(searchField, "");
-            }
-        } catch (final Throwable ignore) {
-
-        }
-    }
-
-    public int size() {
-        return this.view.size();
-    }
-
-    public void clear() {
-        this.list.resetStatus();
-    }
-
-    public boolean hasPower() {
-        return this.hasPower;
-    }
-
-    public void setPower(final boolean hasPower) {
-        this.hasPower = hasPower;
-    }
-
-    public int getRowSize() {
-        return this.rowSize;
-    }
-
-    public void setRowSize(final int rowSize) {
-        this.rowSize = rowSize;
-    }
-
-    public String getSearchString() {
-        return this.searchString;
-    }
-
-    public void setSearchString(@Nonnull final String searchString) {
-        this.searchString = searchString;
-    }
-}

src/main/java/com/glodblock/github/client/render/ItemCertusQuartzTankRender.java

@@ -0,0 +1,114 @@
+package com.glodblock.github.client.render;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.client.IItemRenderer;
+import net.minecraftforge.client.MinecraftForgeClient;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
+import org.lwjgl.opengl.GL11;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.render.tank.ModelCertusTank;
+import com.glodblock.github.common.item.ItemCertusQuartzTank;
+import com.glodblock.github.common.tile.TileCertusQuartzTank;
+import com.glodblock.github.loader.ItemAndBlockHolder;
+
+import cpw.mods.fml.client.registry.ClientRegistry;
+
+public class ItemCertusQuartzTankRender implements IItemRenderer {
+
+    private final ModelCertusTank model = new ModelCertusTank();
+
+    public ItemCertusQuartzTankRender() {
+        ClientRegistry.bindTileEntitySpecialRenderer(TileCertusQuartzTank.class, new RenderBlockCertusQuartzTank());
+        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ItemAndBlockHolder.CERTUS_QUARTZ_TANK), this);
+    }
+
+    @Override
+    public boolean handleRenderType(ItemStack item, ItemRenderType type) {
+        return true;
+    }
+
+    @Override
+    public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
+        return true;
+    }
+
+    @Override
+    public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
+        Minecraft.getMinecraft().renderEngine
+                .bindTexture(FluidCraft.resource("textures/blocks/certus_quartz_tank/map.png"));
+        GL11.glPushMatrix();
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
+        GL11.glDisable(GL11.GL_CULL_FACE);
+        GL11.glEnable(GL11.GL_LIGHTING);
+        GL11.glEnable(GL11.GL_ALPHA_TEST);
+        GL11.glDisable(GL11.GL_BLEND);
+
+        if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) {
+            GL11.glTranslatef(0.5F, 0.5F, 0.5F);
+        }
+
+        GL11.glRotatef(180F, 1F, 0F, 0F);
+        this.model.render(0.0625f);
+        GL11.glRotatef(180F, 1F, 0F, 0F);
+
+        if (item.getItem() instanceof ItemCertusQuartzTank itemCertusQuartzTank) {
+            FluidStack storedFluid = itemCertusQuartzTank.getFluid(item);
+            int tankCapacity = itemCertusQuartzTank.getCapacity(item);
+
+            if (storedFluid != null && storedFluid.getFluid() != null) {
+                IIcon fluidIcon = storedFluid.getFluid().getIcon();
+                if (fluidIcon == null) fluidIcon = FluidRegistry.LAVA.getIcon();
+
+                Tessellator tessellator = Tessellator.instance;
+                RenderBlocks renderer = new RenderBlocks();
+                Block waterBlock = FluidRegistry.WATER.getBlock();
+
+                Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+                renderer.setRenderBounds(
+                        0.08F,
+                        0.001F,
+                        0.08F,
+                        0.92F,
+                        (float) storedFluid.amount / (float) tankCapacity * 0.999F,
+                        0.92F);
+                GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
+                GL11.glDisable(GL11.GL_LIGHTING);
+                GL11.glEnable(GL11.GL_CULL_FACE);
+                GL11.glEnable(GL11.GL_BLEND);
+                GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+
+                tessellator.startDrawingQuads();
+                tessellator.setColorRGBA_F(
+                        (storedFluid.getFluid().getColor() >> 16 & 0xFF) / 255.0F,
+                        (storedFluid.getFluid().getColor() >> 8 & 0xFF) / 255.0F,
+                        (storedFluid.getFluid().getColor() & 0xFF) / 255.0F,
+                        1.0F);
+                tessellator.setNormal(0.0F, -1F, 0.0F);
+                renderer.renderFaceYNeg(waterBlock, 0.0D, 0.0D, 0.0D, fluidIcon);
+                tessellator.setNormal(0.0F, 1.0F, 0.0F);
+                renderer.renderFaceYPos(waterBlock, 0.0D, 0.0D, 0.0D, fluidIcon);
+                tessellator.setNormal(0.0F, 0.0F, -1F);
+                renderer.renderFaceZNeg(waterBlock, 0.0D, 0.0D, 0.0D, fluidIcon);
+                tessellator.setNormal(0.0F, 0.0F, 1.0F);
+                renderer.renderFaceZPos(waterBlock, 0.0D, 0.0D, 0.0D, fluidIcon);
+                tessellator.setNormal(-1F, 0.0F, 0.0F);
+                renderer.renderFaceXNeg(waterBlock, 0.0D, 0.0D, 0.0D, fluidIcon);
+                tessellator.setNormal(1.0F, 0.0F, 0.0F);
+                renderer.renderFaceXPos(waterBlock, 0.0D, 0.0D, 0.0D, fluidIcon);
+                tessellator.draw();
+            }
+        }
+        GL11.glPopAttrib();
+        GL11.glPopMatrix();
+    }
+}

src/main/java/com/glodblock/github/client/render/ItemDropRender.java

@@ -1,10 +1,8 @@
 package com.glodblock.github.client.render;
 
-import com.glodblock.github.common.item.ItemFluidDrop;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.util.RenderUtil;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import java.util.HashMap;
+import java.util.Map;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.Tessellator;
@@ -16,10 +14,15 @@ import net.minecraftforge.client.IItemRenderer;
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
+
 import org.lwjgl.opengl.GL11;
 
-import java.util.HashMap;
-import java.util.Map;
+import com.glodblock.github.common.item.ItemFluidDrop;
+import com.glodblock.github.loader.ItemAndBlockHolder;
+import com.glodblock.github.util.RenderUtil;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 @SideOnly(Side.CLIENT)
 public class ItemDropRender implements IItemRenderer {
@@ -62,7 +65,15 @@ public class ItemDropRender implements IItemRenderer {
         if (type.equals(ItemRenderType.INVENTORY)) {
             RenderUtil.renderItemIcon(shape, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F);
         } else {
-            ItemRenderer.renderItemIn2D(Tessellator.instance, shape.getMaxU(), shape.getMinV(), shape.getMinU(), shape.getMaxV(), shape.getIconWidth(), shape.getIconHeight(), 0.0625F);
+            ItemRenderer.renderItemIn2D(
+                    Tessellator.instance,
+                    shape.getMaxU(),
+                    shape.getMinV(),
+                    shape.getMinU(),
+                    shape.getMaxV(),
+                    shape.getIconWidth(),
+                    shape.getIconHeight(),
+                    0.0625F);
         }
 
         GL11.glDisable(GL11.GL_ALPHA_TEST);
@@ -85,7 +96,7 @@ public class ItemDropRender implements IItemRenderer {
             TextureAtlasSprite sprite;
             try {
                 sprite = Minecraft.getMinecraft().getTextureMapBlocks()
-                    .getTextureExtry(fluid.getStillIcon().getIconName());
+                        .getTextureExtry(fluid.getStillIcon().getIconName());
             } catch (NullPointerException e) {
                 colourCache.put(fluid.getName(), colour);
                 return colour;

src/main/java/com/glodblock/github/client/render/ItemPacketRender.java

@@ -1,10 +1,5 @@
 package com.glodblock.github.client.render;
 
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.util.RenderUtil;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.item.ItemStack;
@@ -13,8 +8,16 @@ import net.minecraftforge.client.IItemRenderer;
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
+
 import org.lwjgl.opengl.GL11;
 
+import com.glodblock.github.common.item.ItemFluidPacket;
+import com.glodblock.github.loader.ItemAndBlockHolder;
+import com.glodblock.github.util.RenderUtil;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 @SideOnly(Side.CLIENT)
 public class ItemPacketRender implements IItemRenderer {
 
@@ -34,18 +37,20 @@ public class ItemPacketRender implements IItemRenderer {
 
     @Override
     public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
-        if (item == null || item.getItem() == null || !(item.getItem() instanceof ItemFluidPacket))
-            return;
+        if (item == null || item.getItem() == null || !(item.getItem() instanceof ItemFluidPacket)) return;
 
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glEnable(GL11.GL_ALPHA_TEST);
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+        final boolean entity = type.equals(ItemRenderType.ENTITY);
+        if (entity) {
+            GL11.glPushMatrix();
+            GL11.glRotated(90.0D, 0.0D, 1.0D, 0.0D);
+            GL11.glTranslated(-0.5D, -0.6D, 0.0D);
+        }
 
         FluidStack fluid = ItemFluidPacket.getFluidStack(item);
-        int RGB = 0xFFFFFF;
-        if (fluid != null) {
-            RGB = fluid.getFluid().getColor(fluid);
-        }
+        int RGB = fluid == null ? 0xFFFFFF : fluid.getFluid().getColor(fluid);
         IIcon icon = fluid == null ? FluidRegistry.WATER.getStillIcon() : fluid.getFluid().getStillIcon();
 
         if (RGB != 0xFFFFFF) {
@@ -55,11 +60,21 @@ public class ItemPacketRender implements IItemRenderer {
         if (type.equals(ItemRenderType.INVENTORY)) {
             RenderUtil.renderItemIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F);
         } else {
-            ItemRenderer.renderItemIn2D(Tessellator.instance, icon.getMaxU(), icon.getMinV(), icon.getMinU(), icon.getMaxV(), icon.getIconWidth(), icon.getIconHeight(), 0.0625F);
+            ItemRenderer.renderItemIn2D(
+                    Tessellator.instance,
+                    icon.getMaxU(),
+                    icon.getMinV(),
+                    icon.getMinU(),
+                    icon.getMaxV(),
+                    icon.getIconWidth(),
+                    icon.getIconHeight(),
+                    0.0625F);
         }
 
+        if (entity) {
+            GL11.glPopMatrix();
+        }
         GL11.glDisable(GL11.GL_BLEND);
         GL11.glDisable(GL11.GL_ALPHA_TEST);
     }
-
 }

src/main/java/com/glodblock/github/client/render/ItemWalrusRender.java

@@ -0,0 +1,46 @@
+package com.glodblock.github.client.render;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.client.IItemRenderer;
+import net.minecraftforge.client.MinecraftForgeClient;
+
+import org.lwjgl.opengl.GL11;
+
+import com.glodblock.github.common.tile.TileWalrus;
+import com.glodblock.github.loader.ItemAndBlockHolder;
+
+import cpw.mods.fml.client.registry.ClientRegistry;
+
+public class ItemWalrusRender implements IItemRenderer {
+
+    public ItemWalrusRender() {
+        ClientRegistry.bindTileEntitySpecialRenderer(TileWalrus.class, new RenderBlockWalrus());
+        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ItemAndBlockHolder.WALRUS), this);
+    }
+
+    @Override
+    public boolean handleRenderType(ItemStack item, ItemRenderType type) {
+        return true;
+    }
+
+    @Override
+    public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
+        GL11.glPushMatrix();
+        switch (type) {
+            case EQUIPPED_FIRST_PERSON -> {
+                GL11.glRotated(180, 0, 1, 0);
+                GL11.glTranslatef(-1F, 0.5F, -0.5F);
+            }
+            case INVENTORY -> GL11.glTranslatef(-0.5F, -0.5F, -0.1F);
+            default -> {}
+        }
+        WalrusRenderer.render();
+        GL11.glPopMatrix();
+    }
+
+    @Override
+    public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) {
+        return true;
+    }
+}

src/main/java/com/glodblock/github/client/render/RenderBlockCertusQuartzTank.java

@@ -0,0 +1,54 @@
+package com.glodblock.github.client.render;
+
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.fluids.FluidStack;
+
+import org.lwjgl.opengl.GL11;
+
+import com.glodblock.github.client.render.tank.FluidTankRenderer;
+import com.glodblock.github.common.tile.TileCertusQuartzTank;
+import com.glodblock.github.util.RenderUtil;
+import com.glodblock.github.util.Util;
+
+public class RenderBlockCertusQuartzTank extends TileEntitySpecialRenderer {
+
+    @Override
+    public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) {
+        TileCertusQuartzTank tank = (TileCertusQuartzTank) tileentity;
+
+        FluidStack liquid = tank.tank.getFluid();
+        if (liquid == null || liquid.getFluid() == null || liquid.amount <= 0) {
+            return;
+        }
+
+        int color = liquid.getFluid().getColor(liquid);
+
+        int[] displayList = FluidTankRenderer.getFluidDisplayLists(liquid, tileentity.getWorldObj(), false);
+        if (displayList == null) {
+            return;
+        }
+
+        GL11.glPushMatrix();
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
+        GL11.glEnable(GL11.GL_CULL_FACE);
+        GL11.glDisable(GL11.GL_LIGHTING);
+        GL11.glEnable(GL11.GL_BLEND);
+        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+
+        bindTexture(TextureMap.locationBlocksTexture);
+        RenderUtil.setGLColorFromInt(color);
+
+        GL11.glTranslatef((float) x + 0.0625F, (float) y + 0.5F, (float) z + 0.0625F);
+        GL11.glScalef(0.875F, 0.99F, 0.875F);
+        GL11.glTranslatef(0, -0.5F, 0);
+
+        int dl = (int) ((float) liquid.amount / (float) (tank.tank.getCapacity())
+                * (FluidTankRenderer.DISPLAY_STAGES - 1));
+        GL11.glCallList(displayList[Util.clamp(dl, 0, FluidTankRenderer.DISPLAY_STAGES - 1)]);
+
+        GL11.glPopAttrib();
+        GL11.glPopMatrix();
+    }
+}

src/main/java/com/glodblock/github/client/render/RenderBlockFluidBuffer.java

@@ -0,0 +1,62 @@
+package com.glodblock.github.client.render;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+
+import com.glodblock.github.common.block.BlockFluidBuffer;
+import com.glodblock.github.common.tile.TileFluidBuffer;
+
+import appeng.client.render.BaseBlockRender;
+import appeng.client.render.BlockRenderInfo;
+
+public class RenderBlockFluidBuffer extends BaseBlockRender<BlockFluidBuffer, TileFluidBuffer> {
+
+    public RenderBlockFluidBuffer() {
+        super(false, 20);
+    }
+
+    @Override
+    public boolean renderInWorld(final BlockFluidBuffer block, final IBlockAccess world, final int x, final int y,
+            final int z, final RenderBlocks renderer) {
+        final TileFluidBuffer ti = block.getTileEntity(world, x, y, z);
+        final BlockRenderInfo info = block.getRendererInstance();
+        this.renderFluid(ti, x, y, z, renderer);
+        final boolean fz = super.renderInWorld(block, world, x, y, z, renderer);
+        info.setTemporaryRenderIcon(null);
+        return fz;
+    }
+
+    private void renderFluid(TileFluidBuffer tileEntity, double x, double y, double z, RenderBlocks renderer) {
+        Tessellator tessellator = Tessellator.instance;
+        if (tileEntity != null && tileEntity.getFluidStack() != null) {
+            Fluid storedFluid = tileEntity.getFluidStack().getFluid();
+            if (storedFluid != null) {
+                Block id = Block.getBlockById(FluidRegistry.WATER.getID());
+                IIcon fluidIcon = storedFluid.getIcon();
+                if (fluidIcon == null) fluidIcon = FluidRegistry.LAVA.getIcon();
+                tessellator.setColorRGBA_F(
+                        (storedFluid.getColor() >> 16 & 0xFF) / 255.0F,
+                        (storedFluid.getColor() >> 8 & 0xFF) / 255.0F,
+                        (storedFluid.getColor() & 0xFF) / 255.0F,
+                        1.0F);
+                tessellator.setNormal(0.0F, -1F, 0.0F);
+                renderer.renderFaceYNeg(id, x, y, z, fluidIcon);
+                tessellator.setNormal(0.0F, 1.0F, 0.0F);
+                renderer.renderFaceYPos(id, x, y, z, fluidIcon);
+                tessellator.setNormal(0.0F, 0.0F, -1F);
+                renderer.renderFaceZNeg(id, x, y, z, fluidIcon);
+                tessellator.setNormal(0.0F, 0.0F, 1.0F);
+                renderer.renderFaceZPos(id, x, y, z, fluidIcon);
+                tessellator.setNormal(-1F, 0.0F, 0.0F);
+                renderer.renderFaceXNeg(id, x, y, z, fluidIcon);
+                tessellator.setNormal(1.0F, 0.0F, 0.0F);
+                renderer.renderFaceXPos(id, x, y, z, fluidIcon);
+            }
+        }
+    }
+}

src/main/java/com/glodblock/github/client/render/RenderBlockFluidInterface.java

@@ -1,39 +1,48 @@
 package com.glodblock.github.client.render;
 
-import appeng.client.render.BaseBlockRender;
-import appeng.client.render.BlockRenderInfo;
-import appeng.tile.misc.TileInterface;
-import com.glodblock.github.client.textures.FCPartsTexture;
-import com.glodblock.github.common.block.BlockFluidInterface;
-import com.glodblock.github.common.tile.TileFluidInterface;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public class RenderBlockFluidInterface extends BaseBlockRender<BlockFluidInterface, TileFluidInterface>
-{
+import com.glodblock.github.client.textures.FCPartsTexture;
+import com.glodblock.github.common.block.BlockFluidInterface;
+import com.glodblock.github.common.tile.TileFluidInterface;
 
-    public RenderBlockFluidInterface()
-    {
-        super( false, 20 );
+import appeng.api.util.AEColor;
+import appeng.client.render.BaseBlockRender;
+import appeng.client.render.BlockRenderInfo;
+import appeng.tile.misc.TileInterface;
+
+public class RenderBlockFluidInterface extends BaseBlockRender<BlockFluidInterface, TileFluidInterface> {
+
+    public RenderBlockFluidInterface() {
+        super(false, 20);
     }
 
     @Override
-    public boolean renderInWorld(final BlockFluidInterface block, final IBlockAccess world, final int x, final int y, final int z, final RenderBlocks renderer )
-    {
-        final TileInterface ti = block.getTileEntity( world, x, y, z );
+    public boolean renderInWorld(final BlockFluidInterface block, final IBlockAccess world, final int x, final int y,
+            final int z, final RenderBlocks renderer) {
+        final TileInterface ti = block.getTileEntity(world, x, y, z);
         final BlockRenderInfo info = block.getRendererInstance();
 
-        if( ti != null && ti.getForward() != ForgeDirection.UNKNOWN )
-        {
-            final IIcon side = FCPartsTexture.BlockFluidInterfaceAlternate_Arrow.getIcon();
-            info.setTemporaryRenderIcons( FCPartsTexture.BlockInterfaceAlternate.getIcon(), block.getIcon( 0, 0 ), side, side, side, side );
+        if (ti != null) {
+            final AEColor color = ti.getProxy().getColor();
+            if (ti.getForward() != ForgeDirection.UNKNOWN) {
+                final IIcon face = color == AEColor.Transparent ? block.getIcon(0, 0)
+                        : block.getColoredTexture(0, color);
+                final IIcon alternate = color == AEColor.Transparent ? FCPartsTexture.BlockInterfaceAlternate.getIcon()
+                        : block.getColoredTexture(1, color);
+                final IIcon side = color == AEColor.Transparent
+                        ? FCPartsTexture.BlockFluidInterfaceAlternate_Arrow.getIcon()
+                        : block.getColoredTexture(2, color);
+                info.setTemporaryRenderIcons(alternate, face, side, side, side, side);
+            }
         }
 
-        final boolean fz = super.renderInWorld( block, world, x, y, z, renderer );
+        final boolean fz = super.renderInWorld(block, world, x, y, z, renderer);
 
-        info.setTemporaryRenderIcon( null );
+        info.setTemporaryRenderIcon(null);
 
         return fz;
     }

src/main/java/com/glodblock/github/client/render/RenderBlockLevelMaintainer.java

@@ -1,23 +1,25 @@
 package com.glodblock.github.client.render;
 
-import appeng.client.render.BaseBlockRender;
-import appeng.client.render.BlockRenderInfo;
-import com.glodblock.github.client.textures.FCPartsTexture;
-import com.glodblock.github.common.block.BlockLevelMaintainer;
-import com.glodblock.github.common.tile.TileLevelMaintainer;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
+import com.glodblock.github.client.textures.FCPartsTexture;
+import com.glodblock.github.common.block.BlockLevelMaintainer;
+import com.glodblock.github.common.tile.TileLevelMaintainer;
+
+import appeng.client.render.BaseBlockRender;
+import appeng.client.render.BlockRenderInfo;
+
 public class RenderBlockLevelMaintainer extends BaseBlockRender<BlockLevelMaintainer, TileLevelMaintainer> {
 
     public RenderBlockLevelMaintainer() {
         super(false, 20);
     }
 
-
     @Override
-    public boolean renderInWorld(final BlockLevelMaintainer block, final IBlockAccess world, final int x, final int y, final int z, final RenderBlocks renderer) {
+    public boolean renderInWorld(final BlockLevelMaintainer block, final IBlockAccess world, final int x, final int y,
+            final int z, final RenderBlocks renderer) {
         final TileLevelMaintainer ti = block.getTileEntity(world, x, y, z);
         final BlockRenderInfo info = block.getRendererInstance();
 

src/main/java/com/glodblock/github/client/render/RenderBlockWalrus.java

@@ -0,0 +1,39 @@
+package com.glodblock.github.client.render;
+
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.tileentity.TileEntity;
+
+import org.lwjgl.opengl.GL11;
+
+import com.glodblock.github.common.tile.TileWalrus;
+
+public class RenderBlockWalrus extends TileEntitySpecialRenderer {
+
+    @Override
+    public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float partialTickTime) {
+        if (!(tileentity instanceof TileWalrus Tile)) return;
+        float scale = Tile.getWalrusScale();
+        GL11.glPushMatrix();
+        int orientation = Tile.getBlockMetadata();
+        switch (orientation) {
+            case 2:
+                GL11.glTranslated(x + 0.5, y, z + 1 - scale * .655); // centering walrus model
+                break;
+            case 3:
+                GL11.glTranslated(x + 0.5, y, z + scale * .655);
+                GL11.glRotatef(180, 0, 1, 0);
+                break;
+            case 4:
+                GL11.glTranslated(x + 1 - scale * .655, y, z + 0.5);
+                GL11.glRotatef(90, 0, 1, 0);
+                break;
+            case 5:
+                GL11.glTranslated(x + scale * .655, y, z + 0.5);
+                GL11.glRotatef(-90, 0, 1, 0);
+                break;
+        }
+        GL11.glScalef(scale, scale, scale);
+        WalrusRenderer.render();
+        GL11.glPopMatrix();
+    }
+}

src/main/java/com/glodblock/github/client/render/WalrusRenderer.java

@@ -0,0 +1,28 @@
+package com.glodblock.github.client.render;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
+
+import com.glodblock.github.FluidCraft;
+import com.gtnewhorizon.gtnhlib.client.model.wavefront.WavefrontVBOBuilder;
+import com.gtnewhorizon.gtnhlib.client.renderer.vao.IVertexArrayObject;
+
+public final class WalrusRenderer {
+
+    private static IVertexArrayObject walrus;
+    private static final ResourceLocation textureWalrus = FluidCraft.resource("textures/blocks/walrus.png");
+
+    public static void load() {
+        walrus = WavefrontVBOBuilder.compileToVBO(FluidCraft.resource("models/walrus.obj"));
+    }
+
+    public static void render() {
+        Minecraft.getMinecraft().renderEngine.bindTexture(textureWalrus);
+        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
+
+        walrus.render();
+    }
+}

src/main/java/com/glodblock/github/client/render/tank/FluidTankRenderer.java

@@ -0,0 +1,122 @@
+package com.glodblock.github.client.render.tank;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GLAllocation;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
+import org.lwjgl.opengl.GL11;
+
+import com.glodblock.github.util.RenderUtil;
+
+public class FluidTankRenderer {
+
+    public static final int DISPLAY_STAGES = 100;
+    private static final Map<Fluid, int[]> flowingRenderCache = new HashMap<>();
+    private static final Map<Fluid, int[]> stillRenderCache = new HashMap<>();
+    private static final RenderEntityBlock.RenderInfo liquidBlock = new RenderEntityBlock.RenderInfo();
+
+    public static void onTextureReload() {
+        for (int[] ia : flowingRenderCache.values()) {
+            for (int i : ia) {
+                GL11.glDeleteLists(i, 1);
+            }
+        }
+        flowingRenderCache.clear();
+
+        for (int[] ia : stillRenderCache.values()) {
+            for (int i : ia) {
+                GL11.glDeleteLists(i, 1);
+            }
+        }
+        stillRenderCache.clear();
+    }
+
+    public static IIcon getFluidTexture(FluidStack fluidStack, boolean flowing) {
+        if (fluidStack == null) {
+            return null;
+        }
+        return getFluidTexture(fluidStack.getFluid(), flowing);
+    }
+
+    public static IIcon getFluidTexture(Fluid fluid, boolean flowing) {
+        if (fluid == null) {
+            return null;
+        }
+        IIcon icon = flowing ? fluid.getFlowingIcon() : fluid.getStillIcon();
+        if (icon == null) {
+            icon = ((TextureMap) Minecraft.getMinecraft().getTextureManager()
+                    .getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno");
+        }
+        return icon;
+    }
+
+    public static void setColorForFluidStack(FluidStack fluidstack) {
+        if (fluidstack == null) {
+            return;
+        }
+        int color = fluidstack.getFluid().getColor(fluidstack);
+        RenderUtil.setGLColorFromInt(color);
+    }
+
+    public static int[] getFluidDisplayLists(FluidStack fluidStack, World world, boolean flowing) {
+        if (fluidStack == null) {
+            return null;
+        }
+        Fluid fluid = fluidStack.getFluid();
+        if (fluid == null) {
+            return null;
+        }
+        Map<Fluid, int[]> cache = flowing ? flowingRenderCache : stillRenderCache;
+        int[] diplayLists = cache.get(fluid);
+        if (diplayLists != null) {
+            return diplayLists;
+        }
+
+        diplayLists = new int[DISPLAY_STAGES];
+
+        if (fluid.getBlock() != null) {
+            liquidBlock.baseBlock = fluid.getBlock();
+        } else {
+            liquidBlock.baseBlock = Blocks.water;
+        }
+        liquidBlock.texture = getFluidTexture(fluidStack, flowing);
+
+        cache.put(fluid, diplayLists);
+
+        GL11.glDisable(GL11.GL_LIGHTING);
+        GL11.glDisable(GL11.GL_BLEND);
+        GL11.glDisable(GL11.GL_CULL_FACE);
+
+        for (int s = 0; s < DISPLAY_STAGES; ++s) {
+            diplayLists[s] = GLAllocation.generateDisplayLists(1);
+            GL11.glNewList(diplayLists[s], GL11.GL_COMPILE);
+
+            liquidBlock.minX = 0.01f;
+            liquidBlock.minY = 0;
+            liquidBlock.minZ = 0.01f;
+
+            liquidBlock.maxX = 0.99f;
+            liquidBlock.maxY = Math.max(s, 1) / (float) DISPLAY_STAGES;
+            liquidBlock.maxZ = 0.99f;
+
+            RenderEntityBlock.INSTANCE.renderBlock(liquidBlock);
+            GL11.glEndList();
+        }
+
+        GL11.glColor4f(1, 1, 1, 1);
+        GL11.glEnable(GL11.GL_CULL_FACE);
+        GL11.glEnable(GL11.GL_BLEND);
+        GL11.glEnable(GL11.GL_LIGHTING);
+
+        return diplayLists;
+    }
+
+}

src/main/java/com/glodblock/github/client/render/tank/ModelCertusTank.java

@@ -0,0 +1,143 @@
+package com.glodblock.github.client.render.tank;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+
+import org.lwjgl.opengl.GL11;
+
+import com.glodblock.github.common.tile.TileCertusQuartzTank;
+
+public class ModelCertusTank extends ModelBase {
+
+    ModelRenderer Shape1;
+
+    public ModelCertusTank() {
+        this.textureWidth = 64;
+        this.textureHeight = 64;
+
+        this.Shape1 = new ModelRenderer(this, 0, 0);
+        this.Shape1.addBox(-7F, -8F, -7F, 14, 16, 14);
+        this.Shape1.setTextureSize(this.textureWidth, this.textureHeight);
+        this.Shape1.mirror = true;
+        setRotation(this.Shape1, 0F, 0F, 0F);
+
+    }
+
+    public void render(float f) {
+        this.Shape1.render(f);
+    }
+
+    public void renderFluid(TileEntity tileEntity, double x, double y, double z, RenderBlocks renderer) {
+        Tessellator tessellator = Tessellator.instance;
+        if (tileEntity != null
+                && ((TileCertusQuartzTank) tileEntity).getTankInfo(ForgeDirection.UNKNOWN)[0].fluid != null) {
+            Fluid storedFluid = ((TileCertusQuartzTank) tileEntity).getRenderFluid();
+            float scale = ((TileCertusQuartzTank) tileEntity).getRenderScale();
+            if (storedFluid != null && scale > 0) {
+                GL11.glEnable(GL11.GL_BLEND);
+                GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+                Block id = Block.getBlockById(FluidRegistry.WATER.getID());
+                IIcon fluidIcon = storedFluid.getIcon();
+                if (fluidIcon == null) fluidIcon = FluidRegistry.LAVA.getIcon();
+                renderer.setRenderBounds(0.08F, 0.001F, 0.08F, 0.92, scale * 0.999F, 0.92F);
+                tessellator.setColorRGBA_F(
+                        (storedFluid.getColor() >> 16 & 0xFF) / 255.0F,
+                        (storedFluid.getColor() >> 8 & 0xFF) / 255.0F,
+                        (storedFluid.getColor() & 0xFF) / 255.0F,
+                        1.0F);
+                tessellator.setNormal(0.0F, -1F, 0.0F);
+                renderer.renderFaceYNeg(id, x, y, z, fluidIcon);
+                tessellator.setNormal(0.0F, 1.0F, 0.0F);
+                renderer.renderFaceYPos(id, x, y, z, fluidIcon);
+                tessellator.setNormal(0.0F, 0.0F, -1F);
+                renderer.renderFaceZNeg(id, x, y, z, fluidIcon);
+                tessellator.setNormal(0.0F, 0.0F, 1.0F);
+                renderer.renderFaceZPos(id, x, y, z, fluidIcon);
+                tessellator.setNormal(-1F, 0.0F, 0.0F);
+                renderer.renderFaceXNeg(id, x, y, z, fluidIcon);
+                tessellator.setNormal(1.0F, 0.0F, 0.0F);
+                renderer.renderFaceXPos(id, x, y, z, fluidIcon);
+            }
+        }
+    }
+
+    public void renderInnerBlock(Block block, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) {
+        Tessellator tessellator = Tessellator.instance;
+        GL11.glPushMatrix();
+        GL11.glEnable(GL11.GL_BLEND);
+        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+        tessellator.setBrightness(15728640);
+        boolean tankUp = world.getTileEntity(x, y + 1, z) instanceof TileCertusQuartzTank;
+        boolean tankDown = world.getTileEntity(x, y - 1, z) instanceof TileCertusQuartzTank;
+        int meta = 0;
+        if (tankUp && tankDown) meta = 3;
+        else if (tankUp) meta = 2;
+        else if (tankDown) meta = 1;
+        if (!tankUp) {
+            tessellator.setNormal(0, -1, 0);
+            renderer.renderFaceYNeg(block, x, y + 0.99F, z, block.getIcon(1, 0));
+        }
+        if (!tankDown) {
+            tessellator.setNormal(0, 1, 0);
+            renderer.renderFaceYPos(block, x, y - 0.99F, z, block.getIcon(0, 0));
+        }
+        IIcon sideIcon = block.getIcon(3, meta);
+        tessellator.setNormal(0, 0, -1);
+        renderer.renderFaceZNeg(block, x, y, z + 0.875F, sideIcon);
+        tessellator.setNormal(0, 0, 1);
+        renderer.renderFaceZPos(block, x, y, z - 0.875F, sideIcon);
+        tessellator.setNormal(-1, 0, 0);
+        renderer.renderFaceXNeg(block, x + 0.875F, y, z, sideIcon);
+        tessellator.setNormal(1, 0, 0);
+        renderer.renderFaceXPos(block, x - 0.875F, y, z, sideIcon);
+        GL11.glPopMatrix();
+    }
+
+    public void renderOuterBlock(Block block, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) {
+        Tessellator tessellator = Tessellator.instance;
+        GL11.glPushMatrix();
+        GL11.glEnable(GL11.GL_BLEND);
+        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+        boolean tankUp = world.getTileEntity(x, y + 1, z) instanceof TileCertusQuartzTank;
+        boolean tankDown = world.getTileEntity(x, y - 1, z) instanceof TileCertusQuartzTank;
+        int meta = 0;
+        if (tankUp && tankDown) meta = 3;
+        else if (tankUp) meta = 2;
+        else if (tankDown) meta = 1;
+        if (!tankDown) {
+            tessellator.setNormal(0.0F, -1F, 0.0F);
+            renderer.renderFaceYNeg(block, x, y, z, block.getIcon(0, 0));
+        }
+        if (!tankUp) {
+            tessellator.setNormal(0.0F, 1.0F, 0.0F);
+            renderer.renderFaceYPos(block, x, y, z, block.getIcon(1, 0));
+        }
+
+        IIcon sideIcon = block.getIcon(3, meta);
+        tessellator.setNormal(0.0F, 0.0F, -1F);
+        renderer.renderFaceZNeg(block, x, y, z, sideIcon);
+        tessellator.setNormal(0.0F, 0.0F, 1.0F);
+        renderer.renderFaceZPos(block, x, y, z, sideIcon);
+        tessellator.setNormal(-1F, 0.0F, 0.0F);
+        renderer.renderFaceXNeg(block, x, y, z, sideIcon);
+        tessellator.setNormal(1.0F, 0.0F, 0.0F);
+        renderer.renderFaceXPos(block, x, y, z, sideIcon);
+        GL11.glPopMatrix();
+    }
+
+    private void setRotation(ModelRenderer model, float x, float y, float z) {
+        model.rotateAngleX = x;
+        model.rotateAngleY = y;
+        model.rotateAngleZ = z;
+    }
+
+}

src/main/java/com/glodblock/github/client/render/tank/RenderEntityBlock.java

@@ -0,0 +1,169 @@
+package com.glodblock.github.client.render.tank;
+
+import java.util.Arrays;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.EnumSkyBlock;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class RenderEntityBlock extends Render {
+
+    public static RenderEntityBlock INSTANCE = new RenderEntityBlock();
+    protected RenderBlocks renderBlocks;
+
+    private RenderEntityBlock() {
+        renderBlocks = field_147909_c;
+    }
+
+    @Override
+    protected ResourceLocation getEntityTexture(Entity entity) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    public static class RenderInfo {
+
+        public double minX = 0.0F;
+        public double minY = 0.0F;
+        public double minZ = 0.0F;
+        public double maxX = 1.0F;
+        public double maxY = 1.0F;
+        public double maxZ = 1.0F;
+        public Block baseBlock = Blocks.sand;
+        public IIcon texture = null;
+        public IIcon[] textureArray = null;
+        public boolean[] renderSide = new boolean[] { true, true, true, true, true, true };
+        public int light = -1;
+        public int brightness = -1;
+
+        public RenderInfo() {}
+
+        public RenderInfo(Block template, IIcon[] texture) {
+            this();
+            this.baseBlock = template;
+            this.textureArray = texture;
+        }
+
+        public RenderInfo(float minX, float minY, float minZ, float maxX, float maxY, float maxZ) {
+            this();
+            setBounds(minX, minY, minZ, maxX, maxY, maxZ);
+        }
+
+        public void setSkyBlockLight(World world, int x, int y, int z, int light) {
+            this.brightness = world.getSkyBlockTypeBrightness(EnumSkyBlock.Sky, x, y, z) << 16 | light;
+        }
+
+        public float getBlockBrightness(IBlockAccess iblockaccess, int i, int j, int k) {
+            return baseBlock.getMixedBrightnessForBlock(iblockaccess, i, j, k);
+        }
+
+        public final void setBounds(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) {
+            this.minX = minX;
+            this.minY = minY;
+            this.minZ = minZ;
+            this.maxX = maxX;
+            this.maxY = maxY;
+            this.maxZ = maxZ;
+        }
+
+        public final void setRenderSingleSide(int side) {
+            Arrays.fill(renderSide, false);
+            renderSide[side] = true;
+        }
+
+        public final void setRenderAllSides() {
+            Arrays.fill(renderSide, true);
+        }
+
+        public void rotate() {
+            double temp = minX;
+            minX = minZ;
+            minZ = temp;
+
+            temp = maxX;
+            maxX = maxZ;
+            maxZ = temp;
+        }
+
+        public void reverseX() {
+            double temp = minX;
+            minX = 1 - maxX;
+            maxX = 1 - temp;
+        }
+
+        public void reverseZ() {
+            double temp = minZ;
+            minZ = 1 - maxZ;
+            maxZ = 1 - temp;
+        }
+
+        public IIcon getBlockTextureFromSide(int i) {
+            if (texture != null) {
+                return texture;
+            }
+
+            int index = i;
+
+            if (textureArray == null || textureArray.length == 0) {
+                return baseBlock.getBlockTextureFromSide(index);
+            } else {
+                if (index >= textureArray.length) {
+                    index = 0;
+                }
+
+                return textureArray[index];
+            }
+        }
+    }
+
+    @Override
+    public void doRender(Entity entity, double x, double y, double z, float f, float f1) {
+        // NO-OP
+    }
+
+    public void renderBlock(RenderInfo info) {
+        Tessellator tessellator = Tessellator.instance;
+        tessellator.startDrawingQuads();
+
+        renderBlocks.setRenderBounds(info.minX, info.minY, info.minZ, info.maxX, info.maxY, info.maxZ);
+
+        if (info.light != -1) {
+            tessellator.setBrightness(info.light << 20 | info.light << 4);
+        } else if (info.brightness != -1) {
+            tessellator.setBrightness(info.brightness << 4);
+        }
+
+        if (info.renderSide[0]) {
+            tessellator.setNormal(0, -1, 0);
+            renderBlocks.renderFaceYNeg(info.baseBlock, 0, 0, 0, info.getBlockTextureFromSide(0));
+        }
+        if (info.renderSide[1]) {
+            tessellator.setNormal(0, 1, 0);
+            renderBlocks.renderFaceYPos(info.baseBlock, 0, 0, 0, info.getBlockTextureFromSide(1));
+        }
+        if (info.renderSide[2]) {
+            tessellator.setNormal(0, 0, -1);
+            renderBlocks.renderFaceZNeg(info.baseBlock, 0, 0, 0, info.getBlockTextureFromSide(2));
+        }
+        if (info.renderSide[3]) {
+            tessellator.setNormal(0, 0, 1);
+            renderBlocks.renderFaceZPos(info.baseBlock, 0, 0, 0, info.getBlockTextureFromSide(3));
+        }
+        if (info.renderSide[4]) {
+            tessellator.setNormal(-1, 0, 0);
+            renderBlocks.renderFaceXNeg(info.baseBlock, 0, 0, 0, info.getBlockTextureFromSide(4));
+        }
+        if (info.renderSide[5]) {
+            tessellator.setNormal(1, 0, 0);
+            renderBlocks.renderFaceXPos(info.baseBlock, 0, 0, 0, info.getBlockTextureFromSide(5));
+        }
+        tessellator.draw();
+    }
+}

src/main/java/com/glodblock/github/client/textures/FCPartsTexture.java

@@ -1,20 +1,36 @@
 package com.glodblock.github.client.textures;
 
-import com.glodblock.github.util.NameConst;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 
+import com.glodblock.github.util.NameConst;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public enum FCPartsTexture {
-    PartFluidTerminal_Bright("fluid_terminal_bright"), PartFluidTerminal_Dark("fluid_terminal_dark"), PartFluidTerminal_Colored("fluid_terminal_medium"),
-    PartFluidPatternTerminal_Bright("pattern_terminal_bright"), PartFluidPatternTerminal_Dark("pattern_terminal_dark"),
-    PartFluidPatternTerminal_Colored("pattern_terminal_medium"), PartTerminalBroad("terminal_broad"),
-    PartFluidImportBus("fluid_import_face"), PartFluidExportBus("fluid_export_face"),
-    BlockFluidInterfaceAlternate_Arrow("fluid_interface_arrow"), BlockInterfaceAlternate("fluid_interface_a"),
-    BlockInterface_Face("fluid_interface"), BlockLevelMaintainer("level_maintainer"), BlockLevelMaintainer_Active("level_maintainer_active");
+
+    PartLevelTerminal_Bright("level_terminal_bright"),
+    PartLevelTerminal_Dark("level_terminal_dark"),
+    PartLevelTerminal_Colored("level_terminal_medium"),
+    PartTerminalBroad("terminal_broad"),
+    PartFluidImportBus("fluid_import_face"),
+    PartFluidExportBus("fluid_export_face"),
+    PartFluidStorageBus("fluid_storage_bus"),
+    BlockFluidInterfaceAlternate_Arrow("fluid_interface_arrow"),
+    BlockInterfaceAlternate("fluid_interface_a"),
+    BlockInterface_Face("fluid_interface"),
+    BlockLevelMaintainer("level_maintainer"),
+    BlockLevelMaintainer_Active("level_maintainer_active"),
+    PartFluidFormationPlane("fluid_formation_plane"),
+    PartFluidAnnihilationPlane("fluid_annihilation_plane"),
+    PartFluidFormationPlaneOn("fluid_formation_plane_on"),
+    PartFluidAnnihilationPlaneOn("fluid_annihilation_plane_on"),
+    BlockMEChestFluid_Bright("fluid_terminal_light"),
+    BlockMEChestFluid_Dark("fluid_terminal_dark"),
+    BlockMEChestFluid_Medium("fluid_terminal_medium");
 
     private final String name;
     public net.minecraft.util.IIcon IIcon;
@@ -27,24 +43,21 @@ public enum FCPartsTexture {
         return null;
     }
 
-    @SideOnly( Side.CLIENT )
-    public static IIcon getMissing()
-    {
-        return ( (TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.locationBlocksTexture ) ).getAtlasSprite( "missingno" );
+    @SideOnly(Side.CLIENT)
+    public static IIcon getMissing() {
+        return ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture))
+                .getAtlasSprite("missingno");
     }
 
-    public String getName()
-    {
+    public String getName() {
         return this.name;
     }
 
-    public IIcon getIcon()
-    {
+    public IIcon getIcon() {
         return this.IIcon;
     }
 
-    public void registerIcon( final TextureMap map )
-    {
-        this.IIcon = map.registerIcon( NameConst.RES_KEY + this.name );
+    public void registerIcon(final TextureMap map) {
+        this.IIcon = map.registerIcon(NameConst.RES_KEY + this.name);
     }
 }

src/main/java/com/glodblock/github/common/Config.java

@@ -1,19 +1,29 @@
 package com.glodblock.github.common;
 
-import cpw.mods.fml.relauncher.FMLInjectionData;
-import net.minecraftforge.common.config.Configuration;
-
 import java.io.File;
 
+import net.minecraftforge.common.config.Configuration;
+
+import cpw.mods.fml.relauncher.FMLInjectionData;
+
 public class Config {
 
-    private static final Configuration Config = new Configuration(new File(new File((File) FMLInjectionData.data()[6], "config"), "ae2fc.cfg"));
+    private static final Configuration Config = new Configuration(
+            new File(new File((File) FMLInjectionData.data()[6], "config"), "ae2fc.cfg"));
 
     public static boolean fluidCells;
     public static boolean noFluidPacket;
     public static boolean fluidIOBus;
     public static boolean removeRecipe;
-    public static boolean blacklistEssentiaGas;
+    public static double portableCellBattery;
+    public static boolean fluidP2PInterface;
+    public static int packetSize;
+    public static int packetRate;
+    public static boolean replaceEC2;
+    public static int levelMaintainerMinTicks;
+    public static int levelMaintainerMaxTicks;
+    public static int reStockTime;
+    public static int magnetRange;
 
     public static void run() {
         loadCategory();
@@ -21,14 +31,55 @@ public class Config {
     }
 
     private static void loadProperty() {
-        fluidCells = Config.getBoolean("Enable Fluid Storage Cell", "Fluid Craft for AE2", true, "Enable this to generate the fluid storage cells. If you are playing with EC2, you can turn it off.");
-        noFluidPacket = Config.getBoolean("No Fluid Packet", "Fluid Craft for AE2", false, "Enable this to make normal ME Interface can emit fluid with fluid pattern, like the ME Dual Interface.");
-        fluidIOBus = Config.getBoolean("Enable AE2FC's Fluid I/O Bus", "Fluid Craft for AE2", true, "Enable this to add Fluid Import/Export Bus like EC2's one.");
-        removeRecipe = Config.getBoolean("Disable all recipes", "Fluid Craft for AE2", false, "Disable all recipes, for quick tweaker.");
-        blacklistEssentiaGas = Config.getBoolean("Blacklist Essentia Gas", "Fluid Craft for AE2", true, "Blacklist Essentia Gas from Thaumic Energistics, so they won't be stored in Fluid Storage Cells.");
+        fluidCells = Config.getBoolean(
+                "Enable Fluid Storage Cell",
+                "Fluid Craft for AE2",
+                true,
+                "Enable this to generate the fluid storage cells. If you are playing with EC2, you can turn it off.");
+        noFluidPacket = Config.getBoolean(
+                "No Fluid Packet",
+                "Fluid Craft for AE2",
+                false,
+                "Enable this to make normal ME Interface can emit fluid with fluid pattern, like the ME Dual Interface.");
+        fluidIOBus = Config.getBoolean(
+                "Enable AE2FC's Fluid I/O Bus",
+                "Fluid Craft for AE2",
+                true,
+                "Enable this to add Fluid Import/Export Bus like EC2's one.");
+        fluidP2PInterface = Config.getBoolean(
+                "fluidP2PInterface",
+                "Fluid Craft for AE2",
+                true,
+                "Enable the P2P Tunnel - ME Dual Interface feature.");
+        removeRecipe = Config.getBoolean(
+                "Disable all recipes",
+                "Fluid Craft for AE2",
+                false,
+                "Disable all recipes, for quick tweaker.");
+        portableCellBattery = Config.get("Fluid Craft for AE2", "Portable Fluid Cell Battery Capacity", 20000D)
+                .getDouble();
+        packetSize = Config.get("Fluid Craft for AE2", "packetSize", 256, "Number of items to be sent per packet")
+                .getInt();
+        if (packetSize <= 0) packetSize = 256;
+        packetRate = Config
+                .get("Fluid Craft for AE2", "packetRate", 50, "Period at which packets are dispatched, in ms.")
+                .getInt();
+        if (packetRate <= 0) packetRate = 50;
+        replaceEC2 = Config.getBoolean(
+                "replaceEC2",
+                "Fluid Craft for AE2",
+                true,
+                "Set true to handle missing item mappings from EC2. Note to work properly, you must have all relevant parts.");
 
-        if (Config.hasChanged())
-            Config.save();
+        levelMaintainerMinTicks = Config.get("LevelMaintainer", "minTick", 5, "Number on ticks for minimal request")
+                .getInt();
+        levelMaintainerMaxTicks = Config.get("LevelMaintainer", "maxTick", 120, "Number on ticks for maximal request")
+                .getInt();
+
+        reStockTime = Config.get("UltraWireless", "reStockTime", 1000, "Time between restocks").getInt();
+        magnetRange = Config.get("UltraWireless", "magnetRange", 16, "Magnet pick up radius").getInt();
+
+        if (Config.hasChanged()) Config.save();
     }
 
     private static void loadCategory() {