Registry resource conditions #3752
Merged
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
- Add matching overloads for all add(...) methods which take a varargs list of ResourceConditions. - Add an additional overload for registering RegistryEntry.References directly. This makes it a little easier to register directly from a RegistryBuilder.
maityyy
reviewed
May 3, 2024
...src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricDynamicRegistryProvider.java
Outdated
Show resolved
Hide resolved
modmuss50
approved these changes
May 13, 2024
...src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricDynamicRegistryProvider.java
Outdated
Show resolved
Hide resolved
modmuss50
added
enhancement
|
Looks good, ill add to last call, 1 or 2 trivial things to be looked at before merging. Thanks :) |
|
Are there any registries where this might fail? I don't remember if there was one that didn't tolerate additional keys, probably zero but maybe we should check, |
modmuss50
pushed a commit
that referenced
this pull request
May 20, 2024
* Add resource conditions to dynamic registries * Support conditions in FabricDynamicRegistryProvider - Add matching overloads for all add(...) methods which take a varargs list of ResourceConditions. - Add an additional overload for registering RegistryEntry.References directly. This makes it a little easier to register directly from a RegistryBuilder. * Throw error if we cannot add resource conditions * Rename EntryWithConditions to ConditionalEntry (cherry picked from commit a5d5299)
|
Thanks! |
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.
This adds support for resource conditions within dynamic registries.
The registry-contains condition (and all other conditions) have access to the parent registries but not registries in the current
ServerDynamicRegistryType. In practice, this means conditions can reference theSTATICregistries, but not dynamic registries (WORLDGEN) or loot tables (RELOADABLE).For datagen, this adds additional overrides to
FabricDynamicRegistryProvider.Entriesto add items with resource conditions. This is a bit of a divergence from the other resource condition generators (which useFabricDataGenHelper.consumeConditions), but I think this makes more sense here.Closes #3632.