From 1f6a80477f6b24c86210a68cf932232f19466110 Mon Sep 17 00:00:00 2001
From: Leclowndu93150 <xdr.a123454321@gmail.com>
Date: Sun, 13 Apr 2025 17:22:57 +0200
Subject: [PATCH] fix AT for 1.21+

---
 .../com/tterrag/k9/mappings/official/OfficialMapping.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/tterrag/k9/mappings/official/OfficialMapping.java b/src/main/java/com/tterrag/k9/mappings/official/OfficialMapping.java
index 08d34763..79a9c03d 100644
--- a/src/main/java/com/tterrag/k9/mappings/official/OfficialMapping.java
+++ b/src/main/java/com/tterrag/k9/mappings/official/OfficialMapping.java
@@ -83,9 +83,13 @@ public String formatMessage(String mcver) {
                     .append(name).append('(').append(parameters).append(")`\n");
         }
 
-        if (!intermediate.isEmpty()) {
+        boolean is121Plus = mcver != null && mcver.compareTo("1.21") >= 0;
+
+        // For 1.21+, use the remapped name. For older versions, use intermediate.
+        String atName = is121Plus ? name : intermediate;
+
+        if (!intermediate.isEmpty() || is121Plus) {
             builder.append("__AT__: `public ").append(Strings.nullToEmpty(getOwner(NameType.INTERMEDIATE)).replace('/', '.'));
-            String atName = intermediate;
             if (isClassMapping) {
                 // getOwner() is empty here, so no space is needed
                 atName = atName.replace('/', '.');