aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-08-01 23:41:55 +0200
committerDream-Master <dream-master@gmx.net>2017-08-01 23:41:55 +0200
commit2bd9fce16a5a8b62d0a10fc4728dd5005cdd7dea (patch)
treefcbc8fbb7be16a10a0d51732cdf44fa22cbb4996 /src/main/java/gregtech/common
parent59d83218c7bbcd7194d045ac94662fd28a71901a (diff)
downloadGT5-Unofficial-2bd9fce16a5a8b62d0a10fc4728dd5005cdd7dea.tar.gz
GT5-Unofficial-2bd9fce16a5a8b62d0a10fc4728dd5005cdd7dea.tar.bz2
GT5-Unofficial-2bd9fce16a5a8b62d0a10fc4728dd5005cdd7dea.zip
cherry pick
Commit: c146a47ff9177286603aef58a146b8d7cf8cd1dd [c146a47] Adapted the Large Chemical Reactor recipes for the Int. Circuits
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java
index 3b7959398a..ee37946124 100644
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/src/main/java/gregtech/common/GT_RecipeAdder.java
@@ -14,6 +14,7 @@ import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine;
import gregtech.api.util.GT_Utility;
+import gregtech.common.items.GT_IntegratedCircuit_Item;
import mods.railcraft.common.items.RailcraftToolItems;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
@@ -154,7 +155,10 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
aCleanroom = false;
}
GT_Recipe.GT_Recipe_Map.sChemicalRecipes.addRecipe(true, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput, aOutput2}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUtick, aCleanroom ? -200 : 0);
- GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.addRecipe(false, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput, aOutput2}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUtick, 0);
+ if (!(aInput1 != null && aInput1.getItem() instanceof GT_IntegratedCircuit_Item && aInput1.getItemDamage() >= 10)
+ && !(aInput2 != null && aInput2.getItem() instanceof GT_IntegratedCircuit_Item && aInput2.getItemDamage() >= 10)) {
+ GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.addRecipe(false, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput, aOutput2}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUtick, 0);
+ }
return true;
}