Fix chemical plant always thinking it has enough inputs (#711)

* Fix chemical plant always thinking it has enough inputs

* make sure catalyst is damaged according to parallels

1 files changed, 18 insertions, 15 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
index b6917f0bd3..c0b3e937db 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
@@ -542,16 +542,18 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
         }
     }
 
-    private void damageCatalyst(ItemStack aStack) {
+    private void damageCatalyst(ItemStack aStack, int minParallel) {
         // Awakened Draconium Coils with Tungstensteel Pipe Casings (or above) no longer consume catalysts.
-        if (isCatalystDamageable()
-                && (MathUtils.randFloat(0, 10000000) / 10000000f < (1.2f - (0.2 * this.mPipeCasingTier)))) {
-            int damage = getDamage(aStack) + 1;
-            if (damage >= getMaxCatalystDurability()) {
-                addOutput(CI.getEmptyCatalyst(1));
-                aStack.stackSize -= 1;
-            } else {
-                setDamage(aStack, damage);
+        if (!isCatalystDamageable()) return;
+        for (int i = 0; i < minParallel; i++) {
+            if (MathUtils.randFloat(0, 10000000) / 10000000f < (1.2f - (0.2 * this.mPipeCasingTier))) {
+                int damage = getDamage(aStack) + 1;
+                if (damage >= getMaxCatalystDurability()) {
+                    addOutput(CI.getEmptyCatalyst(1));
+                    aStack.stackSize -= 1;
+                } else {
+                    setDamage(aStack, damage);
+                }
             }
         }
     }
@@ -604,22 +606,23 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
                 return new GT_ParallelHelper() {
 
                     @Override
-                    protected boolean tryConsumeRecipeInputs(GT_Recipe recipe, FluidStack[] fluids, ItemStack[] items) {
+                    protected boolean tryConsumeRecipeInputs(GT_Recipe recipe, FluidStack[] fluids, ItemStack[] items,
+                            int minParallel) {
                         if (catalystRecipe != null && getDamage(catalystRecipe) >= getMaxCatalystDurability()) {
                             return false;
                         }
-                        boolean hasInputs = super.tryConsumeRecipeInputs(recipe, fluids, items);
+                        boolean hasInputs = super.tryConsumeRecipeInputs(recipe, fluids, items, minParallel);
                         if (hasInputs && catalystRecipe != null) {
-                            damageCatalyst(catalystRecipe);
+                            damageCatalyst(catalystRecipe, minParallel);
                         }
-                        return true;
+                        return hasInputs;
                     }
                 }.setRecipe(recipe).setItemInputs(inputItems).setFluidInputs(inputFluids)
                         .setAvailableEUt(availableVoltage * availableAmperage)
                         .setMachine(machine, protectItems, protectFluids)
                         .setRecipeLocked(recipeLockableMachine, isRecipeLocked).setMaxParallel(maxParallel)
-                        .setEUtModifier(euModifier).enableBatchMode(batchSize).enableConsumption()
-                        .enableOutputCalculation();
+                        .setEUtModifier(euModifier).enableBatchMode(batchSize).setConsumption(true)
+                        .setOutputCalculation(true);
             }
         };
     }