Upon preroll, destroy ranged ingredient. by DilithiumThoride · Pull Request #5051 · GregTechCEu/GregTech-Modern

DilithiumThoride · 2026-07-02T19:33:39Z

What

Big enough structural change that it deserves its own PR into the PR branch.

Upon prerolling a Ranged Ingredient, destroy it and replace it with a Sized Ingredient of the rolled size.

Implementation Details

I realized this was a necessity after trying to fix #5048 to account for NeoForge's versions of SizedIngredient and SizedFluidIngredient.

AI Usage

[ X ] No AI driven tools were used for this pull request.

Outcome

The version of a recipe a machine actually runs will now never contain a Ranged Ingredient. This hugely simplifies the logic needed in Notifiable[X]Handler.handleRecipe().

How Was This Tested

Automated tests pass after being edited to account for it.

Additional Information

Four tests (ranged ingredient sabotage; ranged ingredients json) have been deleted as (1) there isn't a way to do those tests in this new system and (2) the behavior those tests were designed to catch for cannot exist in the new system either.

This is being done as an explicit PR into #5015 to verify it, and will then be replicated as a part of #5048.

Currently logged as a draft because, while it passes tests, I want to do a clean-up pass to remove any cases where something tries to get amount for of a ranged ingredient and really shouldn't.

Potential Compatibility Issues

If anything this resolves potential compatibility issues.

…IllegalCallerException. TODO: replace this with something less destructive.

…be done more efficiently.

jurrejelle

I'm not sure I like .replace() as a name, maybe could be replaced with something like .collapse() or the like, since replace usually gets used in stuff like string.replace("a","b"). Apart from that LGTM

jurrejelle · 2026-07-05T06:59:57Z

+            syncDataHolder.markClientSyncFieldDirty("lastDisplayedRecipe");
+            markLastRecipeDirty();
+        }
+        recipe.doTickPrerolls(this.chanceCaches, this.lastDisplayedRecipe);


this taking lastDisplayedRecipe is a bit iffy since the name implies it's used for displaying, but that might have to wait until 9.0.0 recipelogic refactor

screret

Mostly some formatting nitpicks, code itself looks fine to me.

P.S. Maybe rename the PR to "Destroy ranged ingredients when prerolling" - I think that'd convey what it does a bit better

screret · 2026-07-11T09:27:03Z

            FluidIngredient recipeStack = FluidRecipeCapability.CAP.of(fluidInputs.get(i).content());
-            if (!recipeStack.test(fluidStack) || (recipeStack.getAmount()) > fluidStack.getAmount()) {
+            if (!recipeStack.test(fluidStack) ||
+                    (recipeStack instanceof IRangedIngredient ? ((IRangedIngredient) recipeStack).getMaxRoll() :


Suggested change

(recipeStack instanceof IRangedIngredient ? ((IRangedIngredient) recipeStack).getMaxRoll() :

(recipeStack instanceof IRangedIngredient ranged ? ranged.getMaxRoll() :

screret · 2026-07-11T09:27:22Z

+                    content = new Content(ranged.collapse(), content.chance(), content.maxChance());
+                    ranged.reset();
+                }
+                tickInputs.computeIfAbsent(capability, c -> new ArrayList<>()).add(content);


Suggested change

tickInputs.computeIfAbsent(capability, c -> new ArrayList<>()).add(content);

this.tickInputs.computeIfAbsent(capability, c -> new ArrayList<>()).add(content);

screret · 2026-07-11T09:27:29Z

+                    content = new Content(ranged.collapse(), content.chance(), content.maxChance());
+                    ranged.reset();
+                }
+                tickOutputs.computeIfAbsent(capability, c -> new ArrayList<>()).add(content);


Suggested change

tickOutputs.computeIfAbsent(capability, c -> new ArrayList<>()).add(content);

this.tickOutputs.computeIfAbsent(capability, c -> new ArrayList<>()).add(content);

screret · 2026-07-11T09:33:04Z

-                ranged.rollSampledCount();
+        for (var handler : inputs.values()) {
+            for (var iterator = handler.listIterator(); iterator.hasNext();) {
+                var content = iterator.next();


Less var, please

Suggested change

var content = iterator.next();

for (List<Content> input : this.inputs.values()) {

for (ListIterator<Content> iterator = input.listIterator(); iterator.hasNext();) {

Content content = iterator.next();

screret · 2026-07-11T09:33:37Z

+        for (var handler : outputs.values()) {
+            for (var iterator = handler.listIterator(); iterator.hasNext();) {
+                var content = iterator.next();


Suggested change

for (var handler : outputs.values()) {

for (var iterator = handler.listIterator(); iterator.hasNext();) {

var content = iterator.next();

for (List<Content> output : outputs.values()) {

for (ListIterator<Content> iterator = output.listIterator(); iterator.hasNext();) {

Content content = iterator.next();

screret · 2026-07-11T09:39:05Z


-            int amount = ing.getAmount();
+            int amount;
+            if (ing instanceof IRangedIngredient provider) amount = provider.getMaxRoll();


Suggested change

if (ing instanceof IRangedIngredient provider) amount = provider.getMaxRoll();

if (ing instanceof IRangedIngredient ranged) amount = ranged.getMaxRoll();

screret · 2026-07-11T09:39:31Z

        @Override
        public long kjs$getAmount() {
-            return ingredient.getAmount();
+            return (ingredient instanceof IRangedIngredient ? ((IRangedIngredient) ingredient).getMaxRoll() :


Suggested change

return (ingredient instanceof IRangedIngredient ? ((IRangedIngredient) ingredient).getMaxRoll() :

return (ingredient instanceof IRangedIngredient ranged ? ranged.getMaxRoll() :

screret · 2026-07-11T09:39:47Z

                .map(FluidRecipeCapability.CAP::of)
                .filter(i -> !i.isEmpty())
-                .mapToInt(FluidIngredient::getAmount)
+                .mapToInt((i -> i instanceof IRangedIngredient ? ((IRangedIngredient) i).getMaxRoll() : i.getAmount()))


Suggested change

.mapToInt((i -> i instanceof IRangedIngredient ? ((IRangedIngredient) i).getMaxRoll() : i.getAmount()))

.mapToInt((i -> i instanceof IRangedIngredient ranged ? ranged.getMaxRoll() : i.getAmount()))

screret · 2026-07-11T09:42:30Z

+        // This will print a "Cannot get stacks" warning to the log. Ignore it.
+        helper.assertTrue(ingredient.getStacks().length == 0, "A ranged fluid ingredient " +
+                "should not return items!");
+        ingredient.rollSampledCount();
+        var stacks = ingredient.collapse().getStacks();
+        helper.assertTrue(stacks.length == 1, "Replaced IntProviderFluidIngredient should only " +
+                "return 1 fluid when made with 1 fluid");
        helper.assertTrue(stacks[0].isFluidEqual(GTMaterials.Water.getFluid(1)),
-                "IntProviderFluidIngredient should have fluid equal to what it was made with");
-        helper.assertTrue(stacks[0].isFluidStackIdentical(ingredient.getStacks()[0]),
-                "IntProviderFluidIngredient.getStacks shouldn't change between getStacks calls");
-        ingredient.reset();
-        helper.assertFalse(stacks[0].isFluidStackIdentical(ingredient.getStacks()[0]),
-                "IntProviderFluidIngredient.getStacks should have changed after rerolling");
+                "Replaced IntProviderFluidIngredient should have fluid equal to what it was made with");


Add some newlines here, for spacing

Suggested change

// This will print a "Cannot get stacks" warning to the log. Ignore it.

helper.assertTrue(ingredient.getStacks().length == 0, "A ranged fluid ingredient " +

"should not return items!");

ingredient.rollSampledCount();

var stacks = ingredient.collapse().getStacks();

helper.assertTrue(stacks.length == 1, "Replaced IntProviderFluidIngredient should only " +

"return 1 fluid when made with 1 fluid");

helper.assertTrue(stacks[0].isFluidEqual(GTMaterials.Water.getFluid(1)),

"IntProviderFluidIngredient should have fluid equal to what it was made with");

helper.assertTrue(stacks[0].isFluidStackIdentical(ingredient.getStacks()[0]),

"IntProviderFluidIngredient.getStacks shouldn't change between getStacks calls");

ingredient.reset();

helper.assertFalse(stacks[0].isFluidStackIdentical(ingredient.getStacks()[0]),

"IntProviderFluidIngredient.getStacks should have changed after rerolling");

"Replaced IntProviderFluidIngredient should have fluid equal to what it was made with");

// This will print a "Cannot get stacks" warning to the log. Ignore it.

helper.assertTrue(ingredient.getStacks().length == 0,

"A ranged fluid ingredient should not return items!");

ingredient.rollSampledCount();

var stacks = ingredient.collapse().getStacks();

helper.assertTrue(stacks.length == 1,

"Replaced IntProviderFluidIngredient should only return 1 fluid when made with 1 fluid");

helper.assertTrue(stacks[0].isFluidEqual(GTMaterials.Water.getFluid(1)),

"Replaced IntProviderFluidIngredient should have fluid equal to what it was made with");

screret · 2026-07-11T09:43:48Z

+        // This will print a "Cannot get items" warning to the log. Ignore it.
+        helper.assertTrue(ingredient.getItems().length == 0, "A ranged ingredient " +
+                "should not return items!");
+        ingredient.rollSampledCount();
+        var stacks = ingredient.collapse().getItems();
+        helper.assertTrue(stacks.length == 1, "Replaced IntProviderIngredient should only " +
+                "return 1 item when made with 1 item");
        helper.assertTrue(stacks[0].is(new ItemStack(Items.BRICK, 1).getItem()),
-                "IntProviderIngredient should have item equal to what it was made with");
-        helper.assertTrue(TestUtils.areItemStacksEqual(stacks, ingredient.getItems()),
-                "IntProviderIngredient.getItems shouldn't change between getStacks calls");
-        ingredient.reset();
-        helper.assertFalse(TestUtils.areItemStacksEqual(stacks, ingredient.getItems()),
-                "IntProviderIngredient.getItems should have changed after rerolling");
+                "Replaced IntProviderIngredient should have item equal to what it was made with");


More spacing here too

Suggested change

// This will print a "Cannot get items" warning to the log. Ignore it.

helper.assertTrue(ingredient.getItems().length == 0, "A ranged ingredient " +

"should not return items!");

ingredient.rollSampledCount();

var stacks = ingredient.collapse().getItems();

helper.assertTrue(stacks.length == 1, "Replaced IntProviderIngredient should only " +

"return 1 item when made with 1 item");

helper.assertTrue(stacks[0].is(new ItemStack(Items.BRICK, 1).getItem()),

"IntProviderIngredient should have item equal to what it was made with");

helper.assertTrue(TestUtils.areItemStacksEqual(stacks, ingredient.getItems()),

"IntProviderIngredient.getItems shouldn't change between getStacks calls");

ingredient.reset();

helper.assertFalse(TestUtils.areItemStacksEqual(stacks, ingredient.getItems()),

"IntProviderIngredient.getItems should have changed after rerolling");

"Replaced IntProviderIngredient should have item equal to what it was made with");

// This will print a "Cannot get items" warning to the log. Ignore it.

helper.assertTrue(ingredient.getItems().length == 0,

"A ranged ingredient should not return items!");

ingredient.rollSampledCount();

var stacks = ingredient.collapse().getItems();

helper.assertTrue(stacks.length == 1,

"Replaced IntProviderIngredient should only return 1 item when made with 1 item");

helper.assertTrue(stacks[0].is(new ItemStack(Items.BRICK, 1).getItem()),

"Replaced IntProviderIngredient should have item equal to what it was made with");

Upon preroll, destroy ranged ingredient.

2908304

DilithiumThoride added 1.20 type: refactor Suggestion to refactor a section of code Release: API - X.0.0 Major Breaking Refactors that MUST be in a API-Breaking Release labels Jul 2, 2026

github-actions Bot added the Tests: Passed Game Tests have passed on this PR label Jul 2, 2026

Upon trying to illegally get the items of a ranged ingredient, Throw …

aec1c65

…IllegalCallerException. TODO: replace this with something less destructive.

github-actions Bot added Tests: Failed Game Tests have failed on this PR and removed Tests: Passed Game Tests have passed on this PR labels Jul 2, 2026

DilithiumThoride added 2 commits July 2, 2026 16:02

fix tests

bf48c2a

revert a few getMaxRoll() checks. Spotless.

5a51f80

github-actions Bot added Tests: Passed Game Tests have passed on this PR and removed Tests: Failed Game Tests have failed on this PR labels Jul 2, 2026

DilithiumThoride added 2 commits July 2, 2026 16:44

replace throw with logger.warn

52208b5

no, that's true.

ec749f2

DilithiumThoride marked this pull request as ready for review July 2, 2026 22:05

DilithiumThoride requested a review from a team as a code owner July 2, 2026 22:05

DilithiumThoride added 4 commits July 2, 2026 19:10

genericize the error

5221677

Properly handle per-tick ingredient prerolls. I feel like this could …

a4310ab

…be done more efficiently.

spotless

f426e5c

no that's not what we want to do

bc8e523

jurrejelle approved these changes Jul 5, 2026

View reviewed changes

apply review comments (1/2)

d0e14ee

screret suggested changes Jul 11, 2026

View reviewed changes

	(recipeStack instanceof IRangedIngredient ? ((IRangedIngredient) recipeStack).getMaxRoll() :
	(recipeStack instanceof IRangedIngredient ranged ? ranged.getMaxRoll() :

	tickInputs.computeIfAbsent(capability, c -> new ArrayList<>()).add(content);
	this.tickInputs.computeIfAbsent(capability, c -> new ArrayList<>()).add(content);

	tickOutputs.computeIfAbsent(capability, c -> new ArrayList<>()).add(content);
	this.tickOutputs.computeIfAbsent(capability, c -> new ArrayList<>()).add(content);

-                var content = iterator.next();
+        for (List<Content> input : this.inputs.values()) {
+            for (ListIterator<Content> iterator = input.listIterator(); iterator.hasNext();) {
+                Content content = iterator.next();

	if (ing instanceof IRangedIngredient provider) amount = provider.getMaxRoll();
	if (ing instanceof IRangedIngredient ranged) amount = ranged.getMaxRoll();

	return (ingredient instanceof IRangedIngredient ? ((IRangedIngredient) ingredient).getMaxRoll() :
	return (ingredient instanceof IRangedIngredient ranged ? ranged.getMaxRoll() :

	.mapToInt((i -> i instanceof IRangedIngredient ? ((IRangedIngredient) i).getMaxRoll() : i.getAmount()))
	.mapToInt((i -> i instanceof IRangedIngredient ranged ? ranged.getMaxRoll() : i.getAmount()))

Uh oh!

Conversation

DilithiumThoride commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What

Implementation Details

AI Usage

Outcome

How Was This Tested

Additional Information

Potential Compatibility Issues

Uh oh!

jurrejelle left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

screret left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

DilithiumThoride commented Jul 2, 2026 •

edited

Loading