Ranged Ingredient Tests

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

@@ -19,6 +19,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Allows a {@link FluidIngredient} to be created with a ranged {@code amount}, which will be randomly rolled upon
@@ -53,6 +54,13 @@ protected IntProviderFluidIngredient(FluidIngredient inner, IntProvider provider
         this.countProvider = provider;
     }
 
+    protected IntProviderFluidIngredient(FluidIngredient inner, IntProvider provider, int sampledCount) {
+        super(inner.values, provider.getMaxValue(), null);
+        this.inner = inner;
+        this.countProvider = provider;
+        this.sampledCount = sampledCount;
+    }
+
     @Override
     public IntProviderFluidIngredient copy() {
         IntProviderFluidIngredient ipfi = new IntProviderFluidIngredient(this.inner, this.countProvider);
@@ -150,6 +158,14 @@ public boolean isEmpty() {
         return inner.isEmpty();
     }
 
+    /**
+     * Resets the random roll on this ingredient
+     */
+    public void reroll() {
+        sampledCount = -1;
+        fluidStacks = null;
+    }
+
     /**
      * @param inner    {@link FluidIngredient}
      * @param provider usually as {@link UniformInt#of(int, int)}
@@ -162,6 +178,11 @@ public static IntProviderFluidIngredient of(FluidStack inner, int min, int max)
         return IntProviderFluidIngredient.of(FluidIngredient.of(inner), UniformInt.of(min, max));
     }
 
+    @Override
+    public boolean test(@Nullable FluidStack stack) {
+        return inner.test(stack);
+    }
+
     /**
      * Properties:
      * <ul>
@@ -175,6 +196,7 @@ public static IntProviderFluidIngredient of(FluidStack inner, int min, int max)
         json.add("count_provider", IntProvider.CODEC.encodeStart(JsonOps.INSTANCE, countProvider)
                 .getOrThrow(false, GTCEu.LOGGER::error));
         json.add("inner", inner.toJson());
+        json.addProperty("sampledCount", sampledCount);
         return json;
     }
 
@@ -192,8 +214,9 @@ public static IntProviderFluidIngredient fromJson(JsonElement json) {
         JsonObject jsonObject = GsonHelper.convertToJsonObject(json, "ingredient");
         IntProvider amount = IntProvider.CODEC.parse(JsonOps.INSTANCE, jsonObject.get("count_provider"))
                 .getOrThrow(false, GTCEu.LOGGER::error);
+        int sampledCount = jsonObject.getAsJsonPrimitive("sampledCount").getAsInt();
         FluidIngredient inner = FluidIngredient.fromJson(jsonObject.get("inner"));
-        return new IntProviderFluidIngredient(inner, amount);
+        return new IntProviderFluidIngredient(inner, amount, sampledCount);
     }
 
     public CompoundTag toNBT() {

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

@@ -59,6 +59,13 @@ protected IntProviderIngredient(Ingredient inner, IntProvider countProvider) {
         this.countProvider = countProvider;
     }
 
+    protected IntProviderIngredient(Ingredient inner, IntProvider countProvider, int sampledCount) {
+        super(Stream.empty());
+        this.inner = inner;
+        this.countProvider = countProvider;
+        this.sampledCount = sampledCount;
+    }
+
     /**
      * @param inner         {@link Ingredient}
      * @param countProvider usually as {@link net.minecraft.util.valueproviders.UniformInt#of(int, int)}
@@ -92,7 +99,7 @@ public boolean test(@Nullable ItemStack stack) {
     @Override
     public ItemStack @NotNull [] getItems() {
         if (itemStacks == null) {
-            int cachedCount = getSampledCount(GTValues.RNG);
+            int cachedCount = getSampledCount();
             if (cachedCount == 0) {
                 return EMPTY_STACK_ARRAY;
             }
@@ -117,6 +124,19 @@ public boolean test(@Nullable ItemStack stack) {
         else return inner.getItems()[0].copyWithCount(countProvider.getMaxValue());
     }
 
+    /**
+     * If this ingredient has not yet had its {@link IntProviderIngredient#sampledCount} rolled, rolls it and
+     * returns the roll.
+     * If it has, returns the existing roll.
+     * Passthrough method, invokes {@link IntProviderIngredient#getSampledCount(RandomSource)} using the threadsafe
+     * {@link GTValues#RNG}.
+     *
+     * @return the amount rolled
+     */
+    public int getSampledCount() {
+        return getSampledCount(GTValues.RNG);
+    }
+
     /**
      * If this ingredient has not yet had its {@link IntProviderIngredient#sampledCount} rolled, rolls it and returns
      * the roll.
@@ -139,6 +159,14 @@ public double getMidRoll() {
         return ((countProvider.getMaxValue() + countProvider.getMinValue()) / 2.0);
     }
 
+    /**
+     * Resets the random roll on this ingredient
+     */
+    public void reroll() {
+        sampledCount = -1;
+        itemStacks = null;
+    }
+
     @Override
     public @NotNull IntList getStackingIds() {
         return inner.getStackingIds();
@@ -182,31 +210,36 @@ public static IntProviderIngredient fromJson(JsonObject json) {
         json.add("count_provider", IntProvider.CODEC.encodeStart(JsonOps.INSTANCE, countProvider)
                 .getOrThrow(false, GTCEu.LOGGER::error));
         json.add("ingredient", inner.toJson());
+        json.addProperty("sampledCount", sampledCount);
         return json;
     }
 
     public static final IIngredientSerializer<IntProviderIngredient> SERIALIZER = new IIngredientSerializer<>() {
 
         @Override
         public @NotNull IntProviderIngredient parse(FriendlyByteBuf buffer) {
-            IntProvider amount = IntProvider.CODEC.parse(NbtOps.INSTANCE, buffer.readNbt().get("provider"))
+            var nbt = buffer.readNbt();
+            IntProvider provider = IntProvider.CODEC.parse(NbtOps.INSTANCE, nbt.get("provider"))
                     .getOrThrow(false, GTCEu.LOGGER::error);
-            return new IntProviderIngredient(Ingredient.fromNetwork(buffer), amount);
+            int sampledCount = nbt.getInt("sampledCount");
+            return new IntProviderIngredient(Ingredient.fromNetwork(buffer), provider, sampledCount);
         }
 
         @Override
         public @NotNull IntProviderIngredient parse(JsonObject json) {
-            IntProvider amount = IntProvider.CODEC.parse(JsonOps.INSTANCE, json.get("count_provider"))
+            IntProvider provider = IntProvider.CODEC.parse(JsonOps.INSTANCE, json.get("count_provider"))
                     .getOrThrow(false, GTCEu.LOGGER::error);
             Ingredient inner = Ingredient.fromJson(json.get("ingredient"));
-            return new IntProviderIngredient(inner, amount);
+            int sampledCount = json.getAsJsonPrimitive("sampledCount").getAsInt();
+            return new IntProviderIngredient(inner, provider, sampledCount);
         }
 
         @Override
         public void write(FriendlyByteBuf buffer, IntProviderIngredient ingredient) {
             CompoundTag wrapper = new CompoundTag();
             wrapper.put("provider", IntProvider.CODEC.encodeStart(NbtOps.INSTANCE, ingredient.countProvider)
                     .getOrThrow(false, GTCEu.LOGGER::error));
+            wrapper.putInt("sampledCount", ingredient.sampledCount);
             buffer.writeNbt(wrapper);
             ingredient.inner.toNetwork(buffer);
         }