Merge pull request #331 from GTNewHorizons/hide-filled-flask

Actually hide filled volumetric flask in NEI

2 files changed, 5 insertions, 13 deletions

diff --git a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java
index d0132b1fdd..5ab6b3395e 100644
--- a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java
+++ b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java
@@ -1,7 +1,6 @@
 
 package gregtech.common.items;
 
-import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.GT_Values;
@@ -42,16 +41,6 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain
         unlocalFlaskName = unlocalized;
         setMaxStackSize(16);
         setNoRepair();
-        if (Loader.isModLoaded("NotEnoughItems")) {
-            for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) {
-                if (fluid != null) {
-                    ItemStack stack = new ItemStack(this);
-                    setCapacity(stack, getMaxCapacity());
-                    fill(stack, new FluidStack(fluid, Integer.MAX_VALUE), true);
-                    codechicken.nei.api.API.hideItem(stack);
-                }
-            }
-        }
     }
 
     public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
diff --git a/src/main/java/gregtech/nei/NEI_GT_Config.java b/src/main/java/gregtech/nei/NEI_GT_Config.java
index 36db6879db..d1db906fd0 100644
--- a/src/main/java/gregtech/nei/NEI_GT_Config.java
+++ b/src/main/java/gregtech/nei/NEI_GT_Config.java
@@ -2,6 +2,7 @@ package gregtech.nei;
 
 import codechicken.nei.api.IConfigureNEI;
 import cpw.mods.fml.common.FMLCommonHandler;
+import gregtech.api.enums.ItemList;
 import gregtech.api.util.GT_Recipe;
 
 public class NEI_GT_Config
@@ -16,8 +17,10 @@ public class NEI_GT_Config
                 new GT_NEI_DefaultHandler(tMap);
             }
         }
-        if(FMLCommonHandler.instance().getEffectiveSide().isClient())
-            ALH=new GT_NEI_AssLineHandler(GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes);
+        if (FMLCommonHandler.instance().getEffectiveSide().isClient()) {
+            ALH = new GT_NEI_AssLineHandler(GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes);
+            codechicken.nei.api.API.addItemListEntry(ItemList.VOLUMETRIC_FLASK.get(1));
+        }
         sIsAdded = true;
     }