diff options
author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-10-26 01:04:30 +0100 |
---|---|---|
committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-10-26 01:04:30 +0100 |
commit | b9ad7d46f1f1993add94ad7b561e1fea94a4e0d1 (patch) | |
tree | ff509e8d7226ad3bd789cc38dd9bb9d8ca0a4553 /src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java | |
parent | 7e09b5381593a23aeff0a0bab03926a8c1e2b87d (diff) | |
download | GT5-Unofficial-b9ad7d46f1f1993add94ad7b561e1fea94a4e0d1.tar.gz GT5-Unofficial-b9ad7d46f1f1993add94ad7b561e1fea94a4e0d1.tar.bz2 GT5-Unofficial-b9ad7d46f1f1993add94ad7b561e1fea94a4e0d1.zip |
% Updated 5.08 compatibility.
> Created StaticFields59.java to hold static copies of fields gotten from gt 5.09 classes.
^ Version bump.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java')
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java b/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java index 69c95bc1ff..1e7843b515 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java @@ -12,7 +12,7 @@ import gregtech.api.objects.MaterialStack; import gregtech.api.util.*; import gtPlusPlus.core.util.reflect.ReflectionUtils; - +import gtPlusPlus.xmod.gregtech.common.StaticFields59; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -100,7 +100,7 @@ public class GregtechOreDictUnificator { 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; + if (StaticFields59.getOrePrefixesBooleanDisabledItems().contains(aPrefix) && StaticFields59.getOrePrefixesBooleanDisabledItems().contains(aMaterial)) return aReplacement; return get(aPrefix.get(aMaterial), aReplacement, aAmount, false, true); } |