Feature: Infinity Water Cell, Energy Card, Q Bridge Card, FDisplay Potion Support, uTerm Auto Stock and Network packet fix

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

@@ -13,7 +13,6 @@
 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;
 
@@ -25,8 +24,6 @@
 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(
@@ -76,6 +73,9 @@ public static void postInit(FMLPostInitializationEvent event) {
         if (!Config.removeRecipe) {
             RecipeLoader.INSTANCE.run();
         }
+        if (Config.testItemRecipe) {
+            RecipeLoader.addTestItem();
+        }
         RecipeLoader.runTerminalRecipe();
 
         if (ModAndClassUtil.isV2) {
@@ -93,16 +93,6 @@ public void onLoadComplete(FMLLoadCompleteEvent event) {
         proxy.onLoadComplete(event);
     }
 
-    @Mod.EventHandler
-    public void onServerStart(FMLServerStartingEvent event) {
-        SPacketMEUpdateBuffer.init();
-    }
-
-    @Mod.EventHandler
-    public void onServerStop(FMLServerStoppedEvent event) {
-        SPacketMEUpdateBuffer.disable();
-    }
-
     @Mod.EventHandler
     public void missingMappings(FMLMissingMappingsEvent event) {
         if (!ModAndClassUtil.EC2 && Config.replaceEC2) {

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

@@ -27,22 +27,21 @@ public GuiFluidMonitor(final InventoryPlayer inventoryPlayer, final ITerminalHos
     }
 
     @Override
-    public void postUpdate(final List<IAEFluidStack> list, boolean resort) {
+    public void postUpdate(final List<IAEFluidStack> list) {
         for (final IAEFluidStack is : list) {
             IAEItemStack stack = AEItemStack.create(ItemFluidDrop.newDisplayStack(is.getFluidStack()));
             stack.setStackSize(is.getStackSize());
             this.repo.postUpdate(stack);
         }
-        if (resort) {
-            this.repo.updateView();
-        }
+        this.repo.updateView();
         this.setScrollBar();
     }
 
     @Override
     public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
         this.fontRendererObj.drawString(this.getGuiDisplayName(GuiText.Terminal.getLocal()), 8, 6, 4210752);
         this.fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752);
+        super.drawFG(offsetX, offsetY, mouseX, mouseY);
     }
 
     @Override

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

@@ -9,6 +9,7 @@
 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.client.gui.widget.GuiFCImgButton;
 import com.glodblock.github.inventory.item.IWirelessTerminal;
 import com.glodblock.github.util.ModAndClassUtil;
 import com.glodblock.github.util.NameConst;

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

@@ -9,8 +9,9 @@
 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.client.gui.widget.GuiFCImgButton;
 import com.glodblock.github.inventory.item.IWirelessTerminal;
-import com.glodblock.github.network.CPacketFluidPatternTermBtns;
+import com.glodblock.github.network.CPacketFluidTerminalBtns;
 import com.glodblock.github.util.ModAndClassUtil;
 import com.glodblock.github.util.NameConst;
 
@@ -219,7 +220,7 @@ public void handleMouseInput() {
 
     private void changeActivePage() {
         FluidCraft.proxy.netHandler.sendToServer(
-                new CPacketFluidPatternTermBtns(
+                new CPacketFluidTerminalBtns(
                         "PatternTerminal.ActivePage",
                         String.valueOf(this.processingScrollBar.getCurrentScroll())));
     }

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

@@ -27,4 +27,9 @@ protected int getMaxRows() {
             return 3;
         }
     }
+
+    @Override
+    protected boolean isPortableCell() {
+        return true;
+    }
 }

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

@@ -11,7 +11,7 @@
 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.network.CPacketFluidTerminalBtns;
 import com.glodblock.github.util.NameConst;
 
 import appeng.api.config.AccessRestriction;
@@ -89,9 +89,9 @@ 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"));
+            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidTerminalBtns("StorageBus.Action", "Partition"));
         } else if (btn == this.clear) {
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("StorageBus.Action", "Clear"));
+            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidTerminalBtns("StorageBus.Action", "Clear"));
         } else if (btn == this.priority) {
             InventoryHandler.switchGui(GuiType.PRIORITY);
         } else if (btn == this.rwMode) {

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

@@ -34,6 +34,7 @@
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.client.gui.base.FCBaseMEGui;
 import com.glodblock.github.client.gui.container.ContainerInterfaceWireless;
+import com.glodblock.github.client.gui.widget.GuiFCImgButton;
 import com.glodblock.github.inventory.item.IWirelessTerminal;
 import com.glodblock.github.network.CPacketRenamer;
 

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

@@ -23,20 +23,19 @@ public GuiItemMonitor(final InventoryPlayer inventoryPlayer, final ITerminalHost
     }
 
     @Override
-    public void postUpdate(final List<IAEItemStack> list, boolean resort) {
+    public void postUpdate(final List<IAEItemStack> list) {
         for (final IAEItemStack is : list) {
             this.repo.postUpdate(is);
         }
-        if (resort) {
-            this.repo.updateView();
-        }
+        this.repo.updateView();
         this.setScrollBar();
     }
 
     @Override
     public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
         this.fontRendererObj.drawString(this.getGuiDisplayName(GuiText.Terminal.getLocal()), 8, 6, 4210752);
         this.fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752);
+        super.drawFG(offsetX, offsetY, mouseX, mouseY);
     }
 
     @Override

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

@@ -22,6 +22,9 @@
 
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.client.gui.container.ContainerLevelMaintainer;
+import com.glodblock.github.client.gui.widget.FCGuiLineField;
+import com.glodblock.github.client.gui.widget.FCGuiTextField;
+import com.glodblock.github.client.gui.widget.GuiFCImgButton;
 import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
 import com.glodblock.github.common.parts.PartLevelTerminal;
 import com.glodblock.github.common.tile.TileLevelMaintainer;

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

@@ -43,6 +43,7 @@
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.client.gui.base.FCBaseMEGui;
 import com.glodblock.github.client.gui.container.ContainerLevelTerminal;
+import com.glodblock.github.client.gui.widget.GuiFCImgButton;
 import com.glodblock.github.common.tile.TileLevelMaintainer.State;
 import com.glodblock.github.common.tile.TileLevelMaintainer.TLMTags;
 import com.glodblock.github.inventory.InventoryHandler;

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

@@ -0,0 +1,180 @@
+package com.glodblock.github.client.gui;
+
+import java.util.List;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.gui.container.ContainerMagnet;
+import com.glodblock.github.client.gui.widget.FCGuiBaseButton;
+import com.glodblock.github.client.gui.widget.GuiFCImgButton;
+import com.glodblock.github.common.item.ItemMagnetCard;
+import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
+import com.glodblock.github.inventory.InventoryHandler;
+import com.glodblock.github.network.CPacketFluidTerminalBtns;
+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.widgets.GuiImgButton;
+import appeng.client.gui.widgets.GuiTabButton;
+
+public class GuiMagnet extends AEBaseMEGui {
+
+    protected FCGuiBaseButton listModeBtn;
+    protected ContainerMagnet container;
+    private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/magnet_filter.png");
+
+    protected Component[] components = new Component[3];
+    protected GuiTabButton originalGuiBtn;
+    protected GuiImgButton clearBtn;
+
+    public GuiMagnet(InventoryPlayer ip, ITerminalHost container) {
+        super(new ContainerMagnet(ip, container));
+        this.xSize = 195;
+        this.ySize = 214;
+        this.container = (ContainerMagnet) this.inventorySlots;
+
+    }
+
+    private static class Component {
+
+        private final GuiFCImgButton enable;
+        private final GuiFCImgButton disable;
+        private final String action;
+
+        private boolean value;
+
+        public Component(int x, int y, boolean value, String action, List<GuiButton> buttons) {
+            this.enable = new GuiFCImgButton(x, y, "ENABLE_12x", "ENABLE", false);
+            this.disable = new GuiFCImgButton(x, y, "DISABLE_12x", "DISABLE", false);
+            this.value = value;
+            this.action = action;
+            buttons.add(this.enable);
+            buttons.add(this.disable);
+        }
+
+        public boolean sameBtn(GuiButton btn) {
+            return btn == this.enable || btn == this.disable;
+        }
+
+        public boolean getValue() {
+            return this.value;
+        }
+
+        public void setValue(boolean value) {
+            this.value = value;
+        }
+
+        public void send() {
+            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidTerminalBtns(this.action, !this.getValue()));
+        }
+
+        public void draw() {
+            this.enable.visible = value;
+            this.disable.visible = !value;
+        }
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void initGui() {
+        super.initGui();
+        this.buttonList.clear();
+
+        this.buttonList.add(
+                this.listModeBtn = new FCGuiBaseButton(
+                        0,
+                        this.guiLeft + 86,
+                        this.guiTop + 4,
+                        64,
+                        14,
+                        NameConst.i18n(
+                                this.container.listMode == ItemMagnetCard.ListMode.WhiteList
+                                        ? NameConst.GUI_MAGNET_CARD_WhiteList
+                                        : NameConst.GUI_MAGNET_CARD_BlackList)));
+        this.components[0] = new Component(
+                this.guiLeft + 156,
+                this.guiTop + 18,
+                this.container.nbt,
+                "WirelessTerminal.magnet.NBT",
+                this.buttonList);
+        this.components[1] = new Component(
+                this.guiLeft + 156,
+                this.guiTop + 31,
+                this.container.meta,
+                "WirelessTerminal.magnet.Meta",
+                this.buttonList);
+        this.components[2] = new Component(
+                this.guiLeft + 156,
+                this.guiTop + 44,
+                this.container.ore,
+                "WirelessTerminal.magnet.Ore",
+                this.buttonList);
+
+        this.buttonList.add(
+                this.originalGuiBtn = new GuiTabButton(
+                        this.guiLeft + this.xSize - 44,
+                        this.guiTop - 4,
+                        this.container.getPortableCell().getItemStack(),
+                        this.container.getPortableCell().getItemStack().getDisplayName(),
+                        itemRender));
+        this.originalGuiBtn.setHideEdge(13); // GuiTabButton implementation //
+
+        this.clearBtn = new GuiImgButton(this.guiLeft + 8, this.guiTop + 48, Settings.ACTIONS, ActionItems.CLOSE);
+        this.clearBtn.setHalfSize(true);
+        this.buttonList.add(this.clearBtn);
+    }
+
+    @Override
+    public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
+        this.fontRendererObj.drawString(getGuiDisplayName(NameConst.i18n(NameConst.GUI_MAGNET_CARD)), 8, 6, 0x404040);
+        this.fontRendererObj
+                .drawString(getGuiDisplayName(NameConst.i18n(NameConst.GUI_MAGNET_CARD_NBT)), 61, 22, 0x404040);
+        this.fontRendererObj
+                .drawString(getGuiDisplayName(NameConst.i18n(NameConst.GUI_MAGNET_CARD_META)), 61, 34, 0x404040);
+        this.fontRendererObj
+                .drawString(getGuiDisplayName(NameConst.i18n(NameConst.GUI_MAGNET_CARD_ORE)), 61, 46, 0x404040);
+        this.components[0].setValue(this.container.nbt);
+        this.components[1].setValue(this.container.meta);
+        this.components[2].setValue(this.container.ore);
+        for (Component c : components) {
+            c.draw();
+        }
+        this.listModeBtn.displayString = NameConst.i18n(
+                this.container.listMode == ItemMagnetCard.ListMode.WhiteList ? NameConst.GUI_MAGNET_CARD_WhiteList
+                        : NameConst.GUI_MAGNET_CARD_BlackList);
+    }
+
+    @Override
+    public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) {
+        mc.getTextureManager().bindTexture(TEX_BG);
+        drawTexturedModalRect(offsetX, offsetY, 0, 0, 176, ySize);
+    }
+
+    @Override
+    protected void actionPerformed(GuiButton btn) {
+        for (Component c : components) {
+            if (c.sameBtn(btn)) {
+                c.send();
+                break;
+            }
+        }
+        if (btn == this.listModeBtn) {
+            FluidCraft.proxy.netHandler.sendToServer(
+                    new CPacketFluidTerminalBtns(
+                            "WirelessTerminal.magnet.FilterMode",
+                            this.container.listMode != ItemMagnetCard.ListMode.WhiteList));
+        } else if (btn == this.originalGuiBtn) {
+            InventoryHandler
+                    .switchGui(ItemWirelessUltraTerminal.readMode(this.container.getPortableCell().getItemStack()));
+        } else if (btn == this.clearBtn) {
+            FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidTerminalBtns("WirelessTerminal.magnet.clear", 1));
+        }
+        super.actionPerformed(btn);
+    }
+}