Translation fallback #2543
Merged
Translation fallback #2543
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
mcmonkey4eva
reviewed
Oct 5, 2023
| } | ||
| StringBuilder output = new StringBuilder().append(ChatColor.COLOR_CHAR).append("[translate=").append(FormattedTextHelper.escape(translateText)); | ||
| if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_20) && fallback != null) { | ||
| output.append(';').append(ChatColor.COLOR_CHAR).append("fallback=").append(FormattedTextHelper.escape(fallback.asString())); |
There was a problem hiding this comment.
injecting color_char inside of the block here is problematic
There was a problem hiding this comment.
Updated to be a MapTag as discussed on Discord
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.
Adds support for the 1.19 translatable component fallbacks.
Changes
<&translate[key=<key>;(fallback=<fallback>);(with=<text>|...)]>syntax.fallbackdoes a bit more understandable.@example's, and updated for the new syntax.ObjectTagas a param, instead of manually doing!hasParam -> return null.&[translate=MapTag], with the map being the same as&translate's input.Additions
BukkitImplDeprecations.translateLegacySyntax-FutureWarningfor the legacy&translatesyntax.FormattedTextHelper#parseTranslatable- util method since there are 2 places with practically identical logic for parsing them.Notes
Gave the fallback bit of the internal format for translatable components a prefix with the legacy color char, to make sure it's properly differentiated from thewithvalues - let me know if there's a better way to approach this.Is there a reason the example for the tag.escapes all of thewithvalues? seemed to work as expected without that, and I think the values' safety should be pretty much guaranteed in this case? as player names are pretty strict and the other is just another translatable - and either way they're passed throughFormattedTextHelper#escapelater..escape's from the example forwith, since the entire map is escaped later on, and it doesn't look like they're needed (I assume they were there for legacy list parsing reasons or something?) - all the old code did was immediately unescape them; the old.withsub-tag should still support that for back-support.startsWith("@map")check inFormattedTextHelper#parseTranslatable, but don't think there's a cleaner way of doing that? maybe substring the raw object prefix and check if it starts with[? or some core method to avoid hard-coding that sort of check in?