[1.21] Recipe priority system for solving overlaps in recipe ingredients and patterns #1152
+384
−9
Conversation
This file contains 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
|
bconlon1
changed the title
marchermans
requested changes
Jun 20, 2024
patches/net/minecraft/world/item/crafting/RecipeManager.java.patch
Outdated
Show resolved
Hide resolved
patches/net/minecraft/world/item/crafting/RecipeManager.java.patch
Outdated
Show resolved
Hide resolved
src/main/java/net/neoforged/neoforge/common/crafting/RecipePriorityManager.java
Outdated
Show resolved
Hide resolved
src/main/java/net/neoforged/neoforge/event/AddReloadListenerEvent.java
Outdated
Show resolved
Hide resolved
Matyrobbrt
added
enhancement
Matyrobbrt
requested changes
Jun 26, 2024
| * @param listener the listener to add to the ResourceManager on reload | ||
| * @param before a predicate for what listener to add this before | ||
| */ | ||
| public void addListenerBefore(PreparableReloadListener listener, Predicate<PreparableReloadListener> before) { |
There was a problem hiding this comment.
This method should ideally be split into its own PR and account the feedback provided in #598
@pupnewfster has stated that they don't have updating the PR in their priority list, so if you do end up porting it, you should use a toposort and named listeners.
embeddedt
requested changes
Jun 27, 2024
src/main/java/net/neoforged/neoforge/common/crafting/RecipePriorityManager.java
Outdated
Show resolved
Hide resolved
sciwhiz12
reviewed
Sep 15, 2024
src/main/java/net/neoforged/neoforge/event/AddReloadListenerEvent.java
Outdated
Show resolved
Hide resolved
|
@bconlon1, this pull request has conflicts, please resolve them for this PR to move forward. |
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.
Updated version of #1141
This PR implements a system intended to give modders a solution to the problem of needing to implement a recipe with a pattern of ingredients, but it overlaps with a vanilla recipe that has the same pattern but using a tag instead. For example, a modder may be trying to make a Chest for a specific wood type in a custom dimension, but in Vanilla, crafting Chests uses the #planks tag, so all wood types are normally going to give the default Chest block.
Specifically, this PR does the following main things:
RecipePrioritiesProvider, which is a data provider that can be extended to generate a map of recipeResourceLocations toIntegerpriorities. Vanilla recipes are considered at a baseline of 0, so positive numbered recipes are higher priority and negative numbered recipes are lower priority.RecipePriorityManager, which reads the JSON data.RecipeManagerto use ordered data types that are ordered by taking into account any priority values that are found to match a recipe ID.AddReloadListenerEventis constructed slightly, by passing in the list of original listeners to it. This is necessary to allow for insertingRecipePriorityManagerto run and generate priorities beforeRecipeManagerso that they can be used in it.