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>

.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

@@ -28,6 +28,7 @@ whitelist.json
 *.iws
 src/main/resources/mixins.*([!.]).json
 *.bat
+*.sh
 *.DS_Store
 !gradlew.bat
 .factorypath

dependencies.gradle

@@ -34,29 +34,22 @@
  * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
  */
 dependencies {
-    api('com.github.GTNewHorizons:NotEnoughItems:2.8.43-GTNH:dev')
-    api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-762-GTNH:dev')
-    api('curse.maven:cofh-core-69162:2388751')
-    api('com.github.GTNewHorizons:waila:1.9.15:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.8.34: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")
 
-    implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.11:dev") {
-        exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial'
-    }
-
-    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.4-GTNH:dev')
+    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.2:dev')
-    compileOnly('com.github.GTNewHorizons:EnderIO:2.10.10:dev')
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.152:dev') {
-        exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework'
+    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 }
+
+    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'
     }
-
-    compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
-    compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false }
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.8-GTNH:dev') { transitive = false }
-    compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.16-GTNH:dev') { transitive = false }
-
-    runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.4.0:dev")
 }

gradle.properties

@@ -39,9 +39,33 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
 # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
 developmentEnvironmentUserName = Developer
 
-# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
-# See https://github.com/bsideup/jabel for details on how this works.
-enableModernJavaSyntax = true
+# 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.
@@ -104,7 +128,7 @@ 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
+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!
@@ -162,6 +186,11 @@ modrinthRelations =
 # 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],
@@ -209,3 +238,6 @@ curseForgeRelations =
 # 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,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-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,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# 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.
@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       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/.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -19,12 +19,12 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ 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
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,30 +65,18 @@ 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
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@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
 
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.34'
 }
 
 

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

@@ -6,13 +6,14 @@ import com.glodblock.github.common.Config;
 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.CalculatorV2PluginLoader;
 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;
@@ -25,7 +26,7 @@ import cpw.mods.fml.common.network.NetworkRegistry;
         modid = FluidCraft.MODID,
         version = FluidCraft.VERSION,
         name = FluidCraft.MODNAME,
-        dependencies = "required-after:appliedenergistics2@[rv3-beta-238,);required-after:CoFHCore;after:waila;after:thaumicenergistics;after:ae2wct")
+        dependencies = "required-after:appliedenergistics2@[rv3-beta-238,);after:waila;after:thaumicenergistics;after:ae2wct")
 public class FluidCraft {
 
     public static final String MODID = "ae2fc";
@@ -61,7 +62,7 @@ public class FluidCraft {
     @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) {
@@ -74,10 +75,6 @@ public class FluidCraft {
         RecipeLoader.runTerminalRecipe();
         RecipeLoader.addDisassembleRecipe();
 
-        if (ModAndClassUtil.isV2) {
-            CalculatorV2PluginLoader.installCalculatorV2Plugins();
-        }
-
         proxy.postInit(event);
     }
 

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

@@ -6,7 +6,7 @@ import java.util.Set;
 import net.minecraftforge.fluids.Fluid;
 
 import com.glodblock.github.api.registries.ILevelTerminalRegistry;
-import com.glodblock.github.coremod.registries.LevelTerminalRegistry;
+import com.glodblock.github.util.LevelTerminalRegistry;
 
 public final class FluidCraftAPI implements IFluidCraftAPI {
 

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

@@ -215,7 +215,7 @@ public class UltraTerminalButtons implements ICustomButtonDataObject {
     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)];
+        this.terminalMode = UltraTerminalModes.VALUES[tag.getInteger(MODE)];
     }
 
     @Override
@@ -229,7 +229,8 @@ public class UltraTerminalButtons implements ICustomButtonDataObject {
     public void readByte(ByteBuf buf) {
         this.reStock = buf.readBoolean();
         this.magnetMode = WirelessMagnet.Mode.values()[buf.readInt()];
-        this.terminalMode = UltraTerminalModes.values()[buf.readInt()];
+        this.terminalMode = UltraTerminalModes.VALUES[buf.readInt()];
+        ItemWirelessUltraTerminal.setMode(this.terminal, this.terminalMode);
 
         toggleMagnetButtonsVisibility();
         toggleRestockVisibility();

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

@@ -49,7 +49,7 @@ public class GuiFCImgButton extends GuiButton implements ITooltip {
             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, "EDIT", "YES", "edit");
+            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");
@@ -65,8 +65,10 @@ public class GuiFCImgButton extends GuiButton implements ITooltip {
             this.registerApp(22, "SWITCH", "OFF", "view");
             this.registerApp(21, "SWITCH", "ENABLE", "enable");
             this.registerApp(22, "SWITCH", "DISABLE", "disable");
-            this.registerApp(23, "CONFIG", "YES", "open_configuration");
+            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");

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

@@ -8,6 +8,7 @@ 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;
@@ -31,7 +32,12 @@ public class GuiFluidAutoFiller extends AEBaseGui {
 
     @Override
     public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
-        fontRendererObj.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_AUTO_FILLER)), 8, 6, 0x404040);
-        fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040);
+        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/GuiFluidInterface.java

@@ -1,10 +1,8 @@
 package com.glodblock.github.client.gui;
 
-import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.util.ForgeDirection;
 
@@ -12,14 +10,15 @@ import org.lwjgl.opengl.GL11;
 
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.client.gui.container.ContainerFluidInterface;
-import com.glodblock.github.common.parts.PartFluidInterface;
 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;
 
+import appeng.api.parts.IPart;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.client.gui.GuiSub;
 import appeng.core.localization.GuiText;
@@ -51,24 +50,26 @@ public class GuiFluidInterface extends GuiSub {
         }
     }
 
-    @Override
-    public void func_146977_a(final Slot s) {
-        try {
-            GuiContainer.class.getDeclaredMethod("func_146977_a_original", Slot.class).invoke(this, s);
-        } catch (final Exception ignore) {}
-    }
-
     @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 = 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());
             }
             RenderUtil.renderFluidIntoGui(
                     this,
@@ -102,6 +103,6 @@ public class GuiFluidInterface extends GuiSub {
     }
 
     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

@@ -7,6 +7,7 @@ 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;
@@ -28,7 +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

@@ -22,6 +22,7 @@ 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;
@@ -73,8 +74,13 @@ 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);
     }
 

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

@@ -15,6 +15,7 @@ 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 com.glodblock.github.util.RenderUtil;
 
@@ -66,8 +67,13 @@ 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().getInternalFluid();

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

@@ -15,6 +15,7 @@ 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 com.glodblock.github.util.RenderUtil;
 
@@ -66,9 +67,13 @@ 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,
+                FCGuiColors.guiTextColorGray.getColor());
         fontRendererObj
-                .drawString(getGuiDisplayName(I18n.format(NameConst.GUI_LARGE_INGREDIENT_BUFFER)), 8, 6, 0x404040);
-        fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040);
+                .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor());
         GL11.glColor4f(1F, 1F, 1F, 1F);
 
         IAEFluidTank fluidInv = cont.getTile().getInternalFluid();

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

@@ -5,6 +5,7 @@ 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;
@@ -24,12 +25,14 @@ import com.glodblock.github.util.NameConst;
 
 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;
-import cofh.core.render.CoFHFontRenderer;
 
 public class GuiLevelMaintainer extends GuiSub {
 
@@ -38,14 +41,15 @@ public class GuiLevelMaintainer extends GuiSub {
     private final Component[] component = new Component[TileLevelMaintainer.REQ_COUNT];
     private final MouseRegionManager mouseRegions = new MouseRegionManager(this);
     private Widget focusedWidget;
-    private final CoFHFontRenderer render;
+    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.render = new CoFHFontRenderer(
+        this.render = new FontRenderer(
                 Minecraft.getMinecraft().gameSettings,
                 TEX_BG,
                 Minecraft.getMinecraft().getTextureManager(),
@@ -61,7 +65,8 @@ public class GuiLevelMaintainer extends GuiSub {
                     27,
                     20 + i * 19,
                     this.cont.getTile().getAEStackInventory(),
-                    i);
+                    i,
+                    GuiLevelMaintainer::acceptType);
             slot.setShowAmount(true);
             slot.setShowAmountAlways(true);
             this.registerVirtualSlots(slot);
@@ -82,10 +87,19 @@ public class GuiLevelMaintainer extends GuiSub {
                     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, 125),
+                    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
@@ -122,26 +136,26 @@ public class GuiLevelMaintainer extends GuiSub {
 
     @Override
     public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
-        fontRendererObj.drawString(getGuiDisplayName(NameConst.i18n(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
     protected void mouseClicked(final int xCoord, final int yCoord, final int btn) {
         if (btn == 0) {
-            if (focusedWidget != null) {
-                focusedWidget.textField.setFocused(false);
-            }
             for (Component com : this.component) {
                 Widget textField = com.isMouseIn(xCoord, yCoord);
                 if (textField != null) {
-                    textField.textField.setFocused(true);
-                    this.focusedWidget = textField;
+                    this.focusWidget(textField);
                     super.mouseClicked(xCoord, yCoord, btn);
                     return;
                 }
             }
-            this.focusedWidget = null;
+            this.focusWidget(null);
         }
         super.mouseClicked(xCoord, yCoord, btn);
     }
@@ -162,12 +176,48 @@ public class GuiLevelMaintainer extends GuiSub {
 
             if (key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER) {
                 this.component[this.focusedWidget.componentIndex].submit();
-                this.focusedWidget.textField.setFocused(false);
-                this.focusedWidget = null;
+                this.focusWidget(null);
+            }
+
+            if (key == Keyboard.KEY_TAB) {
+                this.focusAdjacentWidget(isShiftKeyDown());
             }
         }
     }
 
+    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);
+        }
+    }
+
+    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) {
         for (Component com : this.component) {
@@ -175,6 +225,14 @@ public class GuiLevelMaintainer extends GuiSub {
                 return;
             }
         }
+        if (btn == this.liteMode) {
+            if (isShiftKeyDown()) {
+                FluidCraft.proxy.netHandler.sendToServer(new CPacketLevelMaintainer(Action.ClearLiteMode));
+            } else {
+                FluidCraft.proxy.netHandler.sendToServer(new CPacketLevelMaintainer(Action.ToggleLiteMode));
+            }
+            return;
+        }
         super.actionPerformed(btn);
     }
 
@@ -193,6 +251,14 @@ public class GuiLevelMaintainer extends GuiSub {
         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 = false;
@@ -301,43 +367,43 @@ public class GuiLevelMaintainer extends GuiSub {
             message.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_TITLE) + "\n");
             switch (this.state) {
                 case Idle -> {
-                    this.line.setColor(FCGuiColors.StateIdle.getColor());
+                    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());
+                    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());
+                    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());
+                    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());
+                    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());
+                    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());
+                    this.line.setColor(FCGuiColors.stateNone.getColor());
                     message.add(
                             NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " "
                                     + NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_NONE));
@@ -428,10 +494,10 @@ public class GuiLevelMaintainer extends GuiSub {
             final double result = Calculator.conversion(this.textField.getText());
             if (Double.isNaN(result) || result < 0) {
                 this.amount = null;
-                this.textField.setTextColor(0xFF0000);
+                this.textField.setTextColor(FCGuiColors.guiLevelMaintainerError.getColor());
             } else {
                 this.amount = (long) ArithHelper.round(result, 0);
-                this.textField.setTextColor(0xFFFFFF);
+                this.textField.setTextColor(FCGuiColors.guiTextColorGray.getColor());
             }
 
             IAEStack<?> stack = component[this.componentIndex].getStack();

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

@@ -62,7 +62,6 @@ import appeng.container.AEBaseContainer;
 import appeng.container.slot.AppEngSlot;
 import appeng.core.AEConfig;
 import appeng.core.localization.ButtonToolTips;
-import appeng.core.localization.GuiColors;
 import appeng.core.localization.GuiText;
 import appeng.core.localization.PlayerMessages;
 import appeng.core.sync.GuiBridge;
@@ -73,7 +72,6 @@ import appeng.integration.IntegrationRegistry;
 import appeng.integration.IntegrationType;
 import appeng.util.Platform;
 import appeng.util.ReadableNumberConverter;
-import cpw.mods.fml.common.Loader;
 
 public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextField, IGuiTooltipHandler {
 
@@ -93,8 +91,8 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
     private GuiImgButton terminalStyleBox;
 
     private ItemStack tooltipStack;
+    private List<String> buttonTooltip;
     private boolean online;
-    private final boolean neiPresent;
     private int viewHeight;
 
     protected GuiTabButton craftingStatusBtn;
@@ -108,16 +106,14 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
     private static final float ITEM_STACK_Z = 100.0f;
     private static final float ITEM_STACK_OVERLAY_Z = 200.0f;
     private static final float SLOT_HOVER_Z = 310.0f;
-    private static final float TOOLTIP_Z = 410.0f;
     private static final float STEP_Z = 10.0f;
     private static final float MAGIC_RENDER_ITEM_Z = 50.0f;
 
     public GuiLevelTerminal(InventoryPlayer inventoryPlayer, Container container) {
         super(inventoryPlayer, container);
         setScrollBar(new GuiScrollbar());
-        xSize = 208;
+        xSize = 209;
         ySize = 255;
-        neiPresent = Loader.isModLoaded("NotEnoughItems");
 
         searchFieldOutputs = new MEGuiTextField(86, 12, ButtonToolTips.SearchFieldOutputs.getLocal()) {
 
@@ -134,7 +130,6 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
                 masterList.markDirty();
             }
         };
-        searchFieldNames.setFocused(true);
         extraOptionsText.add(ButtonToolTips.HighlightInterface.getLocal());
         online = true;
     }
@@ -179,18 +174,19 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
 
         searchFieldNames.x = guiLeft + Math.max(32, offsetX) + 99;
         searchFieldNames.y = guiTop + 38;
+        searchFieldNames.setFocused(true);
 
         terminalStyleBox.xPosition = guiLeft - 18;
         terminalStyleBox.yPosition = guiTop + 8;
         craftingStatusBtn = new GuiTabButton(
-                guiLeft + xSize - 24,
+                guiLeft + xSize - 25,
                 guiTop - 4,
                 2 + 11 * 16,
                 GuiText.CraftingStatus.getLocal(),
                 itemRender);
         craftingStatusBtn.setHideEdge(13);
 
-        if (ModAndClassUtil.isSearchBar && (AEConfig.instance.preserveSearchBar || isSubGui())) {
+        if (AEConfig.instance.preserveSearchBar || isSubGui()) {
             setSearchString();
         }
         buttonList.add(terminalStyleBox);
@@ -244,14 +240,14 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
                 StatCollector.translateToLocal(NameConst.GUI_LEVEL_TERMINAL),
                 8,
                 6,
-                GuiColors.InterfaceTerminalTitle.getColor());
+                FCGuiColors.guiTextColorGray.getColor());
         fontRendererObj.drawString(
                 GuiText.inventory.getLocal(),
                 GuiLevelTerminal.offsetX + 2,
                 ySize - 96 + 3,
-                GuiColors.InterfaceTerminalInventory.getColor());
+                FCGuiColors.guiTextColorGray.getColor());
 
-        if (!neiPresent && tooltipStack != null) {
+        if (!ModAndClassUtil.NEI && tooltipStack != null) {
             renderToolTip(tooltipStack, mouseX, mouseY);
         }
     }
@@ -264,6 +260,11 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
 
         handleTooltip(mouseX, mouseY, searchFieldOutputs);
         handleTooltip(mouseX, mouseY, searchFieldNames);
+
+        // Drawn after the viewport so the items do not cover it
+        if (buttonTooltip != null) {
+            drawHoveringText(buttonTooltip, mouseX, mouseY, fontRendererObj);
+        }
     }
 
     @Override
@@ -290,7 +291,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
     @Override
     protected void actionPerformed(final GuiButton btn) {
         if (actionPerformedCustomButtons(btn)) return;
-        if (ModAndClassUtil.isSaveText && btn == searchStringSave) {
+        if (btn == searchStringSave) {
 
             final boolean backwards = Mouse.isButtonDown(1);
             final GuiImgButton iBtn = (GuiImgButton) btn;
@@ -348,6 +349,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
             GL11.glPushMatrix();
             GL11.glTranslatef(offsetX + VIEW_LEFT, offsetY + HEADER_HEIGHT, 0);
             tooltipStack = null;
+            buttonTooltip = null;
             drawViewport(mouseX - offsetX - VIEW_LEFT, mouseY - offsetY - HEADER_HEIGHT - 1);
             GL11.glPopMatrix();
             GL11.glPopAttrib();
@@ -398,7 +400,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
         int title;
         int renderY = 0;
         final int sectionBottom = viewY + section.getHeight() - 1;
-        final int fontColor = GuiColors.InterfaceTerminalInventory.getColor();
+        final int fontColor = FCGuiColors.guiTextColorGray.getColor();
         /*
          * Render title
          */
@@ -502,22 +504,26 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
             entry.renameButton.yPosition = viewY + 1;
             entry.configButton.yPosition = viewY + 1;
             GuiFCImgButton toRender;
-            if (isCtrlKeyDown() && isShiftKeyDown()) {
-                toRender = entry.configButton;
-            } else if (isShiftKeyDown()) {
+            if (isShiftKeyDown() && entry.isInPlayerDimension()) {
                 toRender = entry.renameButton;
+            } else if (isCtrlKeyDown() && entry.isInPlayerDimension()) {
+                toRender = entry.configButton;
             } else {
                 toRender = entry.highlightButton;
             }
             toRender.drawButton(mc, relMouseX, relMouseY);
             if (toRender.getMouseIn()
                     && relMouseY >= Math.max(LevelTerminalSection.TITLE_HEIGHT, entry.highlightButton.yPosition)) {
-                // draw a tooltip
-                GL11.glTranslatef(0f, 0f, TOOLTIP_Z);
-                GL11.glDisable(GL11.GL_SCISSOR_TEST);
-                drawHoveringText(Arrays.asList(toRender.getMessage()), relMouseX, relMouseY);
-                GL11.glTranslatef(0f, 0f, -TOOLTIP_Z);
-                GL11.glEnable(GL11.GL_SCISSOR_TEST);
+                List<String> tooltip = new ArrayList<>();
+                tooltip.add(toRender.getMessage());
+                if (entry.isInPlayerDimension()) {
+                    tooltip.add(StatCollector.translateToLocal(NameConst.TT_KEY + "level_terminal.hint_rename"));
+                    tooltip.add(StatCollector.translateToLocal(NameConst.TT_KEY + "level_terminal.hint_open_gui"));
+                } else {
+                    tooltip.add(
+                            StatCollector.translateToLocal(NameConst.TT_KEY + "level_terminal.hint_other_dimension"));
+                }
+                buttonTooltip = tooltip;
             }
         } else {
             entry.highlightButton.yPosition = -1;
@@ -557,11 +563,11 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
                     aes.drawOverlayInGui(mc, 0, 0, false, false, false, false);
                     GL11.glTranslatef(0.0f, 0.0f, ITEM_STACK_OVERLAY_Z - ITEM_STACK_Z);
                     int color = switch (state) {
-                        case Idle -> FCGuiColors.StateIdle.getColor();
-                        case Craft -> FCGuiColors.StateCraft.getColor();
-                        case Export -> FCGuiColors.StateExport.getColor();
-                        case Error, NotFound, CantCraft -> FCGuiColors.StateError.getColor();
-                        case None -> FCGuiColors.StateNone.getColor();
+                        case Idle -> FCGuiColors.stateIdle.getColor();
+                        case Craft -> FCGuiColors.stateCraft.getColor();
+                        case Export -> FCGuiColors.stateExport.getColor();
+                        case Error, NotFound, CantCraft -> FCGuiColors.stateError.getColor();
+                        case None -> FCGuiColors.stateNone.getColor();
                     };
                     int offset = 0;
                     int size = 4;
@@ -579,23 +585,28 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
                     if (!tooltip) {
                         if (entry.filteredRecipes[slotIdx]) {
                             GL11.glTranslatef(0.0f, 0.0f, ITEM_STACK_OVERLAY_Z);
-                            drawRect(0, 0, 16, 16, GuiColors.ItemSlotOverlayUnpowered.getColor());
+                            drawRect(0, 0, 16, 16, FCGuiColors.itemSlotOverlayUnpowered.getColor());
                         }
                     } else {
-                        tooltipStack = Platform.stackConvert(aes).getItemStack();
+                        tooltipStack = aes.getItemStackForNEI();
                     }
                     GL11.glPopMatrix();
                 } else if (entry.filteredRecipes[slotIdx]) {
                     GL11.glPushMatrix();
                     GL11.glTranslatef(colLeft, viewY + rowYTop + 1, ITEM_STACK_OVERLAY_Z);
-                    drawRect(0, 0, 16, 16, GuiColors.ItemSlotOverlayUnpowered.getColor());
+                    drawRect(0, 0, 16, 16, FCGuiColors.itemSlotOverlayUnpowered.getColor());
                     GL11.glPopMatrix();
                 }
                 if (tooltip) {
                     // overlay highlight
                     GL11.glDisable(GL11.GL_LIGHTING);
                     GL11.glTranslatef(0.0f, 0.0f, SLOT_HOVER_Z);
-                    drawRect(colLeft, viewY + 1 + rowYTop, -2 + colRight, viewY - 1 + rowYBot, 0x77FFFFFF);
+                    drawRect(
+                            colLeft,
+                            viewY + 1 + rowYTop,
+                            -2 + colRight,
+                            viewY - 1 + rowYBot,
+                            FCGuiColors.guiLevelTerminalOverlayHighlight.getColor());
                     GL11.glTranslatef(0.0f, 0.0f, -SLOT_HOVER_Z);
                 }
                 GL11.glDisable(GL11.GL_LIGHTING);
@@ -653,102 +664,6 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
         }
     }
 
-    @Override
-    public void drawHoveringText(List<String> textLines, int x, int y, FontRenderer font) {
-        if (!textLines.isEmpty()) {
-            GL11.glDisable(GL12.GL_RESCALE_NORMAL);
-            RenderHelper.disableStandardItemLighting();
-            int maxStrWidth = 0;
-
-            // is this more efficient than doing 1 pass, then doing a translate before drawing the text?
-            for (String s : (List<String>) textLines) {
-                int width = font.getStringWidth(s);
-
-                if (width > maxStrWidth) {
-                    maxStrWidth = width;
-                }
-            }
-
-            // top left corner
-            int curX = x + 12;
-            int curY = y - 12;
-            int totalHeight = 8;
-
-            if (textLines.size() > 1) {
-                totalHeight += 2 + (textLines.size() - 1) * 10;
-            }
-
-            /* String is too long? Display on the left side */
-            if (curX + maxStrWidth > width) {
-                curX -= 28 + maxStrWidth;
-            }
-
-            /* String is too tall? move it up */
-            if (curY + totalHeight + 6 > height) {
-                curY = height - totalHeight - 6;
-            }
-
-            int borderColor = -267386864;
-            // drawing the border...
-            drawGradientRect(curX - 3, curY - 4, curX + maxStrWidth + 3, curY - 3, borderColor, borderColor);
-            drawGradientRect(
-                    curX - 3,
-                    curY + totalHeight + 3,
-                    curX + maxStrWidth + 3,
-                    curY + totalHeight + 4,
-                    borderColor,
-                    borderColor);
-            drawGradientRect(
-                    curX - 3,
-                    curY - 3,
-                    curX + maxStrWidth + 3,
-                    curY + totalHeight + 3,
-                    borderColor,
-                    borderColor);
-            drawGradientRect(curX - 4, curY - 3, curX - 3, curY + totalHeight + 3, borderColor, borderColor);
-            drawGradientRect(
-                    curX + maxStrWidth + 3,
-                    curY - 3,
-                    curX + maxStrWidth + 4,
-                    curY + totalHeight + 3,
-                    borderColor,
-                    borderColor);
-            int color1 = 1347420415;
-            int color2 = (color1 & 16711422) >> 1 | color1 & -16777216;
-            drawGradientRect(curX - 3, curY - 3 + 1, curX - 3 + 1, curY + totalHeight + 3 - 1, color1, color2);
-            drawGradientRect(
-                    curX + maxStrWidth + 2,
-                    curY - 3 + 1,
-                    curX + maxStrWidth + 3,
-                    curY + totalHeight + 3 - 1,
-                    color1,
-                    color2);
-            drawGradientRect(curX - 3, curY - 3, curX + maxStrWidth + 3, curY - 3 + 1, color1, color1);
-            drawGradientRect(
-                    curX - 3,
-                    curY + totalHeight + 2,
-                    curX + maxStrWidth + 3,
-                    curY + totalHeight + 3,
-                    color2,
-                    color2);
-
-            for (int i = 0; i < textLines.size(); ++i) {
-                String line = (String) textLines.get(i);
-                font.drawStringWithShadow(line, curX, curY, -1);
-
-                if (i == 0) {
-                    // gap between name and lore text
-                    curY += 2;
-                }
-
-                curY += 10;
-            }
-
-            RenderHelper.enableGUIStandardItemLighting();
-            GL11.glEnable(GL12.GL_RESCALE_NORMAL);
-        }
-    }
-
     @Override
     protected void keyTyped(final char character, final int key) {
         if (!checkHotbarKeys(key)) {
@@ -854,18 +769,13 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
         }
     }
 
-    private boolean itemStackMatchesSearchTerm(final ItemStack itemStack, final String searchTerm) {
-        if (itemStack == null) {
+    private boolean stackMatchesSearchTerm(final IAEStack<?> stack, final String searchTerm) {
+        if (stack == null) {
             return false;
         }
 
-        final String displayName = Platform.getItemDisplayName(itemStack).toLowerCase();
-
-        if (displayName.contains(searchTerm)) {
-            return true;
-        }
-
-        return false;
+        final String displayName = stack.getDisplayName();
+        return displayName != null && displayName.toLowerCase().contains(searchTerm);
     }
 
     @Override
@@ -1103,9 +1013,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
                             continue;
                         }
 
-                        if (itemStackMatchesSearchTerm(
-                                Platform.stackConvert(entry.infoList[i].stack).getItemStack(),
-                                output)) {
+                        if (stackMatchesSearchTerm(entry.infoList[i].stack, output)) {
                             shouldAdd = true;
                             entry.filteredRecipes[i] = false;
                         } else {
@@ -1188,8 +1096,8 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
                 }
             }
             highlightButton = new GuiFCImgButton(1, 0, "HIGHLIGHT", "YES");
-            renameButton = new GuiFCImgButton(1, 0, "EDIT", "YES");
-            configButton = new GuiFCImgButton(1, 0, "CONFIG", "YES");
+            renameButton = new GuiFCImgButton(1, 0, "RENAME", "YES");
+            configButton = new GuiFCImgButton(1, 0, "OPEN_GUI", "YES");
             guiHeight = 18 * rows + 1;
             filteredRecipes = new boolean[rows * rowSize];
         }
@@ -1209,6 +1117,10 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
             return this;
         }
 
+        private boolean isInPlayerDimension() {
+            return mc != null && mc.thePlayer != null && mc.thePlayer.dimension == this.dim;
+        }
+
         public boolean mouseClicked(int mouseX, int mouseY, int mouseButton) {
             if (!section.visible || mouseButton < 0 || mouseButton > 2) {
                 return false;
@@ -1224,16 +1136,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
                         dim,
                         ForgeDirection.getOrientation(side),
                         "");
-                if (isCtrlKeyDown() && isShiftKeyDown()) {
-                    FluidCraft.proxy.netHandler.sendToServer(
-                            new CPacketLevelTerminalCommands(
-                                    Action.EDIT,
-                                    blockPos.x,
-                                    blockPos.y,
-                                    blockPos.z,
-                                    blockPos.getDimension(),
-                                    blockPos.getSide()));
-                } else if (isShiftKeyDown()) {
+                if (isShiftKeyDown() && isInPlayerDimension()) {
                     FluidCraft.proxy.netHandler.sendToServer(
                             new CPacketLevelTerminalCommands(
                                     Action.RENAME,
@@ -1242,7 +1145,15 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
                                     blockPos.z,
                                     blockPos.getDimension(),
                                     blockPos.getSide()));
-
+                } else if (isCtrlKeyDown() && isInPlayerDimension()) {
+                    FluidCraft.proxy.netHandler.sendToServer(
+                            new CPacketLevelTerminalCommands(
+                                    Action.EDIT,
+                                    blockPos.x,
+                                    blockPos.y,
+                                    blockPos.z,
+                                    blockPos.getDimension(),
+                                    blockPos.getSide()));
                 } else {
                     BlockPosHighlighter.highlightBlocks(
                             mc.thePlayer,

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

@@ -10,6 +10,7 @@ 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;
@@ -136,14 +137,32 @@ public class GuiMagnetFilter extends GuiSub {
 
     @Override
     public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
-        this.fontRendererObj.drawString(NameConst.i18n(NameConst.GUI_MAGNET_CARD), 8, 6, 0x404040);
-        this.fontRendererObj.drawString(NameConst.i18n(NameConst.GUI_MAGNET_CARD_NBT), 61, 22, 0x404040);
-        this.fontRendererObj.drawString(NameConst.i18n(NameConst.GUI_MAGNET_CARD_META), 61, 34, 0x404040);
-        this.fontRendererObj.drawString(NameConst.i18n(NameConst.GUI_MAGNET_CARD_ORE), 61, 46, 0x404040);
+        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();
         }

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

@@ -7,6 +7,7 @@ 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;
@@ -29,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/GuiSuperStockReplenisher.java

@@ -1,101 +1,120 @@
 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.inventory.Slot;
-import net.minecraft.item.ItemStack;
 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.item.ItemFluidPacket;
 import com.glodblock.github.common.tile.TileSuperStockReplenisher;
+import com.glodblock.github.util.FCGuiColors;
 
 import appeng.api.storage.StorageName;
-import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IAEStackType;
 import appeng.client.gui.AEBaseGui;
-import appeng.container.AEBaseContainer;
-import appeng.container.slot.SlotFake;
+import appeng.client.gui.slots.VirtualMEPhantomSlot;
+import appeng.client.gui.slots.VirtualMEPhantomSlotPrecise;
 import appeng.core.localization.GuiText;
-import appeng.core.sync.GuiBridge;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketSwitchGuis;
-import appeng.core.sync.packets.PacketVirtualSlot;
-import appeng.util.item.AEItemStack;
+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
-    protected void handleMouseClick(Slot slot, int slotIdx, int ctrlDown, int mouseButton) {
-        if (mouseButton == 3) {
-            if (slot instanceof SlotFake) {
-                if (slot.getHasStack()) {
-                    IAEItemStack stack = AEItemStack.create(slot.getStack());
-                    ((AEBaseContainer) this.inventorySlots).setTargetStack(stack);
-                    for (int i = 0; i < this.inventorySlots.inventorySlots.size(); i++) {
-                        if (slot.equals(this.inventorySlots.inventorySlots.get(i))) {
-                            NetworkHandler.instance
-                                    .sendToServer(new PacketSwitchGuis(GuiBridge.GUI_PATTERN_VALUE_AMOUNT));
-                            NetworkHandler.instance
-                                    .sendToServer(new PacketVirtualSlot(StorageName.CRAFTING_INPUT, i, stack));
-                        }
-                    }
-                    return;
-                }
+    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);
             }
         }
-        super.handleMouseClick(slot, slotIdx, ctrlDown, mouseButton);
     }
 
-    @Override
-    public void func_146977_a(Slot s) {
-        if (s instanceof SlotFake) {
-            this.drawFillStatus(s);
-        }
-        super.func_146977_a(s);
-    }
+    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;
 
-    private void drawFillStatus(Slot slotIn) {
-        int offsetX = slotIn.xDisplayPosition - 8;
-        int offsetY = slotIn.yDisplayPosition - 11;
-        ItemStack itemstack = slotIn.getStack();
-        int slotInt = slotIn.slotNumber;
-        if (itemstack != null) {
+        if (stackSize != 0) {
             String s = "0%";
-            if (slotInt > 0 && slotInt < 10) {
-                IAEStack<?> aeStack = list.get(slotInt - 1);
-                if (aeStack != null)
-                    s = (int) (((float) aeStack.getStackSize() / ItemFluidPacket.getFluidAmount(itemstack)) * 100)
-                            + "%";
-            } else if (slotInt > 9 && slotInt < 73) {
-                IAEStack<?> aeStack = list.get(slotInt + 90);
-                if (aeStack != null && itemstack.stackSize > 0) {
-                    long i = aeStack.getStackSize();
-                    s = (int) (((float) i / itemstack.stackSize) * 100) + "%";
-                }
-            }
+            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);
-            final int Y = (int) (((float) offsetY - shiftY + 16.0f - 7.0f * scale) * inverseScaleFactor);
+            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);
@@ -104,9 +123,16 @@ public class GuiSuperStockReplenisher extends AEBaseGui {
         }
     }
 
+    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, 0x404040);
+        fontRendererObj
+                .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor());
+        this.drawVirtualSlots();
     }
 
     @Override
@@ -115,7 +141,25 @@ public class GuiSuperStockReplenisher extends AEBaseGui {
         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/container/ContainerFluidPacketDecoder.java

@@ -1,7 +1,10 @@
 package com.glodblock.github.client.gui.container;
 
+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;
@@ -13,7 +16,14 @@ public class ContainerFluidPacketDecoder extends AEBaseContainer {
 
     public ContainerFluidPacketDecoder(InventoryPlayer ipl, TileFluidPacketDecoder tile) {
         super(ipl, tile);
-        addSlotToContainer(new FCSlotRestrictedInput(PACKET.stack(), tile.getInventory(), 0, 80, 35, ipl));
+        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/ContainerLevelMaintainer.java

@@ -110,7 +110,7 @@ public class ContainerLevelMaintainer extends ContainerSubGui implements IVirtua
                     (EntityPlayerMP) this.getInventoryPlayer().player);
         }
         FluidCraft.proxy.netHandler.sendTo(
-                new SPacketLevelMaintainerGuiUpdate(this.tile.requests, !this.isFirstUpdate),
+                new SPacketLevelMaintainerGuiUpdate(this.tile.requests, !this.isFirstUpdate, this.tile.isLiteMode()),
                 (EntityPlayerMP) this.getInventoryPlayer().player);
         this.isFirstUpdate = false;
         this.updateCount = 0;
@@ -126,7 +126,7 @@ public class ContainerLevelMaintainer extends ContainerSubGui implements IVirtua
                 NetworkHandler.instance
                         .sendTo(new PacketVirtualSlot(StorageName.NONE, slotStacks), (EntityPlayerMP) player);
                 FluidCraft.proxy.netHandler.sendTo(
-                        new SPacketLevelMaintainerGuiUpdate(this.tile.requests, false),
+                        new SPacketLevelMaintainerGuiUpdate(this.tile.requests, false, this.tile.isLiteMode()),
                         (EntityPlayerMP) player);
             }
         }

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

@@ -16,12 +16,12 @@ 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.coremod.registries.LevelTerminalRegistry;
 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;
@@ -155,9 +155,9 @@ public class ContainerLevelTerminal extends FCBaseContainer {
                                 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) {
+                                    || 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]);

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

@@ -24,10 +24,12 @@ public class ContainerLevelWireless extends ContainerLevelTerminal {
     @Override
     public PrimaryGui createPrimaryGui() {
         ContainerOpenContext context = getOpenContext();
-        return new FluidPrimaryGui(
+        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/ContainerSuperStockReplenisher.java

@@ -3,63 +3,70 @@ package com.glodblock.github.client.gui.container;
 import java.util.HashMap;
 import java.util.Map;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
 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.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
 import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.item.FCBaseItemCell;
-import com.glodblock.github.common.item.ItemFluidPacket;
+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.inventory.slot.OptionalFluidSlotFake;
 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.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
-import appeng.client.gui.implementations.GuiPatternItemRenamer;
-import appeng.client.gui.implementations.GuiPatternValueAmount;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerOpenContext;
 import appeng.container.PrimaryGui;
-import appeng.container.interfaces.IVirtualSlotHolder;
 import appeng.container.interfaces.IVirtualSlotSource;
-import appeng.container.slot.IOptionalSlotHost;
-import appeng.container.slot.SlotPatternOutputs;
 import appeng.container.slot.SlotRestrictedInput;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketVirtualSlot;
-import appeng.items.storage.ItemBasicStorageCell;
+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 it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
-public class ContainerSuperStockReplenisher extends AEBaseContainer
-        implements IOptionalSlotHost, IVirtualSlotHolder, IVirtualSlotSource {
+public class ContainerSuperStockReplenisher extends AEBaseContainer implements IVirtualSlotSource {
 
     private final TileSuperStockReplenisher tile;
-    private final IInventory configFluids;
-    private final IInventory configItems;
-    private int lastUpdated = 0;
+
+    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;
-        configFluids = tile.getConfigFluid();
-        configItems = tile.getConfigItems();
+        this.configFluids = tile.getConfigFluids();
+        this.configItems = tile.getConfigItems();
         final IInventory cell = tile.getCell();
 
-        final int x = 8;
-        final int fy = 8;
+        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(
@@ -67,56 +74,38 @@ public class ContainerSuperStockReplenisher extends AEBaseContainer
                         cell,
                         0,
                         173,
-                        fy,
+                        8,
                         this.getInventoryPlayer()));
 
-        for (int i = 0; i < 9; i++) {
-            addSlotToContainer(new OptionalFluidSlotFake(configFluids, this, i, x, fy, i, 0, 0));
-        }
-
-        final int io = 29;
-        for (int y = 0; y < 7; y++) {
-            for (int ix = 0; ix < 9; ix++) {
-                this.addSlotToContainer(new SlotPatternOutputs(configItems, this, y * 9 + ix, x, io, ix, y, y));
-            }
-        }
-
         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;
-        }
+        if (slotId == 0 && player.inventory.getItemStack() == null && isConfigurated()) return null;
         return super.slotClick(slotId, clickedButton, mode, player);
     }
 
-    @Override
-    public boolean isSlotEnabled(int idx) {
-        return true;
-    }
-
-    @Override
-    public void addCraftingToCrafters(ICrafting p_75132_1_) {
-        super.addCraftingToCrafters(p_75132_1_);
-        lastUpdated = 24;
-    }
-
     @Override
     public void detectAndSendChanges() {
         super.detectAndSendChanges();
+        if (Platform.isClient()) return;
 
-        if (lastUpdated > 20) {
-            lastUpdated = 0;
+        if (this.lastUpdated > 20) {
+            this.lastUpdated = 0;
             Map<Integer, IAEStack<?>> tmp = new HashMap<>();
 
-            for (int i = 0; i < tile.getInternalFluid().getSlots(); i++) {
-                tmp.put(i, tile.getInternalFluid().getFluidInSlot(i));
+            for (int i = 0; i < this.tile.getInternalFluid().getSlots(); i++) {
+                tmp.put(i, this.tile.getInternalFluid().getFluidInSlot(i));
             }
 
-            for (int i = 0; i < tile.getInternalInventory().getSizeInventory(); i++) {
-                tmp.put(i + 100, AEItemStack.create(tile.getInternalInventory().getStackInSlot(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) {
@@ -124,21 +113,20 @@ public class ContainerSuperStockReplenisher extends AEBaseContainer
                     FluidCraft.proxy.netHandler.sendTo(new SPacketSuperStockReplenisherUpdate(tmp), (EntityPlayerMP) g);
                 }
             }
+
+            if (Platform.isServer()) this.setFullStockMode(this.tile.isFullStockMode());
+
         }
-        lastUpdated++;
+
+        this.lastUpdated++;
     }
 
     private boolean isConfigurated() {
-        for (int i = 0; i < configItems.getSizeInventory(); i++) {
-            if (configItems.getStackInSlot(i) != null) {
-                return true;
-            }
-        }
-        for (int i = 0; i < configFluids.getSizeInventory(); i++) {
-            if (configFluids.getStackInSlot(i) != null) {
-                return true;
-            }
-        }
+        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;
     }
 
@@ -148,17 +136,9 @@ public class ContainerSuperStockReplenisher extends AEBaseContainer
             long currentBytes = 0;
             long newBytes = -1;
 
-            if (s.getStack().getItem() instanceof ItemBasicStorageCell ibsc) {
-                currentBytes = ibsc.getBytesLong(is);
-            } else if (s.getStack().getItem() instanceof FCBaseItemCell fcbic) {
-                currentBytes = fcbic.getBytes(is);
-            }
+            if (s.getStack().getItem() instanceof IStorageCell isc) currentBytes = isc.getBytesLong(is);
 
-            if (is.getItem() instanceof ItemBasicStorageCell ibsc) {
-                newBytes = ibsc.getBytesLong(is);
-            } else if (is.getItem() instanceof FCBaseItemCell fcbic) {
-                newBytes = fcbic.getBytes(is);
-            }
+            if (is.getItem() instanceof IStorageCell isc) newBytes = isc.getBytesLong(is);
 
             if (currentBytes > newBytes) {
                 return false;
@@ -167,10 +147,6 @@ public class ContainerSuperStockReplenisher extends AEBaseContainer
         return super.isValidForSlot(s, is);
     }
 
-    public TileSuperStockReplenisher getTile() {
-        return tile;
-    }
-
     @Override
     public PrimaryGui createPrimaryGui() {
         ContainerOpenContext context = getOpenContext();
@@ -181,40 +157,34 @@ public class ContainerSuperStockReplenisher extends AEBaseContainer
                 context.getSide());
     }
 
-    @Override
-    public void receiveSlotStacks(StorageName invName, Int2ObjectMap<IAEStack<?>> slotStacks) {
-        var entry = slotStacks.int2ObjectEntrySet().iterator().next();
-        IAEStack<?> aes = entry.getValue();
-        int slotIndex = entry.getIntKey();
-
-        if (Platform.isServer()) {
-            for (ICrafting crafter : this.crafters) {
-                final EntityPlayerMP emp = (EntityPlayerMP) crafter;
-                NetworkHandler.instance.sendTo(new PacketVirtualSlot(invName, slotIndex, aes), emp);
-            }
-        } else {
-            final GuiScreen gs = Minecraft.getMinecraft().currentScreen;
-            if (gs instanceof GuiPatternValueAmount gpva) {
-                gpva.update();
-            } else if (gs instanceof GuiPatternItemRenamer gpir) {
-                gpir.update();
-            }
-        }
-    }
-
     @Override
     public void updateVirtualSlot(StorageName invName, int slotId, IAEStack<?> aes) {
-        if (aes instanceof IAEItemStack ais) {
-            ItemStack newIs;
-            if (ais.getItem() instanceof ItemFluidPacket) {
-                newIs = ais.getItemStack();
-                newIs.stackSize = 1;
-                ItemFluidPacket.setFluidAmount(newIs, aes.getStackSize());
-            } else {
-                newIs = ais.getItemStack();
+        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();
             }
-            this.inventorySlots.get(slotId).putStack(newIs);
         }
     }
 
+    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/base/FCBaseContainer.java

@@ -9,6 +9,7 @@ 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 {
 
@@ -37,7 +38,7 @@ public abstract class FCBaseContainer extends AEBaseContainer {
         if (isWirelessTerminal()) {
             if (this.host instanceof IFluidPortableCell) {
                 final int slotIndex = ((IFluidPortableCell) this.host).getInventorySlot();
-                if (Util.GuiHelper.decodeInvType(slotIndex).getLeft() == Util.GuiHelper.InvType.PLAYER_INV) {
+                if (slotIndex <= Platform.baublesSlotsOffset) {
                     this.lockPlayerInventorySlot(slotIndex);
                 }
                 return slotIndex;

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

@@ -42,6 +42,12 @@ public class ItemPacketRender implements IItemRenderer {
         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 = fluid == null ? 0xFFFFFF : fluid.getFluid().getColor(fluid);
@@ -65,6 +71,9 @@ public class ItemPacketRender implements IItemRenderer {
                     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

@@ -1,17 +1,12 @@
 package com.glodblock.github.client.render;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.IItemRenderer;
 import net.minecraftforge.client.MinecraftForgeClient;
-import net.minecraftforge.client.model.AdvancedModelLoader;
-import net.minecraftforge.client.model.IModelCustom;
 
 import org.lwjgl.opengl.GL11;
 
-import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.tile.TileWalrus;
 import com.glodblock.github.loader.ItemAndBlockHolder;
 
@@ -19,9 +14,6 @@ import cpw.mods.fml.client.registry.ClientRegistry;
 
 public class ItemWalrusRender implements IItemRenderer {
 
-    IModelCustom modelWalrus = AdvancedModelLoader.loadModel(FluidCraft.resource("models/walrus.obj"));
-    ResourceLocation textureWalrus = FluidCraft.resource("textures/blocks/walrus.png");
-
     public ItemWalrusRender() {
         ClientRegistry.bindTileEntitySpecialRenderer(TileWalrus.class, new RenderBlockWalrus());
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ItemAndBlockHolder.WALRUS), this);
@@ -34,7 +26,6 @@ public class ItemWalrusRender implements IItemRenderer {
 
     @Override
     public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
-        Minecraft.getMinecraft().renderEngine.bindTexture(this.textureWalrus);
         GL11.glPushMatrix();
         switch (type) {
             case EQUIPPED_FIRST_PERSON -> {
@@ -44,7 +35,7 @@ public class ItemWalrusRender implements IItemRenderer {
             case INVENTORY -> GL11.glTranslatef(-0.5F, -0.5F, -0.1F);
             default -> {}
         }
-        this.modelWalrus.renderAll();
+        WalrusRenderer.render();
         GL11.glPopMatrix();
     }
 

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

@@ -9,6 +9,7 @@ import com.glodblock.github.client.textures.FCPartsTexture;
 import com.glodblock.github.common.block.BlockFluidInterface;
 import com.glodblock.github.common.tile.TileFluidInterface;
 
+import appeng.api.util.AEColor;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BlockRenderInfo;
 import appeng.tile.misc.TileInterface;
@@ -25,15 +26,18 @@ public class RenderBlockFluidInterface extends BaseBlockRender<BlockFluidInterfa
         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);

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

@@ -1,25 +1,16 @@
 package com.glodblock.github.client.render;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.model.AdvancedModelLoader;
-import net.minecraftforge.client.model.IModelCustom;
 
 import org.lwjgl.opengl.GL11;
 
-import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.tile.TileWalrus;
 
 public class RenderBlockWalrus extends TileEntitySpecialRenderer {
 
-    IModelCustom modelWalrus = AdvancedModelLoader.loadModel(FluidCraft.resource("models/walrus.obj"));
-    ResourceLocation textureWalrus = FluidCraft.resource("textures/blocks/walrus.png");
-
     @Override
     public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float partialTickTime) {
-        Minecraft.getMinecraft().renderEngine.bindTexture(this.textureWalrus);
         if (!(tileentity instanceof TileWalrus Tile)) return;
         float scale = Tile.getWalrusScale();
         GL11.glPushMatrix();
@@ -42,7 +33,7 @@ public class RenderBlockWalrus extends TileEntitySpecialRenderer {
                 break;
         }
         GL11.glScalef(scale, scale, scale);
-        this.modelWalrus.renderAll();
+        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/textures/FCPartsTexture.java

@@ -12,12 +12,6 @@ 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"),
     PartLevelTerminal_Bright("level_terminal_bright"),
     PartLevelTerminal_Dark("level_terminal_dark"),
     PartLevelTerminal_Colored("level_terminal_medium"),
@@ -28,9 +22,15 @@ public enum FCPartsTexture {
     BlockFluidInterfaceAlternate_Arrow("fluid_interface_arrow"),
     BlockInterfaceAlternate("fluid_interface_a"),
     BlockInterface_Face("fluid_interface"),
-    PartFluidLevelEmitter("fluid_level_emitter"),
     BlockLevelMaintainer("level_maintainer"),
-    BlockLevelMaintainer_Active("level_maintainer_active");
+    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;

src/main/java/com/glodblock/github/common/block/BlockFluidInterface.java

@@ -4,7 +4,10 @@ import java.util.EnumSet;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
@@ -13,6 +16,7 @@ import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.common.tile.TileFluidInterface;
 import com.glodblock.github.util.NameConst;
 
+import appeng.api.util.AEColor;
 import appeng.api.util.IOrientable;
 import appeng.block.AEBaseItemBlock;
 import appeng.core.features.AEFeature;
@@ -25,6 +29,12 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockFluidInterface extends FCBaseBlock {
 
+    private static final String[] COLORED_TEXTURES = { "fluid_interface", "fluid_interface_a",
+            "fluid_interface_arrow" };
+
+    @SideOnly(Side.CLIENT)
+    private IIcon[][] coloredTextures;
+
     public BlockFluidInterface() {
         super(Material.iron, NameConst.BLOCK_FLUID_INTERFACE);
         setFullBlock(true);
@@ -39,6 +49,38 @@ public class BlockFluidInterface extends FCBaseBlock {
         return new RenderBlockFluidInterface();
     }
 
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(final IIconRegister iconRegistry) {
+        super.registerBlockIcons(iconRegistry);
+        this.coloredTextures = new IIcon[COLORED_TEXTURES.length][AEColor.VALUES.length];
+
+        for (final AEColor color : AEColor.VALID_COLORS) {
+            for (int id = 0; id < COLORED_TEXTURES.length; id++) {
+                this.coloredTextures[id][color.ordinal()] = iconRegistry
+                        .registerIcon("ae2fc:interface/" + COLORED_TEXTURES[id] + "_" + color.name());
+            }
+        }
+    }
+
+    @SideOnly(Side.CLIENT)
+    public IIcon getColoredTexture(final int id, final AEColor color) {
+        return this.coloredTextures[id][color.ordinal()];
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) {
+        final TileInterface tile = this.getTileEntity(world, x, y, z);
+        if (tile != null && tile.getForward() == ForgeDirection.UNKNOWN) {
+            final AEColor color = tile.getProxy().getColor();
+            if (color != AEColor.Transparent) {
+                return this.getColoredTexture(0, color);
+            }
+        }
+        return super.getIcon(world, x, y, z, side);
+    }
+
     @Override
     public boolean onActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
             final int facing, final float hitX, final float hitY, final float hitZ) {

src/main/java/com/glodblock/github/common/block/BlockSuperStockReplenisher.java

@@ -1,8 +1,10 @@
 package com.glodblock.github.common.block;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
@@ -13,11 +15,17 @@ import com.glodblock.github.inventory.gui.GuiType;
 import com.glodblock.github.util.BlockPos;
 import com.glodblock.github.util.NameConst;
 
+import appeng.api.util.AEColor;
 import appeng.block.AEBaseItemBlock;
 import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockSuperStockReplenisher extends FCBaseBlock {
 
+    @SideOnly(Side.CLIENT)
+    private IIcon[] coloredTextures;
+
     public BlockSuperStockReplenisher() {
         super(Material.web, NameConst.BLOCK_SUPER_STOCK_REPLENISHER);
         setTileEntity(TileSuperStockReplenisher.class);
@@ -26,6 +34,28 @@ public class BlockSuperStockReplenisher extends FCBaseBlock {
         this.lightOpacity = 4;
     }
 
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(final IIconRegister iconRegistry) {
+        super.registerBlockIcons(iconRegistry);
+        this.coloredTextures = new IIcon[AEColor.VALUES.length];
+
+        for (final AEColor color : AEColor.VALID_COLORS) {
+            this.coloredTextures[color.ordinal()] = iconRegistry
+                    .registerIcon(this.getTextureName().replace(":", ":replenisher/") + "_" + color.name());
+        }
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) {
+        final TileSuperStockReplenisher tile = this.getTileEntity(world, x, y, z);
+        if (tile != null && tile.getColor() != AEColor.Transparent) {
+            return this.coloredTextures[tile.getColor().ordinal()];
+        }
+        return super.getIcon(world, x, y, z, side);
+    }
+
     @Override
     public boolean onActivated(World world, int x, int y, int z, EntityPlayer player, int facing, float hitX,
             float hitY, float hitZ) {
@@ -47,15 +77,6 @@ public class BlockSuperStockReplenisher extends FCBaseBlock {
         return false;
     }
 
-    @Override
-    public void breakBlock(World w, int x, int y, int z, Block a, int b) {
-        final TileSuperStockReplenisher tss = this.getTileEntity(w, x, y, z);
-        if (tss != null) {
-            tss.fullRefund();
-        }
-        super.breakBlock(w, x, y, z, a, b);
-    }
-
     @Override
     public BlockSuperStockReplenisher register() {
         GameRegistry.registerBlock(this, AEBaseItemBlock.class, NameConst.BLOCK_SUPER_STOCK_REPLENISHER);

src/main/java/com/glodblock/github/common/block/BlockWalrus.java

@@ -14,6 +14,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.item.BaseItemBlockContainer;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.common.tile.TileWalrus;
@@ -30,6 +31,8 @@ public class BlockWalrus extends BaseBlockContainer {
         setHardness(2.0F);
         setResistance(10.0F);
         setBlockName(NameConst.BLOCK_WALRUS);
+        // only used for hit/break particles, the block itself is rendered by RenderBlockWalrus
+        setBlockTextureName(FluidCraft.MODID + ":" + NameConst.BLOCK_WALRUS + "_particle");
     }
 
     @Override

src/main/java/com/glodblock/github/common/block/FCBaseBlock.java

@@ -1,10 +1,8 @@
 package com.glodblock.github.common.block;
 
 import java.util.EnumSet;
-import java.util.List;
 
 import net.minecraft.block.material.Material;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 
@@ -16,8 +14,6 @@ import appeng.core.features.AEFeature;
 import appeng.core.features.ActivityState;
 import appeng.core.features.BlockStackSrc;
 import appeng.tile.AEBaseTile;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public abstract class FCBaseBlock extends AEBaseTileBlock implements IRegister<FCBaseBlock> {
 
@@ -46,15 +42,6 @@ public abstract class FCBaseBlock extends AEBaseTileBlock implements IRegister<F
         super.setFeature(f);
     }
 
-    @SideOnly(Side.CLIENT)
-    public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List<String> toolTip,
-            final boolean advancedToolTips) {}
-
-    public void addCheckedInformation(ItemStack itemStack, EntityPlayer player, List<String> toolTip,
-            boolean advancedToolTips) {
-        this.addInformation(itemStack, player, toolTip, advancedToolTips);
-    }
-
     public ItemStack stack(int size) {
         return new ItemStack(this, size);
     }

src/main/java/com/glodblock/github/common/item/FCBaseItemBlock.java

@@ -1,16 +1,10 @@
 package com.glodblock.github.common.item;
 
-import java.util.List;
-
 import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 
 import com.glodblock.github.common.block.FCBaseBlock;
 
 import appeng.block.AEBaseItemBlock;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class FCBaseItemBlock extends AEBaseItemBlock {
 
@@ -20,11 +14,4 @@ public class FCBaseItemBlock extends AEBaseItemBlock {
         super(id);
         blockType = (FCBaseBlock) id;
     }
-
-    @SideOnly(Side.CLIENT)
-    public void addCheckedInformation(final ItemStack itemStack, final EntityPlayer player, final List<String> toolTip,
-            final boolean advancedToolTips) {
-        blockType.addCheckedInformation(itemStack, player, toolTip, advancedToolTips);
-        super.addCheckedInformation(itemStack, player, toolTip, advancedToolTips);
-    }
 }

src/main/java/com/glodblock/github/common/item/FCBaseItemCell.java

@@ -1,14 +1,31 @@
 package com.glodblock.github.common.item;
 
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
+
+import java.util.List;
+
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
+import org.jetbrains.annotations.NotNull;
 
 import com.glodblock.github.common.storage.CellType;
 import com.glodblock.github.loader.ItemAndBlockHolder;
 import com.google.common.base.Optional;
 
-import appeng.api.storage.StorageChannel;
+import appeng.api.AEApi;
+import appeng.api.storage.IMEInventoryHandler;
+import appeng.api.storage.data.IAEFluidStack;
+import appeng.api.storage.data.IAEStackType;
+import appeng.core.localization.GuiText;
 import appeng.items.AEBaseCell;
-import appeng.util.Platform;
+import appeng.me.storage.FluidCellInventoryHandler;
+import appeng.util.IterationCounter;
+import appeng.util.ReadableNumberConverter;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public abstract class FCBaseItemCell extends AEBaseCell {
 
@@ -24,8 +41,40 @@ public abstract class FCBaseItemCell extends AEBaseCell {
     }
 
     @Override
-    public StorageChannel getStorageChannel() {
-        return StorageChannel.FLUIDS;
+    public @NotNull IAEStackType<?> getStackType() {
+        return FLUID_STACK_TYPE;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void addCheckedInformation(final ItemStack stack, final EntityPlayer player, final List<String> lines,
+            final boolean displayMoreInfo) {
+        super.addCheckedInformation(stack, player, lines, displayMoreInfo);
+
+        final IMEInventoryHandler<?> inventory = AEApi.instance().registries().cell()
+                .getCellInventory(stack, null, getStackType());
+        if (!(inventory instanceof FluidCellInventoryHandler handler) || handler.getCellInv().getTotalItemTypes() != 1
+                || handler.getCellInv().getStoredItemTypes() == 0)
+            return;
+
+        final IAEFluidStack content = handler
+                .getAvailableItems(FLUID_STACK_TYPE.createPrimitiveList(), IterationCounter.fetchNewId())
+                .getFirstItem();
+        final String oldLine = GuiText.Contains.getLocal() + ": " + content.getDisplayName();
+        final int oldLineIndex = lines.lastIndexOf(oldLine);
+        if (oldLineIndex >= 0) {
+            if (!GuiScreen.isCtrlKeyDown()) {
+                lines.set(oldLineIndex, EnumChatFormatting.GRAY + GuiText.HoldCtrlForContents.getLocal());
+                return;
+            }
+            final String unit = FLUID_STACK_TYPE.getDisplayUnit();
+            lines.set(
+                    oldLineIndex,
+                    "  " + content.getDisplayName()
+                            + " x"
+                            + ReadableNumberConverter.INSTANCE.toWideReadableForm(content.getStackSize())
+                            + (unit.isEmpty() ? "" : " " + unit));
+        }
     }
 
     public FCBaseItemCell(Optional subName) {
@@ -49,18 +98,7 @@ public abstract class FCBaseItemCell extends AEBaseCell {
     }
 
     @Override
-    public String getCellData(ItemStack is) {
-        return totalBytes + ","
-                + this.getTotalTypes(null)
-                + ","
-                + perType
-                + ","
-                + 8 * 256
-                + ","
-                + Platform.openNbtData(is).getByte("cellRestrictionTypes")
-                + ","
-                + Platform.openNbtData(is).getLong("cellRestrictionAmount")
-                + ","
-                + "fluid";
+    public boolean storableInStorageCell() {
+        return true;
     }
 }

src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java

@@ -2,7 +2,7 @@ package com.glodblock.github.common.item;
 
 import static com.glodblock.github.common.item.ItemWirelessUltraTerminal.MODE;
 import static com.glodblock.github.loader.recipe.WirelessTerminalEnergyRecipe.getEnergyCard;
-import static com.glodblock.github.loader.recipe.WirelessTerminalRecipe.getInfinityBoosterCard;
+import static com.glodblock.github.loader.recipe.WirelessTerminalQuantumBridgeRecipe.getQuantumBridgeCard;
 import static com.glodblock.github.util.Util.DimensionalCoordSide.hasEnergyCard;
 import static com.glodblock.github.util.Util.hasInfinityBoosterCard;
 
@@ -48,15 +48,16 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II
 
     @Override
     public ItemStack onItemRightClick(final ItemStack item, final World w, final EntityPlayer player) {
-        if (player.isSneaking()) return removeInfinityBoosterCard(player, item); // todo: doesn't work in universal
-                                                                                 // terminal
+        if (player.isSneaking()) return removeQuantumBridgeCard(player, item); // todo: doesn't work in universal
+                                                                               // terminal
         return super.onItemRightClick(item, w, player);
     }
 
-    private ItemStack removeInfinityBoosterCard(final EntityPlayer player, ItemStack is) {
+    private ItemStack removeQuantumBridgeCard(final EntityPlayer player, ItemStack is) {
         if (hasInfinityBoosterCard(is)) {
-            if (!player.inventory.addItemStackToInventory(getInfinityBoosterCard())) {
-                player.entityDropItem(getInfinityBoosterCard(), 0);
+            ItemStack quantumBridgeCardStack = getQuantumBridgeCard().copy();
+            if (!player.inventory.addItemStackToInventory(quantumBridgeCardStack)) {
+                player.entityDropItem(quantumBridgeCardStack, 0);
             }
             is.getTagCompound().setBoolean(infinityBoosterCard, false);
         }
@@ -71,7 +72,7 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II
         if (GuiScreen.isCtrlKeyDown()) {
             lines.add(NameConst.i18n(NameConst.TT_WIRELESS_INSTALLED));
             if (hasInfinityBoosterCard(stack)) {
-                lines.add("  " + EnumChatFormatting.GOLD + getInfinityBoosterCard().getDisplayName());
+                lines.add("  " + EnumChatFormatting.GOLD + getQuantumBridgeCard().getDisplayName());
             }
             if (hasEnergyCard(stack)) {
                 lines.add("  " + EnumChatFormatting.GOLD + getEnergyCard().getDisplayName());
@@ -102,7 +103,7 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II
         Item item = is.getItem();
         if (item instanceof ItemWirelessUltraTerminal) {
             if (!is.hasTagCompound()) is.setTagCompound(new NBTTagCompound());
-            return UltraTerminalModes.values()[is.getTagCompound().getInteger(MODE)];
+            return UltraTerminalModes.VALUES[is.getTagCompound().getInteger(MODE)];
         } else if (item instanceof ItemWirelessPatternTerminal) {
             return UltraTerminalModes.PATTERN;
         } else if (item instanceof ItemWirelessInterfaceTerminal) {

src/main/java/com/glodblock/github/common/item/ItemCreativeFluidStorageCell.java

@@ -1,17 +1,24 @@
 package com.glodblock.github.common.item;
 
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
+
 import java.util.EnumSet;
 
 import net.minecraft.item.ItemStack;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.loader.IRegister;
 import com.glodblock.github.util.NameConst;
 
-import appeng.api.storage.StorageChannel;
+import appeng.api.storage.IMEInventoryHandler;
+import appeng.api.storage.data.IAEStackType;
 import appeng.core.features.AEFeature;
 import appeng.items.AEBaseInfiniteCell;
+import appeng.me.storage.CreativeCellInventory;
+import appeng.me.storage.FluidCellInventoryHandler;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public class ItemCreativeFluidStorageCell extends AEBaseInfiniteCell
@@ -42,7 +49,12 @@ public class ItemCreativeFluidStorageCell extends AEBaseInfiniteCell
     }
 
     @Override
-    public StorageChannel getStorageChannel() {
-        return StorageChannel.FLUIDS;
+    public @NotNull IAEStackType<?> getStackType() {
+        return FLUID_STACK_TYPE;
+    }
+
+    @Override
+    public IMEInventoryHandler getCellInventory(ItemStack stack) {
+        return new FluidCellInventoryHandler(new CreativeCellInventory<>(stack));
     }
 }

src/main/java/com/glodblock/github/common/item/ItemFluidAnnihilationPlane.java

@@ -3,10 +3,12 @@ package com.glodblock.github.common.item;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.parts.PartFluidConversionMonitor;
+import com.glodblock.github.client.textures.FCPartsTexture;
+import com.glodblock.github.common.parts.PartFluidAnnihilationPlane;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.util.NameConst;
 
@@ -16,27 +18,32 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class ItemFluidConversionMonitor extends FCBaseItem implements IPartItem {
+public class ItemFluidAnnihilationPlane extends FCBaseItem implements IPartItem {
 
-    public ItemFluidConversionMonitor() {
+    public ItemFluidAnnihilationPlane() {
         this.setMaxStackSize(64);
-        this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_CONVERSION_MONITOR);
+        this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_ANNIHILATION_PLANE);
         AEApi.instance().partHelper().setItemBusRenderer(this);
     }
 
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override
-    public ItemFluidConversionMonitor register() {
-        GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_CONVERSION_MONITOR, FluidCraft.MODID);
+    public ItemFluidAnnihilationPlane register() {
+        GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_ANNIHILATION_PLANE, FluidCraft.MODID);
         setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
 
+    @Override
+    public IIcon getIconIndex(ItemStack p_77650_1_) {
+        return FCPartsTexture.PartFluidAnnihilationPlane.getIcon();
+    }
+
     public void registerIcons(IIconRegister _iconRegister) {}
 
     @SideOnly(Side.CLIENT)
@@ -45,7 +52,7 @@ public class ItemFluidConversionMonitor extends FCBaseItem implements IPartItem
     }
 
     @Override
-    public PartFluidConversionMonitor createPartFromItemStack(ItemStack is) {
-        return new PartFluidConversionMonitor(is);
+    public PartFluidAnnihilationPlane createPartFromItemStack(ItemStack is) {
+        return new PartFluidAnnihilationPlane(is);
     }
 }

src/main/java/com/glodblock/github/common/item/ItemFluidExportBus.java

@@ -36,7 +36,7 @@ public class ItemFluidExportBus extends FCBaseItem implements IPartItem {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override

src/main/java/com/glodblock/github/common/item/ItemFluidFormationPlane.java

@@ -3,10 +3,12 @@ package com.glodblock.github.common.item;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.parts.PartFluidStorageMonitor;
+import com.glodblock.github.client.textures.FCPartsTexture;
+import com.glodblock.github.common.parts.PartFluidFormationPlane;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.util.NameConst;
 
@@ -16,27 +18,32 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class ItemFluidStorageMonitor extends FCBaseItem implements IPartItem {
+public class ItemFluidFormationPlane extends FCBaseItem implements IPartItem {
 
-    public ItemFluidStorageMonitor() {
+    public ItemFluidFormationPlane() {
         this.setMaxStackSize(64);
-        this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_STORAGE_MONITOR);
+        this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_FORMATION_PLANE);
         AEApi.instance().partHelper().setItemBusRenderer(this);
     }
 
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override
-    public ItemFluidStorageMonitor register() {
-        GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_STORAGE_MONITOR, FluidCraft.MODID);
+    public ItemFluidFormationPlane register() {
+        GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_FORMATION_PLANE, FluidCraft.MODID);
         setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
 
+    @Override
+    public IIcon getIconIndex(ItemStack p_77650_1_) {
+        return FCPartsTexture.PartFluidFormationPlane.getIcon();
+    }
+
     public void registerIcons(IIconRegister _iconRegister) {}
 
     @SideOnly(Side.CLIENT)
@@ -45,7 +52,7 @@ public class ItemFluidStorageMonitor extends FCBaseItem implements IPartItem {
     }
 
     @Override
-    public PartFluidStorageMonitor createPartFromItemStack(ItemStack is) {
-        return new PartFluidStorageMonitor(is);
+    public PartFluidFormationPlane createPartFromItemStack(ItemStack is) {
+        return new PartFluidFormationPlane(is);
     }
 }

src/main/java/com/glodblock/github/common/item/ItemFluidImportBus.java

@@ -36,7 +36,7 @@ public class ItemFluidImportBus extends FCBaseItem implements IPartItem {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override

src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java

@@ -1,69 +0,0 @@
-package com.glodblock.github.common.item;
-
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-
-import org.jetbrains.annotations.Nullable;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.textures.FCPartsTexture;
-import com.glodblock.github.common.parts.PartFluidLevelEmitter;
-import com.glodblock.github.common.tabs.FluidCraftingTabs;
-import com.glodblock.github.util.NameConst;
-
-import appeng.api.AEApi;
-import appeng.api.parts.IPart;
-import appeng.api.parts.IPartItem;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class ItemFluidLevelEmitter extends FCBaseItem implements IPartItem {
-
-    public ItemFluidLevelEmitter() {
-        this.setMaxStackSize(64);
-        this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_LEVEL_EMITTER);
-        AEApi.instance().partHelper().setItemBusRenderer(this);
-    }
-
-    @Nullable
-    @Override
-    public IPart createPartFromItemStack(ItemStack is) {
-        return new PartFluidLevelEmitter(is);
-    }
-
-    @Override
-    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
-            float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
-    }
-
-    @Override
-    public ItemFluidLevelEmitter register() {
-        GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_LEVEL_EMITTER, FluidCraft.MODID);
-        setCreativeTab(FluidCraftingTabs.INSTANCE);
-        return this;
-    }
-
-    @Override
-    public IIcon getIconIndex(ItemStack is) {
-        return FCPartsTexture.PartFluidLevelEmitter.getIcon();
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public int getSpriteNumber() {
-        return 0;
-    }
-
-    @Override
-    public void addInformation(final ItemStack stack, final EntityPlayer player, final List<String> lines,
-            final boolean displayMoreInfo) {
-        lines.add("§4Deprecated, use regular level emitter, hold CTRL for get fluid of container.");
-        super.addInformation(stack, player, lines, displayMoreInfo);
-    }
-}

src/main/java/com/glodblock/github/common/item/ItemFluidPacket.java

@@ -104,6 +104,8 @@ public class ItemFluidPacket extends FCBaseItem {
         } else {
             tooltip.add(EnumChatFormatting.RED + StatCollector.translateToLocalFormatted(NameConst.TT_INVALID_FLUID));
         }
+
+        tooltip.add(StatCollector.translateToLocal(NameConst.TT_FLUID_PACKET_TIPS));
     }
 
     public static void setFluidAmount(ItemStack stack, long amount) {

src/main/java/com/glodblock/github/common/item/ItemFluidVoidStorageCell.java

@@ -1,11 +1,13 @@
 package com.glodblock.github.common.item;
 
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
+
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.loader.IRegister;
 import com.glodblock.github.util.NameConst;
 
-import appeng.api.storage.StorageChannel;
+import appeng.api.storage.data.IAEStackType;
 import appeng.items.storage.ItemVoidStorageCell;
 import cpw.mods.fml.common.registry.GameRegistry;
 
@@ -25,7 +27,7 @@ public class ItemFluidVoidStorageCell extends ItemVoidStorageCell implements IRe
     }
 
     @Override
-    public StorageChannel getStorageChannel() {
-        return StorageChannel.FLUIDS;
+    public IAEStackType<?> getStackType() {
+        return FLUID_STACK_TYPE;
     }
 }

src/main/java/com/glodblock/github/common/item/ItemInfinityWaterStorageCell.java

@@ -1,20 +1,26 @@
 package com.glodblock.github.common.item;
 
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
 import static com.glodblock.github.util.Util.FluidUtil.water_bucket;
 
 import java.util.EnumSet;
 
 import net.minecraft.item.ItemStack;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.loader.IRegister;
 import com.glodblock.github.util.NameConst;
 import com.glodblock.github.util.Util;
 
-import appeng.api.storage.StorageChannel;
+import appeng.api.storage.IMEInventoryHandler;
+import appeng.api.storage.data.IAEStackType;
 import appeng.core.features.AEFeature;
 import appeng.items.AEBaseInfiniteCell;
+import appeng.me.storage.CreativeCellInventory;
+import appeng.me.storage.FluidCellInventoryHandler;
 import appeng.tile.inventory.IAEStackInventory;
 import cpw.mods.fml.common.registry.GameRegistry;
 
@@ -62,7 +68,12 @@ public class ItemInfinityWaterStorageCell extends AEBaseInfiniteCell
     }
 
     @Override
-    public StorageChannel getStorageChannel() {
-        return StorageChannel.FLUIDS;
+    public @NotNull IAEStackType<?> getStackType() {
+        return FLUID_STACK_TYPE;
+    }
+
+    @Override
+    public IMEInventoryHandler getCellInventory(ItemStack stack) {
+        return new FluidCellInventoryHandler(new CreativeCellInventory<>(stack));
     }
 }

src/main/java/com/glodblock/github/common/item/ItemPartFluidInterface.java

@@ -34,7 +34,7 @@ public class ItemPartFluidInterface extends FCBaseItem implements IPartItem {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override
@@ -46,7 +46,7 @@ public class ItemPartFluidInterface extends FCBaseItem implements IPartItem {
 
     @Override
     protected String getIconString() {
-        return NameConst.RES_KEY + "fluid_interface";
+        return NameConst.RES_KEY + "part_fluid_interface";
     }
 
     @Override

src/main/java/com/glodblock/github/common/item/ItemPartFluidP2PInterface.java

@@ -40,7 +40,7 @@ public class ItemPartFluidP2PInterface extends FCBaseItem implements IPartItem {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override

src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminal.java

@@ -1,64 +0,0 @@
-package com.glodblock.github.common.item;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.tabs.FluidCraftingTabs;
-import com.glodblock.github.util.NameConst;
-
-import appeng.api.AEApi;
-import appeng.api.parts.IPartItem;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class ItemPartFluidPatternTerminal extends FCBaseItem implements IPartItem {
-
-    public ItemPartFluidPatternTerminal() {
-        this.setMaxStackSize(64);
-        this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_PATTERN_TERMINAL);
-        AEApi.instance().partHelper().setItemBusRenderer(this);
-    }
-
-    @Nullable
-    @Override
-    public PartFluidPatternTerminal createPartFromItemStack(ItemStack is) {
-        return new PartFluidPatternTerminal(is);
-    }
-
-    @Override
-    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
-            float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
-    }
-
-    @Override
-    public ItemPartFluidPatternTerminal register() {
-        GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_PATTERN_TERMINAL, FluidCraft.MODID);
-        setCreativeTab(FluidCraftingTabs.INSTANCE);
-        return this;
-    }
-
-    @Override
-    public void registerIcons(IIconRegister _iconRegister) {}
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public int getSpriteNumber() {
-        return 0;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack stack, EntityPlayer player, List<String> toolTip, boolean flag) {
-        toolTip.add("§4DEPRECATED!");
-    }
-}

src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminalEx.java

@@ -1,64 +0,0 @@
-package com.glodblock.github.common.item;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.common.tabs.FluidCraftingTabs;
-import com.glodblock.github.util.NameConst;
-
-import appeng.api.AEApi;
-import appeng.api.parts.IPartItem;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class ItemPartFluidPatternTerminalEx extends FCBaseItem implements IPartItem {
-
-    public ItemPartFluidPatternTerminalEx() {
-        this.setMaxStackSize(64);
-        this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_PATTERN_TERMINAL_EX);
-        AEApi.instance().partHelper().setItemBusRenderer(this);
-    }
-
-    @Nullable
-    @Override
-    public PartFluidPatternTerminalEx createPartFromItemStack(ItemStack is) {
-        return new PartFluidPatternTerminalEx(is);
-    }
-
-    @Override
-    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
-            float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
-    }
-
-    @Override
-    public ItemPartFluidPatternTerminalEx register() {
-        GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_PATTERN_TERMINAL_EX, FluidCraft.MODID);
-        setCreativeTab(FluidCraftingTabs.INSTANCE);
-        return this;
-    }
-
-    @Override
-    public void registerIcons(IIconRegister _iconRegister) {}
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public int getSpriteNumber() {
-        return 0;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack stack, EntityPlayer player, List<String> toolTip, boolean flag) {
-        toolTip.add("§4DEPRECATED!");
-    }
-}

src/main/java/com/glodblock/github/common/item/ItemPartFluidStorageBus.java

@@ -1,9 +1,13 @@
 package com.glodblock.github.common.item;
 
+import java.util.List;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import com.glodblock.github.FluidCraft;
@@ -34,7 +38,7 @@ public class ItemPartFluidStorageBus extends FCBaseItem implements IPartItem {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override
@@ -54,4 +58,15 @@ public class ItemPartFluidStorageBus extends FCBaseItem implements IPartItem {
     public int getSpriteNumber() {
         return 0;
     }
+
+    @Override
+    public void addInformation(ItemStack stack, EntityPlayer player, List<String> lines, boolean advanced) {
+        super.addInformation(stack, player, lines, advanced);
+        if (stack.hasTagCompound() && stack.getTagCompound().hasKey("priority")) {
+            int priority = stack.getTagCompound().getInteger("priority");
+            String priorityText = StatCollector
+                    .translateToLocalFormatted("gui.tooltips.appliedenergistics2.PreconfiguredPriority", priority);
+            lines.add(EnumChatFormatting.GRAY + priorityText);
+        }
+    }
 }

src/main/java/com/glodblock/github/common/item/ItemPartFluidTerminal.java

@@ -1,72 +0,0 @@
-package com.glodblock.github.common.item;
-
-import static net.minecraft.client.gui.GuiScreen.isShiftKeyDown;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.parts.PartFluidTerminal;
-import com.glodblock.github.common.tabs.FluidCraftingTabs;
-import com.glodblock.github.util.NameConst;
-
-import appeng.api.AEApi;
-import appeng.api.parts.IPartItem;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class ItemPartFluidTerminal extends FCBaseItem implements IPartItem {
-
-    public ItemPartFluidTerminal() {
-        this.setMaxStackSize(64);
-        this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_TERMINAL);
-        AEApi.instance().partHelper().setItemBusRenderer(this);
-    }
-
-    @Nullable
-    @Override
-    public PartFluidTerminal createPartFromItemStack(ItemStack is) {
-        return new PartFluidTerminal(is);
-    }
-
-    @Override
-    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
-            float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void addInformation(ItemStack stack, EntityPlayer player, List<String> toolTip, boolean flag) {
-        toolTip.add("§4DEPRECATED!");
-        if (isShiftKeyDown()) {
-            toolTip.add(NameConst.i18n(NameConst.TT_FLUID_TERMINAL));
-        } else {
-            toolTip.add(NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE));
-        }
-    }
-
-    @Override
-    public ItemPartFluidTerminal register() {
-        GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_TERMINAL, FluidCraft.MODID);
-        setCreativeTab(FluidCraftingTabs.INSTANCE);
-        return this;
-    }
-
-    @Override
-    public void registerIcons(IIconRegister _iconRegister) {}
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public int getSpriteNumber() {
-        return 0;
-    }
-
-}

src/main/java/com/glodblock/github/common/item/ItemPartLevelTerminal.java

@@ -39,7 +39,7 @@ public class ItemPartLevelTerminal extends FCBaseItem implements IPartItem {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override

src/main/java/com/glodblock/github/common/item/ItemPortableFluidCell.java

@@ -1,5 +1,7 @@
 package com.glodblock.github.common.item;
 
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
+
 import java.util.List;
 
 import net.minecraft.client.gui.GuiScreen;
@@ -9,6 +11,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.api.FluidCraftAPI;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
@@ -17,9 +21,9 @@ import com.glodblock.github.util.NameConst;
 import com.glodblock.github.util.RenderUtil;
 
 import appeng.api.implementations.guiobjects.IGuiItemObject;
-import appeng.api.storage.StorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IAEStackType;
 import appeng.items.AEBasePortableCell;
 import appeng.items.contents.CellUpgrades;
 import appeng.items.contents.PortableCellViewer;
@@ -79,12 +83,12 @@ public class ItemPortableFluidCell extends AEBasePortableCell implements IRegist
     @Override
     public IGuiItemObject getGuiObject(final ItemStack is, final World w, final EntityPlayer p, final int x,
             final int y, final int z) {
-        return new PortableCellViewer<IAEFluidStack>(is, x, StorageChannel.FLUIDS);
+        return new PortableCellViewer<IAEFluidStack>(is, x, FLUID_STACK_TYPE);
     }
 
     @Override
-    public StorageChannel getStorageChannel() {
-        return StorageChannel.FLUIDS;
+    public @NotNull IAEStackType<?> getStackType() {
+        return FLUID_STACK_TYPE;
     }
 
     @Override

src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java

@@ -1,48 +0,0 @@
-package com.glodblock.github.common.item;
-
-import java.util.EnumSet;
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.tabs.FluidCraftingTabs;
-import com.glodblock.github.loader.IRegister;
-import com.glodblock.github.util.NameConst;
-
-import appeng.api.AEApi;
-import appeng.core.features.AEFeature;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-public class ItemWirelessFluidTerminal extends ItemBaseWirelessTerminal
-        implements IRegister<ItemWirelessFluidTerminal> {
-
-    public ItemWirelessFluidTerminal() {
-        super(null);
-        AEApi.instance().registries().wireless().registerWirelessHandler(this);
-        this.setFeature(EnumSet.of(AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools));
-        setUnlocalizedName(NameConst.ITEM_WIRELESS_FLUID_TERMINAL);
-        setTextureName(FluidCraft.resource(NameConst.ITEM_WIRELESS_FLUID_TERMINAL).toString());
-    }
-
-    @Override
-    public ItemWirelessFluidTerminal register() {
-        GameRegistry.registerItem(this, NameConst.ITEM_WIRELESS_FLUID_TERMINAL, FluidCraft.MODID);
-        setCreativeTab(FluidCraftingTabs.INSTANCE);
-        return this;
-    }
-
-    @Override
-    public Object getInventory(ItemStack stack, World world, int x, int y, int z, EntityPlayer player) {
-        return null;
-    }
-
-    @Override
-    public void addCheckedInformation(ItemStack stack, EntityPlayer player, List<String> lines,
-            boolean displayMoreInfo) {
-        lines.add("§4DEPRECATED!");
-        super.addCheckedInformation(stack, player, lines, displayMoreInfo);
-    }
-}

src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java

@@ -2,7 +2,6 @@ package com.glodblock.github.common.item;
 
 import static appeng.util.Platform.baublesSlotsOffset;
 import static appeng.util.Platform.nextEnum;
-import static com.glodblock.github.util.Util.GuiHelper.decodeInvType;
 import static net.minecraft.client.gui.GuiScreen.isShiftKeyDown;
 
 import java.util.Arrays;
@@ -138,8 +137,7 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal
     private void openGui(final ItemStack is, final World w, final EntityPlayer player, final Object mode,
             final int slotIndex) {
         final GuiBridge aeGui;
-        final int slot = slotIndex == Integer.MIN_VALUE ? player.inventory.currentItem : slotIndex;
-        final ImmutablePair<Util.GuiHelper.InvType, Integer> invSlotPair = decodeInvType(slotIndex);
+        final int slot = slotIndex == Integer.MIN_VALUE ? player.inventory.currentItem : slotIndex;;
 
         switch (mode instanceof UltraTerminalModes utm ? utm : getMode(is)) {
             case CRAFTING -> aeGui = GuiBridge.GUI_CRAFTING_TERMINAL;
@@ -161,13 +159,7 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal
             default -> aeGui = GuiBridge.GUI_ME;
         }
 
-        Platform.openGUI(
-                player,
-                null,
-                null,
-                aeGui,
-                invSlotPair.getLeft() == Util.GuiHelper.InvType.PLAYER_INV ? slotIndex
-                        : invSlotPair.getRight() + baublesSlotsOffset);
+        Platform.openGUI(player, null, null, aeGui, slotIndex);
     }
 
     @Override
@@ -175,15 +167,6 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal
         this.openGui(is, w, player, mode, Integer.MIN_VALUE);
     }
 
-    public static boolean hasInfinityBoosterCard(EntityPlayer player) {
-        ImmutablePair<Integer, ItemStack> term = Util.getUltraWirelessTerm(player);
-        if (term == null) return false;
-        if (term.getRight().getItem() instanceof ItemWirelessUltraTerminal) {
-            return Util.hasInfinityBoosterCard(term.getRight());
-        }
-        return false;
-    }
-
     @Override
     public void onWornTick(ItemStack itemStack, EntityLivingBase entityLivingBase) {
         if (Platform.isServer() && entityLivingBase instanceof EntityPlayer player) {
@@ -191,12 +174,7 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal
             if (handler != null) {
                 for (int i = 0; i < handler.getSizeInventory(); ++i) {
                     if (handler.getStackInSlot(i) == itemStack) {
-                        onUpdate(
-                                itemStack,
-                                null,
-                                player,
-                                Util.GuiHelper.encodeType(i, Util.GuiHelper.InvType.PLAYER_BAUBLES),
-                                false);
+                        onUpdate(itemStack, null, player, i + baublesSlotsOffset, false);
                     }
                 }
             }
@@ -216,7 +194,7 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal
     public IGuiItemObject getGuiObject(ItemStack is, World world, EntityPlayer p, int x, int y, int z) {
         final IWirelessTermHandler wh = AEApi.instance().registries().wireless().getWirelessTerminalHandler(is);
         if (wh == null) return null;
-        return switch (y != Integer.MIN_VALUE ? UltraTerminalModes.values()[y] : getMode(is)) {
+        return switch (y != Integer.MIN_VALUE ? UltraTerminalModes.VALUES[y] : getMode(is)) {
             case CRAFTING -> new WirelessCraftingTerminalGuiObject(wh, is, p, world, x, y, z);
             case PATTERN, PATTERN_EX -> new WirelessPatternTerminalGuiObject(wh, is, p, world, x, y, z);
             case INTERFACE -> new WirelessInterfaceTerminalGuiObject(wh, is, x);

src/main/java/com/glodblock/github/common/parts/PartFluidAnnihilationPlane.java

@@ -0,0 +1,86 @@
+package com.glodblock.github.common.parts;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidBlock;
+
+import com.glodblock.github.client.textures.FCPartsTexture;
+import com.glodblock.github.util.Util;
+
+import appeng.api.config.Actionable;
+import appeng.api.networking.energy.IEnergyGrid;
+import appeng.api.networking.security.BaseActionSource;
+import appeng.api.networking.security.MachineSource;
+import appeng.api.storage.IMEMonitor;
+import appeng.api.storage.data.IAEFluidStack;
+import appeng.api.util.DimensionalCoord;
+import appeng.me.GridAccessException;
+import appeng.parts.automation.PartBaseAnnihilationPlane;
+import appeng.util.Platform;
+
+public class PartFluidAnnihilationPlane extends PartBaseAnnihilationPlane {
+
+    public PartFluidAnnihilationPlane(ItemStack is) {
+        super(is);
+    }
+
+    @Override
+    public void onNeighborChanged() {
+        final DimensionalCoord self = this.getLocation();
+        final IMEMonitor<IAEFluidStack> monitor;
+        final IEnergyGrid power;
+
+        try {
+            monitor = this.getProxy().getStorage().getFluidInventory();
+            power = this.getProxy().getEnergy();
+        } catch (GridAccessException ignored) {
+            return;
+        }
+
+        if (monitor == null || power == null) return;
+        final World world = this.tile.getWorldObj();
+        final ForgeDirection side = getSide();
+        final Block fluidBlock = world.getBlock(self.x + side.offsetX, self.y + side.offsetY, self.z + side.offsetZ);
+        final int meta = world.getBlockMetadata(self.x + side.offsetX, self.y + side.offsetY, self.z + side.offsetZ);
+        final BaseActionSource src = new MachineSource(this);
+
+        if (fluidBlock instanceof IFluidBlock block) {
+            final FluidStack drained = block
+                    .drain(world, self.x + side.offsetX, self.y + side.offsetY, self.z + side.offsetZ, false);
+            if (drained == null) return;
+            final IAEFluidStack toInject = Util.FluidUtil.createAEFluidStack(drained);
+            final IAEFluidStack notInjected = Platform
+                    .poweredInsert(power, monitor, toInject, src, Actionable.SIMULATE);
+            if (notInjected != null) return;
+            Platform.poweredInsert(power, monitor, toInject, src, Actionable.MODULATE);
+            block.drain(world, self.x + side.offsetX, self.y + side.offsetY, self.z + side.offsetZ, true);
+        } else if (meta == 0) {
+            if (fluidBlock == Blocks.flowing_water || fluidBlock == Blocks.water) {
+                final IAEFluidStack toInject = Util.FluidUtil.createAEFluidStack(FluidRegistry.WATER);
+                final IAEFluidStack notInjected = Platform
+                        .poweredInsert(power, monitor, toInject, src, Actionable.SIMULATE);
+                if (notInjected != null) return;
+                Platform.poweredInsert(power, monitor, toInject, src, Actionable.MODULATE);
+                world.setBlockToAir(self.x + side.offsetX, self.y + side.offsetY, self.z + side.offsetZ);
+            } else if (fluidBlock == Blocks.flowing_lava || fluidBlock == Blocks.lava) {
+                final IAEFluidStack toInject = Util.FluidUtil.createAEFluidStack(FluidRegistry.LAVA);
+                final IAEFluidStack notInjected = Platform
+                        .poweredInsert(power, monitor, toInject, src, Actionable.SIMULATE);
+                if (notInjected != null) return;
+                Platform.poweredInsert(power, monitor, toInject, src, Actionable.MODULATE);
+                world.setBlockToAir(self.x + side.offsetX, self.y + side.offsetY, self.z + side.offsetZ);
+            }
+        }
+    }
+
+    @Override
+    public IIcon getActiveIcon() {
+        return FCPartsTexture.PartFluidAnnihilationPlaneOn.getIcon();
+    }
+}

src/main/java/com/glodblock/github/common/parts/PartFluidConversionMonitor.java

@@ -1,157 +1,28 @@
 package com.glodblock.github.common.parts;
 
-import java.util.Collections;
-import java.util.List;
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
 
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Vec3;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidContainerItem;
+import net.minecraft.nbt.NBTTagCompound;
 
-import org.apache.commons.lang3.tuple.MutablePair;
+import appeng.parts.reporting.PartConversionMonitor;
 
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.util.Util;
-
-import appeng.api.config.Actionable;
-import appeng.api.networking.energy.IEnergySource;
-import appeng.api.networking.security.PlayerSource;
-import appeng.api.storage.IMEMonitor;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.me.GridAccessException;
-import appeng.util.InventoryAdaptor;
-import appeng.util.Platform;
-
-public class PartFluidConversionMonitor extends PartFluidStorageMonitor {
+public class PartFluidConversionMonitor extends PartConversionMonitor {
 
     public PartFluidConversionMonitor(ItemStack is) {
         super(is);
     }
 
     @Override
-    public boolean onPartShiftActivate(final EntityPlayer player, final Vec3 pos) {
-        if (Platform.isClient()) {
-            return true;
-        }
-
-        if (!this.getProxy().isActive()) {
-            return false;
-        }
-
-        if (!Platform.hasPermissions(this.getLocation(), player)) {
-            return false;
-        }
-        FluidStack fluidStack;
-        ItemStack item = player.getCurrentEquippedItem();
-        if (item != null && item.getItem() instanceof ItemFluidPacket) {
-            fluidStack = ItemFluidPacket.getFluidStack(item);
-        } else {
-            fluidStack = Util.FluidUtil.getFluidFromContainer(item);
-        }
-        if (this.getDisplayed() == null || fluidStack == null
-                || fluidStack.getFluid() != ((IAEFluidStack) this.getDisplayed()).getFluid()) {
-            return false;
-        }
-
-        try {
-            if (!this.getProxy().isActive()) {
-                return false;
+    public void readFromNBT(NBTTagCompound data) {
+        // Migrate old tag
+        if (data.hasKey("configuredItem")) {
+            final NBTTagCompound myItem = data.getCompoundTag("configuredItem");
+            if (!myItem.hasNoTags() && !myItem.hasKey("StackType")) {
+                myItem.setString("StackType", FLUID_STACK_TYPE.getId());
             }
-            final IEnergySource energy = this.getProxy().getEnergy();
-            final IMEMonitor<IAEFluidStack> cell = this.getProxy().getStorage().getFluidInventory();
-            final IAEFluidStack input = (IAEFluidStack) this.getDisplayed().copy().setStackSize(fluidStack.amount);
-            final IAEFluidStack failedToInsert = Platform
-                    .poweredInsert(energy, cell, input, new PlayerSource(player, this));
-            if (failedToInsert != null && failedToInsert.getStackSize() == input.getStackSize()) {
-                return false;
-            } else if (failedToInsert == null || failedToInsert.getStackSize() != input.getStackSize()) {
-                if (item.getItem() instanceof ItemFluidPacket) {
-                    if (failedToInsert != null) {
-                        player.getCurrentEquippedItem()
-                                .setTagCompound(ItemFluidPacket.newStack(failedToInsert).getTagCompound());
-                        return true;
-                    }
-                } else {
-                    ItemStack tmp = item.copy();
-                    tmp.stackSize = 1;
-                    ItemStack tank = null;
-                    if (failedToInsert == null) {
-                        tank = Util.FluidUtil.clearFluid(tmp);
-                    } else {
-                        if (tmp.getItem() instanceof IFluidContainerItem) {
-                            tank = Util.FluidUtil.setFluidContainerAmount(tmp, (int) failedToInsert.getStackSize());
-                        } else if (FluidContainerRegistry.isContainer(tmp)) {
-                            IAEFluidStack insertedFluid = input.copy();
-                            insertedFluid.decStackSize(failedToInsert.getStackSize());
-                            this.getProxy().getStorage().getFluidInventory()
-                                    .extractItems(insertedFluid, Actionable.MODULATE, new PlayerSource(player, this));
-                            return false;
-                        }
-                    }
-                    if (tank != null && !player.inventory.addItemStackToInventory(tank)) {
-                        player.entityDropItem(tank, 0);
-                    }
-                }
-                item.stackSize--;
-                if (item.stackSize <= 0) {
-                    player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
-                }
-            }
-
-        } catch (final GridAccessException ignored) {}
-        return true;
-    }
-
-    @Override
-    protected void extractItem(final EntityPlayer player) {
-        final IAEFluidStack input = (IAEFluidStack) this.getDisplayed();
-        ItemStack eq = player.getCurrentEquippedItem();
-        if (input != null && Util.FluidUtil.isFluidContainer(eq) && Util.FluidUtil.isEmpty(eq)) {
-            try {
-                if (!this.getProxy().isActive()) {
-                    return;
-                }
-
-                final IEnergySource energy = this.getProxy().getEnergy();
-                final IMEMonitor<IAEFluidStack> cell = this.getProxy().getStorage().getFluidInventory();
-                ItemStack tank = eq.copy();
-                tank.stackSize = 1;
-                MutablePair<Integer, ItemStack> fillStack = Util.FluidUtil.fillStack(tank, input.getFluidStack());
-                input.setStackSize(fillStack.left);
-
-                final IAEFluidStack retrieved = Platform
-                        .poweredExtraction(energy, cell, input, new PlayerSource(player, this));
-                if (retrieved != null) {
-                    if (!player.inventory.addItemStackToInventory(fillStack.right)) {
-                        player.entityDropItem(fillStack.right.copy(), 0);
-                    }
-                    eq.stackSize--;
-                    if (eq.stackSize <= 0) {
-                        player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
-                    }
-                    final InventoryAdaptor adaptor = InventoryAdaptor.getAdaptor(player, ForgeDirection.UNKNOWN);
-                    ItemStack newItems = adaptor.addItems(
-                            Util.FluidUtil.setFluidContainerAmount(fillStack.right, (int) retrieved.getStackSize()));
-                    if (newItems != null) {
-                        final TileEntity te = this.getTile();
-                        final List<ItemStack> list = Collections.singletonList(newItems);
-                        Platform.spawnDrops(
-                                player.worldObj,
-                                te.xCoord + this.getSide().offsetX,
-                                te.yCoord + this.getSide().offsetY,
-                                te.zCoord + this.getSide().offsetZ,
-                                list);
-                    }
-
-                    if (player.openContainer != null) {
-                        player.openContainer.detectAndSendChanges();
-                    }
-                }
-            } catch (final GridAccessException ignored) {}
         }
+
+        super.readFromNBT(data);
     }
 }

src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java

@@ -1,5 +1,7 @@
 package com.glodblock.github.common.parts;
 
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.IIcon;
@@ -15,6 +17,7 @@ import appeng.api.storage.StorageName;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IAEStackType;
 import appeng.me.GridAccessException;
 import appeng.parts.automation.PartBaseExportBus;
 import appeng.tile.inventory.IAEStackInventory;
@@ -33,7 +36,7 @@ public class PartFluidExportBus extends PartBaseExportBus<IAEFluidStack> {
 
     @Override
     protected int getAdaptorFlags() {
-        return InventoryAdaptor.DEFAULT & ~InventoryAdaptor.ALLOW_ITEMS;
+        return InventoryAdaptor.ALLOW_FLUIDS | InventoryAdaptor.FOR_INSERTS;
     }
 
     @Override
@@ -72,18 +75,18 @@ public class PartFluidExportBus extends PartBaseExportBus<IAEFluidStack> {
     }
 
     @Override
-    protected void doFuzzy(IAEFluidStack aes, FuzzyMode fzMode, InventoryAdaptor destination, IEnergyGrid energy,
+    protected void doFuzzy(IAEFluidStack aes, FuzzyMode fzMode, IEnergyGrid energy,
             IMEMonitor<IAEFluidStack> gridInv) {}
 
     @Override
-    protected void doOreDict(InventoryAdaptor destination, IEnergyGrid energy, IMEMonitor<IAEFluidStack> gridInv) {}
+    protected void doOreDict(IEnergyGrid energy, IMEMonitor<IAEFluidStack> gridInv) {}
 
     // legacy
     @Override
     public void readFromNBT(NBTTagCompound extra) {
         super.readFromNBT(extra);
 
-        final IAEStackInventory config = this.getAEInventoryByName(StorageName.NONE);
+        final IAEStackInventory config = this.getAEInventoryByName(StorageName.CONFIG);
         for (int i = 0; i < config.getSizeInventory(); i++) {
             final IAEStack<?> stack = config.getAEStackInSlot(i);
             if (stack instanceof IAEItemStack ais) {
@@ -91,4 +94,9 @@ public class PartFluidExportBus extends PartBaseExportBus<IAEFluidStack> {
             }
         }
     }
+
+    @Override
+    public IAEStackType<IAEFluidStack> getStackType() {
+        return FLUID_STACK_TYPE;
+    }
 }

src/main/java/com/glodblock/github/common/parts/PartFluidFormationPlane.java

@@ -0,0 +1,142 @@
+package com.glodblock.github.common.parts;
+
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+
+import com.glodblock.github.client.textures.FCPartsTexture;
+
+import appeng.api.config.Actionable;
+import appeng.api.networking.IGridNode;
+import appeng.api.networking.energy.IEnergyGrid;
+import appeng.api.networking.security.BaseActionSource;
+import appeng.api.networking.security.MachineSource;
+import appeng.api.networking.ticking.IGridTickable;
+import appeng.api.networking.ticking.TickRateModulation;
+import appeng.api.networking.ticking.TickingRequest;
+import appeng.api.storage.IMEMonitor;
+import appeng.api.storage.data.IAEFluidStack;
+import appeng.api.storage.data.IAEStackType;
+import appeng.api.util.DimensionalCoord;
+import appeng.me.GridAccessException;
+import appeng.parts.automation.PartBaseFormationPlane;
+import appeng.util.Platform;
+
+public class PartFluidFormationPlane extends PartBaseFormationPlane implements IGridTickable {
+
+    public PartFluidFormationPlane(ItemStack is) {
+        super(is);
+    }
+
+    @Override
+    public TickingRequest getTickingRequest(IGridNode iGridNode) {
+        return new TickingRequest(2, 120, false, true);
+    }
+
+    @Override
+    public TickRateModulation tickingRequest(IGridNode iGridNode, int ing) {
+        return this.doWork() ? TickRateModulation.SLEEP : TickRateModulation.SAME;
+
+    }
+
+    @Override
+    public void onNeighborChanged() {
+        final TileEntity te = this.getHost().getTile();
+        final World w = te.getWorldObj();
+        if (w == null) return;
+        final ForgeDirection side = this.getSide();
+
+        final int x = te.xCoord + side.offsetX;
+        final int y = te.yCoord + side.offsetY;
+        final int z = te.zCoord + side.offsetZ;
+
+        final Block worldBlock = w.getBlock(x, y, z);
+        this.blocked = worldBlock != null && worldBlock != Blocks.air;
+
+        if (!this.blocked) {
+            try {
+                this.getProxy().getTick().alertDevice(this.getProxy().getNode());
+            } catch (GridAccessException ignored) {}
+        }
+    }
+
+    @Override
+    protected void updateHandler() {
+        if (this.getProxy().isReady()) {
+            this.onNeighborChanged();
+        }
+    }
+
+    public boolean doWork() {
+        if (this.blocked) return true;
+
+        final DimensionalCoord self = this.getLocation();
+        final int x = self.x + side.offsetX;
+        final int y = self.y + side.offsetY;
+        final int z = self.z + side.offsetZ;
+
+        final World world = this.tile.getWorldObj();
+        final Block worldBlock = world.getBlock(x, y, z);
+        if (worldBlock != null && worldBlock != Blocks.air) return this.blocked = true;
+
+        final IMEMonitor<IAEFluidStack> monitor;
+        final IEnergyGrid power;
+
+        try {
+            monitor = this.getProxy().getStorage().getFluidInventory();
+            power = this.getProxy().getEnergy();
+        } catch (GridAccessException ignored) {
+            return true;
+        }
+
+        if (monitor == null || power == null) return true;
+
+        final BaseActionSource src = new MachineSource(this);
+
+        boolean stockOut = false;
+
+        for (int i = 0; i < this.Config.getSizeInventory(); i++) {
+            if (!(this.Config.getAEStackInSlot(i) instanceof IAEFluidStack ifs)) continue;
+            final IAEFluidStack fluid = ifs.copy().setStackSize(FluidContainerRegistry.BUCKET_VOLUME);
+            final IAEFluidStack canDrain = Platform.poweredExtraction(power, monitor, fluid, src, Actionable.SIMULATE);
+            if (canDrain == null || canDrain.getStackSize() < FluidContainerRegistry.BUCKET_VOLUME) {
+                stockOut = true;
+                continue;
+            }
+            Platform.poweredExtraction(power, monitor, fluid, src, Actionable.MODULATE);
+            final Block fluidWorldBlock = fluid.getFluid().getBlock();
+            world.setBlock(x, y, z, fluidWorldBlock);
+            world.markBlockForUpdate(x, y, z);
+            return true;
+        }
+
+        return !stockOut;
+    }
+
+    @Override
+    public IAEStackType<?> getStackType() {
+        return FLUID_STACK_TYPE;
+    }
+
+    @Override
+    public boolean supportItemDrop() {
+        return false;
+    }
+
+    @Override
+    public boolean supportFuzzy() {
+        return false;
+    }
+
+    @Override
+    public IIcon getActiveIcon() {
+        return FCPartsTexture.PartFluidFormationPlaneOn.getIcon();
+    }
+}

src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java

@@ -1,16 +1,16 @@
 package com.glodblock.github.common.parts;
 
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 
 import com.glodblock.github.client.textures.FCPartsTexture;
-import com.glodblock.github.util.BlockPos;
 import com.glodblock.github.util.Util;
 
 import appeng.api.config.Actionable;
@@ -23,9 +23,11 @@ import appeng.api.storage.StorageName;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IAEStackType;
 import appeng.me.GridAccessException;
 import appeng.parts.automation.PartBaseImportBus;
 import appeng.tile.inventory.IAEStackInventory;
+import appeng.util.InventoryAdaptor;
 import appeng.util.item.AEFluidStack;
 
 public class PartFluidImportBus extends PartBaseImportBus<IAEFluidStack> {
@@ -41,18 +43,14 @@ public class PartFluidImportBus extends PartBaseImportBus<IAEFluidStack> {
 
     @Override
     protected Object getTarget() {
-        TileEntity self = this.getHost().getTile();
-        return this.getTileEntity(self, (new BlockPos(self)).getOffSet(this.getSide()));
-    }
+        final TileEntity self = this.getHost().getTile();
+        final TileEntity target = this.getTileEntity(
+                self,
+                self.xCoord + this.getSide().offsetX,
+                self.yCoord + this.getSide().offsetY,
+                self.zCoord + this.getSide().offsetZ);
 
-    private TileEntity getTileEntity(final TileEntity self, final BlockPos pos) {
-        final World w = self.getWorldObj();
-
-        if (w.getChunkProvider().chunkExists(pos.getX() >> 4, pos.getZ() >> 4)) {
-            return w.getTileEntity(pos.getX(), pos.getY(), pos.getZ());
-        }
-
-        return null;
+        return target instanceof IFluidHandler handler ? handler : null;
     }
 
     @Override
@@ -90,6 +88,11 @@ public class PartFluidImportBus extends PartBaseImportBus<IAEFluidStack> {
         }
     }
 
+    @Override
+    protected int getAdaptorFlags() {
+        return InventoryAdaptor.ALLOW_FLUIDS | InventoryAdaptor.FOR_EXTRACTS;
+    }
+
     @Override
     protected boolean importStuff(final Object myTarget, final IAEFluidStack whatToImport,
             final IMEMonitor<IAEFluidStack> inv, final IEnergySource energy, final FuzzyMode fzMode) {
@@ -97,13 +100,12 @@ public class PartFluidImportBus extends PartBaseImportBus<IAEFluidStack> {
             FluidTankInfo[] tanksInfo = fh.getTankInfo(this.getSide().getOpposite());
             if (tanksInfo == null) return true;
 
-            int maxDrain = this.calculateAmountToSend();
-            boolean doBreak = true;
-
             for (FluidTankInfo tankInfo : tanksInfo) {
                 if (tankInfo.fluid == null) continue;
 
-                FluidStack fluidStack = new FluidStack(tankInfo.fluid, Math.min(tankInfo.fluid.amount, maxDrain));
+                FluidStack fluidStack = new FluidStack(
+                        tankInfo.fluid,
+                        Math.min(tankInfo.fluid.amount, this.itemToSend));
                 fluidStack = fh.drain(this.getSide().getOpposite(), fluidStack, false);
                 if (this.filterEnabled() && !this.isInFilter(fluidStack)) continue;
 
@@ -112,18 +114,16 @@ public class PartFluidImportBus extends PartBaseImportBus<IAEFluidStack> {
                     final IAEFluidStack notInserted = inv.injectItems(aeFluidStack, Actionable.MODULATE, this.mySrc);
 
                     if (notInserted != null && notInserted.getStackSize() > 0) {
+                        if (notInserted.getFluidStack().amount == aeFluidStack.getFluidStack().amount) continue;
                         aeFluidStack.decStackSize(notInserted.getStackSize());
                     }
 
                     fh.drain(this.getSide().getOpposite(), aeFluidStack.getFluidStack(), true);
-                    maxDrain -= aeFluidStack.getFluidStack().amount;
-                    doBreak = false;
+                    this.itemToSend -= aeFluidStack.getFluidStack().amount;
+                    this.worked = true;
                 }
             }
-
-            return doBreak;
         }
-
         return true;
     }
 
@@ -139,7 +139,7 @@ public class PartFluidImportBus extends PartBaseImportBus<IAEFluidStack> {
     }
 
     private boolean isInFilter(FluidStack fluid) {
-        final IAEStackInventory inv = this.getAEInventoryByName(StorageName.NONE);
+        final IAEStackInventory inv = this.getAEInventoryByName(StorageName.CONFIG);
         for (int i = 0; i < inv.getSizeInventory(); i++) {
             final IAEFluidStack stack = (IAEFluidStack) inv.getAEStackInSlot(i);
             if (stack != null && stack.getFluidStack().equals(fluid)) {
@@ -150,7 +150,7 @@ public class PartFluidImportBus extends PartBaseImportBus<IAEFluidStack> {
     }
 
     private boolean filterEnabled() {
-        final IAEStackInventory inv = this.getAEInventoryByName(StorageName.NONE);
+        final IAEStackInventory inv = this.getAEInventoryByName(StorageName.CONFIG);
         for (int i = 0; i < inv.getSizeInventory(); i++) {
             final IAEFluidStack stack = (IAEFluidStack) inv.getAEStackInSlot(i);
             if (stack != null) {
@@ -165,7 +165,7 @@ public class PartFluidImportBus extends PartBaseImportBus<IAEFluidStack> {
     public void readFromNBT(NBTTagCompound extra) {
         super.readFromNBT(extra);
 
-        final IAEStackInventory config = this.getAEInventoryByName(StorageName.NONE);
+        final IAEStackInventory config = this.getAEInventoryByName(StorageName.CONFIG);
         for (int i = 0; i < config.getSizeInventory(); i++) {
             final IAEStack<?> stack = config.getAEStackInSlot(i);
             if (stack instanceof IAEItemStack ais) {
@@ -173,4 +173,9 @@ public class PartFluidImportBus extends PartBaseImportBus<IAEFluidStack> {
             }
         }
     }
+
+    @Override
+    public IAEStackType<IAEFluidStack> getStackType() {
+        return FLUID_STACK_TYPE;
+    }
 }

src/main/java/com/glodblock/github/common/parts/PartFluidInterface.java

@@ -1,8 +1,13 @@
 package com.glodblock.github.common.parts;
 
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
+import static appeng.util.item.AEItemStackType.ITEM_STACK_TYPE;
+
 import java.io.IOException;
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -11,27 +16,37 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.glodblock.github.client.FluidInterfaceButtons;
 import com.glodblock.github.common.item.ItemFluidPacket;
 import com.glodblock.github.inventory.AEFluidInventory;
 import com.glodblock.github.inventory.IAEFluidTank;
 import com.glodblock.github.inventory.IDualHost;
 import com.glodblock.github.loader.ItemAndBlockHolder;
+import com.glodblock.github.util.DualHostSettings;
 import com.glodblock.github.util.DualityFluidInterface;
 import com.glodblock.github.util.Util;
+import com.google.common.collect.ImmutableSet;
 
+import appeng.api.config.Actionable;
 import appeng.api.config.Upgrades;
 import appeng.api.networking.IGridNode;
+import appeng.api.networking.crafting.ICraftingLink;
 import appeng.api.networking.events.MENetworkChannelsChanged;
 import appeng.api.networking.events.MENetworkEventSubscribe;
 import appeng.api.networking.events.MENetworkPowerStatusChange;
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
+import appeng.api.storage.IMEMonitor;
 import appeng.api.storage.data.IAEFluidStack;
+import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IAEStackType;
 import appeng.helpers.ICustomButtonDataObject;
 import appeng.helpers.ICustomButtonProvider;
 import appeng.parts.misc.PartInterface;
 import appeng.tile.inventory.AppEngInternalAEInventory;
+import appeng.util.SettingsFrom;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -50,6 +65,12 @@ public class PartFluidInterface extends PartInterface implements IDualHost, ICus
         this.customButtonDataObject = new FluidInterfaceButtons(false);
     }
 
+    @Override
+    public void getDrops(final List<ItemStack> drops, final boolean wrenched) {
+        this.fluidDuality.addDrops(drops);
+        super.getDrops(drops, wrenched);
+    }
+
     @MENetworkEventSubscribe
     public void stateChange(final MENetworkChannelsChanged c) {
         fluidDuality.onChannelStateChange(c);
@@ -78,6 +99,23 @@ public class PartFluidInterface extends PartInterface implements IDualHost, ICus
         return fluidDuality.getTanks();
     }
 
+    @Override
+    public IMEMonitor<IAEFluidStack> getFluidInventory() {
+        return this.fluidDuality.getFluidInventory();
+    }
+
+    @Override
+    @Nullable
+    public IMEMonitor<?> getMEMonitor(@NotNull IAEStackType<?> type) {
+        if (type == ITEM_STACK_TYPE) {
+            return this.getItemInventory();
+        } else if (type == FLUID_STACK_TYPE) {
+            return this.getFluidInventory();
+        }
+
+        return this.fluidDuality.getMEMonitor(type);
+    }
+
     @Override
     public AppEngInternalAEInventory getConfig() {
         Util.mirrorFluidToPacket(this.config, fluidDuality.getConfig());
@@ -115,6 +153,7 @@ public class PartFluidInterface extends PartInterface implements IDualHost, ICus
         config.readFromNBT(data, "ConfigInv");
         fluidDuality.loadConfigFromPacket(this.config);
         getInternalFluid().readFromNBT(data, "FluidInv");
+        fluidDuality.readCraftingTrackerFromNBT(data);
     }
 
     @Override
@@ -122,6 +161,21 @@ public class PartFluidInterface extends PartInterface implements IDualHost, ICus
         super.writeToNBT(data);
         config.writeToNBT(data, "ConfigInv");
         getInternalFluid().writeToNBT(data, "FluidInv");
+        fluidDuality.writeCraftingTrackerToNBT(data);
+    }
+
+    @Override
+    public void uploadSettings(@NotNull SettingsFrom from, @NotNull NBTTagCompound compound) {
+        super.uploadSettings(from, compound);
+        DualHostSettings.uploadSettings(this, compound);
+    }
+
+    @Override
+    @NotNull
+    public NBTTagCompound downloadSettings(SettingsFrom from) {
+        NBTTagCompound output = super.downloadSettings(from);
+        DualHostSettings.downloadSettings(this, output);
+        return output;
     }
 
     @Override
@@ -129,6 +183,26 @@ public class PartFluidInterface extends PartInterface implements IDualHost, ICus
         return getInterfaceDuality().getInstalledUpgrades(u);
     }
 
+    @Override
+    public ImmutableSet<ICraftingLink> getRequestedJobs() {
+        return ImmutableSet.<ICraftingLink>builder().addAll(super.getRequestedJobs())
+                .addAll(fluidDuality.getRequestedJobs()).build();
+    }
+
+    @Override
+    public IAEStack<?> injectCraftedItems(final ICraftingLink link, final IAEStack<?> items, final Actionable mode) {
+        if (items instanceof IAEFluidStack) {
+            return fluidDuality.injectCraftedItems(link, items, mode);
+        }
+        return super.injectCraftedItems(link, items, mode);
+    }
+
+    @Override
+    public void jobStateChange(final ICraftingLink link) {
+        super.jobStateChange(link);
+        fluidDuality.jobStateChange(link);
+    }
+
     @Override
     public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
         return fluidDuality.fill(from, resource, doFill);

src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java

@@ -1,29 +0,0 @@
-package com.glodblock.github.common.parts;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-import com.glodblock.github.common.item.ItemFluidPacket;
-
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.storage.data.IAEStack;
-import appeng.helpers.Reflected;
-import appeng.parts.automation.PartLevelEmitter;
-
-public class PartFluidLevelEmitter extends PartLevelEmitter {
-
-    @Reflected
-    public PartFluidLevelEmitter(final ItemStack is) {
-        super(is);
-    }
-
-    @Override
-    public void readFromNBT(NBTTagCompound data) {
-        super.readFromNBT(data);
-
-        final IAEStack<?> aes = this.getAEInventoryByName(null).getAEStackInSlot(0);
-        if (aes instanceof IAEItemStack ais && ais.getItem() instanceof ItemFluidPacket) {
-            this.getAEInventoryByName(null).putAEStackInSlot(0, ItemFluidPacket.getFluidAEStack(ais));
-        }
-    }
-}

src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java

@@ -1,7 +1,12 @@
 package com.glodblock.github.common.parts;
 
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
+import static appeng.util.item.AEItemStackType.ITEM_STACK_TYPE;
+
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -12,20 +17,29 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.glodblock.github.client.FluidInterfaceButtons;
 import com.glodblock.github.common.item.ItemFluidPacket;
 import com.glodblock.github.inventory.AEFluidInventory;
 import com.glodblock.github.inventory.IAEFluidTank;
 import com.glodblock.github.inventory.IDualHost;
 import com.glodblock.github.loader.ItemAndBlockHolder;
+import com.glodblock.github.util.DualHostSettings;
 import com.glodblock.github.util.DualityFluidInterface;
 import com.glodblock.github.util.Util;
+import com.google.common.collect.ImmutableSet;
 
+import appeng.api.config.Actionable;
 import appeng.api.implementations.items.IMemoryCard;
 import appeng.api.networking.IGridNode;
+import appeng.api.networking.crafting.ICraftingLink;
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
+import appeng.api.storage.IMEMonitor;
 import appeng.api.storage.data.IAEFluidStack;
+import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IAEStackType;
 import appeng.api.util.IConfigManager;
 import appeng.helpers.DualityInterface;
 import appeng.helpers.ICustomButtonDataObject;
@@ -34,6 +48,7 @@ import appeng.parts.p2p.PartP2PInterface;
 import appeng.parts.p2p.PartP2PTunnel;
 import appeng.tile.inventory.AppEngInternalAEInventory;
 import appeng.util.Platform;
+import appeng.util.SettingsFrom;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -50,12 +65,25 @@ public class PartFluidP2PInterface extends PartP2PInterface implements IDualHost
         this.customButtonDataObject = new FluidInterfaceButtons(false);
     }
 
+    @Override
+    public void getDrops(final List<ItemStack> drops, final boolean wrenched) {
+        this.dualityFluid.addDrops(drops);
+        super.getDrops(drops, wrenched);
+    }
+
     @Override
     @SideOnly(Side.CLIENT)
     public IIcon getTypeTexture() {
         return ItemAndBlockHolder.INTERFACE.getBlockTextureFromSide(0);
     }
 
+    @Override
+    public NBTTagCompound getMemoryCardData() {
+        NBTTagCompound output = super.getMemoryCardData();
+        DualHostSettings.downloadSettings(this, output);
+        return output;
+    }
+
     @Override
     public PartP2PTunnel<?> applyMemoryCard(EntityPlayer player, IMemoryCard memoryCard, ItemStack is) {
         PartP2PTunnel<?> newTunnel = super.applyMemoryCard(player, memoryCard, is);
@@ -63,6 +91,7 @@ public class PartFluidP2PInterface extends PartP2PInterface implements IDualHost
         NBTTagCompound data = memoryCard.getData(is);
         if (newTunnel instanceof PartFluidP2PInterface p2PInterface) {
             p2PInterface.duality.getConfigManager().readFromNBT(data);
+            DualHostSettings.uploadSettings(p2PInterface, data);
         }
         return newTunnel;
     }
@@ -75,9 +104,41 @@ public class PartFluidP2PInterface extends PartP2PInterface implements IDualHost
             IConfigManager config = fromInterface.duality.getConfigManager();
             config.getSettings()
                     .forEach(setting -> newDuality.getConfigManager().putSetting(setting, config.getSetting(setting)));
+            DualHostSettings.copySettings(this, fromInterface);
         }
     }
 
+    @Override
+    public void uploadSettings(@NotNull SettingsFrom from, @NotNull NBTTagCompound compound) {
+        super.uploadSettings(from, compound);
+        DualHostSettings.uploadSettings(this, compound);
+    }
+
+    @Override
+    @NotNull
+    public NBTTagCompound downloadSettings(SettingsFrom from) {
+        NBTTagCompound output = super.downloadSettings(from);
+        DualHostSettings.downloadSettings(this, output);
+        return output;
+    }
+
+    @Override
+    public void readFromNBT(final NBTTagCompound data) {
+        super.readFromNBT(data);
+        config.readFromNBT(data, "ConfigInv");
+        dualityFluid.loadConfigFromPacket(this.config);
+        dualityFluid.getInternalFluid().readFromNBT(data, "FluidInv");
+        dualityFluid.readCraftingTrackerFromNBT(data);
+    }
+
+    @Override
+    public void writeToNBT(final NBTTagCompound data) {
+        super.writeToNBT(data);
+        config.writeToNBT(data, "ConfigInv");
+        dualityFluid.getInternalFluid().writeToNBT(data, "FluidInv");
+        dualityFluid.writeCraftingTrackerToNBT(data);
+    }
+
     @Override
     public TickingRequest getTickingRequest(IGridNode node) {
         TickingRequest item = duality.getTickingRequest(node);
@@ -100,6 +161,26 @@ public class PartFluidP2PInterface extends PartP2PInterface implements IDualHost
         }
     }
 
+    @Override
+    public ImmutableSet<ICraftingLink> getRequestedJobs() {
+        return ImmutableSet.<ICraftingLink>builder().addAll(super.getRequestedJobs())
+                .addAll(dualityFluid.getRequestedJobs()).build();
+    }
+
+    @Override
+    public IAEStack<?> injectCraftedItems(final ICraftingLink link, final IAEStack<?> items, final Actionable mode) {
+        if (items instanceof IAEFluidStack) {
+            return dualityFluid.injectCraftedItems(link, items, mode);
+        }
+        return super.injectCraftedItems(link, items, mode);
+    }
+
+    @Override
+    public void jobStateChange(final ICraftingLink link) {
+        super.jobStateChange(link);
+        dualityFluid.jobStateChange(link);
+    }
+
     @Override
     public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
         return dualityFluid.fill(from, resource, doFill);
@@ -147,6 +228,23 @@ public class PartFluidP2PInterface extends PartP2PInterface implements IDualHost
         return dualityFluid;
     }
 
+    @Override
+    public IMEMonitor<IAEFluidStack> getFluidInventory() {
+        return this.dualityFluid.getFluidInventory();
+    }
+
+    @Override
+    @Nullable
+    public IMEMonitor<?> getMEMonitor(@NotNull IAEStackType<?> type) {
+        if (type == ITEM_STACK_TYPE) {
+            return this.getItemInventory();
+        } else if (type == FLUID_STACK_TYPE) {
+            return this.getFluidInventory();
+        }
+
+        return this.dualityFluid.getMEMonitor(type);
+    }
+
     @Override
     public AppEngInternalAEInventory getConfig() {
         Util.mirrorFluidToPacket(config, dualityFluid.getConfig());

src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java

@@ -1,8 +1,17 @@
 package com.glodblock.github.common.parts;
 
-import net.minecraft.item.ItemStack;
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
 
-import appeng.api.storage.StorageChannel;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+import com.glodblock.github.util.Util;
+
+import appeng.api.storage.StorageName;
+import appeng.api.storage.data.IAEFluidStack;
+import appeng.api.storage.data.IAEItemStack;
+import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IAEStackType;
 import appeng.parts.misc.PartStorageBus;
 
 public class PartFluidStorageBus extends PartStorageBus {
@@ -12,7 +21,23 @@ public class PartFluidStorageBus extends PartStorageBus {
     }
 
     @Override
-    public StorageChannel getStorageChannel() {
-        return StorageChannel.FLUIDS;
+    public IAEStackType<?> getStackType() {
+        return FLUID_STACK_TYPE;
+    }
+
+    @Override
+    public void readFromNBT(NBTTagCompound data) {
+        super.readFromNBT(data);
+
+        // Migrate from old data
+        var config = this.getAEInventoryByName(StorageName.CONFIG);
+        for (int i = 0; i < config.getSizeInventory(); i++) {
+            IAEStack<?> stack = config.getAEStackInSlot(i);
+
+            if (stack instanceof IAEItemStack ais) {
+                IAEFluidStack afs = Util.getAEFluidFromItem(ais.getItemStack());
+                config.putAEStackInSlot(i, afs);
+            }
+        }
     }
 }

src/main/java/com/glodblock/github/common/parts/PartFluidStorageMonitor.java

@@ -1,36 +1,28 @@
 package com.glodblock.github.common.parts;
 
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
+
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 
-import com.glodblock.github.common.parts.base.FCPartMonitor;
+import appeng.parts.reporting.PartStorageMonitor;
 
-import appeng.client.texture.CableBusTextures;
-import appeng.helpers.Reflected;
+public class PartFluidStorageMonitor extends PartStorageMonitor {
 
-public class PartFluidStorageMonitor extends FCPartMonitor {
-
-    private static final CableBusTextures FRONT_BRIGHT_ICON = CableBusTextures.PartStorageMonitor_Bright;
-    private static final CableBusTextures FRONT_DARK_ICON = CableBusTextures.PartStorageMonitor_Dark;
-    private static final CableBusTextures FRONT_COLORED_ICON = CableBusTextures.PartStorageMonitor_Colored;
-    private static final CableBusTextures FRONT_COLORED_ICON_LOCKED = CableBusTextures.PartStorageMonitor_Colored_Locked;
-
-    @Reflected
-    public PartFluidStorageMonitor(final ItemStack is) {
+    public PartFluidStorageMonitor(ItemStack is) {
         super(is);
     }
 
     @Override
-    public CableBusTextures getFrontBright() {
-        return FRONT_BRIGHT_ICON;
-    }
+    public void readFromNBT(NBTTagCompound data) {
+        // Migrate old tag
+        if (data.hasKey("configuredItem")) {
+            final NBTTagCompound myItem = data.getCompoundTag("configuredItem");
+            if (!myItem.hasNoTags() && !myItem.hasKey("StackType")) {
+                myItem.setString("StackType", FLUID_STACK_TYPE.getId());
+            }
+        }
 
-    @Override
-    public CableBusTextures getFrontColored() {
-        return this.isLocked() ? FRONT_COLORED_ICON_LOCKED : FRONT_COLORED_ICON;
-    }
-
-    @Override
-    public CableBusTextures getFrontDark() {
-        return FRONT_DARK_ICON;
+        super.readFromNBT(data);
     }
 }

src/main/java/com/glodblock/github/common/parts/PartFluidTerminal.java

@@ -1,49 +0,0 @@
-package com.glodblock.github.common.parts;
-
-import net.minecraft.item.ItemStack;
-
-import com.glodblock.github.client.textures.FCPartsTexture;
-import com.glodblock.github.common.parts.base.FCPart;
-
-import appeng.core.sync.GuiBridge;
-
-public class PartFluidTerminal extends FCPart {
-
-    private static final FCPartsTexture FRONT_BRIGHT_ICON = FCPartsTexture.PartFluidTerminal_Bright;
-    private static final FCPartsTexture FRONT_DARK_ICON = FCPartsTexture.PartFluidTerminal_Colored;
-    private static final FCPartsTexture FRONT_COLORED_ICON = FCPartsTexture.PartFluidTerminal_Dark;
-
-    public PartFluidTerminal(ItemStack is) {
-        super(is, true);
-    }
-
-    @Override
-    public FCPartsTexture getFrontBright() {
-        return FRONT_BRIGHT_ICON;
-    }
-
-    @Override
-    public FCPartsTexture getFrontColored() {
-        return FRONT_COLORED_ICON;
-    }
-
-    @Override
-    public FCPartsTexture getFrontDark() {
-        return FRONT_DARK_ICON;
-    }
-
-    @Override
-    public boolean isLightSource() {
-        return false;
-    }
-
-    @Override
-    public boolean isBooting() {
-        return super.isBooting();
-    }
-
-    @Override
-    public GuiBridge getGui() {
-        return GuiBridge.GUI_ME;
-    }
-}

src/main/java/com/glodblock/github/common/parts/base/FCPart.java

@@ -24,7 +24,6 @@ import appeng.api.config.SecurityPermissions;
 import appeng.api.config.Settings;
 import appeng.api.config.SortDir;
 import appeng.api.config.SortOrder;
-import appeng.api.config.TypeFilter;
 import appeng.api.config.ViewItems;
 import appeng.api.implementations.IPowerChannelState;
 import appeng.api.implementations.tiles.IViewCellStorage;
@@ -84,7 +83,6 @@ public abstract class FCPart extends AEBasePart
         this.cm.registerSetting(Settings.SORT_BY, SortOrder.NAME);
         this.cm.registerSetting(Settings.VIEW_MODE, ViewItems.ALL);
         this.cm.registerSetting(Settings.SORT_DIRECTION, SortDir.ASCENDING);
-        this.cm.registerSetting(Settings.TYPE_FILTER, TypeFilter.ALL);
     }
 
     @MENetworkEventSubscribe

src/main/java/com/glodblock/github/common/storage/CellType.java

@@ -19,6 +19,8 @@ public enum CellType {
     Cell4096kPart(6, AEFeature.StorageCells),
     Cell16384kPart(7, AEFeature.StorageCells);
 
+    public static final CellType[] VALUES = values();
+
     private final EnumSet<AEFeature> features;
     private int damageValue;
     private Item itemInstance;
@@ -53,7 +55,7 @@ public enum CellType {
     }
 
     public static EnumChatFormatting getTypeColor(int type) {
-        return getTypeColor(CellType.values()[type % CellType.values().length]);
+        return getTypeColor(CellType.VALUES[type % CellType.VALUES.length]);
     }
 
     public static EnumChatFormatting getTypeColor(CellType type) {

src/main/java/com/glodblock/github/common/tile/TileCertusQuartzTank.java

@@ -70,20 +70,25 @@ public class TileCertusQuartzTank extends TileEntity implements IFluidHandler {
             return mainTank.drain(fluid, amount, doDrain, false);
         }
 
+        Fluid currentFluid = this.getFluid();
+        if (currentFluid == null) {
+            return null;
+        }
+
         FluidStack drainedFluid = this.tank.drain(amount, doDrain);
         int drained = drainedFluid != null ? drainedFluid.amount : 0;
 
-        if (drained > 0) {
+        if (doDrain && drained > 0) {
             update();
         }
 
         if (drained < amount) {
             TileCertusQuartzTank tankBelow = this.getTankBelow();
             if (tankBelow != null) {
-                FluidStack externallyDrained = tankBelow.drain(fluid, amount - drained, doDrain, false);
+                FluidStack externallyDrained = tankBelow.drain(currentFluid, amount - drained, doDrain, false);
 
                 if (externallyDrained != null) {
-                    return new FluidStack(fluid, drained + externallyDrained.amount);
+                    return new FluidStack(currentFluid, drained + externallyDrained.amount);
                 }
             }
         }
@@ -100,7 +105,7 @@ public class TileCertusQuartzTank extends TileEntity implements IFluidHandler {
 
     @Override
     public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
-        return drain(null, maxDrain, true, true);
+        return drain(null, maxDrain, doDrain, true);
     }
 
     public int fill(FluidStack fluid, boolean doFill, boolean findMainTank) {
@@ -131,7 +136,7 @@ public class TileCertusQuartzTank extends TileEntity implements IFluidHandler {
 
         int filled = this.tank.fill(fluid, doFill);
 
-        if (filled > 0) {
+        if (doFill && filled > 0) {
             update();
         }
 

src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java

@@ -77,15 +77,27 @@ public class TileFluidAutoFiller extends AENetworkInvTile
     public TileFluidAutoFiller() {
         getProxy().setIdlePowerUsage(1D);
         getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
-        inventory.setInventorySlotContents(0, BUCKET);
+        inventory.setInventorySlotContents(0, BUCKET.copy());
     }
 
+    @Nonnull
     public ItemStack getContainerItem() {
+        normalizeContainerItem();
         return getInventory().getStackInSlot(0);
     }
 
     public void setContainerItem(ItemStack is) {
         getInventory().setInventorySlotContents(0, is);
+        normalizeContainerItem();
+    }
+
+    private void normalizeContainerItem() {
+        ItemStack is = getInventory().getStackInSlot(0);
+        if (is == null) {
+            is = BUCKET.copy();
+            getInventory().setInventorySlotContents(0, is);
+        }
+        is.stackSize = 1;
     }
 
     @Override
@@ -102,18 +114,15 @@ public class TileFluidAutoFiller extends AENetworkInvTile
     }
 
     public void updatePattern() {
-        ItemStack is = inventory.getStackInSlot(0);
-        if (is == null) return;
-        this.setContainerItem(is);
+        normalizeContainerItem();
         postEvent();
     }
 
     @TileEvent(TileEventType.WORLD_NBT_READ)
     public void readFromNBTEvent(NBTTagCompound data) {
         inventory.readFromNBT(data, "Inv");
-        if (inventory.getStackInSlot(0) == null) {
-            inventory.setInventorySlotContents(0, BUCKET);
-        }
+        ItemStack container = inventory.getStackInSlot(0);
+        this.setContainerItem(container);
     }
 
     @TileEvent(TileEventType.WORLD_NBT_WRITE)
@@ -150,21 +159,21 @@ public class TileFluidAutoFiller extends AENetworkInvTile
     public void provideCrafting(ICraftingProviderHelper craftingTracker) {
         IStorageGrid storage = getStorageGrid();
         if (storage == null) return;
+        ItemStack containerItem = this.getContainerItem();
+
         if (this.fluids.isEmpty()) {
             this.fluids = storage.getFluidInventory().getStorageList();
         }
         for (IAEFluidStack fluidStack : this.fluids) {
             Fluid fluid = fluidStack.getFluid();
             if (fluid == null) continue;
-            int maxCapacity = Util.FluidUtil.getCapacity(this.getContainerItem(), fluid);
+            int maxCapacity = Util.FluidUtil.getCapacity(containerItem, fluid);
             if (maxCapacity == 0) continue;
             MutablePair<Integer, ItemStack> filled = Util.FluidUtil
-                    .fillStack(this.getContainerItem().copy(), new FluidStack(fluid, maxCapacity));
+                    .fillStack(containerItem.copy(), new FluidStack(fluid, maxCapacity));
+            if (filled == null) continue;
             if (filled.right == null) continue;
-            ItemStack pattern = getPattern(
-                    this.getContainerItem(),
-                    filled.right,
-                    fluidStack.copy().setStackSize(maxCapacity));
+            ItemStack pattern = getPattern(containerItem, filled.right, fluidStack.copy().setStackSize(maxCapacity));
             ICraftingPatternItem patter = (ICraftingPatternItem) pattern.getItem();
             craftingTracker.addCraftingOption(this, patter.getPatternForItem(pattern, getWorldObj()));
         }

src/main/java/com/glodblock/github/common/tile/TileFluidInterface.java

@@ -1,5 +1,8 @@
 package com.glodblock.github.common.tile;
 
+import static appeng.util.item.AEFluidStackType.FLUID_STACK_TYPE;
+import static appeng.util.item.AEItemStackType.ITEM_STACK_TYPE;
+
 import java.io.IOException;
 import java.util.List;
 
@@ -14,25 +17,34 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.glodblock.github.client.FluidInterfaceButtons;
 import com.glodblock.github.common.item.ItemFluidPacket;
 import com.glodblock.github.inventory.AEFluidInventory;
 import com.glodblock.github.inventory.IAEFluidTank;
 import com.glodblock.github.inventory.IDualHost;
 import com.glodblock.github.loader.ItemAndBlockHolder;
+import com.glodblock.github.util.DualHostSettings;
 import com.glodblock.github.util.DualityFluidInterface;
 import com.glodblock.github.util.Util;
+import com.google.common.collect.ImmutableSet;
 
+import appeng.api.config.Actionable;
 import appeng.api.config.Settings;
 import appeng.api.config.SidelessMode;
 import appeng.api.config.Upgrades;
 import appeng.api.networking.IGridNode;
+import appeng.api.networking.crafting.ICraftingLink;
 import appeng.api.networking.events.MENetworkChannelsChanged;
 import appeng.api.networking.events.MENetworkEventSubscribe;
 import appeng.api.networking.events.MENetworkPowerStatusChange;
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
+import appeng.api.storage.IMEMonitor;
 import appeng.api.storage.data.IAEFluidStack;
+import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IAEStackType;
 import appeng.api.util.IConfigManager;
 import appeng.helpers.ICustomButtonDataObject;
 import appeng.helpers.ICustomButtonProvider;
@@ -40,6 +52,7 @@ import appeng.tile.TileEvent;
 import appeng.tile.events.TileEventType;
 import appeng.tile.inventory.AppEngInternalAEInventory;
 import appeng.tile.misc.TileInterface;
+import appeng.util.SettingsFrom;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -98,12 +111,29 @@ public class TileFluidInterface extends TileInterface implements IDualHost, ICus
         return fluidDuality.getTanks();
     }
 
+    @Override
+    public IMEMonitor<IAEFluidStack> getFluidInventory() {
+        return this.fluidDuality.getFluidInventory();
+    }
+
     @Override
     public AppEngInternalAEInventory getConfig() {
         Util.mirrorFluidToPacket(this.config, fluidDuality.getConfig());
         return config;
     }
 
+    @Override
+    @Nullable
+    public IMEMonitor<?> getMEMonitor(@NotNull IAEStackType<?> type) {
+        if (type == ITEM_STACK_TYPE) {
+            return this.getItemInventory();
+        } else if (type == FLUID_STACK_TYPE) {
+            return this.getFluidInventory();
+        }
+
+        return this.fluidDuality.getMEMonitor(type);
+    }
+
     @Override
     public TickingRequest getTickingRequest(IGridNode node) {
         TickingRequest item = super.getTickingRequest(node);
@@ -154,15 +184,31 @@ public class TileFluidInterface extends TileInterface implements IDualHost, ICus
         config.readFromNBT(data, "ConfigInv");
         fluidDuality.loadConfigFromPacket(this.config);
         getInternalFluid().readFromNBT(data, "FluidInv");
+        fluidDuality.readCraftingTrackerFromNBT(data);
     }
 
     @TileEvent(TileEventType.WORLD_NBT_WRITE)
     public NBTTagCompound writeToNBTEvent(NBTTagCompound data) {
         config.writeToNBT(data, "ConfigInv");
         getInternalFluid().writeToNBT(data, "FluidInv");
+        fluidDuality.writeCraftingTrackerToNBT(data);
         return data;
     }
 
+    @Override
+    public void uploadSettings(SettingsFrom from, NBTTagCompound compound) {
+        super.uploadSettings(from, compound);
+        DualHostSettings.uploadSettings(this, compound);
+    }
+
+    @Override
+    public NBTTagCompound downloadSettings(SettingsFrom from) {
+        NBTTagCompound output = super.downloadSettings(from);
+        output = output == null ? new NBTTagCompound() : output;
+        DualHostSettings.downloadSettings(this, output);
+        return output;
+    }
+
     @Nullable
     protected ItemStack getItemFromTile(final Object obj) {
         if (obj instanceof TileFluidInterface) {
@@ -176,6 +222,26 @@ public class TileFluidInterface extends TileInterface implements IDualHost, ICus
         return getInterfaceDuality().getInstalledUpgrades(u);
     }
 
+    @Override
+    public ImmutableSet<ICraftingLink> getRequestedJobs() {
+        return ImmutableSet.<ICraftingLink>builder().addAll(super.getRequestedJobs())
+                .addAll(fluidDuality.getRequestedJobs()).build();
+    }
+
+    @Override
+    public IAEStack<?> injectCraftedItems(final ICraftingLink link, final IAEStack<?> items, final Actionable mode) {
+        if (items instanceof IAEFluidStack) {
+            return fluidDuality.injectCraftedItems(link, items, mode);
+        }
+        return super.injectCraftedItems(link, items, mode);
+    }
+
+    @Override
+    public void jobStateChange(final ICraftingLink link) {
+        super.jobStateChange(link);
+        fluidDuality.jobStateChange(link);
+    }
+
     @Override
     public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
         return fluidDuality.fill(from, resource, doFill);

src/main/java/com/glodblock/github/common/tile/TileFluidPacketDecoder.java

@@ -2,6 +2,7 @@ package com.glodblock.github.common.tile;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -10,6 +11,7 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 
+import com.glodblock.github.common.item.ItemFluidDrop;
 import com.glodblock.github.common.item.ItemFluidPacket;
 
 import appeng.api.networking.GridFlags;
@@ -60,13 +62,22 @@ public class TileFluidPacketDecoder extends AENetworkTile
         return new TickingRequest(5, 120, false, true);
     }
 
+    private FluidStack getFluidStack() {
+        final ItemStack stack = inventory.getStackInSlot(0);
+        if (stack == null) return null;
+
+        if (stack.getItem() instanceof ItemFluidPacket) {
+            return ItemFluidPacket.getFluidStack(stack);
+        } else if (stack.getItem() instanceof ItemFluidDrop) {
+            return ItemFluidDrop.getFluidStack(stack);
+        }
+
+        return null;
+    }
+
     @Override
     public TickRateModulation tickingRequest(IGridNode node, int ticksSinceLastCall) {
-        ItemStack stack = inventory.getStackInSlot(0);
-        if (stack == null || !(stack.getItem() instanceof ItemFluidPacket)) {
-            return TickRateModulation.SLEEP;
-        }
-        FluidStack fluid = ItemFluidPacket.getFluidStack(stack);
+        final FluidStack fluid = getFluidStack();
         if (fluid == null || fluid.amount <= 0) {
             inventory.setInventorySlotContents(0, null);
             return TickRateModulation.SLEEP;
@@ -162,12 +173,13 @@ public class TileFluidPacketDecoder extends AENetworkTile
 
     @Override
     public void closeInventory() {
-        inventory.openInventory();
+        inventory.closeInventory();
     }
 
     @Override
     public boolean isItemValidForSlot(int slot, ItemStack stack) {
-        return stack.getItem() instanceof ItemFluidPacket;
+        final Item item = stack.getItem();
+        return item instanceof ItemFluidPacket || item instanceof ItemFluidDrop;
     }
 
     @Override
@@ -182,34 +194,27 @@ public class TileFluidPacketDecoder extends AENetworkTile
 
     private FluidStack drain(FluidStack requestFluid, boolean doDrain) {
         if (requestFluid == null || requestFluid.amount <= 0) return null;
-        ItemStack fluidPacket = this.inventory.getStackInSlot(0);
-        if (fluidPacket != null) {
-            FluidStack fs = ItemFluidPacket.getFluidStack(fluidPacket);
-            if (fs == null) return null;
-            if (fs.isFluidEqual(requestFluid)) {
-                if (fs.amount > requestFluid.amount) {
-                    fs.amount -= requestFluid.amount;
-                    if (doDrain) this.inventory.setInventorySlotContents(0, ItemFluidPacket.newStack(fs));
-                    return requestFluid;
-                } else {
-                    if (doDrain) this.inventory.setInventorySlotContents(0, null);
-                    return fs;
-                }
+        final FluidStack fs = this.getFluidStack();
+        if (fs != null && fs.isFluidEqual(requestFluid)) {
+            if (fs.amount > requestFluid.amount) {
+                fs.amount -= requestFluid.amount;
+                if (doDrain) this.inventory.setInventorySlotContents(0, ItemFluidPacket.newStack(fs));
+                return requestFluid;
+            } else {
+                if (doDrain) this.inventory.setInventorySlotContents(0, null);
+                return fs;
             }
         }
+
         return null;
     }
 
     @Override
     public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
-        ItemStack fluidPacket = this.inventory.getStackInSlot(0);
-        if (fluidPacket != null) {
-            FluidStack requestFluid = ItemFluidPacket.getFluidStack(fluidPacket);
-            if (requestFluid == null) return null;
-            requestFluid.amount = maxDrain;
-            return this.drain(requestFluid, doDrain);
-        }
-        return null;
+        final FluidStack requestFluid = this.getFluidStack();
+        if (requestFluid == null) return null;
+        requestFluid.amount = maxDrain;
+        return this.drain(requestFluid, doDrain);
     }
 
     @Override
@@ -224,13 +229,8 @@ public class TileFluidPacketDecoder extends AENetworkTile
 
     @Override
     public FluidTankInfo[] getTankInfo(ForgeDirection from) {
-        ItemStack fluidPacket = this.inventory.getStackInSlot(0);
-        if (fluidPacket == null) {
-            return new FluidTankInfo[0];
-        } else {
-            FluidStack fs = ItemFluidPacket.getFluidStack(fluidPacket);
-            if (fs == null) return new FluidTankInfo[0];
-            return new FluidTankInfo[] { new FluidTankInfo(fs, fs.amount) };
-        }
+        final FluidStack fs = this.getFluidStack();
+        if (fs == null) return new FluidTankInfo[0];
+        return new FluidTankInfo[] { new FluidTankInfo(fs, fs.amount) };
     }
 }

src/main/java/com/glodblock/github/common/tile/TileLevelMaintainer.java

@@ -18,11 +18,12 @@ import org.jetbrains.annotations.Nullable;
 import com.glodblock.github.common.Config;
 import com.glodblock.github.common.item.ItemFluidDrop;
 import com.glodblock.github.crossmod.thaumcraft.ThaumicEnergisticsCrafting;
-import com.glodblock.github.util.ModAndClassUtil;
 import com.google.common.collect.ImmutableSet;
 
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
+import appeng.api.config.CraftingAllow;
+import appeng.api.config.CraftingMode;
 import appeng.api.config.PowerMultiplier;
 import appeng.api.features.ILevelViewable;
 import appeng.api.features.LevelItemInfo;
@@ -45,13 +46,14 @@ import appeng.api.networking.security.MachineSource;
 import appeng.api.networking.ticking.IGridTickable;
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
+import appeng.api.storage.IMEMonitor;
 import appeng.api.storage.StorageName;
-import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
-import appeng.api.storage.data.IItemList;
 import appeng.core.AELog;
 import appeng.me.GridAccessException;
+import appeng.me.cache.CraftingGridCache;
+import appeng.me.cluster.implementations.CraftingCPUCluster;
 import appeng.tile.TileEvent;
 import appeng.tile.events.TileEventType;
 import appeng.tile.grid.AENetworkTile;
@@ -74,12 +76,15 @@ public class TileLevelMaintainer extends AENetworkTile
     public static final String NBT_ENABLE = "enable";
     public static final String NBT_STATE = "state";
     public static final String NBT_LINK = "link";
+    public static final String NBT_LITE_MODE = "lite_mode";
 
     public final RequestInfo[] requests = new RequestInfo[REQ_COUNT];
     private final LevelMaintainerInventory inventory = new LevelMaintainerInventory(requests);
     private int firstRequest = 0;
     private final BaseActionSource source;
     private boolean isPowered = false;
+    private boolean isLiteModeOverridden = false;
+    private boolean isLiteMode = false;
 
     public TileLevelMaintainer() {
         getProxy().setIdlePowerUsage(1D);
@@ -99,30 +104,35 @@ public class TileLevelMaintainer extends AENetworkTile
     }
 
     @Override
-    public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack items, Actionable mode) {
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public IAEStack<?> injectCraftedItems(ICraftingLink link, IAEStack<?> stack, Actionable mode) {
         int idx = this.getRequestIndexByLink(link);
 
         try {
             if (getProxy().isActive()) {
                 final IEnergyGrid energy = getProxy().getEnergy();
-                final double power = Math
-                        .ceil(ItemFluidDrop.isFluidStack(items) ? items.getStackSize() / 1000D : items.getStackSize());
-                if (energy.extractAEPower(power, mode, PowerMultiplier.CONFIG) > power - 0.01) {
-                    if (ItemFluidDrop.isFluidStack(items)) {
-                        IAEFluidStack notInjectedItems = getProxy().getStorage().getFluidInventory()
-                                .injectItems(ItemFluidDrop.getAeFluidStack(items), mode, source);
-                        if (notInjectedItems != null) {
-                            items.setStackSize(notInjectedItems.getStackSize());
-                            if (idx != -1) {
-                                this.updateState(idx, LevelState.Export);
-                            }
+                final double power = Math.ceil((double) stack.getStackSize() / stack.getAmountPerUnit());
 
-                            return items;
-                        } else {
-                            return null;
-                        }
+                if (energy.extractAEPower(power, mode, PowerMultiplier.CONFIG) > power - 0.01) {
+                    IMEMonitor monitor = getProxy().getStorage().getMEMonitor(stack.getStackType());
+                    if (monitor == null) return stack;
+
+                    IAEStack<?> notInjected;
+                    if (stack instanceof IAEItemStack ais && ItemFluidDrop.isFluidStack(ais)) {
+                        notInjected = getProxy().getStorage().getFluidInventory()
+                                .injectItems(ItemFluidDrop.getAeFluidStack(ais), mode, source);
                     } else {
-                        return getProxy().getStorage().getItemInventory().injectItems(items, mode, source);
+                        notInjected = monitor.injectItems(stack, mode, source);
+                    }
+
+                    if (notInjected != null) {
+                        if (idx != -1) {
+                            this.updateState(idx, LevelState.Export);
+                        }
+
+                        return notInjected;
+                    } else {
+                        return null;
                     }
                 }
             }
@@ -130,7 +140,7 @@ public class TileLevelMaintainer extends AENetworkTile
             AELog.debug(e);
         }
 
-        return items;
+        return stack;
     }
 
     @Override
@@ -161,16 +171,15 @@ public class TileLevelMaintainer extends AENetworkTile
         }
         try {
             final ICraftingGrid craftingGrid = getProxy().getCrafting();
+            final CraftingGridCache craftingGridCache = (CraftingGridCache) craftingGrid;
             final IGrid grid = getProxy().getGrid();
-            final IItemList<IAEItemStack> invItems = getProxy().getStorage().getItemInventory().getStorageList();
-            final IItemList<IAEFluidStack> invFluid = getProxy().getStorage().getFluidInventory().getStorageList();
 
             // Check there are available crafting CPUs before doing any work.
             // This hopefully stops level maintainers busy-looping calculating
             // crafting tasks that cannot be successfully submitted.
             boolean allBusy = true;
             for (final ICraftingCPU cpu : craftingGrid.getCpus()) {
-                if (!cpu.isBusy()) {
+                if (canAcceptMachineJob(cpu)) {
                     allBusy = false;
                     break;
                 }
@@ -183,7 +192,7 @@ public class TileLevelMaintainer extends AENetworkTile
             IAEStack<?> itemToBegin = null;
             int itemToBeginIdx = -1;
 
-            for (int j = 0; j < REQ_COUNT; ++j) {
+            req: for (int j = 0; j < REQ_COUNT; ++j) {
                 int i = (firstRequest + j) % REQ_COUNT;
                 if (requests[i] == null) continue;
 
@@ -196,58 +205,56 @@ public class TileLevelMaintainer extends AENetworkTile
                     continue;
                 }
 
-                IAEStack<?> aeItem = null;
+                if (!this.isDone(i)) {
+                    continue;
+                }
 
                 IAEStack<?> craftItem = requests[i].stack.copy();
                 craftItem.setStackSize(batchSize);
 
-                if (craftItem instanceof IAEItemStack ais) {
-                    if (ModAndClassUtil.ThE && ThaumicEnergisticsCrafting.isAspectStack(ais.getItemStack())) {
-                        aeItem = ThaumicEnergisticsCrafting.convertAspectStack(ais);
-                    } else {
-                        aeItem = invItems.findPrecise(ais);
-                    }
-                } else if (craftItem instanceof IAEFluidStack afs) {
-                    aeItem = invFluid.findPrecise(afs);
+                final boolean isCraftable = isCraftable(craftingGrid, craftItem);
+
+                if (this.requests[i].state != LevelState.Idle) {
+                    this.updateState(i, LevelState.Idle);
+                }
+                if (this.requests[i].link != null) {
+                    this.updateLink(i, null);
+                }
+                if (!isCraftable) {
+                    updateState(i, LevelState.NotFound);
                 }
 
-                long stackSize = aeItem == null ? 0 : aeItem.getStackSize();
-
-                if (ModAndClassUtil.ThE) {
-                    if (aeItem instanceof IAEItemStack ais
-                            && ThaumicEnergisticsCrafting.isAspectStack(ais.getItemStack())) {
-                        stackSize = ThaumicEnergisticsCrafting.getEssentiaAmount(ais, grid);
-                    }
-                }
-
-                boolean isDone = this.isDone(i);
-                boolean isCraftable = aeItem != null && aeItem.isCraftable();
-                boolean shouldCraft = isCraftable && stackSize < quantity;
-
-                if (isDone) {
-                    if (this.requests[i].state != LevelState.Idle) {
-                        this.updateState(i, LevelState.Idle);
-                    }
-                    if (this.requests[i].link != null) {
-                        this.updateLink(i, null);
-                    }
-                    if (!isCraftable) {
-                        updateState(i, LevelState.NotFound);
-                    }
-                }
-
-                if (allBusy || !isDone || !shouldCraft) {
+                // A free CPU is required before it is worth looking at the stock:
+                if (allBusy || !isCraftable) {
                     continue;
                 }
 
-                if (craftingGrid.canEmitFor(aeItem)) {
+                // Single hash lookup on the emitable mediums, so it is cheaper
+                // than reading the stock and can run first.
+                if (craftingGrid.canEmitFor(craftItem)) {
                     continue;
                 }
 
-                if (craftingGrid.isRequesting(aeItem)) {
+                IMEMonitor monitor = getProxy().getStorage().getMEMonitor(craftItem.getStackType());
+                if (monitor == null) continue;
+
+                @SuppressWarnings({ "rawtypes", "unchecked" })
+                IAEStack<?> stackInStorage = monitor.getStorageList().findPrecise(craftItem);
+                long stackSize = stackInStorage == null ? 0 : stackInStorage.getStackSize();
+
+                if (stackSize >= quantity) {
                     continue;
                 }
 
+                // Walking every CPU to see whether the item is already being
+                // made is comparatively expensive
+                for (ICraftingCPU cpu : craftingGrid.getCpus()) {
+                    IAEStack<?> output = cpu.getFinalMultiOutput();
+                    if (output != null && output.isSameType(craftItem)) {
+                        continue req;
+                    }
+                }
+
                 // do crafting
                 Future<ICraftingJob> jobTask = requests[i].job;
 
@@ -287,9 +294,14 @@ public class TileLevelMaintainer extends AENetworkTile
                 }
             } else if (itemToBegin != null) {
                 // No jobs to submit, start calculating some item.
-
-                requests[itemToBeginIdx].job = craftingGrid
-                        .beginCraftingJob(getWorldObj(), grid, source, itemToBegin, null);
+                requests[itemToBeginIdx].job = craftingGridCache.beginCraftingJob(
+                        this.worldObj,
+                        grid,
+                        source,
+                        itemToBegin,
+                        CraftingMode.STANDARD,
+                        isLiteMode(),
+                        null);
                 this.updateState(itemToBeginIdx, LevelState.Craft);
 
                 // Try the next item next time.
@@ -306,6 +318,21 @@ public class TileLevelMaintainer extends AENetworkTile
         return TickRateModulation.SAME;
     }
 
+    private static boolean isCraftable(final ICraftingGrid craftingGrid, final IAEStack<?> stack) {
+        if (stack == null) return false;
+        return craftingGrid.canEmitFor(stack) || craftingGrid.getCraftingMultiPatterns().containsKey(stack);
+    }
+
+    private static boolean canAcceptMachineJob(final ICraftingCPU cpu) {
+        if (cpu.isBusy()) {
+            return false;
+        }
+        if (!(cpu instanceof CraftingCPUCluster cluster)) {
+            return true;
+        }
+        return cluster.isActive() && cluster.getCraftingAllowMode() != CraftingAllow.ONLY_PLAYER;
+    }
+
     @Override
     public void saveChanges() {
         super.saveChanges();
@@ -383,6 +410,35 @@ public class TileLevelMaintainer extends AENetworkTile
         this.saveChanges();
     }
 
+    private boolean getLiteModeDefault() {
+        try {
+            final ICraftingGrid craftingGrid = getProxy().getCrafting();
+            if (craftingGrid instanceof CraftingGridCache cache) {
+                return cache.getLiteCraftingDefault();
+            }
+        } catch (GridAccessException ignored) {}
+        return false;
+    }
+
+    public boolean isLiteMode() {
+        return this.isLiteModeOverridden ? this.isLiteMode : getLiteModeDefault();
+    }
+
+    public void setLiteMode(boolean liteMode) {
+        this.isLiteModeOverridden = true;
+        this.isLiteMode = liteMode;
+        this.saveChanges();
+    }
+
+    public void toggleLiteMode() {
+        this.setLiteMode(!this.isLiteMode());
+    }
+
+    public void clearLiteMode() {
+        this.isLiteModeOverridden = false;
+        this.saveChanges();
+    }
+
     private void updateLink(int idx, @Nullable ICraftingLink link) {
         if (requests[idx] == null) return;
         requests[idx].link = link;
@@ -430,6 +486,9 @@ public class TileLevelMaintainer extends AENetworkTile
             }
         }
         data.setTag(NBT_REQUESTS, tagList);
+        if (this.isLiteModeOverridden) {
+            data.setBoolean(NBT_LITE_MODE, this.isLiteMode);
+        }
     }
 
     @TileEvent(TileEventType.WORLD_NBT_READ)
@@ -513,6 +572,10 @@ public class TileLevelMaintainer extends AENetworkTile
                 this.requests[i].quantity = quantyties[i];
             }
         }
+        if (data.hasKey(NBT_LITE_MODE)) {
+            this.isLiteModeOverridden = true;
+            this.isLiteMode = data.getBoolean(NBT_LITE_MODE);
+        }
     }
 
     // Remove old format NBT data from ItemStack
@@ -555,6 +618,12 @@ public class TileLevelMaintainer extends AENetworkTile
                 }
             }
         }
+        if (compound.hasKey(NBT_LITE_MODE)) {
+            this.isLiteModeOverridden = true;
+            this.isLiteMode = compound.getBoolean(NBT_LITE_MODE);
+        } else {
+            this.isLiteModeOverridden = false;
+        }
         this.saveChanges();
     }
 
@@ -571,6 +640,9 @@ public class TileLevelMaintainer extends AENetworkTile
             }
         }
         compound.setTag(NBT_REQUESTS, tagList);
+        if (isLiteModeOverridden) {
+            compound.setBoolean(NBT_LITE_MODE, isLiteMode);
+        }
         return compound;
     }
 
@@ -644,6 +716,10 @@ public class TileLevelMaintainer extends AENetworkTile
             if (stack == null) {
                 throw new IllegalArgumentException("ItemStack cannot be null!");
             }
+
+            // Migrate old aspect stack
+            stack = ThaumicEnergisticsCrafting.convertItemAspectStack(stack);
+
             quantity = tag.getLong(NBT_QUANTITY);
             batchSize = tag.getLong(NBT_BATCH);
             enable = tag.getBoolean(NBT_ENABLE);
@@ -660,6 +736,10 @@ public class TileLevelMaintainer extends AENetworkTile
 
         public void loadFromNBT(NBTTagCompound tag) {
             stack = Platform.readStackNBT(tag.getCompoundTag(NBT_STACK), true);
+
+            // Migrate old aspect stack
+            stack = ThaumicEnergisticsCrafting.convertItemAspectStack(stack);
+
             quantity = tag.getLong(NBT_QUANTITY);
             batchSize = tag.getLong(NBT_BATCH);
             enable = tag.getBoolean(NBT_ENABLE);

src/main/java/com/glodblock/github/common/tile/TileSuperStockReplenisher.java

@@ -5,25 +5,32 @@ import java.util.stream.IntStream;
 
 import javax.annotation.Nonnull;
 
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 
-import com.glodblock.github.common.item.FCBaseItemCell;
+import org.jetbrains.annotations.Nullable;
+
 import com.glodblock.github.common.item.ItemFluidPacket;
 import com.glodblock.github.inventory.AEFluidInventory;
 import com.glodblock.github.inventory.IAEFluidInventory;
 import com.glodblock.github.inventory.IAEFluidTank;
+import com.gtnewhorizon.gtnhlib.item.ItemStackNBT;
 
+import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
 import appeng.api.implementations.IPowerChannelState;
+import appeng.api.implementations.items.IStorageCell;
+import appeng.api.implementations.tiles.IColorableTile;
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.events.MENetworkBootingStatusChange;
@@ -36,58 +43,110 @@ import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
 import appeng.api.storage.IMEMonitor;
 import appeng.api.storage.ITerminalHost;
+import appeng.api.storage.StorageName;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
+import appeng.api.storage.data.IAEStack;
 import appeng.api.util.AECableType;
+import appeng.api.util.AEColor;
 import appeng.api.util.DimensionalCoord;
 import appeng.api.util.IConfigManager;
 import appeng.core.AELog;
-import appeng.items.storage.ItemBasicStorageCell;
 import appeng.me.GridAccessException;
 import appeng.tile.TileEvent;
 import appeng.tile.events.TileEventType;
 import appeng.tile.grid.AENetworkInvTile;
-import appeng.tile.inventory.AppEngInternalAEInventory;
 import appeng.tile.inventory.AppEngInternalInventory;
+import appeng.tile.inventory.BiggerAppEngInventory;
+import appeng.tile.inventory.IAEStackInventory;
+import appeng.tile.inventory.IIAEStackInventory;
 import appeng.tile.inventory.InvOperation;
+import appeng.util.Platform;
 import appeng.util.item.AEFluidStack;
 import appeng.util.item.AEItemStack;
 import io.netty.buffer.ByteBuf;
 
-public class TileSuperStockReplenisher extends AENetworkInvTile
-        implements IAEFluidInventory, IFluidHandler, IPowerChannelState, IGridTickable, ITerminalHost {
+public class TileSuperStockReplenisher extends AENetworkInvTile implements IAEFluidInventory, IFluidHandler,
+        IPowerChannelState, IGridTickable, ITerminalHost, IIAEStackInventory, IColorableTile {
 
     private final AppEngInternalInventory cell = new AppEngInternalInventory(this, 1);
-    private final AppEngInternalInventory invItems = new AppEngInternalInventory(this, 63);
+    private final BiggerAppEngInventory invItems = new BiggerAppEngInventory(this, 63);
     private final AEFluidInventory invFluids = new AEFluidInventory(this, 9, Integer.MAX_VALUE);
-    private final AppEngInternalAEInventory configFluids = new AppEngInternalAEInventory(this, 9);
-    private final AppEngInternalAEInventory configItems = new AppEngInternalAEInventory(this, 63);
+    private final IAEStackInventory configItems = new IAEStackInventory(this, 63, StorageName.CONFIG);
+    private final IAEStackInventory configFluids = new IAEStackInventory(this, 9, StorageName.NONE) {
+
+        @Override
+        public void readFromNBT(@Nullable NBTTagCompound data, String name) {
+            super.readFromNBT(data, name);
+
+            for (int i = 0; i < this.getSizeInventory(); i++) {
+                final IAEStack<?> aes = this.getAEStackInSlot(i);
+                if (aes instanceof IAEItemStack ais && ais.getItem() instanceof ItemFluidPacket) {
+                    final IAEFluidStack ifs = ItemFluidPacket.getFluidAEStack(ais);
+                    if (ifs != null && ifs.getStackSize() > Integer.MAX_VALUE) ifs.setStackSize(Integer.MAX_VALUE);
+                    this.putAEStackInSlot(i, ifs);
+                }
+            }
+        }
+    };
     private final BaseActionSource source;
     private boolean isPowered;
+    private AEColor paintedColor = AEColor.Transparent;
     private long totalBytes;
     private long storedFluidCount;
     private long storedItemCount;
+    protected boolean isFullStockMode;
+    protected boolean isSlotsAccessible;
+    protected boolean isNeedsFullyStocked;
+    protected boolean modeChange;
+
+    private boolean needReCountStoredFluids = true;
+    private boolean needReCountStoredItems = true;
 
     public TileSuperStockReplenisher() {
-        getProxy().setIdlePowerUsage(4D);
-        getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
+        super(false);
+        this.getProxy().setIdlePowerUsage(4D);
+        this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
         this.source = new MachineSource(this);
         invItems.setMaxStackSize(Integer.MAX_VALUE);
+        this.isFullStockMode = false;
+        this.isSlotsAccessible = true;
+        this.isNeedsFullyStocked = false;
+        this.modeChange = false;
     }
 
     private TickRateModulation doWork() {
+        final TickRateModulation tickRateModulation;
+
+        if (this.isFullStockMode()) {
+            if (this.isNeedsFullyStocked()) {
+                tickRateModulation = TickRateModulation.FASTER;
+            } else tickRateModulation = TickRateModulation.SLOWER;
+        } else tickRateModulation = TickRateModulation.IDLE;
+
+        this.fletchFluids();
+        this.fletchItems();
+
+        this.needReCountStoredFluids = true;
+        this.needReCountStoredItems = true;
+
+        return tickRateModulation;
+    }
+
+    private void fletchFluids() {
         for (int i = 0; i < 9; i++) {
             IAEFluidStack invFluid = invFluids.getFluidInSlot(i);
-            IAEItemStack configFluid = configFluids.getAEStackInSlot(i);
-            if (configFluid != null) {
-                IAEFluidStack fs = AEFluidStack.create(ItemFluidPacket.getFluidStack(configFluid));
-                if (invFluid == null) requestFluid(fs, i);
-                else if (invFluid.equals(fs)) {
+            IAEStack<?> configFluid = configFluids.getAEStackInSlot(i);
+            if (configFluid instanceof IAEFluidStack fs) {
+                IAEFluidStack ifs = fs.copy();
+                if (invFluid == null) requestFluid(ifs, i);
+                else if (invFluid.equals(ifs)) {
                     long invSize = invFluid.getStackSize();
-                    long confSize = fs.getStackSize();
-                    if (invSize < confSize / 2f) {
-                        fs.setStackSize(confSize - invSize);
-                        requestFluid(fs, i);
+                    long confSize = ifs.getStackSize();
+                    if (!this.isFullStockMode() && (invSize < confSize / 2f)
+                            || (this.isFullStockMode() && (invSize < confSize))) {
+                        ifs.setStackSize(confSize - invSize);
+                        requestFluid(ifs, i);
                     } else if (invSize > confSize) {
                         returnFluid(i, invSize - confSize);
                     }
@@ -98,18 +157,21 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
                 returnFluid(i, Long.MAX_VALUE);
             }
         }
+    }
 
+    private void fletchItems() {
         for (int i = 0; i < 63; i++) {
             ItemStack invItem = invItems.getStackInSlot(i);
-            IAEItemStack configItem = configItems.getAEStackInSlot(i);
-
-            if (configItem != null) {
-                IAEItemStack is = configItem.copy();
+            IAEStack<?> configItem = configItems.getAEStackInSlot(i);
+            if (configItem instanceof IAEItemStack ais) {
+                IAEItemStack is = ais.copy();
                 if (invItem == null) requestItem(is, i);
                 else if (is.equals(invItem)) {
+                    int invSize = invItem.stackSize;
                     int confSize = (int) is.getStackSize();
-                    if (invItem.stackSize < confSize / 2f) {
-                        is.setStackSize(confSize - invItem.stackSize);
+                    if ((!this.isFullStockMode() && (invSize < confSize / 2f))
+                            || ((this.isFullStockMode()) && (invSize < confSize))) {
+                        is.setStackSize(confSize - invSize);
                         requestItem(is, i);
                     } else if (invItem.stackSize > confSize) {
                         returnItem(i, invItem.stackSize - confSize);
@@ -121,8 +183,28 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
                 returnItem(i, Integer.MAX_VALUE);
             }
         }
+    }
 
-        return TickRateModulation.SAME;
+    private void countFluids() {
+        if (this.needReCountStoredFluids) {
+            this.needReCountStoredFluids = false;
+            this.storedFluidCount = 0;
+            for (int i = 0; i < this.invFluids.getSlots(); i++) {
+                final IAEFluidStack fs = this.invFluids.getFluidInSlot(i);
+                if (fs != null) this.storedFluidCount += fs.getStackSize();
+            }
+        }
+    }
+
+    private void countItems() {
+        if (this.needReCountStoredItems) {
+            this.needReCountStoredItems = false;
+            this.storedItemCount = 0;
+            for (int i = 0; i < this.invItems.getSizeInventory(); i++) {
+                final ItemStack is = this.invItems.getStackInSlot(i);
+                if (is != null) this.storedItemCount += is.stackSize;
+            }
+        }
     }
 
     private void returnFluid(int index, long amount) {
@@ -134,6 +216,7 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
             if (notInserted != null) {
                 invFluids.fill(index, notInserted, true);
                 storedFluidCount += notInserted.getStackSize();
+                checkSlotsAccessible();
             }
         } catch (final GridAccessException ignored) {}
     }
@@ -148,6 +231,7 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
             if (extracted != null) {
                 storedFluidCount += extracted.getStackSize();
                 invFluids.fill(index, extracted, true);
+                checkSlotsAccessible();
             }
         } catch (final GridAccessException ignored) {}
     }
@@ -159,19 +243,25 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
                 is.stackSize = is.stackSize - amount;
                 is = is.copy();
                 is.stackSize = amount;
-                storedItemCount -= is.stackSize;
             } else {
                 invItems.setInventorySlotContents(index, null);
             }
 
+            this.storedItemCount -= is.stackSize;
+
             IAEItemStack notInserted = this.getProxy().getStorage().getItemInventory()
                     .injectItems(AEItemStack.create(is), Actionable.MODULATE, this.source);
             if (notInserted != null) {
-                ItemStack tempStack = invItems.getStackInSlot(index);
-                if (tempStack != null) {
+                if (invItems.getStackInSlot(index) != null) {
+                    ItemStack tempStack = invItems.getStackInSlot(index).copy();
                     tempStack.stackSize = tempStack.stackSize + (int) notInserted.getStackSize();
-                    storedItemCount += notInserted.getStackSize();
-                } else invItems.setInventorySlotContents(index, notInserted.getItemStack());
+                    invItems.setInventorySlotContents(index, tempStack);
+                    checkSlotsAccessible();
+                } else {
+                    invItems.setInventorySlotContents(index, notInserted.getItemStack());
+                    checkSlotsAccessible();
+                }
+                this.storedItemCount += notInserted.getStackSize();
             }
         } catch (final GridAccessException ignored) {}
     }
@@ -184,18 +274,160 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
             IAEItemStack extracted = this.getProxy().getStorage().getItemInventory()
                     .extractItems(is, Actionable.MODULATE, this.source);
             if (extracted != null) {
-                ItemStack tempStack = invItems.getStackInSlot(index);
-                if (tempStack != null) {
+                if (invItems.getStackInSlot(index) != null) {
+                    ItemStack tempStack = invItems.getStackInSlot(index).copy();
                     tempStack.stackSize = tempStack.stackSize + (int) extracted.getStackSize();
-                    storedItemCount += extracted.getStackSize();
-                } else invItems.setInventorySlotContents(index, extracted.getItemStack());
+                    invItems.setInventorySlotContents(index, tempStack);
+                    checkSlotsAccessible();
+
+                } else {
+                    invItems.setInventorySlotContents(index, extracted.getItemStack());
+                    checkSlotsAccessible();
+
+                }
+
+                this.storedItemCount += extracted.getStackSize();
             }
         } catch (final GridAccessException ignored) {}
     }
 
+    public boolean isFullStockMode() {
+        return this.isFullStockMode;
+    }
+
+    public void setFullStockMode(boolean fullStockMode) {
+
+        if (this.isFullStockMode == fullStockMode) return;
+
+        if (fullStockMode) this.modeChange = true;
+
+        this.isFullStockMode = fullStockMode;
+        checkSlotsAccessible();
+        this.modeChange = false;
+    }
+
+    public boolean isSlotsAccessible() {
+        return this.isSlotsAccessible;
+    }
+
+    public boolean isNeedsFullyStocked() {
+        return this.isNeedsFullyStocked;
+    }
+
+    public boolean hasModeChangedToTrue() {
+        return this.modeChange;
+    }
+
+    public void setSlotsAccessible() {
+        if (this.isFullStockMode()) {
+
+            if (this.hasModeChangedToTrue()) {
+
+                this.isSlotsAccessible = false;
+
+            }
+            if (this.isSlotsAccessible()) {
+
+                if ((this.needsFullyStocked())) this.isSlotsAccessible = false;
+
+            } else {
+
+                if (this.isFullyStocked()) this.isSlotsAccessible = true;
+
+            }
+
+        } else {
+
+            this.isSlotsAccessible = true;
+
+        }
+    }
+
+    public void checkSlotsAccessible() {
+        this.setSlotsAccessible();
+        this.notifyNeighbors();
+    }
+
+    private boolean needsFullyStocked() {
+        int configSlots = 0;
+        int emptySlots = 0;
+
+        for (int i = 0; i < 9; i++) {
+            IAEStack<?> config = configFluids.getAEStackInSlot(i);
+
+            if (config instanceof IAEFluidStack cfg) {
+                configSlots++;
+                IAEFluidStack inv = invFluids.getFluidInSlot(i);
+
+                if (inv == null) {
+                    emptySlots++;
+                }
+            }
+        }
+
+        for (int i = 0; i < 63; i++) {
+            IAEStack<?> config = configItems.getAEStackInSlot(i);
+
+            if (config instanceof IAEItemStack cfg) {
+                configSlots++;
+                ItemStack inv = invItems.getStackInSlot(i);
+
+                if (inv == null) {
+                    emptySlots++;
+                }
+            }
+        }
+
+        this.isNeedsFullyStocked = (emptySlots == configSlots) && (configSlots > 0);
+
+        return isNeedsFullyStocked;
+    }
+
+    private boolean isFullyStocked() {
+
+        for (int i = 0; i < 9; i++) {
+            IAEStack<?> config = configFluids.getAEStackInSlot(i);
+
+            if (config instanceof IAEFluidStack cfg) {
+                IAEFluidStack cfgFis = cfg.copy();
+                IAEFluidStack inv = invFluids.getFluidInSlot(i);
+
+                if (inv == null || inv.getStackSize() < cfgFis.getStackSize()) {
+                    return false;
+                }
+            }
+        }
+
+        for (int i = 0; i < 63; i++) {
+            IAEStack<?> config = configItems.getAEStackInSlot(i);
+
+            if (config instanceof IAEItemStack cfg) {
+                IAEItemStack cfgIs = cfg.copy();
+                ItemStack inv = invItems.getStackInSlot(i);
+
+                if (inv == null || inv.stackSize < (int) cfgIs.getStackSize()) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
     @Override
     public int[] getAccessibleSlotsBySide(ForgeDirection whichSide) {
-        return IntStream.rangeClosed(0, 62).toArray();
+        return ((this.isSlotsAccessible()) ? IntStream.rangeClosed(0, 62).toArray() : new int[0]);
+    }
+
+    @Override
+    public boolean canExtractItem(int slotIndex, ItemStack itemStackIn, int side) {
+        return this.isSlotsAccessible();
+    }
+
+    public void notifyNeighbors() {
+        if (this.getWorldObj() != null) {
+            this.markDirty();
+            this.getWorldObj().notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType());
+        }
     }
 
     @Nonnull
@@ -204,12 +436,12 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
         return invItems;
     }
 
-    public AppEngInternalAEInventory getConfigFluid() {
-        return configFluids;
+    public IAEStackInventory getConfigFluids() {
+        return this.configFluids;
     }
 
-    public AppEngInternalAEInventory getConfigItems() {
-        return configItems;
+    public IAEStackInventory getConfigItems() {
+        return this.configItems;
     }
 
     public AppEngInternalInventory getCell() {
@@ -217,6 +449,9 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
     }
 
     public long getFreeBytes() {
+        this.countFluids();
+        this.countItems();
+
         return totalBytes - (((storedItemCount + getUnusedItemCount()) / 8)
                 + ((storedFluidCount + getUnusedFluidCount()) / 2048));
     }
@@ -257,24 +492,12 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
             case setInventorySlotContents -> {
                 if (inv == cell) {
                     if (added != null) {
-                        if (added.getItem() instanceof ItemBasicStorageCell ibsc) {
-                            totalBytes = ibsc.getBytesLong(added);
-                        } else if (added.getItem() instanceof FCBaseItemCell fcbic) {
-                            totalBytes = fcbic.getBytes(added);
-                        }
+                        if (added.getItem() instanceof IStorageCell isc) totalBytes = isc.getBytesLong(added);
                         getProxy().setIdlePowerUsage(Math.sqrt(Math.pow(totalBytes, 0.576D)));
                     } else if (removed != null) {
                         totalBytes = 0;
                         getProxy().setIdlePowerUsage(4d);
                     }
-                } else if (inv == invItems) {
-                    if (added != null) {
-                        storedItemCount += added.stackSize;
-                    }
-
-                    if (removed != null) {
-                        storedItemCount -= removed.stackSize;
-                    }
                 }
             }
             case decreaseStackSize -> {
@@ -282,10 +505,6 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
                     totalBytes = 0;
                     getProxy().setIdlePowerUsage(4d);
                 }
-
-                if (inv == invItems) {
-                    storedItemCount -= removed.stackSize;
-                }
             }
             case markDirty -> markDirty();
         }
@@ -296,7 +515,7 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
             AELog.error(e, "Couldn't wake up level emitter for delayed updates");
         }
 
-        markForUpdate();
+        checkSlotsAccessible();
     }
 
     public void fullRefund() {
@@ -315,12 +534,26 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
 
     @Override
     public void getDrops(World w, int x, int y, int z, List<ItemStack> drops) {
+        this.fullRefund();
+
         if (cell.getStackInSlot(0) != null) drops.add(cell.getStackInSlot(0));
+        final ItemStack container = AEApi.instance().definitions().items().itemMEStackPacket().maybeStack(1).get();
+
         for (int i = 0; i < 9; i++) {
-            ItemStack ifp = ItemFluidPacket.newStack(invFluids.getFluidStackInSlot(i));
-            if (ifp != null) drops.add(ifp);
+            final FluidStack fs = this.invFluids.getFluidStackInSlot(i);
+            if (fs == null) continue;
+            final ItemStack temp = container.copy();
+            Platform.writeStackNBT(AEFluidStack.create(fs), ItemStackNBT.get(temp));
+            drops.add(temp);
+        }
+
+        for (int i = 0; i < 63; i++) {
+            final ItemStack is = this.invItems.getStackInSlot(i);
+            if (is == null) continue;
+            final ItemStack temp = container.copy();
+            Platform.writeStackNBT(AEItemStack.create(is), ItemStackNBT.get(temp));
+            drops.add(temp);
         }
-        super.getDrops(w, x, y, z, drops);
     }
 
     @Override
@@ -335,16 +568,12 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
 
     @Override
     public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
-        FluidStack fs = invFluids.drain(from, resource, doDrain);
-        if (doDrain && fs != null) storedFluidCount -= fs.amount;
-        return fs;
+        return (this.isFullStockMode() && !this.isSlotsAccessible()) ? null : invFluids.drain(from, resource, doDrain);
     }
 
     @Override
     public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
-        FluidStack fs = invFluids.drain(from, maxDrain, doDrain);
-        if (doDrain && fs != null) storedFluidCount -= fs.amount;
-        return fs;
+        return (this.isFullStockMode() && !this.isSlotsAccessible()) ? null : invFluids.drain(from, maxDrain, doDrain);
     }
 
     @Override
@@ -354,18 +583,19 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
 
     @Override
     public boolean canDrain(ForgeDirection from, Fluid fluid) {
-        return invFluids.canDrain(from, fluid);
+        return (this.isFullStockMode() && !this.isSlotsAccessible()) ? false : invFluids.canDrain(from, fluid);
     }
 
     @Override
     public FluidTankInfo[] getTankInfo(ForgeDirection from) {
-        return invFluids.getTankInfo(from);
+        return (this.isFullStockMode() && !this.isSlotsAccessible()) ? new FluidTankInfo[0]
+                : invFluids.getTankInfo(from);
     }
 
     @Override
     public void onFluidInventoryChanged(IAEFluidTank inv, int slot) {
-        saveChanges();
-        markForUpdate();
+        this.markDirty();
+        checkSlotsAccessible();
     }
 
     @Override
@@ -376,42 +606,74 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
     @TileEvent(TileEventType.NETWORK_READ)
     public boolean readFromStream_TileSuperStockReplenisher(final ByteBuf data) {
         final boolean oldPower = isPowered;
+        final AEColor oldPaintedColor = this.paintedColor;
         isPowered = data.readBoolean();
-        return isPowered != oldPower;
+        this.paintedColor = AEColor.fromOrdinal(data.readByte());
+        this.getProxy().setColor(this.paintedColor);
+        return isPowered != oldPower || this.paintedColor != oldPaintedColor;
     }
 
     @TileEvent(TileEventType.NETWORK_WRITE)
     public void writeToStream_TileSuperStockReplenisher(final ByteBuf data) {
         data.writeBoolean(isActive());
+        data.writeByte(this.paintedColor.ordinal());
     }
 
     @TileEvent(TileEventType.WORLD_NBT_READ)
     public void readFromNBTEvent(NBTTagCompound data) {
+        final int color = data.hasKey("paintedColor", Constants.NBT.TAG_BYTE) ? data.getByte("paintedColor")
+                : AEColor.Transparent.ordinal();
+        this.paintedColor = color >= 0 && color < AEColor.VALUES.length ? AEColor.fromOrdinal(color)
+                : AEColor.Transparent;
+        this.getProxy().setColor(this.paintedColor);
         invItems.readFromNBT(data, "ItemInv");
         invFluids.readFromNBT(data, "FluidInv");
         configItems.readFromNBT(data, "configItems");
         configFluids.readFromNBT(data, "configFluids");
         cell.readFromNBT(data, "cellHolder");
+        isFullStockMode = data.getBoolean("isFullStockMode");
+        checkSlotsAccessible();
+        isSlotsAccessible = data.getBoolean("isSlotsAccessible");
         totalBytes = data.getLong("totalBytes");
-        storedFluidCount = data.getLong("storedFluidCount");
-        storedItemCount = data.getLong("storedItemCount");
         getProxy().setIdlePowerUsage(data.getDouble("powerDraw"));
     }
 
     @TileEvent(TileEventType.WORLD_NBT_WRITE)
     public NBTTagCompound writeToNBTEvent(NBTTagCompound data) {
+        data.setByte("paintedColor", (byte) this.paintedColor.ordinal());
         invItems.writeToNBT(data, "ItemInv");
         invFluids.writeToNBT(data, "FluidInv");
         configItems.writeToNBT(data, "configItems");
         configFluids.writeToNBT(data, "configFluids");
         cell.writeToNBT(data, "cellHolder");
+        data.setBoolean("isFullStockMode", isFullStockMode);
+        data.setBoolean("isSlotsAccessible", isSlotsAccessible);
         data.setLong("totalBytes", totalBytes);
-        data.setLong("storedFluidCount", storedFluidCount);
-        data.setLong("storedItemCount", storedItemCount);
         data.setDouble("powerDraw", getProxy().getIdlePowerUsage());
         return data;
     }
 
+    @Override
+    public AEColor getColor() {
+        return this.paintedColor;
+    }
+
+    @Override
+    public boolean recolourBlock(final ForgeDirection side, final AEColor newPaintedColor, final EntityPlayer who) {
+        if (this.paintedColor == newPaintedColor) {
+            return false;
+        }
+        this.paintedColor = newPaintedColor;
+        this.getProxy().setColor(this.paintedColor);
+        final IGridNode node = this.getGridNode(side);
+        if (node != null) {
+            node.updateState();
+        }
+        this.markDirty();
+        this.markForUpdate();
+        return true;
+    }
+
     @MENetworkEventSubscribe
     public void stateChange(final MENetworkPowerStatusChange p) {
         this.updatePowerState();
@@ -457,7 +719,7 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
 
     @Override
     public TickingRequest getTickingRequest(IGridNode node) {
-        return new TickingRequest(120, 120, false, false);
+        return new TickingRequest(10, 120, false, false);
     }
 
     @Override
@@ -479,4 +741,18 @@ public class TileSuperStockReplenisher extends AENetworkInvTile
     public IConfigManager getConfigManager() {
         return null;
     }
+
+    @Override
+    public void saveAEStackInv() {
+        this.markDirty();
+    }
+
+    @Override
+    public IAEStackInventory getAEInventoryByName(StorageName name) {
+        return switch (name) {
+            case NONE -> this.configFluids;
+            case CONFIG -> this.configItems;
+            default -> null;
+        };
+    }
 }

src/main/java/com/glodblock/github/coremod/FCClassTransformer.java

@@ -1,55 +0,0 @@
-package com.glodblock.github.coremod;
-
-import net.minecraft.launchwrapper.IClassTransformer;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-
-import com.glodblock.github.coremod.transform.ExternalStorageRegistryTransformer;
-import com.glodblock.github.coremod.transform.GuiCraftingTransformer;
-import com.glodblock.github.coremod.transform.NEITransformer;
-import com.gtnewhorizon.gtnhlib.asm.ASMUtil;
-
-public class FCClassTransformer implements IClassTransformer {
-
-    private static final Logger logger = LogManager.getLogger("ASM AE2FC");
-
-    @Override
-    public byte[] transform(String name, String transformedName, byte[] basicClass) {
-        ClassMapper tform;
-        switch (transformedName) {
-            case "appeng.client.gui.implementations.GuiCraftingCPU", "appeng.client.gui.implementations.GuiCraftConfirm", "net.p455w0rd.wirelesscraftingterminal.client.gui.GuiCraftConfirm", "appeng.client.gui.widgets.GuiCraftingTree" -> tform = GuiCraftingTransformer.INSTANCE;
-            case "appeng.integration.modules.NEI" -> tform = NEITransformer.INSTANCE;
-            case "appeng.core.features.registries.ExternalStorageRegistry" -> tform = ExternalStorageRegistryTransformer.INSTANCE;
-            default -> {
-                return basicClass;
-            }
-        }
-        logger.debug("Transforming class: " + transformedName);
-        final byte[] bytes = tform.transformClass(basicClass);
-        if (FluidCraftCore.DUMP_CLASSES()) {
-            ASMUtil.saveAsRawClassFile(basicClass, transformedName + "_PRE", this);
-            ASMUtil.saveAsRawClassFile(bytes, transformedName + "_POST", this);
-        }
-        return bytes;
-    }
-
-    public abstract static class ClassMapper {
-
-        public final byte[] transformClass(byte[] code) {
-            ClassReader reader = new ClassReader(code);
-            ClassWriter writer = new ClassWriter(reader, getWriteFlags());
-            reader.accept(getClassMapper(writer), ClassReader.EXPAND_FRAMES);
-            return writer.toByteArray();
-        }
-
-        protected int getWriteFlags() {
-            return 0;
-        }
-
-        protected abstract ClassVisitor getClassMapper(ClassVisitor downstream);
-    }
-}

src/main/java/com/glodblock/github/coremod/FluidCraftCore.java

@@ -1,48 +0,0 @@
-package com.glodblock.github.coremod;
-
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
-
-@IFMLLoadingPlugin.Name("FluidCraftCore")
-@IFMLLoadingPlugin.MCVersion("1.7.10")
-@IFMLLoadingPlugin.TransformerExclusions("com.glodblock.github.coremod")
-public class FluidCraftCore implements IFMLLoadingPlugin {
-
-    private static final boolean DUMP_CLASSES = Boolean.parseBoolean(System.getProperty("ae2fc.dumpClass", "false"));
-    private static boolean OBF_ENV;
-
-    @Override
-    public String[] getASMTransformerClass() {
-        return new String[] { FCClassTransformer.class.getName() };
-    }
-
-    @Nullable
-    @Override
-    public String getModContainerClass() {
-        return null;
-    }
-
-    @Nullable
-    @Override
-    public String getSetupClass() {
-        return null;
-    }
-
-    @Override
-    public void injectData(Map<String, Object> data) {
-        OBF_ENV = (boolean) data.get("runtimeDeobfuscationEnabled");
-    }
-
-    @Nullable
-    @Override
-    public String getAccessTransformerClass() {
-        return null;
-    }
-
-    public static boolean DUMP_CLASSES() {
-        return DUMP_CLASSES || !OBF_ENV;
-    }
-}

src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java

@@ -1,28 +0,0 @@
-package com.glodblock.github.coremod.hooker;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-import com.glodblock.github.common.item.ItemFluidDrop;
-import com.glodblock.github.common.item.ItemFluidPacket;
-
-import appeng.api.storage.data.IAEItemStack;
-import appeng.client.gui.IGuiTooltipHandler;
-
-public class CoreModHooks {
-
-    public static ItemStack displayFluid(IAEItemStack aeStack) {
-        if (aeStack.getItemStack() != null && aeStack.getItemStack().getItem() instanceof ItemFluidDrop) {
-            FluidStack fluid = ItemFluidDrop.getFluidStack(aeStack.getItemStack());
-            return ItemFluidPacket.newDisplayStack(fluid);
-        } else return aeStack.getItemStack();
-    }
-
-    public static ItemStack getStackUnderMouse(GuiContainer gui, int mousex, int mousey) {
-        if (gui instanceof IGuiTooltipHandler guiTooltipHandler) {
-            return guiTooltipHandler.getHoveredStack();
-        }
-        return null;
-    }
-}

src/main/java/com/glodblock/github/coremod/hooker/CoreModHooksClient.java

@@ -1,9 +0,0 @@
-package com.glodblock.github.coremod.hooker;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class CoreModHooksClient {
-
-}

src/main/java/com/glodblock/github/coremod/transform/ExternalStorageRegistryTransformer.java

@@ -1,104 +0,0 @@
-package com.glodblock.github.coremod.transform;
-
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-import com.glodblock.github.coremod.FCClassTransformer;
-
-public class ExternalStorageRegistryTransformer extends FCClassTransformer.ClassMapper {
-
-    public static final ExternalStorageRegistryTransformer INSTANCE = new ExternalStorageRegistryTransformer();
-
-    private ExternalStorageRegistryTransformer() {
-        // NO-OP
-    }
-
-    @Override
-    protected ClassVisitor getClassMapper(ClassVisitor downstream) {
-        return new TransformExternalStorageRegistry(Opcodes.ASM5, downstream);
-    }
-
-    @Override
-    protected int getWriteFlags() {
-        return ClassWriter.COMPUTE_FRAMES;
-    }
-
-    private static class TransformExternalStorageRegistry extends ClassVisitor {
-
-        public TransformExternalStorageRegistry(int api, ClassVisitor cv) {
-            super(api, cv);
-        }
-
-        @Override
-        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-            if ("getHandler".equals(name)) {
-                return new TransformGetHandler(api, super.visitMethod(access, name, desc, signature, exceptions));
-            } else {
-                return super.visitMethod(access, name, desc, signature, exceptions);
-            }
-        }
-    }
-
-    private static class TransformGetHandler extends MethodVisitor {
-
-        private int cnt_return = 0;
-        private int cnt_if = 0;
-        private Label L6 = null;
-        private final Label L9 = new Label();
-
-        TransformGetHandler(int api, MethodVisitor mv) {
-            super(api, mv);
-        }
-
-        @Override
-        public void visitJumpInsn(int opcode, Label label) {
-            if (opcode == Opcodes.IFEQ) {
-                cnt_if++;
-            }
-            if (cnt_if == 3) {
-                L6 = label;
-                cnt_if++;
-                super.visitJumpInsn(opcode, L9);
-                return;
-            }
-            super.visitJumpInsn(opcode, label);
-        }
-
-        @Override
-        public void visitInsn(int opcode) {
-            if (opcode == Opcodes.ARETURN) {
-                cnt_return++;
-            }
-            super.visitInsn(opcode);
-            if (cnt_return == 2) {
-                super.visitLabel(L9);
-                super.visitFieldInsn(
-                        Opcodes.GETSTATIC,
-                        "com/glodblock/github/inventory/external/AEFluidTankHandler",
-                        "INSTANCE",
-                        "Lcom/glodblock/github/inventory/external/AEFluidTankHandler;");
-                super.visitVarInsn(Opcodes.ALOAD, 1);
-                super.visitVarInsn(Opcodes.ALOAD, 2);
-                super.visitVarInsn(Opcodes.ALOAD, 3);
-                super.visitVarInsn(Opcodes.ALOAD, 4);
-                super.visitMethodInsn(
-                        Opcodes.INVOKEVIRTUAL,
-                        "com/glodblock/github/inventory/external/AEFluidTankHandler",
-                        "canHandle",
-                        "(Lnet/minecraft/tileentity/TileEntity;Lnet/minecraftforge/common/util/ForgeDirection;Lappeng/api/storage/StorageChannel;Lappeng/api/networking/security/BaseActionSource;)Z",
-                        false);
-                super.visitJumpInsn(Opcodes.IFEQ, L6);
-                super.visitFieldInsn(
-                        Opcodes.GETSTATIC,
-                        "com/glodblock/github/inventory/external/AEFluidTankHandler",
-                        "INSTANCE",
-                        "Lcom/glodblock/github/inventory/external/AEFluidTankHandler;");
-                super.visitInsn(Opcodes.ARETURN);
-                cnt_return++;
-            }
-        }
-    }
-}

src/main/java/com/glodblock/github/coremod/transform/GuiCraftingTransformer.java

@@ -1,58 +0,0 @@
-package com.glodblock.github.coremod.transform;
-
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-import com.glodblock.github.coremod.FCClassTransformer;
-
-public class GuiCraftingTransformer extends FCClassTransformer.ClassMapper {
-
-    public static final GuiCraftingTransformer INSTANCE = new GuiCraftingTransformer();
-
-    private GuiCraftingTransformer() {
-        // NO-OP
-    }
-
-    @Override
-    protected ClassVisitor getClassMapper(ClassVisitor downstream) {
-        return new TransformGuiCrafting(Opcodes.ASM5, downstream);
-    }
-
-    private static class TransformGuiCrafting extends ClassVisitor {
-
-        TransformGuiCrafting(int api, ClassVisitor cv) {
-            super(api, cv);
-        }
-
-        @Override
-        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-            if ("drawFG".equals(name) || "drawListFG".equals(name) || "drawStack".equals(name)) {
-                return new TransformFluidIcon(api, super.visitMethod(access, name, desc, signature, exceptions));
-            }
-            return super.visitMethod(access, name, desc, signature, exceptions);
-        }
-    }
-
-    private static class TransformFluidIcon extends MethodVisitor {
-
-        TransformFluidIcon(int api, MethodVisitor mv) {
-            super(api, mv);
-        }
-
-        @Override
-        public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
-            if (opcode == Opcodes.INVOKEINTERFACE && owner.equals("appeng/api/storage/data/IAEItemStack")
-                    && name.equals("getItemStack")) {
-                super.visitMethodInsn(
-                        Opcodes.INVOKESTATIC,
-                        "com/glodblock/github/coremod/hooker/CoreModHooks",
-                        "displayFluid",
-                        "(Lappeng/api/storage/data/IAEItemStack;)Lnet/minecraft/item/ItemStack;",
-                        false);
-            } else {
-                super.visitMethodInsn(opcode, owner, name, desc, itf);
-            }
-        }
-    }
-}

src/main/java/com/glodblock/github/coremod/transform/NEITransformer.java

@@ -1,93 +0,0 @@
-package com.glodblock.github.coremod.transform;
-
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-import com.glodblock.github.coremod.FCClassTransformer;
-
-public class NEITransformer extends FCClassTransformer.ClassMapper {
-
-    public static final NEITransformer INSTANCE = new NEITransformer();
-
-    private NEITransformer() {
-        // NO-OP
-    }
-
-    @Override
-    protected ClassVisitor getClassMapper(ClassVisitor downstream) {
-        return new TransformNEI(Opcodes.ASM5, downstream);
-    }
-
-    private static class TransformNEI extends ClassVisitor {
-
-        TransformNEI(int api, ClassVisitor cv) {
-            super(api, cv);
-        }
-
-        @Override
-        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-            return switch (name) {
-                case "getStackUnderMouse" -> new TransformStackUnderMouse(
-                        api,
-                        super.visitMethod(access, name, desc, signature, exceptions));
-                case "shouldShowTooltip" -> new TransformShowTooltip(
-                        api,
-                        super.visitMethod(access, name, desc, signature, exceptions));
-                default -> super.visitMethod(access, name, desc, signature, exceptions);
-            };
-        }
-    }
-
-    private static class TransformStackUnderMouse extends MethodVisitor {
-
-        TransformStackUnderMouse(int api, MethodVisitor mv) {
-            super(api, mv);
-        }
-
-        @Override
-        public void visitInsn(int opcode) {
-            if (opcode == Opcodes.ACONST_NULL) {
-                super.visitVarInsn(Opcodes.ALOAD, 1);
-                super.visitVarInsn(Opcodes.ILOAD, 2);
-                super.visitVarInsn(Opcodes.ILOAD, 3);
-                super.visitMethodInsn(
-                        Opcodes.INVOKESTATIC,
-                        "com/glodblock/github/coremod/hooker/CoreModHooks",
-                        "getStackUnderMouse",
-                        "(Lnet/minecraft/client/gui/inventory/GuiContainer;II)Lnet/minecraft/item/ItemStack;",
-                        false);
-                return;
-            }
-            super.visitInsn(opcode);
-        }
-    }
-
-    private static class TransformShowTooltip extends MethodVisitor {
-
-        int const_1 = 0;
-
-        TransformShowTooltip(int api, MethodVisitor mv) {
-            super(api, mv);
-        }
-
-        @Override
-        public void visitInsn(int opcode) {
-            if (opcode == Opcodes.ICONST_1 && const_1 == 2) {
-                super.visitVarInsn(Opcodes.ALOAD, 1);
-                super.visitMethodInsn(
-                        Opcodes.INVOKESTATIC,
-                        "com/glodblock/github/coremod/hooker/CoreModHooks",
-                        "shouldShowTooltip",
-                        "(Lnet/minecraft/client/gui/inventory/GuiContainer;)Z",
-                        false);
-                const_1++;
-                return;
-            }
-            if (opcode == Opcodes.ICONST_1) {
-                const_1++;
-            }
-            super.visitInsn(opcode);
-        }
-    }
-}

src/main/java/com/glodblock/github/crossmod/opencomputers/DriverDualFluidInterface.java

@@ -13,7 +13,7 @@ import com.glodblock.github.util.DualityFluidInterface;
 import com.glodblock.github.util.NameConst;
 import com.glodblock.github.util.Util;
 
-import appeng.api.parts.IPartHost;
+import appeng.util.Platform;
 import li.cil.oc.api.driver.EnvironmentProvider;
 import li.cil.oc.api.driver.NamedBlock;
 import li.cil.oc.api.driver.SidedBlock;
@@ -104,20 +104,19 @@ public class DriverDualFluidInterface implements SidedBlock {
             if (te instanceof TileFluidInterface) {
                 return true;
             }
-            if (te instanceof IPartHost) {
-                return ((IPartHost) te).getPart(face) instanceof PartFluidInterface;
-            }
+
+            return Platform.getPartFromTE(te, face) instanceof PartFluidInterface;
         }
         return false;
     }
 
     private static DualityFluidInterface getInterface(TileEntity te, ForgeDirection face) {
         if (te != null) {
-            if (te instanceof TileFluidInterface) {
-                return ((TileFluidInterface) te).getDualityFluid();
+            if (te instanceof TileFluidInterface tile) {
+                return tile.getDualityFluid();
             }
-            if (te instanceof IPartHost && ((IPartHost) te).getPart(face) instanceof PartFluidInterface) {
-                return ((PartFluidInterface) ((IPartHost) te).getPart(face)).getDualityFluid();
+            if (Platform.getPartFromTE(te, face) instanceof PartFluidInterface part) {
+                return part.getDualityFluid();
             }
         }
         return null;

src/main/java/com/glodblock/github/crossmod/thaumcraft/AspectRender.java

@@ -1,38 +0,0 @@
-package com.glodblock.github.crossmod.thaumcraft;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.ResourceLocation;
-
-import org.lwjgl.opengl.GL11;
-
-import com.glodblock.github.util.RenderUtil;
-
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.client.lib.UtilsFX;
-
-public class AspectRender {
-
-    public static final ResourceLocation UNKNOWN_TEXTURE = new ResourceLocation(
-            "thaumcraft",
-            "textures/aspects/_unknown.png");
-
-    public static void drawAspect(EntityPlayer player, int posX, int posY, float zLevel, Aspect aspect, long amount) {
-        if (aspect == null || amount <= 0) {
-            return;
-        }
-        if (AspectUtil.isPlayerDiscoveredAspect(player, aspect)) {
-            UtilsFX.drawTag(posX, posY, aspect, 0, 0, zLevel);
-        } else {
-            Minecraft.getMinecraft().renderEngine.bindTexture(UNKNOWN_TEXTURE);
-            RenderUtil.setGLColorFromInt(aspect.getColor());
-            GL11.glDisable(GL11.GL_LIGHTING);
-            GL11.glEnable(GL11.GL_BLEND);
-            GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-            UtilsFX.drawTexturedQuadFull(posX, posY, zLevel);
-            GL11.glEnable(GL11.GL_LIGHTING);
-            GL11.glDisable(GL11.GL_BLEND);
-        }
-    }
-
-}

src/main/java/com/glodblock/github/crossmod/thaumcraft/AspectUtil.java

@@ -1,154 +0,0 @@
-package com.glodblock.github.crossmod.thaumcraft;
-
-import java.util.Objects;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.MutablePair;
-
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.util.item.AEFluidStack;
-import cpw.mods.fml.common.Optional;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.IEssentiaContainerItem;
-import thaumcraft.common.Thaumcraft;
-import thaumicenergistics.api.ThEApi;
-import thaumicenergistics.api.storage.IAspectStack;
-import thaumicenergistics.common.fluids.GaseousEssentia;
-import thaumicenergistics.common.integration.tc.EssentiaItemContainerHelper;
-import thaumicenergistics.common.storage.AspectStack;
-
-public class AspectUtil {
-
-    public static final EssentiaItemContainerHelper HELPER = EssentiaItemContainerHelper.INSTANCE;
-    public static int R = 128;
-
-    @Optional.Method(modid = "thaumicenergistics")
-    public static void init() {
-        R = ThEApi.instance().config().conversionMultiplier();
-    }
-
-    public static boolean isPlayerDiscoveredAspect(final EntityPlayer player, final Aspect aspect) {
-        if (player != null && aspect != null) {
-            return Thaumcraft.proxy.getPlayerKnowledge().hasDiscoveredAspect(player.getCommandSenderName(), aspect);
-        }
-        return false;
-    }
-
-    public static boolean isEssentiaGas(Fluid fluid) {
-        return fluid instanceof GaseousEssentia;
-    }
-
-    public static boolean isEssentiaGas(FluidStack fluid) {
-        return fluid != null && fluid.getFluid() instanceof GaseousEssentia;
-    }
-
-    public static boolean isEssentiaGas(IAEFluidStack fluid) {
-        return fluid != null && fluid.getFluid() instanceof GaseousEssentia;
-    }
-
-    public static Aspect getAspectFromGas(FluidStack fluid) {
-        if (!isEssentiaGas(fluid)) {
-            return null;
-        }
-        GaseousEssentia gas = (GaseousEssentia) fluid.getFluid();
-        return gas.getAspect();
-    }
-
-    public static Aspect getAspectFromJar(ItemStack stack) {
-        if (isEssentiaContainer(stack)) {
-            return HELPER.getAspectInContainer(stack);
-        }
-        return null;
-    }
-
-    public static Aspect getAspectFromGas(IAEFluidStack fluid) {
-        if (isEssentiaGas(fluid)) {
-            return null;
-        }
-        GaseousEssentia gas = (GaseousEssentia) fluid.getFluid();
-        return gas.getAspect();
-    }
-
-    public static FluidStack getGasFromAspect(IAspectStack aspectStack) {
-        if (aspectStack == null || aspectStack.isEmpty()) return null;
-        return new FluidStack(
-                GaseousEssentia.getGasFromAspect(aspectStack.getAspect()),
-                (int) aspectStack.getStackSize() * R);
-    }
-
-    public static boolean isEssentiaContainer(ItemStack stack) {
-        return HELPER.getItemType(stack) != EssentiaItemContainerHelper.AspectItemType.Invalid
-                && HELPER.getItemType(stack) != EssentiaItemContainerHelper.AspectItemType.ItemAspect;
-    }
-
-    public static AEFluidStack getAEGasFromContainer(ItemStack stack) {
-        if (isEssentiaContainer(stack) && !isEmptyEssentiaContainer(stack)) {
-            IAspectStack aspectStack = HELPER.getAspectStackFromContainer(stack);
-            aspectStack.setStackSize(stack.stackSize * aspectStack.getStackSize());
-            FluidStack gas = getGasFromAspect(aspectStack);
-            return AEFluidStack.create(gas);
-        }
-        return null;
-    }
-
-    public static boolean isEmptyEssentiaContainer(ItemStack stack) {
-        return HELPER.isContainerEmpty(stack) && isEssentiaContainer(stack);
-    }
-
-    public static ItemStack setAspectAmount(ItemStack itemStack, int amount, Aspect aspect) {
-        if (isEssentiaContainer(itemStack)) {
-            IEssentiaContainerItem container = (IEssentiaContainerItem) itemStack.getItem();
-            assert container != null;
-            container.getAspects(itemStack).aspects.put(aspect, amount);
-            return itemStack;
-        }
-        return null;
-    }
-
-    public static MutablePair<Integer, ItemStack> fillEssentiaFromGas(ItemStack itemStack, FluidStack fluid) {
-        if (isEssentiaContainer(itemStack) && isEssentiaGas(fluid)) {
-            if (itemStack.stackSize != 1) {
-                return null;
-            }
-            Aspect aspect = getAspectFromGas(fluid);
-            int amount = fluid.amount / R;
-            EssentiaItemContainerHelper.AspectItemType iType = HELPER.getItemType(itemStack);
-            if (iType == EssentiaItemContainerHelper.AspectItemType.JarLabel) {
-                ItemStack label = itemStack.copy();
-                HELPER.setLabelAspect(label, aspect);
-            }
-            int cap = HELPER.getContainerCapacity(itemStack);
-            int tryFill = Math.min(cap, amount);
-            ImmutablePair<Integer, ItemStack> result = HELPER
-                    .injectIntoContainer(itemStack, new AspectStack(aspect, tryFill));
-            return result != null ? new MutablePair<>(result.left * R, result.right) : null;
-        }
-        return null;
-    }
-
-    public static MutablePair<Integer, ItemStack> drainEssentiaFromGas(ItemStack itemStack, FluidStack fluid) {
-        if (isEssentiaContainer(itemStack) && isEssentiaGas(fluid)) {
-            Aspect aspect = getAspectFromGas(fluid);
-            int amount = fluid.amount / R;
-            IAspectStack contents = HELPER.getAspectStackFromContainer(itemStack);
-            int drained;
-            ItemStack stack = null;
-            if (contents == null || !Objects.equals(contents.getAspect(), aspect)) {
-                drained = 0;
-            } else {
-                ImmutablePair<Integer, ItemStack> result = HELPER
-                        .extractFromContainer(itemStack, new AspectStack(aspect, amount));
-                drained = result == null ? 0 : result.left;
-                stack = result == null ? null : result.right;
-            }
-            return stack == null ? null : new MutablePair<>(drained * R, stack);
-        }
-        return null;
-    }
-
-}

src/main/java/com/glodblock/github/crossmod/thaumcraft/ThaumicEnergisticsCrafting.java

@@ -1,9 +1,5 @@
 package com.glodblock.github.crossmod.thaumcraft;
 
-import java.util.Objects;
-
-import javax.annotation.Nullable;
-
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -11,14 +7,10 @@ import net.minecraft.nbt.NBTTagList;
 
 import com.glodblock.github.util.ModAndClassUtil;
 
-import appeng.api.networking.IGrid;
+import appeng.api.storage.data.AEStackTypeRegistry;
 import appeng.api.storage.data.IAEItemStack;
-import appeng.util.item.AEItemStack;
-import cpw.mods.fml.common.Optional.Method;
+import appeng.api.storage.data.IAEStack;
 import cpw.mods.fml.common.registry.GameRegistry;
-import thaumcraft.api.aspects.Aspect;
-import thaumicenergistics.api.grid.IEssentiaGrid;
-import thaumicenergistics.common.items.ItemCraftingAspect;
 
 public class ThaumicEnergisticsCrafting {
 
@@ -39,8 +31,24 @@ public class ThaumicEnergisticsCrafting {
         return stack.getItem() == neiAddonAspect || stack.getItem() == thaumicEnergisticsAspect;
     }
 
-    @Method(modid = "thaumicenergistics")
-    private static @Nullable Aspect getAspect(ItemStack stack) {
+    public static IAEStack<?> convertItemAspectStack(IAEStack<?> stack) {
+        if (AEStackTypeRegistry.getType("essentia") == null) return stack;
+
+        if (stack instanceof IAEItemStack ais && isAspectStack(ais.getItemStack())) {
+            String aspectTag = getAspectTag(ais.getItemStack());
+            if (aspectTag == null || aspectTag.isEmpty()) return stack;
+
+            NBTTagCompound tag = new NBTTagCompound();
+            tag.setString("StackType", "essentia");
+            tag.setString("AspectTag", aspectTag);
+            tag.setLong("Cnt", stack.getStackSize());
+            return IAEStack.fromNBTGeneric(tag);
+        } else {
+            return stack;
+        }
+    }
+
+    private static String getAspectTag(ItemStack stack) {
         if (stack == null) return null;
 
         if (stack.getItem() == neiAddonAspect) {
@@ -50,62 +58,16 @@ public class ThaumicEnergisticsCrafting {
             String aspect = aspects.getCompoundTagAt(0).getString("key");
             if (aspect.isEmpty()) return null;
 
-            return Aspect.getAspect(aspect);
+            return aspect;
         }
 
         if (stack.getItem() == thaumicEnergisticsAspect) {
-            return Aspect.getAspect(ItemCraftingAspect.getAspect(stack).getTag());
+            NBTTagCompound tag = stack.getTagCompound();
+            if (tag != null && tag.hasKey("Aspect")) {
+                return tag.getString("Aspect");
+            }
         }
 
         return null;
     }
-
-    @Method(modid = "thaumicenergistics")
-    private static ItemStack getAspectStack(Aspect aspect, int stackSize) {
-        return ItemCraftingAspect.createStackForAspect(aspect, stackSize);
-    }
-
-    /**
-     * Converts an aspect stack into a thaumic energistics stack.
-     */
-    public static IAEItemStack convertAspectStack(IAEItemStack stack) {
-        if (ModAndClassUtil.ThE) {
-            return convertAspectStackImpl(stack);
-        } else {
-            return stack;
-        }
-    }
-
-    @Method(modid = "thaumicenergistics")
-    private static IAEItemStack convertAspectStackImpl(IAEItemStack stack) {
-        if (stack == null) return null;
-
-        Aspect aspect = getAspect(stack.getItemStack());
-
-        if (aspect == null) return stack;
-
-        return Objects.requireNonNull(AEItemStack.create(getAspectStack(aspect, 1))).setStackSize(stack.getStackSize());
-    }
-
-    /**
-     * Gets the amount of essentia stored in a grid for a given aspect preview.
-     */
-    public static long getEssentiaAmount(IAEItemStack stack, IGrid grid) {
-        if (ModAndClassUtil.ThE) {
-            return getEssentiaAmountImpl(stack, grid);
-        } else {
-            return 0;
-        }
-    }
-
-    @Method(modid = "thaumicenergistics")
-    private static long getEssentiaAmountImpl(IAEItemStack stack, IGrid grid) {
-        Aspect aspect = getAspect(stack.getItemStack());
-
-        if (aspect == null) return 0;
-
-        IEssentiaGrid essentiaGrid = grid.getCache(IEssentiaGrid.class);
-
-        return essentiaGrid.getEssentiaAmount(aspect);
-    }
 }

src/main/java/com/glodblock/github/crossmod/waila/PartWailaDataProvider.java

@@ -10,8 +10,6 @@ import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 
 import com.glodblock.github.crossmod.waila.part.FluidInvWailaDataProvider;
-import com.glodblock.github.crossmod.waila.part.FluidMonitorWailaDataProvider;
-import com.glodblock.github.crossmod.waila.part.SpeedWailaDataProvider;
 import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 
@@ -30,10 +28,8 @@ public class PartWailaDataProvider implements IWailaDataProvider {
     private final Tracer tracer = new Tracer();
 
     public PartWailaDataProvider() {
-        final IPartWailaDataProvider speed = new SpeedWailaDataProvider();
         final IPartWailaDataProvider fluidInv = new FluidInvWailaDataProvider();
-        final IPartWailaDataProvider fluidMonitor = new FluidMonitorWailaDataProvider();
-        this.providers = Lists.newArrayList(speed, fluidInv, fluidMonitor);
+        this.providers = Lists.newArrayList(fluidInv);
     }
 
     @Override

src/main/java/com/glodblock/github/crossmod/waila/Tooltip.java

@@ -27,11 +27,6 @@ public class Tooltip {
         return String.format("0 mB / %s mB", NumberFormat.getInstance().format(capacity));
     }
 
-    public static String partFluidBusFormat(int amount) {
-        return String
-                .format("%s: %s mB/t", I18n.format(NameConst.WAILA_SPEED), NumberFormat.getInstance().format(amount));
-    }
-
     public static String tileFluidInterfaceFormat(String name, int amount, int face) {
         return String.format(
                 "%s %s: %s mB",

src/main/java/com/glodblock/github/crossmod/waila/WailaInit.java

@@ -4,6 +4,8 @@ import com.glodblock.github.common.tile.TileCertusQuartzTank;
 import com.glodblock.github.util.ModAndClassUtil;
 
 import appeng.api.parts.IPartHost;
+import appeng.integration.IntegrationRegistry;
+import appeng.integration.IntegrationType;
 import appeng.tile.AEBaseTile;
 import appeng.util.Platform;
 import codechicken.nei.guihook.GuiContainerManager;
@@ -19,8 +21,12 @@ public class WailaInit {
 
     public static void register(final IWailaRegistrar registrar) {
         final IWailaDataProvider part = new PartWailaDataProvider();
-        registrar.registerBodyProvider(part, IPartHost.class);
-        registrar.registerNBTProvider(part, IPartHost.class);
+        registerPartProvider(registrar, part, IPartHost.class);
+        if (IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.FMP)) {
+            try {
+                registerPartProvider(registrar, part, Class.forName("codechicken.multipart.TileMultipart"));
+            } catch (final ClassNotFoundException ignored) {}
+        }
         if (Platform.isClient()) GuiContainerManager.addTooltipHandler(new FCTooltipHandlerWaila());
 
         final IWailaDataProvider tile = new TileWailaDataProvider();
@@ -32,4 +38,10 @@ public class WailaInit {
             registrar.registerBodyProvider(certusQuartzTank, TileCertusQuartzTank.class);
         }
     }
+
+    private static void registerPartProvider(final IWailaRegistrar registrar, final IWailaDataProvider provider,
+            final Class<?> tileClass) {
+        registrar.registerBodyProvider(provider, tileClass);
+        registrar.registerNBTProvider(provider, tileClass);
+    }
 }

src/main/java/com/glodblock/github/crossmod/waila/part/FluidMonitorWailaDataProvider.java

@@ -1,47 +0,0 @@
-package com.glodblock.github.crossmod.waila.part;
-
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-
-import com.glodblock.github.common.parts.base.FCPartMonitor;
-import com.glodblock.github.crossmod.waila.Tooltip;
-import com.glodblock.github.util.Util;
-
-import appeng.api.parts.IPart;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.integration.modules.waila.part.BasePartWailaDataProvider;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-
-public class FluidMonitorWailaDataProvider extends BasePartWailaDataProvider {
-
-    private final String key = "fluidStore";
-
-    @Override
-    public List<String> getWailaBody(final IPart part, final List<String> currentToolTip,
-            final IWailaDataAccessor accessor, final IWailaConfigHandler config) {
-        if (part instanceof FCPartMonitor && accessor.getNBTData().hasKey(key)) {
-            IAEFluidStack iaeFluidStack = Util.loadFluidStackFromNBT(accessor.getNBTData().getCompoundTag(key));
-            if (iaeFluidStack != null) currentToolTip.add(
-                    Tooltip.fluidFormat(
-                            iaeFluidStack.getFluidStack().getLocalizedName(),
-                            iaeFluidStack.getStackSize()));
-        }
-        return currentToolTip;
-    }
-
-    @Override
-    public NBTTagCompound getNBTData(final EntityPlayerMP player, final IPart part, final TileEntity te,
-            final NBTTagCompound tag, final World world, final int x, final int y, final int z) {
-        if (part instanceof FCPartMonitor && ((FCPartMonitor) part).getAEStoreFluidStack() != null) {
-            NBTTagCompound data = new NBTTagCompound();
-            ((FCPartMonitor) part).getAEStoreFluidStack().writeToNBT(data);
-            tag.setTag(key, data);
-        }
-        return tag;
-    }
-}

src/main/java/com/glodblock/github/crossmod/waila/part/SpeedWailaDataProvider.java

@@ -1,37 +0,0 @@
-package com.glodblock.github.crossmod.waila.part;
-
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-
-import com.glodblock.github.crossmod.waila.Tooltip;
-
-import appeng.api.parts.IPart;
-import appeng.integration.modules.waila.part.BasePartWailaDataProvider;
-import appeng.parts.automation.PartSharedItemBus;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-
-public class SpeedWailaDataProvider extends BasePartWailaDataProvider {
-
-    @Override
-    public List<String> getWailaBody(final IPart part, final List<String> currentToolTip,
-            final IWailaDataAccessor accessor, final IWailaConfigHandler config) {
-        if (accessor.getNBTData().hasKey("BusSpeed")) {
-            currentToolTip.add(Tooltip.partFluidBusFormat(accessor.getNBTData().getInteger("BusSpeed")));
-        }
-        return currentToolTip;
-    }
-
-    @Override
-    public NBTTagCompound getNBTData(final EntityPlayerMP player, final IPart part, final TileEntity te,
-            final NBTTagCompound tag, final World world, final int x, final int y, final int z) {
-        if (part instanceof PartSharedItemBus<?>bus) {
-            tag.setInteger("BusSpeed", bus.calculateAmountToSend() / 5);
-        }
-        return tag;
-    }
-}

src/main/java/com/glodblock/github/inventory/AEFluidInventory.java

@@ -432,7 +432,10 @@ public class AEFluidInventory implements IAEFluidTank {
             if (doFill) {
                 if (getFluid() == null) AEFluidInventory.this
                         .setFluidInSlot(this.slot, AEFluidStack.create(new FluidStack(resource.getFluid(), acc)));
-                else getFluid().amount += acc;
+                else {
+                    getFluid().amount += acc;
+                    AEFluidInventory.this.onContentChanged(this.slot);
+                }
             }
             return acc;
         }
@@ -446,7 +449,10 @@ public class AEFluidInventory implements IAEFluidTank {
             if (doDrain) {
                 if (amt == getFluid().amount) {
                     AEFluidInventory.this.setFluidInSlot(this.slot, null);
-                } else getFluid().amount -= amt;
+                } else {
+                    getFluid().amount -= amt;
+                    AEFluidInventory.this.onContentChanged(this.slot);
+                }
             }
             return remove;
         }