[1.21] Fix data generator merge issue #1187
Merged
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.
When using the current DataGenerator system to generate built-in packs, you can easily run into
Duplicate Provider
errors.This is due to how the system merges all providers down to a single larger provider in
GatherDataEvent
.The current implementation ignores the
id
providers are registered with, which for most providers is no issue, but providers registered for built-in packs have theid
prefixed with the packsid
.this PR aims to fix that issue by introducing a simple
DataGenerator.merge
method, which simply pulls the providers and their registered ids directly from the sub generators backing maps and moving them into the parents.This pr also introduces a simple overload helper
DataGenerator.getBuiltinDatapack
, this is to allow generating modded builtin packs.Original Discord message