diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-11-25 18:43:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-25 18:43:13 +0100 |
| commit | dbbefafbccc2aca31f718775e43c4f36ca7e0a85 (patch) | |
| tree | 9ad3fcaef69c67c9451413a0ab958c2472cd8365 /src/main/java/gregtech/common/blocks/GT_Item_Machines.java | |
| parent | 2b8cca2565c58f99654840f6e3cafc5142fbd9ca (diff) | |
| parent | 1c9c9af45bfa46278ed4840c3c6ae1459879d2fe (diff) | |
| download | GT5-Unofficial-dbbefafbccc2aca31f718775e43c4f36ca7e0a85.tar.gz GT5-Unofficial-dbbefafbccc2aca31f718775e43c4f36ca7e0a85.tar.bz2 GT5-Unofficial-dbbefafbccc2aca31f718775e43c4f36ca7e0a85.zip | |
Merge branch 'unstable' into GT6-styled_pipes
Diffstat (limited to 'src/main/java/gregtech/common/blocks/GT_Item_Machines.java')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Item_Machines.java | 26 |
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 642d77d84e..a200fbd52c 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java @@ -3,7 +3,12 @@ package gregtech.common.blocks; import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.interfaces.metatileentity.IConnectable;
+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;
@@ -101,6 +106,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);
|