Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable

1 files changed, 26 insertions, 0 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
index aa54506468..a6a36cf79f 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
@@ -2,7 +2,12 @@ package gregtech.common.blocks;
 

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.GT_Values;

+import gregtech.api.enums.Materials;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

+import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;

+import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;

+import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame;

+import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Item;

 import gregtech.api.util.GT_ItsNotMyFaultException;

 import gregtech.api.util.GT_LanguageManager;

 import gregtech.api.util.GT_Log;

@@ -100,6 +105,27 @@ public class GT_Item_Machines
         return "";

     }

 

+    public String getItemStackDisplayName(ItemStack aStack) {

+    	String aName = super.getItemStackDisplayName(aStack);

+    	short tDamage = (short) getDamage(aStack);

+    	if (tDamage >= 0 && tDamage < GregTech_API.METATILEENTITIES.length && GregTech_API.METATILEENTITIES[tDamage] != null) {

+    		Materials aMaterial = null;

+    		if (GregTech_API.METATILEENTITIES[tDamage] instanceof GT_MetaPipeEntity_Fluid) {

+    			aMaterial = ((GT_MetaPipeEntity_Fluid) GregTech_API.METATILEENTITIES[tDamage]).mMaterial;

+            } else if (GregTech_API.METATILEENTITIES[tDamage] instanceof GT_MetaPipeEntity_Cable) {

+    			aMaterial = ((GT_MetaPipeEntity_Cable) GregTech_API.METATILEENTITIES[tDamage]).mMaterial;

+            } else if (GregTech_API.METATILEENTITIES[tDamage] instanceof GT_MetaPipeEntity_Item) {

+    			aMaterial = ((GT_MetaPipeEntity_Item) GregTech_API.METATILEENTITIES[tDamage]).mMaterial;

+            } else if (GregTech_API.METATILEENTITIES[tDamage] instanceof GT_MetaPipeEntity_Frame) {

+    			aMaterial = ((GT_MetaPipeEntity_Frame) GregTech_API.METATILEENTITIES[tDamage]).mMaterial;

+            }

+    		if (aMaterial != null) {

+    			return aMaterial.getLocalizedNameForItem(aName);

+    		}

+        }

+    	return aName;

+    }

+

     public void onCreated(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {

         super.onCreated(aStack, aWorld, aPlayer);

         short tDamage = (short) getDamage(aStack);