fix fluid button and recipe transfer issue

Author: GlodBlock

src/main/java/com/glodblock/github/client/GuiFluidPatternTerminal.java

@@ -118,6 +118,9 @@ protected void updateBeforeRender() {
             this.combineBtn.visible = true;
         }
 
+        this.fluidBtn.forceActive(this.container.fluidFirst ? 0 : 1);
+        this.combineBtn.forceActive(this.container.combine ? 1 : 0);
+
         setSlotsHidden(SlotSemantic.CRAFTING_RESULT, !this.container.isCraftingMode());
         setSlotsHidden(SlotSemantic.PROCESSING_RESULT, this.container.isCraftingMode());
     }

src/main/java/com/glodblock/github/client/container/ContainerFluidPatternTerminal.java

@@ -76,10 +76,10 @@ public class ContainerFluidPatternTerminal extends ItemTerminalContainer impleme
     public boolean craftingMode;
     @GuiSync(96)
     public boolean substitute;
-    @GuiSync(105)
-    public boolean combine = false;
-    @GuiSync(106)
-    public boolean fluidFirst = false;
+    @GuiSync(95)
+    public boolean combine;
+    @GuiSync(94)
+    public boolean fluidFirst;
 
     public ContainerFluidPatternTerminal(int id, PlayerInventory ip, ITerminalHost monitorable) {
         super(TYPE, id, ip, monitorable, false);
@@ -458,8 +458,8 @@ public void detectAndSendChanges() {
                 this.setCraftingMode(this.patternTerminal.isCraftingRecipe());
             }
             this.substitute = this.patternTerminal.isSubstitution();
-            this.combine = patternTerminal.getCombineMode();
-            this.fluidFirst = patternTerminal.getFluidPlaceMode();
+            this.combine = this.patternTerminal.getCombineMode();
+            this.fluidFirst = this.patternTerminal.getFluidPlaceMode();
         }
     }
 

src/main/java/com/glodblock/github/integration/builder/RecipeTransferBuilder.java

@@ -1,6 +1,7 @@
 package com.glodblock.github.integration.builder;
 
 import com.glodblock.github.common.item.ItemFluidPacket;
+import com.glodblock.github.util.FCUtil;
 import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import mezz.jei.api.gui.IRecipeLayout;
@@ -41,8 +42,11 @@ public RecipeTransferBuilder(int maxInput, int maxOutput, IRecipeLayout recipe)
     }
 
     private void split() {
-        for (int index = 0; index < this.recipe.getItemStacks().getGuiIngredients().size(); index ++) {
+        for (int index : FCUtil.sort(this.recipe.getItemStacks().getGuiIngredients().keySet())) {
             IGuiIngredient<ItemStack> ing = this.recipe.getItemStacks().getGuiIngredients().get(index);
+            if (ing == null) {
+                continue;
+            }
             if (ing.isInput()) {
                 List<ItemStack> holder;
                 if (ing.getAllIngredients().size() < MAX_ITEMS - 1) {
@@ -59,8 +63,11 @@ private void split() {
                 this.itemOut.add(ing.getDisplayedIngredient());
             }
         }
-        for (int index = 0; index < this.recipe.getFluidStacks().getGuiIngredients().size(); index ++) {
+        for (int index : FCUtil.sort(this.recipe.getFluidStacks().getGuiIngredients().keySet())) {
             IGuiIngredient<FluidStack> ing = this.recipe.getFluidStacks().getGuiIngredients().get(index);
+            if (ing == null) {
+                continue;
+            }
             if (ing.isInput()) {
                 this.fluidIn.add(ing.getDisplayedIngredient());
             } else {

src/main/java/com/glodblock/github/util/FCUtil.java

@@ -34,6 +34,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 public final class FCUtil {
 
@@ -96,6 +97,10 @@ public static void clearItemInventory(IItemHandlerModifiable inv) {
         }
     }
 
+    public static Collection<Integer> sort(Collection<Integer> arr) {
+        return arr.stream().sorted().collect(Collectors.toList());
+    }
+
     public static int findMax(Collection<Integer> list) {
         int a = Integer.MIN_VALUE;
         for (int x : list) {