Cover gui: Right click to open instead take.2

10 files changed, 175 insertions, 115 deletions

diff --git a/src/main/java/gregtech/api/gui/GT_GUICover.java b/src/main/java/gregtech/api/gui/GT_GUICover.java
index 760d888c02..b182f6f6d5 100644
--- a/src/main/java/gregtech/api/gui/GT_GUICover.java
+++ b/src/main/java/gregtech/api/gui/GT_GUICover.java
@@ -1,6 +1,7 @@
 package gregtech.api.gui;
 
 import gregtech.api.enums.Dyes;
+import gregtech.api.gui.widgets.GT_GuiFakeItemButton;
 import gregtech.api.gui.widgets.GT_GuiTooltip;
 import gregtech.api.gui.widgets.GT_GuiTooltipManager;
 import gregtech.api.gui.widgets.GT_GuiTooltipManager.GT_IToolTipRenderer;
@@ -10,6 +11,7 @@ import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
@@ -26,15 +28,20 @@ public abstract class GT_GUICover extends GuiScreen implements GT_IToolTipRender
     protected int guiTop, guiLeft;
     protected boolean drawButtons = true;
     private GuiButton selectedButton;
+    public String header;
+    public GT_GuiFakeItemButton headerIcon;
+
 
     protected List<IGuiElement> elements = new ArrayList<>();
 
     public GT_GUICover() {
     }
 
-    public GT_GUICover(int width, int height) {
+    public GT_GUICover(int width, int height, ItemStack cover) {
         this.gui_width = width;
         this.gui_height = height;
+        this.header = (cover != null) ? cover.getDisplayName() : "";
+        this.headerIcon = new GT_GuiFakeItemButton(this, 5, 5, null).setItem(cover);
     }
 
     @Override
@@ -98,7 +105,9 @@ public abstract class GT_GUICover extends GuiScreen implements GT_IToolTipRender
         drawTexturedModalRect(guiLeft, guiTop, 0,0, gui_width, gui_height);
     }
 
-    public void drawExtras(int mouseX, int mouseY, float parTicks) {}
+    public void drawExtras(int mouseX, int mouseY, float parTicks) {
+        this.fontRendererObj.drawString(header, 25, 9, 0xFF222222);
+    }
 
     @Override
     public boolean doesGuiPauseGame()
diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java
index 25af30965a..db7029d60f 100644
--- a/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java
+++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java
@@ -26,8 +26,9 @@ public class GT_GuiFakeItemButton implements IGuiScreen.IGuiElement {
         gui.addElement(this);
     }
 
-    public void setItem(ItemStack i) {
+    public GT_GuiFakeItemButton setItem(ItemStack i) {
         item = i;
+        return this;
     }
 
     public ItemStack getItem(){
diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java
index bd1e921592..f68962f58f 100644
--- a/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java
+++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java
@@ -56,7 +56,7 @@ public class GT_GuiIconButton extends GuiButton implements IGuiScreen.IGuiElemen
             int x = xPosition;
             int y = yPosition;
             if(!this.field_146123_n) {
-                GL11.glColor4f(160F/255F, 170F/255F, 1, 1);
+                GL11.glColor4f(200F/255F, 210F/255F, 1, 1);
             }
             else
                 GL11.glColor4f(1, 1, 1, 1);
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
index 439da50f24..0b9ec848b1 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
@@ -804,15 +804,6 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
         return hasValidMetaTileEntity() && !isDead;
     }
 
-    public boolean shouldDisplayWrenchGrid(ItemStack heldItem, byte side) {
-        return (getCoverIDAtSide(side) == 0) && (
-                 GT_Utility.isStackInList(heldItem, GregTech_API.sCovers.keySet()) ||
-                 GT_Utility.isStackInList(heldItem, GregTech_API.sCrowbarList) ||
-                 GT_Utility.isStackInList(heldItem, GregTech_API.sWireCutterList) ||
-                 GT_Utility.isStackInList(heldItem, GregTech_API.sScrewdriverList) ||
-                 GT_Utility.isStackInList(heldItem, GregTech_API.sSolderingToolList));
-    }
-
     @Override
     public void doExplosion(long aAmount) {
         if (canAccessData()) {
@@ -841,14 +832,13 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
     @Override
     public boolean onRightclick(EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) {
         if (isClientSide()) {
-            byte tSide = aSide;
-            ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
-
-            if (shouldDisplayWrenchGrid(tCurrentItem, aSide)) {
-                tSide = GT_Utility.determineWrenchingSide(aSide, aX, aY, aZ);
+            //Configure Cover, sneak can also be: screwdriver, wrench, side cutter, soldering iron
+            if (aPlayer.isSneaking()) {
+                byte tSide = (getCoverIDAtSide(aSide) == 0) ? GT_Utility.determineWrenchingSide(aSide, aX, aY, aZ) : aSide;
+                return (getCoverBehaviorAtSide(tSide).hasCoverGUI());
+            } else if (getCoverBehaviorAtSide(aSide).onCoverRightclickClient(aSide, this, aPlayer, aX, aY, aZ)) {
+                return true;
             }
-
-            if (getCoverBehaviorAtSide(tSide).onCoverRightclickClient(tSide, this, aPlayer, aX, aY, aZ)) return true;
         }
         if (isServerSide()) {
             ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
@@ -944,6 +934,10 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
                     }
                 }
             }
+            else if (aPlayer.isSneaking()) { //Sneak click, no tool -> open cover config if possible.
+                aSide = (getCoverIDAtSide(aSide) == 0) ? GT_Utility.determineWrenchingSide(aSide, aX, aY, aZ) : aSide;
+                return getCoverIDAtSide(aSide) > 0 && getCoverBehaviorAtSide(aSide).onCoverShiftRightclick(aSide, getCoverIDAtSide(aSide), getCoverDataAtSide(aSide), this, aPlayer);
+            }
 
             if (getCoverBehaviorAtSide(aSide).onCoverRightclick(aSide, getCoverIDAtSide(aSide), getCoverDataAtSide(aSide), this, aPlayer, aX, aY, aZ))
                 return true;
@@ -953,7 +947,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
             return false;
 
         try {
-            if (hasValidMetaTileEntity()) return mMetaTileEntity.onRightclick(this, aPlayer, aSide, aX, aY, aZ);
+            if (!aPlayer.isSneaking() && hasValidMetaTileEntity()) return mMetaTileEntity.onRightclick(this, aPlayer, aSide, aX, aY, aZ);
         } catch (Throwable e) {
             GT_Log.err.println("Encountered Exception while rightclicking TileEntity, the Game should've crashed now, but I prevented that. Please report immediately to GregTech Intergalactical!!!");
             e.printStackTrace(GT_Log.err);
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 52c010afbd..fa0263c28e 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -1318,19 +1318,17 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
         return (mMuffler ? 1 : 0) + (mLockUpgrade ? 1 : 0) + (mSteamConverter ? 1 : 0) + mOtherUpgrades;
     }
 
-    public boolean shouldDisplayWrenchGrid(ItemStack heldItem, byte side) {
-        return (getCoverIDAtSide(side) == 0) && (
-                GT_Utility.isStackInList(heldItem, GregTech_API.sCovers.keySet()) ||
-                GT_Utility.isStackInList(heldItem, GregTech_API.sCrowbarList) ||
-                GT_Utility.isStackInList(heldItem, GregTech_API.sWireCutterList) ||
-                GT_Utility.isStackInList(heldItem, GregTech_API.sScrewdriverList) ||
-                GT_Utility.isStackInList(heldItem, GregTech_API.sSolderingToolList));
-    }
-
     @Override
     public boolean onRightclick(EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) {
         if (isClientSide()) {
-            if (getCoverBehaviorAtSide(aSide).onCoverRightclickClient(aSide, this, aPlayer, aX, aY, aZ)) return true;
+            //Configure Cover, sneak can also be: screwdriver, wrench, side cutter, soldering iron
+            if (aPlayer.isSneaking()) {
+                byte tSide = (getCoverIDAtSide(aSide) == 0) ? GT_Utility.determineWrenchingSide(aSide, aX, aY, aZ) : aSide;
+                return (getCoverBehaviorAtSide(tSide).hasCoverGUI());
+            } else if (getCoverBehaviorAtSide(aSide).onCoverRightclickClient(aSide, this, aPlayer, aX, aY, aZ)) {
+                return true;
+            }
+
             if (!getCoverBehaviorAtSide(aSide).isGUIClickable(aSide, getCoverIDAtSide(aSide), getCoverDataAtSide(aSide), this))
                 return false;
         }
@@ -1415,7 +1413,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
                     byte tSide = GT_Utility.determineWrenchingSide(aSide, aX, aY, aZ);
                     if (getCoverIDAtSide(tSide) == 0) {
                         if (GregTech_API.sCovers.containsKey(new GT_ItemStack(tCurrentItem))) {
-                            if (GregTech_API.getCoverBehavior(tCurrentItem).isCoverPlaceable(tSide, new GT_ItemStack(tCurrentItem), this) && mMetaTileEntity.allowCoverOnSide(aSide, new GT_ItemStack(tCurrentItem))) {
+                            if (GregTech_API.getCoverBehavior(tCurrentItem).isCoverPlaceable(tSide, new GT_ItemStack(tCurrentItem), this) && mMetaTileEntity.allowCoverOnSide(tSide, new GT_ItemStack(tCurrentItem))) {
                                 setCoverItemAtSide(tSide, tCurrentItem);
                                 if (!aPlayer.capabilities.isCreativeMode) tCurrentItem.stackSize--;
                                 GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(100), 1.0F, -1, xCoord, yCoord, zCoord);
@@ -1432,6 +1430,10 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
                         }
                     }
                 }
+                else if (aPlayer.isSneaking()) { //Sneak click, no tool -> open cover config if possible.
+                    aSide = (getCoverIDAtSide(aSide) == 0) ? GT_Utility.determineWrenchingSide(aSide, aX, aY, aZ) : aSide;
+                    return getCoverIDAtSide(aSide) > 0 && getCoverBehaviorAtSide(aSide).onCoverShiftRightclick(aSide, getCoverIDAtSide(aSide), getCoverDataAtSide(aSide), this, aPlayer);
+                }
 
                 if (getCoverBehaviorAtSide(aSide).onCoverRightclick(aSide, getCoverIDAtSide(aSide), getCoverDataAtSide(aSide), this, aPlayer, aX, aY, aZ))
                     return true;
@@ -1439,7 +1441,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
                 if (!getCoverBehaviorAtSide(aSide).isGUIClickable(aSide, getCoverIDAtSide(aSide), getCoverDataAtSide(aSide), this))
                     return false;
 
-                if (isUpgradable() && aPlayer.inventory.getCurrentItem() != null) {/*
+                if (isUpgradable() && tCurrentItem != null) {/*
                     if (ItemList.Upgrade_SteamEngine.isStackEqual(aPlayer.inventory.getCurrentItem())) {
 						if (addSteamEngineUpgrade()) {
 							GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(3), 1.0F, -1, xCoord, yCoord, zCoord);
@@ -1469,13 +1471,13 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
         }
 
         try {
-            if (hasValidMetaTileEntity()) return mMetaTileEntity.onRightclick(this, aPlayer, aSide, aX, aY, aZ);
+            if (!aPlayer.isSneaking() && hasValidMetaTileEntity()) return mMetaTileEntity.onRightclick(this, aPlayer, aSide, aX, aY, aZ);
         } catch (Throwable e) {
             GT_Log.err.println("Encountered Exception while rightclicking TileEntity, the Game should've crashed now, but I prevented that. Please report immediately to GregTech Intergalactical!!!");
             e.printStackTrace(GT_Log.err);
         }
 
-        return true;
+        return false;
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/util/GT_CoverBehavior.java b/src/main/java/gregtech/api/util/GT_CoverBehavior.java
index 38c01b9d92..c0ad751add 100644
--- a/src/main/java/gregtech/api/util/GT_CoverBehavior.java
+++ b/src/main/java/gregtech/api/util/GT_CoverBehavior.java
@@ -46,14 +46,18 @@ public abstract class GT_CoverBehavior {
      * return the new Value of the Cover Variable
      */
     public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        if (!hasCoverGUI())
-            return aCoverVariable;
+        return aCoverVariable;
+    }
 
-        if(aPlayer instanceof EntityPlayerMP) {
+    /**
+     * Called when someone shift-rightclicks this Cover with no tool. Doesn't call @onCoverRightclick in this Case.
+     */
+    public boolean onCoverShiftRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer) {
+        if(hasCoverGUI() && aPlayer instanceof EntityPlayerMP) {
             GT_Values.NW.sendToPlayer(new GT_Packet_TileEntityCoverGUI(aSide, aCoverID, aCoverVariable, aTileEntity, (EntityPlayerMP) aPlayer), (EntityPlayerMP) aPlayer);
+            return true;
         }
-
-        return aCoverVariable;
+        return false;
     }
 
     public boolean hasCoverGUI() {
diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java
index 9b7bdbfed6..bda1852c31 100644
--- a/src/main/java/gregtech/common/GT_Client.java
+++ b/src/main/java/gregtech/common/GT_Client.java
@@ -130,7 +130,7 @@ public class GT_Client extends GT_Proxy
         });
     }
 
-    private static void drawGrid(DrawBlockHighlightEvent aEvent) {
+    private static void drawGrid(DrawBlockHighlightEvent aEvent, boolean showCoverConnections) {
         GL11.glPushMatrix();
         GL11.glTranslated(-(aEvent.player.lastTickPosX + (aEvent.player.posX - aEvent.player.lastTickPosX) * (double) aEvent.partialTicks), -(aEvent.player.lastTickPosY + (aEvent.player.posY - aEvent.player.lastTickPosY) * (double) aEvent.partialTicks), -(aEvent.player.lastTickPosZ + (aEvent.player.posZ - aEvent.player.lastTickPosZ) * (double) aEvent.partialTicks));
         GL11.glTranslated((float) aEvent.target.blockX + 0.5F, (float) aEvent.target.blockY + 0.5F, (float) aEvent.target.blockZ + 0.5F);
@@ -148,7 +148,20 @@ public class GT_Client extends GT_Proxy
         GL11.glVertex3d(-.25D, .0D, -.50D);
         GL11.glVertex3d(-.25D, .0D, +.50D);
         TileEntity tTile = aEvent.player.worldObj.getTileEntity(aEvent.target.blockX, aEvent.target.blockY, aEvent.target.blockZ);
-        if (tTile instanceof BaseMetaPipeEntity) {
+
+        byte tConnections = 0;
+        if (tTile instanceof ICoverable){
+            if (showCoverConnections) {
+                for (byte i = 0; i < 6; i++) {
+                    if ( ((ICoverable) tTile).getCoverIDAtSide(i) > 0)
+                        tConnections = (byte)(tConnections + (1 << i));
+                }
+            }
+            else if (tTile instanceof BaseMetaPipeEntity)
+                tConnections = ((BaseMetaPipeEntity) tTile).mConnections;
+        }
+
+        if (tConnections>0) {
         	int[][] GridSwitchArr = new int[][]{
             	{0, 5, 3, 1, 2, 4},
             	{5, 0, 1, 3, 2, 4},
@@ -156,8 +169,7 @@ public class GT_Client extends GT_Proxy
             	{3, 1, 5, 0, 2, 4},
             	{4, 2, 3, 1, 0, 5},
             	{2, 4, 3, 1, 5, 0},
-            }; 
-        	int tConnections = ((BaseMetaPipeEntity) tTile).mConnections;
+            };
         	for (byte i = 0; i < 6; i++) {
         		if ((tConnections & (1 << i)) != 0) {
         			switch (GridSwitchArr[aEvent.target.sideHit][i]) {
@@ -441,26 +453,50 @@ public class GT_Client extends GT_Proxy
 
     @SubscribeEvent
     public void onDrawBlockHighlight(DrawBlockHighlightEvent aEvent) {
+        TileEntity aTileEntity = aEvent.player.worldObj.getTileEntity(aEvent.target.blockX, aEvent.target.blockY, aEvent.target.blockZ);
+        if (aTileEntity == null)
+            return;
+        try {
+            Class.forName("codechicken.lib.vec.Rotation");//Whats this do, need to check every frame?
+        } catch (Throwable e) {
+            if (GT_Values.D1) {
+                e.printStackTrace(GT_Log.err);
+            }
+            return;
+        }
+
         if (GT_Utility.isStackValid(aEvent.currentItem)) {
             Block aBlock = aEvent.player.worldObj.getBlock(aEvent.target.blockX, aEvent.target.blockY, aEvent.target.blockZ);
-            TileEntity aTileEntity = aEvent.player.worldObj.getTileEntity(aEvent.target.blockX, aEvent.target.blockY, aEvent.target.blockZ);
-            try {
-                Class.forName("codechicken.lib.vec.Rotation");
-                if ((aTileEntity instanceof BaseMetaPipeEntity) &&  ((BaseMetaPipeEntity) aTileEntity).shouldDisplayWrenchGrid(aEvent.currentItem, (byte) aEvent.target.sideHit)) {
-                    drawGrid(aEvent);
-                    return;
-                }
-                if ((aTileEntity instanceof ITurnable || ROTATABLE_VANILLA_BLOCKS.contains(aBlock) || aTileEntity instanceof IWrenchable) && GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sWrenchList)) {
-                    drawGrid(aEvent);
-                    return;
-                }
-                if (aTileEntity instanceof BaseTileEntity && (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sWireCutterList) || GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sSolderingToolList))) {
-                	drawGrid(aEvent);
-                    return;
-                }
-            } catch (Throwable e) {
-                if (GT_Values.D1) {
-                    e.printStackTrace(GT_Log.err);
+            if (((aTileEntity instanceof BaseMetaPipeEntity)) && (((ICoverable) aTileEntity).getCoverIDAtSide((byte) aEvent.target.sideHit) == 0) && (
+                    GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sCovers.keySet()) ||
+                    GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sCrowbarList) ||
+                    GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sWireCutterList) ||
+                    GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sScrewdriverList)||
+                    GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sSolderingToolList) ))
+            {
+                drawGrid(aEvent, false);
+                return;
+            }
+            if ((aTileEntity instanceof ITurnable || ROTATABLE_VANILLA_BLOCKS.contains(aBlock) || aTileEntity instanceof IWrenchable) &&
+                    GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sWrenchList))
+            {
+                drawGrid(aEvent, false);
+                return;
+            }
+            if (aTileEntity instanceof BaseTileEntity && (
+                    GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sWireCutterList) ||
+                    GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sSolderingToolList)))
+            {
+                drawGrid(aEvent, false);
+                return;
+            }
+        } else if (aEvent.currentItem == null && aEvent.player.isSneaking()) {
+            if (aTileEntity instanceof ICoverable && ((ICoverable) aTileEntity).getCoverIDAtSide((byte) aEvent.target.sideHit) == 0 ){
+                for (byte i = 0; i < 6; i++) {
+                    if(((ICoverable) aTileEntity).getCoverIDAtSide(i) > 0) {
+                        drawGrid(aEvent, true);
+                        return;
+                    }
                 }
             }
         }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
index cc75124a05..0b0d065789 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
@@ -295,7 +295,7 @@ public class GT_Block_Machines
         		if(!GT_Utility.isStackInList(tCurrentItem, GregTech_API.sScrewdriverList) && !GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWrenchList) && !GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWireCutterList) && !GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList)){
         			return false;
         		}
-        	}else {return false;}
+        	}
         }
         if ((tTileEntity instanceof IGregTechTileEntity)) {
             if (((IGregTechTileEntity) tTileEntity).getTimer() < 50L) {
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
index 51db541650..1fcdf9fccf 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
@@ -58,6 +58,21 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehavior {
 
     }
 
+    public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+        int aFilterMode = aCoverVariable & 7;
+        aCoverVariable ^= aFilterMode;
+        aFilterMode = (aFilterMode + (aPlayer.isSneaking()? -1 : 1)) % 8;
+        if (aFilterMode < 0) {
+            aFilterMode = 7;
+        }
+
+        GT_Utility.sendChatToPlayer(aPlayer, getFilterMode(aFilterMode));
+
+        aCoverVariable|=aFilterMode;
+
+        return aCoverVariable;
+    }
+
     public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         //GT_FML_LOGGER.info("rightclick");
         if (
@@ -154,8 +169,8 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehavior {
         private final int coverID;
         private int coverVariable;
         private final ICoverable tile;
-        private GT_GuiFakeItemButton fakeItemButton;
-        protected String header, filterString;
+        private GT_GuiFakeItemButton fluidFilterButton;
+        protected String fluidFilterName;
 
         private final static int startX = 10;
         private final static int startY = 25;
@@ -164,24 +179,21 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehavior {
 
         public GT_FluidFilterGUICover(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
         {
+            super(176, 107, GT_Utility.intToStack(aCoverID));
             this.side = aSide;
             this.coverID = aCoverID;
             this.coverVariable = aCoverVariable;
             this.tile = aTileEntity;
 
-            ItemStack item = GT_Utility.intToStack(aCoverID);
-            this.header = (item != null) ? item.getDisplayName() : "";
-
             GT_GuiIconButton b;
-            b = new GT_GuiIconButton(this, 0, startX + spaceX*0, startY+spaceY*0, GT_GuiIcon.EXPORT).setTooltipText(trans("043","Filter Input"));
-            b = new GT_GuiIconButton(this, 1, startX + spaceX*1, startY+spaceY*0, GT_GuiIcon.IMPORT).setTooltipText(trans("044","Filter Output"));
-            b = new GT_GuiIconButton(this, 2, startX + spaceX*0, startY+spaceY*2, GT_GuiIcon.BLOCK_INPUT).setTooltipText(trans("219", "Block Output"));
-            b = new GT_GuiIconButton(this, 3, startX + spaceX*1, startY+spaceY*2, GT_GuiIcon.ALLOW_INPUT).setTooltipText(trans("220", "Allow Output"));
-            b = new GT_GuiIconButton(this, 4, startX + spaceX*0, startY+spaceY*1, GT_GuiIcon.WHITELIST).setTooltipText(trans("045","Whitelist Fluid"));
-            b = new GT_GuiIconButton(this, 5, startX + spaceX*1, startY+spaceY*1, GT_GuiIcon.BLACKLIST).setTooltipText(trans("046","Blacklist Fluid"));
-
-            new GT_GuiFakeItemButton(this, 5, 5, null).setItem(item);
-            fakeItemButton = new GT_GuiFakeItemButton(this, startX, startY+spaceY*3+2, GT_GuiIcon.SLOT_DARKGRAY);
+            b = new GT_GuiIconButton(this, 0, startX + spaceX*0, startY+spaceY*0, GT_GuiIcon.EXPORT).setTooltipText(trans("232","Filter Input"));
+            b = new GT_GuiIconButton(this, 1, startX + spaceX*1, startY+spaceY*0, GT_GuiIcon.IMPORT).setTooltipText(trans("233","Filter Output"));
+            b = new GT_GuiIconButton(this, 2, startX + spaceX*0, startY+spaceY*2, GT_GuiIcon.BLOCK_INPUT).setTooltipText(trans("234", "Block Output"));
+            b = new GT_GuiIconButton(this, 3, startX + spaceX*1, startY+spaceY*2, GT_GuiIcon.ALLOW_INPUT).setTooltipText(trans("235", "Allow Output"));
+            b = new GT_GuiIconButton(this, 4, startX + spaceX*0, startY+spaceY*1, GT_GuiIcon.WHITELIST).setTooltipText(trans("236","Whitelist Fluid"));
+            b = new GT_GuiIconButton(this, 5, startX + spaceX*1, startY+spaceY*1, GT_GuiIcon.BLACKLIST).setTooltipText(trans("237","Blacklist Fluid"));
+
+            fluidFilterButton = new GT_GuiFakeItemButton(this, startX, startY+spaceY*3+2, GT_GuiIcon.SLOT_DARKGRAY);
         }
 
         private int getNewCoverVariable(int id) {
@@ -217,11 +229,11 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehavior {
 
         @Override
         public void drawExtras(int mouseX, int mouseY, float parTicks) {
-            this.fontRendererObj.drawString(header, 25, 9, 0xFF222222);
-            this.fontRendererObj.drawString(trans("016","Filter Direction" ),   startX + spaceX*2, 3+startY+spaceY*0, 0xFF555555);
-            this.fontRendererObj.drawString(trans("223", "Filter Type"),        startX + spaceX*2, 3+startY+spaceY*1, 0xFF555555);
-            this.fontRendererObj.drawString(trans("017","Block Flow"),          startX + spaceX*2, 3+startY+spaceY*2, 0xFF555555);
-            this.fontRendererObj.drawSplitString(filterString,                                startX + spaceX+3, 4+startY+spaceY*3, gui_width-40 , 0xFF222222);
+            super.drawExtras(mouseX, mouseY, parTicks);
+            this.fontRendererObj.drawString(trans("238","Filter Direction" ),   startX + spaceX*2, 3+startY+spaceY*0, 0xFF555555);
+            this.fontRendererObj.drawString(trans("239", "Filter Type"),        startX + spaceX*2, 3+startY+spaceY*1, 0xFF555555);
+            this.fontRendererObj.drawString(trans("240","Block Flow"),          startX + spaceX*2, 3+startY+spaceY*2, 0xFF555555);
+            this.fontRendererObj.drawSplitString(fluidFilterName,                                startX + spaceX+3, 4+startY+spaceY*3, gui_width-40 , 0xFF222222);
         }
 
         @Override
@@ -260,13 +272,13 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehavior {
             if (f != null) {
                 ItemStack item = GT_Utility.getFluidDisplayStack(f);
                 if (item != null) {
-                    fakeItemButton.setItem(item);
-                    filterString = item.getDisplayName();
+                    fluidFilterButton.setItem(item);
+                    fluidFilterName = item.getDisplayName();
                     return;
                 }
             }
-            fakeItemButton.setItem(null);
-            filterString = trans("224", "Filter Empty");
+            fluidFilterButton.setItem(null);
+            fluidFilterName = trans("224", "Filter Empty");
         }
     }
 }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
index aeca33783b..7b98b18a31 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
@@ -2,7 +2,6 @@ package gregtech.common.covers;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.gui.GT_GUICover;
-import gregtech.api.gui.widgets.GT_GuiFakeItemButton;
 import gregtech.api.gui.widgets.GT_GuiIconButton;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
@@ -11,7 +10,7 @@ import gregtech.api.util.GT_CoverBehavior;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.gui.widgets.GT_GuiIcon;
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.item.ItemStack;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
@@ -21,19 +20,6 @@ public class GT_Cover_Pump
         extends GT_CoverBehavior{
     public final int mTransferRate;
 
-    //  {"006", "Export"},
-    //  {"007", "Import"},
-    //  {"008", "Export (conditional)"},
-    //  {"009", "Import (conditional)"},
-    //  {"010", "Export (invert cond)"},
-    //  {"011", "Import (invert cond)"},
-    //  {"012", "Export allow Input"},
-    //  {"013", "Import allow Output"},
-    //  {"014", "Export allow Input (conditional)"},
-    //  {"015", "Import allow Output (conditional)"},
-    //  {"016", "Export allow Input (invert cond)"},
-    //  {"017", "Import allow Output (invert cond)"},
-
     public GT_Cover_Pump(int aTransferRate) {
         this.mTransferRate = aTransferRate;
     }
@@ -87,6 +73,26 @@ public class GT_Cover_Pump
         return aCoverVariable;
     }
 
+    public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+        aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % 12;
+        if(aCoverVariable <0){aCoverVariable = 11;}
+        switch(aCoverVariable) {
+        case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("006", "Export")); break;
+        case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("007", "Import")); break;
+        case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("008", "Export (conditional)")); break;
+        case 3: GT_Utility.sendChatToPlayer(aPlayer, trans("009", "Import (conditional)")); break;
+        case 4: GT_Utility.sendChatToPlayer(aPlayer, trans("010", "Export (invert cond)")); break;
+        case 5: GT_Utility.sendChatToPlayer(aPlayer, trans("011", "Import (invert cond)")); break;
+        case 6: GT_Utility.sendChatToPlayer(aPlayer, trans("012", "Export allow Input")); break;
+        case 7: GT_Utility.sendChatToPlayer(aPlayer, trans("013", "Import allow Output")); break;
+        case 8: GT_Utility.sendChatToPlayer(aPlayer, trans("014", "Export allow Input (conditional)")); break;
+        case 9: GT_Utility.sendChatToPlayer(aPlayer, trans("015", "Import allow Output (conditional)")); break;
+        case 10: GT_Utility.sendChatToPlayer(aPlayer, trans("016", "Export allow Input (invert cond)")); break;
+        case 11: GT_Utility.sendChatToPlayer(aPlayer, trans("017", "Import allow Output (invert cond)")); break;
+        }
+        return aCoverVariable;
+    }
+
     public boolean letsRedstoneGoIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
         return true;
     }
@@ -156,7 +162,6 @@ public class GT_Cover_Pump
         private final int coverID;
         private int coverVariable;
         private final ICoverable tile;
-        protected String header;
 
         private final static int startX = 10;
         private final static int startY = 25;
@@ -164,31 +169,28 @@ public class GT_Cover_Pump
         private final static int spaceY = 18;
 
         public GT_PumpGUICover(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+            super(176, 107, GT_Utility.intToStack(aCoverID));
             this.side = aSide;
             this.coverID = aCoverID;
             this.coverVariable = aCoverVariable;
             this.tile = aTileEntity;
 
-            ItemStack item = GT_Utility.intToStack(aCoverID);
-            this.header = (item != null) ? item.getDisplayName() : "";
-            new GT_GuiFakeItemButton(this, 5, 5, null).setItem(item);
-
             GT_GuiIconButton b;
             b = new GT_GuiIconButton(this, 0, startX + spaceX*0, startY+spaceY*0, GT_GuiIcon.EXPORT).setTooltipText(trans("006","Export"));
             b = new GT_GuiIconButton(this, 1, startX + spaceX*1, startY+spaceY*0, GT_GuiIcon.IMPORT).setTooltipText(trans("007","Import"));
-            b = new GT_GuiIconButton(this, 2, startX + spaceX*0, startY+spaceY*1, GT_GuiIcon.CHECKMARK).setTooltipText(trans("008","Ignore"));
-            b = new GT_GuiIconButton(this, 3, startX + spaceX*1, startY+spaceY*1, GT_GuiIcon.REDSTONE_ON).setTooltipText(trans("009","Conditional"));
-            b = new GT_GuiIconButton(this, 4, startX + spaceX*2, startY+spaceY*1, GT_GuiIcon.REDSTONE_OFF).setTooltipText(trans("010","Invert Condition"));
-            b = new GT_GuiIconButton(this, 5, startX + spaceX*0, startY+spaceY*2, GT_GuiIcon.ALLOW_INPUT).setTooltipText(trans("011","Allow Input"));
-            b = new GT_GuiIconButton(this, 6, startX + spaceX*1, startY+spaceY*2, GT_GuiIcon.BLOCK_INPUT).setTooltipText(trans("012","Block Input"));
+            b = new GT_GuiIconButton(this, 2, startX + spaceX*0, startY+spaceY*1, GT_GuiIcon.CHECKMARK).setTooltipText(trans("224","Ignore"));
+            b = new GT_GuiIconButton(this, 3, startX + spaceX*1, startY+spaceY*1, GT_GuiIcon.REDSTONE_ON).setTooltipText(trans("225","Conditional"));
+            b = new GT_GuiIconButton(this, 4, startX + spaceX*2, startY+spaceY*1, GT_GuiIcon.REDSTONE_OFF).setTooltipText(trans("226","Invert Condition"));
+            b = new GT_GuiIconButton(this, 5, startX + spaceX*0, startY+spaceY*2, GT_GuiIcon.ALLOW_INPUT).setTooltipText(trans("227","Allow Input"));
+            b = new GT_GuiIconButton(this, 6, startX + spaceX*1, startY+spaceY*2, GT_GuiIcon.BLOCK_INPUT).setTooltipText(trans("228","Block Input"));
         }
 
         @Override
         public void drawExtras(int mouseX, int mouseY, float parTicks) {
-            this.fontRendererObj.drawString(header, 25, 9, 0xFF222222);
-            this.fontRendererObj.drawString(trans("013","Import/Export" ),  startX + spaceX*3, 3+startY+spaceY*0, 0xFF555555);
-            this.fontRendererObj.drawString(trans("014","Conditional"),     startX + spaceX*3, 3+startY+spaceY*1, 0xFF555555);
-            this.fontRendererObj.drawString(trans("015", "Enable Input"),   startX + spaceX*3, 3+startY+spaceY*2, 0xFF555555);
+            super.drawExtras(mouseX, mouseY, parTicks);
+            this.fontRendererObj.drawString(trans("229","Import/Export" ),  startX + spaceX*3, 3+startY+spaceY*0, 0xFF555555);
+            this.fontRendererObj.drawString(trans("230","Conditional"),     startX + spaceX*3, 3+startY+spaceY*1, 0xFF555555);
+            this.fontRendererObj.drawString(trans("231", "Enable Input"),   startX + spaceX*3, 3+startY+spaceY*2, 0xFF555555);
         }
 
         @Override