From a47c5003192c87f6960d490abedd1e342acb56bd Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Wed, 16 Jun 2021 16:33:53 +0800
Subject: make fuel recipe map index building a bit more robust

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
---
 src/main/java/gregtech/api/util/GT_Recipe.java  | 3 ++-
 src/main/java/gregtech/api/util/GT_Utility.java | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/main/java')

diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index a5b263a145..19f46dfd15 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -1010,7 +1010,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         @Override
         public GT_Recipe add(GT_Recipe aRecipe) {
             aRecipe = super.add(aRecipe);
-            if (aRecipe.mInputs != null && aRecipe.mInputs.length == 1 && (aRecipe.mFluidInputs == null || aRecipe.mFluidInputs.length == 0)) {
+            if (aRecipe.mInputs != null && GT_Utility.getNonnullElementCount(aRecipe.mInputs) == 1 &&
+                    (aRecipe.mFluidInputs == null || GT_Utility.getNonnullElementCount(aRecipe.mFluidInputs) == 0)) {
                 FluidStack tFluid = GT_Utility.getFluidForFilledItem(aRecipe.mInputs[0], true);
                 if (tFluid != null) {
                     tFluid.amount = 0;
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index c7cee8c9c2..bb2c644f95 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -2884,4 +2884,8 @@ public class GT_Utility {
             dropItem.delayBeforeCanPickup = 0;
         }
     }
+
+    public static long getNonnullElementCount(Object[] tArray) {
+        return Arrays.stream(tArray).filter(Objects::nonNull).count();
+    }
 }
-- 
cgit