Skip to content

Commit

Permalink
split TranslationLoader from ICATranslations, better translation mixins
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ivan-1F
Ivan-1F committed May 9, 2024
1 parent a6c89fc commit 2d11173
Show file tree
Hide file tree
Showing 9 changed files with 200 additions and 153 deletions.
3 changes: 3 additions & 0 deletions src/main/java/me/ivan/ivancarpetaddition/mixins/translations/HUDControllerMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@

@Mixin(HUDController.class)
public abstract class HUDControllerMixin {
/**
* This handle all ICA translation in carpet hud logger
*/
@ModifyVariable(method = "addMessage", at = @At("HEAD"), argsOnly = true, remap = false)
private static
//#if MC >= 11900
Expand Down
52 changes: 0 additions & 52 deletions src/main/java/me/ivan/ivancarpetaddition/mixins/translations/LoggerMixin.java
View file

This file was deleted.

6 changes: 3 additions & 3 deletions src/main/java/me/ivan/ivancarpetaddition/mixins/translations/TranslatableTextMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg;

/**
* From Carpet TIS Addition
*/
@Mixin(TranslatableText.class)
public abstract class TranslatableTextMixin {
@Shadow
@Final
private String key;

/**
* This handles all ICA translation when a TranslatableText is directly accessed as a String etc.
*/
@ModifyArg(
method = "updateTranslations",
at = @At(
Expand Down
193 changes: 99 additions & 94 deletions src/main/java/me/ivan/ivancarpetaddition/translations/ICATranslations.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,60 +5,30 @@
//#else
//$$ import me.ivan.ivancarpetaddition.utils.compat.carpet.CarpetSettings;
//#endif
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.gson.Gson;
import me.ivan.ivancarpetaddition.IvanCarpetAdditionServer;
import me.ivan.ivancarpetaddition.mixins.translations.StyleAccessor;
import me.ivan.ivancarpetaddition.mixins.translations.TranslatableTextAccessor;
import me.ivan.ivancarpetaddition.utils.FileUtil;
import me.ivan.ivancarpetaddition.utils.Messenger;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.io.IOException;
import java.util.*;

/**
* Reference: Carpet TIS Addition
*/
public class ICATranslations {
private static final String LANG_DIR = String.format("assets/%s/lang", TranslationConstants.TRANSLATION_NAMESPACE);

// language -> (key -> content)
public static final Map<String, Map<String, String>> translations = Maps.newLinkedHashMap();
public static final Set<String> languages = Sets.newHashSet();

private static class LanguageList extends ArrayList<String> {}
private static class TranslationMapping extends LinkedHashMap<String, String> {}

private static List<String> getAvailableTranslations() {
try {
String dataStr = FileUtil.readFile(LANG_DIR + "/meta/languages.json");
return new Gson().fromJson(dataStr, LanguageList.class);
} catch (Exception e) {
IvanCarpetAdditionServer.LOGGER.warn("Failed to load translations");
return Lists.newArrayList();
}
}

public static void loadTranslations() {
getAvailableTranslations().forEach(ICATranslations::loadTranslation);
public static Collection<String> getLanguages() {
return Collections.unmodifiableSet(translations.keySet());
}

public static void loadTranslation(String language) {
String path = String.format("%s/%s.json", LANG_DIR, language);
String data;
try {
data = FileUtil.readFile(path);
Map<String, String> translation = new Gson().fromJson(data, TranslationMapping.class);
translations.put(language, translation);
languages.add(language);
} catch (IOException e) {
IvanCarpetAdditionServer.LOGGER.warn("Failed to load translation: " + language);
}
public static void loadTranslations() {
TranslationLoader.loadTranslations(translations);
}

public static String getServerLanguage() {
Expand All @@ -84,81 +54,91 @@ public static BaseText translate(BaseText text) {
}

public static BaseText translate(BaseText text, String lang) {
return translate(text, lang, false);
// quick scan to check if any required translation exists
boolean[] translationRequired = new boolean[]{false};
translate(text, lang, (txt, msgKeyString) -> {
translationRequired[0] = true;
return txt;
});
if (!translationRequired[0]) {
return text;
}

return translate(Messenger.copy(text), lang, (txt, msgKeyString) -> {
//#if MC >= 11900
//$$ TranslatableTextContent content = (TranslatableTextContent) txt.getContent();
//$$ String txtKey = content.getKey();
//$$ Object[] txtArgs = content.getArgs();
//#else
String txtKey = txt.getKey();
Object[] txtArgs = txt.getArgs();
//#endif

if (msgKeyString == null) {
IvanCarpetAdditionServer.LOGGER.warn("ICA: Unknown translation key {}", txtKey);
return txt;
}

BaseText newText;
try {
newText = Messenger.format(msgKeyString, txtArgs);
}
catch (IllegalArgumentException e) {
newText = Messenger.s(msgKeyString);
}

// migrating text data
newText.getSiblings().addAll(txt.getSiblings());
newText.setStyle(txt.getStyle());

return newText;
});
}

public static BaseText translate(BaseText text, String lang, boolean suppressWarnings) {
private static BaseText translate(BaseText text, String lang, TextModifier modifier) {
if (
//#if MC >= 11900
//$$ text.getContent()
//$$ text.getContent() instanceof TranslatableText
//#else
text
text instanceof TranslatableText
//#endif
instanceof TranslatableText
) {
TranslatableText translatableText =
//#if MC >= 11900
//$$ (TranslatableTextContent) text.getContent();
//#else
(TranslatableText) text;
//#endif

// translate arguments
Object[] args = translatableText.getArgs();
for (int i = 0; i < args.length; i++) {
Object arg = args[i];
if (arg instanceof BaseText) {
BaseText newText = translate((BaseText) arg, lang, modifier);
if (newText != arg) {
args[i] = newText;
}
}
}

// do translation logic
if (translatableText.getKey().startsWith(TranslationConstants.TRANSLATION_KEY_PREFIX)) {
String formattedString = translateKeyToFormattedString(lang, translatableText.getKey());
if (formattedString == null) {
String msgKeyString = translateKeyToFormattedString(lang, translatableText.getKey());
if (msgKeyString == null && !lang.equals(TranslationConstants.DEFAULT_LANGUAGE)) {
// not supported language
formattedString = translateKeyToFormattedString(TranslationConstants.DEFAULT_LANGUAGE, translatableText.getKey());
msgKeyString = translateKeyToFormattedString(TranslationConstants.DEFAULT_LANGUAGE, translatableText.getKey());
}
if (formattedString != null) {
BaseText origin = text;
TranslatableTextAccessor fixedTranslatableText = (TranslatableTextAccessor) (
//#if MC >= 11900
//$$ Messenger.tr
//#else
new TranslatableText
//#endif
(formattedString, translatableText.getArgs())
)
//#if MC >= 11900
//$$ .getContent()
//#endif
;
try {
//#if MC >= 11800
//$$ List<StringVisitable> translations = Lists.newArrayList();
//$$ fixedTranslatableText.invokeForEachPart(formattedString, translations::add);
text = modifier.apply(
//#if MC >= 11900
//$$ text,
//#else
fixedTranslatableText.getTranslations().clear();
fixedTranslatableText.invokeSetTranslation(formattedString);
translatableText,
//#endif

//#if MC >= 11600
//$$ text = Messenger.c(
//#if MC >= 11800
//$$ translations
//#else
//$$ fixedTranslatableText.getTranslations()
//#endif
//$$ .stream()
//$$ .map(stringVisitable -> {
//$$ if (stringVisitable instanceof BaseText) {
//$$ return (BaseText) stringVisitable;
//$$ }
//$$ return Messenger.s(stringVisitable.getString());
//$$ })
//$$ .toArray()
//$$ );
//#else
text = Messenger.c(fixedTranslatableText.getTranslations().toArray(new Object[0]));
//#endif
} catch (TranslationException e) {
text = Messenger.s(formattedString);
}
text.getSiblings().addAll(origin.getSiblings());
text.setStyle(origin.getStyle());
} else if (!suppressWarnings) {
IvanCarpetAdditionServer.LOGGER.warn("Unknown translation key {}", translatableText.getKey());
}
msgKeyString
);
}

}

// translate hover text
Expand All @@ -167,16 +147,41 @@ public static BaseText translate(BaseText text, String lang, boolean suppressWar
//#if MC >= 11600
//$$ Object hoverText = hoverEvent.getValue(hoverEvent.getAction());
//$$ if (hoverEvent.getAction() == HoverEvent.Action.SHOW_TEXT && hoverText instanceof BaseText) {
//$$ text.setStyle(text.getStyle().withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, translate((BaseText) hoverText, lang))));
//$$ BaseText newText = translate((BaseText) hoverText, lang, modifier);
//$$ if (newText != hoverText) {
//$$ text.setStyle(text.getStyle().withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, newText)));
//$$ }
//$$ }
//#else
text.getStyle().setHoverEvent(new HoverEvent(hoverEvent.getAction(), translate((BaseText) hoverEvent.getValue(), lang)));
Text hoverText = hoverEvent.getValue();
BaseText newText = translate((BaseText) hoverText, lang, modifier);
if (newText != hoverText) {
text.getStyle().setHoverEvent(new HoverEvent(hoverEvent.getAction(), newText));
}
//#endif
}

// translate sibling texts
List<Text> siblings = text.getSiblings();
siblings.replaceAll(text1 -> translate((BaseText) text1, lang));
for (int i = 0; i < siblings.size(); i++) {
Text sibling = siblings.get(i);
BaseText newText = translate((BaseText) sibling, lang, modifier);
if (newText != sibling) {
siblings.set(i, newText);
}
}
return text;
}

@FunctionalInterface
private interface TextModifier {
BaseText apply(
//#if MC >= 11900
//$$ MutableText translatableText,
//#else
TranslatableText translatableText,
//#endif
@Nullable String msgKeyString
);
}
}
45 changes: 45 additions & 0 deletions src/main/java/me/ivan/ivancarpetaddition/translations/TranslationLoader.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package me.ivan.ivancarpetaddition.translations;

import com.google.gson.Gson;
import me.ivan.ivancarpetaddition.IvanCarpetAdditionServer;
import me.ivan.ivancarpetaddition.utils.FileUtil;
import net.fabricmc.loader.api.FabricLoader;

import java.util.*;

public class TranslationLoader {
private static final String LANG_DIR = String.format("assets/%s/lang", TranslationConstants.TRANSLATION_NAMESPACE);

public static void loadTranslations(Map<String, Map<String, String>> translationStorage) {
List<String> languageList;

try {
String fileContent = FileUtil.readFile(LANG_DIR + "/meta/languages.json");
languageList = new Gson().fromJson(fileContent, LanguageList.class);
}
catch (Exception e) {
IvanCarpetAdditionServer.LOGGER.error("Failed to read language list", e);
return;
}

languageList.forEach(lang -> translationStorage.computeIfAbsent(lang, TranslationLoader::loadTranslation));
}

private static Map<String, String> loadTranslation(String lang) {
try {
String fileContent = FileUtil.readFile(String.format("%s/%s.json", LANG_DIR, lang));
return new Gson().fromJson(fileContent, TranslationMapping.class);
}
catch (Exception e) {
String message = "Failed to load translation of language " + lang;
IvanCarpetAdditionServer.LOGGER.error(message, e);
if (FabricLoader.getInstance().isDevelopmentEnvironment()) {
throw new RuntimeException(message, e);
}
return Collections.emptyMap();
}
}

private static class LanguageList extends ArrayList<String> {}
private static class TranslationMapping extends LinkedHashMap<String, String> {}
}
Loading

0 comments on commit 2d11173

Please sign in to comment.