Universal GUI (#340)

Co-authored-by: Kogepan229 <kogepan25629@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

dependencies.gradle

@@ -35,12 +35,12 @@
  */
 dependencies {
     api('com.github.GTNewHorizons:NotEnoughItems:2.8.33-GTNH:dev')
-    api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-739-GTNH:dev')
+    api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-754-GTNH:dev')
     api('curse.maven:cofh-core-69162:2388751')
     api('com.github.GTNewHorizons:waila:1.9.7:dev')
     api("com.github.GTNewHorizons:GTNHLib:0.8.0:dev")
 
-    implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.7:dev") {
+    implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.10:dev") {
         exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial'
     }
 

repositories.gradle

@@ -1,4 +1,5 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
+    mavenLocal()
 }

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

@@ -3,8 +3,6 @@ package com.glodblock.github;
 import net.minecraft.util.ResourceLocation;
 
 import com.glodblock.github.common.Config;
-import com.glodblock.github.common.storage.FluidCellHandler;
-import com.glodblock.github.crossmod.extracells.EC2Replacer;
 import com.glodblock.github.crossmod.opencomputers.OCDriverInit;
 import com.glodblock.github.crossmod.waila.WailaInit;
 import com.glodblock.github.inventory.InventoryHandler;
@@ -12,21 +10,15 @@ 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.loader.filter.FluidFilter;
-import com.glodblock.github.network.SPacketMEUpdateBuffer;
 import com.glodblock.github.proxy.CommonProxy;
 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;
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
-import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.event.FMLServerStoppedEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 
 @Mod(
@@ -70,7 +62,6 @@ public class FluidCraft {
     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) {
@@ -86,9 +77,6 @@ public class FluidCraft {
         if (ModAndClassUtil.isV2) {
             CalculatorV2PluginLoader.installCalculatorV2Plugins();
         }
-        if (ModAndClassUtil.isTypeFilter) {
-            AEApi.instance().registries().itemDisplay().addItemFilter(FluidFilter::filter);
-        }
 
         proxy.postInit(event);
     }
@@ -98,23 +86,6 @@ public class FluidCraft {
         proxy.onLoadComplete(event);
     }
 
-    @Mod.EventHandler
-    public void onServerStart(FMLServerStartingEvent event) {
-        SPacketMEUpdateBuffer.start();
-    }
-
-    @Mod.EventHandler
-    public void onServerStop(FMLServerStoppedEvent event) {
-        SPacketMEUpdateBuffer.stop();
-    }
-
-    @Mod.EventHandler
-    public void missingMappings(FMLMissingMappingsEvent event) {
-        if (!ModAndClassUtil.EC2 && Config.replaceEC2) {
-            EC2Replacer.replaceExtraCells(event);
-        }
-    }
-
     public static ResourceLocation resource(String path) {
         return new ResourceLocation(MODID, path);
     }

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

@@ -2,6 +2,7 @@ package com.glodblock.github.api.registries;
 
 import java.util.Set;
 
+import appeng.api.features.ILevelViewable;
 import appeng.api.networking.IGridHost;
 
 public interface ILevelTerminalRegistry {

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

@@ -1,59 +0,0 @@
-package com.glodblock.github.api.registries;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-
-import com.glodblock.github.api.ISide;
-
-import appeng.api.implementations.tiles.ISegmentedInventory;
-import appeng.api.networking.IGridHost;
-import appeng.api.util.DimensionalCoord;
-import appeng.helpers.ICustomNameObject;
-
-public interface ILevelViewable extends IGridHost, ISide, ISegmentedInventory, ICustomNameObject {
-
-    DimensionalCoord getLocation();
-
-    TileEntity getTile();
-
-    @Deprecated
-    default long getSortValue() {
-        TileEntity te = getTile();
-        return ((long) te.zCoord << 24) ^ ((long) te.xCoord << 8) ^ te.yCoord;
-    }
-
-    @Deprecated
-    default boolean shouldDisplay() {
-        return true;
-    }
-
-    /**
-     * Number of rows to expect. This is used with {@link #rowSize()} to determine how to render the slots.
-     */
-    default int rows() {
-        return 1;
-    };
-
-    /**
-     * Number of slots per row.
-     */
-    default int rowSize() {
-        return 1;
-    };
-
-    @Deprecated
-    default ItemStack getSelfItemStack() {
-        return null;
-    }
-
-    /**
-     * "Target" Display representation
-     */
-    @Deprecated
-    default ItemStack getDisplayItemStack() {
-        return null;
-    }
-
-    LevelItemInfo[] getLevelItemInfoList();
-
-}

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

@@ -1,5 +1,6 @@
 package com.glodblock.github.api.registries;
 
+import appeng.api.features.ILevelViewable;
 import appeng.api.networking.IGridHost;
 
 public interface ILevelViewableAdapter extends ILevelViewable {

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

@@ -1,20 +0,0 @@
-package com.glodblock.github.api.registries;
-
-import net.minecraft.item.ItemStack;
-
-import org.jetbrains.annotations.NotNull;
-
-public class LevelItemInfo {
-
-    public ItemStack stack;
-    public long quantity;
-    public long batchSize;
-    public LevelState state;
-
-    public LevelItemInfo(@NotNull ItemStack stack, long quantity, long batchSize, LevelState state) {
-        this.stack = stack;
-        this.quantity = quantity;
-        this.batchSize = batchSize;
-        this.state = state;
-    }
-}

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

@@ -1,11 +0,0 @@
-package com.glodblock.github.api.registries;
-
-public enum LevelState {
-    None,
-    Idle,
-    Craft,
-    Export,
-    Error,
-    NotFound,
-    CantCraft
-}

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

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

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

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

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

@@ -1,94 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.common.parts.PartFluidTerminal;
-import com.glodblock.github.common.parts.PartLevelTerminal;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.inventory.item.WirelessFluidTerminalInventory;
-import com.glodblock.github.inventory.item.WirelessInterfaceTerminalInventory;
-import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory;
-import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.network.CPacketInventoryAction;
-import com.glodblock.github.util.Ae2ReflectClient;
-
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.container.AEBaseContainer;
-import appeng.helpers.InventoryAction;
-
-public class GuiCraftingStatus extends appeng.client.gui.implementations.GuiCraftingStatus {
-
-    private final ITerminalHost host;
-
-    public GuiCraftingStatus(InventoryPlayer inventoryPlayer, ITerminalHost te) {
-        super(inventoryPlayer, te);
-        host = te;
-    }
-
-    @Override
-    public void initGui() {
-        if (host instanceof PartFluidPatternTerminal) this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL.stack();
-        else if (host instanceof PartFluidPatternTerminalEx) this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL_EX.stack();
-        else if (host instanceof PartFluidTerminal) this.myIcon = ItemAndBlockHolder.FLUID_TERM.stack();
-        else if (host instanceof PartLevelTerminal) this.myIcon = ItemAndBlockHolder.LEVEL_TERMINAL.stack();
-        else if (host instanceof IWirelessTerminal terminal && terminal.isUniversal(host))
-            this.myIcon = ItemAndBlockHolder.WIRELESS_ULTRA_TERM.stack();
-        else if (host instanceof WirelessFluidTerminalInventory)
-            this.myIcon = ItemAndBlockHolder.WIRELESS_FLUID_TERM.stack();
-        else if (host instanceof WirelessPatternTerminalInventory)
-            this.myIcon = ItemAndBlockHolder.WIRELESS_PATTERN_TERM.stack();
-        else if (host instanceof WirelessInterfaceTerminalInventory)
-            this.myIcon = ItemAndBlockHolder.WIRELESS_INTERFACE_TERM.stack();
-        else if (host instanceof WirelessLevelTerminalInventory)
-            this.myIcon = ItemAndBlockHolder.WIRELESS_LEVEL_TERM.stack();
-        super.initGui();
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        if (btn == originalGuiBtn) {
-            if (host instanceof PartFluidPatternTerminal) InventoryHandler.switchGui(GuiType.FLUID_PATTERN_TERMINAL);
-            else if (host instanceof PartFluidPatternTerminalEx)
-                InventoryHandler.switchGui(GuiType.FLUID_PATTERN_TERMINAL_EX);
-            else if (host instanceof PartFluidTerminal) InventoryHandler.switchGui(GuiType.FLUID_TERMINAL);
-            else if (host instanceof PartLevelTerminal) InventoryHandler.switchGui(GuiType.LEVEL_TERMINAL);
-            else if (host instanceof IWirelessTerminal terminal && terminal.isUniversal(host))
-                InventoryHandler.switchGui(ItemWirelessUltraTerminal.readMode(terminal.getItemStack()));
-            else if (host instanceof WirelessFluidTerminalInventory)
-                InventoryHandler.switchGui(GuiType.WIRELESS_FLUID_TERMINAL);
-            else if (host instanceof WirelessPatternTerminalInventory)
-                InventoryHandler.switchGui(GuiType.WIRELESS_FLUID_PATTERN_TERMINAL);
-            else if (host instanceof WirelessInterfaceTerminalInventory)
-                InventoryHandler.switchGui(GuiType.WIRELESS_INTERFACE_TERMINAL);
-            else if (host instanceof WirelessLevelTerminalInventory)
-                InventoryHandler.switchGui(GuiType.WIRELESS_LEVEL_TERMINAL);
-        } else {
-            super.actionPerformed(btn);
-        }
-    }
-
-    @Override
-    protected void mouseClicked(final int xCoord, final int yCoord, final int btn) {
-        IAEItemStack hoveredAEStack = getHoveredAEStack();
-        if (hoveredAEStack != null && btn == 2) {
-            ((AEBaseContainer) inventorySlots).setTargetStack(hoveredAEStack);
-            FluidCraft.proxy.netHandler.sendToServer(
-                    new CPacketInventoryAction(
-                            InventoryAction.AUTO_CRAFT,
-                            Ae2ReflectClient.getInventorySlots(this).size(),
-                            hoveredAEStack.getStackSize(),
-                            hoveredAEStack));
-            return;
-        }
-        super.mouseClicked(xCoord, yCoord, btn);
-    }
-}

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

@@ -1,280 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.StatCollector;
-
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-
-import com.glodblock.github.client.gui.container.ContainerDualInterface;
-import com.glodblock.github.common.parts.PartFluidInterface;
-import com.glodblock.github.common.tile.TileFluidInterface;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.util.ModAndClassUtil;
-import com.glodblock.github.util.NameConst;
-
-import appeng.api.config.AdvancedBlockingMode;
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.InsertionMode;
-import appeng.api.config.LockCraftingMode;
-import appeng.api.config.Settings;
-import appeng.api.config.SidelessMode;
-import appeng.api.config.Upgrades;
-import appeng.api.config.YesNo;
-import appeng.client.gui.implementations.GuiUpgradeable;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.client.gui.widgets.GuiSimpleImgButton;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.client.gui.widgets.GuiToggleButton;
-import appeng.container.implementations.ContainerInterface;
-import appeng.core.AELog;
-import appeng.core.localization.ButtonToolTips;
-import appeng.core.localization.GuiText;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketConfigButton;
-import appeng.core.sync.packets.PacketValueConfig;
-import appeng.helpers.IInterfaceHost;
-
-public class GuiDualInterface extends GuiUpgradeable {
-
-    private GuiTabButton priority;
-    private GuiTabButton switcher;
-    private GuiImgButton BlockMode;
-    private GuiImgButton SmartBlockMode;
-    private GuiImgButton fuzzyMode;
-    private GuiToggleButton interfaceMode;
-    private GuiImgButton insertionMode;
-    private GuiImgButton sidelessMode;
-    private GuiSimpleImgButton doublePatterns;
-    private GuiToggleButton patternOptimization;
-    private GuiImgButton advancedBlockingMode;
-    private GuiImgButton lockCraftingMode;
-    private final IInterfaceHost host;
-
-    public GuiDualInterface(InventoryPlayer inventoryPlayer, IInterfaceHost te) {
-        super(new ContainerDualInterface(inventoryPlayer, te));
-        this.host = te;
-        this.ySize = 211;
-    }
-
-    @Override
-    protected void addButtons() {
-        this.priority = new GuiTabButton(
-                this.guiLeft + 154,
-                this.guiTop,
-                2 + 4 * 16,
-                GuiText.Priority.getLocal(),
-                itemRender);
-        this.buttonList.add(this.priority);
-
-        this.switcher = new GuiTabButton(
-                this.guiLeft + 132,
-                this.guiTop,
-                host instanceof PartFluidInterface ? ItemAndBlockHolder.FLUID_INTERFACE.stack()
-                        : ItemAndBlockHolder.INTERFACE.stack(),
-                StatCollector.translateToLocal("ae2fc.tooltip.switch_fluid_interface"),
-                itemRender);
-        this.buttonList.add(this.switcher);
-
-        int offset = 8;
-
-        this.BlockMode = new GuiImgButton(this.guiLeft - 18, this.guiTop + offset, Settings.BLOCK, YesNo.NO);
-        this.buttonList.add(this.BlockMode);
-
-        this.SmartBlockMode = new GuiImgButton(this.guiLeft - 36, this.guiTop + offset, Settings.SMART_BLOCK, YesNo.NO);
-        this.buttonList.add(this.SmartBlockMode);
-
-        offset += 18;
-
-        this.interfaceMode = new GuiToggleButton(
-                this.guiLeft - 18,
-                this.guiTop + offset,
-                84,
-                85,
-                GuiText.InterfaceTerminal.getLocal(),
-                GuiText.InterfaceTerminalHint.getLocal());
-        this.buttonList.add(this.interfaceMode);
-
-        offset += 18;
-
-        this.insertionMode = new GuiImgButton(
-                this.guiLeft - 18,
-                this.guiTop + offset,
-                Settings.INSERTION_MODE,
-                InsertionMode.DEFAULT);
-        this.buttonList.add(this.insertionMode);
-
-        offset += 18;
-
-        this.doublePatterns = new GuiSimpleImgButton(this.guiLeft - 18, this.guiTop + offset, 71, "");
-        this.doublePatterns.enabled = false;
-        this.buttonList.add(this.doublePatterns);
-
-        offset += 18;
-
-        this.patternOptimization = new GuiToggleButton(
-                this.guiLeft - 18,
-                this.guiTop + offset,
-                178,
-                194,
-                GuiText.PatternOptimization.getLocal(),
-                GuiText.PatternOptimizationHint.getLocal());
-        this.buttonList.add(this.patternOptimization);
-
-        offset += 18;
-
-        this.advancedBlockingMode = new GuiImgButton(
-                this.guiLeft - 18,
-                this.guiTop + offset,
-                Settings.ADVANCED_BLOCKING_MODE,
-                AdvancedBlockingMode.DEFAULT);
-        this.buttonList.add(this.advancedBlockingMode);
-        this.advancedBlockingMode.visible = this.bc.getInstalledUpgrades(Upgrades.ADVANCED_BLOCKING) > 0;
-
-        offset += 18;
-
-        if (isTile()) {
-            this.sidelessMode = new GuiImgButton(
-                    this.guiLeft - 18,
-                    this.guiTop + offset,
-                    Settings.SIDELESS_MODE,
-                    SidelessMode.SIDELESS);
-            this.buttonList.add(this.sidelessMode);
-
-            offset += 18;
-        }
-
-        this.lockCraftingMode = new GuiImgButton(
-                this.guiLeft - 18,
-                this.guiTop + offset,
-                Settings.LOCK_CRAFTING_MODE,
-                LockCraftingMode.NONE);
-        this.lockCraftingMode.visible = this.bc.getInstalledUpgrades(Upgrades.LOCK_CRAFTING) > 0;
-        this.buttonList.add(lockCraftingMode);
-
-        offset += 18;
-
-        this.fuzzyMode = new GuiImgButton(
-                this.guiLeft - 18,
-                this.guiTop + offset,
-                Settings.FUZZY_MODE,
-                FuzzyMode.IGNORE_ALL);
-        this.fuzzyMode.visible = this.bc.getInstalledUpgrades(Upgrades.FUZZY) > 0;
-        this.buttonList.add(fuzzyMode);
-    }
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        if (this.BlockMode != null) {
-            this.BlockMode.set(((ContainerInterface) this.cvb).getBlockingMode());
-        }
-        if (this.SmartBlockMode != null) {
-            this.SmartBlockMode.set(((ContainerInterface) this.cvb).getSmartBlockingMode());
-        }
-        if (this.interfaceMode != null) {
-            this.interfaceMode.setState(((ContainerInterface) this.cvb).getInterfaceTerminalMode() == YesNo.YES);
-        }
-        if (this.insertionMode != null) {
-            this.insertionMode.set(((ContainerInterface) this.cvb).getInsertionMode());
-        }
-        if (this.doublePatterns != null) {
-            this.doublePatterns.enabled = ((ContainerInterface) this.cvb).isAllowedToMultiplyPatterns;
-            if (this.doublePatterns.enabled) this.doublePatterns.setTooltip(
-                    ButtonToolTips.DoublePatterns.getLocal() + "\n" + ButtonToolTips.DoublePatternsHint.getLocal());
-            else this.doublePatterns.setTooltip(
-                    ButtonToolTips.DoublePatterns.getLocal() + "\n" + ButtonToolTips.OptimizePatternsNoReq.getLocal());
-        }
-        if (this.patternOptimization != null) {
-            this.patternOptimization.setState(((ContainerInterface) this.cvb).getPatternOptimization() == YesNo.YES);
-        }
-        if (this.sidelessMode != null) {
-            this.sidelessMode.set(((ContainerDualInterface) this.cvb).getSidelessMode());
-        }
-        if (this.advancedBlockingMode != null) {
-            this.advancedBlockingMode.set(((ContainerDualInterface) this.cvb).getAdvancedBlockingMode());
-        }
-        if (this.lockCraftingMode != null) {
-            this.lockCraftingMode.set(((ContainerInterface) this.cvb).getLockCraftingMode());
-        }
-        if (this.fuzzyMode != null) {
-            this.fuzzyMode.set(((ContainerInterface) this.cvb).getFuzzyMode());
-        }
-        this.fontRendererObj.drawString(
-                getGuiDisplayName(StatCollector.translateToLocal(NameConst.GUI_FLUID_INTERFACE)),
-                8,
-                6,
-                4210752);
-    }
-
-    @Override
-    protected String getBackground() {
-        if (!ModAndClassUtil.isBigInterface) return "guis/interface.png";
-        return switch (((ContainerInterface) this.cvb).getPatternCapacityCardsInstalled()) {
-            case -1 -> "guis/interfacenonenoconfig.png";
-            case 1 -> "guis/interface2.png";
-            case 2 -> "guis/interface3.png";
-            case 3 -> "guis/interface4.png";
-            default -> "guis/interface.png";
-        };
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        super.actionPerformed(btn);
-        final boolean backwards = Mouse.isButtonDown(1);
-        if (btn == this.priority) {
-            InventoryHandler.switchGui(GuiType.PRIORITY);
-        } else if (btn == this.switcher) {
-            InventoryHandler.switchGui(GuiType.DUAL_INTERFACE_FLUID);
-        } else if (btn == this.interfaceMode) {
-            NetworkHandler.instance.sendToServer(new PacketConfigButton(Settings.INTERFACE_TERMINAL, backwards));
-        } else if (btn == this.BlockMode) {
-            NetworkHandler.instance.sendToServer(new PacketConfigButton(this.BlockMode.getSetting(), backwards));
-        } else if (btn == this.SmartBlockMode) {
-            NetworkHandler.instance.sendToServer(new PacketConfigButton(this.SmartBlockMode.getSetting(), backwards));
-        } else if (btn == this.insertionMode) {
-            NetworkHandler.instance.sendToServer(new PacketConfigButton(this.insertionMode.getSetting(), backwards));
-        } else if (btn == this.doublePatterns) {
-            try {
-                int val = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) ? 1 : 0;
-                if (backwards) val |= 0b10;
-                NetworkHandler.instance
-                        .sendToServer(new PacketValueConfig("Interface.DoublePatterns", String.valueOf(val)));
-            } catch (final Throwable e) {
-                AELog.debug(e);
-            }
-        } else if (btn == this.patternOptimization) {
-            NetworkHandler.instance.sendToServer(new PacketConfigButton(Settings.PATTERN_OPTIMIZATION, backwards));
-        } else if (btn == this.sidelessMode) {
-            NetworkHandler.instance.sendToServer(new PacketConfigButton(this.sidelessMode.getSetting(), backwards));
-        } else if (btn == this.advancedBlockingMode) {
-            NetworkHandler.instance
-                    .sendToServer(new PacketConfigButton(this.advancedBlockingMode.getSetting(), backwards));
-        } else if (btn == this.lockCraftingMode) {
-            NetworkHandler.instance.sendToServer(new PacketConfigButton(this.lockCraftingMode.getSetting(), backwards));
-        } else if (btn == this.fuzzyMode) {
-            NetworkHandler.instance.sendToServer(new PacketConfigButton(this.fuzzyMode.getSetting(), backwards));
-        }
-    }
-
-    private boolean isTile() {
-        return this.host instanceof TileFluidInterface;
-    }
-
-    @Override
-    protected void handleButtonVisibility() {
-        super.handleButtonVisibility();
-        if (this.advancedBlockingMode != null) {
-            this.advancedBlockingMode.setVisibility(this.bc.getInstalledUpgrades(Upgrades.ADVANCED_BLOCKING) > 0);
-        }
-        if (this.lockCraftingMode != null) {
-            this.lockCraftingMode.setVisibility(this.bc.getInstalledUpgrades(Upgrades.LOCK_CRAFTING) > 0);
-        }
-        if (this.fuzzyMode != null) {
-            this.fuzzyMode.setVisibility(this.bc.getInstalledUpgrades(Upgrades.FUZZY) > 0);
-        }
-    }
-}

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

@@ -1,103 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import java.util.Objects;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-import org.lwjgl.opengl.GL11;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.ContainerEssentiaMonitor;
-import com.glodblock.github.client.me.EssentiaRepo;
-import com.glodblock.github.common.item.ItemFluidDrop;
-import com.glodblock.github.crossmod.thaumcraft.AspectRender;
-import com.glodblock.github.crossmod.thaumcraft.AspectUtil;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.network.CPacketFluidUpdate;
-
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.client.me.SlotME;
-
-public class GuiEssentiaTerminal extends GuiFluidMonitor {
-
-    protected EntityPlayer player;
-
-    public GuiEssentiaTerminal(InventoryPlayer inventoryPlayer, IWirelessTerminal te) {
-        super(inventoryPlayer, te, new ContainerEssentiaMonitor(inventoryPlayer, te));
-        this.repo = new EssentiaRepo(getScrollBar(), this);
-        this.player = inventoryPlayer.player;
-    }
-
-    @Override
-    public void setTextFieldValue(String displayName, int mousex, int mousey, ItemStack stack) {
-        if (AspectUtil.getAspectFromJar(stack) != null) {
-            setSearchString(Objects.requireNonNull(AspectUtil.getAspectFromJar(stack)).getName(), true);
-        }
-    }
-
-    @Override
-    public void func_146977_a(final Slot s) {
-        if (drawSlot0(s)) super.func_146977_a(s);
-    }
-
-    public boolean drawSlot0(Slot slot) {
-        if (slot instanceof SlotME) {
-            IAEItemStack stack = ((SlotME) slot).getAEStack();
-            if (stack == null) return true;
-            FluidStack fluidStack = ItemFluidDrop.getFluidStack(slot.getStack());
-            AspectRender.drawAspect(
-                    this.player,
-                    slot.xDisplayPosition,
-                    slot.yDisplayPosition,
-                    this.zLevel,
-                    AspectUtil.getAspectFromGas(fluidStack),
-                    fluidStack.amount);
-            IAEItemStack gas = stack.copy().setStackSize(stack.getStackSize() / AspectUtil.R);
-            aeRenderItem.setAeStack(gas);
-            GL11.glTranslatef(0.0f, 0.0f, 200.0f);
-            aeRenderItem.renderItemOverlayIntoGUI(
-                    fontRendererObj,
-                    mc.getTextureManager(),
-                    gas.getItemStack(),
-                    slot.xDisplayPosition,
-                    slot.yDisplayPosition);
-            GL11.glTranslatef(0.0f, 0.0f, -200.0f);
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    protected void handleMouseClick(final Slot slot, final int slotIdx, final int ctrlDown, final int mouseButton) {
-        if (slot instanceof SlotME && AspectUtil.isEssentiaContainer(player.inventory.getItemStack())) {
-            IAEFluidStack fluid = ItemFluidDrop.getAeFluidStack(((SlotME) slot).getAEStack());
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidUpdate(fluid, isShiftKeyDown()));
-        }
-        if (mouseButton == 3 && slot instanceof SlotME) {
-            return;
-        }
-        super.handleMouseClick(slot, slotIdx, ctrlDown, mouseButton);
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        if (btn == craftingStatusBtn) {
-            InventoryHandler.switchGui(GuiType.CRAFTING_STATUS);
-        } else {
-            super.actionPerformed(btn);
-        }
-    }
-
-    public void update(ItemStack itemStack) {
-        this.player.inventory.setItemStack(itemStack);
-    }
-
-}

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

@@ -1,108 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import java.io.IOException;
-
-import net.minecraft.entity.player.InventoryPlayer;
-
-import com.glodblock.github.client.gui.base.FCGuiAmount;
-import com.glodblock.github.common.parts.PartFluidStorageBus;
-import com.glodblock.github.inventory.IDualHost;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-
-import appeng.container.implementations.ContainerPriority;
-import appeng.core.AEConfig;
-import appeng.core.AELog;
-import appeng.core.localization.GuiText;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketValueConfig;
-import appeng.helpers.IPriorityHost;
-import appeng.util.calculators.ArithHelper;
-import appeng.util.calculators.Calculator;
-
-public class GuiFCPriority extends FCGuiAmount {
-
-    public GuiFCPriority(final InventoryPlayer inventoryPlayer, final IPriorityHost te) {
-        super(new ContainerPriority(inventoryPlayer, te));
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-        this.submit.enabled = false;
-        this.submit.visible = false;
-        this.buttonList.remove(this.submit);
-        ((ContainerPriority) this.inventorySlots).setTextField(this.amountBox);
-    }
-
-    @Override
-    protected int getIncrementQuantity(int i) {
-        return AEConfig.instance.priorityByStacksAmounts(i);
-    }
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        this.fontRendererObj.drawString(GuiText.Priority.getLocal(), 8, 6, 0x404040);
-    }
-
-    @Override
-    public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        super.drawBG(offsetX, offsetY, mouseX, mouseY);
-        this.amountBox.drawTextBox();
-    }
-
-    @Override
-    protected void addQty(final int i) {
-        try {
-            this.amountBox.setText(Long.toString(getAmount() + i));
-            this.amountBox.setCursorPositionEnd();
-        } catch (final NumberFormatException ignore) {}
-        try {
-            NetworkHandler.instance
-                    .sendToServer(new PacketValueConfig("PriorityHost.Priority", String.valueOf(getAmount())));
-        } catch (IOException e) {
-            AELog.debug(e);
-        }
-    }
-
-    @Override
-    protected void setOriginGUI(Object target) {
-        if (target instanceof IDualHost) {
-            this.myIcon = ItemAndBlockHolder.INTERFACE.stack();
-            this.originalGui = GuiType.DUAL_INTERFACE;
-        } else if (target instanceof PartFluidStorageBus) {
-            this.myIcon = ItemAndBlockHolder.FLUID_STORAGE_BUS.stack();
-            this.originalGui = GuiType.FLUID_STORAGE_BUS;
-        }
-    }
-
-    @Override
-    protected void keyTyped(final char character, final int key) {
-        super.keyTyped(character, key);
-        try {
-            NetworkHandler.instance
-                    .sendToServer(new PacketValueConfig("PriorityHost.Priority", String.valueOf(getAmount())));
-        } catch (IOException e) {
-            AELog.debug(e);
-        }
-    }
-
-    @Override
-    protected int getAmount() {
-        try {
-            String out = this.amountBox.getText();
-            double result = Calculator.conversion(out);
-            if (Double.isNaN(result)) {
-                return 0;
-            } else {
-                return (int) ArithHelper.round(result, 0);
-            }
-        } catch (final NumberFormatException e) {
-            return 0;
-        }
-    }
-
-    protected String getBackground() {
-        return "guis/priority.png";
-    }
-}

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

@@ -10,10 +10,10 @@ import com.glodblock.github.client.gui.container.ContainerFluidAutoFiller;
 import com.glodblock.github.common.tile.TileFluidAutoFiller;
 import com.glodblock.github.util.NameConst;
 
-import appeng.client.gui.AEBaseMEGui;
+import appeng.client.gui.AEBaseGui;
 import appeng.core.localization.GuiText;
 
-public class GuiFluidAutoFiller extends AEBaseMEGui {
+public class GuiFluidAutoFiller extends AEBaseGui {
 
     protected EntityPlayer player;
     private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/fluid_auto_filler.png");

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

@@ -1,122 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-
-import org.lwjgl.input.Mouse;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.base.FCGuiAmount;
-import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.common.parts.PartFluidTerminal;
-import com.glodblock.github.common.parts.PartLevelTerminal;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory;
-import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.network.CPacketCraftRequest;
-
-import appeng.api.config.CraftingMode;
-import appeng.api.config.Settings;
-import appeng.api.storage.ITerminalHost;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.container.implementations.ContainerCraftAmount;
-import appeng.core.localization.GuiText;
-import appeng.util.Platform;
-
-public class GuiFluidCraftAmount extends FCGuiAmount {
-
-    private GuiImgButton craftingMode;
-
-    public GuiFluidCraftAmount(final InventoryPlayer inventoryPlayer, final ITerminalHost te) {
-        super(new ContainerCraftAmount(inventoryPlayer, te));
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-
-        this.buttonList.add(
-                this.craftingMode = new GuiImgButton(
-                        this.guiLeft + 10,
-                        this.guiTop + 53,
-                        Settings.CRAFTING_MODE,
-                        CraftingMode.STANDARD));
-        ((ContainerCraftAmount) this.inventorySlots).setAmountField(this.amountBox);
-    }
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        this.fontRendererObj.drawString(GuiText.SelectAmount.getLocal(), 8, 6, 0x404040);
-    }
-
-    @Override
-    public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        super.drawBG(offsetX, offsetY, mouseX, mouseY);
-        this.submit.displayString = isShiftKeyDown() ? GuiText.Start.getLocal() : GuiText.Next.getLocal();
-        try {
-            this.submit.enabled = getAmount() > 0;
-        } catch (final NumberFormatException e) {
-            this.submit.enabled = false;
-        }
-        this.amountBox.drawTextBox();
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        super.actionPerformed(btn);
-        try {
-            if (btn == this.craftingMode) {
-                GuiImgButton iBtn = ((GuiImgButton) btn);
-
-                final Enum<?> cv = iBtn.getCurrentValue();
-                final boolean backwards = Mouse.isButtonDown(1);
-                final Enum<?> next = Platform.rotateEnum(cv, backwards, iBtn.getSetting().getPossibleValues());
-
-                iBtn.set(next);
-            } else if (btn == this.submit && this.submit.enabled) {
-                FluidCraft.proxy.netHandler.sendToServer(
-                        new CPacketCraftRequest(
-                                getAmount(),
-                                isShiftKeyDown(),
-                                ((CraftingMode) this.craftingMode.getCurrentValue())));
-            }
-        } catch (final NumberFormatException e) {
-            this.amountBox.setText("1");
-        }
-    }
-
-    @Override
-    protected void setOriginGUI(Object target) {
-        if (target instanceof PartFluidPatternTerminal) {
-            this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL.stack();
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL;
-        } else if (target instanceof PartFluidPatternTerminalEx) {
-            this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL_EX.stack();
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX;
-        } else if (target instanceof PartFluidTerminal) {
-            this.myIcon = ItemAndBlockHolder.FLUID_TERM.stack();
-            this.originalGui = GuiType.FLUID_TERMINAL;
-        } else if (target instanceof PartLevelTerminal) {
-            myIcon = ItemAndBlockHolder.LEVEL_TERMINAL.stack();
-            originalGui = GuiType.LEVEL_TERMINAL;
-        } else if (target instanceof IWirelessTerminal terminal && terminal.isUniversal(target)) {
-            this.myIcon = ItemAndBlockHolder.WIRELESS_ULTRA_TERM.stack();
-            this.originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack());
-        } else if (target instanceof WirelessPatternTerminalInventory) {
-            this.myIcon = ItemAndBlockHolder.WIRELESS_PATTERN_TERM.stack();
-            this.originalGui = GuiType.FLUID_TERMINAL;
-        } else if (target instanceof WirelessLevelTerminalInventory) {
-            myIcon = ItemAndBlockHolder.LEVEL_TERMINAL.stack();
-            originalGui = GuiType.WIRELESS_LEVEL_TERMINAL;
-        }
-    }
-
-    @Override
-    protected String getBackground() {
-        return "guis/craftAmt.png";
-    }
-}

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

@@ -1,43 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.entity.player.InventoryPlayer;
-
-import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.common.parts.PartLevelTerminal;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory;
-import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory;
-
-import appeng.api.storage.ITerminalHost;
-import appeng.client.gui.implementations.GuiCraftConfirm;
-
-public class GuiFluidCraftConfirm extends GuiCraftConfirm {
-
-    private GuiType originalGui;
-
-    public GuiFluidCraftConfirm(final InventoryPlayer inventoryPlayer, final ITerminalHost te) {
-        super(inventoryPlayer, te);
-        if (te instanceof PartFluidPatternTerminal) {
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL;
-        } else if (te instanceof PartFluidPatternTerminalEx) {
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX;
-        } else if (te instanceof PartLevelTerminal) {
-            originalGui = GuiType.LEVEL_TERMINAL;
-        } else if (te instanceof IWirelessTerminal terminal && terminal.isUniversal(te)) {
-            this.originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack());
-        } else if (te instanceof WirelessPatternTerminalInventory) {
-            this.originalGui = GuiType.FLUID_TERMINAL;
-        } else if (te instanceof WirelessLevelTerminalInventory) {
-            originalGui = GuiType.WIRELESS_LEVEL_TERMINAL;
-        }
-    }
-
-    @Override
-    public void switchToOriginalGUI() {
-        InventoryHandler.switchGui(originalGui);
-    }
-}

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

@@ -1,84 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-
-import com.glodblock.github.client.gui.container.ContainerCraftingWireless;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-
-import appeng.api.config.ActionItems;
-import appeng.api.config.Settings;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.container.slot.SlotCraftingMatrix;
-import appeng.core.localization.GuiColors;
-import appeng.core.localization.GuiText;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketInventoryAction;
-import appeng.helpers.InventoryAction;
-
-public class GuiFluidCraftingWireless extends GuiItemMonitor {
-
-    private GuiImgButton clearBtn;
-
-    public GuiFluidCraftingWireless(final InventoryPlayer inventoryPlayer, final IWirelessTerminal te) {
-        super(inventoryPlayer, te, new ContainerCraftingWireless(inventoryPlayer, te));
-        this.setReservedSpace(73);
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        if (btn == craftingStatusBtn) {
-            InventoryHandler.switchGui(GuiType.CRAFTING_STATUS);
-        } else {
-            super.actionPerformed(btn);
-            if (this.clearBtn == btn) {
-                Slot s = null;
-                final Container c = this.inventorySlots;
-                for (final Object j : c.inventorySlots) {
-                    if (j instanceof SlotCraftingMatrix) {
-                        s = (Slot) j;
-                    }
-                }
-                if (s != null) {
-                    final PacketInventoryAction p = new PacketInventoryAction(
-                            InventoryAction.MOVE_REGION,
-                            s.slotNumber,
-                            0);
-                    NetworkHandler.instance.sendToServer(p);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-        this.buttonList.add(
-                this.clearBtn = new GuiImgButton(
-                        this.guiLeft + 92,
-                        this.guiTop + this.ySize - 156,
-                        Settings.ACTIONS,
-                        ActionItems.STASH));
-        this.clearBtn.setHalfSize(true);
-    }
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        super.drawFG(offsetX, offsetY, mouseX, mouseY);
-        this.fontRendererObj.drawString(
-                GuiText.CraftingTerminal.getLocal(),
-                8,
-                this.ySize - 96 + 1 - this.getReservedSpace(),
-                GuiColors.CraftingTerminalTitle.getColor());
-    }
-
-    @Override
-    protected String getBackground() {
-        return "gui/crafting.png";
-    }
-
-}

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

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

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

@@ -1,13 +1,11 @@
 package com.glodblock.github.client.gui;
 
-import net.minecraft.client.gui.GuiButton;
 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.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import org.lwjgl.opengl.GL11;
@@ -17,27 +15,22 @@ 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.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
 import com.glodblock.github.inventory.gui.MouseRegionManager;
 import com.glodblock.github.inventory.gui.TankMouseHandler;
-import com.glodblock.github.loader.ItemAndBlockHolder;
 import com.glodblock.github.util.NameConst;
 import com.glodblock.github.util.RenderUtil;
 
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.client.gui.AEBaseGui;
-import appeng.client.gui.widgets.GuiTabButton;
+import appeng.client.gui.GuiSub;
 import appeng.core.localization.GuiText;
 
-public class GuiFluidInterface extends AEBaseGui {
+public class GuiFluidInterface extends GuiSub {
 
     private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/interface_fluid.png");
     private static final int TANK_X = 35, TANK_X_OFF = 18, TANK_Y = 53;
     private static final int TANK_WIDTH = 16, TANK_HEIGHT = 68;
     private final ContainerFluidInterface cont;
 
-    private GuiTabButton switcher;
     private final MouseRegionManager mouseRegions = new MouseRegionManager(this);
 
     public GuiFluidInterface(InventoryPlayer ipl, IDualHost tile) {
@@ -65,18 +58,6 @@ public class GuiFluidInterface extends AEBaseGui {
         } catch (final Exception ignore) {}
     }
 
-    @Override
-    public void initGui() {
-        super.initGui();
-        this.switcher = new GuiTabButton(
-                this.guiLeft + 154,
-                this.guiTop,
-                isPart() ? ItemAndBlockHolder.FLUID_INTERFACE.stack() : ItemAndBlockHolder.INTERFACE.stack(),
-                StatCollector.translateToLocal("ae2fc.tooltip.switch_fluid_interface"),
-                itemRender);
-        this.buttonList.add(this.switcher);
-    }
-
     @Override
     public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
         fontRendererObj.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_INTERFACE)), 8, 6, 0x404040);
@@ -112,14 +93,6 @@ public class GuiFluidInterface extends AEBaseGui {
         drawTexturedModalRect(offsetX, offsetY, 0, 0, 176, ySize);
     }
 
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        super.actionPerformed(btn);
-        if (btn == this.switcher) {
-            InventoryHandler.switchGui(GuiType.DUAL_INTERFACE);
-        }
-    }
-
     public void update(int id, IAEFluidStack stack) {
         if (id >= 100) {
             cont.getTile().setConfig(id - 100, stack);

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

@@ -1,306 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.opengl.GL11;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.ContainerFluidLevelEmitter;
-import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
-import com.glodblock.github.common.parts.PartFluidLevelEmitter;
-import com.glodblock.github.common.parts.PartLevelTerminal;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.network.CPacketLevelTerminalCommands;
-import com.glodblock.github.network.CPacketValueConfig;
-import com.glodblock.github.util.NameConst;
-import com.glodblock.github.util.Util;
-
-import appeng.api.config.RedstoneMode;
-import appeng.api.config.Settings;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.util.DimensionalCoord;
-import appeng.client.gui.implementations.GuiUpgradeable;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.client.gui.widgets.MEGuiTextField;
-import appeng.container.AEBaseContainer;
-import appeng.core.AEConfig;
-import appeng.core.localization.GuiColors;
-import appeng.core.localization.GuiText;
-import appeng.util.calculators.ArithHelper;
-import appeng.util.calculators.Calculator;
-
-public class GuiFluidLevelEmitter extends GuiUpgradeable {
-
-    private MEGuiTextField amountTextField;
-
-    protected GuiType originalGui;
-    protected Util.DimensionalCoordSide originalBlockPos;
-    protected ItemStack originalGuiIcon;
-    protected GuiTabButton originalGuiBtn;
-
-    private GuiButton plus1;
-    private GuiButton plus10;
-    private GuiButton plus100;
-    private GuiButton plus1000;
-    private GuiButton minus1;
-    private GuiButton minus10;
-    private GuiButton minus100;
-    private GuiButton minus1000;
-
-    private GuiButton setButton;
-
-    private boolean isMul = false;
-
-    public GuiFluidLevelEmitter(final InventoryPlayer inventoryPlayer, final PartFluidLevelEmitter te) {
-        super(new ContainerFluidLevelEmitter(inventoryPlayer, te));
-
-        if (inventoryPlayer.player.openContainer instanceof AEBaseContainer container) {
-            var target = container.getTarget();
-            if (target instanceof PartLevelTerminal terminal) {
-                originalGuiIcon = ItemAndBlockHolder.LEVEL_TERMINAL.stack();
-                originalGui = GuiType.LEVEL_TERMINAL;
-                DimensionalCoord blockPos = new DimensionalCoord(terminal.getTile());
-                originalBlockPos = new Util.DimensionalCoordSide(
-                        blockPos.x,
-                        blockPos.y,
-                        blockPos.z,
-                        blockPos.getDimension(),
-                        terminal.getSide(),
-                        "");
-            } else if (target instanceof IWirelessTerminal terminal && terminal.isUniversal(target)) {
-                originalGuiIcon = ItemAndBlockHolder.WIRELESS_ULTRA_TERM.stack();
-                originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack());
-                originalBlockPos = new Util.DimensionalCoordSide(
-                        terminal.getInventorySlot(),
-                        Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM),
-                        0,
-                        inventoryPlayer.player.worldObj.provider.dimensionId,
-                        ForgeDirection.UNKNOWN,
-                        "");
-            } else if (target instanceof WirelessLevelTerminalInventory terminal) {
-                originalGuiIcon = ItemAndBlockHolder.WIRELESS_LEVEL_TERM.stack();
-                originalGui = GuiType.WIRELESS_LEVEL_TERMINAL;
-                originalBlockPos = new Util.DimensionalCoordSide(
-                        terminal.getInventorySlot(),
-                        Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM),
-                        0,
-                        inventoryPlayer.player.worldObj.provider.dimensionId,
-                        ForgeDirection.UNKNOWN,
-                        "");
-
-            }
-        }
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-
-        this.amountTextField = new MEGuiTextField(90, 12);
-        this.amountTextField.x = this.guiLeft + 39;
-        this.amountTextField.y = this.guiTop + 44;
-        this.amountTextField.setFocused(true);
-        ((ContainerFluidLevelEmitter) this.inventorySlots).setTextField(this.amountTextField);
-        this.validateText();
-
-        if (this.originalGuiIcon != null) {
-            this.originalGuiBtn = new GuiTabButton(
-                    this.guiLeft + 151,
-                    this.guiTop - 4,
-                    this.originalGuiIcon,
-                    this.originalGuiIcon.getDisplayName(),
-                    itemRender);
-            this.originalGuiBtn.setHideEdge(13);
-            this.buttonList.add(originalGuiBtn);
-        }
-    }
-
-    @Override
-    protected void addButtons() {
-        this.redstoneMode = new GuiImgButton(
-                this.guiLeft - 18,
-                this.guiTop + 8,
-                Settings.REDSTONE_EMITTER,
-                RedstoneMode.LOW_SIGNAL);
-
-        final int a = AEConfig.instance.levelByStackAmounts(0);
-        final int b = AEConfig.instance.levelByStackAmounts(1);
-        final int c = AEConfig.instance.levelByStackAmounts(2);
-        final int d = AEConfig.instance.levelByStackAmounts(3);
-
-        this.buttonList.add(this.plus1 = new GuiButton(0, this.guiLeft + 20, this.guiTop + 17, 22, 20, "+" + a));
-        this.buttonList.add(this.plus10 = new GuiButton(0, this.guiLeft + 48, this.guiTop + 17, 28, 20, "+" + b));
-        this.buttonList.add(this.plus100 = new GuiButton(0, this.guiLeft + 82, this.guiTop + 17, 32, 20, "+" + c));
-        this.buttonList.add(this.plus1000 = new GuiButton(0, this.guiLeft + 120, this.guiTop + 17, 38, 20, "+" + d));
-
-        this.buttonList.add(this.minus1 = new GuiButton(0, this.guiLeft + 20, this.guiTop + 63, 22, 20, "-" + a));
-        this.buttonList.add(this.minus10 = new GuiButton(0, this.guiLeft + 48, this.guiTop + 63, 28, 20, "-" + b));
-        this.buttonList.add(this.minus100 = new GuiButton(0, this.guiLeft + 82, this.guiTop + 63, 32, 20, "-" + c));
-        this.buttonList.add(this.minus1000 = new GuiButton(0, this.guiLeft + 120, this.guiTop + 63, 38, 20, "-" + d));
-
-        this.buttonList.add(
-                this.setButton = new GuiButton(
-                        0,
-                        this.guiLeft + 134,
-                        this.guiTop + 40,
-                        28,
-                        20,
-                        GuiText.Set.getLocal()));
-
-        this.buttonList.add(this.redstoneMode);
-    }
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        this.fontRendererObj.drawString(
-                getGuiDisplayName(NameConst.i18n(NameConst.GUI_FLUID_LEVEL_EMITTER)),
-                8,
-                6,
-                GuiColors.UpgradableTitle.getColor());
-        this.fontRendererObj.drawString(
-                GuiText.inventory.getLocal(),
-                8,
-                this.ySize - 96 + 3,
-                GuiColors.UpgradableInventory.getColor());
-        this.redstoneMode.set(this.cvb.getRedStoneMode());
-
-        if (isShiftKeyDown() && !isMul) {
-            for (GuiButton btn : this.buttonList) {
-                if (btn instanceof GuiButton) {
-                    btn.displayString += "000";
-                }
-            }
-            isMul = true;
-        } else if (!isShiftKeyDown() && isMul) {
-            for (GuiButton btn : this.buttonList) {
-                if (btn instanceof GuiButton) {
-                    btn.displayString = btn.displayString.substring(0, btn.displayString.lastIndexOf("000"));
-                }
-            }
-            isMul = false;
-        }
-    }
-
-    @Override
-    public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        super.drawBG(offsetX, offsetY, mouseX, mouseY);
-        this.amountTextField.drawTextBox();
-
-        // Without these two lines, the liquid slot will not draw properly.
-        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-        this.bindTexture(this.getBackground());
-    }
-
-    @Override
-    protected void handleButtonVisibility() {}
-
-    @Override
-    protected String getBackground() {
-        return "guis/lvlemitter.png";
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-
-        if (btn == this.originalGuiBtn) {
-            CPacketLevelTerminalCommands message = new CPacketLevelTerminalCommands(
-                    CPacketLevelTerminalCommands.Action.BACK,
-                    originalBlockPos.x,
-                    originalBlockPos.y,
-                    originalBlockPos.z,
-                    originalBlockPos.getDimension(),
-                    originalBlockPos.getSide());
-            message.setOriginalGui(originalGui.ordinal());
-            FluidCraft.proxy.netHandler.sendToServer(message);
-        } else if (btn == this.setButton && this.setButton.enabled) {
-            final long amount = this.getAmountLong();
-            this.amountTextField.setText(Long.toString(amount));
-
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketValueConfig(amount, 0));
-        } else {
-            final boolean isPlus = btn == this.plus1 || btn == this.plus10
-                    || btn == this.plus100
-                    || btn == this.plus1000;
-            final boolean isMinus = btn == this.minus1 || btn == this.minus10
-                    || btn == this.minus100
-                    || btn == this.minus1000;
-
-            if (isPlus || isMinus) {
-                long result = addOrderAmount(this.getQty(btn));
-                this.amountTextField.setText(Long.toString(result));
-            } else {
-                super.actionPerformed(btn);
-            }
-        }
-    }
-
-    private long addOrderAmount(final int i) {
-        long resultL = getAmountLong();
-
-        if (resultL == 1 && i > 1) {
-            resultL = 0;
-        }
-
-        resultL += i;
-        if (resultL < 1) {
-            resultL = 1;
-        }
-        return resultL;
-    }
-
-    private long getAmountLong() {
-        String out = this.amountTextField.getText();
-        double resultD = Calculator.conversion(out);
-
-        if (resultD <= 0 || Double.isNaN(resultD)) {
-            return 0;
-        } else {
-            return (long) ArithHelper.round(resultD, 0);
-        }
-    }
-
-    private void validateText() {
-        String text = this.amountTextField.getText();
-        double resultD = Calculator.conversion(text);
-        this.setButton.enabled = !Double.isNaN(resultD);
-    }
-
-    @Override
-    protected void mouseClicked(int xCoord, int yCoord, int btn) {
-        this.amountTextField.mouseClicked(xCoord, yCoord, btn);
-        super.mouseClicked(xCoord, yCoord, btn);
-    }
-
-    @Override
-    protected void keyTyped(final char character, final int key) {
-        if (!this.checkHotbarKeys(key)) {
-            if (key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER) {
-                this.actionPerformed(this.setButton);
-            } else {
-                boolean typedTextbox = this.amountTextField.textboxKeyTyped(character, key);
-                if (typedTextbox) {
-                    this.validateText();
-                } else {
-                    super.keyTyped(character, key);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected boolean drawUpgrades() {
-        return false;
-    }
-
-    public void update(Integer key, IAEFluidStack value) {
-        ((ContainerFluidLevelEmitter) this.cvb).getBus().setFluidInSlot(key, value);
-    }
-}

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

@@ -1,65 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import java.util.List;
-
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-import com.glodblock.github.client.gui.base.FCGuiMonitor;
-import com.glodblock.github.client.gui.container.ContainerFluidMonitor;
-import com.glodblock.github.client.me.FluidRepo;
-import com.glodblock.github.common.item.ItemFluidDrop;
-import com.glodblock.github.util.Util;
-
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.core.localization.GuiText;
-import appeng.util.item.AEItemStack;
-
-public class GuiFluidMonitor extends FCGuiMonitor<IAEFluidStack> {
-
-    public GuiFluidMonitor(final InventoryPlayer inventoryPlayer, final ITerminalHost te,
-            final ContainerFluidMonitor c) {
-        super(inventoryPlayer, te, c);
-        this.repo = new FluidRepo(getScrollBar(), this);
-        this.setScrollBar();
-    }
-
-    @Override
-    public void postUpdate(final List<IAEFluidStack> list, boolean resort) {
-        for (final IAEFluidStack is : list) {
-            IAEItemStack stack = AEItemStack.create(ItemFluidDrop.newDisplayStack(is.getFluidStack()));
-            stack.setStackSize(is.getStackSize());
-            this.repo.postUpdate(stack);
-        }
-        if (resort) {
-            this.repo.updateView();
-        }
-        this.setScrollBar();
-    }
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        this.fontRendererObj.drawString(this.getGuiDisplayName(GuiText.Terminal.getLocal()), 8, 6, 4210752);
-        this.fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752);
-        super.drawFG(offsetX, offsetY, mouseX, mouseY);
-    }
-
-    @Override
-    protected IAEItemStack transformItem(IAEItemStack stack) {
-        if (stack.getItem() instanceof ItemFluidDrop) {
-            return ItemFluidDrop.newAeStack(ItemFluidDrop.getAeFluidStack(stack));
-        }
-        return stack;
-    }
-
-    @Override
-    public void setTextFieldValue(String displayName, int mousex, int mousey, ItemStack stack) {
-        final FluidStack fluid = Util.getFluidFromItem(stack);
-        if (fluid != null) {
-            setSearchString(fluid.getLocalizedName(), true);
-        }
-    }
-}

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

@@ -1,49 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-
-import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.common.parts.PartLevelTerminal;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory;
-import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory;
-
-import appeng.api.storage.ITerminalHost;
-import appeng.client.gui.implementations.GuiOptimizePatterns;
-import appeng.core.localization.GuiText;
-
-public class GuiFluidOptimizePatterns extends GuiOptimizePatterns {
-
-    private GuiType originalGui;
-
-    public GuiFluidOptimizePatterns(InventoryPlayer inventoryPlayer, ITerminalHost te) {
-        super(inventoryPlayer, te);
-        if (te instanceof PartFluidPatternTerminal) {
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL;
-        } else if (te instanceof PartFluidPatternTerminalEx) {
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX;
-        } else if (te instanceof PartLevelTerminal) {
-            originalGui = GuiType.LEVEL_TERMINAL;
-        } else if (te instanceof IWirelessTerminal terminal && terminal.isUniversal(te)) {
-            this.originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack());
-        } else if (te instanceof WirelessPatternTerminalInventory) {
-            this.originalGui = GuiType.FLUID_TERMINAL;
-        } else if (te instanceof WirelessLevelTerminalInventory) {
-            originalGui = GuiType.WIRELESS_LEVEL_TERMINAL;
-        }
-    }
-
-    @Override
-    protected void actionPerformed(GuiButton btn) {
-        if (btn.displayString.equals(GuiText.Cancel.getLocal())) {
-            InventoryHandler.switchGui(originalGui);
-            return;
-        }
-        super.actionPerformed(btn);
-    }
-}

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

@@ -22,7 +22,6 @@ 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.network.CPacketEncodePattern;
 import com.glodblock.github.util.NameConst;
 
 import appeng.api.storage.data.IAEItemStack;
@@ -50,7 +49,7 @@ public class GuiFluidPatternEncoder extends AEBaseGui {
             public boolean onClick(int button) {
                 if (button == 0) {
                     if (cont.canEncodePattern()) {
-                        FluidCraft.proxy.netHandler.sendToServer(new CPacketEncodePattern());
+                        // FluidCraft.proxy.netHandler.sendToServer(new CPacketEncodePattern());
                     }
                     return true;
                 }

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

@@ -1,24 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.entity.player.InventoryPlayer;
-
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-
-import appeng.container.slot.AppEngSlot;
-import appeng.container.slot.SlotDisabled;
-
-public class GuiFluidPatternExWireless extends GuiFluidPatternTerminalEx {
-
-    public GuiFluidPatternExWireless(InventoryPlayer inventoryPlayer, IWirelessTerminal te) {
-        super(inventoryPlayer, te);
-    }
-
-    @Override
-    protected void repositionSlot(final AppEngSlot s) {
-        if (s instanceof SlotDisabled || s.isPlayerSide()) {
-            s.yDisplayPosition = s.getY() + this.ySize - 78 - 5;
-        } else {
-            s.yDisplayPosition = s.getY() + this.ySize - 78 - 3;
-        }
-    }
-}

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

@@ -1,180 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.base.FCGuiEncodeTerminal;
-import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminal;
-import com.glodblock.github.client.gui.container.ContainerFluidPatternWireless;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.network.CPacketInventoryAction;
-import com.glodblock.github.util.ModAndClassUtil;
-import com.glodblock.github.util.NameConst;
-
-import appeng.api.config.ActionItems;
-import appeng.api.config.ItemSubstitution;
-import appeng.api.config.PatternBeSubstitution;
-import appeng.api.config.Settings;
-import appeng.api.storage.ITerminalHost;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.container.slot.OptionalSlotFake;
-import appeng.container.slot.SlotFakeCraftingMatrix;
-import appeng.container.slot.SlotPatternTerm;
-import appeng.core.localization.GuiText;
-import appeng.helpers.InventoryAction;
-
-public class GuiFluidPatternTerminal extends FCGuiEncodeTerminal {
-
-    public GuiFluidPatternTerminal(final InventoryPlayer inventoryPlayer, final ITerminalHost te) {
-        super(inventoryPlayer, te, new ContainerFluidPatternTerminal(inventoryPlayer, te));
-    }
-
-    public GuiFluidPatternTerminal(final InventoryPlayer inventoryPlayer, final IWirelessTerminal te) {
-        super(inventoryPlayer, te, new ContainerFluidPatternWireless(inventoryPlayer, te));
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-        this.tabCraftButton = new GuiTabButton(
-                this.guiLeft + 173,
-                this.guiTop + this.ySize - 177,
-                new ItemStack(Blocks.crafting_table),
-                GuiText.CraftingPattern.getLocal(),
-                itemRender);
-        this.buttonList.add(this.tabCraftButton);
-
-        this.tabProcessButton = new GuiTabButton(
-                this.guiLeft + 173,
-                this.guiTop + this.ySize - 177,
-                new ItemStack(Blocks.furnace),
-                GuiText.ProcessingPattern.getLocal(),
-                itemRender);
-        this.buttonList.add(this.tabProcessButton);
-
-        this.substitutionsEnabledBtn = new GuiImgButton(
-                this.guiLeft + 84,
-                this.guiTop + this.ySize - 163,
-                Settings.ACTIONS,
-                ItemSubstitution.ENABLED);
-        this.substitutionsEnabledBtn.setHalfSize(true);
-        this.buttonList.add(this.substitutionsEnabledBtn);
-
-        this.substitutionsDisabledBtn = new GuiImgButton(
-                this.guiLeft + 84,
-                this.guiTop + this.ySize - 163,
-                Settings.ACTIONS,
-                ItemSubstitution.DISABLED);
-        this.substitutionsDisabledBtn.setHalfSize(true);
-        this.buttonList.add(this.substitutionsDisabledBtn);
-
-        this.clearBtn = new GuiImgButton(
-                this.guiLeft + 74,
-                this.guiTop + this.ySize - 163,
-                Settings.ACTIONS,
-                ActionItems.CLOSE);
-        this.clearBtn.setHalfSize(true);
-        this.buttonList.add(this.clearBtn);
-
-        this.encodeBtn = new GuiImgButton(
-                this.guiLeft + 147,
-                this.guiTop + this.ySize - 142,
-                Settings.ACTIONS,
-                ActionItems.ENCODE);
-        this.buttonList.add(this.encodeBtn);
-
-        int combineLeft = 74;
-        int combineTop = 153;
-        if (ModAndClassUtil.isDoubleButton) {
-            this.doubleBtn = new GuiImgButton(
-                    this.guiLeft + 74,
-                    this.guiTop + this.ySize - 153,
-                    Settings.ACTIONS,
-                    ActionItems.DOUBLE);
-            this.doubleBtn.setHalfSize(true);
-            this.buttonList.add(this.doubleBtn);
-            combineLeft = 84;
-        }
-        if (ModAndClassUtil.isBeSubstitutionsButton) {
-            combineLeft = 74;
-            combineTop -= 11;
-            this.beSubstitutionsEnabledBtn = new GuiImgButton(
-                    this.guiLeft + 84,
-                    this.guiTop + this.ySize - 153,
-                    Settings.ACTIONS,
-                    PatternBeSubstitution.ENABLED);
-            this.beSubstitutionsEnabledBtn.setHalfSize(true);
-            this.buttonList.add(this.beSubstitutionsEnabledBtn);
-
-            this.beSubstitutionsDisabledBtn = new GuiImgButton(
-                    this.guiLeft + 84,
-                    this.guiTop + this.ySize - 153,
-                    Settings.ACTIONS,
-                    PatternBeSubstitution.DISABLED);
-            this.beSubstitutionsDisabledBtn.setHalfSize(true);
-            this.buttonList.add(this.beSubstitutionsDisabledBtn);
-        }
-        this.combineEnableBtn = new GuiFCImgButton(
-                this.guiLeft + combineLeft,
-                this.guiTop + this.ySize - combineTop,
-                "FORCE_COMBINE",
-                "DO_COMBINE");
-        this.combineEnableBtn.setHalfSize(true);
-        this.buttonList.add(this.combineEnableBtn);
-
-        this.combineDisableBtn = new GuiFCImgButton(
-                this.guiLeft + combineLeft,
-                this.guiTop + this.ySize - combineTop,
-                "NOT_COMBINE",
-                "DONT_COMBINE");
-        this.combineDisableBtn.setHalfSize(true);
-        this.buttonList.add(this.combineDisableBtn);
-    }
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        super.drawFG(offsetX, offsetY, mouseX, mouseY);
-        this.fontRendererObj.drawString(
-                StatCollector.translateToLocal(NameConst.GUI_FLUID_PATTERN_TERMINAL),
-                8,
-                this.ySize - 96 + 2 - getReservedSpace(),
-                4210752);
-    }
-
-    @Override
-    protected void mouseClicked(final int xCoord, final int yCoord, final int btn) {
-
-        if (btn == 2 && doubleBtn.mousePressed(this.mc, xCoord, yCoord)) { //
-            InventoryAction action = InventoryAction.SET_PATTERN_MULTI;
-
-            final CPacketInventoryAction p = new CPacketInventoryAction(action, 0, 0);
-            FluidCraft.proxy.netHandler.sendToServer(p);
-        } else super.mouseClicked(xCoord, yCoord, btn);
-
-    }
-
-    @Override
-    protected void handleMouseClick(final Slot slot, final int slotIdx, final int ctrlDown, final int mouseButton) {
-        if (mouseButton == 3) {
-            if (this.container.isCraftingMode()
-                    && (slot instanceof OptionalSlotFake || slot instanceof SlotFakeCraftingMatrix
-                            || slot instanceof SlotPatternTerm)) {
-                return;
-            }
-        }
-        super.handleMouseClick(slot, slotIdx, ctrlDown, mouseButton);
-    }
-
-    @Override
-    protected String getBackground() {
-        if (this.container.isCraftingMode()) {
-            return "gui/pattern.png";
-        }
-        return "gui/pattern2.png";
-    }
-}

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

@@ -1,232 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.StatCollector;
-
-import org.lwjgl.input.Mouse;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.base.FCGuiEncodeTerminal;
-import com.glodblock.github.client.gui.container.ContainerFluidPatternExWireless;
-import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminalEx;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.network.CPacketFluidPatternTermBtns;
-import com.glodblock.github.network.CPacketInventoryAction;
-import com.glodblock.github.util.ModAndClassUtil;
-import com.glodblock.github.util.NameConst;
-
-import appeng.api.config.ActionItems;
-import appeng.api.config.ItemSubstitution;
-import appeng.api.config.PatternBeSubstitution;
-import appeng.api.config.PatternSlotConfig;
-import appeng.api.config.Settings;
-import appeng.api.storage.ITerminalHost;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.helpers.InventoryAction;
-
-public class GuiFluidPatternTerminalEx extends FCGuiEncodeTerminal {
-
-    public GuiFluidPatternTerminalEx(final InventoryPlayer inventoryPlayer, final ITerminalHost te) {
-        super(inventoryPlayer, te, new ContainerFluidPatternTerminalEx(inventoryPlayer, te));
-        processingScrollBar.setHeight(70).setWidth(7).setLeft(6).setRange(0, 1, 1);
-        processingScrollBar.setTexture(FluidCraft.MODID, "gui/pattern3.png", 242, 0);
-    }
-
-    public GuiFluidPatternTerminalEx(final InventoryPlayer inventoryPlayer, final IWirelessTerminal te) {
-        super(inventoryPlayer, te, new ContainerFluidPatternExWireless(inventoryPlayer, te));
-        processingScrollBar.setHeight(70).setWidth(7).setLeft(6).setRange(0, 1, 1);
-        processingScrollBar.setTexture(FluidCraft.MODID, "gui/pattern3.png", 242, 0);
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-
-        this.substitutionsEnabledBtn = new GuiImgButton(
-                this.guiLeft + 97,
-                this.guiTop + this.ySize - 163,
-                Settings.ACTIONS,
-                ItemSubstitution.ENABLED);
-        this.substitutionsEnabledBtn.setHalfSize(true);
-        this.buttonList.add(this.substitutionsEnabledBtn);
-
-        this.substitutionsDisabledBtn = new GuiImgButton(
-                this.guiLeft + 97,
-                this.guiTop + this.ySize - 163,
-                Settings.ACTIONS,
-                ItemSubstitution.DISABLED);
-        this.substitutionsDisabledBtn.setHalfSize(true);
-        this.buttonList.add(this.substitutionsDisabledBtn);
-
-        this.fluidPrioritizedEnabledBtn = new GuiFCImgButton(
-                this.guiLeft + 97,
-                this.guiTop + this.ySize - 114,
-                "FORCE_PRIO",
-                "DO_PRIO");
-        this.fluidPrioritizedEnabledBtn.setHalfSize(true);
-        this.buttonList.add(this.fluidPrioritizedEnabledBtn);
-
-        this.fluidPrioritizedDisabledBtn = new GuiFCImgButton(
-                this.guiLeft + 97,
-                this.guiTop + this.ySize - 114,
-                "NOT_PRIO",
-                "DONT_PRIO");
-        this.fluidPrioritizedDisabledBtn.setHalfSize(true);
-        this.buttonList.add(this.fluidPrioritizedDisabledBtn);
-
-        invertBtn = new GuiImgButton(
-                this.guiLeft + 87,
-                this.guiTop + this.ySize - 153,
-                Settings.ACTIONS,
-                container.inverted ? PatternSlotConfig.C_4_16 : PatternSlotConfig.C_16_4);
-        invertBtn.setHalfSize(true);
-        this.buttonList.add(this.invertBtn);
-
-        this.clearBtn = new GuiImgButton(
-                this.guiLeft + 87,
-                this.guiTop + this.ySize - 163,
-                Settings.ACTIONS,
-                ActionItems.CLOSE);
-        this.clearBtn.setHalfSize(true);
-        this.buttonList.add(this.clearBtn);
-
-        this.encodeBtn = new GuiImgButton(
-                this.guiLeft + 147,
-                this.guiTop + this.ySize - 142,
-                Settings.ACTIONS,
-                ActionItems.ENCODE);
-        this.buttonList.add(this.encodeBtn);
-
-        if (ModAndClassUtil.isDoubleButton) {
-            this.doubleBtn = new GuiImgButton(
-                    this.guiLeft + 97,
-                    this.guiTop + this.ySize - 153,
-                    Settings.ACTIONS,
-                    ActionItems.DOUBLE);
-            this.doubleBtn.setHalfSize(true);
-            this.buttonList.add(this.doubleBtn);
-        }
-
-        this.combineEnableBtn = new GuiFCImgButton(
-                this.guiLeft + 87,
-                this.guiTop + this.ySize - 114,
-                "FORCE_COMBINE",
-                "DO_COMBINE");
-        this.combineEnableBtn.setHalfSize(true);
-        this.buttonList.add(this.combineEnableBtn);
-
-        this.combineDisableBtn = new GuiFCImgButton(
-                this.guiLeft + 87,
-                this.guiTop + this.ySize - 114,
-                "NOT_COMBINE",
-                "DONT_COMBINE");
-        this.combineDisableBtn.setHalfSize(true);
-        this.buttonList.add(this.combineDisableBtn);
-        if (ModAndClassUtil.isBeSubstitutionsButton) {
-            this.beSubstitutionsEnabledBtn = new GuiImgButton(
-                    this.guiLeft + 87,
-                    this.guiTop + this.ySize - 103,
-                    Settings.ACTIONS,
-                    PatternBeSubstitution.ENABLED);
-            this.beSubstitutionsEnabledBtn.setHalfSize(true);
-            this.buttonList.add(this.beSubstitutionsEnabledBtn);
-
-            this.beSubstitutionsDisabledBtn = new GuiImgButton(
-                    this.guiLeft + 87,
-                    this.guiTop + this.ySize - 103,
-                    Settings.ACTIONS,
-                    PatternBeSubstitution.DISABLED);
-            this.beSubstitutionsDisabledBtn.setHalfSize(true);
-            this.buttonList.add(this.beSubstitutionsDisabledBtn);
-        }
-        processingScrollBar.setTop(this.ySize - 164);
-    }
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        super.drawFG(offsetX, offsetY, mouseX, mouseY);
-        this.fontRendererObj.drawString(
-                StatCollector.translateToLocal(NameConst.GUI_FLUID_PATTERN_TERMINAL_EX),
-                8,
-                this.ySize - 96 + 2 - getReservedSpace(),
-                4210752);
-        this.processingScrollBar.draw(this);
-    }
-
-    @Override
-    protected String getBackground() {
-        return container.inverted ? "gui/pattern4.png" : "gui/pattern3.png";
-    }
-
-    @Override
-    public void drawScreen(final int mouseX, final int mouseY, final float btn) {
-        final int offset = container.inverted ? 18 * -3 : 0;
-        substitutionsEnabledBtn.xPosition = this.guiLeft + 97 + offset;
-        substitutionsDisabledBtn.xPosition = this.guiLeft + 97 + offset;
-        beSubstitutionsEnabledBtn.xPosition = this.guiLeft + 97 + offset;
-        beSubstitutionsDisabledBtn.xPosition = this.guiLeft + 97 + offset;
-        fluidPrioritizedEnabledBtn.xPosition = this.guiLeft + 97 + offset;
-        fluidPrioritizedDisabledBtn.xPosition = this.guiLeft + 97 + offset;
-        doubleBtn.xPosition = this.guiLeft + 97 + offset;
-        clearBtn.xPosition = this.guiLeft + 87 + offset;
-        invertBtn.xPosition = this.guiLeft + 87 + offset;
-        combineEnableBtn.xPosition = this.guiLeft + 87 + offset;
-        combineDisableBtn.xPosition = this.guiLeft + 87 + offset;
-        processingScrollBar.setCurrentScroll(container.activePage);
-        super.drawScreen(mouseX, mouseY, btn);
-    }
-
-    @Override
-    protected void mouseClicked(final int xCoord, final int yCoord, final int btn) {
-        final int currentScroll = this.processingScrollBar.getCurrentScroll();
-        this.processingScrollBar.click(this, xCoord - this.guiLeft, yCoord - this.guiTop);
-        if (btn == 2 && doubleBtn.mousePressed(this.mc, xCoord, yCoord)) { //
-            InventoryAction action = InventoryAction.SET_PATTERN_MULTI;
-
-            final CPacketInventoryAction p = new CPacketInventoryAction(action, 0, 0);
-            FluidCraft.proxy.netHandler.sendToServer(p);
-        } else super.mouseClicked(xCoord, yCoord, btn);
-
-        if (currentScroll != this.processingScrollBar.getCurrentScroll()) {
-            changeActivePage();
-        }
-    }
-
-    @Override
-    protected void mouseClickMove(final int x, final int y, final int c, final long d) {
-        final int currentScroll = this.processingScrollBar.getCurrentScroll();
-        this.processingScrollBar.click(this, x - this.guiLeft, y - this.guiTop);
-        super.mouseClickMove(x, y, c, d);
-
-        if (currentScroll != this.processingScrollBar.getCurrentScroll()) {
-            changeActivePage();
-        }
-    }
-
-    @Override
-    public void handleMouseInput() {
-        super.handleMouseInput();
-        final int wheel = Mouse.getEventDWheel();
-
-        if (wheel != 0) {
-            final int x = Mouse.getEventX() * this.width / this.mc.displayWidth;
-            final int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight;
-
-            if (this.processingScrollBar.contains(x - this.guiLeft, y - this.guiTop)) {
-                final int currentScroll = this.processingScrollBar.getCurrentScroll();
-                this.processingScrollBar.wheel(wheel);
-
-                if (currentScroll != this.processingScrollBar.getCurrentScroll()) {
-                    changeActivePage();
-                }
-            }
-        }
-    }
-
-    private void changeActivePage() {
-        FluidCraft.proxy.netHandler.sendToServer(
-                new CPacketFluidPatternTermBtns(
-                        "PatternTerminal.ActivePage",
-                        String.valueOf(this.processingScrollBar.getCurrentScroll())));
-    }
-}

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

@@ -1,24 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.entity.player.InventoryPlayer;
-
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-
-import appeng.container.slot.AppEngSlot;
-import appeng.container.slot.SlotDisabled;
-
-public class GuiFluidPatternWireless extends GuiFluidPatternTerminal {
-
-    public GuiFluidPatternWireless(InventoryPlayer inventoryPlayer, IWirelessTerminal te) {
-        super(inventoryPlayer, te);
-    }
-
-    @Override
-    protected void repositionSlot(final AppEngSlot s) {
-        if (s instanceof SlotDisabled || s.isPlayerSide()) {
-            s.yDisplayPosition = s.getY() + this.ySize - 78 - 5;
-        } else {
-            s.yDisplayPosition = s.getY() + this.ySize - 78 - 3;
-        }
-    }
-}

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

@@ -1,35 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.entity.player.InventoryPlayer;
-
-import com.glodblock.github.client.gui.container.ContainerFluidPortableCell;
-import com.glodblock.github.inventory.item.IFluidPortableCell;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-
-import appeng.container.slot.AppEngSlot;
-
-public class GuiFluidPortableCell extends GuiFluidTerminal {
-
-    public GuiFluidPortableCell(final InventoryPlayer inventoryPlayer, final IFluidPortableCell te) {
-        super(inventoryPlayer, te, new ContainerFluidPortableCell(inventoryPlayer, te));
-    }
-
-    @Override
-    protected void repositionSlot(final AppEngSlot s) {
-        s.yDisplayPosition = s.getY() + this.ySize - 78 - 5;
-    }
-
-    @Override
-    protected int getMaxRows() {
-        if (this.container.getHost() instanceof IWirelessTerminal) {
-            return super.getMaxRows();
-        } else {
-            return 3;
-        }
-    }
-
-    @Override
-    protected boolean isPortableCell() {
-        return true;
-    }
-}

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

@@ -1,104 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.InventoryPlayer;
-
-import org.lwjgl.input.Mouse;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.ContainerFluidStorageBus;
-import com.glodblock.github.common.parts.PartFluidStorageBus;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.network.CPacketFluidPatternTermBtns;
-import com.glodblock.github.util.NameConst;
-
-import appeng.api.config.AccessRestriction;
-import appeng.api.config.ActionItems;
-import appeng.api.config.Settings;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.client.gui.implementations.GuiUpgradeable;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.core.localization.GuiColors;
-import appeng.core.localization.GuiText;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketConfigButton;
-
-public class GuiFluidStorageBus extends GuiUpgradeable {
-
-    private GuiImgButton rwMode;
-    private GuiTabButton priority;
-    private GuiImgButton partition;
-    private GuiImgButton clear;
-
-    public GuiFluidStorageBus(InventoryPlayer inventoryPlayer, PartFluidStorageBus te) {
-        super(new ContainerFluidStorageBus(inventoryPlayer, te));
-        this.ySize = 251;
-    }
-
-    @Override
-    protected void addButtons() {
-        this.clear = new GuiImgButton(this.guiLeft - 18, this.guiTop + 8, Settings.ACTIONS, ActionItems.CLOSE);
-        this.partition = new GuiImgButton(this.guiLeft - 18, this.guiTop + 28, Settings.ACTIONS, ActionItems.WRENCH);
-        this.rwMode = new GuiImgButton(
-                this.guiLeft - 18,
-                this.guiTop + 48,
-                Settings.ACCESS,
-                AccessRestriction.READ_WRITE);
-        this.priority = new GuiTabButton(
-                this.guiLeft + 154,
-                this.guiTop,
-                2 + 4 * 16,
-                GuiText.Priority.getLocal(),
-                itemRender);
-
-        this.buttonList.add(this.priority);
-        this.buttonList.add(this.rwMode);
-        this.buttonList.add(this.partition);
-        this.buttonList.add(this.clear);
-    }
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        this.fontRendererObj.drawString(
-                this.getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_STORAGE_BUS)),
-                8,
-                6,
-                GuiColors.StorageBusTitle.getColor());
-        this.fontRendererObj.drawString(
-                GuiText.inventory.getLocal(),
-                8,
-                this.ySize - 96 + 3,
-                GuiColors.StorageBusInventory.getColor());
-
-        if (this.rwMode != null) {
-            this.rwMode.set(((ContainerFluidStorageBus) this.cvb).getReadWriteMode());
-        }
-    }
-
-    @Override
-    protected String getBackground() {
-        return "guis/storagebus.png";
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        super.actionPerformed(btn);
-        final boolean backwards = Mouse.isButtonDown(1);
-        if (btn == this.partition) {
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("StorageBus.Action", "Partition"));
-        } else if (btn == this.clear) {
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("StorageBus.Action", "Clear"));
-        } else if (btn == this.priority) {
-            InventoryHandler.switchGui(GuiType.PRIORITY);
-        } else if (btn == this.rwMode) {
-            NetworkHandler.instance.sendToServer(new PacketConfigButton(this.rwMode.getSetting(), backwards));
-        }
-    }
-
-    public void update(int id, IAEFluidStack stack) {
-        ((ContainerFluidStorageBus) this.cvb).bus.setFluidInSlot(id, stack);
-    }
-}

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

@@ -1,127 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-
-import org.lwjgl.opengl.GL11;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.ContainerFluidMonitor;
-import com.glodblock.github.common.item.ItemFluidDrop;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.network.CPacketFluidUpdate;
-import com.glodblock.github.util.Util;
-
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.client.me.SlotME;
-import appeng.container.slot.AppEngSlot;
-
-public class GuiFluidTerminal extends GuiFluidMonitor {
-
-    protected EntityPlayer player;
-    public ContainerFluidMonitor container;
-
-    public GuiFluidTerminal(InventoryPlayer inventoryPlayer, ITerminalHost te) {
-        super(inventoryPlayer, te, new ContainerFluidMonitor(inventoryPlayer, te));
-        this.container = new ContainerFluidMonitor(inventoryPlayer, te);
-        this.player = inventoryPlayer.player;
-        this.showViewBtn = false;
-    }
-
-    public GuiFluidTerminal(final InventoryPlayer inventoryPlayer, final ITerminalHost te,
-            final ContainerFluidMonitor c) {
-        super(inventoryPlayer, te, c);
-        this.container = c;
-        this.player = inventoryPlayer.player;
-        this.showViewBtn = false;
-    }
-
-    @Override
-    protected void repositionSlot(final AppEngSlot s) {
-        if (s.isPlayerSide()) {
-            s.yDisplayPosition = s.getY() + this.ySize - 78 - 5;
-        } else {
-            s.yDisplayPosition = s.getY() + this.ySize - 78 - 3;
-        }
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        if (btn == craftingStatusBtn) {
-            InventoryHandler.switchGui(GuiType.CRAFTING_STATUS);
-        } else {
-            super.actionPerformed(btn);
-        }
-    }
-
-    @Override
-    public void func_146977_a(final Slot s) {
-        if (drawSlot0(s)) super.func_146977_a(s);
-    }
-
-    public boolean drawSlot0(Slot slot) {
-        if (slot instanceof SlotME) {
-            IAEItemStack stack = ((SlotME) slot).getAEStack();
-            if (stack == null) return true;
-            FluidStack fluidStack = ItemFluidDrop.getFluidStack(slot.getStack());
-            this.drawWidget(slot.xDisplayPosition, slot.yDisplayPosition, fluidStack.getFluid());
-            aeRenderItem.setAeStack(stack);
-            GL11.glTranslatef(0.0f, 0.0f, 200.0f);
-            aeRenderItem.renderItemOverlayIntoGUI(
-                    fontRendererObj,
-                    mc.getTextureManager(),
-                    stack.getItemStack(),
-                    slot.xDisplayPosition,
-                    slot.yDisplayPosition);
-            GL11.glTranslatef(0.0f, 0.0f, -200.0f);
-            return false;
-        }
-        return true;
-    }
-
-    private void drawWidget(int posX, int posY, Fluid fluid) {
-        if (fluid == null) return;
-        IIcon icon = fluid.getIcon();
-        if (icon == null) return;
-
-        Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
-        GL11.glDisable(GL11.GL_LIGHTING);
-        GL11.glEnable(GL11.GL_BLEND);
-        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-        GL11.glColor3f(
-                (fluid.getColor() >> 16 & 0xFF) / 255.0F,
-                (fluid.getColor() >> 8 & 0xFF) / 255.0F,
-                (fluid.getColor() & 0xFF) / 255.0F);
-        drawTexturedModelRectFromIcon(posX, posY, icon, 16, 16);
-        GL11.glEnable(GL11.GL_LIGHTING);
-        GL11.glDisable(GL11.GL_BLEND);
-        GL11.glColor3f(1, 1, 1);
-    }
-
-    @Override
-    protected void handleMouseClick(final Slot slot, final int slotIdx, final int ctrlDown, final int mouseButton) {
-        if (slot instanceof SlotME && Util.FluidUtil.isFluidContainer(player.inventory.getItemStack())) {
-            IAEFluidStack fluid = ItemFluidDrop.getAeFluidStack(((SlotME) slot).getAEStack());
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidUpdate(fluid, isShiftKeyDown()));
-        }
-        if (mouseButton == 3 && slot instanceof SlotME) {
-            return;
-        }
-        super.handleMouseClick(slot, slotIdx, ctrlDown, mouseButton);
-    }
-
-    public void update(ItemStack itemStack) {
-        this.player.inventory.setItemStack(itemStack);
-    }
-}

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

@@ -1,107 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-
-import com.glodblock.github.client.gui.container.ContainerInterfaceWireless;
-import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.util.ModAndClassUtil;
-
-import appeng.client.gui.implementations.GuiInterfaceTerminal;
-
-public class GuiInterfaceWireless extends GuiInterfaceTerminal {
-
-    protected GuiFCImgButton FluidTerminal;
-    protected GuiFCImgButton CraftingTerminal;
-    protected GuiFCImgButton PatternTerminal;
-    protected GuiFCImgButton EssentiaTerminal;
-    protected GuiFCImgButton InterfaceTerminal;
-    protected GuiFCImgButton LevelTerminal;
-    protected GuiFCImgButton PatternTerminalEx;
-
-    public GuiInterfaceWireless(final InventoryPlayer inventoryPlayer, final IWirelessTerminal te) {
-        super(new ContainerInterfaceWireless(inventoryPlayer, te));
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-        drawSwitchGuiBtns();
-    }
-
-    protected void drawSwitchGuiBtns() {
-        this.buttonList.add(this.CraftingTerminal = new GuiFCImgButton(this.guiLeft - 18, offsetY, "CRAFT_TEM", "YES"));
-        offsetY += 20;
-
-        this.buttonList
-                .add(this.PatternTerminal = new GuiFCImgButton(this.guiLeft - 18, offsetY, "PATTERN_TEM", "YES"));
-        offsetY += 20;
-
-        this.buttonList
-                .add(this.PatternTerminalEx = new GuiFCImgButton(this.guiLeft - 18, offsetY, "PATTERN_EX_TEM", "YES"));
-        offsetY += 20;
-
-        this.buttonList.add(this.FluidTerminal = new GuiFCImgButton(this.guiLeft - 18, offsetY, "FLUID_TEM", "YES"));
-        offsetY += 20;
-
-        this.buttonList.add(this.LevelTerminal = new GuiFCImgButton(this.guiLeft - 18, offsetY, "LEVEL_TEM", "YES"));
-        offsetY += 20;
-
-        if (ModAndClassUtil.ThE) {
-            this.buttonList
-                    .add(this.EssentiaTerminal = new GuiFCImgButton(this.guiLeft - 18, offsetY, "ESSENTIA_TEM", "YES"));
-            offsetY += 20;
-        }
-    }
-
-    private boolean scheduleGuiResize;
-
-    @Override
-    protected void mouseClicked(int xCoord, int yCoord, int btn) {
-        super.mouseClicked(xCoord, yCoord, btn);
-        if (scheduleGuiResize) {
-            // in the GuiScreen class, the implementation of super.mouseClicked
-            // ends up looping on the button list and execute the action for any
-            // button below the mouse.
-            // Therefore, if we initGui() the terminal in the actionPerformed method below
-            // it will run the actionPerformed a second time for the new button
-            // that will end up being below the mouse (if any) after the initGui()
-            buttonList.clear();
-            initGui();
-            scheduleGuiResize = false;
-        }
-    }
-
-    protected final void scheduleGuiResize() {
-        scheduleGuiResize = true;
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        if (btn instanceof GuiFCImgButton) {
-            if (btn == this.FluidTerminal) {
-                ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_FLUID_TERMINAL);
-            } else if (btn == this.CraftingTerminal) {
-                ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_CRAFTING_TERMINAL);
-            } else if (btn == this.EssentiaTerminal) {
-                ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_ESSENTIA_TERMINAL);
-            } else if (btn == this.PatternTerminal) {
-                ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_FLUID_PATTERN_TERMINAL);
-            } else if (btn == this.InterfaceTerminal) {
-                ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_INTERFACE_TERMINAL);
-            } else if (btn == this.LevelTerminal) {
-                ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_LEVEL_TERMINAL);
-            } else if (btn == this.PatternTerminalEx) {
-                ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_FLUID_PATTERN_TERMINAL_EX);
-            }
-        }
-
-        super.actionPerformed(btn);
-
-        if (btn == this.terminalStyleBox) {
-            scheduleGuiResize();
-        }
-    }
-}

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

@@ -1,45 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import java.util.List;
-
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-
-import com.glodblock.github.client.gui.base.FCGuiMonitor;
-import com.glodblock.github.client.gui.container.ContainerItemMonitor;
-
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.client.me.ItemRepo;
-import appeng.core.localization.GuiText;
-
-public class GuiItemMonitor extends FCGuiMonitor<IAEItemStack> {
-
-    public GuiItemMonitor(final InventoryPlayer inventoryPlayer, final ITerminalHost te, final ContainerItemMonitor c) {
-        super(inventoryPlayer, te, c);
-        this.repo = new ItemRepo(getScrollBar(), this);
-    }
-
-    @Override
-    public void postUpdate(final List<IAEItemStack> list, boolean resort) {
-        for (final IAEItemStack is : list) {
-            this.repo.postUpdate(is);
-        }
-        if (resort) {
-            this.repo.updateView();
-        }
-        this.setScrollBar();
-    }
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        this.fontRendererObj.drawString(this.getGuiDisplayName(GuiText.Terminal.getLocal()), 8, 6, 4210752);
-        this.fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752);
-        super.drawFG(offsetX, offsetY, mouseX, mouseY);
-    }
-
-    @Override
-    public void setTextFieldValue(String displayName, int mousex, int mousey, ItemStack stack) {
-        setSearchString(displayName, true);
-    }
-}

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

@@ -2,103 +2,47 @@ package com.glodblock.github.client.gui;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
 
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
-import com.glodblock.github.common.parts.PartLevelTerminal;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.network.CPacketLevelTerminalCommands;
-import com.glodblock.github.util.Util;
-
-import appeng.api.util.DimensionalCoord;
+import appeng.api.parts.ILevelEmitter;
+import appeng.client.gui.IGuiSub;
 import appeng.client.gui.implementations.GuiLevelEmitter;
 import appeng.client.gui.widgets.GuiTabButton;
-import appeng.container.AEBaseContainer;
-import appeng.parts.automation.PartLevelEmitter;
+import appeng.container.interfaces.IContainerSubGui;
+import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.PacketSwitchGuis;
 
-public class GuiLevelEmitterProxy extends GuiLevelEmitter {
+public class GuiLevelEmitterProxy extends GuiLevelEmitter implements IGuiSub {
 
-    protected GuiType originalGui;
-    protected Util.DimensionalCoordSide originalBlockPos;
-    protected ItemStack originalGuiIcon;
-    protected GuiTabButton originalGuiBtn;
+    protected final IContainerSubGui container;
+    protected GuiTabButton originalGuiBtn;;
 
-    public GuiLevelEmitterProxy(final InventoryPlayer inventoryPlayer, final PartLevelEmitter te) {
+    public GuiLevelEmitterProxy(final InventoryPlayer inventoryPlayer, final ILevelEmitter te) {
         super(inventoryPlayer, te);
-
-        if (inventoryPlayer.player.openContainer instanceof AEBaseContainer container) {
-            var target = container.getTarget();
-            if (target instanceof PartLevelTerminal terminal) {
-                originalGuiIcon = ItemAndBlockHolder.LEVEL_TERMINAL.stack();
-                originalGui = GuiType.LEVEL_TERMINAL;
-                DimensionalCoord blockPos = new DimensionalCoord(terminal.getTile());
-                originalBlockPos = new Util.DimensionalCoordSide(
-                        blockPos.x,
-                        blockPos.y,
-                        blockPos.z,
-                        blockPos.getDimension(),
-                        terminal.getSide(),
-                        "");
-            } else if (target instanceof IWirelessTerminal terminal && terminal.isUniversal(target)) {
-                originalGuiIcon = ItemAndBlockHolder.WIRELESS_ULTRA_TERM.stack();
-                originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack());
-                originalBlockPos = new Util.DimensionalCoordSide(
-                        terminal.getInventorySlot(),
-                        Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM),
-                        0,
-                        inventoryPlayer.player.worldObj.provider.dimensionId,
-                        ForgeDirection.UNKNOWN,
-                        "");
-            } else if (target instanceof WirelessLevelTerminalInventory terminal) {
-                originalGuiIcon = ItemAndBlockHolder.WIRELESS_LEVEL_TERM.stack();
-                originalGui = GuiType.WIRELESS_LEVEL_TERMINAL;
-                originalBlockPos = new Util.DimensionalCoordSide(
-                        terminal.getInventorySlot(),
-                        Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM),
-                        0,
-                        inventoryPlayer.player.worldObj.provider.dimensionId,
-                        ForgeDirection.UNKNOWN,
-                        "");
-
-            }
-        }
+        this.container = (IContainerSubGui) inventorySlots;
+        this.container.setGuiLink(this);
     }
 
     @Override
     public void initGui() {
         super.initGui();
+        if (container.getPrimaryGuiIcon() != null) initPrimaryGuiButton();
+    }
 
-        if (this.originalGuiIcon != null) {
-            this.originalGuiBtn = new GuiTabButton(
-                    this.guiLeft + 151,
-                    this.guiTop - 4,
-                    this.originalGuiIcon,
-                    this.originalGuiIcon.getDisplayName(),
-                    itemRender);
-            this.originalGuiBtn.setHideEdge(13);
-            this.buttonList.add(originalGuiBtn);
-        }
+    public void initPrimaryGuiButton() {
+        this.buttonList.add(
+                this.originalGuiBtn = new GuiTabButton(
+                        this.guiLeft + this.xSize - 57,
+                        this.guiTop,
+                        container.getPrimaryGuiIcon(),
+                        container.getPrimaryGuiIcon().getDisplayName(),
+                        itemRender));
     }
 
     @Override
     protected void actionPerformed(GuiButton btn) {
+        super.actionPerformed(btn);
         if (btn == this.originalGuiBtn) {
-            CPacketLevelTerminalCommands message = new CPacketLevelTerminalCommands(
-                    CPacketLevelTerminalCommands.Action.BACK,
-                    originalBlockPos.x,
-                    originalBlockPos.y,
-                    originalBlockPos.z,
-                    originalBlockPos.getDimension(),
-                    originalBlockPos.getSide());
-            message.setOriginalGui(originalGui.ordinal());
-            FluidCraft.proxy.netHandler.sendToServer(message);
-        } else {
-            super.actionPerformed(btn);
+            NetworkHandler.instance.sendToServer(new PacketSwitchGuis());
         }
     }
 }

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

@@ -2,61 +2,36 @@ package com.glodblock.github.client.gui;
 
 import java.text.NumberFormat;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
-import net.minecraftforge.common.util.ForgeDirection;
 
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.input.Keyboard;
-import org.lwjgl.opengl.GL11;
 
 import com.glodblock.github.FluidCraft;
-import com.glodblock.github.api.registries.LevelState;
 import com.glodblock.github.client.gui.container.ContainerLevelMaintainer;
-import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
-import com.glodblock.github.common.parts.PartLevelTerminal;
 import com.glodblock.github.common.tile.TileLevelMaintainer;
-import com.glodblock.github.inventory.gui.GuiType;
 import com.glodblock.github.inventory.gui.MouseRegionManager;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory;
-import com.glodblock.github.inventory.slot.SlotFluidConvertingFake;
-import com.glodblock.github.inventory.slot.SlotSingleItem;
-import com.glodblock.github.loader.ItemAndBlockHolder;
 import com.glodblock.github.network.CPacketLevelMaintainer;
 import com.glodblock.github.network.CPacketLevelMaintainer.Action;
-import com.glodblock.github.network.CPacketLevelTerminalCommands;
 import com.glodblock.github.util.FCGuiColors;
 import com.glodblock.github.util.NameConst;
-import com.glodblock.github.util.Util;
 
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.util.DimensionalCoord;
-import appeng.client.gui.AEBaseGui;
+import appeng.api.features.LevelState;
+import appeng.api.storage.data.IAEStack;
+import appeng.client.gui.GuiSub;
+import appeng.client.gui.slots.VirtualMEPhantomSlot;
 import appeng.client.gui.widgets.GuiTabButton;
-import appeng.container.AEBaseContainer;
-import appeng.container.slot.SlotFake;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketNEIDragClick;
 import appeng.util.calculators.ArithHelper;
 import appeng.util.calculators.Calculator;
-import codechicken.nei.VisiblityData;
-import codechicken.nei.api.INEIGuiHandler;
-import codechicken.nei.api.TaggedInventoryArea;
 import cofh.core.render.CoFHFontRenderer;
-import cpw.mods.fml.common.Optional;
 
-@Optional.Interface(modid = "NotEnoughItems", iface = "codechicken.nei.api.INEIGuiHandler")
-public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
+public class GuiLevelMaintainer extends GuiSub {
 
     private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/level_maintainer.png");
     private final ContainerLevelMaintainer cont;
@@ -64,11 +39,6 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
     private final MouseRegionManager mouseRegions = new MouseRegionManager(this);
     private Widget focusedWidget;
     private final CoFHFontRenderer render;
-    protected ItemStack icon = null;
-
-    protected GuiType originalGui;
-    protected Util.DimensionalCoordSide originalBlockPos;
-    protected GuiTabButton originalGuiBtn;
 
     public GuiLevelMaintainer(InventoryPlayer ipl, TileLevelMaintainer tile) {
         super(new ContainerLevelMaintainer(ipl, tile));
@@ -80,48 +50,23 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
                 TEX_BG,
                 Minecraft.getMinecraft().getTextureManager(),
                 true);
-
-        if (ipl.player.openContainer instanceof AEBaseContainer container) {
-            var target = container.getTarget();
-            if (target instanceof PartLevelTerminal terminal) {
-                icon = ItemAndBlockHolder.LEVEL_TERMINAL.stack();
-                originalGui = GuiType.LEVEL_TERMINAL;
-                DimensionalCoord blockPos = new DimensionalCoord(terminal.getTile());
-                originalBlockPos = new Util.DimensionalCoordSide(
-                        blockPos.x,
-                        blockPos.y,
-                        blockPos.z,
-                        blockPos.getDimension(),
-                        terminal.getSide(),
-                        "");
-            } else if (target instanceof IWirelessTerminal terminal && terminal.isUniversal(target)) {
-                icon = ItemAndBlockHolder.WIRELESS_ULTRA_TERM.stack();
-                originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack());
-                originalBlockPos = new Util.DimensionalCoordSide(
-                        terminal.getInventorySlot(),
-                        Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM),
-                        0,
-                        ipl.player.worldObj.provider.dimensionId,
-                        ForgeDirection.UNKNOWN,
-                        "");
-            } else if (target instanceof WirelessLevelTerminalInventory terminal) {
-                icon = ItemAndBlockHolder.WIRELESS_LEVEL_TERM.stack();
-                originalGui = GuiType.WIRELESS_LEVEL_TERMINAL;
-                originalBlockPos = new Util.DimensionalCoordSide(
-                        terminal.getInventorySlot(),
-                        Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM),
-                        0,
-                        ipl.player.worldObj.provider.dimensionId,
-                        ForgeDirection.UNKNOWN,
-                        "");
-
-            }
-        }
     }
 
     @Override
     public void initGui() {
         super.initGui();
+
+        for (int i = 0; i < TileLevelMaintainer.REQ_COUNT; i++) {
+            VirtualMEPhantomSlot slot = new VirtualMEPhantomSlot(
+                    27,
+                    20 + i * 19,
+                    this.cont.getTile().getAEStackInventory(),
+                    i);
+            slot.setShowAmount(true);
+            slot.setShowAmountAlways(true);
+            this.registerVirtualSlots(slot);
+        }
+
         for (int i = 0; i < TileLevelMaintainer.REQ_COUNT; i++) {
             component[i] = new Component(
                     new Widget(
@@ -141,16 +86,18 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
                     this.buttonList,
                     this.cont);
         }
-        if (this.icon != null) {
-            this.originalGuiBtn = new GuiTabButton(
-                    this.guiLeft + 151,
-                    this.guiTop - 4,
-                    this.icon,
-                    this.icon.getDisplayName(),
-                    itemRender);
-            this.originalGuiBtn.setHideEdge(13);
-            this.buttonList.add(originalGuiBtn);
-        }
+    }
+
+    @Override
+    public void initPrimaryGuiButton() {
+        this.originalGuiBtn = new GuiTabButton(
+                this.guiLeft + 151,
+                this.guiTop - 4,
+                this.cont.getPrimaryGuiIcon(),
+                this.cont.getPrimaryGuiIcon().getDisplayName(),
+                itemRender);
+        this.originalGuiBtn.setHideEdge(13);
+        this.buttonList.add(originalGuiBtn);
     }
 
     @Override
@@ -179,36 +126,6 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
         mouseRegions.render(mouseX, mouseY);
     }
 
-    @Override
-    public void func_146977_a(final Slot s) {
-        if (drawSlot0(s)) super.func_146977_a(s);
-    }
-
-    public boolean drawSlot0(Slot slot) {
-        if (slot instanceof SlotFake) {
-            IAEItemStack stack = ((SlotFluidConvertingFake) slot).getAeStack();
-            super.func_146977_a(new SlotSingleItem(slot));
-            if (stack == null) return true;
-            IAEItemStack fake = stack.copy();
-
-            Widget qty = this.component[slot.getSlotIndex()].getQty();
-            qty.validate();
-            fake.setStackSize(qty.getAmount() != null ? qty.getAmount() : 0);
-
-            GL11.glTranslatef(0.0f, 0.0f, 200.0f);
-            aeRenderItem.setAeStack(fake);
-            aeRenderItem.renderItemOverlayIntoGUI(
-                    fontRendererObj,
-                    mc.getTextureManager(),
-                    fake.getItemStack(),
-                    slot.xDisplayPosition,
-                    slot.yDisplayPosition);
-            GL11.glTranslatef(0.0f, 0.0f, -200.0f);
-            return false;
-        }
-        return true;
-    }
-
     @Override
     protected void mouseClicked(final int xCoord, final int yCoord, final int btn) {
         if (btn == 0) {
@@ -253,83 +170,12 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
 
     @Override
     protected void actionPerformed(final GuiButton btn) {
-        if (btn == originalGuiBtn) {
-            switchGui();
-        } else {
-            super.actionPerformed(btn);
-            for (Component com : this.component) {
-                if (com.sendToServer(btn)) {
-                    break;
-                }
+        for (Component com : this.component) {
+            if (com.sendToServer(btn)) {
+                return;
             }
         }
-    }
-
-    public void switchGui() {
-        CPacketLevelTerminalCommands message = new CPacketLevelTerminalCommands(
-                CPacketLevelTerminalCommands.Action.BACK,
-                originalBlockPos.x,
-                originalBlockPos.y,
-                originalBlockPos.z,
-                originalBlockPos.getDimension(),
-                originalBlockPos.getSide());
-        if (originalGui != null) {
-            message.setOriginalGui(originalGui.ordinal());
-        }
-        FluidCraft.proxy.netHandler.sendToServer(message);
-    }
-
-    @Override
-    public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) {
-        return currentVisibility;
-    }
-
-    @Override
-    public Iterable<Integer> getItemSpawnSlots(GuiContainer gui, ItemStack item) {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui) {
-        return null;
-    }
-
-    @Override
-    protected void handleMouseClick(Slot slot, int slotIdx, int ctrlDown, int mouseButton) {
-        if (slot instanceof SlotFluidConvertingFake && this.cont.getPlayerInv().getItemStack() == null) {
-            slot.putStack(null);
-            this.component[slot.getSlotIndex()].reset();
-        }
-        super.handleMouseClick(slot, slotIdx, ctrlDown, mouseButton);
-    }
-
-    @Override
-    public boolean handleDragNDrop(GuiContainer gui, int mouseX, int mouseY, ItemStack draggedStack, int button) {
-        if (draggedStack == null) {
-            return false;
-        }
-
-        draggedStack.stackSize = 0;
-        Slot slotAtPosition = this.getSlotAtPosition(mouseX, mouseY);
-        if (slotAtPosition == null) {
-            return false;
-        }
-
-        for (int i = 0; i < this.cont.getRequestSlots().length; i++) {
-            SlotFluidConvertingFake slot = this.cont.getRequestSlots()[i];
-            if (slotAtPosition.equals(slot)) {
-                slot.putStack(draggedStack);
-                component[i].reset();
-                NetworkHandler.instance.sendToServer(new PacketNEIDragClick(draggedStack, slot.getSlotIndex()));
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) {
-        return false;
+        super.actionPerformed(btn);
     }
 
     public void updateComponent(int index, long quantity, long batchSize, boolean isEnabled, LevelState state) {
@@ -383,8 +229,12 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
             this.isEnable = enable;
         }
 
+        public IAEStack<?> getStack() {
+            return this.container.getTile().getAEStackInventory().getAEStackInSlot(this.getIndex());
+        }
+
         private void send(Widget widget) {
-            if (cont.inventorySlots.get(widget.componentIndex).getHasStack() && widget.getAmount() != null) {
+            if (this.getStack() != null && widget.getAmount() != null) {
                 FluidCraft.proxy.netHandler.sendToServer(
                         new CPacketLevelMaintainer(widget.action, widget.componentIndex, widget.getAmount()));
             }
@@ -416,7 +266,7 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
                 FluidCraft.proxy.netHandler.sendToServer(new CPacketLevelMaintainer(Action.Enable, this.getIndex()));
                 didSomething = true;
             } else if (this.disable == btn) {
-                if (this.container.getInventory().get(this.getIndex()) != null) {
+                if (this.getStack() != null) {
                     this.setEnable(true);
                     FluidCraft.proxy.netHandler
                             .sendToServer(new CPacketLevelMaintainer(Action.Disable, this.getIndex()));
@@ -525,15 +375,6 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
         public void setState(LevelState state) {
             this.state = state;
         }
-
-        public void reset() {
-            this.qty.textField.setText("0");
-            this.batch.textField.setText("0");
-            this.qty.validate();
-            this.batch.validate();
-            this.setEnable(false);
-            this.setState(LevelState.None);
-        }
     }
 
     private class Widget {
@@ -592,6 +433,12 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler {
                 this.amount = (long) ArithHelper.round(result, 0);
                 this.textField.setTextColor(0xFFFFFF);
             }
+
+            IAEStack<?> stack = component[this.componentIndex].getStack();
+            if (stack != null) {
+                Long amount = component[this.componentIndex].getQty().getAmount();
+                stack.setStackSize(amount != null ? amount : 0);
+            }
         }
 
         @Nullable

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

@@ -1,7 +1,5 @@
 package com.glodblock.github.client.gui;
 
-import static com.glodblock.github.common.item.ItemWirelessUltraTerminal.hasInfinityBoosterCard;
-
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -35,16 +33,10 @@ import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
 import com.glodblock.github.FluidCraft;
-import com.glodblock.github.api.registries.LevelItemInfo;
-import com.glodblock.github.api.registries.LevelState;
 import com.glodblock.github.client.gui.base.FCBaseMEGui;
 import com.glodblock.github.client.gui.container.ContainerLevelTerminal;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.network.CPacketInventoryAction;
 import com.glodblock.github.network.CPacketLevelTerminalCommands;
 import com.glodblock.github.network.CPacketLevelTerminalCommands.Action;
-import com.glodblock.github.network.CPacketRenamer;
 import com.glodblock.github.network.SPacketLevelTerminalUpdate;
 import com.glodblock.github.util.FCGuiColors;
 import com.glodblock.github.util.ModAndClassUtil;
@@ -55,7 +47,10 @@ import appeng.api.config.Settings;
 import appeng.api.config.TerminalFontSize;
 import appeng.api.config.TerminalStyle;
 import appeng.api.config.YesNo;
+import appeng.api.features.LevelItemInfo;
+import appeng.api.features.LevelState;
 import appeng.api.storage.ITerminalHost;
+import appeng.api.storage.data.IAEStack;
 import appeng.client.gui.IGuiTooltipHandler;
 import appeng.client.gui.widgets.GuiImgButton;
 import appeng.client.gui.widgets.GuiScrollbar;
@@ -70,12 +65,14 @@ 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;
+import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.PacketSwitchGuis;
 import appeng.helpers.InventoryAction;
 import appeng.integration.IntegrationRegistry;
 import appeng.integration.IntegrationType;
 import appeng.util.Platform;
 import appeng.util.ReadableNumberConverter;
-import appeng.util.item.AEItemStack;
 import cpw.mods.fml.common.Loader;
 
 public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextField, IGuiTooltipHandler {
@@ -86,7 +83,6 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
     public static final int VIEW_LEFT = 8;
     private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/level_terminal.png");
     private static final RenderItem renderItem = new RenderItem();
-    protected int offsetY;
     private static final int offsetX = 21;
     protected static String searchFieldOutputsText = "";
     protected static String searchFieldNamesText = "";
@@ -147,16 +143,6 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
         this(inventoryPlayer, new ContainerLevelTerminal(inventoryPlayer, te));
     }
 
-    @Override
-    public int getOffsetY() {
-        return offsetY;
-    }
-
-    @Override
-    public void setOffsetY(int y) {
-        offsetY = y;
-    }
-
     private void setScrollBar() {
         int maxScroll = masterList.getHeight() - viewHeight - 1;
         if (maxScroll <= 0) {
@@ -174,7 +160,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
         final int unusedSpace = height - ySize;
         guiTop = (int) Math.floor(unusedSpace / (unusedSpace < 0 ? 3.8f : 2.0f));
 
-        offsetY = guiTop + 8;
+        int offsetY = guiTop + 8;
         terminalStyleBox = new GuiImgButton(
                 guiLeft - 18,
                 offsetY,
@@ -213,7 +199,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
 
         setScrollBar();
         repositionSlots();
-        initGuiDone();
+        initCustomButtons(0, offsetY);
     }
 
     @Override
@@ -274,12 +260,6 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
     public void drawScreen(final int mouseX, final int mouseY, final float btn) {
         terminalStyleBox.set(AEConfig.instance.settings.getSetting(Settings.TERMINAL_STYLE));
 
-        buttonList.clear();
-        buttonList.add(terminalStyleBox);
-        buttonList.add(searchStringSave);
-        buttonList.add(craftingStatusBtn);
-        addSwitchGuiBtns();
-
         super.drawScreen(mouseX, mouseY, btn);
 
         handleTooltip(mouseX, mouseY, searchFieldOutputs);
@@ -309,7 +289,8 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
 
     @Override
     protected void actionPerformed(final GuiButton btn) {
-            if (ModAndClassUtil.isSaveText && btn == searchStringSave) {
+        if (actionPerformedCustomButtons(btn)) return;
+        if (ModAndClassUtil.isSaveText && btn == searchStringSave) {
 
             final boolean backwards = Mouse.isButtonDown(1);
             final GuiImgButton iBtn = (GuiImgButton) btn;
@@ -320,7 +301,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
             searchStringSave.set(next);
 
         } else if (btn == craftingStatusBtn) {
-            InventoryHandler.switchGui(GuiType.CRAFTING_STATUS);
+            NetworkHandler.instance.sendToServer(new PacketSwitchGuis(GuiBridge.GUI_CRAFTING_STATUS));
         } else if (btn instanceof final GuiImgButton iBtn) {
             if (iBtn.getSetting() != Settings.ACTIONS) {
                 final Enum<?> cv = iBtn.getCurrentValue();
@@ -521,7 +502,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
             entry.renameButton.yPosition = viewY + 1;
             entry.configButton.yPosition = viewY + 1;
             GuiFCImgButton toRender;
-            if (isCtrlKeyDown() && isShiftKeyDown() && hasInfinityBoosterCard(player)) {
+            if (isCtrlKeyDown() && isShiftKeyDown()) {
                 toRender = entry.configButton;
             } else if (isShiftKeyDown()) {
                 toRender = entry.renameButton;
@@ -561,7 +542,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
                         && relMouseY >= Math.max(viewY + rowYTop, LevelTerminalSection.TITLE_HEIGHT)
                         && relMouseY < Math.min(viewY + rowYBot, viewHeight);
                 if (info != null) {
-                    ItemStack itemStack = info.stack;
+                    IAEStack<?> aes = info.stack;
                     long quantity = info.quantity;
                     long batch = info.batchSize;
                     LevelState state = info.state;
@@ -570,10 +551,10 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
                     GL11.glTranslatef(colLeft, viewY + rowYTop + 1, ITEM_STACK_Z);
                     GL11.glEnable(GL12.GL_RESCALE_NORMAL);
                     RenderHelper.enableGUIStandardItemLighting();
-                    itemStack.stackSize = 0;
+                    aes.setStackSize(1);
                     renderItem.zLevel = ITEM_STACK_Z - MAGIC_RENDER_ITEM_Z;
-                    renderItem.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), itemStack, 0, 0);
-                    renderItem.renderItemOverlayIntoGUI(fontRendererObj, mc.getTextureManager(), itemStack, 0, 0);
+                    aes.drawInGui(mc, 0, 0);
+                    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();
@@ -601,7 +582,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
                             drawRect(0, 0, 16, 16, GuiColors.ItemSlotOverlayUnpowered.getColor());
                         }
                     } else {
-                        tooltipStack = itemStack;
+                        tooltipStack = Platform.stackConvert(aes).getItemStack();
                     }
                     GL11.glPopMatrix();
                 } else if (entry.filteredRecipes[slotIdx]) {
@@ -1122,7 +1103,9 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
                             continue;
                         }
 
-                        if (itemStackMatchesSearchTerm(entry.infoList[i].stack, output)) {
+                        if (itemStackMatchesSearchTerm(
+                                Platform.stackConvert(entry.infoList[i].stack).getItemStack(),
+                                output)) {
                             shouldAdd = true;
                             entry.filteredRecipes[i] = false;
                         } else {
@@ -1252,12 +1235,14 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
                                     blockPos.getSide()));
                 } else if (isShiftKeyDown()) {
                     FluidCraft.proxy.netHandler.sendToServer(
-                            new CPacketRenamer(
+                            new CPacketLevelTerminalCommands(
+                                    Action.RENAME,
                                     blockPos.x,
                                     blockPos.y,
                                     blockPos.z,
                                     blockPos.getDimension(),
                                     blockPos.getSide()));
+
                 } else {
                     BlockPosHighlighter.highlightBlocks(
                             mc.thePlayer,
@@ -1294,9 +1279,10 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel
                 };
 
                 if (action != null && this.infoList[slotIdx] != null) {
-                    AEItemStack aeStack = AEItemStack.create(this.infoList[slotIdx].stack);
+                    IAEStack<?> aeStack = this.infoList[slotIdx].stack;
                     ((AEBaseContainer) inventorySlots).setTargetStack(aeStack);
-                    FluidCraft.proxy.netHandler.sendToServer(new CPacketInventoryAction(action, slotIdx, 0, aeStack));
+                    // FluidCraft.proxy.netHandler.sendToServer(new CPacketInventoryAction(action, slotIdx, 0,
+                    // aeStack));
                 }
 
                 return true;

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

@@ -8,8 +8,6 @@ import org.lwjgl.input.Keyboard;
 
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.client.gui.container.ContainerMagnetFilter;
-import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
-import com.glodblock.github.inventory.InventoryHandler;
 import com.glodblock.github.inventory.item.WirelessMagnet;
 import com.glodblock.github.network.CPacketFluidPatternTermBtns;
 import com.glodblock.github.util.NameConst;
@@ -17,12 +15,11 @@ import com.glodblock.github.util.NameConst;
 import appeng.api.config.ActionItems;
 import appeng.api.config.Settings;
 import appeng.api.storage.ITerminalHost;
-import appeng.client.gui.AEBaseMEGui;
+import appeng.client.gui.GuiSub;
 import appeng.client.gui.widgets.GuiImgButton;
-import appeng.client.gui.widgets.GuiTabButton;
 import appeng.client.gui.widgets.MEGuiTextField;
 
-public class GuiMagnetFilter extends AEBaseMEGui {
+public class GuiMagnetFilter extends GuiSub {
 
     protected FCGuiBaseButton listModeBtn;
     protected ContainerMagnetFilter cont;
@@ -30,12 +27,11 @@ public class GuiMagnetFilter extends AEBaseMEGui {
 
     protected Component[] components = new Component[4];
     protected MEGuiTextField oreDict;
-    protected GuiTabButton originalGuiBtn;
     protected GuiImgButton clearBtn;
 
     public GuiMagnetFilter(InventoryPlayer ip, ITerminalHost container) {
         super(new ContainerMagnetFilter(ip, container));
-        this.xSize = 195;
+        this.xSize = 176;
         this.ySize = 214;
         this.cont = (ContainerMagnetFilter) this.inventorySlots;
         oreDict = new MEGuiTextField(149, 12, NameConst.i18n(NameConst.TT_MAGNET_CARD_OREDICT));
@@ -45,10 +41,10 @@ public class GuiMagnetFilter extends AEBaseMEGui {
 
         private final GuiFCImgButton enable;
         private final GuiFCImgButton disable;
-        private final String action;
+        private final CPacketFluidPatternTermBtns.Command action;
         private boolean var;
 
-        public Component(int x, int y, boolean var, String action) {
+        public Component(int x, int y, boolean var, CPacketFluidPatternTermBtns.Command action) {
             this.enable = new GuiFCImgButton(x, y, "ENABLE_12x", "ENABLE", false);
             this.disable = new GuiFCImgButton(x, y, "DISABLE_12x", "DISABLE", false);
             this.var = var;
@@ -106,36 +102,27 @@ public class GuiMagnetFilter extends AEBaseMEGui {
                 this.guiLeft + 157,
                 this.guiTop + 18,
                 this.cont.nbt,
-                "WirelessTerminal.magnet.NBT");
+                CPacketFluidPatternTermBtns.Command.MAGNET_FILTER_NBT);
         this.components[1] = new Component(
                 this.guiLeft + 157,
                 this.guiTop + 31,
                 this.cont.meta,
-                "WirelessTerminal.magnet.Meta");
+                CPacketFluidPatternTermBtns.Command.MAGNET_FILTER_META);
         this.components[2] = new Component(
                 this.guiLeft + 157,
                 this.guiTop + 44,
                 this.cont.ore,
-                "WirelessTerminal.magnet.Ore");
+                CPacketFluidPatternTermBtns.Command.MAGNET_FILTER_ORE);
         this.components[3] = new Component(
                 this.guiLeft + 157,
                 this.guiTop + 112,
                 this.cont.oreDict,
-                "WirelessTerminal.magnet.OreDictState");
+                CPacketFluidPatternTermBtns.Command.MAGNET_FILTER_OREDICT_STATE);
 
         oreDict.x = this.guiLeft + 7;
         oreDict.y = this.guiTop + 112;
         oreDict.setText(this.cont.oreDictFilter);
 
-        this.buttonList.add(
-                this.originalGuiBtn = new GuiTabButton(
-                        this.guiLeft + this.xSize - 44,
-                        this.guiTop - 4,
-                        this.cont.getPortableCell().getItemStack(),
-                        this.cont.getPortableCell().getItemStack().getDisplayName(),
-                        itemRender));
-        this.originalGuiBtn.setHideEdge(13); // GuiTabButton implementation //
-
         this.clearBtn = new GuiImgButton(this.guiLeft + 7, this.guiTop + 48, Settings.ACTIONS, ActionItems.CLOSE);
         this.clearBtn.setHalfSize(true);
         this.buttonList.add(this.clearBtn);
@@ -176,7 +163,9 @@ public class GuiMagnetFilter extends AEBaseMEGui {
     protected void keyTyped(char typedChar, int keyCode) {
         if (oreDict.isFocused() && (Keyboard.KEY_NUMPADENTER == keyCode || Keyboard.KEY_RETURN == keyCode)) {
             FluidCraft.proxy.netHandler.sendToServer(
-                    new CPacketFluidPatternTermBtns("WirelessTerminal.magnet.OreDictFilter", oreDict.getText()));
+                    new CPacketFluidPatternTermBtns(
+                            CPacketFluidPatternTermBtns.Command.MAGNET_FILTER_OREDICT_FILTER,
+                            oreDict.getText()));
         }
 
         if (!oreDict.textboxKeyTyped(typedChar, keyCode)) super.keyTyped(typedChar, keyCode);
@@ -199,13 +188,11 @@ public class GuiMagnetFilter extends AEBaseMEGui {
         if (btn == this.listModeBtn) {
             FluidCraft.proxy.netHandler.sendToServer(
                     new CPacketFluidPatternTermBtns(
-                            "WirelessTerminal.magnet.FilterMode",
+                            CPacketFluidPatternTermBtns.Command.MAGNET_FILTER_MODE,
                             this.cont.listMode != WirelessMagnet.ListMode.WhiteList));
-        } else if (btn == this.originalGuiBtn) {
-            InventoryHandler.switchGui(ItemWirelessUltraTerminal.readMode(this.cont.getPortableCell().getItemStack()));
         } else if (btn == this.clearBtn) {
-            FluidCraft.proxy.netHandler
-                    .sendToServer(new CPacketFluidPatternTermBtns("WirelessTerminal.magnet.clear", 1));
+            FluidCraft.proxy.netHandler.sendToServer(
+                    new CPacketFluidPatternTermBtns(CPacketFluidPatternTermBtns.Command.MAGNET_FILTER_CLEAR, 1));
         }
         super.actionPerformed(btn);
     }

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

@@ -1,55 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.entity.player.InventoryPlayer;
-
-import org.lwjgl.input.Keyboard;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.common.parts.PartFluidTerminal;
-import com.glodblock.github.common.parts.PartLevelTerminal;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory;
-import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory;
-import com.glodblock.github.network.SPacketPatternItemRenamer;
-
-import appeng.api.storage.ITerminalHost;
-
-public class GuiPatternItemRenamer extends appeng.client.gui.implementations.GuiPatternItemRenamer {
-
-    private GuiType originalGui;
-
-    public GuiPatternItemRenamer(InventoryPlayer ip, ITerminalHost p) {
-        super(ip, p);
-    }
-
-    @Override
-    protected void setOriginGUI(Object target) {
-        if (target instanceof PartFluidPatternTerminal) {
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL;
-        } else if (target instanceof PartFluidPatternTerminalEx) {
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX;
-        } else if (target instanceof PartFluidTerminal) {
-            this.originalGui = GuiType.FLUID_TERMINAL;
-        } else if (target instanceof PartLevelTerminal) {
-            originalGui = GuiType.LEVEL_TERMINAL;
-        } else if (target instanceof IWirelessTerminal terminal && terminal.isUniversal(target)) {
-            this.originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack());
-        } else if (target instanceof WirelessPatternTerminalInventory) {
-            this.originalGui = GuiType.FLUID_TERMINAL;
-        } else if (target instanceof WirelessLevelTerminalInventory) {
-            originalGui = GuiType.WIRELESS_LEVEL_TERMINAL;
-        }
-    }
-
-    @Override
-    protected void keyTyped(final char character, final int key) {
-        if (key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER) {
-            FluidCraft.proxy.netHandler
-                    .sendToServer(new SPacketPatternItemRenamer(originalGui, getText(), getValueIndex()));
-        } else super.keyTyped(character, key);
-    }
-}

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

@@ -1,155 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.common.parts.PartFluidTerminal;
-import com.glodblock.github.common.parts.PartLevelTerminal;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory;
-import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.network.CPacketPatternMultiSet;
-
-import appeng.api.config.ActionItems;
-import appeng.api.config.Settings;
-import appeng.api.storage.ITerminalHost;
-import appeng.client.gui.implementations.GuiAmount;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.container.implementations.ContainerPatternMulti;
-import appeng.core.localization.GuiColors;
-import appeng.core.localization.GuiText;
-import appeng.helpers.Reflected;
-import appeng.util.calculators.ArithHelper;
-import appeng.util.calculators.Calculator;
-
-public class GuiPatternMulti extends GuiAmount {
-
-    private static final int DEFAULT_VALUE = 0;
-    private GuiImgButton symbolSwitch;
-    protected GuiType originalGui;
-
-    @Reflected
-    public GuiPatternMulti(final InventoryPlayer inventoryPlayer, final ITerminalHost te) {
-        super(new ContainerPatternMulti(inventoryPlayer, te));
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-
-        this.buttonList.add(
-                this.symbolSwitch = new GuiImgButton(
-                        this.guiLeft + 22,
-                        this.guiTop + 53,
-                        Settings.ACTIONS,
-                        ActionItems.MULTIPLY));
-
-        this.amountTextField.x = this.guiLeft + 48;
-        this.amountTextField.w = 73;
-        this.amountTextField.setText(String.valueOf(DEFAULT_VALUE));
-        this.amountTextField.setCursorPositionEnd();
-        this.amountTextField.setSelectionPos(0);
-    }
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        this.fontRendererObj
-                .drawString(GuiText.SelectAmount.getLocal(), 8, 6, GuiColors.CraftAmountSelectAmount.getColor());
-    }
-
-    @Override
-    public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        super.drawBG(offsetX, offsetY, mouseX, mouseY);
-        this.nextBtn.displayString = GuiText.Set.getLocal();
-
-        try {
-            int resultI = getAmount();
-
-            this.symbolSwitch.set(resultI >= 0 ? ActionItems.MULTIPLY : ActionItems.DIVIDE);
-            this.nextBtn.enabled = resultI < -1 || resultI > 1;
-        } catch (final NumberFormatException e) {
-            this.nextBtn.enabled = false;
-        }
-
-        this.amountTextField.drawTextBox();
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        super.actionPerformed(btn);
-
-        try {
-
-            if (btn == this.nextBtn && btn.enabled) {
-                int resultI = getAmount();
-                if (resultI > 1 || resultI < -1)
-                    FluidCraft.proxy.netHandler.sendToServer(new CPacketPatternMultiSet(this.originalGui, resultI));
-            }
-        } catch (final NumberFormatException e) {
-            // nope..
-            this.amountTextField.setText(String.valueOf(DEFAULT_VALUE));
-        }
-
-        if (btn == this.symbolSwitch) {
-            int resultI = -getAmount();
-            this.amountTextField.setText(Integer.toString(resultI));
-        }
-
-    }
-
-    @Override
-    protected int getAmount() {
-        String out = this.amountTextField.getText();
-
-        double resultD = Calculator.conversion(out);
-
-        if (Double.isNaN(resultD)) {
-            return DEFAULT_VALUE;
-        } else {
-            return (int) ArithHelper.round(resultD, 0);
-        }
-    }
-
-    @Override
-    protected void addAmount(int i) {
-        this.amountTextField.setText(Long.toString(i + getAmount()));
-        this.amountTextField.setCursorPositionEnd();
-    }
-
-    @Override
-    protected String getBackground() {
-        return "guis/patternMulti.png";
-    }
-
-    @Override
-    protected void setOriginGUI(Object target) {
-        if (target instanceof PartFluidPatternTerminal) {
-            this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL.stack();
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL;
-        } else if (target instanceof PartFluidPatternTerminalEx) {
-            this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL_EX.stack();
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX;
-        } else if (target instanceof PartFluidTerminal) {
-            this.myIcon = ItemAndBlockHolder.FLUID_TERM.stack();
-            this.originalGui = GuiType.FLUID_TERMINAL;
-        } else if (target instanceof PartLevelTerminal) {
-            myIcon = ItemAndBlockHolder.LEVEL_TERMINAL.stack();
-            originalGui = GuiType.LEVEL_TERMINAL;
-        } else if (target instanceof IWirelessTerminal terminal && terminal.isUniversal(target)) {
-            this.myIcon = ItemAndBlockHolder.WIRELESS_ULTRA_TERM.stack();
-            this.originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack());
-        } else if (target instanceof WirelessPatternTerminalInventory) {
-            this.myIcon = ItemAndBlockHolder.WIRELESS_PATTERN_TERM.stack();
-            this.originalGui = GuiType.FLUID_TERMINAL;
-        } else if (target instanceof WirelessLevelTerminalInventory) {
-            myIcon = ItemAndBlockHolder.LEVEL_TERMINAL.stack();
-            originalGui = GuiType.WIRELESS_LEVEL_TERMINAL;
-        }
-    }
-}

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

@@ -1,95 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.base.FCGuiAmount;
-import com.glodblock.github.client.gui.container.ContainerPatternValueAmount;
-import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.common.tile.TileSuperStockReplenisher;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.network.CPacketPatternValueSet;
-
-import appeng.core.localization.GuiText;
-
-public class GuiPatternValueAmount extends FCGuiAmount {
-
-    public GuiPatternValueAmount(final InventoryPlayer inventoryPlayer, final Object te) {
-        super(new ContainerPatternValueAmount(inventoryPlayer, te));
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-        this.submit.displayString = GuiText.Set.getLocal();
-    }
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        this.fontRendererObj.drawString(GuiText.SelectAmount.getLocal(), 8, 6, 0x404040);
-    }
-
-    @Override
-    public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        super.drawBG(offsetX, offsetY, mouseX, mouseY);
-        try {
-            int result = getAmount();
-            this.submit.enabled = result > 0;
-        } catch (final NumberFormatException e) {
-            this.submit.enabled = false;
-        }
-        this.amountBox.drawTextBox();
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        super.actionPerformed(btn);
-        try {
-            if (btn == this.submit && btn.enabled) {
-                FluidCraft.proxy.netHandler.sendToServer(
-                        new CPacketPatternValueSet(
-                                originalGui.ordinal(),
-                                getAmount(),
-                                ((ContainerPatternValueAmount) this.inventorySlots).getValueIndex()));
-            }
-        } catch (final NumberFormatException e) {
-            this.amountBox.setText("1");
-        }
-    }
-
-    @Override
-    protected void setOriginGUI(Object target) {
-        if (target instanceof PartFluidPatternTerminal) {
-            this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL.stack();
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL;
-        } else if (target instanceof PartFluidPatternTerminalEx) {
-            this.myIcon = ItemAndBlockHolder.FLUID_TERMINAL_EX.stack();
-            this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX;
-        } else if (target instanceof IWirelessTerminal terminal && terminal.isUniversal(target)) {
-            this.myIcon = ItemAndBlockHolder.WIRELESS_ULTRA_TERM.stack();
-            this.originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack());
-        } else if (target instanceof WirelessPatternTerminalInventory) {
-            this.myIcon = ItemAndBlockHolder.WIRELESS_PATTERN_TERM.stack();
-            this.originalGui = GuiType.WIRELESS_FLUID_PATTERN_TERMINAL;
-        } else if (target instanceof TileSuperStockReplenisher) {
-            this.myIcon = ItemAndBlockHolder.SUPER_STOCK_RERPLENISHER.stack();
-            this.originalGui = GuiType.GUI_SUPER_STOCK_REPLENISHER;
-        }
-    }
-
-    @Override
-    protected String getBackground() {
-        return "guis/craftAmt.png";
-    }
-
-    public void setAmount(int amount) {
-        this.amountBox.setText(String.valueOf(amount));
-        this.amountBox.setSelectionPos(0);
-    }
-}

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

@@ -1,134 +0,0 @@
-package com.glodblock.github.client.gui;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-
-import org.lwjgl.input.Keyboard;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.ContainerRenamer;
-import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
-import com.glodblock.github.common.parts.PartLevelTerminal;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.inventory.item.WirelessInterfaceTerminalInventory;
-import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory;
-import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.network.CPacketRenamer;
-
-import appeng.api.storage.ITerminalHost;
-import appeng.client.gui.AEBaseGui;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.client.gui.widgets.IDropToFillTextField;
-import appeng.client.gui.widgets.MEGuiTextField;
-import appeng.core.localization.GuiColors;
-import appeng.core.localization.GuiText;
-
-public class GuiRenamer extends AEBaseGui implements IDropToFillTextField {
-
-    protected final MEGuiTextField textField;
-
-    protected final ITerminalHost host;
-    protected GuiTabButton originalGuiBtn;
-
-    protected ItemStack icon = null;
-
-    protected GuiType originalGui;
-
-    public GuiRenamer(InventoryPlayer ip, ITerminalHost monitorable) {
-        super(new ContainerRenamer(ip, monitorable));
-        this.host = monitorable;
-        this.xSize = 256;
-
-        this.textField = new MEGuiTextField(230, 12);
-        this.textField.setMaxStringLength(32);
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-        FluidCraft.proxy.netHandler.sendToServer(new CPacketRenamer(CPacketRenamer.Action.GET_TEXT));
-        if (host instanceof PartLevelTerminal) {
-            icon = ItemAndBlockHolder.LEVEL_TERMINAL.stack();
-            originalGui = GuiType.LEVEL_TERMINAL;
-        } else if (host instanceof IWirelessTerminal terminal && terminal.isUniversal(host)) {
-            icon = ItemAndBlockHolder.WIRELESS_ULTRA_TERM.stack();
-            originalGui = ItemWirelessUltraTerminal.readMode(terminal.getItemStack());
-        } else if (host instanceof WirelessLevelTerminalInventory) {
-            icon = ItemAndBlockHolder.WIRELESS_LEVEL_TERM.stack();
-            originalGui = GuiType.WIRELESS_LEVEL_TERMINAL;
-        } else if (host instanceof WirelessInterfaceTerminalInventory) {
-            icon = ItemAndBlockHolder.WIRELESS_INTERFACE_TERM.stack();
-            originalGui = GuiType.WIRELESS_INTERFACE_TERMINAL;
-        }
-        if (this.icon != null) {
-            this.buttonList.add(
-                    this.originalGuiBtn = new GuiTabButton(
-                            this.guiLeft + 231,
-                            this.guiTop - 4,
-                            this.icon,
-                            this.icon.getDisplayName(),
-                            itemRender));
-            this.originalGuiBtn.setHideEdge(13);
-        }
-        this.textField.x = this.guiLeft + 12;
-        this.textField.y = this.guiTop + 35;
-        this.textField.setFocused(true);
-    }
-
-    @Override
-    public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
-        this.fontRendererObj.drawString(GuiText.Renamer.getLocal(), 12, 8, GuiColors.RenamerTitle.getColor());
-    }
-
-    @Override
-    public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) {
-        this.bindTexture("guis/renamer.png");
-        this.drawTexturedModalRect(offsetX, offsetY, 0, 0, this.xSize, this.ySize);
-        this.textField.drawTextBox();
-    }
-
-    @Override
-    protected void mouseClicked(final int xCoord, final int yCoord, final int btn) {
-        this.textField.mouseClicked(xCoord, yCoord, btn);
-        super.mouseClicked(xCoord, yCoord, btn);
-    }
-
-    @Override
-    protected void keyTyped(final char character, final int key) {
-        if (key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER) {
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketRenamer(this.textField.getText()));
-        } else if (!this.textField.textboxKeyTyped(character, key)) {
-            super.keyTyped(character, key);
-        }
-    }
-
-    public boolean isOverTextField(final int mousex, final int mousey) {
-        return textField.isMouseIn(mousex, mousey);
-    }
-
-    @Override
-    protected void actionPerformed(GuiButton button) {
-        if (button == originalGuiBtn) {
-            switchGui();
-        } else {
-            super.actionPerformed(button);
-        }
-    }
-
-    public void switchGui() {
-        if (originalGui != null) {
-            InventoryHandler.switchGui(originalGui);
-        }
-    }
-
-    public void setTextFieldValue(final String displayName, final int mousex, final int mousey, final ItemStack stack) {
-        textField.setText(displayName);
-    }
-
-    public void postUpdate(String text) {
-        this.textField.setText(text);
-    }
-}

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

@@ -14,15 +14,18 @@ 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.network.CPacketInventoryAction;
 
+import appeng.api.storage.StorageName;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
 import appeng.client.gui.AEBaseGui;
 import appeng.container.AEBaseContainer;
 import appeng.container.slot.SlotFake;
 import appeng.core.localization.GuiText;
-import appeng.helpers.InventoryAction;
+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;
 
 public class GuiSuperStockReplenisher extends AEBaseGui {
@@ -41,12 +44,14 @@ public class GuiSuperStockReplenisher extends AEBaseGui {
         if (mouseButton == 3) {
             if (slot instanceof SlotFake) {
                 if (slot.getHasStack()) {
-                    InventoryAction action = InventoryAction.SET_PATTERN_VALUE;
                     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))) {
-                            FluidCraft.proxy.netHandler.sendToServer(new CPacketInventoryAction(action, i, 0, stack));
+                            NetworkHandler.instance
+                                    .sendToServer(new PacketSwitchGuis(GuiBridge.GUI_PATTERN_VALUE_AMOUNT));
+                            NetworkHandler.instance
+                                    .sendToServer(new PacketVirtualSlot(StorageName.CRAFTING_INPUT, i, stack));
                         }
                     }
                     return;

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

@@ -1,68 +1,14 @@
 package com.glodblock.github.client.gui.base;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.GuiEssentiaTerminal;
-import com.glodblock.github.client.gui.GuiFCImgButton;
-import com.glodblock.github.client.gui.GuiFluidCraftingWireless;
-import com.glodblock.github.client.gui.GuiFluidPatternExWireless;
-import com.glodblock.github.client.gui.GuiFluidPatternWireless;
-import com.glodblock.github.client.gui.GuiFluidPortableCell;
-import com.glodblock.github.client.gui.GuiLevelWireless;
-import com.glodblock.github.client.gui.container.base.FCBaseContainer;
-import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.inventory.item.WirelessMagnet;
-import com.glodblock.github.network.CPacketFluidPatternTermBtns;
-import com.glodblock.github.util.ModAndClassUtil;
+import appeng.client.gui.AEBaseGui;
 
-import appeng.api.storage.StorageChannel;
-import appeng.client.gui.AEBaseMEGui;
-
-public abstract class FCBaseMEGui extends AEBaseMEGui {
-
-    protected GuiFCImgButton FluidTerminal;
-    protected GuiFCImgButton CraftingTerminal;
-    protected GuiFCImgButton PatternTerminal;
-    protected GuiFCImgButton EssentiaTerminal;
-    protected GuiFCImgButton InterfaceTerminal;
-    protected GuiFCImgButton LevelTerminal;
-    protected GuiFCImgButton PatternTerminalEx;
-    protected GuiFCImgButton magnetOff;
-    protected GuiFCImgButton magnetInv;
-    protected GuiFCImgButton magnetME;
-    protected GuiFCImgButton magnetFilter;
-    protected GuiFCImgButton restockEnableBtn;
-    protected GuiFCImgButton restockDisableBtn;
-    protected List<GuiFCImgButton> termBtns = new ArrayList<>();
-    protected boolean drawSwitchGuiBtn;
-    private StorageChannel channel = null;
+public abstract class FCBaseMEGui extends AEBaseGui {
 
     public FCBaseMEGui(final InventoryPlayer inventoryPlayer, Container container) {
         super(container);
-        if (container instanceof FCBaseContainer) {
-            Object target = ((FCBaseContainer) container).getTarget();
-            if (target instanceof IWirelessTerminal
-                    && ((IWirelessTerminal) target).getItemStack().getItem() instanceof ItemWirelessUltraTerminal) {
-                this.drawSwitchGuiBtn = true;
-                channel = ((IWirelessTerminal) target).getChannel();
-            }
-        }
-    }
-
-    protected WirelessMagnet.Mode getMagnetMode() {
-        return ((FCBaseContainer) this.inventorySlots).mode;
-    }
-
-    protected boolean isRestock() {
-        return ((FCBaseContainer) this.inventorySlots).restock;
     }
 
     @Override
@@ -70,128 +16,6 @@ public abstract class FCBaseMEGui extends AEBaseMEGui {
         super.onGuiClosed();
     }
 
-    protected void initGuiDone() {
-        if (drawSwitchGuiBtn) {
-            drawSwitchGuiBtns();
-        }
-    }
-
-    public abstract int getOffsetY();
-
-    public abstract void setOffsetY(int y);
-
-    protected void drawSwitchGuiBtns() {
-        if (!drawSwitchGuiBtn) return;
-        if (!termBtns.isEmpty()) {
-            this.termBtns.clear();
-        }
-        if (this.getMagnetMode() != null && this.channel == StorageChannel.ITEMS) {
-            this.buttonList.add(
-                    this.magnetOff = new GuiFCImgButton(
-                            this.guiLeft + this.xSize - 18,
-                            this.guiTop + this.ySize - 124,
-                            "MAGNET_CARD",
-                            "OFF"));
-            this.buttonList.add(
-                    this.magnetInv = new GuiFCImgButton(
-                            this.guiLeft + this.xSize - 18,
-                            this.guiTop + this.ySize - 124,
-                            "MAGNET_CARD",
-                            "INV"));
-            this.buttonList.add(
-                    this.magnetME = new GuiFCImgButton(
-                            this.guiLeft + this.xSize - 18,
-                            this.guiTop + this.ySize - 124,
-                            "MAGNET_CARD",
-                            "ME"));
-            this.buttonList.add(
-                    this.magnetFilter = new GuiFCImgButton(
-                            this.guiLeft + this.xSize - 18,
-                            this.guiTop + this.ySize - 104,
-                            "MAGNET_CARD",
-                            "FILTER"));
-        }
-        if (this.channel == StorageChannel.ITEMS) {
-            this.buttonList.add(
-                    this.restockEnableBtn = new GuiFCImgButton(
-                            this.guiLeft + this.xSize - 18,
-                            this.guiTop + this.ySize - 84,
-                            "RESTOCK",
-                            "ENABLE"));
-            this.buttonList.add(
-                    this.restockDisableBtn = new GuiFCImgButton(
-                            this.guiLeft + this.xSize - 18,
-                            this.guiTop + this.ySize - 84,
-                            "RESTOCK",
-                            "DISABLE"));
-        }
-        if (!(this instanceof GuiFluidCraftingWireless)) {
-            this.buttonList.add(
-                    this.CraftingTerminal = new GuiFCImgButton(
-                            this.guiLeft - 18,
-                            this.getOffsetY(),
-                            "CRAFT_TEM",
-                            "YES"));
-            this.setOffsetY(this.getOffsetY() + 20);
-            termBtns.add(this.CraftingTerminal);
-        }
-        if (!(this instanceof GuiFluidPatternWireless)) {
-            this.buttonList.add(
-                    this.PatternTerminal = new GuiFCImgButton(
-                            this.guiLeft - 18,
-                            this.getOffsetY(),
-                            "PATTERN_TEM",
-                            "YES"));
-            this.setOffsetY(this.getOffsetY() + 20);
-            termBtns.add(this.PatternTerminal);
-        }
-        if (!(this instanceof GuiFluidPatternExWireless)) {
-            this.buttonList.add(
-                    this.PatternTerminalEx = new GuiFCImgButton(
-                            this.guiLeft - 18,
-                            this.getOffsetY(),
-                            "PATTERN_EX_TEM",
-                            "YES"));
-            this.setOffsetY(this.getOffsetY() + 20);
-            termBtns.add(this.PatternTerminalEx);
-        }
-        if (!(this instanceof GuiFluidPortableCell)) {
-            this.buttonList.add(
-                    this.FluidTerminal = new GuiFCImgButton(this.guiLeft - 18, this.getOffsetY(), "FLUID_TEM", "YES"));
-            this.setOffsetY(this.getOffsetY() + 20);
-            termBtns.add(this.FluidTerminal);
-        }
-        this.buttonList.add(
-                this.InterfaceTerminal = new GuiFCImgButton(
-                        this.guiLeft - 18,
-                        this.getOffsetY(),
-                        "INTERFACE_TEM",
-                        "YES"));
-        this.setOffsetY(this.getOffsetY() + 20);
-        termBtns.add(this.InterfaceTerminal);
-        if (!(this instanceof GuiLevelWireless)) {
-            this.buttonList.add(
-                    this.LevelTerminal = new GuiFCImgButton(this.guiLeft - 18, this.getOffsetY(), "LEVEL_TEM", "YES"));
-            this.setOffsetY(this.getOffsetY() + 20);
-            termBtns.add(this.LevelTerminal);
-        }
-        if (ModAndClassUtil.ThE && !(this instanceof GuiEssentiaTerminal)) {
-            this.buttonList.add(
-                    this.EssentiaTerminal = new GuiFCImgButton(
-                            this.guiLeft - 18,
-                            this.getOffsetY(),
-                            "ESSENTIA_TEM",
-                            "YES"));
-            this.setOffsetY(this.getOffsetY() + 20);
-            termBtns.add(this.EssentiaTerminal);
-        }
-    }
-
-    protected void addSwitchGuiBtns() {
-        if (!drawSwitchGuiBtn) return;
-        this.buttonList.addAll(termBtns);
-    }
-
     private boolean scheduleGuiResize;
 
     @Override
@@ -213,53 +37,4 @@ public abstract class FCBaseMEGui extends AEBaseMEGui {
     protected final void scheduleGuiResize() {
         scheduleGuiResize = true;
     }
-
-    @Override
-    public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
-        if (isPortableCell()) return;
-        if (getMagnetMode() != null && this.channel == StorageChannel.ITEMS) {
-            GuiFCImgButton[] magnetButtons = { this.magnetOff, this.magnetInv, this.magnetME };
-            for (int i = 0; i < magnetButtons.length; i++) {
-                magnetButtons[i].visible = getMagnetMode().ordinal() == i;
-            }
-        }
-        if (this.drawSwitchGuiBtn && this.channel == StorageChannel.ITEMS) { // Only ultra terminal
-            this.restockDisableBtn.visible = !this.isRestock();
-            this.restockEnableBtn.visible = this.isRestock();
-        }
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        if (btn instanceof GuiFCImgButton) {
-            if (btn == this.FluidTerminal) {
-                ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_FLUID_TERMINAL);
-            } else if (btn == this.CraftingTerminal) {
-                ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_CRAFTING_TERMINAL);
-            } else if (btn == this.EssentiaTerminal) {
-                ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_ESSENTIA_TERMINAL);
-            } else if (btn == this.PatternTerminal) {
-                ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_FLUID_PATTERN_TERMINAL);
-            } else if (btn == this.InterfaceTerminal) {
-                ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_INTERFACE_TERMINAL);
-            } else if (btn == this.LevelTerminal) {
-                ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_LEVEL_TERMINAL);
-            } else if (btn == this.PatternTerminalEx) {
-                ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_FLUID_PATTERN_TERMINAL_EX);
-            } else if (btn == this.magnetOff || btn == this.magnetME || btn == this.magnetInv) {
-                FluidCraft.proxy.netHandler.sendToServer(
-                        new CPacketFluidPatternTermBtns("WirelessTerminal.MagnetMode", this.getMagnetMode().ordinal()));
-            } else if (btn == this.magnetFilter) {
-                FluidCraft.proxy.netHandler
-                        .sendToServer(new CPacketFluidPatternTermBtns("WirelessTerminal.OpenMagnet", 0));
-            } else if (btn == this.restockDisableBtn || btn == this.restockEnableBtn) {
-                FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("WirelessTerminal.Stock", 1));
-            }
-        }
-        super.actionPerformed(btn);
-    }
-
-    protected boolean isPortableCell() {
-        return false;
-    }
 }

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

@@ -1,152 +0,0 @@
-package com.glodblock.github.client.gui.base;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.inventory.Container;
-import net.minecraft.item.ItemStack;
-
-import org.lwjgl.input.Keyboard;
-
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-
-import appeng.client.gui.AEBaseGui;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.client.gui.widgets.MEGuiTextField;
-import appeng.container.AEBaseContainer;
-import appeng.core.AEConfig;
-import appeng.core.localization.GuiText;
-import appeng.util.calculators.ArithHelper;
-import appeng.util.calculators.Calculator;
-
-public abstract class FCGuiAmount extends AEBaseGui {
-
-    protected MEGuiTextField amountBox;
-    protected GuiTabButton originalGuiBtn;
-    protected GuiButton submit;
-    protected GuiButton plus1;
-    protected GuiButton plus10;
-    protected GuiButton plus100;
-    protected GuiButton plus1000;
-    protected GuiButton minus1;
-    protected GuiButton minus10;
-    protected GuiButton minus100;
-    protected GuiButton minus1000;
-    protected GuiType originalGui;
-    protected ItemStack myIcon;
-
-    public FCGuiAmount(Container container) {
-        super(container);
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-
-        final int a = getIncrementQuantity(0);
-        final int b = getIncrementQuantity(1);
-        final int c = getIncrementQuantity(2);
-        final int d = getIncrementQuantity(3);
-
-        this.buttonList.add(this.plus1 = new GuiButton(0, this.guiLeft + 20, this.guiTop + 26, 22, 20, "+" + a));
-        this.buttonList.add(this.plus10 = new GuiButton(0, this.guiLeft + 48, this.guiTop + 26, 28, 20, "+" + b));
-        this.buttonList.add(this.plus100 = new GuiButton(0, this.guiLeft + 82, this.guiTop + 26, 32, 20, "+" + c));
-        this.buttonList.add(this.plus1000 = new GuiButton(0, this.guiLeft + 120, this.guiTop + 26, 38, 20, "+" + d));
-
-        this.buttonList.add(this.minus1 = new GuiButton(0, this.guiLeft + 20, this.guiTop + 75, 22, 20, "-" + a));
-        this.buttonList.add(this.minus10 = new GuiButton(0, this.guiLeft + 48, this.guiTop + 75, 28, 20, "-" + b));
-        this.buttonList.add(this.minus100 = new GuiButton(0, this.guiLeft + 82, this.guiTop + 75, 32, 20, "-" + c));
-        this.buttonList.add(this.minus1000 = new GuiButton(0, this.guiLeft + 120, this.guiTop + 75, 38, 20, "-" + d));
-
-        this.buttonList.add(
-                this.submit = new GuiButton(0, this.guiLeft + 128, this.guiTop + 51, 38, 20, GuiText.Next.getLocal()));
-
-        setOriginGUI(((AEBaseContainer) this.inventorySlots).getTarget());
-        if (this.originalGui != null && this.myIcon != null) {
-            this.buttonList.add(
-                    this.originalGuiBtn = new GuiTabButton(
-                            this.guiLeft + 151,
-                            this.guiTop - 4,
-                            this.myIcon,
-                            this.myIcon.getDisplayName(),
-                            itemRender));
-            this.originalGuiBtn.setHideEdge(13);
-        }
-
-        this.amountBox = new MEGuiTextField(61, 12);
-        this.amountBox.x = this.guiLeft + 60;
-        this.amountBox.y = this.guiTop + 55;
-        this.amountBox.setMaxStringLength(16);
-        this.amountBox.setFocused(true);
-    }
-
-    protected int getIncrementQuantity(int i) {
-        return AEConfig.instance.craftItemsByStackAmounts(i);
-    }
-
-    @Override
-    public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        this.bindTexture(getBackground());
-        this.drawTexturedModalRect(offsetX, offsetY, 0, 0, this.xSize, this.ySize);
-    }
-
-    @Override
-    protected void keyTyped(final char character, final int key) {
-        if (!this.checkHotbarKeys(key)) {
-            if (key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER) {
-                this.actionPerformed(this.submit);
-            }
-            this.amountBox.textboxKeyTyped(character, key);
-            super.keyTyped(character, key);
-        }
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        super.actionPerformed(btn);
-        if (btn == this.originalGuiBtn) {
-            InventoryHandler.switchGui(originalGui);
-        }
-        final boolean isPlus = btn == this.plus1 || btn == this.plus10 || btn == this.plus100 || btn == this.plus1000;
-        final boolean isMinus = btn == this.minus1 || btn == this.minus10
-                || btn == this.minus100
-                || btn == this.minus1000;
-
-        if (isPlus || isMinus) {
-            this.addQty(this.getQty(btn));
-        }
-    }
-
-    protected void addQty(final int i) {
-        try {
-            long resultI = getAmount();
-            if (resultI == 1 && i > 1) {
-                resultI = 0;
-            }
-            resultI += i;
-            if (resultI < 1) {
-                resultI = 1;
-            }
-            String out = Long.toString(resultI);
-            this.amountBox.setText(out);
-            this.amountBox.setCursorPositionEnd();
-        } catch (final NumberFormatException ignore) {}
-    }
-
-    protected abstract void setOriginGUI(Object target);
-
-    protected abstract String getBackground();
-
-    protected int getAmount() {
-        try {
-            String out = this.amountBox.getText();
-            double result = Calculator.conversion(out);
-            if (result <= 0 || Double.isNaN(result)) {
-                return 0;
-            } else {
-                return (int) ArithHelper.round(result, 0);
-            }
-        } catch (final NumberFormatException e) {
-            return 0;
-        }
-    }
-}

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

@@ -1,199 +0,0 @@
-package com.glodblock.github.client.gui.base;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-import org.lwjgl.opengl.GL11;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.GuiFCImgButton;
-import com.glodblock.github.client.gui.GuiItemMonitor;
-import com.glodblock.github.client.gui.container.base.FCContainerEncodeTerminal;
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.slot.SlotSingleItem;
-import com.glodblock.github.network.CPacketFluidPatternTermBtns;
-import com.glodblock.github.util.ModAndClassUtil;
-
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.client.gui.widgets.GuiScrollbar;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.container.slot.AppEngSlot;
-import appeng.container.slot.SlotFake;
-import appeng.util.item.AEItemStack;
-
-public abstract class FCGuiEncodeTerminal extends GuiItemMonitor {
-
-    private static final String SUBSTITUTION_DISABLE = "0";
-    private static final String SUBSTITUTION_ENABLE = "1";
-    private static final String PRIORITY_DISABLE = "0";
-    private static final String PRIORITY_ENABLE = "1";
-    private static final String MODE_CRAFTING = "1";
-    private static final String MODE_PROCESSING = "0";
-    public FCContainerEncodeTerminal container;
-    protected GuiTabButton tabCraftButton;
-    protected GuiTabButton tabProcessButton;
-    protected GuiImgButton substitutionsEnabledBtn;
-    protected GuiImgButton substitutionsDisabledBtn;
-    protected GuiFCImgButton fluidPrioritizedEnabledBtn;
-    protected GuiFCImgButton fluidPrioritizedDisabledBtn;
-    protected GuiImgButton encodeBtn;
-    protected GuiImgButton invertBtn;
-    protected GuiImgButton clearBtn;
-    protected GuiImgButton doubleBtn;
-    protected GuiImgButton beSubstitutionsEnabledBtn;
-    protected GuiImgButton beSubstitutionsDisabledBtn;
-    protected GuiFCImgButton combineEnableBtn;
-    protected GuiFCImgButton combineDisableBtn;
-    protected GuiFCImgButton autoFillPatternEnableBtn;
-    protected GuiFCImgButton autoFillPatternDisableBtn;
-    protected final GuiScrollbar processingScrollBar = new GuiScrollbar();
-
-    public FCGuiEncodeTerminal(final InventoryPlayer inventoryPlayer, final ITerminalHost te,
-            final FCContainerEncodeTerminal c) {
-        super(inventoryPlayer, te, c);
-        this.container = (FCContainerEncodeTerminal) this.inventorySlots;
-        c.setGui(this);
-        setReservedSpace(81);
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-        this.buttonList.add(
-                this.autoFillPatternEnableBtn = new GuiFCImgButton(
-                        this.guiLeft - 18,
-                        this.offsetY,
-                        "FILL_PATTERN",
-                        "DO_FILL"));
-        this.buttonList.add(
-                this.autoFillPatternDisableBtn = new GuiFCImgButton(
-                        this.guiLeft - 18,
-                        this.offsetY,
-                        "NOT_FILL_PATTERN",
-                        "DONT_FILL"));
-        this.offsetY += 20;
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        super.actionPerformed(btn);
-        if (btn == craftingStatusBtn) {
-            InventoryHandler.switchGui(GuiType.CRAFTING_STATUS);
-        } else if (this.tabCraftButton == btn || this.tabProcessButton == btn) {
-            FluidCraft.proxy.netHandler.sendToServer(
-                    new CPacketFluidPatternTermBtns(
-                            "PatternTerminal.CraftMode",
-                            this.tabProcessButton == btn ? MODE_CRAFTING : MODE_PROCESSING));
-        } else if (this.encodeBtn == btn) {
-            FluidCraft.proxy.netHandler.sendToServer(
-                    new CPacketFluidPatternTermBtns(
-                            "PatternTerminal.Encode",
-                            (isCtrlKeyDown() ? 1 : 0) << 1 | (isShiftKeyDown() ? 1 : 0)));
-        } else if (this.clearBtn == btn) {
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("PatternTerminal.Clear", "1"));
-        } else if (this.substitutionsEnabledBtn == btn || this.substitutionsDisabledBtn == btn) {
-            FluidCraft.proxy.netHandler.sendToServer(
-                    new CPacketFluidPatternTermBtns(
-                            "PatternTerminal.Substitute",
-                            this.substitutionsEnabledBtn == btn ? SUBSTITUTION_DISABLE : SUBSTITUTION_ENABLE));
-        } else if (this.fluidPrioritizedEnabledBtn == btn || this.fluidPrioritizedDisabledBtn == btn) {
-            FluidCraft.proxy.netHandler.sendToServer(
-                    new CPacketFluidPatternTermBtns(
-                            "PatternTerminal.Prioritize",
-                            isShiftKeyDown() ? "2" : (container.prioritize ? PRIORITY_DISABLE : PRIORITY_ENABLE)));
-        } else if (this.invertBtn == btn) {
-            FluidCraft.proxy.netHandler.sendToServer(
-                    new CPacketFluidPatternTermBtns("PatternTerminal.Invert", container.inverted ? "0" : "1"));
-        } else if (this.combineDisableBtn == btn || this.combineEnableBtn == btn) {
-            FluidCraft.proxy.netHandler.sendToServer(
-                    new CPacketFluidPatternTermBtns(
-                            "PatternTerminal.Combine",
-                            this.combineDisableBtn == btn ? "1" : "0"));
-        } else if (ModAndClassUtil.isDoubleButton && doubleBtn == btn) {
-            int val = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) ? 1 : 0;
-            if (Mouse.isButtonDown(1)) val |= 0b10;
-            FluidCraft.proxy.netHandler
-                    .sendToServer(new CPacketFluidPatternTermBtns("PatternTerminal.Double", String.valueOf(val)));
-        } else if (ModAndClassUtil.isBeSubstitutionsButton && beSubstitutionsDisabledBtn == btn) {
-            FluidCraft.proxy.netHandler
-                    .sendToServer(new CPacketFluidPatternTermBtns("PatternTerminal.beSubstitute", "1"));
-        } else if (ModAndClassUtil.isBeSubstitutionsButton && beSubstitutionsEnabledBtn == btn) {
-            FluidCraft.proxy.netHandler
-                    .sendToServer(new CPacketFluidPatternTermBtns("PatternTerminal.beSubstitute", "0"));
-        } else if (this.autoFillPatternDisableBtn == btn || this.autoFillPatternEnableBtn == btn) {
-            FluidCraft.proxy.netHandler.sendToServer(
-                    new CPacketFluidPatternTermBtns(
-                            "PatternTerminal.AutoFillerPattern",
-                            this.autoFillPatternDisableBtn == btn ? "1" : "0"));
-        }
-    }
-
-    @Override
-    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        updateButton(this.tabCraftButton, this.container.isCraftingMode());
-        updateButton(this.tabProcessButton, !this.container.isCraftingMode());
-        updateButton(this.doubleBtn, !this.container.isCraftingMode());
-        updateButton(this.substitutionsEnabledBtn, this.container.substitute);
-        updateButton(this.substitutionsDisabledBtn, !this.container.substitute);
-        updateButton(this.combineEnableBtn, !this.container.isCraftingMode() && this.container.combine);
-        updateButton(this.combineDisableBtn, !this.container.isCraftingMode() && !this.container.combine);
-        updateButton(this.beSubstitutionsEnabledBtn, this.container.beSubstitute);
-        updateButton(this.beSubstitutionsDisabledBtn, !this.container.beSubstitute);
-        updateButton(this.fluidPrioritizedEnabledBtn, this.container.prioritize);
-        updateButton(this.fluidPrioritizedDisabledBtn, !this.container.prioritize);
-        updateButton(this.autoFillPatternEnableBtn, this.container.autoFillPattern);
-        updateButton(this.autoFillPatternDisableBtn, !this.container.autoFillPattern);
-        super.drawFG(offsetX, offsetY, mouseX, mouseY);
-    }
-
-    protected void updateButton(GuiButton button, boolean vis) {
-        if (button != null) {
-            button.visible = vis;
-        }
-    }
-
-    @Override
-    protected void repositionSlot(final AppEngSlot s) {
-        if (s.isPlayerSide()) {
-            s.yDisplayPosition = s.getY() + this.ySize - 78 - 5;
-        } else {
-            s.yDisplayPosition = s.getY() + this.ySize - 78 - 3;
-        }
-    }
-
-    @Override
-    public void func_146977_a(final Slot s) {
-        if (drawSlot0(s)) super.func_146977_a(s);
-    }
-
-    public boolean drawSlot0(Slot slot) {
-        if (slot instanceof SlotFake && !this.container.isCraftingMode()) {
-            AEItemStack stack = AEItemStack.create(slot.getStack());
-            super.func_146977_a(new SlotSingleItem(slot));
-            if (stack == null) return true;
-            IAEItemStack fake = stack.copy();
-            if (fake.getItemStack().getItem() instanceof ItemFluidPacket) {
-                if (ItemFluidPacket.getFluidStack(stack) != null && ItemFluidPacket.getFluidStack(stack).amount > 0)
-                    fake.setStackSize(ItemFluidPacket.getFluidStack(stack).amount);
-            } else return true;
-            aeRenderItem.setAeStack(fake);
-            GL11.glTranslatef(0.0f, 0.0f, 200.0f);
-            aeRenderItem.renderItemOverlayIntoGUI(
-                    fontRendererObj,
-                    mc.getTextureManager(),
-                    stack.getItemStack(),
-                    slot.xDisplayPosition,
-                    slot.yDisplayPosition);
-            GL11.glTranslatef(0.0f, 0.0f, -200.0f);
-            return false;
-        }
-        return true;
-    }
-}

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

@@ -1,914 +0,0 @@
-package com.glodblock.github.client.gui.base;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.List;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.GuiFluidMonitor;
-import com.glodblock.github.client.gui.GuiItemMonitor;
-import com.glodblock.github.client.gui.container.base.FCContainerMonitor;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.network.CPacketInventoryAction;
-import com.glodblock.github.util.Ae2ReflectClient;
-import com.glodblock.github.util.ModAndClassUtil;
-
-import appeng.api.config.CraftingStatus;
-import appeng.api.config.PinsState;
-import appeng.api.config.SearchBoxFocusPriority;
-import appeng.api.config.SearchBoxMode;
-import appeng.api.config.Settings;
-import appeng.api.config.TerminalStyle;
-import appeng.api.config.YesNo;
-import appeng.api.implementations.tiles.IViewCellStorage;
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.ITerminalPins;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.storage.data.IAEStack;
-import appeng.api.storage.data.IDisplayRepo;
-import appeng.api.util.IConfigManager;
-import appeng.api.util.IConfigurableObject;
-import appeng.client.gui.widgets.GuiImgButton;
-import appeng.client.gui.widgets.GuiScrollbar;
-import appeng.client.gui.widgets.GuiTabButton;
-import appeng.client.gui.widgets.IDropToFillTextField;
-import appeng.client.gui.widgets.ISortSource;
-import appeng.client.gui.widgets.MEGuiTextField;
-import appeng.client.me.InternalSlotME;
-import appeng.client.me.ItemRepo;
-import appeng.client.me.PinSlotME;
-import appeng.client.me.SlotDisconnected;
-import appeng.client.me.SlotME;
-import appeng.container.AEBaseContainer;
-import appeng.container.slot.AppEngSlot;
-import appeng.container.slot.OptionalSlotFake;
-import appeng.container.slot.SlotCraftingMatrix;
-import appeng.container.slot.SlotCraftingTerm;
-import appeng.container.slot.SlotDisabled;
-import appeng.container.slot.SlotFake;
-import appeng.container.slot.SlotFakeCraftingMatrix;
-import appeng.container.slot.SlotPatternTerm;
-import appeng.core.AEConfig;
-import appeng.core.AELog;
-import appeng.core.localization.ButtonToolTips;
-import appeng.core.localization.GuiText;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketInventoryAction;
-import appeng.core.sync.packets.PacketPinsUpdate;
-import appeng.core.sync.packets.PacketValueConfig;
-import appeng.helpers.IPinsHandler;
-import appeng.helpers.InventoryAction;
-import appeng.integration.IntegrationRegistry;
-import appeng.integration.IntegrationType;
-import appeng.util.IConfigManagerHost;
-import appeng.util.Platform;
-import appeng.util.item.AEItemStack;
-import codechicken.nei.LayoutManager;
-import codechicken.nei.util.TextHistory;
-
-// TODO why is this copy pasting all the UI code from AE2 instead of reusing it ???
-public abstract class FCGuiMonitor<T extends IAEStack<T>> extends FCBaseMEGui
-        implements ISortSource, IConfigManagerHost, IDropToFillTextField, IPinsHandler {
-
-    public static int craftingGridOffsetX;
-    public static int craftingGridOffsetY;
-    protected static String memoryText = "";
-    protected final int offsetX = 9;
-    protected final int lowerTextureOffset = 0;
-    public IConfigManager configSrc;
-    protected final boolean viewCell;
-    protected final ItemStack[] myCurrentViewCells = new ItemStack[5];
-    public FCContainerMonitor<T> monitorableContainer;
-    public GuiTabButton craftingStatusBtn;
-    protected IDisplayRepo repo;
-    protected GuiImgButton craftingStatusImgBtn;
-    protected MEGuiTextField searchField;
-    protected int perRow = 9;
-    protected int reservedSpace = 0;
-    protected boolean customSortOrder = true;
-    protected boolean showViewBtn = true;
-    protected int rows = 0;
-    protected int maxRows = Integer.MAX_VALUE;
-    protected int standardSize;
-    protected int offsetY;
-    protected GuiImgButton ViewBox;
-    protected GuiImgButton SortByBox;
-    protected GuiImgButton SortDirBox;
-    protected GuiImgButton searchBoxSettings;
-    protected GuiImgButton terminalStyleBox;
-    protected GuiImgButton searchStringSave;
-    protected GuiImgButton typeFilter;
-    protected GuiImgButton pinsStateButton;
-    protected boolean hasShiftKeyDown = false;
-    private PinsState pinsState;
-    public final boolean hasPinHost;
-    private boolean canBeAutoFocused;
-    private boolean isAutoFocused;
-    protected int currentMouseY;
-    protected int currentMouseX;
-
-    @SuppressWarnings("unchecked")
-    public FCGuiMonitor(final InventoryPlayer inventoryPlayer, final ITerminalHost te, final FCContainerMonitor<T> c) {
-        super(inventoryPlayer, c);
-        final GuiScrollbar scrollbar = new GuiScrollbar();
-        this.setScrollBar(scrollbar);
-        this.xSize = 195;
-        this.ySize = 204;
-        this.standardSize = this.xSize;
-        this.configSrc = ((IConfigurableObject) this.inventorySlots).getConfigManager();
-        (this.monitorableContainer = (FCContainerMonitor<T>) this.inventorySlots).setGui(this);
-        this.viewCell = te instanceof IViewCellStorage;
-        pinsState = (PinsState) configSrc.getSetting(Settings.PINS_STATE);
-        hasPinHost = te instanceof ITerminalPins && !(this instanceof GuiFluidMonitor);
-    }
-
-    public int getOffsetY() {
-        return offsetY;
-    }
-
-    public void setOffsetY(int y) {
-        offsetY = y;
-    }
-
-    public abstract void postUpdate(final List<T> list, boolean resort);
-
-    protected void setScrollBar() {
-        this.getScrollBar().setTop(18).setLeft(175).setHeight(this.rows * 18 - 2);
-        this.getScrollBar().setRange(
-                0,
-                (this.repo.size() + pinsState.ordinal() * 9 + this.perRow - 1) / this.perRow - this.rows,
-                Math.max(1, this.rows / 6));
-    }
-
-    @Override
-    protected void actionPerformed(final GuiButton btn) {
-        memoryText = this.searchField.getText();
-        if (btn == this.craftingStatusBtn || btn == this.craftingStatusImgBtn) {
-            InventoryHandler.switchGui(GuiType.CRAFTING_STATUS);
-        }
-        if (btn instanceof final GuiImgButton iBtn) {
-            final boolean backwards = Mouse.isButtonDown(1);
-            if (iBtn.getSetting() != Settings.ACTIONS) {
-                final Enum<?> cv = iBtn.getCurrentValue();
-                final Enum<?> next = Platform.rotateEnum(cv, backwards, iBtn.getSetting().getPossibleValues());
-                if (btn == this.terminalStyleBox) {
-                    AEConfig.instance.settings.putSetting(iBtn.getSetting(), next);
-                } else if (btn == this.searchBoxSettings) {
-                    AEConfig.instance.settings.putSetting(iBtn.getSetting(), next);
-                } else if (ModAndClassUtil.isSaveText && btn == this.searchStringSave) {
-                    AEConfig.instance.preserveSearchBar = next == YesNo.YES;
-                } else if (btn == this.pinsStateButton) {
-                    try {
-                        if (next.ordinal() >= rows) return; // ignore to avoid hiding terminal inventory
-
-                        final PacketPinsUpdate p = new PacketPinsUpdate((PinsState) next);
-                        NetworkHandler.instance.sendToServer(p);
-                    } catch (final IOException e) {
-                        AELog.debug(e);
-                    }
-                } else {
-                    try {
-                        NetworkHandler.instance
-                                .sendToServer(new PacketValueConfig(iBtn.getSetting().name(), next.name()));
-                    } catch (final IOException e) {
-                        AELog.debug(e);
-                    }
-                }
-                iBtn.set(next);
-                if (next.getClass() == SearchBoxMode.class || next.getClass() == TerminalStyle.class) {
-                    super.scheduleGuiResize();
-                }
-            }
-        }
-        super.actionPerformed(btn);
-    }
-
-    private void adjustPinsSize() {
-        final int pinMaxSize = rows - 1;
-        if (pinsState.ordinal() <= pinMaxSize) return;
-
-        try {
-            PinsState newState = PinsState.fromOrdinal(pinMaxSize);
-            final PacketPinsUpdate p = new PacketPinsUpdate(newState);
-            NetworkHandler.instance.sendToServer(p);
-        } catch (final IOException e) {
-            AELog.debug(e);
-        }
-    }
-
-    @Override
-    public void initGui() {
-        Keyboard.enableRepeatEvents(true);
-
-        this.maxRows = this.getMaxRows();
-        this.perRow = AEConfig.instance.getConfigManager().getSetting(Settings.TERMINAL_STYLE) != TerminalStyle.FULL ? 9
-                : 9 + ((this.width - this.standardSize) / 18);
-
-        final boolean hasNEI = IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.NEI);
-
-        final int NEI = hasNEI ? 1 : 0;
-        int top = hasNEI ? 22 : 0;
-
-        final int magicNumber = 114 + 1;
-        final int extraSpace = this.height - magicNumber - NEI - top - this.reservedSpace;
-
-        this.rows = (int) Math.floor(extraSpace / 18.0);
-        if (this.rows > this.maxRows) {
-            this.rows = this.maxRows;
-        }
-
-        if (hasNEI) {
-            this.rows--;
-        }
-
-        if (this.rows < 3) {
-            this.rows = 3;
-        }
-
-        this.getMeSlots().clear();
-
-        // make sure we have space at least for one row of normal slots, because pins not adjusted by scroll bar
-        adjustPinsSize();
-
-        int pinsRows = pinsState.ordinal();
-        for (int y = 0; y < pinsRows; y++) {
-            for (int x = 0; x < this.perRow; x++) {
-                this.getMeSlots()
-                        .add(new PinSlotME(this.repo, x + y * this.perRow, this.offsetX + x * 18, y * 18 + 18));
-            }
-        }
-
-        for (int y = 0; y < this.rows - pinsRows; y++) {
-            for (int x = 0; x < this.perRow; x++) {
-                this.getMeSlots().add(
-                        new InternalSlotME(
-                                this.repo,
-                                x + y * this.perRow,
-                                this.offsetX + x * 18,
-                                18 + y * 18 + pinsRows * 18));
-            }
-        }
-
-        if (AEConfig.instance.getConfigManager().getSetting(Settings.TERMINAL_STYLE) != TerminalStyle.FULL) {
-            this.xSize = this.standardSize + ((this.perRow - 9) * 18);
-        } else {
-            this.xSize = this.standardSize;
-        }
-
-        super.initGui();
-        this.setScrollBar();
-        // full size : 204
-        // extra slots : 72
-        // slot 18
-
-        this.ySize = magicNumber + this.rows * 18 + this.reservedSpace;
-        final int unusedSpace = this.height - this.ySize;
-        this.guiTop = (int) Math.floor(unusedSpace / (unusedSpace < 0 ? 3.8f : 2.0f));
-
-        this.offsetY = this.guiTop + 8;
-
-        buttonList.clear();
-        if (this.customSortOrder) {
-            this.buttonList.add(
-                    this.SortByBox = new GuiImgButton(
-                            this.guiLeft - 18,
-                            this.offsetY,
-                            Settings.SORT_BY,
-                            this.configSrc.getSetting(Settings.SORT_BY)));
-            this.offsetY += 20;
-        }
-        if (this.showViewBtn) {
-            this.buttonList.add(
-                    this.ViewBox = new GuiImgButton(
-                            this.guiLeft - 18,
-                            this.offsetY,
-                            Settings.VIEW_MODE,
-                            this.configSrc.getSetting(Settings.VIEW_MODE)));
-            this.offsetY += 20;
-        }
-        if (ModAndClassUtil.isTypeFilter && this instanceof GuiItemMonitor) {
-            this.buttonList.add(
-                    this.typeFilter = new GuiImgButton(
-                            this.guiLeft - 18,
-                            this.offsetY,
-                            Settings.TYPE_FILTER,
-                            this.configSrc.getSetting(Settings.TYPE_FILTER)));
-            this.offsetY += 20;
-        }
-
-        this.buttonList.add(
-                this.SortDirBox = new GuiImgButton(
-                        this.guiLeft - 18,
-                        this.offsetY,
-                        Settings.SORT_DIRECTION,
-                        this.configSrc.getSetting(Settings.SORT_DIRECTION)));
-        this.offsetY += 20;
-
-        this.buttonList.add(
-                this.searchBoxSettings = new GuiImgButton(
-                        this.guiLeft - 18,
-                        this.offsetY,
-                        Settings.SEARCH_MODE,
-                        AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE)));
-        this.offsetY += 20;
-
-        if (ModAndClassUtil.isSaveText) {
-            this.buttonList.add(
-                    this.searchStringSave = new GuiImgButton(
-                            this.guiLeft - 18,
-                            this.offsetY,
-                            Settings.SAVE_SEARCH,
-                            AEConfig.instance.preserveSearchBar ? YesNo.YES : YesNo.NO));
-            this.offsetY += 20;
-        }
-
-        this.buttonList.add(
-                this.terminalStyleBox = new GuiImgButton(
-                        this.guiLeft - 18,
-                        this.offsetY,
-                        Settings.TERMINAL_STYLE,
-                        AEConfig.instance.settings.getSetting(Settings.TERMINAL_STYLE)));
-        this.offsetY += 20;
-
-        this.searchField = new MEGuiTextField(90, 12) {
-
-            @Override
-            public void onTextChange(final String oldText) {
-                final String text = getText();
-                repo.setSearchString(text);
-                repo.updateView();
-                setScrollBar();
-            }
-        };
-        this.searchField.x = this.guiLeft + Math.max(80, this.offsetX);
-        this.searchField.y = this.guiTop + 4;
-        this.searchField.setMaxStringLength(25);
-        if (ModAndClassUtil.isSearchStringTooltip)
-            searchField.setMessage(ButtonToolTips.SearchStringTooltip.getLocal());
-
-        if (this.viewCell) {
-            if (ModAndClassUtil.isCraftStatus && AEConfig.instance.getConfigManager()
-                    .getSetting(Settings.CRAFTING_STATUS).equals(CraftingStatus.BUTTON)) {
-                this.buttonList.add(
-                        this.craftingStatusImgBtn = new GuiImgButton(
-                                this.guiLeft - 18,
-                                this.offsetY,
-                                Settings.CRAFTING_STATUS,
-                                AEConfig.instance.settings.getSetting(Settings.CRAFTING_STATUS)));
-                this.offsetY += 20;
-            } else {
-                this.buttonList.add(
-                        this.craftingStatusBtn = new GuiTabButton(
-                                this.guiLeft + 170,
-                                this.guiTop - 4,
-                                2 + 11 * 16,
-                                GuiText.CraftingStatus.getLocal(),
-                                itemRender));
-                this.craftingStatusBtn.setHideEdge(13); // GuiTabButton implementation //
-            }
-        }
-
-        if (hasPinHost) {
-            this.buttonList.add(
-                    this.pinsStateButton = new GuiImgButton(
-                            this.guiLeft + 177,
-                            this.guiTop + 18 + (rows * 18) + 26,
-                            Settings.PINS_STATE,
-                            configSrc.getSetting(Settings.PINS_STATE)));
-        }
-
-        final Enum<?> setting = AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE);
-        this.canBeAutoFocused = SearchBoxMode.AUTOSEARCH == setting || SearchBoxMode.NEI_AUTOSEARCH == setting;
-        this.searchField.setFocused(this.canBeAutoFocused);
-        this.isAutoFocused = this.canBeAutoFocused;
-
-        if (ModAndClassUtil.isSearchBar && (AEConfig.instance.preserveSearchBar || this.isSubGui())) {
-            setSearchString(memoryText, false);
-        }
-        if (this.isSubGui()) {
-            this.repo.updateView();
-            this.setScrollBar();
-        }
-
-        craftingGridOffsetX = Integer.MAX_VALUE;
-        craftingGridOffsetY = Integer.MAX_VALUE;
-
-        for (final Object s : this.inventorySlots.inventorySlots) {
-            if (s instanceof AppEngSlot) {
-                if (((Slot) s).xDisplayPosition < 195 || s instanceof SlotDisabled) {
-                    this.repositionSlot((AppEngSlot) s);
-                }
-            }
-
-            if (s instanceof SlotCraftingMatrix || s instanceof SlotFakeCraftingMatrix) {
-                final Slot g = (Slot) s;
-                if (g.xDisplayPosition > 0 && g.yDisplayPosition > 0) {
-                    craftingGridOffsetX = Math.min(craftingGridOffsetX, g.xDisplayPosition);
-                    craftingGridOffsetY = Math.min(craftingGridOffsetY, g.yDisplayPosition);
-                }
-            }
-        }
-
-        craftingGridOffsetX -= 25;
-        craftingGridOffsetY -= 6;
-        initGuiDone();
-    }
-
-    public void setSearchString(String memoryText, boolean updateView) {
-        this.searchField.setText(memoryText);
-        this.searchField.setCursorPositionEnd();
-        this.repo.setSearchString(memoryText);
-        if (updateView) {
-            this.repo.updateView();
-            this.setScrollBar();
-        }
-    }
-
-    @Override
-    protected void mouseClicked(final int xCoord, final int yCoord, final int btn) {
-        this.searchField.mouseClicked(xCoord, yCoord, btn);
-        isAutoFocused = false;
-        super.mouseClicked(xCoord, yCoord, btn);
-    }
-
-    @Override
-    public void handleMouseInput() {
-        final int wheel = Mouse.getEventDWheel();
-        final int x = Mouse.getEventX() * this.width / this.mc.displayWidth;
-        final int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight;
-
-        if (wheel != 0 && this.searchField.isMouseIn(x, y) && isCtrlKeyDown()) {
-            final Enum<?> searchMode = AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE);
-            if (searchMode == SearchBoxMode.NEI_MANUAL_SEARCH || searchMode == SearchBoxMode.NEI_AUTOSEARCH) {
-                try {
-                    Field cls = LayoutManager.searchField.getClass().getDeclaredField("history");
-                    cls.setAccessible(true);
-                    TextHistory history = ((TextHistory) cls.get("get"));
-                    TextHistory.Direction direction;
-                    if (wheel > 0) {
-                        direction = TextHistory.Direction.PREVIOUS;
-                    } else {
-                        direction = TextHistory.Direction.NEXT;
-                    }
-                    history.get(direction, this.searchField.getText()).map(newText -> {
-                        setSearchString(newText, true);
-                        return true;
-                    }).orElse(false);
-                    return;
-                } catch (NoSuchFieldException | IllegalAccessException ignore) {}
-            }
-        }
-        super.handleMouseInput();
-    }
-
-    @Override
-    protected void handleMouseClick(final Slot slot, final int slotIdx, final int ctrlDown, final int mouseButton) {
-        final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-        if (mouseButton == 3) {
-            if (slot instanceof OptionalSlotFake || slot instanceof SlotFakeCraftingMatrix) {
-                if (slot.getHasStack()) {
-                    InventoryAction action = InventoryAction.SET_PATTERN_VALUE;
-                    if (isCtrlKeyDown()) {
-                        action = InventoryAction.RENAME_PATTERN_ITEM;
-                    }
-                    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))) {
-                            FluidCraft.proxy.netHandler.sendToServer(new CPacketInventoryAction(action, i, 0, stack));
-                        }
-                    }
-                    return;
-                }
-            }
-        }
-
-        if (slot instanceof SlotFake) {
-            InventoryAction action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE
-                    : InventoryAction.PICKUP_OR_SET_DOWN;
-            if (Keyboard.isKeyDown(Keyboard.KEY_LMENU) || Keyboard.isKeyDown(Keyboard.KEY_RMENU)) {
-                if (action == InventoryAction.SPLIT_OR_PLACE_SINGLE) {
-                    action = InventoryAction.MOVE_REGION;
-                } else {
-                    action = InventoryAction.PICKUP_SINGLE;
-                }
-            }
-            if (this.drag_click.size() > 1) {
-                return;
-            }
-            final PacketInventoryAction p = new PacketInventoryAction(action, slotIdx, 0);
-            NetworkHandler.instance.sendToServer(p);
-            return;
-        }
-
-        if (slot instanceof SlotPatternTerm) {
-            if (mouseButton == 6) {
-                return; // prevents weird double clicks
-            }
-            try {
-                NetworkHandler.instance.sendToServer(((SlotPatternTerm) slot).getRequest(isShiftKeyDown()));
-            } catch (final IOException e) {
-                AELog.debug(e);
-            }
-        } else if (slot instanceof SlotCraftingTerm) {
-            if (mouseButton == 6) {
-                return; // prevents weird double clicks
-            }
-            InventoryAction action;
-            if (isShiftKeyDown()) {
-                action = InventoryAction.CRAFT_SHIFT;
-            } else {
-                // Craft a stack on right-click, craft a single one on left-click
-                action = (mouseButton == 1) ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM;
-            }
-            final PacketInventoryAction p = new PacketInventoryAction(action, slotIdx, 0);
-            NetworkHandler.instance.sendToServer(p);
-            return;
-        }
-
-        if (Keyboard.isKeyDown(Keyboard.KEY_SPACE)) {
-            if (this.enableSpaceClicking() && !(slot instanceof SlotPatternTerm)) {
-                IAEItemStack stack = null;
-                if (slot instanceof SlotME) {
-                    stack = ((SlotME) slot).getAEStack();
-                }
-                int slotNum = Ae2ReflectClient.getInventorySlots(this).size();
-                if (!(slot instanceof SlotME) && slot != null) {
-                    slotNum = slot.slotNumber;
-                }
-                ((AEBaseContainer) this.inventorySlots).setTargetStack(stack);
-                final PacketInventoryAction p = new PacketInventoryAction(InventoryAction.MOVE_REGION, slotNum, 0);
-                NetworkHandler.instance.sendToServer(p);
-                return;
-            }
-        }
-
-        if (slot instanceof SlotDisconnected) {
-            if (this.drag_click.size() > 1) {
-                return;
-            }
-            InventoryAction action = null;
-            switch (mouseButton) {
-                case 0: // pickup / set-down.
-                {
-                    ItemStack heldStack = player.inventory.getItemStack();
-                    if (slot.getStack() == null && heldStack != null) action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
-                    else if (slot.getStack() != null && (heldStack == null || heldStack.stackSize <= 1))
-                        action = InventoryAction.PICKUP_OR_SET_DOWN;
-                }
-                    break;
-                case 1:
-                    action = ctrlDown == 1 ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
-                    break;
-                case 3: // creative dupe:
-                    if (player.capabilities.isCreativeMode) {
-                        action = InventoryAction.CREATIVE_DUPLICATE;
-                    }
-                    break;
-                default:
-                case 4: // drop item:
-                case 6:
-            }
-            if (action != null) {
-                final PacketInventoryAction p = new PacketInventoryAction(
-                        action,
-                        slot.getSlotIndex(),
-                        ((SlotDisconnected) slot).getSlot().getId());
-                NetworkHandler.instance.sendToServer(p);
-            }
-            return;
-        }
-
-        if (slot instanceof SlotME sme) {
-            InventoryAction action = null;
-            IAEItemStack stack = null;
-            switch (mouseButton) {
-                case 0: // pickup / set-down.
-                    action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
-                    if (sme.isPin() && player.inventory.getItemStack() != null) {
-                        final PacketInventoryAction p = new PacketInventoryAction(
-                                InventoryAction.SET_PIN,
-                                sme.getPinIndex(),
-                                0);
-                        NetworkHandler.instance.sendToServer(p);
-                        return;
-                    }
-
-                    stack = sme.getAEStack();
-                    if (stack != null && action == InventoryAction.PICKUP_OR_SET_DOWN
-                            && stack.getStackSize() == 0
-                            && player.inventory.getItemStack() == null) {
-                        action = InventoryAction.AUTO_CRAFT;
-                    }
-                    break;
-                case 1:
-                    if (sme.isPin() && ctrlDown == 1) { // clear pin
-                        final PacketInventoryAction p = new PacketInventoryAction(
-                                InventoryAction.SET_PIN,
-                                sme.getPinIndex(),
-                                -1);
-                        NetworkHandler.instance.sendToServer(p);
-                        return;
-                    }
-
-                    action = ctrlDown == 1 ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
-                    stack = ((SlotME) slot).getAEStack();
-                    break;
-                case 3: // creative dupe:
-                    stack = ((SlotME) slot).getAEStack();
-                    stack = transformItem(stack); // for fluid terminal
-                    if (stack != null && stack.isCraftable()) {
-                        action = InventoryAction.AUTO_CRAFT;
-                    } else if (player.capabilities.isCreativeMode) {
-                        final IAEItemStack slotItem = ((SlotME) slot).getAEStack();
-                        if (slotItem != null) {
-                            action = InventoryAction.CREATIVE_DUPLICATE;
-                        }
-                    }
-                    break;
-                default:
-                case 4: // drop item:
-                case 6:
-            }
-            if (action == InventoryAction.AUTO_CRAFT) {
-                ((AEBaseContainer) this.inventorySlots).setTargetStack(stack);
-                FluidCraft.proxy.netHandler.sendToServer(
-                        new CPacketInventoryAction(action, Ae2ReflectClient.getInventorySlots(this).size(), 0, stack));
-            } else if (action != null) {
-                ((AEBaseContainer) this.inventorySlots).setTargetStack(stack);
-                final PacketInventoryAction p = new PacketInventoryAction(
-                        action,
-                        Ae2ReflectClient.getInventorySlots(this).size(),
-                        0);
-                NetworkHandler.instance.sendToServer(p);
-            }
-
-            return;
-        }
-
-        super.handleMouseClick(slot, slotIdx, ctrlDown, mouseButton);
-    }
-
-    protected IAEItemStack transformItem(IAEItemStack stack) {
-        return stack;
-    }
-
-    @Override
-    public void onGuiClosed() {
-        super.onGuiClosed();
-        Keyboard.enableRepeatEvents(false);
-        memoryText = this.searchField.getText();
-    }
-
-    @Override
-    public void handleKeyboardInput() {
-        super.handleKeyboardInput();
-
-        // Pause the terminal when holding shift
-        this.repo.setPaused(hasShiftDown());
-    }
-
-    private boolean hasShiftDown() {
-        return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
-    }
-
-    public void bindTextureBack(final String file) {
-        final ResourceLocation loc = new ResourceLocation(FluidCraft.MODID, "textures/" + file);
-        this.mc.getTextureManager().bindTexture(loc);
-    }
-
-    @Override
-    public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
-        this.bindTextureBack(this.getBackground());
-        final int x_width = 195;
-        this.drawTexturedModalRect(offsetX, offsetY, 0, 0, x_width, 18);
-        if (this.viewCell) {
-            this.drawTexturedModalRect(offsetX + x_width, offsetY, x_width, 0, 46, 128);
-        }
-        for (int x = 0; x < this.rows; x++) {
-            this.drawTexturedModalRect(offsetX, offsetY + 18 + x * 18, 0, 18, x_width, 18);
-        }
-        this.drawTexturedModalRect(
-                offsetX,
-                offsetY + 16 + this.rows * 18 + this.lowerTextureOffset,
-                0,
-                106 - 18 - 18,
-                x_width,
-                99 + this.reservedSpace - this.lowerTextureOffset);
-        if (this.viewCell) {
-            boolean update = false;
-            for (int i = 0; i < 5; i++) {
-                if (this.myCurrentViewCells[i] != this.monitorableContainer.getCellViewSlot(i).getStack()) {
-                    update = true;
-                    this.myCurrentViewCells[i] = this.monitorableContainer.getCellViewSlot(i).getStack();
-                }
-            }
-            if (update) {
-                this.repo.setViewCell(this.myCurrentViewCells);
-            }
-        }
-        if (this.searchField != null) {
-            this.searchField.drawTextBox();
-        }
-
-        this.currentMouseX = mouseX;
-        this.currentMouseY = mouseY;
-    }
-
-    protected String getBackground() {
-        return "gui/terminal.png";
-    }
-
-    @Override
-    protected boolean isPowered() {
-        return this.repo.hasPower();
-    }
-
-    protected int getMaxRows() {
-        return AEConfig.instance.getConfigManager().getSetting(Settings.TERMINAL_STYLE) == TerminalStyle.SMALL ? 6
-                : Integer.MAX_VALUE;
-    }
-
-    protected void repositionSlot(final AppEngSlot s) {
-        s.yDisplayPosition = s.getY() + this.ySize - 78 - 5;
-    }
-
-    @Override
-    protected void keyTyped(final char character, final int key) {
-        if (character == ' ' && this.searchField.getText().isEmpty()) {
-            return;
-        }
-
-        boolean skipHotbarCheck = searchField.isFocused()
-                && (AEConfig.instance.searchBoxFocusPriority == SearchBoxFocusPriority.ALWAYS
-                        || (AEConfig.instance.searchBoxFocusPriority == SearchBoxFocusPriority.NO_AUTOSEARCH
-                                && !isAutoFocused));
-
-        if (!skipHotbarCheck && checkHotbarKeys(key)) {
-            return;
-        }
-
-        final boolean mouseInGui = this
-                .isPointInRegion(0, 0, this.xSize, this.ySize, this.currentMouseX, this.currentMouseY);
-
-        if (this.canBeAutoFocused && !searchField.isFocused() && mouseInGui) {
-            searchField.setFocused(true);
-            isAutoFocused = true;
-        }
-
-        if (!searchField.textboxKeyTyped(character, key)) {
-            super.keyTyped(character, key);
-        }
-    }
-
-    @Override
-    public void updateScreen() {
-        this.repo.setPowered(this.monitorableContainer.isPowered());
-        super.updateScreen();
-    }
-
-    @Override
-    public Enum<?> getSortBy() {
-        return this.configSrc.getSetting(Settings.SORT_BY);
-    }
-
-    @Override
-    public Enum<?> getSortDir() {
-        return this.configSrc.getSetting(Settings.SORT_DIRECTION);
-    }
-
-    @Override
-    public Enum<?> getSortDisplay() {
-        return this.configSrc.getSetting(Settings.VIEW_MODE);
-    }
-
-    @Override
-    public Enum<?> getTypeFilter() {
-        return this.configSrc.getSetting(Settings.TYPE_FILTER);
-    }
-
-    @Override
-    public void updateSetting(final IConfigManager manager, @SuppressWarnings("rawtypes") final Enum settingName,
-            @SuppressWarnings("rawtypes") final Enum newValue) {
-        if (this.SortByBox != null) {
-            this.SortByBox.set(this.configSrc.getSetting(Settings.SORT_BY));
-        }
-
-        if (this.SortDirBox != null) {
-            this.SortDirBox.set(this.configSrc.getSetting(Settings.SORT_DIRECTION));
-        }
-
-        if (this.ViewBox != null) {
-            this.ViewBox.set(this.configSrc.getSetting(Settings.VIEW_MODE));
-        }
-        if (this.typeFilter != null) {
-            this.typeFilter.set(this.configSrc.getSetting(Settings.TYPE_FILTER));
-        }
-
-        if (this.pinsStateButton != null) {
-            pinsState = (PinsState) this.configSrc.getSetting(Settings.PINS_STATE);
-            this.pinsStateButton.set(pinsState);
-
-            initGui();
-        }
-
-        this.repo.updateView();
-    }
-
-    public int getReservedSpace() {
-        return this.reservedSpace;
-    }
-
-    public void setReservedSpace(final int reservedSpace) {
-        this.reservedSpace = reservedSpace;
-    }
-
-    public boolean isCustomSortOrder() {
-        return this.customSortOrder;
-    }
-
-    public void setCustomSortOrder(final boolean customSortOrder) {
-        this.customSortOrder = customSortOrder;
-    }
-
-    public int getStandardSize() {
-        return this.standardSize;
-    }
-
-    public void setStandardSize(final int standardSize) {
-        this.standardSize = standardSize;
-    }
-
-    public boolean isOverSearchField(int x, int y) {
-        return searchField.isMouseIn(x, y);
-    }
-
-    public boolean hideItemPanelSlot(int tx, int ty, int tw, int th) {
-        if (this.viewCell) {
-            int rw = 33;
-            int rh = 14 + myCurrentViewCells.length * 18;
-
-            if (tw <= 0 || th <= 0) {
-                return false;
-            }
-
-            int rx = this.guiLeft + this.xSize;
-            int ry = this.guiTop;
-
-            rw += rx;
-            rh += ry;
-            tw += tx;
-            th += ty;
-
-            // overflow || intersect
-            return (rw < rx || rw > tx) && (rh < ry || rh > ty) && (tw < tx || tw > rx) && (th < ty || th > ry);
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isOverTextField(int mousex, int mousey) {
-        return searchField.isMouseIn(mousex, mousey);
-    }
-
-    @Override
-    public void setAEPins(IAEItemStack[] pins) {
-        if (repo instanceof ItemRepo) repo.setAEPins(pins);
-    }
-
-    @Override
-    public void setPinsState(PinsState state) {
-        configSrc.putSetting(Settings.PINS_STATE, state);
-    }
-
-    @SuppressWarnings("SameParameterValue")
-    protected boolean isPointInRegion(int rectX, int rectY, int rectWidth, int rectHeight, int pointX, int pointY) {
-        pointX -= this.guiLeft;
-        pointY -= this.guiTop;
-        return pointX >= rectX - 1 && pointX < rectX + rectWidth + 1
-                && pointY >= rectY - 1
-                && pointY < rectY + rectHeight + 1;
-    }
-
-    // Moving items via hotbar keys in terminals isn't working anyway.
-    // Let's disable hotbar keys processing for terminal slots to allow proper input of numbers in the search field
-    @Override
-    protected boolean checkHotbarKeys(int keyCode) {
-        if (theSlot instanceof SlotME) {
-            return false;
-        }
-        return super.checkHotbarKeys(keyCode);
-    }
-}

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

@@ -1,109 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
-
-import com.glodblock.github.inventory.ItemBiggerAppEngInventory;
-import com.glodblock.github.inventory.item.IWirelessCraftTerminal;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-
-import appeng.container.ContainerNull;
-import appeng.container.slot.SlotCraftingMatrix;
-import appeng.container.slot.SlotCraftingTerm;
-import appeng.helpers.IContainerCraftingPacket;
-import appeng.tile.inventory.AppEngInternalInventory;
-import appeng.tile.inventory.IAEAppEngInventory;
-import appeng.tile.inventory.InvOperation;
-
-public class ContainerCraftingWireless extends ContainerItemMonitor
-        implements IAEAppEngInventory, IContainerCraftingPacket {
-
-    private final IWirelessCraftTerminal it;
-    private final SlotCraftingMatrix[] craftingSlots = new SlotCraftingMatrix[9];
-    private final SlotCraftingTerm outputSlot;
-
-    public ContainerCraftingWireless(final InventoryPlayer ip, final IWirelessTerminal monitorable) {
-        super(ip, monitorable, false);
-        this.it = (IWirelessCraftTerminal) monitorable;
-        final IInventory crafting = this.it.getInventoryByName("crafting");
-        for (int y = 0; y < 3; y++) {
-            for (int x = 0; x < 3; x++) {
-                this.addSlotToContainer(
-                        this.craftingSlots[x + y * 3] = new SlotCraftingMatrix(
-                                this,
-                                crafting,
-                                x + y * 3,
-                                37 + x * 18,
-                                -72 + y * 18) {
-
-                            @Override
-                            public void onSlotChanged() {
-                                if (this.inventory instanceof ItemBiggerAppEngInventory i) {
-                                    i.markDirty();
-                                }
-                                super.onSlotChanged();
-                            }
-                        });
-            }
-        }
-        AppEngInternalInventory output = new AppEngInternalInventory(this, 1);
-        this.addSlotToContainer(
-                this.outputSlot = new SlotCraftingTerm(
-                        this.getPlayerInv().player,
-                        this.getActionSource(),
-                        this.getPowerSource(),
-                        monitorable,
-                        crafting,
-                        crafting,
-                        output,
-                        131,
-                        -72 + 18,
-                        this));
-        this.bindPlayerInventory(ip, 0, 0);
-        this.onCraftMatrixChanged(crafting);
-    }
-
-    @Override
-    protected boolean isWirelessTerminal() {
-        return true;
-    }
-
-    @Override
-    public void onCraftMatrixChanged(final IInventory par1IInventory) {
-        final ContainerNull cn = new ContainerNull();
-        final InventoryCrafting ic = new InventoryCrafting(cn, 3, 3);
-        for (int x = 0; x < 9; x++) {
-            ic.setInventorySlotContents(x, this.craftingSlots[x].getStack());
-        }
-        this.outputSlot
-                .putStack(CraftingManager.getInstance().findMatchingRecipe(ic, this.getPlayerInv().player.worldObj));
-    }
-
-    @Override
-    public void saveChanges() {
-        // NO-OP
-    }
-
-    @Override
-    public void onChangeInventory(final IInventory inv, final int slot, final InvOperation mc,
-            final ItemStack removedStack, final ItemStack newStack) {
-        // NO-OP
-    }
-
-    @Override
-    public IInventory getInventoryByName(final String name) {
-        if (name.equals("player")) {
-            return this.getInventoryPlayer();
-        }
-        return this.it.getInventoryByName(name);
-    }
-
-    @Override
-    public boolean useRealItems() {
-        return true;
-    }
-
-}

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

@@ -1,36 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import net.minecraft.entity.player.InventoryPlayer;
-
-import com.glodblock.github.common.tile.TileFluidInterface;
-
-import appeng.api.config.Settings;
-import appeng.api.config.SidelessMode;
-import appeng.api.util.IConfigManager;
-import appeng.container.guisync.GuiSync;
-import appeng.container.implementations.ContainerInterface;
-import appeng.helpers.IInterfaceHost;
-
-public class ContainerDualInterface extends ContainerInterface {
-
-    @GuiSync(11)
-    public SidelessMode sidelessMode;
-
-    private final boolean isTile;
-
-    public ContainerDualInterface(InventoryPlayer ip, IInterfaceHost te) {
-        super(ip, te);
-        this.sidelessMode = SidelessMode.SIDELESS;
-        this.isTile = te instanceof TileFluidInterface;
-    }
-
-    public SidelessMode getSidelessMode() {
-        return this.sidelessMode;
-    }
-
-    @Override
-    protected void loadSettingsFromHost(IConfigManager cm) {
-        super.loadSettingsFromHost(cm);
-        this.sidelessMode = this.isTile ? (SidelessMode) cm.getSetting(Settings.SIDELESS_MODE) : SidelessMode.SIDELESS;
-    }
-}

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

@@ -1,159 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import java.util.HashMap;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-import org.apache.commons.lang3.tuple.MutablePair;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.crossmod.thaumcraft.AspectUtil;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.network.CPacketFluidUpdate;
-import com.glodblock.github.network.SPacketFluidUpdate;
-import com.glodblock.github.util.Util;
-
-import appeng.api.config.Actionable;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.container.slot.SlotPlayerHotBar;
-import appeng.container.slot.SlotPlayerInv;
-import appeng.util.Platform;
-
-public class ContainerEssentiaMonitor extends ContainerFluidPortableCell {
-
-    public ContainerEssentiaMonitor(InventoryPlayer ip, IWirelessTerminal monitorable) {
-        super(ip, monitorable);
-    }
-
-    @Override
-    public ItemStack transferStackInSlot(final EntityPlayer p, final int idx) {
-        if (Platform.isClient()) {
-            Slot clickSlot = (Slot) this.inventorySlots.get(idx);
-            if ((clickSlot instanceof SlotPlayerInv || clickSlot instanceof SlotPlayerHotBar) && clickSlot.getHasStack()
-                    && AspectUtil.isEssentiaContainer(clickSlot.getStack())) {
-                int index = Util.findItemInPlayerInvSlot(p, clickSlot.getStack());
-                FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidUpdate(index));
-            }
-        }
-        return super.transferStackInSlot(p, idx);
-    }
-
-    @Override
-    public void postChange(IAEFluidStack clientSelectedFluid, EntityPlayer player, int slotIndex, boolean shift) {
-        ItemStack targetStack;
-        if (slotIndex == -1) {
-            targetStack = player.inventory.getItemStack();
-        } else {
-            targetStack = player.inventory.getStackInSlot(slotIndex);
-        }
-        final int containersRequested = shift ? targetStack.stackSize : 1;
-
-        IAEFluidStack storedFluid = this.monitor.getStorageList().findPrecise(clientSelectedFluid);
-        ItemStack out = targetStack.copy();
-        out.stackSize = 1;
-        if (AspectUtil.isEmptyEssentiaContainer(targetStack) && AspectUtil.isEssentiaGas(storedFluid)) {
-            // add essentia to jars
-            if (storedFluid.getStackSize() / AspectUtil.R <= 0) {
-                return;
-            }
-            final IAEFluidStack toExtract = storedFluid.copy();
-            MutablePair<Integer, ItemStack> fillStack = AspectUtil.fillEssentiaFromGas(out, toExtract.getFluidStack());
-            if (fillStack == null || fillStack.right == null || fillStack.left <= 0) {
-                return;
-            }
-            toExtract.setStackSize((long) fillStack.left * containersRequested);
-            IAEFluidStack tmp = this.host.getFluidInventory()
-                    .extractItems(toExtract, Actionable.SIMULATE, this.getActionSource());
-            if (tmp == null) {
-                return;
-            }
-            fillStack.right.stackSize = (int) (tmp.getStackSize() / fillStack.left);
-            this.dropItem(fillStack.right);
-            out.stackSize = fillStack.right.stackSize;
-            if (AspectUtil.isEssentiaContainer(fillStack.right)) {
-                this.host.getFluidInventory().extractItems(toExtract, Actionable.MODULATE, this.getActionSource());
-                if ((int) (tmp.getStackSize() % fillStack.left) / AspectUtil.R > 0) {
-                    this.dropItem(
-                            AspectUtil.setAspectAmount(
-                                    fillStack.right,
-                                    (int) (tmp.getStackSize() % fillStack.left) / AspectUtil.R,
-                                    AspectUtil.getAspectFromGas(toExtract)),
-                            1);
-                    out.stackSize++;
-                }
-            }
-        } else if (!AspectUtil.isEmptyEssentiaContainer(targetStack)) {
-            // add essentia to ae network
-            ItemStack containerStack = targetStack.copy();
-            containerStack.stackSize = containersRequested;
-            IAEFluidStack fluidStack = AspectUtil.getAEGasFromContainer(containerStack);
-            if (fluidStack == null) {
-                return;
-            }
-            final IAEFluidStack aeFluidStack = fluidStack.copy();
-            // simulate result is incorrect. so I'm using other solution and ec2 both mod have same issues
-            final IAEFluidStack notInserted = this.host.getFluidInventory()
-                    .injectItems(aeFluidStack, Actionable.MODULATE, this.getActionSource());
-            MutablePair<Integer, ItemStack> drainStack = AspectUtil
-                    .drainEssentiaFromGas(out.copy(), aeFluidStack.getFluidStack());
-            if (notInserted != null && notInserted.getStackSize() > 0 && drainStack != null) {
-                if (fluidStack.getStackSize() == notInserted.getStackSize()) {
-                    return;
-                }
-                aeFluidStack.decStackSize(notInserted.getStackSize());
-
-                if (drainStack.left > aeFluidStack.getStackSize() && AspectUtil.isEssentiaContainer(drainStack.right)) {
-                    aeFluidStack.setStackSize(drainStack.left - aeFluidStack.getStackSize());
-                    this.host.getFluidInventory()
-                            .extractItems(aeFluidStack, Actionable.MODULATE, this.getActionSource());
-                    return;
-                }
-
-                // drop empty item
-                this.dropItem(drainStack.right, (int) (aeFluidStack.getStackSize() / drainStack.left));
-                out.stackSize = (int) (notInserted.getStackSize() / drainStack.left);
-                if (AspectUtil.isEssentiaContainer(drainStack.right)) {
-                    if (notInserted.getStackSize() % drainStack.left > 0) {
-                        fluidStack.setStackSize((notInserted.getStackSize() % drainStack.left));
-                        AspectUtil.fillEssentiaFromGas(drainStack.right, fluidStack.getFluidStack());
-                        this.dropItem(drainStack.right, 1);
-                    }
-                }
-                if (slotIndex == -1) out.stackSize = targetStack.stackSize - out.stackSize;
-            } else if (drainStack != null) {
-                if (slotIndex == -1) {
-                    out.stackSize = targetStack.stackSize;
-                } else {
-                    out.stackSize = (int) (targetStack.stackSize - (aeFluidStack.getStackSize() / drainStack.left));
-                }
-                this.dropItem(drainStack.right, targetStack.stackSize); // drop empty item
-            }
-        } else {
-            return;
-        }
-        if (slotIndex == -1) {
-            player.inventory.getItemStack().stackSize = player.inventory.getItemStack().stackSize - out.stackSize;
-            if (player.inventory.getItemStack().stackSize > 0) {
-                FluidCraft.proxy.netHandler.sendTo(
-                        new SPacketFluidUpdate(new HashMap<>(), player.inventory.getItemStack()),
-                        (EntityPlayerMP) player);
-            } else {
-                player.inventory.setItemStack(null);
-                FluidCraft.proxy.netHandler.sendTo(new SPacketFluidUpdate(new HashMap<>()), (EntityPlayerMP) player);
-            }
-        } else {
-            player.inventory.setInventorySlotContents(slotIndex, out.stackSize > 0 ? out : null);
-        }
-        this.detectAndSendChanges();
-    }
-
-    @Override
-    protected boolean isEssentiaMode() {
-        return true;
-    }
-
-}

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

@@ -1,98 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import java.util.Objects;
-
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import com.glodblock.github.common.item.ItemBaseWirelessTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.common.parts.PartLevelTerminal;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.util.BlockPos;
-
-import appeng.api.networking.IGrid;
-import appeng.api.networking.security.IActionHost;
-import appeng.api.storage.ITerminalHost;
-import appeng.container.implementations.ContainerCraftConfirm;
-import appeng.container.implementations.ContainerOptimizePatterns;
-import appeng.crafting.v2.CraftingJobV2;
-import appeng.tile.misc.TilePatternOptimizationMatrix;
-
-public class ContainerFluidCraftConfirm extends ContainerCraftConfirm {
-
-    public ContainerFluidCraftConfirm(final InventoryPlayer ip, final ITerminalHost te) {
-        super(ip, te);
-    }
-
-    @Override
-    public void switchToOriginalGUI() {
-        GuiType originalGui = null;
-
-        final IActionHost ah = this.getActionHost();
-        if (ah instanceof PartFluidPatternTerminal) {
-            originalGui = GuiType.FLUID_PATTERN_TERMINAL;
-        }
-        if (ah instanceof PartFluidPatternTerminalEx) {
-            originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX;
-        }
-        if (ah instanceof PartLevelTerminal) {
-            originalGui = GuiType.LEVEL_TERMINAL;
-        }
-        if (ah instanceof IWirelessTerminal) {
-            ItemStack terminal = ((IWirelessTerminal) ah).getItemStack();
-            if (terminal.getItem() instanceof ItemBaseWirelessTerminal) {
-                originalGui = ((ItemBaseWirelessTerminal) terminal.getItem()).guiGuiType(terminal);
-            }
-        }
-        if (ah instanceof IWirelessTerminal) {
-            InventoryHandler.openGui(
-                    this.getInventoryPlayer().player,
-                    getWorld(),
-                    new BlockPos(((IWirelessTerminal) ah).getInventorySlot(), 0, 0),
-                    ForgeDirection.UNKNOWN,
-                    originalGui);
-        } else if (this.getOpenContext() != null) {
-            InventoryHandler.openGui(
-                    this.getInventoryPlayer().player,
-                    getWorld(),
-                    new BlockPos(this.getOpenContext().getTile()),
-                    Objects.requireNonNull(this.getOpenContext().getSide()),
-                    originalGui);
-        }
-    }
-
-    @Override
-    public void optimizePatterns() {
-        // only V2 supported
-        IGrid grid = this.getGrid();
-
-        if (result instanceof CraftingJobV2 && !this.isSimulation()
-                && grid != null
-                && !grid.getMachines(TilePatternOptimizationMatrix.class).isEmpty()) {
-            final IActionHost ah = this.getActionHost();
-            if (ah instanceof IWirelessTerminal) {
-                InventoryHandler.openGui(
-                        this.getInventoryPlayer().player,
-                        getWorld(),
-                        new BlockPos(((IWirelessTerminal) ah).getInventorySlot(), 0, 0),
-                        ForgeDirection.UNKNOWN,
-                        GuiType.FLUID_OPTIMIZE_PATTERNS_ITEM);
-            } else if (this.getOpenContext() != null) {
-                InventoryHandler.openGui(
-                        this.getInventoryPlayer().player,
-                        getWorld(),
-                        new BlockPos(this.getOpenContext().getTile()),
-                        Objects.requireNonNull(this.getOpenContext().getSide()),
-                        GuiType.FLUID_OPTIMIZE_PATTERNS);
-            }
-            if (this.getPlayerInv().player.openContainer instanceof ContainerOptimizePatterns cop) {
-                cop.setResult(result);
-            }
-        }
-    }
-}

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

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

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

@@ -15,11 +15,11 @@ import com.glodblock.github.inventory.slot.OptionalFluidSlotFakeTypeOnly;
 import com.glodblock.github.network.SPacketFluidUpdate;
 
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.container.AEBaseContainer;
+import appeng.container.ContainerSubGui;
 import appeng.container.slot.IOptionalSlotHost;
 import appeng.util.item.AEFluidStack;
 
-public class ContainerFluidInterface extends AEBaseContainer implements IOptionalSlotHost {
+public class ContainerFluidInterface extends ContainerSubGui implements IOptionalSlotHost {
 
     private final IDualHost tile;
 

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

@@ -1,99 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.IInventory;
-
-import com.glodblock.github.client.gui.container.base.FCContainerFluidConfigurable;
-import com.glodblock.github.common.parts.PartFluidLevelEmitter;
-import com.glodblock.github.inventory.slot.OptionalFluidSlotFakeTypeOnly;
-
-import appeng.api.config.RedstoneMode;
-import appeng.api.config.SecurityPermissions;
-import appeng.api.config.Settings;
-import appeng.client.gui.widgets.MEGuiTextField;
-import appeng.container.guisync.GuiSync;
-import appeng.tile.inventory.AppEngInternalAEInventory;
-import appeng.util.Platform;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class ContainerFluidLevelEmitter extends FCContainerFluidConfigurable {
-
-    private final PartFluidLevelEmitter lvlEmitter;
-
-    @SideOnly(Side.CLIENT)
-    private MEGuiTextField textField;
-
-    @GuiSync(2)
-    public long EmitterValue = -1;
-
-    public ContainerFluidLevelEmitter(final InventoryPlayer ip, final PartFluidLevelEmitter te) {
-        super(ip, te);
-        this.lvlEmitter = te;
-    }
-
-    public PartFluidLevelEmitter getBus() {
-        return this.lvlEmitter;
-    }
-
-    public AppEngInternalAEInventory getFakeFluidInv() {
-        return (AppEngInternalAEInventory) this.lvlEmitter.getInventoryByName("config");
-    }
-
-    @Override
-    protected void setupConfig() {
-        final IInventory inv = this.getUpgradeable().getInventoryByName("config");
-        this.addSlotToContainer(new OptionalFluidSlotFakeTypeOnly(inv, null, this, 0, 17, 42, 0, 0, 0));
-    }
-
-    @SideOnly(Side.CLIENT)
-    public void setTextField(final MEGuiTextField level) {
-        this.textField = level;
-    }
-
-    public void setLevel(final long l, final EntityPlayer player) {
-        this.lvlEmitter.setReportingValue(l);
-        this.EmitterValue = l;
-    }
-
-    @Override
-    protected boolean supportCapacity() {
-        return false;
-    }
-
-    @Override
-    public int availableUpgrades() {
-        return 0;
-    }
-
-    public void setRedStoneMode(final RedstoneMode rsMode) {
-        this.rsMode = rsMode;
-    }
-
-    @Override
-    public void detectAndSendChanges() {
-        this.verifyPermissions(SecurityPermissions.BUILD, false);
-
-        if (Platform.isServer()) {
-            this.EmitterValue = this.lvlEmitter.getReportingValue();
-            this.setRedStoneMode(
-                    (RedstoneMode) this.getUpgradeable().getConfigManager().getSetting(Settings.REDSTONE_EMITTER));
-        }
-
-        this.standardDetectAndSendChanges();
-    }
-
-    @Override
-    public void onUpdate(final String field, final Object oldValue, final Object newValue) {
-        if (field.equals("EmitterValue")) {
-            if (this.textField != null) {
-                this.textField.setText(String.valueOf(this.EmitterValue));
-
-                if (String.valueOf(oldValue).equals("-1")) {
-                    this.textField.setCursorPositionEnd();
-                }
-            }
-        }
-    }
-}

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

@@ -1,560 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.ICrafting;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidContainerItem;
-
-import com.glodblock.github.FluidCraft;
-import com.glodblock.github.client.gui.container.base.FCContainerMonitor;
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.network.CPacketFluidUpdate;
-import com.glodblock.github.network.SPacketFluidUpdate;
-import com.glodblock.github.network.SPacketMEUpdateBuffer;
-import com.glodblock.github.util.Util;
-
-import appeng.api.AEApi;
-import appeng.api.config.Actionable;
-import appeng.api.implementations.tiles.IViewCellStorage;
-import appeng.api.networking.IGrid;
-import appeng.api.networking.IGridHost;
-import appeng.api.networking.IGridNode;
-import appeng.api.networking.energy.IEnergyGrid;
-import appeng.api.networking.energy.IEnergySource;
-import appeng.api.networking.security.BaseActionSource;
-import appeng.api.networking.storage.IBaseMonitor;
-import appeng.api.networking.storage.IStorageGrid;
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.storage.data.IItemList;
-import appeng.container.slot.SlotPlayerHotBar;
-import appeng.container.slot.SlotPlayerInv;
-import appeng.container.slot.SlotRestrictedInput;
-import appeng.me.helpers.ChannelPowerSrc;
-import appeng.util.Platform;
-import appeng.util.item.AEFluidStack;
-
-public class ContainerFluidMonitor extends FCContainerMonitor<IAEFluidStack> {
-
-    protected final IItemList<IAEFluidStack> fluids = AEApi.instance().storage().createFluidList();
-    /**
-     * Index of tuple which indicates remaining tanks that are remaining (not emptied/filled)
-     */
-    protected static final int REM_IDX = 0;
-    /**
-     * Index of tuple which indicates remaining tanks that are acted upon (emptied/filled)
-     */
-    protected static final int ACT_IDX = 1;
-    /**
-     * Index of tuple which indicates tanks that are partially emptied/filled
-     */
-    protected static final int PARTIAL_IDX = 2;
-
-    public ContainerFluidMonitor(final InventoryPlayer ip, final ITerminalHost monitorable) {
-        this(ip, monitorable, true);
-    }
-
-    protected ContainerFluidMonitor(final InventoryPlayer ip, final ITerminalHost monitorable,
-            final boolean bindInventory) {
-        super(ip, monitorable, bindInventory);
-        if (Platform.isServer()) {
-            this.serverCM = monitorable.getConfigManager();
-            if (monitorable instanceof IGridHost) {
-                final IGridNode node = ((IGridHost) monitorable).getGridNode(ForgeDirection.UNKNOWN);
-                if (node != null) {
-                    this.networkNode = node;
-                    final IGrid g = node.getGrid();
-                    if (g != null) {
-                        this.setPowerSource(new ChannelPowerSrc(this.networkNode, g.getCache(IEnergyGrid.class)));
-                        IStorageGrid storageGrid = g.getCache(IStorageGrid.class);
-                        this.monitor = storageGrid.getFluidInventory();
-                        if (this.monitor == null) {
-                            this.setValidContainer(false);
-                        } else {
-                            this.monitor.addListener(this, null);
-                        }
-                    }
-                } else {
-                    this.setValidContainer(false);
-                }
-            } else {
-                this.monitor = monitorable.getFluidInventory();
-                this.monitor.addListener(this, null);
-                this.setPowerSource((IEnergySource) monitorable);
-            }
-        } else {
-            this.monitor = null;
-        }
-
-        this.canAccessViewCells = false;
-        if (monitorable instanceof IViewCellStorage) {
-            for (int y = 0; y < 5; y++) {
-                this.cellView[y] = new SlotRestrictedInput(
-                        SlotRestrictedInput.PlacableItemType.VIEW_CELL,
-                        ((IViewCellStorage) monitorable).getViewCellStorage(),
-                        y,
-                        206,
-                        y * 18 + 8,
-                        this.getInventoryPlayer());
-                this.cellView[y].setAllowEdit(this.canAccessViewCells);
-                this.addSlotToContainer(this.cellView[y]);
-            }
-        }
-
-        if (bindInventory) {
-            this.bindPlayerInventory(ip, 0, 0);
-        }
-    }
-
-    @Override
-    public ItemStack transferStackInSlot(final EntityPlayer p, final int idx) {
-        if (Platform.isClient() && !isEssentiaMode()) {
-            Slot clickSlot = (Slot) this.inventorySlots.get(idx);
-            if ((clickSlot instanceof SlotPlayerInv || clickSlot instanceof SlotPlayerHotBar) && clickSlot.getHasStack()
-                    && Util.FluidUtil.isFluidContainer(clickSlot.getStack())) {
-                int index = Util.findItemInPlayerInvSlot(p, clickSlot.getStack());
-                FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidUpdate(index));
-            }
-        }
-        return super.transferStackInSlot(p, idx);
-    }
-
-    @Override
-    protected void processItemList() {
-        if (!this.fluids.isEmpty()) {
-            final IItemList<IAEFluidStack> monitorCache = this.monitor.getStorageList();
-            List<IAEFluidStack> toSend = new ArrayList<>();
-            for (final IAEFluidStack is : this.fluids) {
-                final IAEFluidStack send = monitorCache.findPrecise(is);
-                if (send != null) {
-                    toSend.add(send);
-                } else {
-                    is.setStackSize(0);
-                    toSend.add(is);
-                }
-            }
-            for (final Object c : this.crafters) {
-                if (c instanceof EntityPlayerMP) {
-                    SPacketMEUpdateBuffer.scheduleFluidUpdate((EntityPlayerMP) c, toSend);
-                }
-            }
-            this.fluids.resetStatus();
-        }
-    }
-
-    @Override
-    protected void queueInventory(final ICrafting c) {
-        if (Platform.isServer() && c instanceof EntityPlayerMP && this.monitor != null) {
-            final IItemList<IAEFluidStack> monitorCache = this.monitor.getStorageList();
-            List<IAEFluidStack> toSend = new ArrayList<>();
-            for (final IAEFluidStack is : monitorCache) {
-                toSend.add(is);
-            }
-            SPacketMEUpdateBuffer.scheduleFluidUpdate((EntityPlayerMP) c, toSend);
-        }
-    }
-
-    @Override
-    public void postChange(IBaseMonitor<IAEFluidStack> monitor, Iterable<IAEFluidStack> change,
-            BaseActionSource actionSource) {
-        for (final IAEFluidStack is : change) {
-            this.fluids.add(is);
-        }
-    }
-
-    protected void dropItem(ItemStack is) {
-        if (is == null || is.stackSize <= 0) return;
-        ItemStack itemStack = is.copy();
-        int i = itemStack.getMaxStackSize();
-        while (itemStack.stackSize > 0) {
-            if (i > itemStack.stackSize) {
-                if (!getPlayerInv().addItemStackToInventory(itemStack.copy())) {
-                    getPlayerInv().player.entityDropItem(itemStack.copy(), 0);
-                }
-                break;
-            } else {
-                itemStack.stackSize -= i;
-                ItemStack item = itemStack.copy();
-                item.stackSize = i;
-                if (!getPlayerInv().addItemStackToInventory(item)) {
-                    getPlayerInv().player.entityDropItem(item, 0);
-                }
-            }
-        }
-    }
-
-    protected void dropItem(ItemStack itemStack, int stackSize) {
-        if (itemStack == null || itemStack.stackSize <= 0) return;
-        ItemStack is = itemStack.copy();
-        is.stackSize = stackSize;
-        this.dropItem(is);
-    }
-
-    /**
-     * Two operations, insert and extract.
-     *
-     * @param slotIndex The slot. If index == -1, the cursor held itemstack. Else, slotIndex indicates which slot was
-     *                  shift clicked on.
-     */
-    public void postChange(IAEFluidStack fluid, EntityPlayer player, int slotIndex, boolean shift) {
-        ItemStack targetStack;
-        if (slotIndex == -1) {
-            targetStack = player.inventory.getItemStack();
-        } else {
-            targetStack = player.inventory.getStackInSlot(slotIndex);
-        }
-        // The primary output itemstack
-        if (Util.FluidUtil.isEmpty(targetStack) && fluid != null) {
-            // Situation 1.a: Empty fluid container, and nonnull slot
-            extractFluid(fluid, player, slotIndex, shift);
-        } else if (!Util.FluidUtil.isEmpty(targetStack)) {
-            // Situation 2.a: We are holding a non-empty container.
-            insertFluid(player, slotIndex, shift);
-            // End of situation 2.a
-        }
-        // No op (Any other situation)
-        this.detectAndSendChanges();
-    }
-
-    /**
-     * The insert operation. For input, we have a filled container stack. For outputs, we have the following:
-     * <ol>
-     * <li>Leftover filled container stack</li>
-     * <li>Empty containers</li>
-     * <li>Partially filled container x1</li>
-     * </ol>
-     * In order above, the itemstack at `slotIndex` is transformed into the output.
-     */
-    private void insertFluid(EntityPlayer player, int slotIndex, boolean shift) {
-        final ItemStack targetStack;
-        if (slotIndex == -1) {
-            targetStack = player.inventory.getItemStack();
-        } else {
-            targetStack = player.inventory.getStackInSlot(slotIndex);
-        }
-        final int containersRequestedToInsert = shift ? targetStack.stackSize : 1;
-
-        // Step 1: Determine container characteristics and verify fluid to be extractable
-        final int fluidPerContainer;
-        final FluidStack fluidStackPerContainer;
-        final boolean partialInsertSupported;
-        if (targetStack.getItem() instanceof IFluidContainerItem fcItem) {
-            ItemStack test = targetStack.copy();
-            test.stackSize = 1;
-            fluidStackPerContainer = fcItem.drain(test, Integer.MAX_VALUE, false);
-            if (fluidStackPerContainer == null || fluidStackPerContainer.amount == 0) {
-                return;
-            }
-
-            fluidPerContainer = fluidStackPerContainer.amount;
-            partialInsertSupported = true;
-        } else if (FluidContainerRegistry.isContainer(targetStack)) {
-            ItemStack emptyTank = FluidContainerRegistry.drainFluidContainer(targetStack);
-            if (emptyTank == null) {
-                return;
-            }
-
-            fluidStackPerContainer = FluidContainerRegistry.getFluidForFilledItem(targetStack);
-            fluidPerContainer = fluidStackPerContainer.amount;
-            partialInsertSupported = false;
-        } else {
-            return;
-        }
-
-        // Step 2: determine network capacity
-        final IAEFluidStack totalFluid = AEFluidStack.create(fluidStackPerContainer);
-        totalFluid.setStackSize((long) fluidPerContainer * containersRequestedToInsert);
-
-        final IAEFluidStack notInsertable = this.host.getFluidInventory()
-                .injectItems(totalFluid, Actionable.SIMULATE, this.getActionSource());
-
-        final long insertableFluid;
-        if (notInsertable == null || notInsertable.getStackSize() == 0) {
-            insertableFluid = totalFluid.getStackSize();
-        } else {
-            long insertable = totalFluid.getStackSize() - notInsertable.getStackSize();
-            if (partialInsertSupported) {
-                insertableFluid = insertable;
-            } else {
-                // avoid remainder
-                insertableFluid = insertable - (insertable % fluidPerContainer);
-            }
-        }
-        totalFluid.setStackSize(insertableFluid);
-
-        // Step 3: perform insert
-        final long totalInserted;
-        final IAEFluidStack notInserted = this.host.getFluidInventory()
-                .injectItems(totalFluid, Actionable.MODULATE, this.getActionSource());
-        if (notInserted != null && notInserted.getStackSize() > 0) {
-            // User has a setup that causes discrepancy between simulation and modulation. Likely double storage bus.
-            long total = totalFluid.getStackSize() - notInserted.getStackSize();
-            if (partialInsertSupported) {
-                totalInserted = total;
-            } else {
-                // We cant have partially filled containers -> user will receive a fluid packet as last resort
-                long overflowAmount = fluidPerContainer - (total % fluidPerContainer);
-                IAEFluidStack overflow = AEFluidStack.create(fluidStackPerContainer);
-                overflow.setStackSize(overflowAmount);
-                dropItem(ItemFluidPacket.newStack(overflow));
-                totalInserted = total + overflowAmount;
-            }
-        } else {
-            totalInserted = totalFluid.getStackSize();
-        }
-
-        // Step 4: calculate outputs
-        final int emptiedTanks;
-        final int partialDrain;
-        if (fluidPerContainer > 0) {
-            emptiedTanks = (int) (totalInserted / fluidPerContainer);
-            partialDrain = (int) (totalInserted % fluidPerContainer);
-        } else {
-            emptiedTanks = containersRequestedToInsert;
-            partialDrain = 0;
-        }
-        final int partialTanks = partialDrain > 0 && partialInsertSupported ? 1 : 0;
-        final int usedTanks = emptiedTanks + partialTanks;
-        final int untouchedTanks = targetStack.stackSize - usedTanks;
-
-        final ItemStack emptiedTanksStack;
-        final ItemStack partialTanksStack;
-
-        if (targetStack.getItem() instanceof IFluidContainerItem fcItem) {
-            if (emptiedTanks > 0) {
-                final ItemStack testDrainStack = targetStack.copy();
-                testDrainStack.stackSize = 1;
-                fcItem.drain(testDrainStack, fluidPerContainer, true);
-                if (testDrainStack.stackSize == 0) {
-                    emptiedTanksStack = null;
-                } else {
-                    emptiedTanksStack = testDrainStack.copy();
-                    emptiedTanksStack.stackSize = emptiedTanks;
-                }
-            } else {
-                emptiedTanksStack = null;
-            }
-            if (partialTanks > 0) {
-                partialTanksStack = targetStack.copy();
-                partialTanksStack.stackSize = 1;
-                fcItem.drain(partialTanksStack, partialDrain, true);
-            } else {
-                partialTanksStack = null;
-            }
-        } else {
-            if (emptiedTanks > 0) {
-                emptiedTanksStack = FluidContainerRegistry.drainFluidContainer(targetStack);
-                emptiedTanksStack.stackSize = emptiedTanks;
-            } else {
-                emptiedTanksStack = null;
-            }
-            // Not possible > see Step 2 and Step 3
-            partialTanksStack = null;
-        }
-
-        // Done. Put the output in the inventory or ground, and update stack size.
-        boolean shouldSendStack = true;
-        if (slotIndex == -1) {
-            // Item is in mouse hand
-            if (untouchedTanks > 0) {
-                targetStack.stackSize = untouchedTanks;
-                adjustStack(targetStack);
-                dropItem(emptiedTanksStack);
-                dropItem(partialTanksStack);
-            } else if (emptiedTanksStack != null) {
-                adjustStack(emptiedTanksStack);
-                player.inventory.setItemStack(emptiedTanksStack);
-                dropItem(partialTanksStack);
-            } else if (partialTanksStack != null) {
-                player.inventory.setItemStack(partialTanksStack);
-            } else {
-                player.inventory.setItemStack(null);
-                shouldSendStack = false;
-            }
-        } else {
-            // Shift clicked in
-            if (untouchedTanks > 0) {
-                targetStack.stackSize = untouchedTanks;
-                adjustStack(targetStack);
-                dropItem(emptiedTanksStack);
-                dropItem(partialTanksStack);
-            } else if (emptiedTanksStack != null) {
-                adjustStack(emptiedTanksStack);
-                player.inventory.setInventorySlotContents(slotIndex, emptiedTanksStack);
-                dropItem(partialTanksStack);
-            } else if (partialTanksStack != null) {
-                player.inventory.setInventorySlotContents(slotIndex, partialTanksStack);
-            } else {
-                player.inventory.setInventorySlotContents(slotIndex, null);
-            }
-        }
-        if (shouldSendStack) {
-            FluidCraft.proxy.netHandler.sendTo(
-                    new SPacketFluidUpdate(new HashMap<>(), player.inventory.getItemStack()),
-                    (EntityPlayerMP) player);
-        } else {
-            FluidCraft.proxy.netHandler.sendTo(new SPacketFluidUpdate(new HashMap<>()), (EntityPlayerMP) player);
-        }
-    }
-
-    /**
-     * The extract operation. For input, we have an empty container stack. For outputs, we have the following:
-     * <ol>
-     * <li>Leftover empty container stack</li>
-     * <li>Filled containers (full)</li>
-     * <li>Partially filled container x1</li>
-     * </ol>
-     * In order above, the itemstack at `slotIndex` is transformed into the output.
-     */
-    private void extractFluid(IAEFluidStack clientRequestedFluid, EntityPlayer player, int slotIndex, boolean shift) {
-        if (slotIndex != -1) {
-            // shift-click from inventory cant fill fluids
-            return;
-        }
-        final ItemStack targetStack = player.inventory.getItemStack();
-        final int containersRequestedToExtract = shift ? targetStack.stackSize : 1;
-
-        final FluidStack clientRequestedFluidStack = clientRequestedFluid.getFluidStack();
-        clientRequestedFluidStack.amount = Integer.MAX_VALUE;
-
-        // Step 1: Determine container characteristics and verify fluid to be insertable
-        final int fluidPerContainer;
-        final boolean partialInsertSupported;
-        if (targetStack.getItem() instanceof IFluidContainerItem fcItem) {
-            ItemStack testStack = targetStack.copy();
-            testStack.stackSize = 1;
-            fluidPerContainer = fcItem.fill(testStack, clientRequestedFluidStack, false);
-            if (fluidPerContainer == 0) {
-                return;
-            }
-            partialInsertSupported = true;
-        } else if (FluidContainerRegistry.isContainer(targetStack)) {
-            fluidPerContainer = FluidContainerRegistry.getContainerCapacity(clientRequestedFluidStack, targetStack);
-            partialInsertSupported = false;
-        } else {
-            return;
-        }
-
-        // Step 2: determine fluid in network
-        final IAEFluidStack totalRequestedFluid = clientRequestedFluid.copy();
-        totalRequestedFluid.setStackSize((long) fluidPerContainer * containersRequestedToExtract);
-
-        final IAEFluidStack availableFluid = this.host.getFluidInventory()
-                .extractItems(totalRequestedFluid, Actionable.SIMULATE, this.getActionSource());
-        if (availableFluid == null || availableFluid.getStackSize() == 0) {
-            return;
-        }
-
-        if (availableFluid.getStackSize() != totalRequestedFluid.getStackSize() && !partialInsertSupported) {
-            availableFluid.decStackSize(availableFluid.getStackSize() % fluidPerContainer);
-        }
-
-        // Step 3: perform extract
-        final IAEFluidStack extracted = this.host.getFluidInventory()
-                .extractItems(availableFluid, Actionable.MODULATE, this.getActionSource());
-        final long totalExtracted = extracted != null ? extracted.getStackSize() : 0;
-
-        // Step 4: calculate outputs
-        final int filledTanks = (int) (totalExtracted / fluidPerContainer);
-        final int partialFill = (int) (totalExtracted % fluidPerContainer);
-        final int partialTanks = partialFill > 0 && partialInsertSupported ? 1 : 0;
-        final int usedTanks = filledTanks + partialTanks;
-        final int untouchedTanks = targetStack.stackSize - usedTanks;
-
-        final ItemStack filledTanksStack;
-        final ItemStack partialTanksStack;
-
-        if (targetStack.getItem() instanceof IFluidContainerItem fcItem) {
-            if (filledTanks > 0) {
-                filledTanksStack = targetStack.copy();
-                filledTanksStack.stackSize = 1;
-                FluidStack toInsert = extracted.getFluidStack().copy();
-                toInsert.amount = fluidPerContainer;
-                fcItem.fill(filledTanksStack, toInsert, true);
-                filledTanksStack.stackSize = filledTanks;
-            } else {
-                filledTanksStack = null;
-            }
-            if (partialTanks > 0) {
-                partialTanksStack = targetStack.copy();
-                partialTanksStack.stackSize = 1;
-                FluidStack toInsert = extracted.getFluidStack().copy();
-                toInsert.amount = partialFill;
-                fcItem.fill(partialTanksStack, toInsert, true);
-            } else {
-                partialTanksStack = null;
-            }
-        } else {
-            if (filledTanks > 0) {
-                FluidStack toInsert = extracted.getFluidStack().copy();
-                toInsert.amount = fluidPerContainer;
-                filledTanksStack = FluidContainerRegistry.fillFluidContainer(toInsert, targetStack);
-                filledTanksStack.stackSize = filledTanks;
-            } else {
-                filledTanksStack = null;
-            }
-            if (partialFill > 0) {
-                // User has a setup that causes discrepancy between simulation and modulation. Likely double storage
-                // bus.
-                // We cant have partially filled containers -> user will receive a fluid packet as last resort
-                IAEFluidStack overflow = extracted.copy();
-                overflow.setStackSize(partialFill);
-                dropItem(ItemFluidPacket.newStack(overflow));
-            }
-            partialTanksStack = null;
-        }
-
-        // Done. Put the output in the inventory or ground, and update stack size.
-        // We can assume slotIndex == -1, since we don't actually allow extraction via shift click.
-        boolean shouldSendStack = true;
-        if (untouchedTanks > 0) {
-            ItemStack emptyStack = player.inventory.getItemStack();
-            emptyStack.stackSize = untouchedTanks;
-            adjustStack(emptyStack);
-            dropItem(filledTanksStack);
-            dropItem(partialTanksStack);
-        } else if (filledTanksStack != null) {
-            adjustStack(filledTanksStack);
-            player.inventory.setItemStack(filledTanksStack);
-            dropItem(partialTanksStack);
-        } else if (partialTanksStack != null) {
-            player.inventory.setItemStack(partialTanksStack);
-        } else {
-            player.inventory.setItemStack(null);
-            shouldSendStack = false;
-        }
-        if (shouldSendStack) {
-            FluidCraft.proxy.netHandler.sendTo(
-                    new SPacketFluidUpdate(new HashMap<>(), player.inventory.getItemStack()),
-                    (EntityPlayerMP) player);
-        } else {
-            FluidCraft.proxy.netHandler.sendTo(new SPacketFluidUpdate(new HashMap<>()), (EntityPlayerMP) player);
-        }
-    }
-
-    void adjustStack(ItemStack stack) {
-        if (stack != null && stack.stackSize > stack.getMaxStackSize()) {
-            dropItem(stack, stack.stackSize - stack.getMaxStackSize());
-            stack.stackSize = stack.getMaxStackSize();
-        }
-    }
-
-    protected boolean isEssentiaMode() {
-        return false;
-    }
-
-    @Override
-    protected boolean isWirelessTerminal() {
-        return false;
-    }
-}

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

@@ -1,69 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import java.util.Objects;
-
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import com.glodblock.github.common.item.ItemBaseWirelessTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminal;
-import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
-import com.glodblock.github.common.parts.PartLevelTerminal;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.util.BlockPos;
-
-import appeng.api.networking.security.IActionHost;
-import appeng.api.storage.ITerminalHost;
-import appeng.container.implementations.ContainerOptimizePatterns;
-
-public class ContainerFluidOptimizePatterns extends ContainerOptimizePatterns {
-
-    public ContainerFluidOptimizePatterns(InventoryPlayer ip, ITerminalHost te) {
-        super(ip, te);
-    }
-
-    public World getWorld() {
-        return this.getPlayerInv().player.worldObj;
-    }
-
-    @Override
-    public void switchToOriginalGUI() {
-        GuiType originalGui = null;
-
-        final IActionHost ah = this.getActionHost();
-        if (ah instanceof PartFluidPatternTerminal) {
-            originalGui = GuiType.FLUID_PATTERN_TERMINAL;
-        }
-        if (ah instanceof PartFluidPatternTerminalEx) {
-            originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX;
-        }
-        if (ah instanceof PartLevelTerminal) {
-            originalGui = GuiType.LEVEL_TERMINAL;
-        }
-        if (ah instanceof IWirelessTerminal) {
-            ItemStack terminal = ((IWirelessTerminal) ah).getItemStack();
-            if (terminal.getItem() instanceof ItemBaseWirelessTerminal) {
-                originalGui = ((ItemBaseWirelessTerminal) terminal.getItem()).guiGuiType(terminal);
-            }
-        }
-        if (ah instanceof IWirelessTerminal) {
-            InventoryHandler.openGui(
-                    this.getInventoryPlayer().player,
-                    getWorld(),
-                    new BlockPos(((IWirelessTerminal) ah).getInventorySlot(), 0, 0),
-                    ForgeDirection.UNKNOWN,
-                    originalGui);
-        } else if (this.getOpenContext() != null) {
-            InventoryHandler.openGui(
-                    this.getInventoryPlayer().player,
-                    getWorld(),
-                    new BlockPos(this.getOpenContext().getTile()),
-                    Objects.requireNonNull(this.getOpenContext().getSide()),
-                    originalGui);
-        }
-    }
-}

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

@@ -1,17 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import net.minecraft.entity.player.InventoryPlayer;
-
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-
-public class ContainerFluidPatternExWireless extends ContainerFluidPatternTerminalEx {
-
-    public ContainerFluidPatternExWireless(InventoryPlayer ip, IWirelessTerminal monitorable) {
-        super(ip, monitorable);
-    }
-
-    @Override
-    protected boolean isWirelessTerminal() {
-        return true;
-    }
-}

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

@@ -1,161 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
-
-import com.glodblock.github.client.gui.container.base.FCContainerEncodeTerminal;
-
-import appeng.api.storage.ITerminalHost;
-import appeng.container.slot.OptionalSlotFake;
-import appeng.container.slot.SlotFakeCraftingMatrix;
-import appeng.container.slot.SlotPatternOutputs;
-import appeng.container.slot.SlotPatternTerm;
-import appeng.util.Platform;
-
-public class ContainerFluidPatternTerminal extends FCContainerEncodeTerminal {
-
-    public ContainerFluidPatternTerminal(final InventoryPlayer ip, final ITerminalHost monitorable) {
-        super(ip, monitorable);
-        final IInventory output = this.patternTerminal.getInventoryByName("output");
-        final IInventory patternInv = this.patternTerminal.getInventoryByName("pattern");
-        this.craftingSlots = new SlotFakeCraftingMatrix[9];
-        this.outputSlots = new OptionalSlotFake[3];
-        for (int y = 0; y < 3; y++) {
-            for (int x = 0; x < 3; x++) {
-                this.addSlotToContainer(
-                        this.craftingSlots[x + y * 3] = new SlotFakeCraftingMatrix(
-                                this.crafting,
-                                x + y * 3,
-                                18 + x * 18,
-                                -76 + y * 18));
-            }
-        }
-
-        this.addSlotToContainer(
-                this.craftSlot = new SlotPatternTerm(
-                        ip.player,
-                        this.getActionSource(),
-                        this.getPowerSource(),
-                        monitorable,
-                        this.crafting,
-                        patternInv,
-                        this.cOut,
-                        110,
-                        -76 + 18,
-                        this,
-                        2,
-                        this));
-        this.craftSlot.setIIcon(-1);
-
-        for (int y = 0; y < 3; y++) {
-            this.addSlotToContainer(
-                    this.outputSlots[y] = new SlotPatternOutputs(output, this, y, 110, -76 + y * 18, 0, 0, 1));
-            this.outputSlots[y].setRenderDisabled(false);
-        }
-        this.updateOrderOfOutputSlots();
-    }
-
-    private void updateOrderOfOutputSlots() {
-        if (!this.isCraftingMode()) {
-            this.craftSlot.xDisplayPosition = -9000;
-            for (int y = 0; y < 3; y++) {
-                this.outputSlots[y].xDisplayPosition = this.outputSlots[y].getX();
-            }
-        } else {
-            this.craftSlot.xDisplayPosition = this.craftSlot.getX();
-            for (int y = 0; y < 3; y++) {
-                this.outputSlots[y].xDisplayPosition = -9000;
-            }
-        }
-    }
-
-    protected boolean validPatternSlot(Slot slot) {
-        return slot instanceof SlotFakeCraftingMatrix || slot instanceof SlotPatternOutputs;
-    }
-
-    @Override
-    public void putStackInSlot(final int par1, final ItemStack par2ItemStack) {
-        super.putStackInSlot(par1, par2ItemStack);
-        this.getAndUpdateOutput();
-    }
-
-    @Override
-    public void putStacksInSlots(final ItemStack[] par1ArrayOfItemStack) {
-        super.putStacksInSlots(par1ArrayOfItemStack);
-        this.getAndUpdateOutput();
-    }
-
-    private ItemStack getAndUpdateOutput() {
-        final InventoryCrafting ic = new InventoryCrafting(this, 3, 3);
-
-        for (int x = 0; x < ic.getSizeInventory(); x++) {
-            ic.setInventorySlotContents(x, this.crafting.getStackInSlot(x));
-        }
-
-        final ItemStack is = CraftingManager.getInstance().findMatchingRecipe(ic, this.getPlayerInv().player.worldObj);
-        this.cOut.setInventorySlotContents(0, is);
-        return is;
-    }
-
-    @Override
-    protected ItemStack[] getOutputs() {
-        if (this.isCraftingMode()) {
-            final ItemStack out = this.getAndUpdateOutput();
-            if (out != null && out.stackSize > 0) {
-                return new ItemStack[] { out };
-            }
-        }
-        return super.getOutputs();
-    }
-
-    @Override
-    public boolean isSlotEnabled(final int idx) {
-        if (idx == 1) {
-            return Platform.isServer() ? !this.patternTerminal.isCraftingRecipe() : !this.isCraftingMode();
-        } else if (idx == 2) {
-            return Platform.isServer() ? this.patternTerminal.isCraftingRecipe() : this.isCraftingMode();
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public void detectAndSendChanges() {
-        super.detectAndSendChanges();
-        if (Platform.isServer()) {
-            if (this.isCraftingMode() != this.patternTerminal.isCraftingRecipe()) {
-                this.setCraftingMode(this.patternTerminal.isCraftingRecipe());
-                this.updateOrderOfOutputSlots();
-            }
-        }
-    }
-
-    @Override
-    public void onUpdate(final String field, final Object oldValue, final Object newValue) {
-        super.onUpdate(field, oldValue, newValue);
-        if (field.equals("craftingMode")) {
-            this.getAndUpdateOutput();
-            this.updateOrderOfOutputSlots();
-        }
-    }
-
-    public void clear() {
-        super.clear();
-        this.getAndUpdateOutput();
-    }
-
-    private void setCraftingMode(final boolean craftingMode) {
-        this.craftingMode = craftingMode;
-    }
-
-    @Override
-    public void doubleStacks(int val) {
-        if (!isCraftingMode()) {
-            super.doubleStacks(val);
-        }
-    }
-}

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

@@ -1,153 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-
-import com.glodblock.github.client.gui.container.base.FCContainerEncodeTerminal;
-
-import appeng.api.storage.ITerminalHost;
-import appeng.container.slot.IOptionalSlotHost;
-import appeng.container.slot.OptionalSlotFake;
-import appeng.helpers.InventoryAction;
-import appeng.util.Platform;
-
-public class ContainerFluidPatternTerminalEx extends FCContainerEncodeTerminal {
-
-    private static final int CRAFTING_GRID_PAGES = 2;
-    private static final int CRAFTING_GRID_WIDTH = 4;
-    private static final int CRAFTING_GRID_HEIGHT = 4;
-    private static final int CRAFTING_GRID_SLOTS = CRAFTING_GRID_WIDTH * CRAFTING_GRID_HEIGHT;
-
-    public ContainerFluidPatternTerminalEx(final InventoryPlayer ip, final ITerminalHost monitorable) {
-        super(ip, monitorable);
-        this.craftingSlots = new ProcessingSlotFake[CRAFTING_GRID_SLOTS * CRAFTING_GRID_PAGES];
-        this.outputSlots = new ProcessingSlotFake[CRAFTING_GRID_SLOTS * CRAFTING_GRID_PAGES];
-        final IInventory output = this.getPatternTerminal().getInventoryByName("output");
-        for (int page = 0; page < CRAFTING_GRID_PAGES; page++) {
-            for (int y = 0; y < CRAFTING_GRID_HEIGHT; y++) {
-                for (int x = 0; x < CRAFTING_GRID_WIDTH; x++) {
-                    this.addSlotToContainer(
-                            this.craftingSlots[x + y * CRAFTING_GRID_WIDTH
-                                    + page * CRAFTING_GRID_SLOTS] = new ProcessingSlotFake(
-                                            crafting,
-                                            this,
-                                            x + y * CRAFTING_GRID_WIDTH + page * CRAFTING_GRID_SLOTS,
-                                            15,
-                                            -83,
-                                            x,
-                                            y,
-                                            x + 4));
-                }
-            }
-            for (int x = 0; x < CRAFTING_GRID_WIDTH; x++) {
-                for (int y = 0; y < CRAFTING_GRID_HEIGHT; y++) {
-                    this.addSlotToContainer(
-                            this.outputSlots[x * CRAFTING_GRID_HEIGHT + y
-                                    + page * CRAFTING_GRID_SLOTS] = new ProcessingSlotFake(
-                                            output,
-                                            this,
-                                            x * CRAFTING_GRID_HEIGHT + y + page * CRAFTING_GRID_SLOTS,
-                                            112,
-                                            -83,
-                                            -x,
-                                            y,
-                                            x));
-                }
-            }
-        }
-        this.craftingMode = false;
-    }
-
-    @Override
-    public boolean isSlotEnabled(final int idx) {
-        if (idx < 4) // outputs
-        {
-            return inverted || idx == 0;
-        } else {
-            return !inverted || idx == 4;
-        }
-    }
-
-    protected boolean validPatternSlot(Slot slot) {
-        return slot instanceof ProcessingSlotFake;
-    }
-
-    @Override
-    public void detectAndSendChanges() {
-        if (Platform.isServer()) {
-            if (inverted != patternTerminal.isInverted() || activePage != patternTerminal.getActivePage()) {
-                inverted = patternTerminal.isInverted();
-                activePage = patternTerminal.getActivePage();
-                offsetSlots();
-            }
-        }
-        super.detectAndSendChanges();
-    }
-
-    private void offsetSlots() {
-        for (int page = 0; page < CRAFTING_GRID_PAGES; page++) {
-            for (int y = 0; y < CRAFTING_GRID_HEIGHT; y++) {
-                for (int x = 0; x < CRAFTING_GRID_WIDTH; x++) {
-                    ((ProcessingSlotFake) this.craftingSlots[x + y * CRAFTING_GRID_WIDTH + page * CRAFTING_GRID_SLOTS])
-                            .setHidden(page != activePage || x > 0 && inverted);
-                    ((ProcessingSlotFake) this.outputSlots[x * CRAFTING_GRID_HEIGHT + y + page * CRAFTING_GRID_SLOTS])
-                            .setHidden(page != activePage || x > 0 && !inverted);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onUpdate(String field, Object oldValue, Object newValue) {
-        super.onUpdate(field, oldValue, newValue);
-        if (field.equals("inverted") || field.equals("activePage")) {
-            offsetSlots();
-        }
-    }
-
-    @Override
-    public void onSlotChange(final Slot s) {
-        if (s == this.patternSlotOUT && Platform.isServer()) {
-            inverted = patternTerminal.isInverted();
-        }
-        super.onSlotChange(s);
-    }
-
-    @Override
-    public void doAction(EntityPlayerMP player, InventoryAction action, int slotId, long id) {
-        this.craftingMode = false;
-        super.doAction(player, action, slotId, id);
-    }
-
-    @Override
-    public void encode() {
-        this.craftingMode = false;
-        super.encode();
-    }
-
-    @Override
-    public boolean isCraftingMode() {
-        return false;
-    }
-
-    private static class ProcessingSlotFake extends OptionalSlotFake {
-
-        private static final int POSITION_SHIFT = 9000;
-        private boolean hidden = false;
-
-        public ProcessingSlotFake(IInventory inv, IOptionalSlotHost containerBus, int idx, int x, int y, int offX,
-                int offY, int groupNum) {
-            super(inv, containerBus, idx, x, y, offX, offY, groupNum);
-            this.setRenderDisabled(false);
-        }
-
-        public void setHidden(boolean hide) {
-            if (this.hidden != hide) {
-                this.hidden = hide;
-                this.xDisplayPosition += (hide ? -1 : 1) * POSITION_SHIFT;
-            }
-        }
-    }
-}

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

@@ -1,17 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import net.minecraft.entity.player.InventoryPlayer;
-
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-
-public class ContainerFluidPatternWireless extends ContainerFluidPatternTerminal {
-
-    public ContainerFluidPatternWireless(InventoryPlayer ip, IWirelessTerminal monitorable) {
-        super(ip, monitorable);
-    }
-
-    @Override
-    protected boolean isWirelessTerminal() {
-        return true;
-    }
-}

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

@@ -1,19 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import net.minecraft.entity.player.InventoryPlayer;
-
-import com.glodblock.github.inventory.item.IFluidPortableCell;
-
-public class ContainerFluidPortableCell extends ContainerFluidMonitor {
-
-    public ContainerFluidPortableCell(final InventoryPlayer ip, final IFluidPortableCell monitorable) {
-        super(ip, monitorable, false);
-        this.bindPlayerInventory(ip, 0, 0);
-    }
-
-    @Override
-    protected boolean isWirelessTerminal() {
-        return true;
-    }
-
-}

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

@@ -1,191 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import java.util.Iterator;
-
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.IInventory;
-
-import com.glodblock.github.client.gui.container.base.FCContainerFluidConfigurable;
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.common.parts.PartFluidStorageBus;
-import com.glodblock.github.inventory.slot.OptionalFluidSlotFakeTypeOnly;
-
-import appeng.api.AEApi;
-import appeng.api.config.AccessRestriction;
-import appeng.api.config.SecurityPermissions;
-import appeng.api.config.Settings;
-import appeng.api.config.StorageFilter;
-import appeng.api.config.Upgrades;
-import appeng.api.storage.IMEInventory;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.storage.data.IItemList;
-import appeng.container.guisync.GuiSync;
-import appeng.container.slot.SlotRestrictedInput;
-import appeng.tile.inventory.AppEngInternalAEInventory;
-import appeng.util.IterationCounter;
-import appeng.util.Platform;
-import appeng.util.iterators.NullIterator;
-
-public class ContainerFluidStorageBus extends FCContainerFluidConfigurable {
-
-    public final PartFluidStorageBus bus;
-
-    @GuiSync(3)
-    public AccessRestriction rwMode = AccessRestriction.READ_WRITE;
-
-    @GuiSync(4)
-    public StorageFilter storageFilter = StorageFilter.EXTRACTABLE_ONLY;
-
-    public ContainerFluidStorageBus(InventoryPlayer ip, PartFluidStorageBus te) {
-        super(ip, te);
-        this.bus = te;
-    }
-
-    @Override
-    protected int getHeight() {
-        return 251;
-    }
-
-    @Override
-    protected void setupConfig() {
-        final int xo = 8;
-        final int yo = 23 + 6;
-        final IInventory upgrades = getUpgradeable().getInventoryByName("upgrades");
-        final IInventory config = getUpgradeable().getInventoryByName("config");
-        for (int y = 0; y < 7; y++) {
-            for (int x = 0; x < 9; x++) {
-                this.addSlotToContainer(
-                        new OptionalFluidSlotFakeTypeOnly(config, null, this, y * 9 + x, xo, yo, x, y, y));
-            }
-        }
-        this.addSlotToContainer(
-                (new SlotRestrictedInput(
-                        SlotRestrictedInput.PlacableItemType.UPGRADES,
-                        upgrades,
-                        0,
-                        187,
-                        8,
-                        this.getInventoryPlayer())).setNotDraggable());
-        this.addSlotToContainer(
-                (new SlotRestrictedInput(
-                        SlotRestrictedInput.PlacableItemType.UPGRADES,
-                        upgrades,
-                        1,
-                        187,
-                        8 + 18,
-                        this.getInventoryPlayer())).setNotDraggable());
-        this.addSlotToContainer(
-                (new SlotRestrictedInput(
-                        SlotRestrictedInput.PlacableItemType.UPGRADES,
-                        upgrades,
-                        2,
-                        187,
-                        8 + 18 * 2,
-                        this.getInventoryPlayer())).setNotDraggable());
-        this.addSlotToContainer(
-                (new SlotRestrictedInput(
-                        SlotRestrictedInput.PlacableItemType.UPGRADES,
-                        upgrades,
-                        3,
-                        187,
-                        8 + 18 * 3,
-                        this.getInventoryPlayer())).setNotDraggable());
-        this.addSlotToContainer(
-                (new SlotRestrictedInput(
-                        SlotRestrictedInput.PlacableItemType.UPGRADES,
-                        upgrades,
-                        4,
-                        187,
-                        8 + 18 * 4,
-                        this.getInventoryPlayer())).setNotDraggable());
-    }
-
-    @Override
-    protected boolean isValidForConfig(int slot, IAEFluidStack fs) {
-        if (this.supportCapacity()) {
-            final int upgrades = getUpgradeable().getInstalledUpgrades(Upgrades.CAPACITY);
-            final int y = slot / 9;
-            return y < upgrades + 2;
-        }
-        return true;
-    }
-
-    @Override
-    protected boolean supportCapacity() {
-        return true;
-    }
-
-    @Override
-    public int availableUpgrades() {
-        return 5;
-    }
-
-    @Override
-    public void detectAndSendChanges() {
-        this.verifyPermissions(SecurityPermissions.BUILD, false);
-
-        if (Platform.isServer()) {
-            this.setReadWriteMode((AccessRestriction) getUpgradeable().getConfigManager().getSetting(Settings.ACCESS));
-            this.setStorageFilter(
-                    (StorageFilter) getUpgradeable().getConfigManager().getSetting(Settings.STORAGE_FILTER));
-        }
-
-        this.standardDetectAndSendChanges();
-    }
-
-    @Override
-    public boolean isSlotEnabled(final int idx) {
-        if (getUpgradeable().getInstalledUpgrades(Upgrades.ORE_FILTER) > 0) return false;
-        final int upgrades = getUpgradeable().getInstalledUpgrades(Upgrades.CAPACITY);
-        return upgrades > (idx - 2);
-    }
-
-    public void clear() {
-        AppEngInternalAEInventory h = this.bus.getConfig();
-        for (int i = 0; i < h.getSizeInventory(); ++i) {
-            h.setInventorySlotContents(i, null);
-        }
-        this.detectAndSendChanges();
-    }
-
-    public void partition() {
-        AppEngInternalAEInventory h = this.bus.getConfig();
-        final IMEInventory<IAEFluidStack> cellInv = this.bus.getInternalHandler();
-        Iterator<IAEFluidStack> i = new NullIterator<>();
-        if (cellInv != null) {
-            final IItemList<IAEFluidStack> list = cellInv
-                    .getAvailableItems(AEApi.instance().storage().createFluidList(), IterationCounter.fetchNewId());
-            i = list.iterator();
-        }
-
-        for (int x = 0; x < h.getSizeInventory(); x++) {
-            if (i.hasNext() && this.isSlotEnabled((x / 9) - 2)) {
-                h.setInventorySlotContents(x, ItemFluidPacket.newStack(i.next()));
-            } else {
-                h.setInventorySlotContents(x, null);
-            }
-        }
-        this.detectAndSendChanges();
-    }
-
-    public AccessRestriction getReadWriteMode() {
-        return this.rwMode;
-    }
-
-    public StorageFilter getStorageFilter() {
-        return this.storageFilter;
-    }
-
-    @Override
-    public AppEngInternalAEInventory getFakeFluidInv() {
-        return (AppEngInternalAEInventory) this.bus.getInventoryByName("config");
-    }
-
-    private void setReadWriteMode(final AccessRestriction rwMode) {
-        this.rwMode = rwMode;
-    }
-
-    private void setStorageFilter(final StorageFilter storageFilter) {
-        this.storageFilter = storageFilter;
-    }
-}

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

@@ -1,44 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-
-import com.glodblock.github.client.gui.container.base.FCBaseContainer;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-
-import appeng.container.implementations.ContainerInterfaceTerminal;
-import appeng.helpers.InventoryAction;
-import appeng.util.Platform;
-
-public class ContainerInterfaceWireless extends FCBaseContainer {
-
-    ContainerInterfaceTerminal delegateContainer;
-
-    public ContainerInterfaceWireless(final InventoryPlayer ip, final IWirelessTerminal monitorable) {
-        super(ip, monitorable);
-
-        delegateContainer = new ContainerInterfaceTerminal(ip, monitorable);
-
-        this.bindPlayerInventory(ip, 14, 3);
-    }
-
-    @Override
-    public void detectAndSendChanges() {
-        if (Platform.isClient()) {
-            return;
-        }
-        super.detectAndSendChanges();
-
-        delegateContainer.detectAndSendChanges();
-    }
-
-    @Override
-    public void doAction(final EntityPlayerMP player, final InventoryAction action, final int slot, final long id) {
-        delegateContainer.doAction(player, action, slot, id);
-    }
-
-    @Override
-    protected boolean isWirelessTerminal() {
-        return true;
-    }
-}

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

@@ -1,152 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.minecraftforge.common.util.ForgeDirection;
-
-import com.glodblock.github.client.gui.container.base.FCContainerMonitor;
-import com.glodblock.github.network.SPacketMEUpdateBuffer;
-
-import appeng.api.AEApi;
-import appeng.api.implementations.tiles.IViewCellStorage;
-import appeng.api.networking.IGrid;
-import appeng.api.networking.IGridHost;
-import appeng.api.networking.IGridNode;
-import appeng.api.networking.energy.IEnergyGrid;
-import appeng.api.networking.energy.IEnergySource;
-import appeng.api.networking.security.BaseActionSource;
-import appeng.api.networking.storage.IBaseMonitor;
-import appeng.api.networking.storage.IStorageGrid;
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.storage.data.IItemList;
-import appeng.container.slot.SlotRestrictedInput;
-import appeng.me.helpers.ChannelPowerSrc;
-import appeng.util.Platform;
-
-public class ContainerItemMonitor extends FCContainerMonitor<IAEItemStack> {
-
-    private final IItemList<IAEItemStack> items = AEApi.instance().storage().createItemList();
-
-    public ContainerItemMonitor(final InventoryPlayer ip, final ITerminalHost monitorable) {
-        this(ip, monitorable, true);
-    }
-
-    protected ContainerItemMonitor(final InventoryPlayer ip, final ITerminalHost monitorable,
-            final boolean bindInventory) {
-        super(ip, monitorable, bindInventory);
-        if (Platform.isServer()) {
-            this.serverCM = monitorable.getConfigManager();
-            if (monitorable instanceof IGridHost) {
-                final IGridNode node = ((IGridHost) monitorable).getGridNode(ForgeDirection.UNKNOWN);
-                if (node != null) {
-                    this.networkNode = node;
-                    final IGrid g = node.getGrid();
-                    if (g != null) {
-                        this.setPowerSource(new ChannelPowerSrc(this.networkNode, g.getCache(IEnergyGrid.class)));
-                        IStorageGrid storageGrid = g.getCache(IStorageGrid.class);
-                        this.monitor = storageGrid.getItemInventory();
-                        if (this.monitor == null) {
-                            this.setValidContainer(false);
-                        } else {
-                            this.monitor.addListener(this, null);
-                            this.setCellInventory(this.monitor);
-                        }
-                    }
-                } else {
-                    this.setValidContainer(false);
-                }
-            } else {
-                this.monitor = monitorable.getItemInventory();
-                this.monitor.addListener(this, null);
-                this.setCellInventory(this.monitor);
-                this.setPowerSource((IEnergySource) monitorable);
-            }
-        } else {
-            this.monitor = null;
-        }
-
-        this.canAccessViewCells = false;
-        if (monitorable instanceof IViewCellStorage) {
-            for (int y = 0; y < 5; y++) {
-                this.cellView[y] = new SlotRestrictedInput(
-                        SlotRestrictedInput.PlacableItemType.VIEW_CELL,
-                        ((IViewCellStorage) monitorable).getViewCellStorage(),
-                        y,
-                        206,
-                        y * 18 + 8,
-                        this.getInventoryPlayer());
-                this.cellView[y].setAllowEdit(this.canAccessViewCells);
-                this.addSlotToContainer(this.cellView[y]);
-            }
-        }
-
-        if (bindInventory) {
-            this.bindPlayerInventory(ip, 0, 0);
-        }
-    }
-
-    @Override
-    protected void processItemList() {
-        if (!this.items.isEmpty()) {
-            final IItemList<IAEItemStack> monitorCache = this.monitor.getStorageList();
-            List<IAEItemStack> toSend = new ArrayList<>();
-            for (final IAEItemStack is : this.items) {
-                final IAEItemStack send = monitorCache.findPrecise(is);
-                if (send != null) {
-                    toSend.add(send);
-                } else {
-                    is.setStackSize(0);
-                    toSend.add(is);
-                }
-            }
-            for (final Object c : this.crafters) {
-                if (c instanceof EntityPlayer) {
-                    SPacketMEUpdateBuffer.scheduleItemUpdate((EntityPlayerMP) c, toSend);
-                }
-            }
-            this.items.resetStatus();
-        }
-    }
-
-    @Override
-    protected void queueInventory(final ICrafting c) {
-        if (Platform.isServer() && c instanceof EntityPlayer && this.monitor != null) {
-            final IItemList<IAEItemStack> monitorCache = this.monitor.getStorageList();
-            List<IAEItemStack> toSend = new ArrayList<>();
-            for (final IAEItemStack is : monitorCache) {
-                toSend.add(is);
-            }
-            SPacketMEUpdateBuffer.scheduleItemUpdate((EntityPlayerMP) c, toSend);
-        }
-    }
-
-    @Override
-    public void removeCraftingFromCrafters(final ICrafting c) {
-        super.removeCraftingFromCrafters(c);
-        if (this.crafters.isEmpty() && this.monitor != null) {
-            this.monitor.removeListener(this);
-            if (c instanceof EntityPlayerMP) {
-                SPacketMEUpdateBuffer.clear((EntityPlayerMP) c);
-            }
-        }
-    }
-
-    @Override
-    public void postChange(final IBaseMonitor<IAEItemStack> monitor, final Iterable<IAEItemStack> change,
-            final BaseActionSource source) {
-        for (final IAEItemStack is : change) {
-            this.items.add(is);
-        }
-    }
-
-    @Override
-    protected boolean isWirelessTerminal() {
-        return false;
-    }
-}

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

@@ -7,19 +7,26 @@ import net.minecraft.item.ItemStack;
 
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.tile.TileLevelMaintainer;
-import com.glodblock.github.inventory.AeItemStackHandler;
 import com.glodblock.github.inventory.slot.SlotFluidConvertingFake;
 import com.glodblock.github.network.SPacketLevelMaintainerGuiUpdate;
 
 import appeng.api.config.SecurityPermissions;
-import appeng.container.AEBaseContainer;
+import appeng.api.storage.StorageName;
+import appeng.api.storage.data.IAEStack;
+import appeng.container.ContainerSubGui;
+import appeng.container.interfaces.IVirtualSlotHolder;
+import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.PacketVirtualSlot;
 import appeng.helpers.InventoryAction;
+import appeng.tile.inventory.IAEStackInventory;
 import appeng.util.Platform;
+import appeng.util.item.AEItemStack;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
-public class ContainerLevelMaintainer extends AEBaseContainer {
+public class ContainerLevelMaintainer extends ContainerSubGui implements IVirtualSlotHolder {
 
     private final TileLevelMaintainer tile;
-    private final SlotFluidConvertingFake[] requestSlots = new SlotFluidConvertingFake[TileLevelMaintainer.REQ_COUNT];
 
     private static final int UPDATE_INTERVAL = 20;
     private boolean isFirstUpdate = true;
@@ -28,12 +35,7 @@ public class ContainerLevelMaintainer extends AEBaseContainer {
     public ContainerLevelMaintainer(InventoryPlayer ipl, TileLevelMaintainer tile) {
         super(ipl, tile);
         this.tile = tile;
-        AeItemStackHandler request = new AeItemStackHandler(tile.getRequestSlots());
-        for (int y = 0; y < TileLevelMaintainer.REQ_COUNT; y++) {
-            SlotFluidConvertingFake slot = new SlotFluidConvertingFake(request, y, 27, 20 + y * 19);
-            addSlotToContainer(slot);
-            requestSlots[y] = slot;
-        }
+
         bindPlayerInventory(ipl, 0, 130);
     }
 
@@ -41,10 +43,6 @@ public class ContainerLevelMaintainer extends AEBaseContainer {
         return tile;
     }
 
-    public SlotFluidConvertingFake[] getRequestSlots() {
-        return this.requestSlots;
-    }
-
     @Override
     public void doAction(EntityPlayerMP player, InventoryAction action, int slotId, long id) {
         if (getSlot(slotId) instanceof SlotFluidConvertingFake slot) {
@@ -70,12 +68,15 @@ public class ContainerLevelMaintainer extends AEBaseContainer {
             return null;
         }
 
-        for (int i = 0; i < this.getRequestSlots().length; i++) {
-            SlotFluidConvertingFake slot = this.getRequestSlots()[i];
-            if (!slot.getHasStack()) {
-                ItemStack itemStack = this.inventorySlots.get(idx).getStack();
-                tile.updateStack(i, itemStack.copy());
-                break;
+        ItemStack clickedStack = this.inventorySlots.get(idx).getStack();
+        if (clickedStack != null) {
+            IAEStackInventory inventory = this.getTile().getAEStackInventory();
+            for (int i = 0; i < inventory.getSizeInventory(); i++) {
+                IAEStack<?> stack = inventory.getAEStackInSlot(i);
+                if (stack == null) {
+                    tile.updateStack(i, AEItemStack.create(clickedStack));
+                    break;
+                }
             }
         }
 
@@ -98,10 +99,36 @@ public class ContainerLevelMaintainer extends AEBaseContainer {
     }
 
     public void updateGui() {
+        if (this.isFirstUpdate) {
+            Int2ObjectMap<IAEStack<?>> list = new Int2ObjectOpenHashMap<>();
+            for (int i = 0; i < this.tile.requests.length; i++) {
+                TileLevelMaintainer.RequestInfo info = this.tile.requests[i];
+                list.put(i, info != null ? info.getAEStack() : null);
+            }
+            NetworkHandler.instance.sendTo(
+                    new PacketVirtualSlot(StorageName.NONE, list),
+                    (EntityPlayerMP) this.getInventoryPlayer().player);
+        }
         FluidCraft.proxy.netHandler.sendTo(
                 new SPacketLevelMaintainerGuiUpdate(this.tile.requests, !this.isFirstUpdate),
                 (EntityPlayerMP) this.getInventoryPlayer().player);
         this.isFirstUpdate = false;
         this.updateCount = 0;
     }
+
+    @Override
+    public void receiveSlotStacks(StorageName invName, Int2ObjectMap<IAEStack<?>> slotStacks) {
+        for (var entry : slotStacks.int2ObjectEntrySet()) {
+            this.tile.updateStack(entry.getIntKey(), entry.getValue());
+        }
+        if (!this.tile.getWorldObj().isRemote) {
+            for (var player : this.crafters) {
+                NetworkHandler.instance
+                        .sendTo(new PacketVirtualSlot(StorageName.NONE, slotStacks), (EntityPlayerMP) player);
+                FluidCraft.proxy.netHandler.sendTo(
+                        new SPacketLevelMaintainerGuiUpdate(this.tile.requests, false),
+                        (EntityPlayerMP) player);
+            }
+        }
+    }
 }

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

@@ -9,26 +9,30 @@ import java.util.Set;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import org.jetbrains.annotations.Nullable;
 
 import com.glodblock.github.FluidCraft;
-import com.glodblock.github.api.registries.ILevelViewable;
-import com.glodblock.github.api.registries.LevelItemInfo;
 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 appeng.api.features.ILevelViewable;
+import appeng.api.features.LevelItemInfo;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.security.IActionHost;
 import appeng.api.storage.ITerminalHost;
 import appeng.api.util.DimensionalCoord;
+import appeng.container.ContainerOpenContext;
+import appeng.container.PrimaryGui;
 import appeng.util.Platform;
 
 public class ContainerLevelTerminal extends FCBaseContainer {
@@ -150,7 +154,7 @@ public class ContainerLevelTerminal extends FCBaseContainer {
                                 knownTracker.infoList[i] = null;
                                 if (update == null) update = new SPacketLevelTerminalUpdate();
                                 update.addOverwriteSlotEntry(knownTracker.id, i, null);
-                            } else if (!ItemStack.areItemStacksEqual(prev[i].stack, curr[i].stack)
+                            } 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) {
@@ -238,4 +242,15 @@ public class ContainerLevelTerminal extends FCBaseContainer {
             this.infoList = machine.getLevelItemInfoList();
         }
     }
+
+    @Override
+    public PrimaryGui getPrimaryGui() {
+
+        ContainerOpenContext context = getOpenContext();
+        return new FluidPrimaryGui(
+                GuiType.LEVEL_TERMINAL,
+                ItemAndBlockHolder.LEVEL_TERMINAL.stack(),
+                context.getTile(),
+                context.getSide());
+    }
 }

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

@@ -2,7 +2,13 @@ package com.glodblock.github.client.gui.container;
 
 import net.minecraft.entity.player.InventoryPlayer;
 
+import com.glodblock.github.inventory.gui.GuiType;
 import com.glodblock.github.inventory.item.IWirelessTerminal;
+import com.glodblock.github.loader.ItemAndBlockHolder;
+import com.glodblock.github.util.FluidPrimaryGui;
+
+import appeng.container.ContainerOpenContext;
+import appeng.container.PrimaryGui;
 
 public class ContainerLevelWireless extends ContainerLevelTerminal {
 
@@ -14,4 +20,15 @@ public class ContainerLevelWireless extends ContainerLevelTerminal {
     protected boolean isWirelessTerminal() {
         return true;
     }
+
+    @Override
+    public PrimaryGui getPrimaryGui() {
+
+        ContainerOpenContext context = getOpenContext();
+        return new FluidPrimaryGui(
+                GuiType.WIRELESS_LEVEL_TERMINAL,
+                ItemAndBlockHolder.WIRELESS_LEVEL_TERM.stack(),
+                context.getTile(),
+                context.getSide());
+    }
 }

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

@@ -5,12 +5,12 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 
-import com.glodblock.github.client.gui.container.base.FCBaseContainer;
-import com.glodblock.github.inventory.item.IItemTerminal;
 import com.glodblock.github.inventory.item.IWirelessMagnetFilter;
 import com.glodblock.github.inventory.item.WirelessMagnet;
+import com.glodblock.github.inventory.item.WirelessMagnetCardFilterInventory;
 
 import appeng.api.storage.ITerminalHost;
+import appeng.container.ContainerSubGui;
 import appeng.container.guisync.GuiSync;
 import appeng.container.slot.AppEngSlot;
 import appeng.container.slot.IOptionalSlotHost;
@@ -19,7 +19,7 @@ import appeng.container.slot.SlotFake;
 import appeng.container.slot.SlotPatternOutputs;
 import appeng.util.Platform;
 
-public class ContainerMagnetFilter extends FCBaseContainer implements IOptionalSlotHost {
+public class ContainerMagnetFilter extends ContainerSubGui implements IOptionalSlotHost {
 
     @GuiSync(101)
     public WirelessMagnet.ListMode listMode;
@@ -41,12 +41,14 @@ public class ContainerMagnetFilter extends FCBaseContainer implements IOptionalS
 
     protected OptionalSlotFake[] filterSlots;
     protected final IInventory filter;
+    private final IWirelessMagnetFilter object;
 
     public ContainerMagnetFilter(InventoryPlayer ip, ITerminalHost monitorable) {
         super(ip, monitorable);
-        this.filter = ((IItemTerminal) monitorable).getInventoryByName("config");
+        this.object = (WirelessMagnetCardFilterInventory) monitorable;
+        this.filter = object.getInventoryByName("config");
         this.filterSlots = new OptionalSlotFake[27];
-        oreDictFilter = ((IWirelessMagnetFilter) getHost()).getOreDictFilter();
+        oreDictFilter = object.getOreDictFilter();
         for (int y = 0; y < 3; y++) {
             for (int x = 0; x < 9; x++) {
                 this.addSlotToContainer(
@@ -62,14 +64,10 @@ public class ContainerMagnetFilter extends FCBaseContainer implements IOptionalS
                 this.filterSlots[x + y * 9].setRenderDisabled(false);
             }
         }
+        this.lockPlayerInventorySlot(this.object.getInventorySlot());
         bindPlayerInventory(ip, 0, 126);
     }
 
-    @Override
-    protected boolean isWirelessTerminal() {
-        return true;
-    }
-
     @Override
     public ItemStack transferStackInSlot(EntityPlayer p, int idx) {
         AppEngSlot clickSlot = (AppEngSlot) this.inventorySlots.get(idx);
@@ -87,14 +85,13 @@ public class ContainerMagnetFilter extends FCBaseContainer implements IOptionalS
 
     @Override
     public void detectAndSendChanges() {
-        if (Platform.isServer() && this.getPortableCell() instanceof IWirelessMagnetFilter) {
-            IWirelessMagnetFilter host = (IWirelessMagnetFilter) this.getHost();
-            this.listMode = host.getListMode();
-            this.meta = host.getMetaMode();
-            this.nbt = host.getNBTMode();
-            this.ore = host.getOreMode();
-            this.oreDict = host.getOreDictMode();
-            this.oreDictFilter = host.getOreDictFilter();
+        if (Platform.isServer()) {
+            this.listMode = this.object.getListMode();
+            this.meta = this.object.getMetaMode();
+            this.nbt = this.object.getNBTMode();
+            this.ore = this.object.getOreMode();
+            this.oreDict = this.object.getOreDictMode();
+            this.oreDictFilter = this.object.getOreDictFilter();
         }
         super.detectAndSendChanges();
     }

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

@@ -1,38 +0,0 @@
-package com.glodblock.github.client.gui.container;
-
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.world.World;
-
-import appeng.api.config.SecurityPermissions;
-import appeng.api.networking.IGrid;
-import appeng.api.networking.security.BaseActionSource;
-import appeng.api.networking.security.IActionHost;
-import appeng.api.networking.security.PlayerSource;
-import appeng.api.storage.ITerminalHost;
-import appeng.container.AEBaseContainer;
-
-public class ContainerPatternMulti extends AEBaseContainer {
-
-    public ContainerPatternMulti(final InventoryPlayer ip, final ITerminalHost te) {
-        super(ip, te);
-    }
-
-    @Override
-    public void detectAndSendChanges() {
-        super.detectAndSendChanges();
-        this.verifyPermissions(SecurityPermissions.CRAFT, false);
-    }
-
-    public IGrid getGrid() {
-        final IActionHost h = ((IActionHost) this.getTarget());
-        return h.getActionableNode().getGrid();
-    }
-
-    public World getWorld() {
-        return this.getPlayerInv().player.worldObj;
-    }
-
-    public BaseActionSource getActionSrc() {
-        return new PlayerSource(this.getPlayerInv().player, (IActionHost) this.getTarget());
-    }
-}

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

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

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

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

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

@@ -3,6 +3,8 @@ 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;
@@ -13,19 +15,36 @@ 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.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.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.util.Platform;
 import appeng.util.item.AEItemStack;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 
-public class ContainerSuperStockReplenisher extends AEBaseContainer implements IOptionalSlotHost {
+public class ContainerSuperStockReplenisher extends AEBaseContainer
+        implements IOptionalSlotHost, IVirtualSlotHolder, IVirtualSlotSource {
 
     private final TileSuperStockReplenisher tile;
     private final IInventory configFluids;
@@ -151,4 +170,52 @@ public class ContainerSuperStockReplenisher extends AEBaseContainer implements I
     public TileSuperStockReplenisher getTile() {
         return tile;
     }
+
+    @Override
+    public PrimaryGui getPrimaryGui() {
+
+        ContainerOpenContext context = getOpenContext();
+        return new FluidPrimaryGui(
+                GuiType.GUI_SUPER_STOCK_REPLENISHER,
+                ItemAndBlockHolder.SUPER_STOCK_RERPLENISHER.stack(),
+                context.getTile(),
+                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();
+            }
+            this.inventorySlots.get(slotId).putStack(newIs);
+        }
+    }
+
 }

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

@@ -3,14 +3,12 @@ package com.glodblock.github.client.gui.container.base;
 import net.minecraft.entity.player.InventoryPlayer;
 
 import com.glodblock.github.inventory.item.IFluidPortableCell;
-import com.glodblock.github.inventory.item.IWirelessExtendCard;
 import com.glodblock.github.inventory.item.WirelessMagnet;
 import com.glodblock.github.util.Util;
 
 import appeng.api.storage.ITerminalHost;
 import appeng.container.AEBaseContainer;
 import appeng.container.guisync.GuiSync;
-import appeng.util.Platform;
 
 public abstract class FCBaseContainer extends AEBaseContainer {
 
@@ -62,13 +60,6 @@ public abstract class FCBaseContainer extends AEBaseContainer {
                     this.getPowerMultiplier(),
                     ((IFluidPortableCell) this.host));
         }
-
-        if (Platform.isServer()) {
-            if (this.host instanceof IWirelessExtendCard wec) {
-                this.mode = wec.getMagnetCardMode();
-                this.restock = wec.isRestock();
-            }
-        }
         super.detectAndSendChanges();
     }
 

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

@@ -1,669 +0,0 @@
-package com.glodblock.github.client.gui.container.base;
-
-import static appeng.util.Platform.writeStackNBT;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-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 net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraftforge.fluids.FluidStack;
-
-import com.glodblock.github.client.gui.container.ContainerItemMonitor;
-import com.glodblock.github.common.item.ItemFluidDrop;
-import com.glodblock.github.common.item.ItemFluidEncodedPattern;
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.inventory.IPatternConsumer;
-import com.glodblock.github.inventory.item.IItemPatternTerminal;
-import com.glodblock.github.util.Util;
-
-import appeng.api.AEApi;
-import appeng.api.config.Actionable;
-import appeng.api.definitions.IDefinitions;
-import appeng.api.implementations.ICraftingPatternItem;
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.container.guisync.GuiSync;
-import appeng.container.slot.IOptionalSlotHost;
-import appeng.container.slot.OptionalSlotFake;
-import appeng.container.slot.SlotFake;
-import appeng.container.slot.SlotFakeCraftingMatrix;
-import appeng.container.slot.SlotPatternTerm;
-import appeng.container.slot.SlotRestrictedInput;
-import appeng.helpers.IContainerCraftingPacket;
-import appeng.helpers.InventoryAction;
-import appeng.tile.inventory.AppEngInternalInventory;
-import appeng.tile.inventory.IAEAppEngInventory;
-import appeng.tile.inventory.InvOperation;
-import appeng.util.Platform;
-import appeng.util.item.AEFluidStack;
-import appeng.util.item.AEItemStack;
-
-public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor
-        implements IAEAppEngInventory, IOptionalSlotHost, IContainerCraftingPacket, IPatternConsumer {
-
-    public static final int MULTIPLE_OF_BUTTON_CLICK = 2;
-    public static final int MULTIPLE_OF_BUTTON_CLICK_ON_SHIFT = 8;
-    protected final IItemPatternTerminal patternTerminal;
-    protected final AppEngInternalInventory cOut = new AppEngInternalInventory(null, 1);
-    protected final IInventory crafting;
-    protected final SlotRestrictedInput patternSlotIN;
-    protected final SlotRestrictedInput patternSlotOUT;
-    protected SlotFake[] craftingSlots;
-    protected OptionalSlotFake[] outputSlots;
-    protected SlotPatternTerm craftSlot;
-
-    @GuiSync(97)
-    public boolean craftingMode = true;
-
-    @GuiSync(96)
-    public boolean substitute = false;
-
-    @GuiSync(95)
-    public boolean combine = false;
-
-    @GuiSync(94)
-    public boolean beSubstitute = false;
-
-    @GuiSync(93)
-    public boolean inverted;
-
-    @GuiSync(92)
-    public int activePage = 0;
-
-    @GuiSync(91)
-    public boolean prioritize = false;
-
-    @GuiSync(90)
-    public boolean autoFillPattern = false;
-
-    public FCContainerEncodeTerminal(final InventoryPlayer ip, final ITerminalHost monitorable) {
-        super(ip, monitorable);
-        this.patternTerminal = (IItemPatternTerminal) monitorable;
-        this.inverted = patternTerminal.isInverted();
-        final IInventory patternInv = this.patternTerminal.getInventoryByName("pattern");
-        this.crafting = this.patternTerminal.getInventoryByName("crafting");
-        this.addSlotToContainer(
-                this.patternSlotIN = new SlotRestrictedInput(
-                        SlotRestrictedInput.PlacableItemType.BLANK_PATTERN,
-                        patternInv,
-                        0,
-                        147,
-                        -72 - 9,
-                        this.getInventoryPlayer()));
-        this.addSlotToContainer(
-                this.patternSlotOUT = new SlotRestrictedInput(
-                        SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN,
-                        patternInv,
-                        1,
-                        147,
-                        -72 + 34,
-                        this.getInventoryPlayer()));
-        this.patternSlotOUT.setStackLimit(1);
-    }
-
-    @Override
-    public void doAction(EntityPlayerMP player, InventoryAction action, int slotId, long id) {
-        if (this.isCraftingMode()) {
-            super.doAction(player, action, slotId, id);
-            return;
-        }
-        if (slotId < 0 || slotId >= this.inventorySlots.size()) {
-            super.doAction(player, action, slotId, id);
-            return;
-        }
-        if (action == InventoryAction.MOVE_REGION) {
-            super.doAction(player, InventoryAction.MOVE_REGION, slotId, id);
-            return;
-        }
-        if (action == InventoryAction.PICKUP_SINGLE) {
-            super.doAction(player, InventoryAction.PICKUP_OR_SET_DOWN, slotId, id);
-            return;
-        }
-        Slot slot = getSlot(slotId);
-        ItemStack stack = player.inventory.getItemStack();
-        FluidStack fluid = Util.getFluidFromItem(stack);
-
-        if (fluid == null || fluid.amount <= 0) {
-            super.doAction(player, action, slotId, id);
-            return;
-        }
-
-        if (validPatternSlot(slot)) {
-
-            switch (action) {
-                case PICKUP_OR_SET_DOWN -> {
-                    slot.putStack(ItemFluidPacket.newStack(fluid));
-                    return;
-                }
-                case SPLIT_OR_PLACE_SINGLE -> {
-                    fluid = Util.getFluidFromItem(Util.copyStackWithSize(stack, 1));
-                    FluidStack origin = ItemFluidPacket.getFluidStack(slot.getStack());
-                    if (fluid != null && fluid.equals(origin)) {
-                        fluid.amount += origin.amount;
-                        if (fluid.amount <= 0) fluid = null;
-                    }
-                    slot.putStack(ItemFluidPacket.newStack(fluid));
-                    return;
-                }
-                default -> {}
-            }
-
-        }
-        super.doAction(player, action, slotId, id);
-    }
-
-    protected abstract boolean validPatternSlot(Slot slot);
-
-    @Override
-    public ItemStack transferStackInSlot(EntityPlayer p, int idx) {
-        Slot clickSlot = (Slot) this.inventorySlots.get(idx);
-        ItemStack is = clickSlot.getStack();
-        if (is != null && !patternSlotOUT.getHasStack()
-                && is.stackSize == 1
-                && is.getItem() instanceof ICraftingPatternItem) {
-            ItemStack output = is.copy();
-            patternSlotOUT.putStack(output);
-            p.inventory.setInventorySlotContents(clickSlot.getSlotIndex(), null);
-            this.detectAndSendChanges();
-            return null;
-        } else {
-            return super.transferStackInSlot(p, idx);
-        }
-    }
-
-    public IItemPatternTerminal getPatternTerminal() {
-        return this.patternTerminal;
-    }
-
-    protected static boolean canDoubleStacks(SlotFake[] slots) {
-        List<SlotFake> enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList());
-        long emptySlots = enabledSlots.stream().filter(s -> s.getStack() == null).count();
-        long fullSlots = enabledSlots.stream().filter(s -> s.getStack() != null && s.getStack().stackSize * 2 > 127)
-                .count();
-        return fullSlots <= emptySlots;
-    }
-
-    protected static void doubleStacksInternal(SlotFake[] slots) {
-        List<ItemStack> overFlowStacks = new ArrayList<>();
-        List<SlotFake> enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList());
-        for (final Slot s : enabledSlots) {
-            ItemStack st = s.getStack();
-            if (st == null) continue;
-            if (Util.isFluidPacket(st)) {
-                FluidStack fluidStack = ItemFluidPacket.getFluidStack(st);
-                if (fluidStack != null) {
-                    fluidStack = ItemFluidPacket.getFluidStack(st).copy();
-                    if (fluidStack.amount < Integer.MAX_VALUE / 2) fluidStack.amount *= 2;
-                }
-                s.putStack(ItemFluidPacket.newStack(fluidStack));
-            } else if (st.stackSize * 2 > 127) {
-                overFlowStacks.add(st.copy());
-            } else {
-                st.stackSize *= 2;
-                s.putStack(st);
-            }
-        }
-        Iterator<ItemStack> ow = overFlowStacks.iterator();
-        for (final Slot s : enabledSlots) {
-            if (!ow.hasNext()) break;
-            if (s.getStack() != null) continue;
-            s.putStack(ow.next());
-        }
-        assert !ow.hasNext();
-    }
-
-    protected static boolean containsItem(SlotFake[] slots) {
-        List<SlotFake> enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList());
-        long item = enabledSlots.stream().filter(s -> s.getStack() != null && !Util.isFluidPacket(s.getStack()))
-                .count();
-        return item > 0;
-    }
-
-    protected static boolean containsFluid(SlotFake[] slots) {
-        List<SlotFake> enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList());
-        long fluid = enabledSlots.stream().filter(s -> Util.isFluidPacket(s.getStack())).count();
-        return fluid > 0;
-    }
-
-    protected static boolean nonNullSlot(SlotFake[] slots) {
-        List<SlotFake> enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList());
-        long object = enabledSlots.stream().filter(s -> s.getStack() != null).count();
-        return object > 0;
-    }
-
-    protected ItemStack stampAuthor(ItemStack patternStack) {
-        if (patternStack.stackTagCompound == null) {
-            patternStack.stackTagCompound = new NBTTagCompound();
-        }
-        patternStack.stackTagCompound.setString("author", getPlayerInv().player.getCommandSenderName());
-        return patternStack;
-    }
-
-    protected void encodeFluidPattern() {
-        ItemStack patternStack = AEApi.instance().definitions().items().encodedUltimatePattern().maybeStack(1).orNull();
-        if (patternStack != null) {
-            final NBTTagCompound encodedValue = new NBTTagCompound();
-
-            final ItemStack[] in = this.getInputs();
-            final ItemStack[] out = this.getOutputs();
-
-            final NBTTagList tagIn = new NBTTagList();
-            final NBTTagList tagOut = new NBTTagList();
-
-            for (final ItemStack i : in) {
-                if (i != null) {
-                    if (i.getItem() instanceof ItemFluidPacket) {
-                        tagIn.appendTag(
-                                writeStackNBT(
-                                        AEFluidStack.create(ItemFluidPacket.getFluidStack(i)),
-                                        new NBTTagCompound(),
-                                        true));
-                    } else {
-                        tagIn.appendTag(writeStackNBT(AEItemStack.create(i), new NBTTagCompound(), true));
-                    }
-                }
-            }
-
-            for (final ItemStack i : out) {
-                if (i != null) {
-                    if (i.getItem() instanceof ItemFluidPacket) {
-                        tagOut.appendTag(
-                                writeStackNBT(
-                                        AEFluidStack.create(ItemFluidPacket.getFluidStack(i)),
-                                        new NBTTagCompound(),
-                                        true));
-                    } else {
-                        tagOut.appendTag(writeStackNBT(AEItemStack.create(i), new NBTTagCompound(), true));
-                    }
-                }
-            }
-
-            encodedValue.setTag("in", tagIn);
-            encodedValue.setTag("out", tagOut);
-            encodedValue.setBoolean("substitute", substitute);
-            encodedValue.setBoolean("beSubstitute", beSubstitute);
-            encodedValue.setString("author", this.getPlayerInv().player.getCommandSenderName());
-            patternStack.setTagCompound(encodedValue);
-            patternSlotOUT.putStack(patternStack);
-        }
-    }
-
-    protected static IAEItemStack[] collectInventory(Slot[] slots) {
-        IAEItemStack[] stacks = new IAEItemStack[slots.length];
-        for (int i = 0; i < stacks.length; i++) {
-            ItemStack stack = slots[i].getStack();
-            if (stack != null) {
-                if (stack.getItem() instanceof ItemFluidPacket) {
-                    IAEItemStack dropStack = ItemFluidDrop.newAeStack(ItemFluidPacket.getFluidStack(stack));
-                    if (dropStack != null) {
-                        stacks[i] = dropStack;
-                        continue;
-                    }
-                }
-            }
-            IAEItemStack aeStack = AEItemStack.create(stack);
-            stacks[i] = aeStack;
-        }
-        return stacks;
-    }
-
-    @Override
-    public void saveChanges() {
-        // NO-OP
-    }
-
-    public void clear() {
-        for (final Slot s : this.craftingSlots) {
-            s.putStack(null);
-        }
-        for (final Slot s : this.outputSlots) {
-            s.putStack(null);
-        }
-        this.detectAndSendChanges();
-    }
-
-    @Override
-    public void onChangeInventory(final IInventory inv, final int slot, final InvOperation mc,
-            final ItemStack removedStack, final ItemStack newStack) {
-        // NO-OP
-    }
-
-    public void encodeAndMoveToInventory() {
-        encode();
-        ItemStack output = this.patternSlotOUT.getStack();
-        if (output != null) {
-            if (!getPlayerInv().addItemStackToInventory(output)) {
-                getPlayerInv().player.entityDropItem(output, 0);
-            }
-            this.patternSlotOUT.putStack(null);
-        }
-        fillPattern();
-    }
-
-    public void encodeAllItemAndMoveToInventory() {
-        encode();
-        ItemStack output = this.patternSlotOUT.getStack();
-        if (output != null) {
-            if (this.patternSlotIN.getStack() != null) output.stackSize += this.patternSlotIN.getStack().stackSize;
-            if (!getPlayerInv().addItemStackToInventory(output)) {
-                getPlayerInv().player.entityDropItem(output, 0);
-            }
-            this.patternSlotOUT.putStack(null);
-            this.patternSlotIN.putStack(null);
-        }
-        fillPattern();
-    }
-
-    private void fillPattern() {
-        if (this.autoFillPattern && this.getHost().getItemInventory() != null) {
-            // try to use me network item to fill pattern input slot
-            final IDefinitions definitions = AEApi.instance().definitions();
-            int fillStackSize = this.patternSlotIN.getHasStack() ? 64 - this.patternSlotIN.getStack().stackSize : 64;
-            if (fillStackSize == 0) return;
-            for (ItemStack blankPattern : definitions.materials().blankPattern().maybeStack(fillStackSize).asSet()) {
-                IAEItemStack iBlankPattern = AEApi.instance().storage().createItemStack(blankPattern);
-                if (this.patternSlotIN.getHasStack() && !iBlankPattern.isSameType(this.patternSlotIN.getStack()))
-                    continue;
-                IAEItemStack out = this.getHost().getItemInventory()
-                        .extractItems(iBlankPattern, Actionable.MODULATE, this.getActionSource());
-                if (out != null) {
-                    ItemStack outPattern;
-                    if (this.patternSlotIN.getHasStack()) {
-                        outPattern = this.patternSlotIN.getStack().copy();
-                        outPattern.stackSize += out.getItemStack().stackSize;
-                    } else {
-                        outPattern = out.getItemStack();
-                    }
-                    this.patternSlotIN.putStack(outPattern);
-                    return;
-                }
-            }
-        }
-    }
-
-    public void encode() {
-        if (getInputs() != null && getOutputs() != null) {
-            fillPattern();
-            if (isCraftingMode()) {
-                encodeItemPattern();
-                return;
-            }
-            ItemStack stack = this.patternSlotOUT.getStack();
-            if (stack == null) {
-                stack = this.patternSlotIN.getStack();
-                if (notPattern(stack)) {
-                    return;
-                }
-                if (stack.stackSize == 1) {
-                    this.patternSlotIN.putStack(null);
-                } else {
-                    stack.stackSize--;
-                }
-                encodeFluidPattern();
-            } else if (!notPattern(stack)) {
-                encodeFluidPattern();
-            }
-        }
-    }
-
-    public void encodeItemPattern() {
-        ItemStack output = this.patternSlotOUT.getStack();
-        final ItemStack[] in = this.getInputs();
-        final ItemStack[] out = this.getOutputs();
-
-        // first check the output slots, should either be null, or a pattern
-        if (output != null && this.notPattern(output)) {
-            return;
-        } // if nothing is there we should snag a new pattern.
-        else if (output == null) {
-            output = this.patternSlotIN.getStack();
-            if (this.notPattern(output)) {
-                return; // no blanks.
-            }
-
-            // remove one, and clear the input slot.
-            output.stackSize--;
-            if (output.stackSize == 0) {
-                this.patternSlotIN.putStack(null);
-            }
-
-            // add a new encoded pattern.
-            for (final ItemStack encodedPatternStack : AEApi.instance().definitions().items().encodedPattern()
-                    .maybeStack(1).asSet()) {
-                output = encodedPatternStack;
-            }
-        } else if (output.getItem() instanceof ItemFluidEncodedPattern) {
-            for (final ItemStack encodedPatternStack : AEApi.instance().definitions().items().encodedPattern()
-                    .maybeStack(1).asSet()) {
-                output = encodedPatternStack;
-            }
-        }
-
-        // encode the slot.
-        final NBTTagCompound encodedValue = new NBTTagCompound();
-
-        final NBTTagList tagIn = new NBTTagList();
-        final NBTTagList tagOut = new NBTTagList();
-
-        for (final ItemStack i : in) {
-            tagIn.appendTag(this.createItemTag(i));
-        }
-
-        for (final ItemStack i : out) {
-            tagOut.appendTag(this.createItemTag(i));
-        }
-
-        encodedValue.setTag("in", tagIn);
-        encodedValue.setTag("out", tagOut);
-        encodedValue.setBoolean("crafting", this.craftingMode);
-        encodedValue.setBoolean("substitute", this.substitute);
-        encodedValue.setBoolean("beSubstitute", this.beSubstitute);
-        encodedValue.setBoolean("prioritize", this.prioritize);
-        output.setTagCompound(encodedValue);
-        stampAuthor(output);
-        this.patternSlotOUT.putStack(output);
-    }
-
-    protected ItemStack[] getInputs() {
-        final ArrayList<ItemStack> input = new ArrayList<>();
-        for (SlotFake craftingSlot : this.craftingSlots) {
-            input.add(craftingSlot.getStack());
-        }
-        if (input.stream().anyMatch(Objects::nonNull)) {
-            return input.toArray(new ItemStack[0]);
-        }
-        return null;
-    }
-
-    protected ItemStack[] getOutputs() {
-        final ArrayList<ItemStack> output = new ArrayList<>();
-        for (final SlotFake outputSlot : this.outputSlots) {
-            output.add(outputSlot.getStack());
-        }
-        if (output.stream().anyMatch(Objects::nonNull)) {
-            return output.toArray(new ItemStack[0]);
-        }
-        return null;
-    }
-
-    protected boolean notPattern(final ItemStack output) {
-        if (output == null) {
-            return true;
-        }
-        if (output.getItem() instanceof ItemFluidEncodedPattern) {
-            return false;
-        }
-        final IDefinitions definitions = AEApi.instance().definitions();
-
-        boolean isPattern = definitions.items().encodedPattern().isSameAs(output);
-        isPattern |= definitions.materials().blankPattern().isSameAs(output);
-
-        boolean isUltimatePattern = definitions.items().encodedUltimatePattern().isSameAs(output);
-        isUltimatePattern |= definitions.materials().blankPattern().isSameAs(output);
-
-        return !isPattern && !isUltimatePattern;
-    }
-
-    protected NBTBase createItemTag(final ItemStack i) {
-        final NBTTagCompound c = new NBTTagCompound();
-        if (i != null) {
-            Util.writeItemStackToNBT(i, c);
-        }
-        return c;
-    }
-
-    @Override
-    public void detectAndSendChanges() {
-        super.detectAndSendChanges();
-        if (Platform.isServer()) {
-            this.substitute = this.patternTerminal.isSubstitution();
-            this.combine = this.patternTerminal.shouldCombine();
-            this.beSubstitute = this.patternTerminal.canBeSubstitute();
-            this.prioritize = this.patternTerminal.isPrioritize();
-            this.autoFillPattern = this.patternTerminal.isAutoFillPattern();
-        }
-    }
-
-    @Override
-    public void onSlotChange(final Slot s) {
-        if (s == this.patternSlotOUT && Platform.isServer()) {
-            for (final Object crafter : this.crafters) {
-                final ICrafting icrafting = (ICrafting) crafter;
-
-                for (final Object g : this.inventorySlots) {
-                    if (g instanceof OptionalSlotFake || g instanceof SlotFakeCraftingMatrix) {
-                        final Slot sri = (Slot) g;
-                        icrafting.sendSlotContents(this, sri.slotNumber, sri.getStack());
-                    }
-                }
-                ((EntityPlayerMP) icrafting).isChangingQuantityOnly = false;
-            }
-            this.detectAndSendChanges();
-        }
-    }
-
-    @Override
-    public IInventory getInventoryByName(final String name) {
-        if (name.equals("player")) {
-            return this.getInventoryPlayer();
-        }
-        return this.patternTerminal.getInventoryByName(name);
-    }
-
-    @Override
-    public boolean useRealItems() {
-        return false;
-    }
-
-    public void doubleStacks(int val) {
-        multiplyOrDivideStacks(
-                ((val & 1) != 0 ? MULTIPLE_OF_BUTTON_CLICK_ON_SHIFT : MULTIPLE_OF_BUTTON_CLICK)
-                        * ((val & 2) != 0 ? -1 : 1));
-    }
-
-    static boolean canMultiplyOrDivide(SlotFake[] slots, int mult) {
-        if (mult > 0) {
-            for (Slot s : slots) {
-                ItemStack st = s.getStack();
-                if (st == null) continue;
-                final long count;
-                if (st.getItem() instanceof ItemFluidPacket) {
-                    count = ItemFluidPacket.getFluidAmount(st);
-                } else {
-                    count = s.getStack().stackSize;
-                }
-                long result = count * mult;
-                if (result > Integer.MAX_VALUE) {
-                    return false;
-                }
-            }
-            return true;
-        } else if (mult < 0) {
-            mult = Math.abs(mult);
-            for (Slot s : slots) {
-                ItemStack st = s.getStack();
-                if (st == null) continue;
-                final long count;
-                if (st.getItem() instanceof ItemFluidPacket) {
-                    count = ItemFluidPacket.getFluidAmount(st);
-                } else {
-                    count = s.getStack().stackSize;
-                }
-                if (count % mult != 0) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-    static void multiplyOrDivideStacksInternal(SlotFake[] slots, int mult) {
-        List<SlotFake> enabledSlots = Arrays.stream(slots).filter(SlotFake::isEnabled).collect(Collectors.toList());
-        if (mult > 0) {
-            for (final Slot s : enabledSlots) {
-                ItemStack st = s.getStack();
-                if (st != null) {
-                    if (st.getItem() instanceof ItemFluidPacket) {
-                        ItemFluidPacket.setFluidAmount(st, ItemFluidPacket.getFluidAmount(st) * mult);
-                    } else {
-                        st.stackSize *= mult;
-                        s.putStack(st);
-                    }
-                }
-            }
-        } else if (mult < 0) {
-            mult = Math.abs(mult);
-            for (final Slot s : enabledSlots) {
-                ItemStack st = s.getStack();
-                if (st != null) {
-                    if (st.getItem() instanceof ItemFluidPacket) {
-                        ItemFluidPacket.setFluidAmount(st, ItemFluidPacket.getFluidAmount(st) / mult);
-                    } else {
-                        st.stackSize /= mult;
-                        s.putStack(st);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Multiply or divide a number
-     *
-     * @param multi Positive numbers are multiplied and negative numbers are divided
-     */
-    public void multiplyOrDivideStacks(int multi) {
-        if (!isCraftingMode()) {
-            if (canMultiplyOrDivide(this.craftingSlots, multi) && canMultiplyOrDivide(this.outputSlots, multi)) {
-                multiplyOrDivideStacksInternal(this.craftingSlots, multi);
-                multiplyOrDivideStacksInternal(this.outputSlots, multi);
-            }
-            this.detectAndSendChanges();
-        }
-    }
-
-    @Override
-    public void acceptPattern(IAEItemStack[] inputs, IAEItemStack[] outputs) {
-        if (this.patternTerminal != null) {
-            this.patternTerminal.onChangeCrafting(inputs, outputs);
-        }
-    }
-
-    public boolean isCraftingMode() {
-        return this.craftingMode;
-    }
-}

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

@@ -1,346 +0,0 @@
-package com.glodblock.github.client.gui.container.base;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.ICrafting;
-import net.minecraft.item.ItemStack;
-
-import com.glodblock.github.inventory.item.BaseWirelessInventory;
-import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.network.SPacketMEUpdateBuffer;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-
-import appeng.api.config.Actionable;
-import appeng.api.config.CraftingAllow;
-import appeng.api.config.PinsState;
-import appeng.api.config.PowerMultiplier;
-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.networking.IGridNode;
-import appeng.api.networking.crafting.ICraftingCPU;
-import appeng.api.networking.crafting.ICraftingGrid;
-import appeng.api.networking.energy.IEnergyGrid;
-import appeng.api.networking.security.PlayerSource;
-import appeng.api.storage.IMEMonitor;
-import appeng.api.storage.IMEMonitorHandlerReceiver;
-import appeng.api.storage.ITerminalHost;
-import appeng.api.storage.ITerminalPins;
-import appeng.api.storage.StorageChannel;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.storage.data.IAEStack;
-import appeng.api.util.IConfigManager;
-import appeng.api.util.IConfigurableObject;
-import appeng.container.guisync.GuiSync;
-import appeng.container.slot.SlotRestrictedInput;
-import appeng.core.AELog;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketValueConfig;
-import appeng.helpers.IPinsHandler;
-import appeng.helpers.WirelessTerminalGuiObject;
-import appeng.items.contents.PinsHandler;
-import appeng.util.ConfigManager;
-import appeng.util.IConfigManagerHost;
-import appeng.util.Platform;
-
-public abstract class FCContainerMonitor<T extends IAEStack<T>> extends FCBaseContainer
-        implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver<T>, IPinsHandler {
-
-    protected final SlotRestrictedInput[] cellView = new SlotRestrictedInput[5];
-    protected final IConfigManager clientCM;
-    protected final ITerminalHost host;
-
-    protected PinsHandler pinsHandler = null;
-
-    @GuiSync(99)
-    public boolean canAccessViewCells = false;
-
-    @GuiSync(98)
-    public boolean hasPower = false;
-
-    protected IConfigManagerHost gui;
-    protected IConfigManager serverCM;
-    protected IGridNode networkNode;
-    protected IMEMonitor<T> monitor;
-
-    public FCContainerMonitor(final InventoryPlayer ip, final ITerminalHost monitorable) {
-        this(ip, monitorable, true);
-    }
-
-    protected FCContainerMonitor(final InventoryPlayer ip, final ITerminalHost monitorable,
-            final boolean bindInventory) {
-        super(ip, monitorable);
-        this.host = monitorable;
-        this.clientCM = new ConfigManager(this);
-        this.clientCM.registerSetting(Settings.SORT_BY, SortOrder.NAME);
-        this.clientCM.registerSetting(Settings.VIEW_MODE, ViewItems.ALL);
-        this.clientCM.registerSetting(Settings.SORT_DIRECTION, SortDir.ASCENDING);
-        this.clientCM.registerSetting(Settings.TYPE_FILTER, TypeFilter.ALL);
-        this.clientCM.registerSetting(Settings.PINS_STATE, PinsState.DISABLED); // use for GUI
-
-        if (Platform.isServer()) {
-            if (monitorable instanceof ITerminalPins t && !(monitorable instanceof BaseWirelessInventory bwi
-                    && bwi.getChannel() == StorageChannel.FLUIDS)) {
-                pinsHandler = t.getPinsHandler(ip.player);
-            }
-        }
-    }
-
-    public IMEMonitor<T> getMonitor() {
-        return this.monitor;
-    }
-
-    public IGridNode getNetworkNode() {
-        return this.networkNode;
-    }
-
-    @Override
-    public void detectAndSendChanges() {
-        if (Platform.isServer()) {
-            if (isInvalid()) {
-                this.setValidContainer(false);
-            }
-            if (this.serverCM != null) {
-                for (final Settings set : this.serverCM.getSettings()) {
-                    final Enum<?> sideLocal = this.serverCM.getSetting(set);
-                    final Enum<?> sideRemote = this.clientCM.getSetting(set);
-
-                    if (sideLocal != sideRemote) {
-                        this.clientCM.putSetting(set, sideLocal);
-                        for (final Object crafter : this.crafters) {
-                            try {
-                                NetworkHandler.instance.sendTo(
-                                        new PacketValueConfig(set.name(), sideLocal.name()),
-                                        (EntityPlayerMP) crafter);
-                            } catch (final IOException e) {
-                                AELog.debug(e);
-                            }
-                        }
-                    }
-                }
-            }
-
-            if (pinsHandler != null) {
-                if (clientCM.getSetting(Settings.PINS_STATE) != pinsHandler.getPinsState()) {
-                    this.clientCM.putSetting(Settings.PINS_STATE, pinsHandler.getPinsState());
-                    updatePins(true);
-                } else {
-                    updatePins(false);
-                }
-            }
-
-            processItemList();
-            this.updatePowerStatus();
-            final boolean oldAccessible = this.canAccessViewCells;
-            this.canAccessViewCells = this.host instanceof WirelessTerminalGuiObject
-                    || this.host instanceof IWirelessTerminal
-                    || this.hasAccess(SecurityPermissions.BUILD, false);
-            if (this.canAccessViewCells != oldAccessible) {
-                for (int y = 0; y < 5; y++) {
-                    if (this.cellView[y] != null) {
-                        this.cellView[y].setAllowEdit(this.canAccessViewCells);
-                    }
-                }
-            }
-            super.detectAndSendChanges();
-        }
-    }
-
-    private int lastUpdate = 0;
-
-    public void updatePins(boolean forceUpdate) {
-        if (pinsHandler == null || !(host instanceof ITerminalPins itp)) return;
-
-        boolean isActive = pinsHandler.getPinsState() != PinsState.DISABLED;
-        ++lastUpdate;
-        if (!forceUpdate && lastUpdate <= 20) return;
-        lastUpdate = 0;
-        if (isActive) {
-            final ICraftingGrid cc = itp.getGrid().getCache(ICraftingGrid.class);
-            final ImmutableList<ICraftingCPU> cpuList = cc.getCpus().asList();
-
-            List<IAEItemStack> craftedItems = new ArrayList<>();
-
-            // fetch the first available crafting output
-            for (int i = 0; i < cpuList.size(); i++) {
-                ICraftingCPU cpu = cpuList.get(i);
-                if (cpu.getCraftingAllowMode() != CraftingAllow.ONLY_NONPLAYER && cpu.getFinalOutput() != null
-                        && cpu.getCurrentJobSource() instanceof PlayerSource src
-                        && src.player == pinsHandler.getPlayer()) {
-                    if (craftedItems.contains(cpu.getFinalOutput())) {
-                        continue; // skip if already added
-                    }
-                    if (cpu.isBusy()) craftedItems.add(0, cpu.getFinalOutput().copy());
-                    else craftedItems.add(cpu.getFinalOutput().copy());
-                }
-            }
-
-            pinsHandler.addItemsToPins(craftedItems);
-        }
-        pinsHandler.update(forceUpdate);
-        onListUpdate(); // notify the repo that the pins have changed
-    }
-
-    @Override
-    public void setPin(ItemStack is, int idx) {
-        if (pinsHandler == null || !(host instanceof ITerminalPins itp)) return;
-
-        if (is == null) {
-            final ICraftingGrid cc = itp.getGrid().getCache(ICraftingGrid.class);
-            final ImmutableSet<ICraftingCPU> cpuSet = cc.getCpus();
-            for (ICraftingCPU cpu : cpuSet) {
-                if (cpu.getCraftingAllowMode() != CraftingAllow.ONLY_NONPLAYER && cpu.getFinalOutput() != null
-                        && cpu.getFinalOutput().isSameType(getPin(idx))) {
-                    if (!cpu.isBusy()) {
-                        cpu.resetFinalOutput();
-                    } else {
-                        return;
-                    }
-                }
-            }
-        }
-        pinsHandler.setPin(idx, is);
-        updatePins(true);
-    }
-
-    @Override
-    public ItemStack getPin(int idx) {
-        if (pinsHandler == null) return null;
-        return pinsHandler.getPin(idx);
-    }
-
-    public void setPinsState(PinsState pinsState) {
-        if (pinsHandler == null) return;
-        clientCM.putSetting(Settings.PINS_STATE, pinsState);
-        pinsHandler.setPinsState(pinsState);
-        updatePins(true);
-    }
-
-    public PinsState getPinsState() {
-        return pinsHandler != null ? pinsHandler.getPinsState() : PinsState.DISABLED;
-    }
-
-    public PinsHandler getPinsHandler() {
-        return pinsHandler;
-    }
-
-    protected abstract void processItemList();
-
-    protected boolean isInvalid() {
-        return this.monitor == null;
-    }
-
-    protected void updatePowerStatus() {
-        try {
-            if (this.networkNode != null) {
-                this.setPowered(this.networkNode.isActive());
-            } else if (this.getPowerSource() instanceof IEnergyGrid) {
-                this.setPowered(((IEnergyGrid) this.getPowerSource()).isNetworkPowered());
-            } else {
-                this.setPowered(
-                        this.getPowerSource().extractAEPower(1, Actionable.SIMULATE, PowerMultiplier.CONFIG) > 0.8);
-            }
-        } catch (final Throwable ignore) {}
-    }
-
-    @Override
-    public void onUpdate(final String field, final Object oldValue, final Object newValue) {
-        if (field.equals("canAccessViewCells")) {
-            for (int y = 0; y < 5; y++) {
-                if (this.cellView[y] != null) {
-                    this.cellView[y].setAllowEdit(this.canAccessViewCells);
-                }
-            }
-        }
-        super.onUpdate(field, oldValue, newValue);
-    }
-
-    @Override
-    public void addCraftingToCrafters(final ICrafting c) {
-        super.addCraftingToCrafters(c);
-        this.queueInventory(c);
-    }
-
-    protected abstract void queueInventory(final ICrafting c);
-
-    @Override
-    public void onContainerClosed(final EntityPlayer player) {
-        super.onContainerClosed(player);
-        if (this.monitor != null) {
-            this.monitor.removeListener(this);
-            if (player instanceof EntityPlayerMP && Platform.isServer()) {
-                SPacketMEUpdateBuffer.clear((EntityPlayerMP) player);
-            }
-
-        }
-    }
-
-    @Override
-    public IConfigManager getConfigManager() {
-        if (Platform.isServer()) {
-            return this.serverCM;
-        }
-        return this.clientCM;
-    }
-
-    public ItemStack[] getViewCells() {
-        final ItemStack[] list = new ItemStack[this.cellView.length];
-        for (int x = 0; x < this.cellView.length; x++) {
-            list[x] = this.cellView[x].getStack();
-        }
-        return list;
-    }
-
-    public SlotRestrictedInput getCellViewSlot(final int index) {
-        return this.cellView[index];
-    }
-
-    public boolean isPowered() {
-        return this.hasPower;
-    }
-
-    protected void setPowered(final boolean isPowered) {
-        this.hasPower = isPowered;
-    }
-
-    protected IConfigManagerHost getGui() {
-        return this.gui;
-    }
-
-    public void setGui(@Nonnull final IConfigManagerHost gui) {
-        this.gui = gui;
-    }
-
-    @Override
-    public boolean isValid(Object verificationToken) {
-        return true;
-    }
-
-    @Override
-    public void onListUpdate() {
-        for (final Object c : this.crafters) {
-            if (c instanceof final ICrafting cr) {
-                this.queueInventory(cr);
-            }
-        }
-    }
-
-    @Override
-    public void updateSetting(final IConfigManager manager, @SuppressWarnings("rawtypes") final Enum settingName,
-            @SuppressWarnings("rawtypes") final Enum newValue) {
-        if (this.getGui() != null) {
-            this.getGui().updateSetting(manager, settingName, newValue);
-        }
-    }
-}

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

@@ -1,145 +0,0 @@
-package com.glodblock.github.client.me;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import net.minecraftforge.fluids.Fluid;
-
-import com.glodblock.github.common.item.ItemFluidDrop;
-import com.glodblock.github.crossmod.thaumcraft.AspectUtil;
-import com.glodblock.github.util.FluidSorters;
-
-import appeng.api.config.SearchBoxMode;
-import appeng.api.config.Settings;
-import appeng.api.config.SortOrder;
-import appeng.api.config.ViewItems;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.client.gui.widgets.IScrollSource;
-import appeng.client.gui.widgets.ISortSource;
-import appeng.core.AEConfig;
-
-public class EssentiaRepo extends FluidRepo {
-
-    public EssentiaRepo(final IScrollSource src, final ISortSource sortSrc) {
-        super(src, sortSrc);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public void updateView() {
-        if (this.paused) {
-            // Update existing view with new data
-            for (int i = 0; i < this.view.size(); i++) {
-                IAEItemStack entry = this.view.get(i);
-                IAEItemStack serverEntry = this.list.findPrecise(entry);
-                if (serverEntry == null) {
-                    entry.setStackSize(0);
-                } else {
-                    this.view.set(i, serverEntry);
-                }
-            }
-
-            // Append newly added item stacks to the end of the view
-            Set<IAEItemStack> viewSet = new HashSet<>(this.view);
-            ArrayList<IAEItemStack> entriesToAdd = new ArrayList<>();
-            for (IAEItemStack serverEntry : this.list) {
-                if (!viewSet.contains(serverEntry)) {
-                    entriesToAdd.add(serverEntry);
-                }
-            }
-            addEntriesToView(entriesToAdd);
-        } else {
-            this.view.clear();
-            this.view.ensureCapacity(this.list.size());
-            addEntriesToView(this.list);
-        }
-
-        // Do not sort if paused
-        if (!this.paused) {
-            final Enum<?> SortBy = this.sortSrc.getSortBy();
-            final Enum<?> SortDir = this.sortSrc.getSortDir();
-
-            FluidSorters.setDirection((appeng.api.config.SortDir) SortDir);
-            FluidSorters.init();
-
-            if (SortBy == SortOrder.MOD) {
-                this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_MOD);
-            } else if (SortBy == SortOrder.AMOUNT) {
-                this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_SIZE);
-            } else if (SortBy == SortOrder.INVTWEAKS) {
-                this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS);
-            } else {
-                this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_NAME);
-            }
-        }
-
-        // Update the display
-        this.dsp.clear();
-        this.dsp.ensureCapacity(this.list.size());
-        for (final IAEItemStack is : this.view) {
-            this.dsp.add(is.getItemStack());
-        }
-    }
-
-    private void addEntriesToView(Iterable<IAEItemStack> entries) {
-        final Enum<?> viewMode = this.sortSrc.getSortDisplay();
-        final Enum<?> searchMode = AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE);
-        if (searchMode == SearchBoxMode.NEI_AUTOSEARCH || searchMode == SearchBoxMode.NEI_MANUAL_SEARCH) {
-            this.updateNEI(this.searchString);
-        }
-
-        String innerSearch = this.searchString;
-
-        if (innerSearch.startsWith("@")) {
-            innerSearch = innerSearch.substring(1);
-        }
-
-        Pattern m;
-        try {
-            m = Pattern.compile(innerSearch.toLowerCase(), Pattern.CASE_INSENSITIVE);
-        } catch (final Throwable ignore) {
-            try {
-                m = Pattern.compile(Pattern.quote(innerSearch.toLowerCase()), Pattern.CASE_INSENSITIVE);
-            } catch (final Throwable __) {
-                return;
-            }
-        }
-
-        for (IAEItemStack is : entries) {
-            if (!AspectUtil.isEssentiaGas(ItemFluidDrop.getAeFluidStack(is))) {
-                continue;
-            }
-
-            if (this.myPartitionList != null) {
-                if (!this.myPartitionList.isListed(is)) {
-                    continue;
-                }
-            }
-
-            if (viewMode == ViewItems.CRAFTABLE && !is.isCraftable()) {
-                continue;
-            }
-
-            if (viewMode == ViewItems.CRAFTABLE) {
-                is = is.copy();
-                is.setStackSize(0);
-            }
-
-            if (viewMode == ViewItems.STORED && is.getStackSize() == 0) {
-                continue;
-            }
-
-            Fluid fluid = ItemFluidDrop.getAeFluidStack(is).getFluid();
-            if (!AspectUtil.isEssentiaGas(fluid)) {
-                continue;
-            }
-
-            if (m.matcher(fluid.getLocalizedName().toLowerCase()).find()) {
-                this.view.add(is);
-            }
-        }
-    }
-
-}

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

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

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

@@ -11,14 +11,12 @@ import net.minecraftforge.common.util.ForgeDirection;
 import com.glodblock.github.client.render.RenderBlockFluidInterface;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.common.tile.TileFluidInterface;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.util.BlockPos;
 import com.glodblock.github.util.NameConst;
 
 import appeng.api.util.IOrientable;
 import appeng.block.AEBaseItemBlock;
 import appeng.core.features.AEFeature;
+import appeng.core.sync.GuiBridge;
 import appeng.tile.misc.TileInterface;
 import appeng.util.Platform;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -50,12 +48,7 @@ public class BlockFluidInterface extends FCBaseBlock {
         final TileInterface tg = this.getTileEntity(world, x, y, z);
         if (tg != null) {
             if (Platform.isServer()) {
-                InventoryHandler.openGui(
-                        player,
-                        world,
-                        new BlockPos(x, y, z),
-                        ForgeDirection.getOrientation(facing),
-                        GuiType.DUAL_INTERFACE);
+                Platform.openGUI(player, tg, ForgeDirection.getOrientation(facing), GuiBridge.GUI_INTERFACE);
             }
             return true;
         }

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

@@ -1,70 +1,33 @@
 package com.glodblock.github.common.item;
 
-import java.text.NumberFormat;
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.List;
-
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
-import com.glodblock.github.api.FluidCraftAPI;
 import com.glodblock.github.common.storage.CellType;
-import com.glodblock.github.common.storage.FluidCellInventory;
-import com.glodblock.github.common.storage.FluidCellInventoryHandler;
-import com.glodblock.github.common.storage.IStorageFluidCell;
-import com.glodblock.github.inventory.FluidCellConfig;
 import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.util.NameConst;
 import com.google.common.base.Optional;
 
-import appeng.api.AEApi;
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.IncludeExclude;
-import appeng.api.implementations.items.IUpgradeModule;
-import appeng.api.storage.IMEInventoryHandler;
 import appeng.api.storage.StorageChannel;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.storage.data.IItemList;
-import appeng.core.features.AEFeature;
-import appeng.core.localization.GuiText;
-import appeng.helpers.ICellRestriction;
-import appeng.items.AEBaseItem;
-import appeng.items.contents.CellUpgrades;
-import appeng.util.InventoryAdaptor;
-import appeng.util.IterationCounter;
-import appeng.util.Platform;
-import appeng.util.ReadableNumberConverter;
+import appeng.items.AEBaseCell;
 
-public abstract class FCBaseItemCell extends AEBaseItem implements IStorageFluidCell, ICellRestriction {
+public abstract class FCBaseItemCell extends AEBaseCell {
 
     protected CellType component;
-    protected long totalBytes;
-    protected int perType;
-    protected double idleDrain;
-    protected int maxType = 1;
-    private final ReadableNumberConverter format = ReadableNumberConverter.INSTANCE;
 
-    @SuppressWarnings("Guava")
     public FCBaseItemCell(long bytes, int perType, int totalType, double drain) {
         super(Optional.of(bytes / 1024 + "k"));
-        this.setFeature(EnumSet.of(AEFeature.StorageCells));
-        this.setMaxStackSize(1);
         this.totalBytes = bytes;
         this.perType = perType;
         this.idleDrain = drain;
-        this.maxType = totalType;
+        this.totalTypes = totalType;
         this.component = null;
     }
 
-    public FCBaseItemCell(final Optional<String> subName) {
+    @Override
+    public StorageChannel getStorageChannel() {
+        return StorageChannel.FLUIDS;
+    }
+
+    public FCBaseItemCell(Optional subName) {
         super(subName);
     }
 
@@ -76,226 +39,6 @@ public abstract class FCBaseItemCell extends AEBaseItem implements IStorageFluid
         return component.stack(1);
     }
 
-    @Override
-    public long getBytes(ItemStack cellItem) {
-        return this.totalBytes;
-    }
-
-    @Override
-    public int getBytesPerType(ItemStack cellItem) {
-        return this.perType;
-    }
-
-    @Override
-    public boolean isBlackListed(ItemStack cellItem, IAEFluidStack requestedAddition) {
-        return requestedAddition == null || requestedAddition.getFluid() == null
-                || FluidCraftAPI.instance().isBlacklistedInStorage(requestedAddition.getFluid().getClass());
-    }
-
-    @Override
-    public void addCheckedInformation(final ItemStack stack, final EntityPlayer player, final List<String> lines,
-                                      final boolean displayMoreInfo) {
-        final IMEInventoryHandler<?> inventory = AEApi.instance().registries().cell()
-            .getCellInventory(stack, null, StorageChannel.FLUIDS);
-
-        if (inventory instanceof final FluidCellInventoryHandler handler) {
-            final FluidCellInventory cellInventory = (FluidCellInventory) handler.getCellInv();
-
-            if (cellInventory != null) {
-                lines.add(
-                        EnumChatFormatting.WHITE + NumberFormat.getInstance().format(cellInventory.getUsedBytes())
-                                + EnumChatFormatting.GRAY
-                                + " "
-                                + GuiText.Of.getLocal()
-                                + " "
-                                + EnumChatFormatting.DARK_GREEN
-                                + NumberFormat.getInstance().format(cellInventory.getTotalBytes())
-                                + " "
-                                + EnumChatFormatting.GRAY
-                                + GuiText.BytesUsed.getLocal());
-                lines.add(
-                        EnumChatFormatting.WHITE + NumberFormat.getInstance().format(cellInventory.getStoredFluidTypes())
-                                + EnumChatFormatting.GRAY
-                                + " "
-                                + GuiText.Of.getLocal()
-                                + " "
-                                + EnumChatFormatting.DARK_GREEN
-                                + cellInventory.getMaxFluidTypes()
-                                + " "
-                                + EnumChatFormatting.GRAY
-                                + GuiText.Types.getLocal());
-
-                if (GuiScreen.isCtrlKeyDown()) {
-                    if (cellInventory.getStoredFluidTypes() > 0) {
-                        lines.add(StatCollector.translateToLocal(NameConst.TT_CELL_CONTENTS));
-                        for (IAEFluidStack fluid : cellInventory.getContents()) {
-                            if (fluid != null) {
-                                lines.add(
-                                        String.format(
-                                                "  %s x%s mB",
-                                                fluid.getFluidStack().getLocalizedName(),
-                                                format.toWideReadableForm(fluid.getStackSize())));
-                            }
-                        }
-                    } else {
-                        lines.add(StatCollector.translateToLocal(NameConst.TT_CELL_EMPTY));
-                    }
-                } else {
-                    lines.add(StatCollector.translateToLocal(NameConst.TT_CTRL_FOR_MORE));
-                }
-
-                if (handler.isPreformatted()) {
-                    final String list = (handler.getWhitelist() == IncludeExclude.WHITELIST ? GuiText.Included
-                        : GuiText.Excluded).getLocal();
-                    lines.add(GuiText.Partitioned.getLocal() + " - " + list + ' ' + GuiText.Precise.getLocal());
-
-                    if (GuiScreen.isShiftKeyDown()) {
-                        lines.add(GuiText.Filter.getLocal() + ": ");
-                        for (IAEFluidStack aeFluidStack : handler.getPartitionInv()) {
-                            if (aeFluidStack != null) lines.add("  " + aeFluidStack.getFluidStack().getLocalizedName());
-                        }
-                    } else {
-                        lines.add(StatCollector.translateToLocal(NameConst.TT_SHIFT_FOR_MORE));
-                    }
-                    if (handler.getSticky()) {
-                        lines.add(GuiText.Sticky.getLocal());
-                    }
-                }
-                List<Object> restricted = handler.getRestricted();
-                if (restricted != null && ((long) restricted.get(0) != 0 || (byte) restricted.get(1) != 0)) {
-                    lines.add(GuiText.Restricted.getLocal());
-                    if (GuiScreen.isShiftKeyDown()) {
-                        NumberFormat nf = NumberFormat.getNumberInstance();
-                        if ((long) restricted.get(0) != 0)
-                            lines.add(GuiText.MaxFluid.getLocal() + " " + nf.format((long) restricted.get(0)) + " mB");
-                        if ((byte) restricted.get(1) != 0)
-                            lines.add(GuiText.MaxTypes.getLocal() + " " + restricted.get(1));
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public boolean storableInStorageCell() {
-        return false;
-    }
-
-    @Override
-    public boolean isStorageCell(ItemStack i) {
-        return true;
-    }
-
-    @Override
-    public double getIdleDrain(ItemStack is) {
-        return this.idleDrain;
-    }
-
-    @Override
-    public int getTotalTypes(final ItemStack cellItem) {
-        return this.maxType;
-    }
-
-    @Override
-    public boolean isEditable(ItemStack is) {
-        return true;
-    }
-
-    @Override
-    public IInventory getUpgradesInventory(ItemStack is) {
-        return new CellUpgrades(is, 5);
-    }
-
-    @Override
-    public IInventory getConfigInventory(ItemStack is) {
-        return new FluidCellConfig(is);
-    }
-
-    @Override
-    public FuzzyMode getFuzzyMode(ItemStack is) {
-        final String fz = Platform.openNbtData(is).getString("FuzzyMode");
-        try {
-            return FuzzyMode.valueOf(fz);
-        } catch (final Throwable t) {
-            return FuzzyMode.IGNORE_ALL;
-        }
-    }
-
-    @Override
-    public void setFuzzyMode(ItemStack is, FuzzyMode fzMode) {
-        Platform.openNbtData(is).setString("FuzzyMode", fzMode.name());
-    }
-
-    @Override
-    public String getCellData(ItemStack is) {
-        return totalBytes + ","
-                + this.getTotalTypes(null)
-                + ","
-                + this.getBytesPerType(null)
-                + ","
-                + 256 * 8
-                + ","
-                + Platform.openNbtData(is).getByte("cellRestrictionTypes")
-                + ","
-                + Platform.openNbtData(is).getLong("cellRestrictionAmount")
-                + ","
-                + "fluid";
-    }
-
-    @Override
-    public void setCellRestriction(ItemStack is, String newData) {
-        List<String> data = Arrays.asList(newData.split(",", 2));
-        Platform.openNbtData(is).setByte("cellRestrictionTypes", Byte.parseByte(data.get(0)));
-        Platform.openNbtData(is).setLong("cellRestrictionAmount", Long.parseLong(data.get(1)));
-    }
-
-    @SuppressWarnings("unchecked")
-    protected boolean disassembleDrive(final ItemStack stack, final World world, final EntityPlayer player) {
-        if (player.isSneaking()) {
-            if (Platform.isClient()) {
-                return false;
-            }
-            final InventoryPlayer playerInventory = player.inventory;
-            final IMEInventoryHandler<?> inv = AEApi.instance().registries().cell()
-                    .getCellInventory(stack, null, StorageChannel.FLUIDS);
-            if (inv != null && playerInventory.getCurrentItem() == stack) {
-                final InventoryAdaptor ia = InventoryAdaptor.getAdaptor(player, ForgeDirection.UNKNOWN);
-                final IItemList<IAEFluidStack> list = inv
-                        .getAvailableItems(StorageChannel.FLUIDS.createList(), IterationCounter.fetchNewId());
-                if (list.isEmpty() && ia != null) {
-                    playerInventory.setInventorySlotContents(playerInventory.currentItem, null);
-
-                    // drop core
-                    final ItemStack extraB = ia.addItems(this.component.stack(1));
-                    if (extraB != null) {
-                        player.dropPlayerItemWithRandomChoice(extraB, false);
-                    }
-
-                    // drop upgrades
-                    final IInventory upgradesInventory = this.getUpgradesInventory(stack);
-                    for (int upgradeIndex = 0; upgradeIndex < upgradesInventory.getSizeInventory(); upgradeIndex++) {
-                        final ItemStack upgradeStack = upgradesInventory.getStackInSlot(upgradeIndex);
-                        final ItemStack leftStack = ia.addItems(upgradeStack);
-                        if (leftStack != null && upgradeStack.getItem() instanceof IUpgradeModule) {
-                            player.dropPlayerItemWithRandomChoice(upgradeStack, false);
-                        }
-                    }
-
-                    // drop empty storage cell case
-                    final ItemStack extraA = ia.addItems(this.getHousing());
-                    if (extraA != null) {
-                        player.dropPlayerItemWithRandomChoice(this.getHousing(), false);
-                    }
-                    if (player.inventoryContainer != null) {
-                        player.inventoryContainer.detectAndSendChanges();
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
     public ItemStack stack(int size) {
         return new ItemStack(this, size);
     }

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

@@ -1,93 +0,0 @@
-package com.glodblock.github.common.item;
-
-import java.util.List;
-
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
-
-import com.glodblock.github.api.FluidCraftAPI;
-import com.glodblock.github.common.storage.IFluidCellInventory;
-import com.glodblock.github.common.storage.IFluidCellInventoryHandler;
-import com.glodblock.github.common.storage.IStorageFluidCell;
-import com.glodblock.github.util.NameConst;
-
-import appeng.api.AEApi;
-import appeng.api.storage.IMEInventoryHandler;
-import appeng.api.storage.StorageChannel;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.items.AEBaseItem;
-import appeng.items.contents.CellUpgrades;
-
-public abstract class ItemBaseInfinityStorageCell extends AEBaseItem implements IStorageFluidCell {
-
-    @Override
-    public long getBytes(ItemStack cellItem) {
-        return 0;
-    }
-
-    @Override
-    public int getBytesPerType(ItemStack cellItem) {
-        return 0;
-    }
-
-    @Override
-    public boolean isBlackListed(ItemStack cellItem, IAEFluidStack requestedAddition) {
-        return requestedAddition == null || requestedAddition.getFluid() == null
-                || FluidCraftAPI.instance().isBlacklistedInStorage(requestedAddition.getFluid().getClass());
-    }
-
-    @Override
-    public boolean storableInStorageCell() {
-        return false;
-    }
-
-    @Override
-    public boolean isStorageCell(ItemStack i) {
-        return true;
-    }
-
-    @Override
-    public double getIdleDrain(ItemStack is) {
-        return 0;
-    }
-
-    @Override
-    public int getTotalTypes(ItemStack cellItem) {
-        return 0;
-    }
-
-    @Override
-    public IInventory getUpgradesInventory(ItemStack is) {
-        return new CellUpgrades(is, 0);
-    }
-
-    @Override
-    public void addCheckedInformation(final ItemStack stack, final EntityPlayer player, final List<String> lines,
-                                      final boolean displayMoreInfo) {
-        final IMEInventoryHandler<?> inventory = AEApi.instance().registries().cell()
-            .getCellInventory(stack, null, StorageChannel.FLUIDS);
-
-        if (inventory instanceof final IFluidCellInventoryHandler handler) {
-            final IFluidCellInventory cellInventory = handler.getCellInv();
-
-            if (GuiScreen.isCtrlKeyDown()) {
-                if (!cellInventory.getContents().isEmpty()) {
-                    lines.add(StatCollector.translateToLocal(NameConst.TT_CELL_CONTENTS));
-                    for (IAEFluidStack fluid : cellInventory.getContents()) {
-                        if (fluid != null) {
-                            lines.add(String.format("  %s %s", StatCollector.translateToLocal(NameConst.TT_INFINITY_FLUID_STORAGE_TIPS),  fluid.getFluidStack().getLocalizedName()));
-                        }
-                    }
-                } else {
-                    lines.add(StatCollector.translateToLocal(NameConst.TT_CELL_EMPTY));
-                }
-            } else {
-                lines.add(StatCollector.translateToLocal(NameConst.TT_CTRL_FOR_MORE));
-            }
-        }
-    }
-
-}

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

@@ -1,5 +1,6 @@
 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.util.Util.DimensionalCoordSide.hasEnergyCard;
@@ -9,37 +10,38 @@ import java.util.List;
 
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.event.ForgeEventFactory;
 
 import com.glodblock.github.inventory.InventoryHandler;
 import com.glodblock.github.inventory.gui.GuiType;
 import com.glodblock.github.inventory.item.IItemInventory;
 import com.glodblock.github.util.BlockPos;
 import com.glodblock.github.util.NameConst;
+import com.glodblock.github.util.UltraTerminalModes;
 
 import appeng.api.AEApi;
-import appeng.api.features.ILocatable;
 import appeng.api.features.IWirelessTermHandler;
-import appeng.api.features.IWirelessTermRegistry;
-import appeng.core.localization.PlayerMessages;
+import appeng.api.implementations.guiobjects.IGuiItem;
+import appeng.api.implementations.guiobjects.IGuiItemObject;
+import appeng.core.sync.GuiBridge;
+import appeng.helpers.WirelessTerminalGuiObject;
 import appeng.items.tools.powered.ToolWirelessTerminal;
 import appeng.util.Platform;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements IItemInventory {
+public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements IItemInventory, IGuiItem {
 
-    protected GuiType type;
+    protected Object type;
     public static String infinityBoosterCard = "infinityBoosterCard";
     public static String infinityEnergyCard = "InfinityEnergyCard";
-    public static String restockItems = "restock";
 
-    public ItemBaseWirelessTerminal(GuiType t) {
+    public ItemBaseWirelessTerminal(Object t) {
         super();
         this.type = t;
     }
@@ -48,40 +50,7 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II
     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 (ForgeEventFactory.onItemUseStart(player, item, 1) > 0) {
-            if (Platform.isClient()) {
-                return item;
-            }
-            IWirelessTermRegistry term = AEApi.instance().registries().wireless();
-            if (!term.isWirelessTerminal(item)) {
-                player.addChatMessage(PlayerMessages.DeviceNotWirelessTerminal.toChat());
-                return item;
-            }
-            final IWirelessTermHandler handler = term.getWirelessTerminalHandler(item);
-            final String unparsedKey = handler.getEncryptionKey(item);
-            if (unparsedKey.isEmpty()) {
-                player.addChatMessage(PlayerMessages.DeviceNotLinked.toChat());
-                return item;
-            }
-            final long parsedKey = Long.parseLong(unparsedKey);
-            final ILocatable securityStation = AEApi.instance().registries().locatable().getLocatableBy(parsedKey);
-            if (securityStation == null) {
-                player.addChatMessage(PlayerMessages.StationCanNotBeLocated.toChat());
-                return item;
-            }
-            if (handler.hasPower(player, 0.5, item)) {
-                InventoryHandler.openGui(
-                        player,
-                        w,
-                        new BlockPos(player.inventory.currentItem, 0, 0),
-                        ForgeDirection.UNKNOWN,
-                        this.guiGuiType(item));
-            } else {
-                player.addChatMessage(PlayerMessages.DeviceNotPowered.toChat());
-            }
-        }
-
-        return item;
+        return super.onItemRightClick(item, w, player);
     }
 
     private ItemStack removeInfinityBoosterCard(final EntityPlayer player, ItemStack is) {
@@ -117,7 +86,7 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II
         if (is == null) {
             return false;
         }
-        return is.getItem() instanceof ItemBaseWirelessTerminal;
+        return is.getItem() == this;
     }
 
     public ItemStack stack() {
@@ -129,12 +98,64 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II
         return null;
     }
 
-    public GuiType guiGuiType(ItemStack stack) {
-        return this.type;
+    public static UltraTerminalModes getMode(ItemStack is) {
+        Item item = is.getItem();
+        if (item instanceof ItemWirelessUltraTerminal) {
+            if (!is.hasTagCompound()) is.setTagCompound(new NBTTagCompound());
+            return UltraTerminalModes.values()[is.getTagCompound().getInteger(MODE)];
+        } else if (item instanceof ItemWirelessPatternTerminal) {
+            return UltraTerminalModes.PATTERN;
+        } else if (item instanceof ItemWirelessInterfaceTerminal) {
+            return UltraTerminalModes.INTERFACE;
+        } else if (item instanceof ItemWirelessLevelTerminal) {
+            return UltraTerminalModes.LEVEL;
+        } else {
+            return UltraTerminalModes.INTERFACE; // any wireless gui object will fit
+        }
     }
 
-    public static void toggleRestockItemsMode(ItemStack is, boolean state) {
-        NBTTagCompound data = Platform.openNbtData(is);
-        data.setBoolean(restockItems, state);
+    public static void setMode(ItemStack is, UltraTerminalModes utm) {
+        is.getTagCompound().setInteger(MODE, utm.ordinal());
+    }
+
+    @Override
+    public void openGui(final ItemStack is, final World w, final EntityPlayer player, final Object mode) {
+        final GuiBridge aeGui;
+        Item item = is.getItem();
+        if (item instanceof ItemWirelessPatternTerminal) {
+            aeGui = GuiBridge.GUI_PATTERN_TERMINAL;
+        } else if (item instanceof ItemWirelessInterfaceTerminal) {
+            aeGui = GuiBridge.GUI_INTERFACE_TERMINAL;
+        } else if (item instanceof ItemWirelessLevelTerminal) {
+            InventoryHandler.openGui(
+                    player,
+                    w,
+                    new BlockPos(player.inventory.currentItem, 0, 0),
+                    ForgeDirection.UNKNOWN,
+                    GuiType.WIRELESS_LEVEL_TERMINAL);
+            return;
+        } else {
+            aeGui = GuiBridge.GUI_INTERFACE_TERMINAL; // any wireless gui object will fit
+        }
+        Platform.openGUI(player, null, null, aeGui);
+    }
+
+    @Override
+    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 new WirelessTerminalGuiObject(wh, is, p, world, x, y, z);
+    }
+
+    @Override
+    public boolean hasInfinityPower(ItemStack is) {
+        NBTTagCompound data = is.getTagCompound();
+        return data != null && data.hasKey(infinityEnergyCard) && data.getBoolean(infinityEnergyCard);
+    }
+
+    @Override
+    public boolean hasInfinityRange(ItemStack is) {
+        NBTTagCompound data = is.getTagCompound();
+        return data != null && data.hasKey(infinityBoosterCard) && data.getBoolean(infinityBoosterCard);
     }
 }

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

@@ -4,18 +4,14 @@ import java.util.EnumSet;
 import java.util.HashMap;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.StatCollector;
-import net.minecraft.world.World;
-import net.minecraftforge.event.ForgeEventFactory;
 
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.Config;
 import com.glodblock.github.common.storage.CellType;
-import com.glodblock.github.common.storage.IStorageFluidCell;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.loader.IRegister;
 import com.glodblock.github.loader.ItemAndBlockHolder;
@@ -23,14 +19,12 @@ import com.glodblock.github.util.NameConst;
 import com.google.common.base.Optional;
 
 import appeng.api.exceptions.MissingDefinition;
-import appeng.core.AEConfig;
 import appeng.core.features.AEFeature;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class ItemBasicFluidStorageCell extends FCBaseItemCell
-        implements IStorageFluidCell, IRegister<ItemBasicFluidStorageCell> {
+public class ItemBasicFluidStorageCell extends FCBaseItemCell implements IRegister<ItemBasicFluidStorageCell> {
 
     private static final HashMap<Integer, IIcon> icon = new HashMap<>();
     private final int housingValue;
@@ -114,19 +108,6 @@ public class ItemBasicFluidStorageCell extends FCBaseItemCell
         return icon.get(id);
     }
 
-    @Override
-    public ItemStack onItemRightClick(final ItemStack stack, final World world, final EntityPlayer player) {
-        this.disassembleDrive(stack, world, player);
-        return stack;
-    }
-
-    @Override
-    public boolean onItemUseFirst(final ItemStack stack, final EntityPlayer player, final World world, final int x,
-            final int y, final int z, final int side, final float hitX, final float hitY, final float hitZ) {
-        if (ForgeEventFactory.onItemUseStart(player, stack, 1) <= 0) return true;
-        return this.disassembleDrive(stack, world, player);
-    }
-
     @Override
     public ItemStack getContainerItem(final ItemStack itemStack) {
         if (this.getHousing() != null) {
@@ -135,11 +116,6 @@ public class ItemBasicFluidStorageCell extends FCBaseItemCell
         throw new MissingDefinition("Tried to use empty storage cells while basic storage cells are defined.");
     }
 
-    @Override
-    public boolean hasContainerItem(final ItemStack stack) {
-        return AEConfig.instance.isFeatureEnabled(AEFeature.EnableDisassemblyCrafting);
-    }
-
     @Override
     public ItemBasicFluidStorageCell register() {
         if (!Config.fluidCells) return null;

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

@@ -2,61 +2,47 @@ package com.glodblock.github.common.item;
 
 import java.util.EnumSet;
 
-import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 
 import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.storage.IStorageFluidCell;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
-import com.glodblock.github.inventory.FluidCellConfig;
 import com.glodblock.github.loader.IRegister;
 import com.glodblock.github.util.NameConst;
 
-import appeng.api.config.FuzzyMode;
+import appeng.api.storage.StorageChannel;
 import appeng.core.features.AEFeature;
-import appeng.util.Platform;
+import appeng.items.AEBaseInfiniteCell;
 import cpw.mods.fml.common.registry.GameRegistry;
 
-public class ItemCreativeFluidStorageCell extends ItemBaseInfinityStorageCell
-        implements IStorageFluidCell, IRegister<ItemCreativeFluidStorageCell> {
+public class ItemCreativeFluidStorageCell extends AEBaseInfiniteCell
+        implements IRegister<ItemCreativeFluidStorageCell> {
 
     public ItemCreativeFluidStorageCell() {
-        super();
         setUnlocalizedName(NameConst.ITEM_CREATIVE_FLUID_STORAGE);
         setTextureName(FluidCraft.resource(NameConst.ITEM_CREATIVE_FLUID_STORAGE).toString());
         this.setFeature(EnumSet.of(AEFeature.StorageCells));
         this.setMaxStackSize(1);
     }
 
-    @Override
-    public IInventory getConfigInventory(ItemStack is) {
-        return new FluidCellConfig(is);
-    }
-
-    @Override
-    public FuzzyMode getFuzzyMode(ItemStack is) {
-        final String fz = Platform.openNbtData(is).getString("FuzzyMode");
-        try {
-            return FuzzyMode.valueOf(fz);
-        } catch (final Throwable t) {
-            return FuzzyMode.IGNORE_ALL;
-        }
-    }
-
-    @Override
-    public boolean isEditable(ItemStack is) {
-        return true;
-    }
-
-    @Override
-    public void setFuzzyMode(ItemStack is, FuzzyMode fzMode) {
-        Platform.openNbtData(is).setString("FuzzyMode", fzMode.name());
-    }
-
     @Override
     public ItemCreativeFluidStorageCell register() {
         GameRegistry.registerItem(this, NameConst.ITEM_CREATIVE_FLUID_STORAGE, FluidCraft.MODID);
         setCreativeTab(FluidCraftingTabs.INSTANCE);
         return this;
     }
+
+    @Override
+    public boolean isEditable(ItemStack is) {
+        return true;
+    }
+
+    @Override
+    public int getTotalTypes(ItemStack cellItem) {
+        return 63;
+    }
+
+    @Override
+    public StorageChannel getStorageChannel() {
+        return StorageChannel.FLUIDS;
+    }
 }

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

@@ -1,24 +1,27 @@
 package com.glodblock.github.common.item;
 
+import java.util.EnumSet;
+
 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.Config;
-import com.glodblock.github.common.storage.IStorageFluidCell;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.loader.IRegister;
 
+import appeng.core.features.AEFeature;
 import cpw.mods.fml.common.registry.GameRegistry;
 
-public class ItemFluidExtremeStorageCell extends FCBaseItemCell
-        implements IStorageFluidCell, IRegister<ItemFluidExtremeStorageCell> {
+public class ItemFluidExtremeStorageCell extends FCBaseItemCell implements IRegister<ItemFluidExtremeStorageCell> {
 
     private final String name;
 
     public ItemFluidExtremeStorageCell(String name, long bytes, int perType, int totalTypes, double drain) {
         super(bytes, perType, totalTypes, drain);
+        this.setFeature(EnumSet.of(AEFeature.StorageCells));
+        this.setMaxStackSize(1);
         setUnlocalizedName(name);
         this.name = name;
         setTextureName(FluidCraft.resource(name).toString());

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

@@ -1,5 +1,7 @@
 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;
@@ -57,4 +59,11 @@ public class ItemFluidLevelEmitter extends FCBaseItem implements IPartItem {
     public int getSpriteNumber() {
         return 0;
     }
+
+    @Override
+    public void addInformation(final ItemStack stack, final EntityPlayer player, final List<String> lines,
+            final boolean displayMoreInfo) {
+        lines.add("Deprecated, 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/ItemFluidVoidStorageCell.java

@@ -1,44 +1,20 @@
 package com.glodblock.github.common.item;
 
-import java.util.EnumSet;
-import java.util.List;
-
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
 import com.glodblock.github.FluidCraft;
-import com.glodblock.github.api.FluidCraftAPI;
-import com.glodblock.github.common.storage.IFluidCellInventory;
-import com.glodblock.github.common.storage.IFluidCellInventoryHandler;
-import com.glodblock.github.common.storage.IStorageFluidCell;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
-import com.glodblock.github.inventory.FluidCellConfig;
 import com.glodblock.github.loader.IRegister;
 import com.glodblock.github.util.NameConst;
 
-import appeng.api.AEApi;
-import appeng.api.config.FuzzyMode;
-import appeng.api.storage.IMEInventoryHandler;
 import appeng.api.storage.StorageChannel;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.core.features.AEFeature;
-import appeng.core.localization.GuiText;
-import appeng.items.AEBaseItem;
-import appeng.items.contents.CellUpgrades;
-import appeng.util.Platform;
+import appeng.items.storage.ItemVoidStorageCell;
 import cpw.mods.fml.common.registry.GameRegistry;
 
-public class ItemFluidVoidStorageCell extends AEBaseItem
-        implements IStorageFluidCell, IRegister<ItemFluidVoidStorageCell> {
+public class ItemFluidVoidStorageCell extends ItemVoidStorageCell implements IRegister<ItemFluidVoidStorageCell> {
 
     public ItemFluidVoidStorageCell() {
         super();
         setUnlocalizedName(NameConst.ITEM_FLUID_VOID_CELL);
         setTextureName(FluidCraft.resource(NameConst.ITEM_FLUID_VOID_CELL).toString());
-        this.setFeature(EnumSet.of(AEFeature.StorageCells));
-        this.setMaxStackSize(1);
     }
 
     @Override
@@ -49,88 +25,7 @@ public class ItemFluidVoidStorageCell extends AEBaseItem
     }
 
     @Override
-    public void addCheckedInformation(final ItemStack stack, final EntityPlayer player, final List<String> lines,
-                                      final boolean displayMoreInfo) {
-        final IMEInventoryHandler<?> inventory = AEApi.instance().registries().cell()
-            .getCellInventory(stack, null, StorageChannel.FLUIDS);
-        if (inventory instanceof final IFluidCellInventoryHandler handler) {
-            lines.add(NameConst.i18n(NameConst.TT_ITEM_FLUID_VOID_CELL));
-            lines.add(GuiText.VoidCellTooltip.getLocal());
-            lines.add(0 + " " + GuiText.Of.getLocal() + " \u00A7k9999\u00A77 " + GuiText.BytesUsed.getLocal());
-            final IFluidCellInventory inv = handler.getCellInv();
-            if (GuiScreen.isShiftKeyDown()) {
-                lines.add(GuiText.Filter.getLocal() + ": ");
-                for (int i = 0; i < inv.getConfigInventory().getSizeInventory(); ++i) {
-                    ItemStack s = inv.getConfigInventory().getStackInSlot(i);
-                    if (s != null) lines.add(s.getDisplayName());
-                }
-            }
-        }
-    }
-
-    @Override
-    public long getBytes(ItemStack cellItem) {
-        return 0;
-    }
-
-    @Override
-    public int getBytesPerType(ItemStack cellItem) {
-        return 0;
-    }
-
-    @Override
-    public boolean isBlackListed(ItemStack cellItem, IAEFluidStack requestedAddition) {
-        return requestedAddition == null || requestedAddition.getFluid() == null
-                || FluidCraftAPI.instance().isBlacklistedInStorage(requestedAddition.getFluid().getClass());
-    }
-
-    @Override
-    public boolean storableInStorageCell() {
-        return true;
-    }
-
-    @Override
-    public boolean isStorageCell(ItemStack i) {
-        return true;
-    }
-
-    @Override
-    public double getIdleDrain(ItemStack is) {
-        return 0;
-    }
-
-    @Override
-    public int getTotalTypes(ItemStack cellItem) {
-        return 0;
-    }
-
-    @Override
-    public boolean isEditable(ItemStack is) {
-        return true;
-    }
-
-    @Override
-    public IInventory getUpgradesInventory(ItemStack is) {
-        return new CellUpgrades(is, 5);
-    }
-
-    @Override
-    public IInventory getConfigInventory(ItemStack is) {
-        return new FluidCellConfig(is);
-    }
-
-    @Override
-    public FuzzyMode getFuzzyMode(ItemStack is) {
-        final String fz = Platform.openNbtData(is).getString("FuzzyMode");
-        try {
-            return FuzzyMode.valueOf(fz);
-        } catch (final Throwable t) {
-            return FuzzyMode.IGNORE_ALL;
-        }
-    }
-
-    @Override
-    public void setFuzzyMode(ItemStack is, FuzzyMode fzMode) {
-        Platform.openNbtData(is).setString("FuzzyMode", fzMode.name());
+    public StorageChannel getStorageChannel() {
+        return StorageChannel.FLUIDS;
     }
 }

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

@@ -4,33 +4,28 @@ import static com.glodblock.github.util.Util.FluidUtil.water_bucket;
 
 import java.util.EnumSet;
 
-import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 
 import com.glodblock.github.FluidCraft;
-import com.glodblock.github.common.storage.IStorageFluidCell;
 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.config.FuzzyMode;
+import appeng.api.storage.StorageChannel;
 import appeng.core.features.AEFeature;
-import appeng.tile.inventory.AppEngInternalInventory;
+import appeng.items.AEBaseInfiniteCell;
+import appeng.tile.inventory.IAEStackInventory;
 import cpw.mods.fml.common.registry.GameRegistry;
 
-public class ItemInfinityWaterStorageCell extends ItemBaseInfinityStorageCell
-        implements IStorageFluidCell, IRegister<ItemInfinityWaterStorageCell> {
+public class ItemInfinityWaterStorageCell extends AEBaseInfiniteCell
+        implements IRegister<ItemInfinityWaterStorageCell> {
 
-    @Override
-    public IInventory getConfigInventory(ItemStack is) {
-        return new InfinityConfig(water_bucket);
-    }
-
-    public static class InfinityConfig extends AppEngInternalInventory {
+    public static class InfinityConfig extends IAEStackInventory {
 
         public InfinityConfig(final ItemStack is) {
             super(null, 1);
-            this.setInventorySlotContents(0, is);
+            this.putAEStackInSlot(0, Util.getAEFluidFromItem(is));
         }
 
         @Override
@@ -38,7 +33,6 @@ public class ItemInfinityWaterStorageCell extends ItemBaseInfinityStorageCell
     }
 
     public ItemInfinityWaterStorageCell() {
-        super();
         setUnlocalizedName(NameConst.ITEM_INFINITY_WATER_FLUID_STORAGE);
         setTextureName(FluidCraft.resource(NameConst.ITEM_INFINITY_FLUID_STORAGE).toString());
         this.setFeature(EnumSet.of(AEFeature.StorageCells));
@@ -52,17 +46,23 @@ public class ItemInfinityWaterStorageCell extends ItemBaseInfinityStorageCell
         return this;
     }
 
+    @Override
+    public IAEStackInventory getConfigAEInventory(ItemStack is) {
+        return new InfinityConfig(water_bucket);
+    }
+
     @Override
     public boolean isEditable(ItemStack is) {
         return false;
     }
 
     @Override
-    public FuzzyMode getFuzzyMode(ItemStack is) {
-        return FuzzyMode.IGNORE_ALL;
+    public int getTotalTypes(ItemStack cellItem) {
+        return 1;
     }
 
     @Override
-    public void setFuzzyMode(ItemStack is, FuzzyMode fzMode) {}
-
+    public StorageChannel getStorageChannel() {
+        return StorageChannel.FLUIDS;
+    }
 }

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

@@ -4,18 +4,14 @@ import java.util.EnumSet;
 import java.util.HashMap;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.StatCollector;
-import net.minecraft.world.World;
-import net.minecraftforge.event.ForgeEventFactory;
 
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.Config;
 import com.glodblock.github.common.storage.CellType;
-import com.glodblock.github.common.storage.IStorageFluidCell;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.loader.IRegister;
 import com.glodblock.github.loader.ItemAndBlockHolder;
@@ -23,14 +19,12 @@ import com.glodblock.github.util.NameConst;
 import com.google.common.base.Optional;
 
 import appeng.api.exceptions.MissingDefinition;
-import appeng.core.AEConfig;
 import appeng.core.features.AEFeature;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class ItemMultiFluidStorageCell extends FCBaseItemCell
-        implements IStorageFluidCell, IRegister<ItemMultiFluidStorageCell> {
+public class ItemMultiFluidStorageCell extends FCBaseItemCell implements IRegister<ItemMultiFluidStorageCell> {
 
     private static final HashMap<Integer, IIcon> icon = new HashMap<>();
     private final int housingValue;
@@ -43,7 +37,7 @@ public class ItemMultiFluidStorageCell extends FCBaseItemCell
         this.totalBytes = kilobytes * 1024;
         this.component = whichCell;
         this.housingValue = housingValue;
-        this.maxType = 5;
+        this.totalTypes = 5;
         setUnlocalizedName(NameConst.ITEM_MULTI_FLUID_STORAGE + "." + kilobytes);
 
         switch (this.component) {
@@ -115,24 +109,6 @@ public class ItemMultiFluidStorageCell extends FCBaseItemCell
         return icon.get(id);
     }
 
-    @Override
-    public ItemStack onItemRightClick(final ItemStack stack, final World world, final EntityPlayer player) {
-        this.disassembleDrive(stack, world, player);
-        return stack;
-    }
-
-    @Override
-    public boolean onItemUseFirst(final ItemStack stack, final EntityPlayer player, final World world, final int x,
-            final int y, final int z, final int side, final float hitX, final float hitY, final float hitZ) {
-        if (ForgeEventFactory.onItemUseStart(player, stack, 1) <= 0) return true;
-        return this.disassembleDrive(stack, world, player);
-    }
-
-    @Override
-    public boolean hasContainerItem(final ItemStack stack) {
-        return AEConfig.instance.isFeatureEnabled(AEFeature.EnableDisassemblyCrafting);
-    }
-
     @Override
     public ItemStack getContainerItem(final ItemStack itemStack) {
         if (this.getHousing() != null) {

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

@@ -2,7 +2,6 @@ package com.glodblock.github.common.item;
 
 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;
@@ -46,7 +45,9 @@ public class ItemPartFluidInterface extends FCBaseItem implements IPartItem {
     }
 
     @Override
-    public void registerIcons(IIconRegister _iconRegister) {}
+    protected String getIconString() {
+        return NameConst.RES_KEY + "fluid_interface";
+    }
 
     @Override
     @SideOnly(Side.CLIENT)

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

@@ -1,5 +1,7 @@
 package com.glodblock.github.common.item;
 
+import java.util.List;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -53,4 +55,10 @@ public class ItemPartFluidPatternTerminal extends FCBaseItem implements IPartIte
     public int getSpriteNumber() {
         return 0;
     }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void addInformation(ItemStack stack, EntityPlayer player, List<String> toolTip, boolean flag) {
+        toolTip.add("DEPRECATED!");
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.glodblock.github.common.item;
 
+import java.util.List;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -53,4 +55,10 @@ public class ItemPartFluidPatternTerminalEx extends FCBaseItem implements IPartI
     public int getSpriteNumber() {
         return 0;
     }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void addInformation(ItemStack stack, EntityPlayer player, List<String> toolTip, boolean flag) {
+        toolTip.add("DEPRECATED!");
+    }
 }

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

@@ -2,7 +2,6 @@ package com.glodblock.github.common.item;
 
 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;
@@ -46,7 +45,9 @@ public class ItemPartFluidStorageBus extends FCBaseItem implements IPartItem {
     }
 
     @Override
-    public void registerIcons(IIconRegister _iconRegister) {}
+    protected String getIconString() {
+        return NameConst.RES_KEY + "fluid_storage_bus";
+    }
 
     @Override
     @SideOnly(Side.CLIENT)

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

@@ -45,6 +45,7 @@ public class ItemPartFluidTerminal extends FCBaseItem implements IPartItem {
     @Override
     @SideOnly(Side.CLIENT)
     public void addInformation(ItemStack stack, EntityPlayer player, List<String> toolTip, boolean flag) {
+        toolTip.add("DEPRECATED!");
         if (isShiftKeyDown()) {
             toolTip.add(NameConst.i18n(NameConst.TT_FLUID_TERMINAL));
         } else {
@@ -67,4 +68,5 @@ public class ItemPartFluidTerminal extends FCBaseItem implements IPartItem {
     public int getSpriteNumber() {
         return 0;
     }
+
 }

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

@@ -1,75 +1,38 @@
 package com.glodblock.github.common.item;
 
-import java.text.NumberFormat;
-import java.util.EnumSet;
 import java.util.List;
 
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.api.FluidCraftAPI;
-import com.glodblock.github.common.Config;
-import com.glodblock.github.common.storage.IFluidCellInventory;
-import com.glodblock.github.common.storage.IFluidCellInventoryHandler;
-import com.glodblock.github.common.storage.IStorageFluidCell;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
-import com.glodblock.github.inventory.FluidCellConfig;
-import com.glodblock.github.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.IItemInventory;
-import com.glodblock.github.inventory.item.PortableFluidCellInventory;
 import com.glodblock.github.loader.IRegister;
-import com.glodblock.github.util.BlockPos;
 import com.glodblock.github.util.NameConst;
 import com.glodblock.github.util.RenderUtil;
-import com.google.common.base.Optional;
 
-import appeng.api.AEApi;
-import appeng.api.config.FuzzyMode;
-import appeng.api.storage.IMEInventoryHandler;
+import appeng.api.implementations.guiobjects.IGuiItemObject;
 import appeng.api.storage.StorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.core.features.AEFeature;
-import appeng.core.localization.GuiText;
+import appeng.api.storage.data.IAEStack;
+import appeng.items.AEBasePortableCell;
 import appeng.items.contents.CellUpgrades;
-import appeng.items.tools.powered.powersink.AEBasePoweredItem;
-import appeng.util.Platform;
+import appeng.items.contents.PortableCellViewer;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class ItemPortableFluidCell extends AEBasePoweredItem
-        implements IStorageFluidCell, IItemInventory, IRegister<ItemPortableFluidCell> {
+public class ItemPortableFluidCell extends AEBasePortableCell implements IRegister<ItemPortableFluidCell> {
 
     public ItemPortableFluidCell() {
-        super(Config.portableCellBattery, Optional.absent());
+        super();
         setUnlocalizedName(NameConst.ITEM_FLUID_PORTABLE_CELL);
         setTextureName(FluidCraft.resource(NameConst.ITEM_FLUID_PORTABLE_CELL).toString());
-        this.setFeature(EnumSet.of(AEFeature.PortableCell, AEFeature.StorageCells, AEFeature.PoweredTools));
-    }
-
-    @Override
-    public ItemStack onItemRightClick(final ItemStack item, final World w, final EntityPlayer player) {
-        InventoryHandler.openGui(
-                player,
-                w,
-                new BlockPos(player.inventory.currentItem, 0, 0),
-                ForgeDirection.UNKNOWN,
-                GuiType.PORTABLE_FLUID_CELL);
-        return item;
-    }
-
-    @SideOnly(Side.CLIENT)
-    @Override
-    public boolean isFull3D() {
-        return false;
     }
 
     @SideOnly(Side.CLIENT)
@@ -77,35 +40,6 @@ public class ItemPortableFluidCell extends AEBasePoweredItem
     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, StorageChannel.FLUIDS);
-        if (inventory instanceof final IFluidCellInventoryHandler handler) {
-            final IFluidCellInventory cellInventory = handler.getCellInv();
-            if (cellInventory != null) {
-                lines.add(
-                        EnumChatFormatting.WHITE + NumberFormat.getInstance().format(cellInventory.getUsedBytes())
-                                + EnumChatFormatting.GRAY
-                                + " "
-                                + GuiText.Of.getLocal()
-                                + " "
-                                + EnumChatFormatting.DARK_GREEN
-                                + cellInventory.getTotalBytes()
-                                + " "
-                                + EnumChatFormatting.GRAY
-                                + GuiText.BytesUsed.getLocal());
-                lines.add(
-                        EnumChatFormatting.WHITE + NumberFormat.getInstance().format(cellInventory.getStoredFluidTypes())
-                                + EnumChatFormatting.GRAY
-                                + " "
-                                + GuiText.Of.getLocal()
-                                + " "
-                                + EnumChatFormatting.DARK_GREEN
-                                + cellInventory.getTotalFluidTypes()
-                                + " "
-                                + EnumChatFormatting.GRAY
-                                + GuiText.Types.getLocal());
-            }
-        }
         if (GuiScreen.isShiftKeyDown()) {
             lines.addAll(
                     RenderUtil.listFormattedStringToWidth(
@@ -116,34 +50,20 @@ public class ItemPortableFluidCell extends AEBasePoweredItem
     }
 
     @Override
-    public long getBytes(final ItemStack cellItem) {
+    public long getBytesLong(final ItemStack cellItem) {
         return 256;
     }
 
-    @Override
-    public int getBytesPerType(final ItemStack cellItem) {
-        return 8;
-    }
-
     @Override
     public int getTotalTypes(final ItemStack cellItem) {
         return 5;
     }
 
     @Override
-    public boolean isBlackListed(ItemStack cellItem, IAEFluidStack requestedAddition) {
-        return requestedAddition == null || requestedAddition.getFluid() == null
-                || FluidCraftAPI.instance().isBlacklistedInStorage(requestedAddition.getFluid().getClass());
-    }
+    public boolean isBlackListed(IAEStack<?> requestedAddition) {
 
-    @Override
-    public boolean storableInStorageCell() {
-        return false;
-    }
-
-    @Override
-    public boolean isStorageCell(final ItemStack i) {
-        return true;
+        return requestedAddition instanceof IAEFluidStack ifs && (ifs.getFluid() == null
+                || FluidCraftAPI.instance().isBlacklistedInStorage(ifs.getFluid().getClass()));
     }
 
     @Override
@@ -151,34 +71,20 @@ public class ItemPortableFluidCell extends AEBasePoweredItem
         return 0.5;
     }
 
-    @Override
-    public boolean isEditable(final ItemStack is) {
-        return true;
-    }
-
     @Override
     public IInventory getUpgradesInventory(final ItemStack is) {
         return new CellUpgrades(is, 0);
     }
 
     @Override
-    public IInventory getConfigInventory(final ItemStack is) {
-        return new FluidCellConfig(is);
+    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);
     }
 
     @Override
-    public FuzzyMode getFuzzyMode(final ItemStack is) {
-        final String fz = Platform.openNbtData(is).getString("FuzzyMode");
-        try {
-            return FuzzyMode.valueOf(fz);
-        } catch (final Throwable t) {
-            return FuzzyMode.IGNORE_ALL;
-        }
-    }
-
-    @Override
-    public void setFuzzyMode(final ItemStack is, final FuzzyMode fzMode) {
-        Platform.openNbtData(is).setString("FuzzyMode", fzMode.name());
+    public StorageChannel getStorageChannel() {
+        return StorageChannel.FLUIDS;
     }
 
     @Override
@@ -188,11 +94,6 @@ public class ItemPortableFluidCell extends AEBasePoweredItem
         return this;
     }
 
-    @Override
-    public Object getInventory(ItemStack stack, World world, int x, int y, int z, EntityPlayer player) {
-        return new PortableFluidCellInventory(stack, x);
-    }
-
     public ItemStack stack() {
         return new ItemStack(this, 1);
     }

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

@@ -8,23 +8,18 @@ import net.minecraft.world.World;
 
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.WirelessFluidTerminalInventory;
 import com.glodblock.github.loader.IRegister;
 import com.glodblock.github.util.NameConst;
-import com.glodblock.github.util.Util;
 
 import appeng.api.AEApi;
-import appeng.api.networking.IGridNode;
 import appeng.core.features.AEFeature;
-import appeng.core.localization.PlayerMessages;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public class ItemWirelessFluidTerminal extends ItemBaseWirelessTerminal
         implements IRegister<ItemWirelessFluidTerminal> {
 
     public ItemWirelessFluidTerminal() {
-        super(GuiType.WIRELESS_FLUID_TERMINAL);
+        super(null);
         AEApi.instance().registries().wireless().registerWirelessHandler(this);
         this.setFeature(EnumSet.of(AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools));
         setUnlocalizedName(NameConst.ITEM_WIRELESS_FLUID_TERMINAL);
@@ -40,12 +35,6 @@ public class ItemWirelessFluidTerminal extends ItemBaseWirelessTerminal
 
     @Override
     public Object getInventory(ItemStack stack, World world, int x, int y, int z, EntityPlayer player) {
-        try {
-            IGridNode gridNode = Util.getWirelessGrid(stack);
-            return new WirelessFluidTerminalInventory(stack, x, gridNode, player);
-        } catch (Exception e) {
-            player.addChatMessage(PlayerMessages.OutOfRange.toChat());
-        }
         return null;
     }
 

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

@@ -8,23 +8,22 @@ import net.minecraft.world.World;
 
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.WirelessInterfaceTerminalInventory;
 import com.glodblock.github.loader.IRegister;
 import com.glodblock.github.util.NameConst;
-import com.glodblock.github.util.Util;
 
 import appeng.api.AEApi;
-import appeng.api.networking.IGridNode;
+import appeng.api.features.IWirelessTermHandler;
+import appeng.api.implementations.guiobjects.IGuiItemObject;
 import appeng.core.features.AEFeature;
-import appeng.core.localization.PlayerMessages;
+import appeng.core.sync.GuiBridge;
+import appeng.items.contents.WirelessInterfaceTerminalGuiObject;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public class ItemWirelessInterfaceTerminal extends ItemBaseWirelessTerminal
         implements IRegister<ItemWirelessInterfaceTerminal> {
 
     public ItemWirelessInterfaceTerminal() {
-        super(GuiType.WIRELESS_INTERFACE_TERMINAL);
+        super(GuiBridge.GUI_INTERFACE_TERMINAL);
         AEApi.instance().registries().wireless().registerWirelessHandler(this);
         this.setFeature(EnumSet.of(AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools));
         setUnlocalizedName(NameConst.ITEM_WIRELESS_INTERFACE_TERMINAL);
@@ -39,13 +38,9 @@ public class ItemWirelessInterfaceTerminal extends ItemBaseWirelessTerminal
     }
 
     @Override
-    public Object getInventory(ItemStack stack, World world, int x, int y, int z, EntityPlayer player) {
-        try {
-            IGridNode gridNode = Util.getWirelessGrid(stack);
-            return new WirelessInterfaceTerminalInventory(stack, x, gridNode, player);
-        } catch (Exception e) {
-            player.addChatMessage(PlayerMessages.OutOfRange.toChat());
-        }
-        return null;
+    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 new WirelessInterfaceTerminalGuiObject(wh, is, x);
     }
 }

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

@@ -8,23 +8,22 @@ import net.minecraft.world.World;
 
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory;
 import com.glodblock.github.loader.IRegister;
 import com.glodblock.github.util.NameConst;
-import com.glodblock.github.util.Util;
 
 import appeng.api.AEApi;
-import appeng.api.networking.IGridNode;
+import appeng.api.features.IWirelessTermHandler;
+import appeng.api.implementations.guiobjects.IGuiItemObject;
 import appeng.core.features.AEFeature;
-import appeng.core.localization.PlayerMessages;
+import appeng.core.sync.GuiBridge;
+import appeng.items.contents.WirelessPatternTerminalGuiObject;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public class ItemWirelessPatternTerminal extends ItemBaseWirelessTerminal
         implements IRegister<ItemWirelessPatternTerminal> {
 
     public ItemWirelessPatternTerminal() {
-        super(GuiType.WIRELESS_FLUID_PATTERN_TERMINAL);
+        super(GuiBridge.GUI_PATTERN_TERMINAL);
         AEApi.instance().registries().wireless().registerWirelessHandler(this);
         this.setFeature(EnumSet.of(AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools));
         setUnlocalizedName(NameConst.ITEM_WIRELESS_FLUID_PATTERN_TERMINAL);
@@ -39,13 +38,9 @@ public class ItemWirelessPatternTerminal extends ItemBaseWirelessTerminal
     }
 
     @Override
-    public Object getInventory(ItemStack stack, World world, int x, int y, int z, EntityPlayer player) {
-        try {
-            IGridNode gridNode = Util.getWirelessGrid(stack);
-            return new WirelessPatternTerminalInventory(stack, x, gridNode, player);
-        } catch (Exception e) {
-            player.addChatMessage(PlayerMessages.OutOfRange.toChat());
-        }
-        return null;
+    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 new WirelessPatternTerminalGuiObject(wh, is, p, world, x, y, z);
     }
 }

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

@@ -1,8 +1,10 @@
 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.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
@@ -12,7 +14,6 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -20,43 +21,44 @@ import net.minecraftforge.common.util.ForgeDirection;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
 import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.UltraTerminalButtons;
 import com.glodblock.github.common.tabs.FluidCraftingTabs;
 import com.glodblock.github.inventory.InventoryHandler;
 import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.inventory.item.WirelessCraftingTerminalInventory;
-import com.glodblock.github.inventory.item.WirelessFluidTerminalInventory;
-import com.glodblock.github.inventory.item.WirelessInterfaceTerminalInventory;
 import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory;
 import com.glodblock.github.inventory.item.WirelessMagnet;
 import com.glodblock.github.inventory.item.WirelessMagnetCardFilterInventory;
-import com.glodblock.github.inventory.item.WirelessPatternTerminalExInventory;
-import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory;
 import com.glodblock.github.loader.IRegister;
-import com.glodblock.github.network.CPacketSwitchGuis;
 import com.glodblock.github.util.BlockPos;
-import com.glodblock.github.util.ModAndClassUtil;
 import com.glodblock.github.util.NameConst;
+import com.glodblock.github.util.UltraTerminalModes;
 import com.glodblock.github.util.Util;
 
 import appeng.api.AEApi;
+import appeng.api.features.IWirelessTermHandler;
+import appeng.api.implementations.guiobjects.IGuiItem;
+import appeng.api.implementations.guiobjects.IGuiItemObject;
 import appeng.api.networking.IGridNode;
+import appeng.container.AEBaseContainer;
 import appeng.core.features.AEFeature;
 import appeng.core.localization.PlayerMessages;
+import appeng.core.sync.GuiBridge;
+import appeng.helpers.ICustomButtonDataObject;
+import appeng.helpers.ICustomButtonProvider;
+import appeng.helpers.ICustomButtonSource;
+import appeng.items.contents.WirelessCraftingTerminalGuiObject;
+import appeng.items.contents.WirelessInterfaceTerminalGuiObject;
+import appeng.items.contents.WirelessPatternTerminalGuiObject;
 import appeng.util.Platform;
-import baubles.api.BaubleType;
 import baubles.api.BaublesApi;
-import baubles.api.IBauble;
-import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-@Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles")
 public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal
-        implements IBauble, IRegister<ItemWirelessUltraTerminal> {
+        implements IRegister<ItemWirelessUltraTerminal>, IGuiItem, ICustomButtonSource {
 
-    public final static String MODE = "mode_main";
-    private final static List<GuiType> guis = new ArrayList<>();
+    public final static String MODE = "mode";
 
     public ItemWirelessUltraTerminal() {
         super(null);
@@ -64,15 +66,6 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal
         this.setFeature(EnumSet.of(AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools));
         setUnlocalizedName(NameConst.ITEM_WIRELESS_ULTRA_TERMINAL);
         setTextureName(FluidCraft.resource(NameConst.ITEM_WIRELESS_ULTRA_TERMINAL).toString());
-        guis.add(GuiType.WIRELESS_CRAFTING_TERMINAL);
-        guis.add(GuiType.WIRELESS_FLUID_PATTERN_TERMINAL);
-        guis.add(GuiType.WIRELESS_FLUID_PATTERN_TERMINAL_EX);
-        guis.add(GuiType.WIRELESS_FLUID_TERMINAL);
-        guis.add(GuiType.WIRELESS_INTERFACE_TERMINAL);
-        guis.add(GuiType.WIRELESS_LEVEL_TERMINAL);
-        if (ModAndClassUtil.ThE) {
-            guis.add(GuiType.WIRELESS_ESSENTIA_TERMINAL);
-        }
     }
 
     @Override
@@ -89,7 +82,7 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal
         super.addCheckedInformation(stack, player, lines, displayMoreInfo);
         if (isShiftKeyDown()) {
             lines.add(StatCollector.translateToLocal(NameConst.TT_ULTRA_TERMINAL));
-            lines.add(StatCollector.translateToLocal(NameConst.TT_ULTRA_TERMINAL + "." + guiGuiType(stack)));
+            lines.add(StatCollector.translateToLocal(NameConst.TT_ULTRA_TERMINAL + "." + getMode(stack)));
             lines.add(NameConst.i18n(NameConst.TT_ULTRA_TERMINAL_TIPS));
             lines.addAll(Arrays.asList(NameConst.i18n(NameConst.TT_ULTRA_TERMINAL_TIPS_DESC).split("\\\\n")));
         } else {
@@ -99,40 +92,21 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal
 
     @Override
     public String getItemStackDisplayName(ItemStack stack) {
-        return StatCollector.translateToLocalFormatted("item.wireless_ultra_terminal." + guiGuiType(stack) + ".name");
+        return StatCollector.translateToLocalFormatted("item.wireless_ultra_terminal." + getMode(stack) + ".name");
     }
 
     @Override
     public Object getInventory(ItemStack stack, World world, int x, int y, int z, EntityPlayer player) {
         try {
-            IGridNode gridNode = Util.getWirelessGrid(stack);
-            final GuiType gui;
+            final IGridNode gridNode = Util.getWirelessGrid(stack);
+
+            // wireless magnet
             if (Util.GuiHelper.decodeType(y).getLeft() == Util.GuiHelper.GuiType.ITEM && z == -1) {
-                gui = GuiType.WIRELESS_MAGNET_FILTER;
-            } else if (Util.GuiHelper.decodeType(y).getLeft() == Util.GuiHelper.GuiType.ITEM && z > 0) {
-                gui = getGuis().get(Util.GuiHelper.decodeType(y).getRight());
-            } else {
-                gui = readMode(stack);
-            }
-            if (gui == GuiType.WIRELESS_FLUID_PATTERN_TERMINAL) {
-                return new WirelessPatternTerminalInventory(stack, x, gridNode, player);
-            } else if (gui == GuiType.WIRELESS_CRAFTING_TERMINAL) {
-                return new WirelessCraftingTerminalInventory(stack, x, gridNode, player);
-            } else if (ModAndClassUtil.ThE && gui == GuiType.WIRELESS_ESSENTIA_TERMINAL) {
-                return new WirelessFluidTerminalInventory(stack, x, gridNode, player);
-            } else if (gui == GuiType.WIRELESS_FLUID_TERMINAL) {
-                return new WirelessFluidTerminalInventory(stack, x, gridNode, player);
-            } else if (gui == GuiType.WIRELESS_INTERFACE_TERMINAL) {
-                return new WirelessInterfaceTerminalInventory(stack, x, gridNode, player);
-            } else if (gui == GuiType.WIRELESS_LEVEL_TERMINAL) {
-                return new WirelessLevelTerminalInventory(stack, x, gridNode, player);
-            } else if (gui == GuiType.WIRELESS_FLUID_PATTERN_TERMINAL_EX) {
-                return new WirelessPatternTerminalExInventory(stack, x, gridNode, player);
-            } else if (gui == GuiType.WIRELESS_MAGNET_FILTER) {
                 return new WirelessMagnetCardFilterInventory(stack, x, gridNode, player);
-            } else {
-                this.setMode(GuiType.WIRELESS_FLUID_TERMINAL, stack); // set as default mode
-                return new WirelessFluidTerminalInventory(stack, x, gridNode, player);
+            }
+
+            if (z != 0 ? z == UltraTerminalModes.LEVEL.ordinal() : getMode(stack) == UltraTerminalModes.LEVEL) {
+                return new WirelessLevelTerminalInventory(stack, x, gridNode, player);
             }
         } catch (Exception e) {
             player.addChatMessage(PlayerMessages.OutOfRange.toChat());
@@ -141,73 +115,64 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal
     }
 
     @Override
-    public ItemStack onItemRightClick(final ItemStack item, final World w, final EntityPlayer player) {
+    public ItemStack onItemRightClick(final ItemStack is, final World w, final EntityPlayer player) {
         if (player.isSneaking()) {
-            setNext(readMode(item), item);
-            return item;
+            setMode(is, nextEnum(getMode(is)));
+            return is;
         }
-        readMode(item);
-        return super.onItemRightClick(item, w, player);
+        return super.onItemRightClick(is, w, player);
     }
 
-    public static GuiType readMode(ItemStack stack) {
-        NBTTagCompound data = Platform.openNbtData(stack);
-        if (data.hasKey(MODE)) {
-            String GUI = data.getString(MODE);
-            try {
-                return GuiType.valueOf(GUI);
-            } catch (IllegalArgumentException e) {
-                return GuiType.WIRELESS_CRAFTING_TERMINAL;
-            }
-        } else {
-            return GuiType.WIRELESS_CRAFTING_TERMINAL;
+    public void switchTerminal(EntityPlayer player, ImmutablePair<Integer, ItemStack> term, UltraTerminalModes mode) {
+        if (term != null) {
+            final ItemStack terminal = term.getRight();
+            if (terminal == null) return;
+            if (mode != null) setMode(terminal, mode);
+            else mode = getMode(terminal);
+
+            if (AEApi.instance().registries().wireless().performCheck(terminal, player))
+                openGui(terminal, player.worldObj, player, mode, term.getLeft());
         }
     }
 
-    public void setNext(GuiType type, ItemStack stack) {
-        boolean f = false;
-        for (GuiType g : guis) {
-            if (f) {
-                setMode(g.toString(), stack);
+    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);
+
+        switch (mode instanceof UltraTerminalModes utm ? utm : getMode(is)) {
+            case CRAFTING -> aeGui = GuiBridge.GUI_CRAFTING_TERMINAL;
+            case PATTERN -> aeGui = GuiBridge.GUI_PATTERN_TERMINAL;
+            case PATTERN_EX -> aeGui = GuiBridge.GUI_PATTERN_TERMINAL_EX;
+            case INTERFACE -> aeGui = GuiBridge.GUI_INTERFACE_TERMINAL;
+            case LEVEL -> {
+                InventoryHandler.openGui(
+                        player,
+                        w,
+                        new BlockPos(
+                                slot,
+                                0,
+                                player.openContainer instanceof AEBaseContainer abc ? abc.getSwitchAbleGuiNext() : 0),
+                        ForgeDirection.UNKNOWN,
+                        GuiType.WIRELESS_LEVEL_TERMINAL);
                 return;
             }
-            if (g == type) {
-                f = true;
-            }
+            default -> aeGui = GuiBridge.GUI_ME;
         }
-        setMode(guis.get(0).toString(), stack);
+
+        Platform.openGUI(
+                player,
+                null,
+                null,
+                aeGui,
+                invSlotPair.getLeft() == Util.GuiHelper.InvType.PLAYER_INV ? slotIndex
+                        : invSlotPair.getRight() + baublesSlotsOffset);
     }
 
-    public void setMode(String mode, ItemStack stack) {
-        NBTTagCompound data = Platform.openNbtData(stack);
-        data.setString(MODE, mode);
-    }
-
-    public void setMode(GuiType mode, ItemStack stack) {
-        this.setMode(mode.toString(), stack);
-    }
-
-    public static void switchTerminal(EntityPlayer player, GuiType guiType) {
-        ImmutablePair<Integer, ItemStack> term = Util.getUltraWirelessTerm(player);
-        if (term == null) return;
-        if (term.getRight().getItem() instanceof ItemWirelessUltraTerminal) {
-            ((ItemWirelessUltraTerminal) term.getRight().getItem()).setMode(guiType, term.getRight());
-        }
-        if (Platform.isClient()) {
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(guiType, true));
-        } else {
-            InventoryHandler.openGui(
-                    player,
-                    player.worldObj,
-                    new BlockPos(
-                            term.getLeft(),
-                            Util.GuiHelper.encodeType(
-                                    guis.indexOf(GuiType.valueOf(guiType.toString())),
-                                    Util.GuiHelper.GuiType.ITEM),
-                            1),
-                    ForgeDirection.UNKNOWN,
-                    guiType);
-        }
+    @Override
+    public void openGui(final ItemStack is, final World w, final EntityPlayer player, final Object mode) {
+        this.openGui(is, w, player, mode, Integer.MIN_VALUE);
     }
 
     public static boolean hasInfinityBoosterCard(EntityPlayer player) {
@@ -219,20 +184,6 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal
         return false;
     }
 
-    public static List<GuiType> getGuis() {
-        return guis;
-    }
-
-    @Override
-    public GuiType guiGuiType(ItemStack stack) {
-        return readMode(stack);
-    }
-
-    @Override
-    public BaubleType getBaubleType(ItemStack itemStack) {
-        return BaubleType.RING;
-    }
-
     @Override
     public void onWornTick(ItemStack itemStack, EntityLivingBase entityLivingBase) {
         if (Platform.isServer() && entityLivingBase instanceof EntityPlayer player) {
@@ -252,26 +203,6 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal
         }
     }
 
-    @Override
-    public void onEquipped(ItemStack itemStack, EntityLivingBase entityLivingBase) {
-
-    }
-
-    @Override
-    public void onUnequipped(ItemStack itemStack, EntityLivingBase entityLivingBase) {
-
-    }
-
-    @Override
-    public boolean canEquip(ItemStack itemStack, EntityLivingBase entityLivingBase) {
-        return true;
-    }
-
-    @Override
-    public boolean canUnequip(ItemStack itemStack, EntityLivingBase entityLivingBase) {
-        return true;
-    }
-
     @Override
     public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int slot, boolean p_77663_5_) {
         if (entityIn instanceof EntityPlayer player) {
@@ -280,4 +211,21 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal
             }
         }
     }
+
+    @Override
+    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)) {
+            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);
+            default -> super.getGuiObject(is, world, p, x, y, z);
+        };
+    }
+
+    @Override
+    public ICustomButtonDataObject getCustomDataObject(ICustomButtonProvider provider) {
+        return new UltraTerminalButtons();
+    }
 }

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

@@ -1,69 +1,29 @@
 package com.glodblock.github.common.parts;
 
-import static appeng.util.Platform.convertStack;
-import static appeng.util.Platform.stackConvert;
-
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.IIcon;
-import net.minecraftforge.fluids.IFluidHandler;
 
 import com.glodblock.github.client.textures.FCPartsTexture;
-import com.glodblock.github.common.item.ItemFluidDrop;
-import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.common.parts.base.FCSharedFluidBus;
-import com.google.common.collect.ImmutableSet;
+import com.glodblock.github.util.Util;
 
-import appeng.api.config.Actionable;
 import appeng.api.config.FuzzyMode;
-import appeng.api.config.InsertionMode;
-import appeng.api.config.PowerMultiplier;
-import appeng.api.config.RedstoneMode;
-import appeng.api.config.SchedulingMode;
-import appeng.api.config.Settings;
 import appeng.api.config.Upgrades;
-import appeng.api.config.YesNo;
-import appeng.api.networking.IGridNode;
-import appeng.api.networking.crafting.ICraftingGrid;
-import appeng.api.networking.crafting.ICraftingLink;
-import appeng.api.networking.crafting.ICraftingRequester;
 import appeng.api.networking.energy.IEnergyGrid;
-import appeng.api.networking.security.BaseActionSource;
-import appeng.api.networking.security.MachineSource;
-import appeng.api.networking.ticking.TickRateModulation;
-import appeng.api.networking.ticking.TickingRequest;
-import appeng.api.parts.IPartCollisionHelper;
-import appeng.api.parts.IPartRenderHelper;
 import appeng.api.storage.IMEMonitor;
+import appeng.api.storage.StorageName;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
-import appeng.client.texture.CableBusTextures;
-import appeng.core.AELog;
-import appeng.helpers.MultiCraftingTracker;
+import appeng.api.storage.data.IAEStack;
 import appeng.me.GridAccessException;
+import appeng.parts.automation.PartBaseExportBus;
+import appeng.tile.inventory.IAEStackInventory;
 import appeng.util.InventoryAdaptor;
-import appeng.util.Platform;
-import appeng.util.item.AEFluidStack;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
-public class PartFluidExportBus extends FCSharedFluidBus implements ICraftingRequester {
-
-    private final BaseActionSource source;
-    private final MultiCraftingTracker craftingTracker = new MultiCraftingTracker(this, 9);
-    private int nextSlot = 0;
-    private long fluidToSend = 1000;
-    private boolean didSomething;
+public class PartFluidExportBus extends PartBaseExportBus<IAEFluidStack> {
 
     public PartFluidExportBus(ItemStack is) {
         super(is);
-        this.getConfigManager().registerSetting(Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE);
-        this.getConfigManager().registerSetting(Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL);
-        this.getConfigManager().registerSetting(Settings.CRAFT_ONLY, YesNo.NO);
-        this.getConfigManager().registerSetting(Settings.SCHEDULING_MODE, SchedulingMode.DEFAULT);
-        this.source = new MachineSource(this);
     }
 
     @Override
@@ -72,238 +32,63 @@ public class PartFluidExportBus extends FCSharedFluidBus implements ICraftingReq
     }
 
     @Override
-    public TickingRequest getTickingRequest(IGridNode node) {
-        return new TickingRequest(5, 40, this.isSleeping(), false);
+    protected int getAdaptorFlags() {
+        return InventoryAdaptor.DEFAULT & ~InventoryAdaptor.ALLOW_ITEMS;
     }
 
     @Override
-    public TickRateModulation tickingRequest(IGridNode node, int ticksSinceLastCall) {
-        return this.canDoBusWork() ? this.doBusWork() : TickRateModulation.IDLE;
-    }
-
-    @Override
-    protected boolean canDoBusWork() {
-        return this.getProxy().isActive();
-    }
-
-    private int getStartingSlot(final SchedulingMode schedulingMode, final int x) {
-        if (schedulingMode == SchedulingMode.RANDOM) {
-            return Platform.getRandom().nextInt(this.availableSlots());
+    public int calculateAmountToSend() {
+        double amount = 1000D;
+        switch (this.getInstalledUpgrades(Upgrades.SPEED)) {
+            case 4:
+                amount = amount * 1.5;
+            case 3:
+                amount = amount * 2;
+            case 2:
+                amount = amount * 4;
+            case 1:
+                amount = amount * 8;
         }
-
-        if (schedulingMode == SchedulingMode.ROUNDROBIN) {
-            return (this.nextSlot + x) % this.availableSlots();
+        switch (this.getInstalledUpgrades(Upgrades.SUPERSPEED)) {
+            case 4:
+                amount = amount * 8;
+            case 3:
+                amount = amount * 12;
+            case 2:
+                amount = amount * 16;
+            case 1:
+                amount = amount * 32;
         }
-
-        return x;
-    }
-
-    private int availableSlots() {
-        return Math.min(1 + this.getInstalledUpgrades(Upgrades.CAPACITY) * 4, this.getInv().getSizeInventory());
-    }
-
-    private IInventory getInv() {
-        return this.getInventoryByName("config");
+        return (int) Math.floor(amount);
     }
 
     @Override
-    protected TickRateModulation doBusWork() {
-        if (!this.canDoBusWork()) {
-            return TickRateModulation.IDLE;
-        }
-        this.didSomething = false;
-        this.fluidToSend = this.calculateAmountToSend();
-        final TileEntity te = this.getConnectedTE();
-        InventoryAdaptor destination;
-        if (te instanceof IFluidHandler && (destination = this.getHandler(te)) != null) {
-            try {
-                final ICraftingGrid cg = this.getProxy().getCrafting();
-                final IFluidHandler fh = (IFluidHandler) te;
-                final IMEMonitor<IAEFluidStack> inv = this.getProxy().getStorage().getFluidInventory();
-                int i;
-                for (i = 0; i < this.availableSlots() && this.fluidToSend > 0; i++) {
-                    final int slotToExport = this.getStartingSlot(this.getSchedulingMode(), i);
-                    IAEFluidStack fluid = AEFluidStack
-                            .create(ItemFluidPacket.getFluidStack(getInv().getStackInSlot(slotToExport)));
-                    if (fluid != null) {
-                        fluid.setStackSize(this.calculateAmountToSend());
-                        if (this.craftOnly()) {
-                            this.didSomething = this.craftingTracker.handleCrafting(
-                                    i,
-                                    fluid.getStackSize(),
-                                    ItemFluidDrop.newAeStack(fluid),
-                                    destination,
-                                    this.getTile().getWorldObj(),
-                                    this.getProxy().getGrid(),
-                                    cg,
-                                    this.source);
-                            continue;
-                        }
-                        // Find out how much to push
-                        final IAEFluidStack toPush = fluid.copy();
-                        final int amtToInsert = fh.fill(this.getSide().getOpposite(), toPush.getFluidStack(), false);
-                        toPush.setStackSize(amtToInsert);
-                        // Extract from the ME system. This might not be the same amount we actually send...
-                        final IAEFluidStack real = inv.extractItems(toPush, Actionable.MODULATE, this.source);
-                        if (real != null) {
-                            int realInserted = fh.fill(this.getSide().getOpposite(), real.getFluidStack(), true);
-                            if (realInserted < real.getStackSize()) {
-                                // Could not use the entirety of the amount we extracted, so put it back.
-                                // This can result in voiding fluids if there's nowhere for the fluids to go.
-                                fluid.setStackSize(real.getStackSize() - realInserted);
-                                inv.injectItems(fluid, Actionable.MODULATE, this.source);
-                            }
-                            this.fluidToSend -= realInserted;
-                            didSomething = true;
-                        } else if (this.isCraftingEnabled()) {
-                            // If we didn't send anything, try crafting it if we can.
-                            this.didSomething = this.craftingTracker.handleCrafting(
-                                    i,
-                                    fluid.getStackSize(),
-                                    ItemFluidDrop.newAeStack(fluid),
-                                    destination,
-                                    this.getTile().getWorldObj(),
-                                    this.getProxy().getGrid(),
-                                    cg,
-                                    this.source);
-                        }
-                    }
-                }
-                this.updateSchedulingMode(this.getSchedulingMode(), i);
-                return didSomething ? TickRateModulation.FASTER : TickRateModulation.SLOWER;
-            } catch (GridAccessException ignored) {}
-        }
-
-        return TickRateModulation.SLEEP;
-    }
-
-    private void updateSchedulingMode(final SchedulingMode schedulingMode, final int x) {
-        if (schedulingMode == SchedulingMode.ROUNDROBIN) {
-            this.nextSlot = (this.nextSlot + x) % this.availableSlots();
-        }
-    }
-
-    @Override
-    public void getBoxes(final IPartCollisionHelper bch) {
-        bch.addBox(4, 4, 12, 12, 12, 14);
-        bch.addBox(5, 5, 14, 11, 11, 15);
-        bch.addBox(6, 6, 15, 10, 10, 16);
-        bch.addBox(6, 6, 11, 10, 10, 12);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void renderInventory(final IPartRenderHelper rh, final RenderBlocks renderer) {
-        rh.setTexture(
-                CableBusTextures.PartExportSides.getIcon(),
-                CableBusTextures.PartExportSides.getIcon(),
-                CableBusTextures.PartMonitorBack.getIcon(),
-                this.getFaceIcon(),
-                CableBusTextures.PartExportSides.getIcon(),
-                CableBusTextures.PartExportSides.getIcon());
-
-        rh.setBounds(4, 4, 12, 12, 12, 14);
-        rh.renderInventoryBox(renderer);
-
-        rh.setBounds(5, 5, 14, 11, 11, 15);
-        rh.renderInventoryBox(renderer);
-
-        rh.setBounds(6, 6, 15, 10, 10, 16);
-        rh.renderInventoryBox(renderer);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void renderStatic(final int x, final int y, final int z, final IPartRenderHelper rh,
-            final RenderBlocks renderer) {
-        this.setRenderCache(rh.useSimplifiedRendering(x, y, z, this, this.getRenderCache()));
-        rh.setTexture(
-                CableBusTextures.PartExportSides.getIcon(),
-                CableBusTextures.PartExportSides.getIcon(),
-                CableBusTextures.PartMonitorBack.getIcon(),
-                this.getFaceIcon(),
-                CableBusTextures.PartExportSides.getIcon(),
-                CableBusTextures.PartExportSides.getIcon());
-
-        rh.setBounds(4, 4, 12, 12, 12, 14);
-        rh.renderBlock(x, y, z, renderer);
-
-        rh.setBounds(5, 5, 14, 11, 11, 15);
-        rh.renderBlock(x, y, z, renderer);
-
-        rh.setBounds(6, 6, 15, 10, 10, 16);
-        rh.renderBlock(x, y, z, renderer);
-
-        rh.setTexture(
-                CableBusTextures.PartMonitorSidesStatus.getIcon(),
-                CableBusTextures.PartMonitorSidesStatus.getIcon(),
-                CableBusTextures.PartMonitorBack.getIcon(),
-                this.getFaceIcon(),
-                CableBusTextures.PartMonitorSidesStatus.getIcon(),
-                CableBusTextures.PartMonitorSidesStatus.getIcon());
-
-        rh.setBounds(6, 6, 11, 10, 10, 12);
-        rh.renderBlock(x, y, z, renderer);
-
-        this.renderLights(x, y, z, rh, renderer);
-    }
-
-    @Override
-    public RedstoneMode getRSMode() {
-        return (RedstoneMode) this.getConfigManager().getSetting(Settings.REDSTONE_CONTROLLED);
-    }
-
-    public SchedulingMode getSchedulingMode() {
-        return (SchedulingMode) this.getConfigManager().getSetting(Settings.SCHEDULING_MODE);
-    }
-
-    private boolean craftOnly() {
-        return this.getConfigManager().getSetting(Settings.CRAFT_ONLY) == YesNo.YES;
-    }
-
-    private boolean isCraftingEnabled() {
-        return this.getInstalledUpgrades(Upgrades.CRAFTING) > 0;
-    }
-
-    @Override
-    public ImmutableSet<ICraftingLink> getRequestedJobs() {
-        return this.craftingTracker.getRequestedJobs();
-    }
-
-    protected InventoryAdaptor getHandler(TileEntity target) {
-        return target != null ? InventoryAdaptor.getAdaptor(target, getSide().getOpposite()) : null;
-    }
-
-    @Override
-    public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack items, Actionable mode) {
-        final InventoryAdaptor d = this.getHandler(getConnectedTE());
-
+    protected IMEMonitor<IAEFluidStack> getMonitor() {
         try {
-            if (d != null && this.getProxy().isActive()) {
-                final IEnergyGrid energy = this.getProxy().getEnergy();
-                final double power = Math.ceil(items.getStackSize() / 1000D);
-
-                if (energy.extractAEPower(power, mode, PowerMultiplier.CONFIG) > power - 0.01) {
-                    IAEItemStack remaining;
-
-                    if (mode == Actionable.SIMULATE) {
-                        remaining = stackConvert(d.simulateAddStack(convertStack(items), InsertionMode.DEFAULT));
-                    } else {
-                        remaining = stackConvert(d.addStack(convertStack(items), InsertionMode.DEFAULT));
-                    }
-
-                    return remaining;
-                }
-            }
+            return this.getProxy().getStorage().getFluidInventory();
         } catch (final GridAccessException e) {
-            AELog.debug(e);
+            return null;
         }
-
-        return items;
     }
 
     @Override
-    public void jobStateChange(ICraftingLink link) {
-        this.craftingTracker.jobStateChange(link);
+    protected void doFuzzy(IAEFluidStack aes, FuzzyMode fzMode, InventoryAdaptor destination, IEnergyGrid energy,
+            IMEMonitor<IAEFluidStack> gridInv) {}
+
+    @Override
+    protected void doOreDict(InventoryAdaptor destination, IEnergyGrid energy, IMEMonitor<IAEFluidStack> gridInv) {}
+
+    // legacy
+    @Override
+    public void readFromNBT(NBTTagCompound extra) {
+        super.readFromNBT(extra);
+
+        final IAEStackInventory config = this.getAEInventoryByName(StorageName.NONE);
+        for (int i = 0; i < config.getSizeInventory(); i++) {
+            final IAEStack<?> stack = config.getAEStackInSlot(i);
+            if (stack instanceof IAEItemStack ais) {
+                config.putAEStackInSlot(i, Util.getAEFluidFromItem(ais.getItemStack()));
+            }
+        }
     }
 }

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

@@ -1,49 +1,37 @@
 package com.glodblock.github.common.parts;
 
-import net.minecraft.client.renderer.RenderBlocks;
 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.common.item.ItemFluidPacket;
-import com.glodblock.github.common.parts.base.FCSharedFluidBus;
+import com.glodblock.github.util.BlockPos;
+import com.glodblock.github.util.Util;
 
 import appeng.api.config.Actionable;
 import appeng.api.config.FuzzyMode;
-import appeng.api.config.RedstoneMode;
-import appeng.api.config.SchedulingMode;
-import appeng.api.config.Settings;
-import appeng.api.config.YesNo;
-import appeng.api.networking.IGridNode;
-import appeng.api.networking.security.BaseActionSource;
-import appeng.api.networking.security.MachineSource;
-import appeng.api.networking.ticking.TickRateModulation;
-import appeng.api.networking.ticking.TickingRequest;
-import appeng.api.parts.IPartCollisionHelper;
-import appeng.api.parts.IPartRenderHelper;
+import appeng.api.config.Upgrades;
+import appeng.api.networking.energy.IEnergyGrid;
+import appeng.api.networking.energy.IEnergySource;
 import appeng.api.storage.IMEMonitor;
+import appeng.api.storage.StorageName;
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.client.texture.CableBusTextures;
+import appeng.api.storage.data.IAEItemStack;
+import appeng.api.storage.data.IAEStack;
 import appeng.me.GridAccessException;
+import appeng.parts.automation.PartBaseImportBus;
+import appeng.tile.inventory.IAEStackInventory;
 import appeng.util.item.AEFluidStack;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
-public class PartFluidImportBus extends FCSharedFluidBus {
-
-    private final BaseActionSource source;
+public class PartFluidImportBus extends PartBaseImportBus<IAEFluidStack> {
 
     public PartFluidImportBus(ItemStack is) {
         super(is);
-        this.getConfigManager().registerSetting(Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE);
-        this.getConfigManager().registerSetting(Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL);
-        this.getConfigManager().registerSetting(Settings.CRAFT_ONLY, YesNo.NO);
-        this.getConfigManager().registerSetting(Settings.SCHEDULING_MODE, SchedulingMode.DEFAULT);
-        this.source = new MachineSource(this);
     }
 
     @Override
@@ -52,79 +40,108 @@ public class PartFluidImportBus extends FCSharedFluidBus {
     }
 
     @Override
-    public TickingRequest getTickingRequest(IGridNode node) {
-        return new TickingRequest(5, 40, this.isSleeping(), false);
+    protected Object getTarget() {
+        TileEntity self = this.getHost().getTile();
+        return this.getTileEntity(self, (new BlockPos(self)).getOffSet(this.getSide()));
     }
 
-    @Override
-    public TickRateModulation tickingRequest(IGridNode node, int ticksSinceLastCall) {
-        return this.canDoBusWork() ? this.doBusWork() : TickRateModulation.IDLE;
-    }
+    private TileEntity getTileEntity(final TileEntity self, final BlockPos pos) {
+        final World w = self.getWorldObj();
 
-    @Override
-    protected TickRateModulation doBusWork() {
-        if (!this.canDoBusWork()) {
-            return TickRateModulation.IDLE;
+        if (w.getChunkProvider().chunkExists(pos.getX() >> 4, pos.getZ() >> 4)) {
+            return w.getTileEntity(pos.getX(), pos.getY(), pos.getZ());
         }
 
-        final TileEntity te = this.getConnectedTE();
+        return null;
+    }
 
-        if (te instanceof IFluidHandler) {
-            try {
-                final IFluidHandler fh = (IFluidHandler) te;
-                FluidTankInfo[] tanksInfo = fh.getTankInfo(this.getSide().getOpposite());
-                if (tanksInfo == null) {
-                    return TickRateModulation.SLOWER;
+    @Override
+    public int calculateAmountToSend() {
+        double amount = 1000D;
+        switch (this.getInstalledUpgrades(Upgrades.SPEED)) {
+            case 4:
+                amount = amount * 1.5;
+            case 3:
+                amount = amount * 2;
+            case 2:
+                amount = amount * 4;
+            case 1:
+                amount = amount * 8;
+        }
+        switch (this.getInstalledUpgrades(Upgrades.SUPERSPEED)) {
+            case 4:
+                amount = amount * 8;
+            case 3:
+                amount = amount * 12;
+            case 2:
+                amount = amount * 16;
+            case 1:
+                amount = amount * 32;
+        }
+        return (int) Math.floor(amount);
+    }
+
+    @Override
+    protected IMEMonitor<IAEFluidStack> getMonitor() {
+        try {
+            return this.getProxy().getStorage().getFluidInventory();
+        } catch (final GridAccessException e) {
+            return null;
+        }
+    }
+
+    @Override
+    protected boolean importStuff(final Object myTarget, final IAEFluidStack whatToImport,
+            final IMEMonitor<IAEFluidStack> inv, final IEnergySource energy, final FuzzyMode fzMode) {
+        if (myTarget instanceof IFluidHandler fh) {
+            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 = fh.drain(this.getSide().getOpposite(), fluidStack, false);
+                if (this.filterEnabled() && !this.isInFilter(fluidStack)) continue;
+
+                final AEFluidStack aeFluidStack = AEFluidStack.create(fluidStack);
+                if (aeFluidStack != null) {
+                    final IAEFluidStack notInserted = inv.injectItems(aeFluidStack, Actionable.MODULATE, this.mySrc);
+
+                    if (notInserted != null && notInserted.getStackSize() > 0) {
+                        aeFluidStack.decStackSize(notInserted.getStackSize());
+                    }
+
+                    fh.drain(this.getSide().getOpposite(), aeFluidStack.getFluidStack(), true);
+                    maxDrain -= aeFluidStack.getFluidStack().amount;
+                    doBreak = false;
                 }
-
-                final IMEMonitor<IAEFluidStack> inv = this.getProxy().getStorage().getFluidInventory();
-                int maxDrain = this.calculateAmountToSend();
-                boolean drained = false;
-
-                for (FluidTankInfo tankInfo : tanksInfo) {
-                    if (tankInfo.fluid == null) {
-                        continue;
-                    }
-
-                    FluidStack fluidStack = new FluidStack(tankInfo.fluid, Math.min(tankInfo.fluid.amount, maxDrain));
-                    fluidStack = fh.drain(this.getSide().getOpposite(), fluidStack, false);
-                    if (this.filterEnabled() && !this.isInFilter(fluidStack)) {
-                        continue;
-                    }
-
-                    final AEFluidStack aeFluidStack = AEFluidStack.create(fluidStack);
-                    if (aeFluidStack != null) {
-                        final IAEFluidStack notInserted = inv
-                                .injectItems(aeFluidStack, Actionable.MODULATE, this.source);
-
-                        if (notInserted != null && notInserted.getStackSize() > 0) {
-                            aeFluidStack.decStackSize(notInserted.getStackSize());
-                        }
-
-                        fh.drain(this.getSide().getOpposite(), aeFluidStack.getFluidStack(), true);
-                        maxDrain -= aeFluidStack.getFluidStack().amount;
-                        drained = true;
-                    }
-                }
-
-                return drained ? TickRateModulation.FASTER : TickRateModulation.SLOWER;
-            } catch (GridAccessException e) {
-                e.printStackTrace();
             }
+
+            return doBreak;
         }
 
-        return TickRateModulation.SLEEP;
+        return true;
     }
 
     @Override
-    protected boolean canDoBusWork() {
-        return this.getProxy().isActive();
+    protected boolean doOreDict(final Object myTarget, IMEMonitor<IAEFluidStack> inv, IEnergyGrid energy,
+            FuzzyMode fzMode) {
+        return false;
+    }
+
+    @Override
+    protected int getPowerMultiplier() {
+        return 1000;
     }
 
     private boolean isInFilter(FluidStack fluid) {
-        for (int i = 0; i < this.getInventoryByName("config").getSizeInventory(); i++) {
-            final IAEFluidStack stack = AEFluidStack
-                    .create(ItemFluidPacket.getFluidStack(this.getInventoryByName("config").getStackInSlot(i)));
+        final IAEStackInventory inv = this.getAEInventoryByName(StorageName.NONE);
+        for (int i = 0; i < inv.getSizeInventory(); i++) {
+            final IAEFluidStack stack = (IAEFluidStack) inv.getAEStackInSlot(i);
             if (stack != null && stack.getFluidStack().equals(fluid)) {
                 return true;
             }
@@ -133,9 +150,9 @@ public class PartFluidImportBus extends FCSharedFluidBus {
     }
 
     private boolean filterEnabled() {
-        for (int i = 0; i < this.getInventoryByName("config").getSizeInventory(); i++) {
-            final IAEFluidStack stack = AEFluidStack
-                    .create(ItemFluidPacket.getFluidStack(this.getInventoryByName("config").getStackInSlot(i)));
+        final IAEStackInventory inv = this.getAEInventoryByName(StorageName.NONE);
+        for (int i = 0; i < inv.getSizeInventory(); i++) {
+            final IAEFluidStack stack = (IAEFluidStack) inv.getAEStackInSlot(i);
             if (stack != null) {
                 return true;
             }
@@ -143,71 +160,17 @@ public class PartFluidImportBus extends FCSharedFluidBus {
         return false;
     }
 
+    // legacy
     @Override
-    public RedstoneMode getRSMode() {
-        return (RedstoneMode) this.getConfigManager().getSetting(Settings.REDSTONE_CONTROLLED);
-    }
+    public void readFromNBT(NBTTagCompound extra) {
+        super.readFromNBT(extra);
 
-    @Override
-    public void getBoxes(final IPartCollisionHelper bch) {
-        bch.addBox(6, 6, 11, 10, 10, 13);
-        bch.addBox(5, 5, 13, 11, 11, 14);
-        bch.addBox(4, 4, 14, 12, 12, 16);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void renderInventory(final IPartRenderHelper rh, final RenderBlocks renderer) {
-        rh.setTexture(
-                CableBusTextures.PartImportSides.getIcon(),
-                CableBusTextures.PartImportSides.getIcon(),
-                CableBusTextures.PartMonitorBack.getIcon(),
-                this.getFaceIcon(),
-                CableBusTextures.PartImportSides.getIcon(),
-                CableBusTextures.PartImportSides.getIcon());
-
-        rh.setBounds(3, 3, 15, 13, 13, 16);
-        rh.renderInventoryBox(renderer);
-
-        rh.setBounds(4, 4, 14, 12, 12, 15);
-        rh.renderInventoryBox(renderer);
-
-        rh.setBounds(5, 5, 13, 11, 11, 14);
-        rh.renderInventoryBox(renderer);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void renderStatic(final int x, final int y, final int z, final IPartRenderHelper rh,
-            final RenderBlocks renderer) {
-        this.setRenderCache(rh.useSimplifiedRendering(x, y, z, this, this.getRenderCache()));
-        rh.setTexture(
-                CableBusTextures.PartImportSides.getIcon(),
-                CableBusTextures.PartImportSides.getIcon(),
-                CableBusTextures.PartMonitorBack.getIcon(),
-                this.getFaceIcon(),
-                CableBusTextures.PartImportSides.getIcon(),
-                CableBusTextures.PartImportSides.getIcon());
-
-        rh.setBounds(4, 4, 14, 12, 12, 16);
-        rh.renderBlock(x, y, z, renderer);
-
-        rh.setBounds(5, 5, 13, 11, 11, 14);
-        rh.renderBlock(x, y, z, renderer);
-
-        rh.setBounds(6, 6, 12, 10, 10, 13);
-        rh.renderBlock(x, y, z, renderer);
-        rh.setTexture(
-                CableBusTextures.PartMonitorSidesStatus.getIcon(),
-                CableBusTextures.PartMonitorSidesStatus.getIcon(),
-                CableBusTextures.PartMonitorBack.getIcon(),
-                this.getFaceIcon(),
-                CableBusTextures.PartMonitorSidesStatus.getIcon(),
-                CableBusTextures.PartMonitorSidesStatus.getIcon());
-
-        rh.setBounds(6, 6, 11, 10, 10, 12);
-        rh.renderBlock(x, y, z, renderer);
-
-        this.renderLights(x, y, z, rh, renderer);
+        final IAEStackInventory config = this.getAEInventoryByName(StorageName.NONE);
+        for (int i = 0; i < config.getSizeInventory(); i++) {
+            final IAEStack<?> stack = config.getAEStackInSlot(i);
+            if (stack instanceof IAEItemStack ais) {
+                config.putAEStackInSlot(i, Util.getAEFluidFromItem(ais.getItemStack()));
+            }
+        }
     }
 }

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

@@ -1,26 +1,22 @@
 package com.glodblock.github.common.parts;
 
 import java.io.IOException;
-import java.util.Objects;
+import java.util.List;
 
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.client.gui.GuiButton;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.Vec3;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 
-import com.glodblock.github.client.textures.FCPartsTexture;
+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.inventory.InventoryHandler;
-import com.glodblock.github.inventory.gui.GuiType;
-import com.glodblock.github.util.BlockPos;
+import com.glodblock.github.loader.ItemAndBlockHolder;
 import com.glodblock.github.util.DualityFluidInterface;
 import com.glodblock.github.util.Util;
 
@@ -31,86 +27,27 @@ 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.parts.IPartRenderHelper;
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.client.texture.CableBusTextures;
+import appeng.helpers.ICustomButtonDataObject;
+import appeng.helpers.ICustomButtonProvider;
 import appeng.parts.misc.PartInterface;
 import appeng.tile.inventory.AppEngInternalAEInventory;
-import appeng.util.Platform;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 
-public class PartFluidInterface extends PartInterface implements IDualHost {
+public class PartFluidInterface extends PartInterface implements IDualHost, ICustomButtonProvider {
 
     private final AppEngInternalAEInventory config = new AppEngInternalAEInventory(this, 6);
     private final DualityFluidInterface fluidDuality = new DualityFluidInterface(this.getProxy(), this);
 
+    private ICustomButtonDataObject customButtonDataObject;
+
     public PartFluidInterface(ItemStack is) {
         super(is);
-    }
 
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void renderStatic(final int x, final int y, final int z, final IPartRenderHelper rh,
-            final RenderBlocks renderer) {
-        this.setRenderCache(rh.useSimplifiedRendering(x, y, z, this, this.getRenderCache()));
-        rh.setTexture(
-                CableBusTextures.PartMonitorSides.getIcon(),
-                CableBusTextures.PartMonitorSides.getIcon(),
-                CableBusTextures.PartMonitorBack.getIcon(),
-                FCPartsTexture.BlockInterface_Face.getIcon(),
-                CableBusTextures.PartMonitorSides.getIcon(),
-                CableBusTextures.PartMonitorSides.getIcon());
-
-        rh.setBounds(2, 2, 14, 14, 14, 16);
-        rh.renderBlock(x, y, z, renderer);
-
-        rh.setTexture(
-                CableBusTextures.PartMonitorSides.getIcon(),
-                CableBusTextures.PartMonitorSides.getIcon(),
-                CableBusTextures.PartMonitorBack.getIcon(),
-                FCPartsTexture.BlockInterface_Face.getIcon(),
-                CableBusTextures.PartMonitorSides.getIcon(),
-                CableBusTextures.PartMonitorSides.getIcon());
-
-        rh.setBounds(5, 5, 12, 11, 11, 13);
-        rh.renderBlock(x, y, z, renderer);
-
-        rh.setTexture(
-                CableBusTextures.PartMonitorSidesStatus.getIcon(),
-                CableBusTextures.PartMonitorSidesStatus.getIcon(),
-                CableBusTextures.PartMonitorBack.getIcon(),
-                FCPartsTexture.BlockInterface_Face.getIcon(),
-                CableBusTextures.PartMonitorSidesStatus.getIcon(),
-                CableBusTextures.PartMonitorSidesStatus.getIcon());
-
-        rh.setBounds(5, 5, 13, 11, 11, 14);
-        rh.renderBlock(x, y, z, renderer);
-
-        this.renderLights(x, y, z, rh, renderer);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void renderInventory(final IPartRenderHelper rh, final RenderBlocks renderer) {
-        rh.setTexture(
-                CableBusTextures.PartMonitorSides.getIcon(),
-                CableBusTextures.PartMonitorSides.getIcon(),
-                CableBusTextures.PartMonitorBack.getIcon(),
-                FCPartsTexture.BlockInterface_Face.getIcon(),
-                CableBusTextures.PartMonitorSides.getIcon(),
-                CableBusTextures.PartMonitorSides.getIcon());
-
-        rh.setBounds(2, 2, 14, 14, 14, 16);
-        rh.renderInventoryBox(renderer);
-
-        rh.setBounds(5, 5, 12, 11, 11, 13);
-        rh.renderInventoryBox(renderer);
-
-        rh.setBounds(5, 5, 13, 11, 11, 14);
-        rh.renderInventoryBox(renderer);
+        this.customButtonDataObject = new FluidInterfaceButtons(false);
     }
 
     @MENetworkEventSubscribe
@@ -222,22 +159,6 @@ public class PartFluidInterface extends PartInterface implements IDualHost {
         return fluidDuality.getTankInfo(from);
     }
 
-    @Override
-    public boolean onPartActivate(final EntityPlayer player, final Vec3 pos) {
-        if (player.isSneaking()) {
-            return false;
-        }
-        if (Platform.isServer()) {
-            InventoryHandler.openGui(
-                    player,
-                    this.getHost().getTile().getWorldObj(),
-                    new BlockPos(this.getHost().getTile()),
-                    Objects.requireNonNull(this.getSide()),
-                    GuiType.DUAL_INTERFACE);
-        }
-        return true;
-    }
-
     @Override
     public void onFluidInventoryChanged(IAEFluidTank inv, int slot) {
         saveChanges();
@@ -283,4 +204,38 @@ public class PartFluidInterface extends PartInterface implements IDualHost {
             return fluid;
         }
     }
+
+    @Override
+    public ItemStack getPrimaryGuiIcon() {
+        return ItemAndBlockHolder.FLUID_INTERFACE.stack();
+    }
+
+    @Override
+    public void writeCustomButtonData() {}
+
+    @Override
+    public void readCustomButtonData() {}
+
+    @Override
+    public void initCustomButtons(int guiLeft, int guiTop, int xSize, int ySize, int xOffset, int yOffset,
+            List<GuiButton> buttonList) {
+        if (customButtonDataObject != null)
+            customButtonDataObject.initCustomButtons(guiLeft, guiTop, xSize, ySize, xOffset, yOffset, buttonList);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public boolean actionPerformedCustomButtons(final GuiButton btn) {
+        return customButtonDataObject != null && customButtonDataObject.actionPerformedCustomButtons(btn);
+    }
+
+    @Override
+    public ICustomButtonDataObject getDataObject() {
+        return customButtonDataObject;
+    }
+
+    @Override
+    public void setDataObject(ICustomButtonDataObject dataObject) {
+        customButtonDataObject = dataObject;
+    }
 }