Better Assline checkresult (#3863)

Co-authored-by: Martin Robertz <[email protected]>
GTNewHorizons · Jan 26, 2025 · ef5c54c · ef5c54c
1 parent fe6fb67
commit ef5c54c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/ggfab/mte/MTEAdvAssLine.java b/src/main/java/ggfab/mte/MTEAdvAssLine.java
@@ -754,7 +754,7 @@ public CheckRecipeResult checkProcessing() {
         for (ItemStack stack : tDataStickList) {
             GTRecipe.RecipeAssemblyLine recipe = findRecipe(stack);
             if (recipe == null) {
-                result = CheckRecipeResultRegistry.NO_RECIPE;
+                if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE;
                 continue;
             }
             if (recipe.mEUt > inputVoltage) {

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java
@@ -221,7 +221,7 @@ public CheckRecipeResult checkProcessing() {
                 .findAssemblyLineRecipeFromDataStick(tDataStick, false);
 
             if (tLookupResult.getType() == AssemblyLineUtils.LookupResultType.INVALID_STICK) {
-                result = CheckRecipeResultRegistry.NO_RECIPE;
+                if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE;
                 continue;
             }
 
@@ -231,7 +231,8 @@ public CheckRecipeResult checkProcessing() {
             if (tLookupResult.getType() != AssemblyLineUtils.LookupResultType.VALID_STACK_AND_VALID_HASH) {
                 tRecipe = AssemblyLineUtils.processDataStick(tDataStick);
                 if (tRecipe == null) {
-                    result = CheckRecipeResultRegistry.NO_RECIPE;
+                    if (result == CheckRecipeResultRegistry.NO_DATA_STICKS)
+                        result = CheckRecipeResultRegistry.NO_RECIPE;
                     continue;
                 }
             }
@@ -261,7 +262,7 @@ public CheckRecipeResult checkProcessing() {
                         mInputHatches.size(),
                         tRecipe.mFluidInputs.length);
                 }
-                result = CheckRecipeResultRegistry.NO_RECIPE;
+                if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE;
                 continue;
             }
 
@@ -301,13 +302,13 @@ public CheckRecipeResult checkProcessing() {
             // Check Inputs allign
             int[] itemConsumptions = GTRecipe.RecipeAssemblyLine.getItemConsumptionAmountArray(mInputBusses, tRecipe);
             if (itemConsumptions == null || itemConsumptions.length == 0) {
-                result = CheckRecipeResultRegistry.NO_RECIPE;
+                if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE;
                 continue;
             }
             currentParallel = (int) GTRecipe.RecipeAssemblyLine
                 .maxParallelCalculatedByInputItems(mInputBusses, currentParallel, itemConsumptions, inputsFromME);
             if (currentParallel <= 0) {
-                result = CheckRecipeResultRegistry.NO_RECIPE;
+                if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE;
                 continue;
             }
             tStacks = itemConsumptions;
@@ -324,7 +325,8 @@ public CheckRecipeResult checkProcessing() {
                     tRecipe.mFluidInputs,
                     fluidsFromME);
                 if (currentParallel <= 0) {
-                    result = CheckRecipeResultRegistry.NO_RECIPE;
+                    if (result == CheckRecipeResultRegistry.NO_DATA_STICKS)
+                        result = CheckRecipeResultRegistry.NO_RECIPE;
                     continue;
                 }
                 tFluids = tRecipe.mFluidInputs;