Preroll Ranged Ingredients on Recipe Start (1.20.1)

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

@@ -179,9 +179,7 @@ public int getMaxParallelByInput(IRecipeCapabilityHolder holder, GTRecipe recipe
         for (Content content : inputs) {
             FluidIngredient ing = of(content.content());
 
-            int amount;
-            if (ing instanceof IRangedIngredient provider) amount = provider.getMaxRoll();
-            else amount = ing.getAmount();
+            int amount = ing.getAmount();
 
             if (content.chance() == 0) {
                 nonConsumables.addTo(ing, amount);

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

@@ -88,9 +88,6 @@ public List<Object> compressIngredients(@Unmodifiable Collection<Object> ingredi
                 } else if (ingredient instanceof SizedIngredient sized &&
                         sized.getInner() instanceof IntCircuitIngredient) {
                     list.add(0, ingredient);
-                } else if (ingredient instanceof IntProviderIngredient intProvider &&
-                        intProvider.getInner() instanceof IntCircuitIngredient) {
-                    list.add(0, ingredient);
                 } else {
                     list.add(ingredient);
                 }
@@ -152,7 +149,7 @@ public int limitMaxParallelByOutput(IRecipeCapabilityHolder holder, GTRecipe rec
 
             int count;
             if (ing instanceof SizedIngredient sized) count = sized.getAmount();
-            else if (ing instanceof IntProviderIngredient provider) count = provider.getCountProvider().getMaxValue();
+            else if (ing instanceof IntProviderIngredient provider) count = provider.getMaxRoll();
             else count = 1;
 
             maxCount = Math.max(maxCount, count);
@@ -204,7 +201,7 @@ public int getMaxParallelByInput(IRecipeCapabilityHolder holder, GTRecipe recipe
 
             int count;
             if (ing instanceof SizedIngredient sized) count = sized.getAmount();
-            else if (ing instanceof IntProviderIngredient provider) count = provider.getCountProvider().getMaxValue();
+            else if (ing instanceof IntProviderIngredient provider) count = provider.getMaxRoll();
             else count = 1;
 
             if (content.chance() == 0) {

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

@@ -118,15 +118,8 @@ public void onContentsChanged() {
 
             FluidStack[] fluids;
 
-            if (ingredient instanceof IntProviderFluidIngredient provider) {
-                provider.setFluidStacks(null);
-                provider.setSampledCount(-1);
-
-                if (simulate) {
-                    fluids = new FluidStack[] { provider.getMaxSizeStack() };
-                } else {
-                    fluids = provider.getStacks();
-                }
+            if (ingredient instanceof IntProviderFluidIngredient provider && simulate) {
+                fluids = new FluidStack[] { provider.getMaxSizeStack() };
             } else {
                 fluids = ingredient.getStacks();
             }

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

@@ -120,9 +120,6 @@ public static List<Ingredient> handleRecipe(IO io, GTRecipe recipe, List<Ingredi
             ItemStack[] items;
             int amount;
             if (ingredient instanceof IntProviderIngredient provider) {
-                provider.setItemStacks(null);
-                provider.setSampledCount(-1);
-
                 ItemStack output;
                 if (simulate) {
                     output = provider.getMaxSizeStack();

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

@@ -31,7 +31,7 @@ protected List<Class<?>> validMachineClasses() {
     public long getInputAmperage() {
         var recipeLogic = getMachine().getTrait(RecipeLogic.TYPE);
         if (recipeLogic == null) return 0;
-        var lastRecipe = recipeLogic.getLastRecipe();
+        var lastRecipe = recipeLogic.getLastDisplayedRecipe();
         long amperage;
         if (lastRecipe != null) {
             amperage = lastRecipe.getInputEUt().amperage();
@@ -49,7 +49,7 @@ public long getInputAmperage() {
     public long getOutputAmperage() {
         var recipeLogic = getMachine().getTrait(RecipeLogic.TYPE);
         if (recipeLogic == null) return 0;
-        var lastRecipe = recipeLogic.getLastRecipe();
+        var lastRecipe = recipeLogic.getLastDisplayedRecipe();
         if (lastRecipe != null) {
             return lastRecipe.getOutputEUt().amperage();
         } else {

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

@@ -99,8 +99,12 @@ public enum Status implements StringRepresentable {
     @Nullable
     @Getter
     @SaveField
-    @SyncToClient
     protected GTRecipe lastRecipe;
+    @Nullable
+    @Getter
+    @SaveField
+    @SyncToClient
+    protected GTRecipe lastDisplayedRecipe;
     @Getter
     @SaveField
     @SyncToClient
@@ -165,6 +169,7 @@ protected void onStatusSynced() {
     public void resetRecipeLogic() {
         recipeDirty = false;
         lastRecipe = null;
+        lastDisplayedRecipe = null;
         lastOriginRecipe = null;
         consecutiveRecipes = 0;
         progress = 0;
@@ -354,16 +359,18 @@ public void findAndHandleRecipe() {
         if (!recipeDirty && lastRecipe != null && checkRecipe(lastRecipe).isSuccess()) {
             GTRecipe recipe = lastRecipe;
             lastRecipe = null;
+            lastDisplayedRecipe = null;
             lastOriginRecipe = null;
             setupRecipe(recipe);
         } else {
             // try to find and handle a new recipe
             failureReasonMap.clear();
             lastRecipe = null;
+            lastDisplayedRecipe = null;
             lastOriginRecipe = null;
             handleSearchingRecipes(searchRecipe());
         }
-        syncDataHolder.markClientSyncFieldDirty("lastRecipe");
+        syncDataHolder.markClientSyncFieldDirty("lastDisplayedRecipe");
         recipeDirty = false;
     }
 
@@ -393,6 +400,8 @@ public ActionResult handleTickRecipe(GTRecipe recipe) {
         var result = RecipeHelper.matchTickRecipe(getRLMachine(), recipe);
         if (!result.isSuccess()) return result;
 
+        recipe.doTickPrerolls(this.chanceCaches);
+
         result = handleTickRecipeIO(recipe, IO.IN);
         if (!result.isSuccess()) return result;
 
@@ -410,6 +419,12 @@ public void setupRecipe(GTRecipe recipe) {
             syncDataHolder.resyncAllFields();
             return;
         }
+        if (lastRecipe != null && !recipe.equals(lastRecipe)) {
+            chanceCaches.clear();
+        }
+        lastDisplayedRecipe = recipe.copy();
+        syncDataHolder.markClientSyncFieldDirty("lastDisplayedRecipe");
+        recipe.doPrerolls(this.chanceCaches);
         var handledIO = handleRecipeIO(recipe, IO.IN);
         if (handledIO.isSuccess()) {
             if (lastRecipe != null && !recipe.equals(lastRecipe)) {
@@ -423,6 +438,8 @@ public void setupRecipe(GTRecipe recipe) {
             duration = recipe.duration;
             isActive = true;
             syncDataHolder.resyncAllFields();
+        } else {
+            lastDisplayedRecipe = null;
         }
     }
 
@@ -541,6 +558,7 @@ public void onRecipeFinish() {
                 isActive = false;
                 // Force a recipe recheck.
                 lastRecipe = null;
+                lastDisplayedRecipe = null;
                 syncDataHolder.resyncAllFields();
                 return;
             }
@@ -551,7 +569,6 @@ public void onRecipeFinish() {
                         markLastRecipeDirty();
                     } else {
                         lastRecipe = modified;
-                        syncDataHolder.markClientSyncFieldDirty("lastRecipe");
                     }
                 } else {
                     markLastRecipeDirty();

src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipe.java

@@ -6,6 +6,7 @@
 import com.gregtechceu.gtceu.api.recipe.content.Content;
 import com.gregtechceu.gtceu.api.recipe.content.ContentModifier;
 import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack;
+import com.gregtechceu.gtceu.api.recipe.ingredient.IRangedIngredient;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.RegistryAccess;
@@ -16,12 +17,14 @@
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.level.Level;
 
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import lombok.Getter;
 import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.stream.Stream;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
@@ -231,6 +234,38 @@ public ChanceLogic getChanceLogicForCapability(RecipeCapability<?> cap, IO io, b
         return new EnergyStack(v, a);
     }
 
+    public void doPrerolls(IdentityHashMap<RecipeCapability<?>, Object2IntMap<?>> chanceCaches) {
+        var rangedContents = getFullContents()
+                .filter(i -> i.content() instanceof IRangedIngredient)
+                .toList();
+        for (var item : rangedContents) {
+            ((IRangedIngredient) item.content()).rollSampledCount();
+        }
+    }
+
+    public void doTickPrerolls(IdentityHashMap<RecipeCapability<?>, Object2IntMap<?>> chanceCaches) {
+        var rangedContents = getFullTickContents()
+                .filter(i -> i.content() instanceof IRangedIngredient)
+                .toList();
+        for (var item : rangedContents) {
+            ((IRangedIngredient) item.content()).rollSampledCount();
+        }
+    }
+
+    public Stream<Content> getFullContents() {
+        return Stream.concat(
+                inputs.values().stream(),
+                outputs.values().stream())
+                .flatMap(List::stream);
+    }
+
+    public Stream<Content> getFullTickContents() {
+        return Stream.concat(
+                tickInputs.values().stream(),
+                tickOutputs.values().stream())
+                .flatMap(List::stream);
+    }
+
     public int getTotalRuns() {
         return parallels * subtickParallels * batchParallels;
     }

src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeHelper.java

@@ -11,7 +11,6 @@
 import com.gregtechceu.gtceu.api.recipe.content.Content;
 import com.gregtechceu.gtceu.api.recipe.ingredient.EnergyStack;
 import com.gregtechceu.gtceu.api.recipe.ingredient.FluidIngredient;
-import com.gregtechceu.gtceu.api.recipe.ingredient.IRangedIngredient;
 import com.gregtechceu.gtceu.config.ConfigHolder;
 import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder;
 import com.gregtechceu.gtceu.utils.GTUtil;
@@ -401,7 +400,6 @@ public static int getRatioForDistillery(FluidIngredient fluidInput, FluidIngredi
     }
 
     public static boolean isFluidStackDivisibleForDistillery(FluidIngredient fluidStack, int divisor) {
-        int amount = (fluidStack instanceof IRangedIngredient ranged ? ranged.getMaxRoll() : fluidStack.getAmount());
-        return amount % divisor == 0 && amount / divisor >= 25;
+        return fluidStack.getAmount() % divisor == 0 && fluidStack.getAmount() / divisor >= 25;
     }
 }

src/main/java/com/gregtechceu/gtceu/api/recipe/content/ContentModifier.java

@@ -42,7 +42,8 @@ public double apply(double number) {
      * @return A new Content map that is the modified version of the argument
      */
     public Map<RecipeCapability<?>, List<Content>> applyContents(Map<RecipeCapability<?>, List<Content>> contents) {
-        if (this == IDENTITY) return new HashMap<>(contents);
+        // Prerolls require copying, even on IDENTITY
+        // if (this == IDENTITY) return new HashMap<>(contents);
         Map<RecipeCapability<?>, List<Content>> copyContents = new HashMap<>();
         for (var entry : contents.entrySet()) {
             var contentList = entry.getValue();

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

@@ -38,7 +38,7 @@ public class FluidIngredient implements Predicate<FluidStack> {
     @Nullable
     public FluidStack[] stacks;
     @Getter
-    protected int amount;
+    private int amount;
     @Getter
     protected CompoundTag nbt;
     protected boolean changed = true;

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

@@ -28,6 +28,8 @@ default int rollSampledCount() {
 
     int rollSampledCount(@NotNull RandomSource random);
 
+    int getAmount();
+
     /**
      * @return the average roll of this ranged amount
      */