From 90f805884ddf29f1808cf90f581e486e1bb0d03d Mon Sep 17 00:00:00 2001
From: Discreater <discreater@163.com>
Date: Sat, 17 Dec 2022 20:36:34 +0800
Subject: [PATCH] Fix: may fix the abnormal number of transfers

---
 .../me/towdium/jecalculation/nei/Adapter.java  | 18 +++++++++---------
 .../jecalculation/nei/adapter/GregTech.java    | 13 +++++++++----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/main/java/me/towdium/jecalculation/nei/Adapter.java b/src/main/java/me/towdium/jecalculation/nei/Adapter.java
index e3ed1c0..979aeb6 100644
--- a/src/main/java/me/towdium/jecalculation/nei/Adapter.java
+++ b/src/main/java/me/towdium/jecalculation/nei/Adapter.java
@@ -31,42 +31,42 @@ public class Adapter {
     public static void init() {
         JustEnoughCalculation.logger.info("=====Just Enough Calculation Init Start=====");
         if (Loader.isModLoaded("Forestry")) {
-            JustEnoughCalculation.logger.info("Forestry installed");
+            JustEnoughCalculation.logger.info("Forestry detected");
             adapters.add(new Forestry());
         }
         if (Loader.isModLoaded("appliedenergistics2")) {
-            JustEnoughCalculation.logger.info("ae2 not supported");
+            JustEnoughCalculation.logger.info("ae2 detected");
             adapters.add(new AE2());
         }
         if (Loader.isModLoaded("gregtech")) {
             if(GregTech6.isGT6()) {
-                JustEnoughCalculation.logger.info("gregtech6 installed");
+                JustEnoughCalculation.logger.info("gregtech6 detected");
                 adapters.add(new GregTech6());
             } else {
-                JustEnoughCalculation.logger.info("gregtech5 installed");
+                JustEnoughCalculation.logger.info("gregtech5 detected");
                 adapters.add(new GregTech());
             }
         }
         try {
             if (Loader.isModLoaded("miscutils")) {
                 adapters.add(new GTPP());
-                JustEnoughCalculation.logger.info("gt++ installed");
+                JustEnoughCalculation.logger.info("gt++ detected");
             }
         } catch (Exception e) {
-            JustEnoughCalculation.logger.info("exception when installing gt++");
+            JustEnoughCalculation.logger.error("Init error with gt++");
             e.printStackTrace();
         }
         if (Loader.isModLoaded("Avaritia")) {
-            JustEnoughCalculation.logger.info("Avaritia installed");
+            JustEnoughCalculation.logger.info("Avaritia detected");
             adapters.add(new Avaritia());
         }
         if (Loader.isModLoaded("EnderIO")) {
-            JustEnoughCalculation.logger.info("EnderIO installed");
+            JustEnoughCalculation.logger.info("EnderIO detected");
             adapters.add(new EnderIO());
         }
         if (Loader.isModLoaded("thaumcraftneiplugin")) {
             adapters.add(new Thaum());
-            JustEnoughCalculation.logger.info("Thaumcraft installed");
+            JustEnoughCalculation.logger.info("Thaumcraft detected");
         }
         JustEnoughCalculation.logger.info("=====Just Enough Calculation Init Finish=====");
     }
diff --git a/src/main/java/me/towdium/jecalculation/nei/adapter/GregTech.java b/src/main/java/me/towdium/jecalculation/nei/adapter/GregTech.java
index 6656cde..1b46565 100644
--- a/src/main/java/me/towdium/jecalculation/nei/adapter/GregTech.java
+++ b/src/main/java/me/towdium/jecalculation/nei/adapter/GregTech.java
@@ -66,10 +66,15 @@ public class GregTech implements IAdapter {
     }
 
     protected void handleDefault(IRecipeHandler recipe, int index, List<Object[]> inputs, List<Object[]> outputs) {
-        for (int i = 0; i < inputs.size(); i++) {
-            Object[] objects = Arrays.stream(inputs.get(i)).map(o -> GregTech.convertFluid((ItemStack) o)).toArray();
-            inputs.set(i, objects);
-        }
+        inputs.replaceAll(ts -> Arrays.stream(ts).map(o -> {
+            if(o instanceof ItemStack) {
+                return GregTech.convertFluid((ItemStack) o);
+            } else if (o instanceof FluidStack) {
+                return o;
+            } else {
+                throw new IllegalArgumentException("Shall get ItemStack or FluidStack, but get: " + o.getClass());
+            }
+        }).toArray());
         List<PositionedStack> otherStacks = recipe.getOtherStacks(index);
         outputs.addAll(otherStacks.stream()
                                   .map(positionedStack -> positionedStack.items)