aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-07-19 12:27:24 +0200
committerDream-Master <dream-master@gmx.net>2017-07-19 12:27:24 +0200
commit4275b75df56171f9886cadf73ee66e1abb62071d (patch)
tree7b31d6f7f2b6d1248d863fd0e5208b1576dc3509
parent622d3f5ab173bdde965396b361a52b5e51fb3718 (diff)
downloadGT5-Unofficial-4275b75df56171f9886cadf73ee66e1abb62071d.tar.gz
GT5-Unofficial-4275b75df56171f9886cadf73ee66e1abb62071d.tar.bz2
GT5-Unofficial-4275b75df56171f9886cadf73ee66e1abb62071d.zip
try to ignore unification for steve carts metals
SteveCarts with Reinforced tools cant be repaired #1672 https://github.com/GTNewHorizons/NewHorizons/issues/1672
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 6477b47191..9378ed1b05 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -1737,6 +1737,15 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
} else if (tOre.mModID.equalsIgnoreCase("appliedenergistics2") && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.CertusQuartz) {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue;
+ } else if (tOre.mModID.equalsIgnoreCase("StevesCarts") && tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.Reinforced) {
+ GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+ GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue;
+ } else if (tOre.mModID.equalsIgnoreCase("StevesCarts") && tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.Galgadorian) {
+ GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+ GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue;
+ } else if (tOre.mModID.equalsIgnoreCase("StevesCarts") && tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.EnhancedGalgadorian) {
+ GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+ GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue;
}
}
if (GT_OreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) {