Add support for partially synced client tags #3118
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
Technici4n
reviewed
Jun 14, 2023
fabric-client-tags-api-v1/src/client/java/net/fabricmc/fabric/api/tag/client/v1/ClientTags.java
Outdated
Show resolved
Hide resolved
Technici4n
reviewed
Jun 14, 2023
fabric-client-tags-api-v1/src/client/java/net/fabricmc/fabric/api/tag/client/v1/ClientTags.java
Outdated
Show resolved
Hide resolved
Technici4n
reviewed
Jun 14, 2023
fabric-client-tags-api-v1/src/client/java/net/fabricmc/fabric/api/tag/client/v1/ClientTags.java
Outdated
Show resolved
Hide resolved
Technici4n
reviewed
Jun 14, 2023
fabric-client-tags-api-v1/src/client/java/net/fabricmc/fabric/api/tag/client/v1/ClientTags.java
Outdated
Show resolved
Hide resolved
Technici4n
reviewed
Jun 14, 2023
...client-tags-api-v1/src/client/java/net/fabricmc/fabric/impl/tag/client/ClientTagsLoader.java
Outdated
Show resolved
Hide resolved
Technici4n
reviewed
Jun 21, 2023
fabric-client-tags-api-v1/src/client/java/net/fabricmc/fabric/api/tag/client/v1/ClientTags.java
Outdated
Show resolved
Hide resolved
Technici4n
approved these changes
Jun 21, 2023
modmuss50
reviewed
Jun 23, 2023
fabric-client-tags-api-v1/src/client/java/net/fabricmc/fabric/api/tag/client/v1/ClientTags.java
Outdated
Show resolved
Hide resolved
...tags-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/tag/client/v1/ClientTagTest.java
Outdated
Show resolved
Hide resolved
fabric-client-tags-api-v1/src/client/java/net/fabricmc/fabric/api/tag/client/v1/ClientTags.java
Outdated
Show resolved
Hide resolved
Co-authored-by: modmuss <modmuss50@gmail.com>
|
Your change to the recursion handling means that nested tags won't be correctly overridden anymore, as far as I can tell. |
Good catch. I've restored the recursive search, but added tracking of already tested tags so we should now always terminate. |
Technici4n
reviewed
Jun 24, 2023
...c-client-tags-api-v1/src/client/java/net/fabricmc/fabric/impl/tag/client/ClientTagsImpl.java
Show resolved
Hide resolved
Technici4n
reviewed
Jun 24, 2023
...client-tags-api-v1/src/client/java/net/fabricmc/fabric/impl/tag/client/ClientTagsLoader.java
Outdated
Show resolved
Hide resolved
Technici4n
approved these changes
Jun 24, 2023
modmuss50
approved these changes
Jun 25, 2023
modmuss50
added
enhancement
modmuss50
added a commit
that referenced
this pull request
Jul 3, 2023
* Draft v1.1.0 * Resolve some comments * Add javadoc * Remove old behavior * Minor cleanup * Add test for partially synced tags * Address nitpick * Fix checkstyle * Hard fail when datapack fails to regsiter Co-authored-by: modmuss <modmuss50@gmail.com> * Fix missing import * Refactor Don't recurse through tag hierarchy * Add note for test * Adjustments to logic to handle server-missing nested tags * Restore recursive search, add tracking of checked tags * Cleanup --------- Co-authored-by: modmuss <modmuss50@gmail.com>
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.
Allows for client tags to reference tags that may be synced from a server, allowing for them to be used.
An example of this being useful is in AutoSwitch. To address
mc:sword_efficientnot containing bamboo, a wrapper tag is neededas:sword_efficient. With partially synced tags it would allow for server-side changes tomc:sword_efficientto be seen inas:sword_efficient, which better reflects the intent of the tag.This is a draft as implementation is worked out, some todos are left in with some questions.