From 9dea4a38320826c8c3df139eb8b3f89162aeada2 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 9 Jun 2026 20:18:15 -0400
Subject: [PATCH] Fix dynamic_languages on 26.1

---
 .../perf/dynamic_languages/ClientLanguageMixin.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_languages/ClientLanguageMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_languages/ClientLanguageMixin.java
index 0d62a734..d378e829 100644
--- a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_languages/ClientLanguageMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_languages/ClientLanguageMixin.java
@@ -28,9 +28,11 @@ public class ClientLanguageMixin {
      * @reason collect the list of all known language resources
      */
     @WrapOperation(method = "loadFrom", at = @At(value = "INVOKE",
-            target = "Lnet/minecraft/client/resources/language/ClientLanguage;appendFrom(Ljava/lang/String;Ljava/util/List;Ljava/util/Map;)V"))
+            target = "Lnet/minecraft/client/resources/language/ClientLanguage;appendFrom(Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;)V"))
     private static void collectResources(String languageName, List<Resource> resources,
-                                              Map<String, String> destinationMap, Operation<Void> original,
+                                              Map<String, String> destinationMap,
+                                              Map<String, net.minecraft.network.chat.Component> componentMap,
+                                              Operation<Void> original,
                                               @Share("usedResources") LocalRef<List<Resource>> usedResources) {
         List<Resource> collected = usedResources.get();
         if (collected == null) {
@@ -38,14 +40,14 @@ public class ClientLanguageMixin {
             usedResources.set(collected);
         }
         collected.addAll(resources);
-        original.call(languageName, resources, destinationMap);
+        original.call(languageName, resources, destinationMap, componentMap);
     }
 
     /**
      * @author embeddedt
      * @reason figure out which keys are dynamically loaded and which are injected by mixins
      */
-    @ModifyArg(method = "loadFrom", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/language/ClientLanguage;<init>(Ljava/util/Map;Z)V"), index = 0)
+    @ModifyArg(method = "loadFrom", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/language/ClientLanguage;<init>(Ljava/util/Map;ZLjava/util/Map;)V"), index = 0)
     private static Map<String, String> modifyLanguageMap(Map<String, String> storage, @Share("usedResources") LocalRef<List<Resource>> usedResources) {
         List<Resource> collected = Objects.requireNonNullElse(usedResources.get(), List.of());
         return DynamicLanguageMap.forVanillaData(storage, collected);