diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-06-04 10:39:04 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-06-04 10:39:04 +0200 |
| commit | e8d7301521518dd69851ff3c06fb99a538e391e3 (patch) | |
| tree | e56693e50ef66d43a67b95e947fa0857e468362d /src/main/java/gregtech/api/util/GT_OreDictUnificator.java | |
| parent | f5e078aa1eb2da76585d620afa91903f0dbdd031 (diff) | |
| parent | 69b943083da96677f27003811db2004d39088e2c (diff) | |
| download | GT5-Unofficial-e8d7301521518dd69851ff3c06fb99a538e391e3.tar.gz GT5-Unofficial-e8d7301521518dd69851ff3c06fb99a538e391e3.tar.bz2 GT5-Unofficial-e8d7301521518dd69851ff3c06fb99a538e391e3.zip | |
Merge branch 'mergeGTNH' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/util/GT_OreDictUnificator.java')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_OreDictUnificator.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java index c8d95140a2..7552f5ea85 100644 --- a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java +++ b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java @@ -94,6 +94,8 @@ public class GT_OreDictUnificator { } public static ItemStack get(OrePrefixes aPrefix, Object aMaterial, ItemStack aReplacement, long aAmount) { + //if (Materials.mDefaultComponents.contains(aPrefix) && !aPrefix.mDynamicItems.contains((Materials)aMaterial)) aPrefix.mDynamicItems.add((Materials) aMaterial); + if (OrePrefixes.mPreventableComponents.contains(aPrefix) && aPrefix.mDisabledItems.contains(aMaterial)) return aReplacement; return get(aPrefix.get(aMaterial), aReplacement, aAmount, false, true); } |