Merge pull request #1 from Blood-Asp/experimental

Update from orig

25 files changed, 505 insertions, 55 deletions

diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index ddd2179478..c0a55e3655 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -34,7 +34,6 @@ import gregtech.common.items.armor.GuiElectricArmor1;
 import gregtech.common.items.armor.GuiModularArmor;
 import gregtech.common.items.armor.InventoryArmor;
 import gregtech.common.items.armor.ModularArmor_Item;
-import gregtech.api.enums.TC_Aspects;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
@@ -168,6 +167,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
     public boolean mChangeHarvestLevels=false;
     public boolean mNerfedCombs = true;
     public int mWireHeatingTicks = 4;
+    public boolean mHideUnusedOres = true;
+    public boolean mHideRecyclingRecipes = true;
 
     public GT_Proxy() {
         GameRegistry.registerFuelHandler(this);
@@ -571,6 +572,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
                     GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), tBits, new Object[]{"PhP", "SRf", "PdP",
                             Character.valueOf('P'), aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plate.get(aMaterial),
                             Character.valueOf('R'), OrePrefixes.ring.get(aMaterial), Character.valueOf('S'), OrePrefixes.screw.get(aMaterial)});
+                    GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), Materials.Tin.getMolten(32), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), 240, 24);
+                    GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), Materials.Lead.getMolten(48), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), 240, 24);
+                    GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), Materials.SolderingAlloy.getMolten(16), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), 240, 24);
                     GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), tBits,
                             new Object[]{"sf", "G ", Character.valueOf('G'), OrePrefixes.gemFlawless.get(aMaterial)});
                     GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 2L), tBits,
diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java
index 40175f7d28..74dd9d5788 100644
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/src/main/java/gregtech/common/GT_RecipeAdder.java
@@ -114,8 +114,13 @@ public class GT_RecipeAdder
         new GT_Recipe(aInput1, aEUt, aInput2, aDuration, aOutput1, aOutput2);
         return true;
     }
+    
+	@Override
+	public boolean addAlloySmelterRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt) {
+		return addAlloySmelterRecipe(aInput1, aInput2, aOutput1, aDuration, aEUt, false);
+	}
 
-    public boolean addAlloySmelterRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt) {
+    public boolean addAlloySmelterRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt, boolean hidden) {
         if ((aInput1 == null) || (aOutput1 == null || Materials.Graphite.contains(aInput1))) {
             return false;
         }
@@ -125,7 +130,10 @@ public class GT_RecipeAdder
         if ((aDuration = GregTech_API.sRecipeFile.get("alloysmelting", aInput2 == null ? aInput1 : aOutput1, aDuration)) <= 0) {
             return false;
         }
-        new GT_Recipe(aInput1, aInput2, aEUt, aDuration, aOutput1);
+        GT_Recipe tRecipe =new GT_Recipe(aInput1, aInput2, aEUt, aDuration, aOutput1);
+         if ((hidden) && (tRecipe != null)) {
+            tRecipe.mHidden = true;
+        }
         return true;
     }
 
@@ -267,7 +275,7 @@ public class GT_RecipeAdder
         if(tGunpowder<65){
         	GT_Recipe.GT_Recipe_Map.sImplosionRecipes.addRecipe(true, new ItemStack[]{aInput1, ItemList.Block_Powderbarrel.get(tGunpowder, new Object[0])}, new ItemStack[]{aOutput1, aOutput2}, null, null, null, null, 20, 30, 0);
         }
-        if(tDynamite<65){
+        if(tDynamite<17){
         	GT_Recipe.GT_Recipe_Map.sImplosionRecipes.addRecipe(true, new ItemStack[]{aInput1, GT_ModHandler.getIC2Item("dynamite", tDynamite, null)}, new ItemStack[]{aOutput1, aOutput2}, null, null, null, null, 20, 30, 0);
         }
         GT_Recipe.GT_Recipe_Map.sImplosionRecipes.addRecipe(true, new ItemStack[]{aInput1, new ItemStack(Blocks.tnt,tTNT)}, new ItemStack[]{aOutput1, aOutput2}, null, null, null, null, 20, 30, 0);
@@ -464,8 +472,13 @@ public class GT_RecipeAdder
         GT_Recipe.GT_Recipe_Map.sFluidSolidficationRecipes.addRecipe(true, new ItemStack[]{aMold}, new ItemStack[]{aOutput}, null, new FluidStack[]{aInput}, null, aDuration, aEUt, 0);
         return true;
     }
+    
+	@Override
+	public boolean addFluidSmelterRecipe(ItemStack aInput, ItemStack aRemains, FluidStack aOutput, int aChance, int aDuration, int aEUt) {
+		return addFluidSmelterRecipe(aInput, aRemains, aOutput, aChance, aDuration, aEUt, false);
+	}
 
-    public boolean addFluidSmelterRecipe(ItemStack aInput, ItemStack aRemains, FluidStack aOutput, int aChance, int aDuration, int aEUt) {
+    public boolean addFluidSmelterRecipe(ItemStack aInput, ItemStack aRemains, FluidStack aOutput, int aChance, int aDuration, int aEUt, boolean hidden) {
         if ((aInput == null) || (aOutput == null)) {
             return false;
         }
@@ -478,7 +491,10 @@ public class GT_RecipeAdder
         if ((aDuration = GregTech_API.sRecipeFile.get("fluidsmelter", aInput, aDuration)) <= 0) {
             return false;
         }
-        GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aRemains}, null, new int[]{aChance}, null, new FluidStack[]{aOutput}, aDuration, aEUt, 0);
+        GT_Recipe tRecipe =GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aRemains}, null, new int[]{aChance}, null, new FluidStack[]{aOutput}, aDuration, aEUt, 0);
+        if ((hidden) && (tRecipe != null)) {
+           tRecipe.mHidden = true;
+        }
         return true;
     }
 
@@ -619,8 +635,14 @@ public class GT_RecipeAdder
         }
         return false;
     }
+    
+
+	@Override
+	public boolean addArcFurnaceRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt) {
+		return addArcFurnaceRecipe(aInput, aOutputs, aChances, aDuration, aEUt,	false);
+	}
 
-    public boolean addArcFurnaceRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt) {
+    public boolean addArcFurnaceRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt,	boolean hidden) {
         if ((aInput == null) || (aOutputs == null)) {
             return false;
         }
@@ -629,11 +651,17 @@ public class GT_RecipeAdder
                 if ((aDuration = GregTech_API.sRecipeFile.get("arcfurnace", aInput, aDuration)) <= 0) {
                     return false;
                 }
-                GT_Recipe.GT_Recipe_Map.sArcFurnaceRecipes.addRecipe(true, new ItemStack[]{aInput}, aOutputs, null, aChances, new FluidStack[]{Materials.Oxygen.getGas(aDuration)}, null, Math.max(1, aDuration), Math.max(1, aEUt), 0);
+                GT_Recipe sRecipe = GT_Recipe.GT_Recipe_Map.sArcFurnaceRecipes.addRecipe(true, new ItemStack[]{aInput}, aOutputs, null, aChances, new FluidStack[]{Materials.Oxygen.getGas(aDuration)}, null, Math.max(1, aDuration), Math.max(1, aEUt), 0);
+                if ((hidden) && (sRecipe != null)) {
+                   sRecipe.mHidden = true;
+                }
                 for (Materials tMaterial : new Materials[]{Materials.Argon, Materials.Nitrogen}) {
                     if (tMaterial.mPlasma != null) {
                         int tPlasmaAmount = (int) Math.max(1L, aDuration / (tMaterial.getMass() * 16L));
-                        GT_Recipe.GT_Recipe_Map.sPlasmaArcFurnaceRecipes.addRecipe(true, new ItemStack[]{aInput}, aOutputs, null, aChances, new FluidStack[]{tMaterial.getPlasma(tPlasmaAmount)}, new FluidStack[]{tMaterial.getGas(tPlasmaAmount)}, Math.max(1, aDuration / 16), Math.max(1, aEUt / 3), 0);
+                        GT_Recipe tRecipe =GT_Recipe.GT_Recipe_Map.sPlasmaArcFurnaceRecipes.addRecipe(true, new ItemStack[]{aInput}, aOutputs, null, aChances, new FluidStack[]{tMaterial.getPlasma(tPlasmaAmount)}, new FluidStack[]{tMaterial.getGas(tPlasmaAmount)}, Math.max(1, aDuration / 16), Math.max(1, aEUt / 3), 0);
+                        if ((hidden) && (tRecipe != null)) {
+                           tRecipe.mHidden = true;
+                        }
                     }
                 }
                 return true;
@@ -689,8 +717,14 @@ public class GT_RecipeAdder
         }
         return false;
     }
+    
 
-    public boolean addPulveriserRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt) {
+	@Override
+	public boolean addPulveriserRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt) {
+		return addPulveriserRecipe(aInput, aOutputs, aChances, aDuration, aEUt, false);
+	}
+
+    public boolean addPulveriserRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt, boolean hidden) {
         if ((aInput == null) || (aOutputs == null)) {
             return false;
         }
@@ -699,7 +733,10 @@ public class GT_RecipeAdder
                 if ((aDuration = GregTech_API.sRecipeFile.get("pulveriser", aInput, aDuration)) <= 0) {
                     return false;
                 }
-                GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.addRecipe(true, new ItemStack[]{aInput}, aOutputs, null, aChances, null, null, aDuration, aEUt, 0);
+                GT_Recipe tRecipe =GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.addRecipe(true, new ItemStack[]{aInput}, aOutputs, null, aChances, null, null, aDuration, aEUt, 0);
+                if ((hidden) && (tRecipe != null)) {
+                   tRecipe.mHidden = true;
+                }
                 return true;
             }
         }
@@ -732,4 +769,7 @@ public class GT_RecipeAdder
         return true;
     }
 
+
+
+
 }
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 40edbaf306..2793130d91 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
@@ -256,9 +256,17 @@ public class GT_Block_Machines
 

     public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float par1, float par2, float par3) {

         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

-        if ((tTileEntity == null) || (aPlayer.isSneaking())) {

+        if (tTileEntity == null) {

             return false;

         }

+        if(aPlayer.isSneaking()){

+        	ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();

+        	if(tCurrentItem!=null){

+        		if(!GT_Utility.isStackInList(tCurrentItem, GregTech_API.sScrewdriverList)){

+        			return false;

+        		}

+        	}else {return false;}

+        }

         if ((tTileEntity instanceof IGregTechTileEntity)) {

             if (((IGregTechTileEntity) tTileEntity).getTimer() < 50L) {

                 return false;

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores.java
index df1a4ba6bd..07be0e3132 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores.java
@@ -1,7 +1,9 @@
 package gregtech.common.blocks;
 
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -40,6 +42,7 @@ public class GT_Block_Ores
         this.isBlockContainer = true;
         setStepSound(soundTypeStone);
         setCreativeTab(GregTech_API.TAB_GREGTECH_ORES);
+        boolean tHideOres = Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres;
         for (int i = 0; i < 16; i++) {
             GT_ModHandler.addValuableOre(this, i, 1);
         }
@@ -60,8 +63,19 @@ public class GT_Block_Ores
                     GT_OreDictUnificator.registerOre(OrePrefixes.oreNetherrack.get(GregTech_API.sGeneratedMaterials[i]), new ItemStack(this, 1, i + 1000));
                     GT_OreDictUnificator.registerOre(OrePrefixes.oreEndstone.get(GregTech_API.sGeneratedMaterials[i]), new ItemStack(this, 1, i + 2000));
                     GT_OreDictUnificator.registerOre(OrePrefixes.oreBlackgranite.get(GregTech_API.sGeneratedMaterials[i]), new ItemStack(this, 1, i + 3000));
-                    GT_OreDictUnificator.registerOre(OrePrefixes.oreRedgranite.get(GregTech_API.sGeneratedMaterials[i]), new ItemStack(this, 1, i + 4000));
+                    GT_OreDictUnificator.registerOre(OrePrefixes.oreRedgranite.get(GregTech_API.sGeneratedMaterials[i]), new ItemStack(this, 1, i + 4000));       	
+                if (tHideOres) {
+                    codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 1000));
+                    codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 2000));
+                    codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 3000));
+                    codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 4000));
+                    codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 16000));
+                    codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 17000));
+                    codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 18000));
+                    codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 19000));
+                    codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + 20000));
                 }
+                }         
             }
         }
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
new file mode 100644
index 0000000000..e0057cf1a8
--- /dev/null
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
@@ -0,0 +1,129 @@
+package gregtech.common.covers;
+
+import gregtech.api.interfaces.tileentity.ICoverable;
+import gregtech.api.interfaces.tileentity.IMachineProgress;
+import gregtech.api.util.GT_CoverBehavior;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidHandler;
+
+public class GT_Cover_FluidRegulator
+        extends GT_CoverBehavior {
+    public final int mTransferRate;
+
+    public GT_Cover_FluidRegulator(int aTransferRate) {
+        this.mTransferRate = aTransferRate;
+    }
+
+    public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {
+    	if(aCoverVariable==0){return aCoverVariable;}
+        if ((aTileEntity instanceof IFluidHandler)) {
+            IFluidHandler tTank2 = aTileEntity.getITankContainerAtSide(aSide);
+            if (tTank2 != null) {
+                IFluidHandler tTank1 = (IFluidHandler) aTileEntity;
+                if (aCoverVariable >0) {
+                    FluidStack tLiquid = tTank1.drain(ForgeDirection.getOrientation(aSide), aCoverVariable, false);
+                    if (tLiquid != null) {
+                        tLiquid = tLiquid.copy();
+                        tLiquid.amount = tTank2.fill(ForgeDirection.getOrientation(aSide).getOpposite(), tLiquid, false);
+                        if (tLiquid.amount > 0) {
+                            if (aTileEntity.getUniversalEnergyCapacity() >= Math.min(1, tLiquid.amount / 10)) {
+                                if (aTileEntity.isUniversalEnergyStored(Math.min(1, tLiquid.amount / 10))) {
+                                    aTileEntity.decreaseStoredEnergyUnits(Math.min(1, tLiquid.amount / 10), true);
+                                    tTank2.fill(ForgeDirection.getOrientation(aSide).getOpposite(), tTank1.drain(ForgeDirection.getOrientation(aSide), tLiquid.amount, true), true);
+                                }
+                            } else {
+                                tTank2.fill(ForgeDirection.getOrientation(aSide).getOpposite(), tTank1.drain(ForgeDirection.getOrientation(aSide), tLiquid.amount, true), true);
+                            }
+                        }
+                    }
+                } else {
+                    FluidStack tLiquid = tTank2.drain(ForgeDirection.getOrientation(aSide).getOpposite(), Math.abs(aCoverVariable), false);
+                    if (tLiquid != null) {
+                        tLiquid = tLiquid.copy();
+                        tLiquid.amount = tTank1.fill(ForgeDirection.getOrientation(aSide), tLiquid, false);
+                        if (tLiquid.amount > 0) {
+                            if (aTileEntity.getUniversalEnergyCapacity() >= Math.min(1, tLiquid.amount / 10)) {
+                                if (aTileEntity.isUniversalEnergyStored(Math.min(1, tLiquid.amount / 10))) {
+                                    aTileEntity.decreaseStoredEnergyUnits(Math.min(1, tLiquid.amount / 10), true);
+                                    tTank1.fill(ForgeDirection.getOrientation(aSide), tTank2.drain(ForgeDirection.getOrientation(aSide).getOpposite(), tLiquid.amount, true), true);
+                                }
+                            } else {
+                                tTank1.fill(ForgeDirection.getOrientation(aSide), tTank2.drain(ForgeDirection.getOrientation(aSide).getOpposite(), tLiquid.amount, true), true);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return aCoverVariable;
+    }
+
+    public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+        if (GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ)[0] >= 0.5F) {
+            aCoverVariable += 16;
+        } else {
+            aCoverVariable -= 16;
+        }
+        if(aCoverVariable>mTransferRate){aCoverVariable=mTransferRate;}
+        if(aCoverVariable<(0-mTransferRate)){aCoverVariable=(0-mTransferRate);}
+        GT_Utility.sendChatToPlayer(aPlayer, "Pump speed: "+aCoverVariable+"L/tick "+aCoverVariable*20+"L/sec");
+        return aCoverVariable;
+    }
+
+    public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+        if (GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ)[0] >= 0.5F) {
+            aCoverVariable++;
+        } else {
+            aCoverVariable--;
+        }
+        if(aCoverVariable>mTransferRate){aCoverVariable=mTransferRate;}
+        if(aCoverVariable<(0-mTransferRate)){aCoverVariable=(0-mTransferRate);}
+        GT_Utility.sendChatToPlayer(aPlayer, "Pump speed: "+aCoverVariable+"L/tick "+aCoverVariable*20+"L/sec");
+        aTileEntity.setCoverDataAtSide(aSide, aCoverVariable);
+        return true;
+    }
+
+    public boolean letsRedstoneGoIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        return true;
+    }
+
+    public boolean letsRedstoneGoOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        return true;
+    }
+
+    public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        return true;
+    }
+
+    public boolean letsEnergyOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        return true;
+    }
+
+    public boolean letsItemsIn(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) {
+        return true;
+    }
+
+    public boolean letsItemsOut(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) {
+        return true;
+    }
+
+    public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
+    	return false;
+    }
+
+    public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
+    	return false;
+    }
+
+    public boolean alwaysLookConnected(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        return true;
+    }
+
+    public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        return 1;
+    }
+}
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
new file mode 100644
index 0000000000..0c8740a386
--- /dev/null
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
@@ -0,0 +1,72 @@
+package gregtech.common.covers;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.interfaces.tileentity.ICoverable;
+import gregtech.api.interfaces.tileentity.IMachineProgress;
+import gregtech.api.objects.ItemData;
+import gregtech.api.util.GT_CoverBehavior;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTankInfo;
+import net.minecraftforge.fluids.IFluidContainerItem;
+import net.minecraftforge.fluids.IFluidHandler;
+
+public class GT_Cover_Fluidfilter
+        extends GT_CoverBehavior {
+    public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {
+        return aCoverVariable;
+    }
+
+    public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+       System.out.println("rightclick");
+    	if (((aX > 0.375D) && (aX < 0.625D)) || ((aSide > 3) && (((aY > 0.375D) && (aY < 0.625D)) || ((aSide < 2) && (((aZ > 0.375D) && (aZ < 0.625D)) || (aSide == 2) || (aSide == 3)))))) {
+            ItemStack tStack = aPlayer.inventory.getCurrentItem();
+            if(tStack!=null){
+            FluidStack tFluid = FluidContainerRegistry.getFluidForFilledItem(tStack);
+            if(tFluid!=null){
+            	System.out.println(tFluid.getLocalizedName()+" "+tFluid.getFluidID());
+            	aCoverVariable = tFluid.getFluidID();
+            aTileEntity.setCoverDataAtSide(aSide, aCoverVariable);
+        	FluidStack sFluid = new FluidStack(FluidRegistry.getFluid(aCoverVariable),1000);
+            GT_Utility.sendChatToPlayer(aPlayer, "Filter Fluid: " + sFluid.getLocalizedName());
+            }else if(tStack.getItem() instanceof IFluidContainerItem){
+            	IFluidContainerItem tContainer = (IFluidContainerItem)tStack.getItem();
+            	aCoverVariable = tContainer.getFluid(tStack).getFluidID();
+            	System.out.println("fluidcontainer " + aCoverVariable);
+            	FluidStack sFluid = new FluidStack(FluidRegistry.getFluid(aCoverVariable),1000);
+            	GT_Utility.sendChatToPlayer(aPlayer, "Filter Fluid: " + sFluid.getLocalizedName());
+            }
+            }
+            return true;
+        }
+        return false;
+    }
+    
+    @Override
+    public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
+    	if(aFluid==null){return true;}
+    	return aFluid.getID() == aCoverVariable;
+    }
+    
+    @Override
+    public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
+    	if(aFluid==null) return false;
+    	return aFluid.getID() == aCoverVariable;
+    }
+    
+    public boolean alwaysLookConnected(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        return true;
+    }
+
+    public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        return 0;
+    }
+}
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
index 33722e64e1..9768c7b5db 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
@@ -28,16 +28,15 @@ public class GT_Cover_ItemMeter
             }

         }

         tAll /= 14;

-        if (tAll > 0) {

-            aTileEntity.setOutputRedstoneSignal(aSide, aCoverVariable != 1 ? 0 : tFull > 0 ? (byte) (tFull / tAll + 1) : (byte) (15 - (tFull > 0 ? tFull / tAll + 1 : 0)));

-        } else {

-            aTileEntity.setOutputRedstoneSignal(aSide, (byte) (aCoverVariable != 1 ? 0 : 15));

-        }

+        if(tAll > 0)

+            aTileEntity.setOutputRedstoneSignal(aSide, aCoverVariable == 1 ? (byte)(15 - (tFull <= 0 ? 0 : tFull / tAll + 1)) : tFull <= 0 ? 0 : (byte)(tFull / tAll + 1));

+        else

+            aTileEntity.setOutputRedstoneSignal(aSide, ((byte)(aCoverVariable == 1 ? 15 : 0)));

         return aCoverVariable;

     }

 

     public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {

-        aCoverVariable = (aCoverVariable + 1) % (2 + aTileEntity.getSizeInventory());

+        aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % (2 + aTileEntity.getSizeInventory());

         switch(aCoverVariable) {

             case 0: GT_Utility.sendChatToPlayer(aPlayer, "Normal"); break;

             case 1: GT_Utility.sendChatToPlayer(aPlayer, "Inverted"); break;

diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
index c7cf0dbb48..2ceeca88ce 100644
--- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
+++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
@@ -8,6 +8,7 @@ import gregtech.api.items.GT_Generic_Item;
 import gregtech.api.util.GT_Utility;

 import net.minecraft.client.renderer.texture.IIconRegister;

 import net.minecraft.creativetab.CreativeTabs;

+import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.Item;

 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

@@ -25,7 +26,7 @@ public class GT_FluidDisplayItem
         ItemList.Display_Fluid.set(this);

     }

 

-    protected void addAdditionalToolTips(List aList, ItemStack aStack) {

+    protected void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {

         NBTTagCompound aNBT = aStack.getTagCompound();

         if (GT_Values.D1) {

             Fluid tFluid = FluidRegistry.getFluid(aStack.getItemDamage());

diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
index 8727d6bd94..4184719060 100644
--- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
+++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
@@ -12,6 +12,7 @@ import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;

 import net.minecraft.client.renderer.texture.IIconRegister;

 import net.minecraft.creativetab.CreativeTabs;

+import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.Item;

 import net.minecraft.item.ItemStack;

 

@@ -76,8 +77,8 @@ public class GT_IntegratedCircuit_Item
         return getModeString(aMetaData) + " " + (byte) (aMetaData & 0xFF);

     }

 

-    public void addAdditionalToolTips(List aList, ItemStack aStack) {

-        super.addAdditionalToolTips(aList, aStack);

+    public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {

+        super.addAdditionalToolTips(aList, aStack, aPlayer);

         aList.add(GT_LanguageManager.addStringLocalization(new StringBuilder().append(getUnlocalizedName()).append(".configuration").toString(), "Configuration: ") + getConfigurationString(getDamage(aStack)));

     }

 

diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
index 95fc9fcd00..60bb4a898e 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
@@ -17,6 +17,7 @@ import gregtech.common.items.behaviors.*;
 import net.minecraft.block.Block;

 import net.minecraft.enchantment.Enchantment;

 import net.minecraft.entity.item.EntityItem;

+import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.init.Blocks;

 import net.minecraft.init.Items;

 import net.minecraft.item.EnumAction;

@@ -267,17 +268,17 @@ public class GT_MetaGenerated_Item_01
 

         ItemList.ThermosCan_Empty.set(addItem(tLastID = 404, "Empty Thermos Can", "Keeping hot things hot and cold things cold", new Object[]{new ItemData(Materials.Aluminium, OrePrefixes.plate.mMaterialAmount * 1L +