Fix AL crash with ME hatches (#2566)

* fix

* refactor

3 files changed, 53 insertions, 61 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
index a99ec29822..6b5ce10387 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
@@ -537,6 +537,16 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
         return null;
     }
 
+    /**
+     * Used to avoid slot update.
+     */
+    public ItemStack getShadowItemStack(int index) {
+        if (index < 0 || index >= shadowInventory.length) {
+            return null;
+        }
+        return shadowInventory[index];
+    }
+
     @Override
     public boolean isValidSlot(int aIndex) {
         return aIndex == getManualSlot();
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Input_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Input_ME.java
index b8a2c78763..6e1ba2b3ce 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Input_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Input_ME.java
@@ -414,6 +414,9 @@ public class GT_MetaTileEntity_Hatch_Input_ME extends GT_MetaTileEntity_Hatch_In
         return null;
     }
 
+    /**
+     * Used to avoid slot update.
+     */
     public FluidStack getShadowFluidStack(int index) {
         if (index < 0 || index >= storedFluids.length) {
             return null;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
index 307843896c..7c7c27c880 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
@@ -20,10 +20,12 @@ import static gregtech.api.util.GT_Utility.filterValidMTEs;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 import org.jetbrains.annotations.NotNull;
@@ -46,7 +48,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_DataAccess;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
 import gregtech.api.multitileentity.multiblock.casing.Glasses;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
@@ -197,21 +198,25 @@ public class GT_MetaTileEntity_AssemblyLine extends
         if (GT_Values.D1) {
             GT_FML_LOGGER.info("Start ALine recipe check");
         }
+        CheckRecipeResult result = CheckRecipeResultRegistry.NO_DATA_STICKS;
+
         ArrayList<ItemStack> tDataStickList = getDataItems(2);
         if (tDataStickList.isEmpty()) {
-            return CheckRecipeResultRegistry.NO_DATA_STICKS;
+            return result;
         }
         if (GT_Values.D1) {
             GT_FML_LOGGER.info("Stick accepted, " + tDataStickList.size() + " Data Sticks found");
         }
 
-        int[] tStack = new int[0];
+        int[] tStacks = new int[0];
         FluidStack[] tFluids = new FluidStack[0];
         long averageVoltage = getAverageInputVoltage();
         long maxAmp = mEnergyHatches.size() <= 1 ? 1 : getMaxInputAmps();
-        CheckRecipeResult result = CheckRecipeResultRegistry.NO_DATA_STICKS;
+        int maxParallel = 1;
+        Map<GT_Utility.ItemId, ItemStack> inputsFromME = getStoredInputsFromME();
+        Map<Fluid, FluidStack> fluidsFromME = getStoredFluidsFromME();
 
-        nextDataStick: for (ItemStack tDataStick : tDataStickList) {
+        for (ItemStack tDataStick : tDataStickList) {
             GT_AssemblyLineUtils.LookupResult tLookupResult = GT_AssemblyLineUtils
                 .findAssemblyLineRecipeFromDataStick(tDataStick, false);
 
@@ -239,7 +244,7 @@ public class GT_MetaTileEntity_AssemblyLine extends
 
             // So here we check against the recipe found on the data stick.
             // If we run into missing buses/hatches or bad inputs, we go to the next data stick.
-            // This check only happens if we have a valid up to date data stick.
+            // This check only happens if we have a valid up-to-date data stick.
 
             // first validate we have enough input busses and input hatches for this recipe
             if (mInputBusses.size() < tRecipe.mInputs.length || mInputHatches.size() < tRecipe.mFluidInputs.length) {
@@ -256,45 +261,39 @@ public class GT_MetaTileEntity_AssemblyLine extends
             }
 
             // Check Inputs allign
-            int aItemCount = tRecipe.mInputs.length;
-            tStack = new int[aItemCount];
-            for (int i = 0; i < aItemCount; i++) {
-                GT_MetaTileEntity_Hatch_InputBus tInputBus = mInputBusses.get(i);
-                if (!tInputBus.isValid()) {
-                    result = CheckRecipeResultRegistry.NO_RECIPE;
-                    continue nextDataStick;
-                }
-                ItemStack tSlotStack = tInputBus.getStackInSlot(0);
-                int tRequiredStackSize = isStackValidIngredient(tSlotStack, tRecipe.mInputs[i], tRecipe.mOreDictAlt[i]);
-                if (tRequiredStackSize < 0) {
-                    result = CheckRecipeResultRegistry.NO_RECIPE;
-                    continue nextDataStick;
-                }
+            int[] itemConsumptions = GT_Recipe_AssemblyLine.getItemConsumptionAmountArray(mInputBusses, tRecipe);
+            if (itemConsumptions == null || itemConsumptions.length == 0) {
+                result = CheckRecipeResultRegistry.NO_RECIPE;
+                continue;
+            }
+            maxParallel = (int) GT_Recipe_AssemblyLine
+                .maxParallelCalculatedByInputItems(mInputBusses, maxParallel, itemConsumptions, inputsFromME);
+            if (maxParallel <= 0) {
+                result = CheckRecipeResultRegistry.NO_RECIPE;
+                continue;
+            }
+            tStacks = itemConsumptions;
 
-                tStack[i] = tRequiredStackSize;
-                if (GT_Values.D1) {
-                    GT_FML_LOGGER.info("Item: " + i + " accepted");
-                }
+            if (GT_Values.D1) {
+                GT_FML_LOGGER.info("All Items accepted");
             }
 
             // Check Fluid Inputs allign
-            int aFluidCount = tRecipe.mFluidInputs.length;
-            if (aFluidCount > 0) {
-                for (int i = 0; i < aFluidCount; i++) {
-                    if (!drain(mInputHatches.get(i), tRecipe.mFluidInputs[i], false)) {
-                        result = CheckRecipeResultRegistry.NO_RECIPE;
-                        continue nextDataStick;
-                    }
-                    if (GT_Values.D1) {
-                        GT_FML_LOGGER.info("Fluid:" + i + " accepted");
-                    }
-
+            if (tRecipe.mFluidInputs.length > 0) {
+                maxParallel = (int) GT_Recipe_AssemblyLine
+                    .maxParallelCalculatedByInputFluids(mInputHatches, maxParallel, tRecipe.mFluidInputs, fluidsFromME);
+                if (maxParallel <= 0) {
+                    result = CheckRecipeResultRegistry.NO_RECIPE;
+                    continue;
                 }
-                // Finish Fluid Inputs allign check.
                 tFluids = tRecipe.mFluidInputs;
             }
 
             if (GT_Values.D1) {
+                GT_FML_LOGGER.info("All fluids accepted");
+            }
+
+            if (GT_Values.D1) {
                 GT_FML_LOGGER.info("Check overclock");
             }
 
@@ -339,23 +338,18 @@ public class GT_MetaTileEntity_AssemblyLine extends
         if (!result.wasSuccessful()) {
             return result;
         }
+
         // Must be something wrong here...
-        if (tStack.length == 0) {
-            return CheckRecipeResultRegistry.NO_RECIPE;
+        if (tStacks.length == 0 || maxParallel <= 0) {
+            return CheckRecipeResultRegistry.INTERNAL_ERROR;
         }
 
         if (GT_Values.D1) {
             GT_FML_LOGGER.info("All checked start consuming inputs");
         }
-        for (int i = 0; i < tStack.length; i++) {
-            ItemStack stackInSlot = mInputBusses.get(i)
-                .getStackInSlot(0);
-            stackInSlot.stackSize -= tStack[i];
-        }
 
-        for (int i = 0; i < tFluids.length; i++) {
-            drain(mInputHatches.get(i), tFluids[i], true);
-        }
+        GT_Recipe_AssemblyLine.consumeInputItems(mInputBusses, maxParallel, tStacks, inputsFromME);
+        GT_Recipe_AssemblyLine.consumeInputFluids(mInputHatches, maxParallel, tFluids, fluidsFromME);
 
         if (this.lEUt > 0) {
             this.lEUt = -this.lEUt;
@@ -369,21 +363,6 @@ public class GT_MetaTileEntity_AssemblyLine extends
         return result;
     }
 
-    private static int isStackValidIngredient(ItemStack aSlotStack, ItemStack aIngredient, ItemStack[] alts) {
-        if (alts == null || alts.length == 0) return isStackValidIngredient(aSlotStack, aIngredient);
-        for (ItemStack tAltStack : alts) {
-            int i = isStackValidIngredient(aSlotStack, tAltStack);
-            if (i >= 0) return i;
-        }
-        return -1;
-    }
-
-    private static int isStackValidIngredient(ItemStack aSlotStack, ItemStack aIngredient) {
-        if (GT_Utility.areStacksEqual(aSlotStack, aIngredient, true) && aIngredient.stackSize <= aSlotStack.stackSize)
-            return aIngredient.stackSize;
-        return -1;
-    }
-
     @Override
     public boolean onRunningTick(ItemStack aStack) {
         for (GT_MetaTileEntity_Hatch_DataAccess hatch_dataAccess : mDataAccessHatches) {