R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dynamic_languages on 26.1

Browse Source
This commit is contained in:
embeddedt 2026-06-09 20:18:15 -04:00
parent 433a0e5b70
commit 9dea4a3832
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_languages/ClientLanguageMixin.java
View File

@ -28,9 +28,11 @@ public class ClientLanguageMixin {
* @reason collect the list of all known language resources * @reason collect the list of all known language resources
*/ */
@WrapOperation(method = "loadFrom", at = @At(value = "INVOKE", @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, 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) { @Share("usedResources") LocalRef<List<Resource>> usedResources) {
List<Resource> collected = usedResources.get(); List<Resource> collected = usedResources.get();
if (collected == null) { if (collected == null) {
@ -38,14 +40,14 @@ public class ClientLanguageMixin {
usedResources.set(collected); usedResources.set(collected);
} }
collected.addAll(resources); collected.addAll(resources);
original.call(languageName, resources, destinationMap); original.call(languageName, resources, destinationMap, componentMap);
} }
/** /**
* @author embeddedt * @author embeddedt
* @reason figure out which keys are dynamically loaded and which are injected by mixins * @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) { 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()); List<Resource> collected = Objects.requireNonNullElse(usedResources.get(), List.of());
return DynamicLanguageMap.forVanillaData(storage, collected); return DynamicLanguageMap.forVanillaData(storage, collected);