-
Notifications
You must be signed in to change notification settings - Fork 422
Fix simulated recipe matching causing visible side effects #5299
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Archengius
wants to merge
2
commits into
GregTechCEu:1.20.1
Choose a base branch
from
Archengius:fix-recipe-runner-side-effects
base: 1.20.1
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -113,10 +113,13 @@ public List<FluidIngredient> handleRecipeInner(IO io, GTRecipe recipe, List<Flui | |
| if (io != IO.IN && io != IO.OUT) return left; | ||
|
|
||
| // Temporarily remove listeners so that we can broadcast the entire set of transactions once | ||
| Runnable[] listeners = new Runnable[storages.length]; | ||
| for (int i = 0; i < storages.length; i++) { | ||
| listeners[i] = storages[i].getOnContentsChanged(); | ||
| storages[i].setOnContentsChanged(() -> {}); | ||
| Runnable[] listeners = null; | ||
| if (!simulate) { | ||
| listeners = new Runnable[storages.length]; | ||
| for (int i = 0; i < storages.length; i++) { | ||
| listeners[i] = storages[i].getOnContentsChanged(); | ||
| storages[i].setOnContentsChanged(() -> {}); | ||
| } | ||
| } | ||
| boolean changed = false; | ||
|
|
||
|
|
@@ -222,9 +225,11 @@ public List<FluidIngredient> handleRecipeInner(IO io, GTRecipe recipe, List<Flui | |
| } | ||
| } | ||
|
|
||
| for (int i = 0; i < storages.length; i++) { | ||
| storages[i].setOnContentsChanged(listeners[i]); | ||
| if (changed && action.execute()) listeners[i].run(); | ||
| if (listeners != null && !simulate) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ditto |
||
| for (int i = 0; i < storages.length; i++) { | ||
| storages[i].setOnContentsChanged(listeners[i]); | ||
| if (changed && action.execute()) listeners[i].run(); | ||
| } | ||
| } | ||
|
|
||
| return left; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -94,8 +94,11 @@ public static List<Ingredient> handleRecipe(IO io, GTRecipe recipe, List<Ingredi | |
| if (io != IO.IN && io != IO.OUT) return left; | ||
|
|
||
| // Temporarily remove listener so that we can broadcast the entire set of transactions once | ||
| Runnable listener = storage.getOnContentsChanged(); | ||
| storage.setOnContentsChanged(() -> {}); | ||
| Runnable listener = null; | ||
| if (!simulate) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ditto |
||
| listener = storage.getOnContentsChanged(); | ||
| storage.setOnContentsChanged(() -> {}); | ||
| } | ||
| boolean changed = false; | ||
|
|
||
| // Store the ItemStack in each slot after an operation | ||
|
|
@@ -170,8 +173,10 @@ public static List<Ingredient> handleRecipe(IO io, GTRecipe recipe, List<Ingredi | |
| } | ||
| } | ||
|
|
||
| storage.setOnContentsChanged(listener); | ||
| if (changed && !simulate) listener.run(); | ||
| if (!simulate) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ditto |
||
| storage.setOnContentsChanged(listener); | ||
| if (changed) listener.run(); | ||
| } | ||
|
|
||
| return left; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm fairly certain this should always be done regardless of
simulatedstatus? Don't quote me on that, though.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It being done means the state is modified, which makes it unsafe to call from multiple threads. Why should it be done? In a simulated path, no change listeners will fire since no contents will be changed, and as such, that logic is not necessary.