From f0a479d7c5e29dad318cbe9126a6c48cb2e9f951 Mon Sep 17 00:00:00 2001 From: JFronny Date: Sat, 11 May 2024 18:53:57 +0200 Subject: [PATCH] fix: add client-side compatibility with nucleoid serverside translation --- .../gitlab/jfronny/translater/mixin/LanguageMixin.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/client/java/io/gitlab/jfronny/translater/mixin/LanguageMixin.java b/src/client/java/io/gitlab/jfronny/translater/mixin/LanguageMixin.java index 618ab44..07cd936 100644 --- a/src/client/java/io/gitlab/jfronny/translater/mixin/LanguageMixin.java +++ b/src/client/java/io/gitlab/jfronny/translater/mixin/LanguageMixin.java @@ -5,19 +5,19 @@ import net.minecraft.client.resource.language.TranslationStorage; import net.minecraft.util.Language; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.*; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import java.util.Map; -@Mixin(Language.class) +@Mixin(value = Language.class, priority = 900) public class LanguageMixin { - @Inject(at = @At("HEAD"), method = "setInstance") - private static void languageSetInstance(Language language, CallbackInfo ci) { + @ModifyVariable(at = @At("HEAD"), method = "setInstance", argsOnly = true) + private static Language languageSetInstance(Language language) { if (language instanceof TranslationStorage t) { TranslationStorageAccessor ta = (TranslationStorageAccessor) t; ta.setTranslations(Translater.getMap(ta.getTranslations())); Translater.LOGGER.info("Set translater backend 2"); - } else Translater.LOGGER.warn("Unsupported language configured: {}", language); + } else Translater.LOGGER.error("Unsupported language configured: {}", language); + return language; } @ModifyArg(