aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util/GT_OreDictUnificator.java
diff options
context:
space:
mode:
authorMuramasa <haydenkilloh@gmail.com>2016-09-25 00:25:15 +0100
committerMuramasa <haydenkilloh@gmail.com>2016-09-25 00:25:15 +0100
commit3ee18ca5551f4bde620e79082b9854bfbf76ab83 (patch)
tree6194316cfdb24885f8c016cda2d01b0ae07d2273 /src/main/java/gregtech/api/util/GT_OreDictUnificator.java
parentfed8109b17fd2b41de17ceef92f37e39dc1ffc53 (diff)
downloadGT5-Unofficial-3ee18ca5551f4bde620e79082b9854bfbf76ab83.tar.gz
GT5-Unofficial-3ee18ca5551f4bde620e79082b9854bfbf76ab83.tar.bz2
GT5-Unofficial-3ee18ca5551f4bde620e79082b9854bfbf76ab83.zip
Cleanup, disable auto TE recipes with config and fixes
Diffstat (limited to 'src/main/java/gregtech/api/util/GT_OreDictUnificator.java')
-rw-r--r--src/main/java/gregtech/api/util/GT_OreDictUnificator.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java
index 456d8cee58..b403f05e5a 100644
--- a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java
+++ b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java
@@ -94,12 +94,8 @@ public class GT_OreDictUnificator {
}
public static ItemStack get(OrePrefixes aPrefix, Object aMaterial, ItemStack aReplacement, long aAmount) {
- //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");
- }*/
+ //if (Materials.mDefaultComponents.contains(aPrefix) && !aPrefix.mDynamicItems.contains((Materials)aMaterial)) aPrefix.mDynamicItems.add((Materials) aMaterial);
+ if (Materials.mDefaultComponents.contains(aPrefix) && aPrefix.mDisabledItems.contains(aMaterial)) return null;
return get(aPrefix.get(aMaterial), aReplacement, aAmount, false, true);
}