Fix ranged item & fluid outputs with minimum 0, and fix SizedIngredient modifying recipe stack sizes in batched recipes. (#3594)

Co-authored-by: Ghostipedia <Ghostipedia@gmail.com>
Co-authored-by: Ghostipedia / Caitlynn <46772882+Ghostipedia@users.noreply.github.com>

Author: DilithiumThoride

src/main/java/com/gregtechceu/gtceu/api/capability/recipe/FluidRecipeCapability.java

@@ -403,8 +403,8 @@ public void applyWidgetInfo(@NotNull Widget widget,
     // Maps fluids to a FluidEntryList for XEI: either a FluidTagList or a FluidStackList
     public static FluidEntryList mapFluid(FluidIngredient ingredient) {
         int amount;
-        if (ingredient instanceof IntProviderFluidIngredient provider) {
-            amount = provider.getCountProvider().getMaxValue();
+        if (ingredient instanceof IntProviderFluidIngredient) {
+            amount = 1;
         } else {
             amount = ingredient.getAmount();
         }

src/main/java/com/gregtechceu/gtceu/api/capability/recipe/ItemRecipeCapability.java

@@ -52,7 +52,6 @@
 import org.jetbrains.annotations.UnknownNullability;
 
 import java.util.*;
-import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 
 import static com.gregtechceu.gtceu.api.recipe.RecipeHelper.addToRecipeHandlerMap;
@@ -498,24 +497,35 @@ private static ItemEntryList mapItem(final Ingredient ingredient) {
             final int amount = sizedIngredient.getAmount();
             var mapped = tryMapInner(sizedIngredient.getInner(), amount);
             if (mapped != null) return mapped;
+
+            if (sizedIngredient.getInner() instanceof IntProviderIngredient intProvider) {
+                ItemStackList stackList = new ItemStackList();
+                for (ItemStack i : intProvider.getInner().getItems()) {
+                    stackList.add(i);
+                }
+                return stackList;
+            }
         } else if (ingredient instanceof IntProviderIngredient intProvider) {
             final int amount = 1;
             var mapped = tryMapInner(intProvider.getInner(), amount);
             if (mapped != null) return mapped;
+
+            ItemStackList stackList = new ItemStackList();
+            for (ItemStack i : intProvider.getInner().getItems()) {
+                stackList.add(i);
+            }
+            return stackList;
         } else if (ingredient instanceof IntersectionIngredient intersection) {
             return mapIntersection(intersection, -1);
         } else {
             var tagList = tryMapTag(ingredient, 1);
             if (tagList != null) return tagList;
         }
-        ItemStackList stackList = new ItemStackList();
-        boolean isIntProvider = ingredient instanceof IntProviderIngredient ||
-                (ingredient instanceof SizedIngredient sized && sized.getInner() instanceof IntProviderIngredient);
 
-        UnaryOperator<ItemStack> setCount = stack -> isIntProvider ? stack.copyWithCount(1) : stack;
-        Arrays.stream(ingredient.getItems())
-                .map(setCount)
-                .forEach(stackList::add);
+        ItemStackList stackList = new ItemStackList();
+        for (ItemStack i : ingredient.getItems()) {
+            stackList.add(i);
+        }
         return stackList;
     }
 

src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableFluidTank.java

@@ -118,31 +118,24 @@ public List<FluidIngredient> handleRecipeInner(IO io, GTRecipe recipe, List<Flui
             }
 
             FluidStack[] fluids;
-            int amount;
 
             if (io == IO.OUT && ingredient instanceof IntProviderFluidIngredient provider) {
                 provider.setFluidStacks(null);
                 provider.setSampledCount(-1);
 
                 if (simulate) {
                     fluids = new FluidStack[] { provider.getMaxSizeStack() };
-                    amount = provider.getCountProvider().getMaxValue();
                 } else {
                     fluids = provider.getStacks();
-                    if (fluids.length == 0 || fluids[0].isEmpty()) {
-                        it.remove();
-                        continue;
-                    }
-                    amount = fluids[0].getAmount();
                 }
             } else {
                 fluids = ingredient.getStacks();
-                if (fluids.length == 0 || fluids[0].isEmpty()) {
-                    it.remove();
-                    continue;
-                }
-                amount = ingredient.getAmount();
             }
+            if (fluids.length == 0 || fluids[0].isEmpty()) {
+                it.remove();
+                continue;
+            }
+            int amount = fluids[0].getAmount();
 
             if (io == IO.OUT && !allowSameFluids) {
                 CustomFluidTank existing = null;

src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/FluidIngredient.java

@@ -30,6 +30,7 @@ public class FluidIngredient implements Predicate<FluidStack> {
             .xmap(FluidIngredient::fromJson, FluidIngredient::toJson);
 
     public static final FluidIngredient EMPTY = new FluidIngredient(new Value[0], 0, null);
+    public static final FluidStack[] EMPTY_STACK_ARRAY = new FluidStack[0];
     public FluidIngredient.Value[] values;
     @Nullable
     public FluidStack[] stacks;

src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderFluidIngredient.java

@@ -54,8 +54,16 @@ public int getAmount() {
     @Override
     public FluidStack[] getStacks() {
         if (fluidStacks == null) {
-            inner.setAmount(getSampledCount(GTValues.RNG));
-            fluidStacks = inner.getStacks();
+            int cachedAmount = getSampledCount(GTValues.RNG);
+            if (cachedAmount == 0) {
+                return EMPTY_STACK_ARRAY;
+            }
+            var innerStacks = inner.getStacks();
+            this.fluidStacks = new FluidStack[innerStacks.length];
+            for (int i = 0; i < fluidStacks.length; i++) {
+                fluidStacks[i] = innerStacks[i].copy();
+                fluidStacks[i].setAmount(cachedAmount);
+            }
         }
         return fluidStacks;
     }

src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderIngredient.java

@@ -29,6 +29,7 @@
 public class IntProviderIngredient extends Ingredient {
 
     public static final ResourceLocation TYPE = GTCEu.id("int_provider");
+    public static final ItemStack[] EMPTY_STACK_ARRAY = new ItemStack[0];
 
     @Getter
     protected final IntProvider countProvider;
@@ -64,9 +65,14 @@ public boolean test(@Nullable ItemStack stack) {
     @Override
     public ItemStack @NotNull [] getItems() {
         if (itemStacks == null) {
-            itemStacks = inner.getItems();
+            int cachedCount = getSampledCount(GTValues.RNG);
+            if (cachedCount == 0) {
+                return EMPTY_STACK_ARRAY;
+            }
+            var innerStacks = inner.getItems();
+            this.itemStacks = new ItemStack[innerStacks.length];
             for (int i = 0; i < itemStacks.length; i++) {
-                itemStacks[i] = itemStacks[i].copyWithCount(getSampledCount(GTValues.RNG));
+                itemStacks[i] = innerStacks[i].copyWithCount(cachedCount);
             }
         }
         return itemStacks;

src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/SizedIngredient.java

@@ -32,6 +32,9 @@ public class SizedIngredient extends Ingredient {
     protected int amount;
     @Getter
     protected final Ingredient inner;
+    /**
+     * This array's elements must be treated as immutable.
+     */
     protected ItemStack[] itemStacks = null;
     private boolean changed = true;
     @Getter
@@ -136,9 +139,10 @@ public boolean test(@Nullable ItemStack stack) {
             return intProviderIngredient.getItems();
         }
         if (changed || itemStacks == null) {
-            itemStacks = inner.getItems();
+            var innerStacks = inner.getItems();
+            this.itemStacks = new ItemStack[innerStacks.length];
             for (int i = 0; i < itemStacks.length; i++) {
-                itemStacks[i] = itemStacks[i].copyWithCount(amount);
+                itemStacks[i] = innerStacks[i].copyWithCount(amount);
             }
             changed = false;
         }

src/main/java/com/gregtechceu/gtceu/integration/jade/provider/RecipeOutputProvider.java

@@ -177,21 +177,23 @@ private void addItemTooltips(ITooltip iTooltip, List<Ingredient> outputItems) {
         IElementHelper helper = iTooltip.getElementHelper();
         for (Ingredient itemOutput : outputItems) {
             if (itemOutput != null && !itemOutput.isEmpty()) {
-                ItemStack item = itemOutput.getItems()[0];
-                int count = item.getCount();
-                item.setCount(1);
-                iTooltip.add(helper.smallItem(item));
+                ItemStack item;
                 MutableComponent text = CommonComponents.space();
                 if (itemOutput instanceof IntProviderIngredient provider) {
+                    item = provider.getInner().getItems()[0];
                     text = text.append(Component.translatable("gtceu.gui.content.range",
                             String.valueOf(provider.getCountProvider().getMinValue()),
                             String.valueOf(provider.getCountProvider().getMaxValue())));
                 } else {
-                    text.append(String.valueOf(count));
+                    item = itemOutput.getItems()[0];
+                    text.append(String.valueOf(item.getCount()));
+                    item.setCount(1);
                 }
                 text.append(Component.translatable("gtceu.gui.content.times_item",
                         getItemName(item))
                         .withStyle(ChatFormatting.WHITE));
+
+                iTooltip.add(helper.smallItem(item));
                 iTooltip.append(text);
             }
         }
@@ -200,18 +202,22 @@ private void addItemTooltips(ITooltip iTooltip, List<Ingredient> outputItems) {
     private void addFluidTooltips(ITooltip iTooltip, List<FluidIngredient> outputFluids) {
         for (FluidIngredient fluidOutput : outputFluids) {
             if (fluidOutput != null && !fluidOutput.isEmpty()) {
-                iTooltip.add(GTElementHelper.smallFluid(getFluid(fluidOutput.getStacks()[0])));
+                FluidStack stack;
                 MutableComponent text = CommonComponents.space();
                 if (fluidOutput instanceof IntProviderFluidIngredient provider) {
+                    stack = provider.getInner().getStacks()[0];
                     text.append(Component.translatable("gtceu.gui.content.range",
                             FluidTextHelper.getUnicodeMillibuckets(provider.getCountProvider().getMinValue(), true),
                             FluidTextHelper.getUnicodeMillibuckets(provider.getCountProvider().getMaxValue(), true)));
                 } else {
-                    text.append(FluidTextHelper.getUnicodeMillibuckets(fluidOutput.getAmount(), true));
+                    stack = fluidOutput.getStacks()[0];
+                    text.append(FluidTextHelper.getUnicodeMillibuckets(stack.getAmount(), true));
                 }
                 text.append(CommonComponents.space())
-                        .append(getFluidName(fluidOutput.getStacks()[0]))
+                        .append(getFluidName(stack))
                         .withStyle(ChatFormatting.WHITE);
+
+                iTooltip.add(GTElementHelper.smallFluid(getFluid(stack)));
                 iTooltip.append(text);
             }
         }

src/main/java/com/gregtechceu/gtceu/integration/top/provider/RecipeOutputProvider.java

@@ -17,9 +17,11 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraftforge.fluids.FluidStack;
 
 import mcjty.theoneprobe.api.CompoundText;
 import mcjty.theoneprobe.api.ElementAlignment;
@@ -58,7 +60,13 @@ protected void addProbeInfo(RecipeLogic recipeLogic, IProbeInfo iProbeInfo, Play
 
                 List<Ingredient> itemOutputs = new ArrayList<>();
                 for (var item : itemContents) {
-                    var stacks = ItemRecipeCapability.CAP.of(item.content).getItems();
+                    ItemStack[] stacks;
+                    Ingredient content = ItemRecipeCapability.CAP.of(item.content);
+                    if (content instanceof IntProviderIngredient provider) {
+                        stacks = provider.getInner().getItems();
+                    } else {
+                        stacks = content.getItems();
+                    }
                     if (stacks.length == 0) continue;
                     if (stacks[0].isEmpty()) continue;
                     var stack = stacks[0].copy();
@@ -75,7 +83,13 @@ protected void addProbeInfo(RecipeLogic recipeLogic, IProbeInfo iProbeInfo, Play
 
                 List<FluidIngredient> fluidOutputs = new ArrayList<>();
                 for (var fluid : fluidContents) {
-                    var stacks = FluidRecipeCapability.CAP.of(fluid.content).getStacks();
+                    FluidStack[] stacks;
+                    FluidIngredient content = FluidRecipeCapability.CAP.of(fluid.content);
+                    if (content instanceof IntProviderFluidIngredient provider) {
+                        stacks = provider.getInner().getStacks();
+                    } else {
+                        stacks = content.getStacks();
+                    }
                     if (stacks.length == 0) continue;
                     if (stacks[0].isEmpty()) continue;
                     var stack = stacks[0].copy();