diff options
author | Muramasa- <haydenkilloh@gmail.com> | 2016-08-22 22:50:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-22 22:50:58 +0100 |
commit | ccfc536501e8133794ec2a0c5f2a589201af81d6 (patch) | |
tree | c9f8c9af123f7fce7a942a2130973c51cfb3b65b /src/main/java/gregtech/common/items | |
parent | 0476a036352600b83133caf167ac5dee4b9b5176 (diff) | |
parent | 5a94ea039ba265d966aaa7872aecb79a4851769d (diff) | |
download | GT5-Unofficial-ccfc536501e8133794ec2a0c5f2a589201af81d6.tar.gz GT5-Unofficial-ccfc536501e8133794ec2a0c5f2a589201af81d6.tar.bz2 GT5-Unofficial-ccfc536501e8133794ec2a0c5f2a589201af81d6.zip |
Merge pull request #603 from Muramasa-/Mats
Material Rework
Diffstat (limited to 'src/main/java/gregtech/common/items')
-rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 6b0cf0cc3d..fed61dbd4f 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 @@ -844,7 +844,7 @@ public class GT_MetaGenerated_Item_01 }
public boolean doesShowInCreative(OrePrefixes aPrefix, Materials aMaterial, boolean aDoShowAllItems) {
- return (aDoShowAllItems) || (((aPrefix != OrePrefixes.gem) || (!aMaterial.name().startsWith("Infused"))) && (aPrefix != OrePrefixes.nugget) && (aPrefix != OrePrefixes.dustTiny) && (aPrefix != OrePrefixes.dustSmall) && (aPrefix != OrePrefixes.dustImpure) && (aPrefix != OrePrefixes.dustPure) && (aPrefix != OrePrefixes.crushed) && (aPrefix != OrePrefixes.crushedPurified) && (aPrefix != OrePrefixes.crushedCentrifuged) && (aPrefix != OrePrefixes.ingotHot) && !(aPrefix == OrePrefixes.cellPlasma && !isPlasmaCellUsed(aPrefix, aMaterial)));
+ return (aDoShowAllItems) || (((aPrefix != OrePrefixes.gem) || (!aMaterial.mName.startsWith("Infused"))) && (aPrefix != OrePrefixes.nugget) && (aPrefix != OrePrefixes.dustTiny) && (aPrefix != OrePrefixes.dustSmall) && (aPrefix != OrePrefixes.dustImpure) && (aPrefix != OrePrefixes.dustPure) && (aPrefix != OrePrefixes.crushed) && (aPrefix != OrePrefixes.crushedPurified) && (aPrefix != OrePrefixes.crushedCentrifuged) && (aPrefix != OrePrefixes.ingotHot) && !(aPrefix == OrePrefixes.cellPlasma && !isPlasmaCellUsed(aPrefix, aMaterial)));
}
public ItemStack getContainerItem(ItemStack aStack) {
|