Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ComponentFlattenerImpl: translatable components check fallback first #895

Merged
merged 1 commit into from
Apr 8, 2023
Merged

ComponentFlattenerImpl: translatable components check fallback first #895

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion api/src/main/java/net/kyori/adventure/text/flattener/ComponentFlattenerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ final class ComponentFlattenerImpl implements ComponentFlattener {
.mapper(ScoreComponent.class, ScoreComponent::value) // Removed in Vanilla 1.16, but we keep it for backwards compat
.mapper(SelectorComponent.class, SelectorComponent::pattern)
.mapper(TextComponent.class, TextComponent::content)
.mapper(TranslatableComponent.class, TranslatableComponent::key)
.mapper(TranslatableComponent.class, component -> {
final @Nullable String fallback = component.fallback();
return fallback != null ? fallback : component.key();
})
// The Vanilla game will not print NBT components, expecting those to be resolved with sender context
.build();
static final ComponentFlattener TEXT_ONLY = new BuilderImpl()
Expand Down