From c0f1fce8597a1fddab378c0e090b153b70cdc895 Mon Sep 17 00:00:00 2001
From: Muramasa <haydenkilloh@gmail.com>
Date: Thu, 29 Sep 2016 07:36:45 +0100
Subject: Small fixes & Stop storage blocks and fluids for disabled materials

---
 src/main/java/gregtech/common/blocks/GT_Block_Metal.java  | 15 +++++++++------
 .../java/gregtech/common/blocks/GT_Block_Storage.java     |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/main/java/gregtech/common')

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java
index 58e1996b9b..56c920c6d1 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java
@@ -5,7 +5,6 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
@@ -15,18 +14,23 @@ public class GT_Block_Metal extends GT_Block_Storage {
     public Materials[] mMats;
     public OrePrefixes mPrefix;
     public IIconContainer[] mBlockIcons;
+    public boolean mHideBlocks;
 
     public GT_Block_Metal(String aName, Materials[] aMats, OrePrefixes aPrefix, IIconContainer[] aBlockIcons) {
         super(GT_Item_Storage.class, aName, Material.iron);
         mMats = aMats;
         mPrefix = aPrefix;
         mBlockIcons = aBlockIcons;
+        mHideBlocks = Loader.isModLoaded("NotEnoughItems");
+
         for (int i = 0; i < aMats.length; i++) {
-            GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + i + ".name", "Block of " + aMats[i].mDefaultLocalName);
-            GT_OreDictUnificator.registerOre(aPrefix, aMats[i], new ItemStack(this, 1, i));
+            if (aMats[i].mMetaItemSubID > 0) {
+                GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + i + ".name", "Block of " + aMats[i].mDefaultLocalName);
+                GT_OreDictUnificator.registerOre(aPrefix, aMats[i], new ItemStack(this, 1, i));
+            }
         }
-        if(aMats.length<16 && Loader.isModLoaded("NotEnoughItems")){
-        	for( int i = aMats.length;i<16;i++)codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i));                
+        if (aMats.length<16 && Loader.isModLoaded("NotEnoughItems")) {
+            for (int i = aMats.length; i < 16; i++) codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i));
         }
     }
 
@@ -36,5 +40,4 @@ public class GT_Block_Metal extends GT_Block_Storage {
         }
         return null;
     }
-
 }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java b/src/main/java/gregtech/common/blocks/GT_Block_Storage.java
index e2272a6503..768fed6619 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Storage.java
@@ -95,7 +95,7 @@ public class GT_Block_Storage extends GT_Generic_Block {
     @SideOnly(Side.CLIENT)
     public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) {
         for (int i = 0; i < 16; i++) {
-            aList.add(new ItemStack(aItem, 1, i));
+            if (!(new ItemStack(aItem, 1, i).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i));
         }
     }
 }
-- 
cgit