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 resources, - Map destinationMap, Operation original, + Map destinationMap, + Map componentMap, + Operation original, @Share("usedResources") LocalRef> usedResources) { List 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;(Ljava/util/Map;Z)V"), index = 0) + @ModifyArg(method = "loadFrom", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/language/ClientLanguage;(Ljava/util/Map;ZLjava/util/Map;)V"), index = 0) private static Map modifyLanguageMap(Map storage, @Share("usedResources") LocalRef> usedResources) { List collected = Objects.requireNonNullElse(usedResources.get(), List.of()); return DynamicLanguageMap.forVanillaData(storage, collected);