diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-09-23 02:28:29 +0100 |
|---|---|---|
| committer | Muramasa <haydenkilloh@gmail.com> | 2016-09-23 02:28:29 +0100 |
| commit | 291839871e1233ba0c72e48cf16847246a1ccc7c (patch) | |
| tree | b70a8f5f9e0448b62708fa1ec41e39cfa7dd6f9a /src/main/java/gregtech/api/util | |
| parent | 23546a5c2c2a6edc75eb32d8c179e63dc8df3930 (diff) | |
| download | GT5-Unofficial-291839871e1233ba0c72e48cf16847246a1ccc7c.tar.gz GT5-Unofficial-291839871e1233ba0c72e48cf16847246a1ccc7c.tar.bz2 GT5-Unofficial-291839871e1233ba0c72e48cf16847246a1ccc7c.zip | |
Reduce disabled component creation & GT_Proxy postInit -> Processors
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_OreDictUnificator.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java index ea13933a26..4060f5f906 100644 --- a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java +++ b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java @@ -93,7 +93,12 @@ public class GT_OreDictUnificator { } public static ItemStack get(OrePrefixes aPrefix, Object aMaterial, ItemStack aReplacement, long aAmount) { - if (aPrefix.mNotGeneratedItems.contains((Materials) aMaterial)) System.out.println("##### TRIED TO GET DISABLED COMPONENT"); + //if (aPrefix.mDisabledMaterials.contains((Materials) aMaterial) && !Materials.mTempComponents.contains(aPrefix)) System.out.println("##### Prefix: " + aPrefix); + if (Materials.mDefaultComponents.contains(aPrefix) && aPrefix.mDisabledMaterials.contains(aMaterial)) return null; + /*if (Materials.mDefaultComponents.contains(aPrefix) && !aPrefix.mDynamicItems.contains((Materials)aMaterial)) { + aPrefix.mDynamicItems.add((Materials) aMaterial); + System.out.println("##### Added component to dynamic items"); + }*/ return get(aPrefix.get(aMaterial), aReplacement, aAmount, false, true); } |