[1.18.x] Allow safely registering RenderType predicates at any time #8671
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
approved these changes
Jun 7, 2022
AterAnimAvis
added
Performance
Gegy
approved these changes
Jun 7, 2022
patches/minecraft/net/minecraft/client/renderer/ItemBlockRenderTypes.java.patch
Outdated
Show resolved
Hide resolved
sciwhiz12
approved these changes
Jun 16, 2022
sciwhiz12
added
Assigned
tterrag1098
suggested changes
Jun 27, 2022
patches/minecraft/net/minecraft/client/renderer/ItemBlockRenderTypes.java.patch
Outdated
Show resolved
Hide resolved
patches/minecraft/net/minecraft/client/renderer/ItemBlockRenderTypes.java.patch
Outdated
Show resolved
Hide resolved
| + } | ||
| + | ||
| + | ||
| + public static Map<net.minecraftforge.registries.IRegistryDelegate<Fluid>, java.util.function.Predicate<RenderType>> getFluidLayerPredicatesView() { |
There was a problem hiding this comment.
Why are these view methods necessary? The map being wrapped is already a copy, creating an unmodifiable instance seems like unnecessary overhead.
There was a problem hiding this comment.
These methods only provide a view to prevent callers from modifying the map that may be concurrently accessed by the rendering process.
patches/minecraft/net/minecraft/client/renderer/ItemBlockRenderTypes.java.patch
Outdated
Show resolved
Hide resolved
marchermans
approved these changes
Jun 28, 2022
tterrag1098
approved these changes
Jun 29, 2022
|
This looks completely fine to me, but I will leave it to another team member to merge, as I am too close to the issue and a bit out of the loop in general. |
tmvkrpxl0
pushed a commit
to tmvkrpxl0/MinecraftForge
that referenced
this pull request
Jul 24, 2022
…inecraftForge#8671) * Allow safely registering RenderType predicates at any time * Requested changes
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 PR effectively supersedes #8664 by providing a solution that keeps the performance benefit of the initial change in #8476 while avoiding breaking mods that need access to the predicate map, such as CTM.
This is done by using a lazy "copy-on-write" implementation where the map is only actually copied on the first read access after modification.
The PR also adds getters to allow mods like CTM to access an unmodifiable view of the maps instead of accessing internals via reflection.
Quote of the description of #8664 for completeness: