From fa4313264383f866c236494ae0017b64df9c4326 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Wed, 1 Sep 2021 14:03:00 -0700
Subject: [PATCH] flattener should try to render custom translations (#6540)

---
 patches/server/Adventure.patch | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/patches/server/Adventure.patch b/patches/server/Adventure.patch
index 83c72646353..7d76b2b65d0 100644
--- a/patches/server/Adventure.patch
+++ b/patches/server/Adventure.patch
@@ -527,6 +527,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import net.kyori.adventure.translation.GlobalTranslator;
 +import net.kyori.adventure.util.Codec;
 +import net.minecraft.ChatFormatting;
++import net.minecraft.locale.Language;
 +import net.minecraft.nbt.CompoundTag;
 +import net.minecraft.nbt.ListTag;
 +import net.minecraft.nbt.StringTag;
@@ -545,7 +546,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    private static final Pattern LOCALIZATION_PATTERN = Pattern.compile("%(?:(\\d+)\\$)?s");
 +    public static final ComponentFlattener FLATTENER = ComponentFlattener.basic().toBuilder()
 +        .complexMapper(TranslatableComponent.class, (translatable, consumer) -> {
-+            final @NonNull String translated = net.minecraft.locale.Language.getInstance().getOrDefault(translatable.key());
++            if (!Language.getInstance().has(translatable.key())) {
++                consumer.accept(GlobalTranslator.render(translatable, Locale.US));
++                return;
++            }
++            final @NonNull String translated = Language.getInstance().getOrDefault(translatable.key());
 +
 +            final Matcher matcher = LOCALIZATION_PATTERN.matcher(translated);
 +            final List<Component> args = translatable.args();