Move recycling code out of OreDictUnifier #2809
Merged
Conversation
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
M-W-K
approved these changes
May 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What
Moves Recycling code out of OreDictUnifier, and improves some of the related code.
OreDictUnifier.getMaterial()is only ever used with the intention that the ItemStack passed in is a "material item," meaning it is the item form of some material. There is no obvious expectation that it should ever return a material for non-material items that have recycling data, so I changed its behavior to be more intuitive and align with the common expectations. I did not notice any obvious change to any of our recycling recipes, and I do not expect any issues in the other places it's used.Outcome
Less confusion with
OreDictUnifier.registerOre()sometimes being used for recycling and other times being for Ore Dictionary entries.